406 files changed, 122201 insertions, 46204 deletions

diff --git a/xorg-server/.Xdefaults b/xorg-server/.Xdefaults
new file mode 100644
index 000000000..06c29211a
--- /dev/null
+++ b/xorg-server/.Xdefaults
@@ -0,0 +1 @@
+*customization:-color

diff --git a/xorg-server/.gitignore b/xorg-server/.gitignore
index 94a12fdc2..4e5c3a5bd 100644
--- a/xorg-server/.gitignore
+++ b/xorg-server/.gitignore
@@ -1,81 +1,10 @@
-#
-#		X.Org module default exclusion patterns
-#		The next section if for module specific patterns
-#
-#	Do not edit the following section
-# 	GNU Build System (Autotools)
-aclocal.m4
-autom4te.cache/
-autoscan.log
-ChangeLog
-compile
-config.guess
-config.h
-config.h.in
-config.log
-config-ml.in
-config.py
-config.status
-config.status.lineno
-config.sub
-configure
-configure.scan
-depcomp
-.deps/
-INSTALL
-install-sh
-.libs/
-libtool
-libtool.m4
-ltmain.sh
-lt~obsolete.m4
-ltoptions.m4
-ltsugar.m4
-ltversion.m4
-Makefile
-Makefile.in
-mdate-sh
-missing
-mkinstalldirs
-*.pc
-py-compile
-stamp-h?
-symlink-tree
-texinfo.tex
-ylwrap
-
-#	Do not edit the following section
-# 	Edit Compile Debug Document Distribute
-*~
-*.[0-9]
-*.[0-9]x
-*.bak
-*.bin
-core
-*.dll
-*.exe
-*-ISO*.bdf
-*-JIS*.bdf
-*-KOI8*.bdf
-*.kld
-*.ko
-*.ko.cmd
-*.lai
-*.l[oa]
-*.[oa]
-*.obj
-*.patch
-*.so
-*.pcf.gz
-*.pdb
-*.tar.bz2
-*.tar.gz
-#
-#		Add & Override patterns for xserver 
-#
-#		Edit the following section as needed
-# For example, !report.pc overrides *.pc. See 'man gitignore'
-# 
-doltcompile
-doltlibtool
-xserver.ent
+fonts

+locale

+protocol.txt

+xcalc

+xcalc-color

+xclock

+xclock-color

+xerrordb

+xkbdata

+xwin.rc
\ No newline at end of file
diff --git a/xorg-server/Xext/Makefile b/xorg-server/Xext/Makefile
new file mode 100644
index 000000000..d59f345d0
--- /dev/null
+++ b/xorg-server/Xext/Makefile
@@ -0,0 +1,38 @@
+CSRCS=\
+bigreq.c \
+dpms.c \
+dpmsstubs.c \
+saver.c \
+security.c \
+shape.c \
+sleepuntil.c \
+sync.c \
+xace.c \
+xcmisc.c \
+hashtable.c \
+xres.c \
+xtest.c \
+geext.c \
+panoramiX.c \
+panoramiXprocs.c \
+xf86bigfont.c \
+panoramiXSwap.c 
+
+#shm.c \
+#appgroup.c \
+#fontcache.c \
+#mbufbf.c \
+#mbufpx.c \
+#xcalibrate.c \
+#xprint.c \
+#xselinux.c \
+#xvdisp.c \
+#xvmain.c \
+#xvmc.c
+
+LIBRARY=libxext
+
+INCLUDES += ..\hw\xfree86\dixmods\extmod ..\composite ..\miext\sync
+
+
+
diff --git a/xorg-server/Xext/bigreq.c b/xorg-server/Xext/bigreq.c
index c78a1e4b4..c4508ddb5 100644
--- a/xorg-server/Xext/bigreq.c
+++ b/xorg-server/Xext/bigreq.c
@@ -53,12 +53,11 @@ ProcBigReqDispatch(ClientPtr client)
         return BadRequest;
     REQUEST_SIZE_MATCH(xBigReqEnableReq);
     client->big_requests = TRUE;
-    rep = (xBigReqEnableReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .max_request_size = maxBigRequestSize
-    };
+    memset(&rep, 0, sizeof(xBigReqEnableReply));
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.max_request_size = maxBigRequestSize;
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swapl(&rep.max_request_size);
diff --git a/xorg-server/Xext/dpms.c b/xorg-server/Xext/dpms.c
index 5f1a35d9c..6a6039ad3 100644
--- a/xorg-server/Xext/dpms.c
+++ b/xorg-server/Xext/dpms.c
@@ -28,6 +28,8 @@ Equipment Corporation.
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#else
+#define DPMSExtension
 #endif
 
 #include <X11/X.h>
@@ -45,16 +47,15 @@ static int
 ProcDPMSGetVersion(ClientPtr client)
 {
     /* REQUEST(xDPMSGetVersionReq); */
-    xDPMSGetVersionReply rep = {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .majorVersion = DPMSMajorVersion,
-        .minorVersion = DPMSMinorVersion
-    };
+    xDPMSGetVersionReply rep;
 
     REQUEST_SIZE_MATCH(xDPMSGetVersionReq);
 
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.majorVersion = DPMSMajorVersion;
+    rep.minorVersion = DPMSMinorVersion;
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swaps(&rep.majorVersion);
@@ -68,15 +69,15 @@ static int
 ProcDPMSCapable(ClientPtr client)
 {
     /* REQUEST(xDPMSCapableReq); */
-    xDPMSCapableReply rep = {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .capable = DPMSCapableFlag
-    };
+    xDPMSCapableReply rep;
 
     REQUEST_SIZE_MATCH(xDPMSCapableReq);
 
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.capable = DPMSCapableFlag;
+
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
     }
@@ -88,17 +89,17 @@ static int
 ProcDPMSGetTimeouts(ClientPtr client)
 {
     /* REQUEST(xDPMSGetTimeoutsReq); */
-    xDPMSGetTimeoutsReply rep = {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .standby = DPMSStandbyTime / MILLI_PER_SECOND,
-        .suspend = DPMSSuspendTime / MILLI_PER_SECOND,
-        .off = DPMSOffTime / MILLI_PER_SECOND
-    };
+    xDPMSGetTimeoutsReply rep;
 
     REQUEST_SIZE_MATCH(xDPMSGetTimeoutsReq);
 
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.standby = DPMSStandbyTime / MILLI_PER_SECOND;
+    rep.suspend = DPMSSuspendTime / MILLI_PER_SECOND;
+    rep.off = DPMSOffTime / MILLI_PER_SECOND;
+
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swaps(&rep.standby);
@@ -189,16 +190,16 @@ static int
 ProcDPMSInfo(ClientPtr client)
 {
     /* REQUEST(xDPMSInfoReq); */
-    xDPMSInfoReply rep = {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .power_level = DPMSPowerLevel,
-        .state = DPMSEnabled
-    };
+    xDPMSInfoReply rep;
 
     REQUEST_SIZE_MATCH(xDPMSInfoReq);
 
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.power_level = DPMSPowerLevel;
+    rep.state = DPMSEnabled;
+
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swaps(&rep.power_level);
diff --git a/xorg-server/Xext/geext.c b/xorg-server/Xext/geext.c
index 1e5ae6f82..f96b76468 100644
--- a/xorg-server/Xext/geext.c
+++ b/xorg-server/Xext/geext.c
@@ -64,16 +64,14 @@ ProcGEQueryVersion(ClientPtr client)
 
     REQUEST_SIZE_MATCH(xGEQueryVersionReq);
 
-    rep = (xGEQueryVersionReply) {
-        .repType = X_Reply,
-        .RepType = X_GEQueryVersion,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-
-        /* return the supported version by the server */
-        .majorVersion = SERVER_GE_MAJOR_VERSION,
-        .minorVersion = SERVER_GE_MINOR_VERSION
-    };
+    rep.repType = X_Reply;
+    rep.RepType = X_GEQueryVersion;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+
+    /* return the supported version by the server */
+    rep.majorVersion = SERVER_GE_MAJOR_VERSION;
+    rep.minorVersion = SERVER_GE_MINOR_VERSION;
 
     /* Remember version the client requested */
     pGEClient->major_version = stuff->majorVersion;
diff --git a/xorg-server/Xext/hashtable.c b/xorg-server/Xext/hashtable.c
index 9d9ef8949..e362ad12f 100644
--- a/xorg-server/Xext/hashtable.c
+++ b/xorg-server/Xext/hashtable.c
@@ -72,7 +72,7 @@ void
 ht_destroy(HashTable ht)
 {
     int c;
-    BucketPtr it, tmp;
+    BucketPtr it=NULL, tmp;
     int numBuckets = 1 << ht->bucketBits;
     for (c = 0; c < numBuckets; ++c) {
         xorg_list_for_each_entry_safe(it, tmp, &ht->buckets[c], l) {
@@ -99,7 +99,7 @@ double_size(HashTable ht)
         }
 
         for (c = 0; c < numBuckets; ++c) {
-            BucketPtr it, tmp;
+            BucketPtr it=NULL, tmp;
             xorg_list_for_each_entry_safe(it, tmp, &ht->buckets[c], l) {
                 struct xorg_list *newBucket =
                     &newBuckets[ht->hash(ht->cdata, it->key, newBucketBits)];
@@ -168,7 +168,7 @@ ht_remove(HashTable ht, pointer key)
 {
     unsigned index = ht->hash(ht->cdata, key, ht->bucketBits);
     struct xorg_list *bucket = &ht->buckets[index];
-    BucketPtr it;
+    BucketPtr it=NULL;
 
     xorg_list_for_each_entry(it, bucket, l) {
         if (ht->compare(ht->cdata, key, it->key) == 0) {
@@ -187,7 +187,7 @@ ht_find(HashTable ht, pointer key)
 {
     unsigned index = ht->hash(ht->cdata, key, ht->bucketBits);
     struct xorg_list *bucket = &ht->buckets[index];
-    BucketPtr it;
+    BucketPtr it=NULL;
 
     xorg_list_for_each_entry(it, bucket, l) {
         if (ht->compare(ht->cdata, key, it->key) == 0) {
@@ -204,7 +204,7 @@ ht_dump_distribution(HashTable ht)
     int c;
     int numBuckets = 1 << ht->bucketBits;
     for (c = 0; c < numBuckets; ++c) {
-        BucketPtr it;
+        BucketPtr it=NULL;
         int n = 0;
 
         xorg_list_for_each_entry(it, &ht->buckets[c], l) {
@@ -277,7 +277,7 @@ ht_dump_contents(HashTable ht,
     int c;
     int numBuckets = 1 << ht->bucketBits;
     for (c = 0; c < numBuckets; ++c) {
-        BucketPtr it;
+        BucketPtr it=NULL;
         int n = 0;
 
         printf("%d: ", c);
diff --git a/xorg-server/Xext/panoramiX.c b/xorg-server/Xext/panoramiX.c
index be475f7f4..92437dde5 100644
--- a/xorg-server/Xext/panoramiX.c
+++ b/xorg-server/Xext/panoramiX.c
@@ -905,15 +905,14 @@ int
 ProcPanoramiXQueryVersion(ClientPtr client)
 {
     /* REQUEST(xPanoramiXQueryVersionReq); */
-    xPanoramiXQueryVersionReply rep = {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .majorVersion = SERVER_PANORAMIX_MAJOR_VERSION,
-        .minorVersion = SERVER_PANORAMIX_MINOR_VERSION
-    };
+    xPanoramiXQueryVersionReply rep;
 
     REQUEST_SIZE_MATCH(xPanoramiXQueryVersionReq);
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.majorVersion = SERVER_PANORAMIX_MAJOR_VERSION;
+    rep.minorVersion = SERVER_PANORAMIX_MINOR_VERSION;
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swapl(&rep.length);
@@ -937,13 +936,12 @@ ProcPanoramiXGetState(ClientPtr client)
     if (rc != Success)
         return rc;
 
-    rep = (xPanoramiXGetStateReply) {
-        .type = X_Reply,
-        .state = !noPanoramiXExtension,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .window = stuff->window
-    };
+
+    rep.type = X_Reply;
+    rep.state = !noPanoramiXExtension;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.window = stuff->window;
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swapl(&rep.length);
@@ -967,13 +965,12 @@ ProcPanoramiXGetScreenCount(ClientPtr client)
     if (rc != Success)
         return rc;
 
-    rep = (xPanoramiXGetScreenCountReply) {
-        .type = X_Reply,
-        .ScreenCount = PanoramiXNumScreens,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .window = stuff->window
-    };
+
+    rep.type = X_Reply;
+    rep.ScreenCount = PanoramiXNumScreens;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.window = stuff->window;
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swapl(&rep.length);
@@ -999,16 +996,15 @@ ProcPanoramiXGetScreenSize(ClientPtr client)
     if (rc != Success)
         return rc;
 
-    rep = (xPanoramiXGetScreenSizeReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0,
+
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
     /* screen dimensions */
-        .width = screenInfo.screens[stuff->screen]->width,
-        .height = screenInfo.screens[stuff->screen]->height,
-        .window = stuff->window,
-        .screen = stuff->screen
-    };
+    rep.width = screenInfo.screens[stuff->screen]->width;
+    rep.height = screenInfo.screens[stuff->screen]->height;
+    rep.window = stuff->window;
+    rep.screen = stuff->screen;
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swapl(&rep.length);
@@ -1029,18 +1025,17 @@ ProcXineramaIsActive(ClientPtr client)
 
     REQUEST_SIZE_MATCH(xXineramaIsActiveReq);
 
-    rep = (xXineramaIsActiveReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0,
+
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
 #if 1
         /* The following hack fools clients into thinking that Xinerama
          * is disabled even though it is not. */
-        .state = !noPanoramiXExtension && !PanoramiXExtensionDisabledHack
+    rep.state = !noPanoramiXExtension && !PanoramiXExtensionDisabledHack;
 #else
-        .state = !noPanoramiXExtension;
+    rep.state = !noPanoramiXExtension;
 #endif
-    };
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swapl(&rep.length);
@@ -1055,15 +1050,14 @@ ProcXineramaQueryScreens(ClientPtr client)
 {
     /* REQUEST(xXineramaQueryScreensReq); */
     CARD32 number = (noPanoramiXExtension) ? 0 : PanoramiXNumScreens;
-    xXineramaQueryScreensReply rep = {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = bytes_to_int32(number * sz_XineramaScreenInfo),
-        .number = number
-    };
+    xXineramaQueryScreensReply rep;
 
     REQUEST_SIZE_MATCH(xXineramaQueryScreensReq);
 
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = bytes_to_int32(number * sz_XineramaScreenInfo);
+    rep.number = number;
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swapl(&rep.length);
diff --git a/xorg-server/Xext/panoramiXprocs.c b/xorg-server/Xext/panoramiXprocs.c
index 576844cbf..1a855fe08 100644
--- a/xorg-server/Xext/panoramiXprocs.c
+++ b/xorg-server/Xext/panoramiXprocs.c
@@ -566,18 +566,17 @@ PanoramiXGetGeometry(ClientPtr client)
     if (rc != Success)
         return rc;
 
-    rep = (xGetGeometryReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .root = screenInfo.screens[0]->root->drawable.id,
-        .depth = pDraw->depth,
-        .width = pDraw->width,
-        .height = pDraw->height,
-        .x = 0,
-        .y = 0,
-        .borderWidth = 0
-    };
+
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.root = screenInfo.screens[0]->root->drawable.id;
+    rep.depth = pDraw->depth;
+    rep.width = pDraw->width;
+    rep.height = pDraw->height;
+    rep.x = 0;
+    rep.y = 0;
+    rep.borderWidth = 0;
 
     if (stuff->id == rep.root) {
         xWindowRoot *root = (xWindowRoot *)
@@ -621,13 +620,12 @@ PanoramiXTranslateCoords(ClientPtr client)
     rc = dixLookupWindow(&pDst, stuff->dstWid, client, DixReadAccess);
     if (rc != Success)
         return rc;
-    rep = (xTranslateCoordsReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .sameScreen = xTrue,
-        .child = None
-    };
+
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.sameScreen = xTrue;
+    rep.child = None;
 
     if ((pWin == screenInfo.screens[0]->root) ||
         (pWin->drawable.id == screenInfo.screens[0]->screensaver.wid)) {
@@ -1960,12 +1958,12 @@ PanoramiXGetImage(ClientPtr client)
             return rc;
     }
 
-    xgi = (xGetImageReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .visual = wVisual(((WindowPtr) pDraw)),
-        .depth = pDraw->depth
-    };
+
+    xgi.type = X_Reply;
+    xgi.sequenceNumber = client->sequence;
+    xgi.visual = wVisual(((WindowPtr) pDraw));
+    xgi.depth = pDraw->depth;
+
     if (format == ZPixmap) {
         widthBytesLine = PixmapBytePad(w, pDraw->depth);
         length = widthBytesLine * h;
diff --git a/xorg-server/Xext/saver.c b/xorg-server/Xext/saver.c
index 8de043f8e..07f652a26 100644
--- a/xorg-server/Xext/saver.c
+++ b/xorg-server/Xext/saver.c
@@ -28,6 +28,12 @@ in this Software without prior written authorization from the X Consortium.
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#else
+#define SCREENSAVER
+#endif
+
+#ifdef CreateWindow
+#undef CreateWindow
 #endif
 
 #include <X11/X.h>
@@ -426,15 +432,14 @@ SendScreenSaverNotify(ScreenPtr pScreen, int state, Bool forced)
         kind = ScreenSaverInternal;
     for (pEv = pPriv->events; pEv; pEv = pEv->next) {
         if (pEv->mask & mask) {
-            xScreenSaverNotifyEvent ev = {
-                .type = ScreenSaverNotify + ScreenSaverEventBase,
-                .state = state,
-                .timestamp = currentTime.milliseconds,
-                .root = pScreen->root->drawable.id,
-                .window = pScreen->screensaver.wid,
-                .kind = kind,
-                .forced = forced
-            };
+            xScreenSaverNotifyEvent ev;
+            ev.type = ScreenSaverNotify + ScreenSaverEventBase;
+            ev.state = state;
+            ev.timestamp = currentTime.milliseconds;
+            ev.root = pScreen->root->drawable.id;
+            ev.window = pScreen->screensaver.wid;
+            ev.kind = kind;
+            ev.forced = forced;
             WriteEventsToClient(pEv->client, 1, (xEvent *) &ev);
         }
     }
@@ -637,16 +642,14 @@ ScreenSaverHandle(ScreenPtr pScreen, int xstate, Bool force)
 static int
 ProcScreenSaverQueryVersion(ClientPtr client)
 {
-    xScreenSaverQueryVersionReply rep = {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .majorVersion = SERVER_SAVER_MAJOR_VERSION,
-        .minorVersion = SERVER_SAVER_MINOR_VERSION
-    };
+    xScreenSaverQueryVersionReply rep;
 
     REQUEST_SIZE_MATCH(xScreenSaverQueryVersionReq);
-
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+    rep.majorVersion = SERVER_SAVER_MAJOR_VERSION;
+    rep.minorVersion = SERVER_SAVER_MINOR_VERSION;
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swapl(&rep.length);
@@ -682,12 +685,12 @@ ProcScreenSaverQueryInfo(ClientPtr client)
     UpdateCurrentTime();
     lastInput = GetTimeInMillis() - lastDeviceEventTime[XIAllDevices].milliseconds;
 
-    rep = (xScreenSaverQueryInfoReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .window = pSaver->wid
-    };
+
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.window = pSaver->wid;
+
     if (screenIsSaved != SCREEN_SAVER_OFF) {
         rep.state = ScreenSaverOn;
         if (ScreenSaverTime)
diff --git a/xorg-server/Xext/security.c b/xorg-server/Xext/security.c
index 6cc9aa044..8a82806e9 100644
--- a/xorg-server/Xext/security.c
+++ b/xorg-server/Xext/security.c
@@ -26,6 +26,8 @@ in this Software without prior written authorization from The Open Group.
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#else
+#define XACE
 #endif
 
 #include "scrnintstr.h"
@@ -192,10 +194,10 @@ SecurityDeleteAuthorization(pointer value, XID id)
 
     while ((pEventClient = pAuth->eventClients)) {
         /* send revocation event event */
-        xSecurityAuthorizationRevokedEvent are = {
-            .type = SecurityEventBase + XSecurityAuthorizationRevoked,
-            .authId = pAuth->id
-        };
+        xSecurityAuthorizationRevokedEvent are;
+        are.type = SecurityEventBase + XSecurityAuthorizationRevoked;
+        are.authId = pAuth->id;
+
         WriteEventsToClient(rClient(pEventClient), 1, (xEvent *) &are);
         FreeResource(pEventClient->resource, RT_NONE);
     }
@@ -338,16 +340,14 @@ static int
 ProcSecurityQueryVersion(ClientPtr client)
 {
     /* REQUEST(xSecurityQueryVersionReq); */
-    xSecurityQueryVersionReply rep = {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .majorVersion = SERVER_SECURITY_MAJOR_VERSION,
-        .minorVersion = SERVER_SECURITY_MINOR_VERSION
-    };
+    xSecurityQueryVersionReply rep;
 
     REQUEST_SIZE_MATCH(xSecurityQueryVersionReq);
-
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.majorVersion = SERVER_SECURITY_MAJOR_VERSION;
+    rep.minorVersion = SERVER_SECURITY_MINOR_VERSION;
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swaps(&rep.majorVersion);
@@ -529,13 +529,12 @@ ProcSecurityGenerateAuthorization(ClientPtr client)
 
     /* tell client the auth id and data */
 
-    rep = (xSecurityGenerateAuthorizationReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = bytes_to_int32(authdata_len),
-        .authId = authId,
-        .dataLength = authdata_len
-    };
+
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = bytes_to_int32(authdata_len);
+    rep.authId = authId;
+    rep.dataLength = authdata_len;
 
     if (client->swapped) {
         swapl(&rep.length);
diff --git a/xorg-server/Xext/securitysrv.h b/xorg-server/Xext/securitysrv.h
index 8904242d6..3ae711d11 100644
--- a/xorg-server/Xext/securitysrv.h
+++ b/xorg-server/Xext/securitysrv.h
@@ -31,10 +31,6 @@ from The Open Group.
 #define _SECURITY_SRV_H
 
 /* Allow client side portions of <X11/extensions/security.h> to compile */
-#ifndef Status
-#define Status int
-#define NEED_UNDEF_Status
-#endif
 #ifndef Display
 #define Display void
 #define NEED_UNDEF_Display
diff --git a/xorg-server/Xext/shape.c b/xorg-server/Xext/shape.c
index d36867cc8..dfe6fe70b 100644
--- a/xorg-server/Xext/shape.c
+++ b/xorg-server/Xext/shape.c
@@ -26,6 +26,8 @@ in this Software without prior written authorization from The Open Group.
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#else
+#define SHAPE
 #endif
 
 #include <stdlib.h>
@@ -204,16 +206,15 @@ CreateClipShape(WindowPtr pWin)
 static int
 ProcShapeQueryVersion(ClientPtr client)
 {
-    xShapeQueryVersionReply rep = {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .majorVersion = SERVER_SHAPE_MAJOR_VERSION,
-        .minorVersion = SERVER_SHAPE_MINOR_VERSION
-    };
+    xShapeQueryVersionReply rep;
 
     REQUEST_SIZE_MATCH(xShapeQueryVersionReq);
-
+    memset(&rep, 0, sizeof(xShapeQueryVersionReply));
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.majorVersion = SERVER_SHAPE_MAJOR_VERSION;
+    rep.minorVersion = SERVER_SHAPE_MINOR_VERSION;
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swapl(&rep.length);
@@ -632,13 +633,12 @@ ProcShapeQueryExtents(ClientPtr client)
     rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
     if (rc != Success)
         return rc;
-    rep = (xShapeQueryExtentsReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .boundingShaped = (wBoundingShape(pWin) != 0),
-        .clipShaped = (wClipShape(pWin) != 0)
-    };
+    memset(&rep, 0, sizeof(xShapeQueryExtentsReply));
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.boundingShaped = (wBoundingShape(pWin) != 0);
+    rep.clipShaped = (wClipShape(pWin) != 0);
     if ((region = wBoundingShape(pWin))) {
         /* this is done in two steps because of a compiler bug on SunOS 4.1.3 */
         pExtents = RegionExtents(region);
@@ -882,17 +882,16 @@ SendShapeNotify(WindowPtr pWin, int which)
         return;
     }
     for (pShapeEvent = *pHead; pShapeEvent; pShapeEvent = pShapeEvent->next) {
-        xShapeNotifyEvent se = {
-            .type = ShapeNotify + ShapeEventBase,
-            .kind = which,
-            .window = pWin->drawable.id,
-            .x = extents.x1,
-            .y = extents.y1,
-            .width = extents.x2 - extents.x1,
-            .height = extents.y2 - extents.y1,
-            .time = currentTime.milliseconds,
-            .shaped = shaped
-        };
+        xShapeNotifyEvent se;
+        se.type = ShapeNotify + ShapeEventBase;
+        se.kind = which;
+        se.window = pWin->drawable.id;
+        se.x = extents.x1;
+        se.y = extents.y1;
+        se.width = extents.x2 - extents.x1;
+        se.height = extents.y2 - extents.y1;
+        se.time = currentTime.milliseconds;
+        se.shaped = shaped;
         WriteEventsToClient(pShapeEvent->client, 1, (xEvent *) &se);
     }
 }
@@ -923,12 +922,12 @@ ProcShapeInputSelected(ClientPtr client)
             }
         }
     }
-    rep = (xShapeInputSelectedReply) {
-        .type = X_Reply,
-        .enabled = enabled,
-        .sequenceNumber = client->sequence,
-        .length = 0
-    };
+
+    rep.type = X_Reply;
+    rep.enabled = enabled;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swapl(&rep.length);
@@ -1006,13 +1005,13 @@ ProcShapeGetRectangles(ClientPtr client)
             rects[i].height = box->y2 - box->y1;
         }
     }
-    rep = (xShapeGetRectanglesReply) {
-        .type = X_Reply,
-        .ordering = YXBanded,
-        .sequenceNumber = client->sequence,
-        .length = bytes_to_int32(nrects * sizeof(xRectangle)),
-        .nrects = nrects
-    };
+
+    rep.type = X_Reply;
+    rep.ordering = YXBanded;
+    rep.sequenceNumber = client->sequence;
+    rep.length = bytes_to_int32(nrects * sizeof(xRectangle));
+    rep.nrects = nrects;
+
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swapl(&rep.length);
diff --git a/xorg-server/Xext/shm.c b/xorg-server/Xext/shm.c
index 55960907b..37c1ed88f 100644
--- a/xorg-server/Xext/shm.c
+++ b/xorg-server/Xext/shm.c
@@ -33,8 +33,10 @@ in this Software without prior written authorization from The Open Group.
 #endif
 
 #include <sys/types.h>
+#if !defined(_MSC_VER)
 #include <sys/ipc.h>
 #include <sys/shm.h>
+#endif
 #include <unistd.h>
 #include <sys/stat.h>
 #include <X11/X.h>
@@ -299,6 +301,8 @@ ProcShmQueryVersion(ClientPtr client)
 
     REQUEST_SIZE_MATCH(xShmQueryVersionReq);
 
+#ifndef _MSC_VER
+#endif
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swapl(&rep.length);
@@ -348,6 +352,9 @@ shm_access(ClientPtr client, SHMPERM_TYPE * perm, int readonly)
             if (uid == 0) {
                 return 0;
             }
+            #ifdef _MSC_VER
+            __asm int 3;
+            #else
             /* Check the owner */
             if (SHMPERM_UID(perm) == uid || SHMPERM_CUID(perm) == uid) {
                 mask = S_IRUSR;
@@ -356,10 +363,14 @@ shm_access(ClientPtr client, SHMPERM_TYPE * perm, int readonly)
                 }
                 return (SHMPERM_MODE(perm) & mask) == mask ? 0 : -1;
             }
+            #endif
         }
 
         if (gidset) {
             /* Check the group */
+            #ifdef _MSC_VER
+            __asm int 3;
+            #else
             if (SHMPERM_GID(perm) == gid || SHMPERM_CGID(perm) == gid) {
                 mask = S_IRGRP;
                 if (!readonly) {
@@ -367,14 +378,20 @@ shm_access(ClientPtr client, SHMPERM_TYPE * perm, int readonly)
                 }
                 return (SHMPERM_MODE(perm) & mask) == mask ? 0 : -1;
             }
+            #endif
         }
     }
+            #ifdef _MSC_VER
+            __asm int 3;
+            return -1;
+            #else
     /* Otherwise, check everyone else */
     mask = S_IROTH;
     if (!readonly) {
         mask |= S_IWOTH;
     }
     return (SHMPERM_MODE(perm) & mask) == mask ? 0 : -1;
+    #endif
 }
 
 static int
@@ -440,7 +457,9 @@ ShmDetachSegment(pointer value, /* must conform to DeleteType */
 
     if (--shmdesc->refcnt)
         return TRUE;
+#ifndef _MSC_VER
     shmdt(shmdesc->addr);
+#endif
     for (prev = &Shmsegs; *prev != shmdesc; prev = &(*prev)->next);
     *prev = shmdesc->next;
     free(shmdesc);
diff --git a/xorg-server/Xext/sync.c b/xorg-server/Xext/sync.c
index 4d11992bb..3c9090e66 100644
--- a/xorg-server/Xext/sync.c
+++ b/xorg-server/Xext/sync.c
@@ -437,16 +437,9 @@ SyncSendAlarmNotifyEvents(SyncAlarm * pAlarm)
 
     UpdateCurrentTime();
 
-    ane = (xSyncAlarmNotifyEvent) {
-        .type = SyncEventBase + XSyncAlarmNotify,
-        .kind = XSyncAlarmNotify,
-        .alarm = pAlarm->alarm_id,
-        .alarm_value_hi = XSyncValueHigh32(pTrigger->test_value),
-        .alarm_value_lo = XSyncValueLow32(pTrigger->test_value),
-        .time = currentTime.milliseconds,
-        .state = pAlarm->state
-    };
-
+    ane.type = SyncEventBase + XSyncAlarmNotify;
+    ane.kind = XSyncAlarmNotify;
+    ane.alarm = pAlarm->alarm_id;
     if (pTrigger->pSync && SYNC_COUNTER == pTrigger->pSync->type) {
         ane.counter_value_hi = XSyncValueHigh32(pCounter->value);
         ane.counter_value_lo = XSyncValueLow32(pCounter->value);
@@ -456,6 +449,11 @@ SyncSendAlarmNotifyEvents(SyncAlarm * pAlarm)
         ane.counter_value_hi = ane.counter_value_lo = 0;
     }
 
+    ane.alarm_value_hi = XSyncValueHigh32(pTrigger->test_value);
+    ane.alarm_value_lo = XSyncValueLow32(pTrigger->test_value);
+    ane.time = currentTime.milliseconds;
+    ane.state = pAlarm->state;
+
     /* send to owner */
     if (pAlarm->events)
         WriteEventsToClient(pAlarm->client, 1, (xEvent *) &ane);
@@ -1157,6 +1155,10 @@ FreeAwait(void *addr, XID id)
     return Success;
 }
 
+#ifdef _MSC_VER
+#pragma warning(disable:4715) /* Not all control paths return a value */
+#endif
+
 /* loosely based on dix/events.c/OtherClientGone */
 static int
 FreeAlarmClient(void *value, XID id)
@@ -1188,16 +1190,17 @@ FreeAlarmClient(void *value, XID id)
 static int
 ProcSyncInitialize(ClientPtr client)
 {
-    xSyncInitializeReply rep = {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .majorVersion = SERVER_SYNC_MAJOR_VERSION,
-        .minorVersion = SERVER_SYNC_MINOR_VERSION,
-    };
+    xSyncInitializeReply rep;
 
     REQUEST_SIZE_MATCH(xSyncInitializeReq);
 
+    memset(&rep, 0, sizeof(xSyncInitializeReply));
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.majorVersion = SERVER_SYNC_MAJOR_VERSION;
+    rep.minorVersion = SERVER_SYNC_MINOR_VERSION;
+    rep.length = 0;
+
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
     }
@@ -1211,17 +1214,17 @@ ProcSyncInitialize(ClientPtr client)
 static int
 ProcSyncListSystemCounters(ClientPtr client)
 {
-    xSyncListSystemCountersReply rep = {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .nCounters = 0,
-    };
-    SysCounterInfo *psci;
+    xSyncListSystemCountersReply rep;
+    SysCounterInfo *psci=NULL;
     int len = 0;
     xSyncSystemCounter *list = NULL, *walklist = NULL;
 
     REQUEST_SIZE_MATCH(xSyncListSystemCountersReq);
 
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.nCounters = 0;
+
     xorg_list_for_each_entry(psci, &SysCounterList, entry) {
         /* pad to 4 byte boundary */
         len += pad_to_int32(sz_xSyncSystemCounter + strlen(psci->name));
@@ -1331,12 +1334,11 @@ ProcSyncGetPriority(ClientPtr client)
             return rc;
     }
 
-    rep = (xSyncGetPriorityReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .priority = priorityclient->priority
-    };
+
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.priority = priorityclient->priority;
 
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
@@ -1616,13 +1618,12 @@ ProcSyncQueryCounter(ClientPtr client)
                                                   &pCounter->value);
     }
 
-    rep = (xSyncQueryCounterReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .value_hi = XSyncValueHigh32(pCounter->value),
-        .value_lo = XSyncValueLow32(pCounter->value)
-    };
+
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.value_hi = XSyncValueHigh32(pCounter->value);
+    rep.value_lo = XSyncValueLow32(pCounter->value);
 
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
@@ -1778,32 +1779,31 @@ ProcSyncQueryAlarm(ClientPtr client)
         return rc;
 
     pTrigger = &pAlarm->trigger;
-    rep = (xSyncQueryAlarmReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length =
-          bytes_to_int32(sizeof(xSyncQueryAlarmReply) - sizeof(xGenericReply)),
-        .counter = (pTrigger->pSync) ? pTrigger->pSync->id : None,
+
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length =
+          bytes_to_int32(sizeof(xSyncQueryAlarmReply) - sizeof(xGenericReply));
+    rep.counter = (pTrigger->pSync) ? pTrigger->pSync->id : None;
 
 #if 0  /* XXX unclear what to do, depends on whether relative value-types
         * are "consumed" immediately and are considered absolute from then
         * on.
         */
-        .value_type = pTrigger->value_type,
-        .wait_value_hi = XSyncValueHigh32(pTrigger->wait_value),
-        .wait_value_lo = XSyncValueLow32(pTrigger->wait_value),
+    rep.value_type = pTrigger->value_type;
+    rep.wait_value_hi = XSyncValueHigh32(pTrigger->wait_value);
+    rep.wait_value_lo = XSyncValueLow32(pTrigger->wait_value);
 #else
-        .value_type = XSyncAbsolute,
-        .wait_value_hi = XSyncValueHigh32(pTrigger->test_value),
-        .wait_value_lo = XSyncValueLow32(pTrigger->test_value),
+    rep.value_type = XSyncAbsolute;
+    rep.wait_value_hi = XSyncValueHigh32(pTrigger->test_value);
+    rep.wait_value_lo = XSyncValueLow32(pTrigger->test_value);
 #endif
 
-        .test_type = pTrigger->test_type,
-        .delta_hi = XSyncValueHigh32(pAlarm->delta),
-        .delta_lo = XSyncValueLow32(pAlarm->delta),
-        .events = pAlarm->events,
-        .state = pAlarm->state
-    };
+    rep.test_type = pTrigger->test_type;
+    rep.delta_hi = XSyncValueHigh32(pAlarm->delta);
+    rep.delta_lo = XSyncValueLow32(pAlarm->delta);
+    rep.events = pAlarm->events;
+    rep.state = pAlarm->state;
 
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
@@ -1962,13 +1962,12 @@ ProcSyncQueryFence(ClientPtr client)
     if (rc != Success)
         return rc;
 
-    rep = (xSyncQueryFenceReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0,
 
-        .triggered = pFence->funcs.CheckTriggered(pFence)
-    };
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+
+    rep.triggered = pFence->funcs.CheckTriggered(pFence);
 
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
diff --git a/xorg-server/Xext/xace.c b/xorg-server/Xext/xace.c
index 026d3c5cf..2bfe5ecf4 100644
--- a/xorg-server/Xext/xace.c
+++ b/xorg-server/Xext/xace.c
@@ -19,6 +19,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#else
+#define XACE
 #endif
 
 #include <stdarg.h>
diff --git a/xorg-server/Xext/xcmisc.c b/xorg-server/Xext/xcmisc.c
index 034bfb63b..a48f61282 100644
--- a/xorg-server/Xext/xcmisc.c
+++ b/xorg-server/Xext/xcmisc.c
@@ -45,16 +45,14 @@ from The Open Group.
 static int
 ProcXCMiscGetVersion(ClientPtr client)
 {
-    xXCMiscGetVersionReply rep = {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .majorVersion = XCMiscMajorVersion,
-        .minorVersion = XCMiscMinorVersion
-    };
+    xXCMiscGetVersionReply rep;
 
     REQUEST_SIZE_MATCH(xXCMiscGetVersionReq);
-
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.majorVersion = XCMiscMajorVersion;
+    rep.minorVersion = XCMiscMinorVersion;
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swaps(&rep.majorVersion);
@@ -72,13 +70,12 @@ ProcXCMiscGetXIDRange(ClientPtr client)
 
     REQUEST_SIZE_MATCH(xXCMiscGetXIDRangeReq);
     GetXIDRange(client->index, FALSE, &min_id, &max_id);
-    rep = (xXCMiscGetXIDRangeReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .start_id = min_id,
-        .count = max_id - min_id + 1
-    };
+
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.start_id = min_id;
+    rep.count = max_id - min_id + 1;
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swapl(&rep.start_id);
@@ -106,12 +103,11 @@ ProcXCMiscGetXIDList(ClientPtr client)
         return BadAlloc;
     }
     count = GetXIDList(client, stuff->count, pids);
-    rep = (xXCMiscGetXIDListReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = count,
-        .count = count
-    };
+
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = count;
+    rep.count = count;
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swapl(&rep.length);
diff --git a/xorg-server/Xext/xf86bigfont.c b/xorg-server/Xext/xf86bigfont.c
index 46b3242d1..5877a7174 100644
--- a/xorg-server/Xext/xf86bigfont.c
+++ b/xorg-server/Xext/xf86bigfont.c
@@ -278,23 +278,28 @@ ProcXF86BigfontQueryVersion(ClientPtr client)
     xXF86BigfontQueryVersionReply reply;
 
     REQUEST_SIZE_MATCH(xXF86BigfontQueryVersionReq);
-    reply = (xXF86BigfontQueryVersionReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .majorVersion = SERVER_XF86BIGFONT_MAJOR_VERSION,
-        .minorVersion = SERVER_XF86BIGFONT_MINOR_VERSION,
-        .uid = geteuid(),
-        .gid = getegid(),
+
+    reply.type = X_Reply;
+    reply.sequenceNumber = client->sequence;
+    reply.length = 0;
+    reply.majorVersion = SERVER_XF86BIGFONT_MAJOR_VERSION;
+    reply.minorVersion = SERVER_XF86BIGFONT_MINOR_VERSION;
+    #ifdef WIN32
+    reply.uid = 0;
+    reply.gid = 0;
+    #else
+    reply.uid = geteuid();
+    reply.gid = getegid();
+    #endif
 #ifdef HAS_SHM
-        .signature = signature,
-        .capabilities = (client->local && !client->swapped)
+    reply.signature = signature;
+    reply.capabilities = (client->local && !client->swapped)
                          ? XF86Bigfont_CAP_LocalShm : 0
 #else
-        .signature = 0,
-        .capabilities = 0
+    reply.signature = 0;        /* This is redundant. Avoids uninitialized memory. */
+    reply.capabilities = 0;
 #endif
-    };
+    
     if (client->swapped) {
         swaps(&reply.sequenceNumber);
         swapl(&reply.length);
diff --git a/xorg-server/Xext/xres.c b/xorg-server/Xext/xres.c
index 445abcab8..cac2e12ab 100644
--- a/xorg-server/Xext/xres.c
+++ b/xorg-server/Xext/xres.c
@@ -120,7 +120,7 @@ AddFragment(struct xorg_list *frags, int bytes)
 static void
 WriteFragmentsToClient(ClientPtr client, struct xorg_list *frags)
 {
-    FragmentList *it;
+    FragmentList *it=NULL;
     xorg_list_for_each_entry(it, frags, l) {
         WriteToClient(client, it->bytes, (char*) it + sizeof(*it));
     }
@@ -133,7 +133,7 @@ WriteFragmentsToClient(ClientPtr client, struct xorg_list *frags)
 static void
 DestroyFragments(struct xorg_list *frags)
 {
-    FragmentList *it, *tmp;
+    FragmentList *it=NULL, *tmp;
     xorg_list_for_each_entry_safe(it, tmp, frags, l) {
         xorg_list_del(&it->l);
         free(it);
@@ -194,16 +194,15 @@ static int
 ProcXResQueryVersion(ClientPtr client)
 {
     REQUEST(xXResQueryVersionReq);
-    xXResQueryVersionReply rep = {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .server_major = SERVER_XRES_MAJOR_VERSION,
-        .server_minor = SERVER_XRES_MINOR_VERSION
-    };
+    xXResQueryVersionReply rep;
 
     REQUEST_SIZE_MATCH(xXResQueryVersionReq);
 
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.server_major = SERVER_XRES_MAJOR_VERSION;
+    rep.server_minor = SERVER_XRES_MINOR_VERSION;
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swapl(&rep.length);
@@ -234,12 +233,11 @@ ProcXResQueryClients(ClientPtr client)
         }
     }
 
-    rep = (xXResQueryClientsReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = bytes_to_int32(num_clients * sz_xXResClient),
-        .num_clients = num_clients
-    };
+
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = bytes_to_int32(num_clients * sz_xXResClient);
+    rep.num_clients = num_clients;
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swapl(&rep.length);
@@ -303,12 +301,11 @@ ProcXResQueryClientResources(ClientPtr client)
             num_types++;
     }
 
-    rep = (xXResQueryClientResourcesReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = bytes_to_int32(num_types * sz_xXResType),
-        .num_types = num_types
-    };
+
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = bytes_to_int32(num_types * sz_xXResType);
+    rep.num_types = num_types;
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swapl(&rep.length);
@@ -475,17 +472,16 @@ ProcXResQueryClientPixmapBytes(ClientPtr client)
                               (pointer)(&bytes));
 #endif
 
-    rep = (xXResQueryClientPixmapBytesReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .bytes = bytes,
+
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.bytes = bytes;
 #ifdef _XSERVER64
-        .bytes_overflow = bytes >> 32
+    rep.bytes_overflow = bytes >> 32;
 #else
-        .bytes_overflow = 0
+    rep.bytes_overflow = 0;
 #endif
-    };
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swapl(&rep.length);
@@ -670,12 +666,11 @@ ProcXResQueryClientIds (ClientPtr client)
     rc = ConstructClientIds(client, stuff->numSpecs, specs, &ctx);
 
     if (rc == Success) {
-        xXResQueryClientIdsReply  rep = {
-            .type = X_Reply,
-            .sequenceNumber = client->sequence,
-            .length = bytes_to_int32(ctx.resultBytes),
-            .numIds = ctx.numIds
-        };
+        xXResQueryClientIdsReply  rep;
+        rep.type = X_Reply;
+        rep.sequenceNumber = client->sequence;
+        rep.length = bytes_to_int32(ctx.resultBytes);
+        rep.numIds = ctx.numIds;
 
         assert((ctx.resultBytes & 3) == 0);
 
@@ -827,7 +822,7 @@ AddResourceSizeValue(pointer ptr, XID id, RESTYPE type, pointer cdata)
         Bool ok = TRUE;
         HashTable ht;
         HtGenericHashSetupRec htSetup = {
-            .keySize = sizeof(void*)
+            /*.keySize = */sizeof(void*)
         };
 
         /* it doesn't matter that we don't undo the work done here
@@ -1053,12 +1048,11 @@ ProcXResQueryResourceBytes (ClientPtr client)
     rc = ConstructResourceBytes(stuff->client, &ctx);
 
     if (rc == Success) {
-        xXResQueryResourceBytesReply rep = {
-            .type = X_Reply,
-            .sequenceNumber = client->sequence,
-            .length = bytes_to_int32(ctx.resultBytes),
-            .numSizes = ctx.numSizes
-        };
+        xXResQueryResourceBytesReply rep;
+        rep.type = X_Reply;
+        rep.sequenceNumber = client->sequence;
+        rep.length = bytes_to_int32(ctx.resultBytes);
+        rep.numSizes = ctx.numSizes;
 
         if (client->swapped) {
             swaps (&rep.sequenceNumber);
diff --git a/xorg-server/Xext/xtest.c b/xorg-server/Xext/xtest.c
index 2abdc7f58..e7f94d3d9 100644
--- a/xorg-server/Xext/xtest.c
+++ b/xorg-server/Xext/xtest.c
@@ -86,16 +86,14 @@ static int XTestSwapFakeInput(ClientPtr /* client */ ,
 static int
 ProcXTestGetVersion(ClientPtr client)
 {
-    xXTestGetVersionReply rep = {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .majorVersion = XTestMajorVersion,
-        .minorVersion = XTestMinorVersion
-    };
+    xXTestGetVersionReply rep;
 
     REQUEST_SIZE_MATCH(xXTestGetVersionReq);
-
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.majorVersion = XTestMajorVersion;
+    rep.minorVersion = XTestMinorVersion;
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swaps(&rep.minorVersion);
@@ -134,12 +132,11 @@ ProcXTestCompareCursor(ClientPtr client)
             return rc;
         }
     }
-    rep = (xXTestCompareCursorReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .same = (wCursor(pWin) == pCursor)
-    };
+
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.same = (wCursor(pWin) == pCursor);
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
     }
diff --git a/xorg-server/Xext/xvmain.c b/xorg-server/Xext/xvmain.c
index c2860b86a..e0708b352 100644
--- a/xorg-server/Xext/xvmain.c
+++ b/xorg-server/Xext/xvmain.c
@@ -271,7 +271,7 @@ XvScreenInit(ScreenPtr pScreen)
 
     /* ALLOCATE SCREEN PRIVATE RECORD */
 
-    pxvs = malloc(sizeof(XvScreenRec));
+    pxvs = calloc(1,sizeof(XvScreenRec));
     if (!pxvs) {
         ErrorF("XvScreenInit: Unable to allocate screen private structure\n");
         return BadAlloc;
@@ -302,7 +302,7 @@ XvCloseScreen(ScreenPtr pScreen)
     pScreen->DestroyWindow = pxvs->DestroyWindow;
     pScreen->CloseScreen = pxvs->CloseScreen;
 
-    (*pxvs->ddCloseScreen) (pScreen);
+    if (pxvs->ddCloseScreen) (*pxvs->ddCloseScreen) (pScreen);
 
     free(pxvs);
 
diff --git a/xorg-server/Xi/chgdctl.c b/xorg-server/Xi/chgdctl.c
index 31d3a57f3..84aa1c4df 100644
--- a/xorg-server/Xi/chgdctl.c
+++ b/xorg-server/Xi/chgdctl.c
@@ -122,13 +122,12 @@ ProcXChangeDeviceControl(ClientPtr client)
     if (ret != Success)
         goto out;
 
-    rep = (xChangeDeviceControlReply) {
-        .repType = X_Reply,
-        .RepType = X_ChangeDeviceControl,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .status = Success,
-    };
+
+    rep.repType = X_Reply;
+    rep.RepType = X_ChangeDeviceControl;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.status = Success;
 
     switch (stuff->control) {
     case DEVICE_RESOLUTION:
@@ -214,13 +213,12 @@ ProcXChangeDeviceControl(ClientPtr client)
 
  out:
     if (ret == Success) {
-        devicePresenceNotify dpn = {
-            .type = DevicePresenceNotify,
-            .time = currentTime.milliseconds,
-            .devchange = DeviceControlChanged,
-            .deviceid = dev->id,
-            .control = stuff->control
-        };
+        devicePresenceNotify dpn;
+        dpn.type = DevicePresenceNotify;
+        dpn.time = currentTime.milliseconds;
+        dpn.devchange = DeviceControlChanged;
+        dpn.deviceid = dev->id;
+        dpn.control = stuff->control;
         SendEventToAllWindows(dev, DevicePresenceNotifyMask,
                               (xEvent *) &dpn, 1);
 
diff --git a/xorg-server/Xi/exevents.c b/xorg-server/Xi/exevents.c
index 74f3610cc..2ff2471c5 100644
--- a/xorg-server/Xi/exevents.c
+++ b/xorg-server/Xi/exevents.c
@@ -80,6 +80,8 @@ SOFTWARE.
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#else
+#define XINPUT
 #endif
 
 #include "inputstr.h"
@@ -1019,7 +1021,7 @@ DeliverOneTouchEvent(ClientPtr client, DeviceIntPtr dev, TouchPointInfoPtr ti,
     err = EventToXI2(ev, &xi2);
     if (err != Success)
         FatalError("[Xi] %s: XI2 conversion failed in %s"
-                   " (%d)\n", dev->name, __func__, err);
+                   " (%d)\n", dev->name, __FUNCTION__, err);
 
     FixUpEventFromWindow(&ti->sprite, xi2, win, child, FALSE);
     filter = GetEventFilter(dev, xi2);
@@ -1651,7 +1653,7 @@ ProcessBarrierEvent(InternalEvent *e, DeviceIntPtr dev)
 
     rc = EventToXI2(e, &ev);
     if (rc != Success) {
-        ErrorF("[Xi] event conversion from %s failed with code %d\n", __func__, rc);
+        ErrorF("[Xi] event conversion from %s failed with code %d\n", __FUNCTION__, rc);
         return;
     }
 
@@ -1691,7 +1693,7 @@ ProcessDeviceEvent(InternalEvent *ev, DeviceIntPtr device)
     if (IsPointerDevice(device)) {
         kbd = GetMaster(device, KEYBOARD_OR_FLOAT);
         mouse = device;
-        if (!kbd->key)          /* can happen with floating SDs */
+        if (kbd && !kbd->key)          /* can happen with floating SDs */
             kbd = NULL;
     }
     else {
@@ -1721,6 +1723,8 @@ ProcessDeviceEvent(InternalEvent *ev, DeviceIntPtr device)
     case ET_KeyRelease:
     case ET_ProximityIn:
     case ET_ProximityOut:
+        if (!device->spriteInfo->sprite)
+          return;
         GetSpritePosition(device, &rootX, &rootY);
         event->root_x = rootX;
         event->root_y = rootY;
@@ -2507,6 +2511,10 @@ RecalculateDeviceDeliverableEvents(WindowPtr pWin)
     }
 }
 
+#ifdef _MSC_VER
+#pragma warning(disable:4715) /* Not all control paths return a value */
+#endif
+
 int
 InputClientGone(WindowPtr pWin, XID id)
 {
diff --git a/xorg-server/Xi/getbmap.c b/xorg-server/Xi/getbmap.c
index 49b868889..78adc6623 100644
--- a/xorg-server/Xi/getbmap.c
+++ b/xorg-server/Xi/getbmap.c
@@ -92,13 +92,12 @@ ProcXGetDeviceButtonMapping(ClientPtr client)
     REQUEST(xGetDeviceButtonMappingReq);
     REQUEST_SIZE_MATCH(xGetDeviceButtonMappingReq);
 
-    rep = (xGetDeviceButtonMappingReply) {
-        .repType = X_Reply,
-        .RepType = X_GetDeviceButtonMapping,
-        .sequenceNumber = client->sequence,
-        .nElts = 0,
-        .length = 0
-    };
+
+    rep.repType = X_Reply;
+    rep.RepType = X_GetDeviceButtonMapping;
+    rep.sequenceNumber = client->sequence;
+    rep.nElts = 0;
+    rep.length = 0;
 
     rc = dixLookupDevice(&dev, stuff->deviceid, client, DixGetAttrAccess);
     if (rc != Success)
diff --git a/xorg-server/Xi/getdctl.c b/xorg-server/Xi/getdctl.c
index 6f73e0979..39cde5174 100644
--- a/xorg-server/Xi/getdctl.c
+++ b/xorg-server/Xi/getdctl.c
@@ -182,12 +182,11 @@ ProcXGetDeviceControl(ClientPtr client)
     if (rc != Success)
         return rc;
 
-    rep = (xGetDeviceControlReply) {
-        .repType = X_Reply,
-        .RepType = X_GetDeviceControl,
-        .sequenceNumber = client->sequence,
-        .length = 0
-    };
+
+    rep.repType = X_Reply;
+    rep.RepType = X_GetDeviceControl;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
 
     switch (stuff->control) {
     case DEVICE_RESOLUTION:
diff --git a/xorg-server/Xi/getfctl.c b/xorg-server/Xi/getfctl.c
index 599b2ef97..e235e7c1f 100644
--- a/xorg-server/Xi/getfctl.c
+++ b/xorg-server/Xi/getfctl.c
@@ -295,13 +295,12 @@ ProcXGetFeedbackControl(ClientPtr client)
     if (rc != Success)
         return rc;
 
-    rep = (xGetFeedbackControlReply) {
-        .repType = X_Reply,
-        .RepType = X_GetFeedbackControl,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .num_feedbacks = 0
-    };
+
+    rep.repType = X_Reply;
+    rep.RepType = X_GetFeedbackControl;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.num_feedbacks = 0;
 
     for (k = dev->kbdfeed; k; k = k->next) {
         rep.num_feedbacks++;
diff --git a/xorg-server/Xi/getfocus.c b/xorg-server/Xi/getfocus.c
index 40546cb84..9d6c42ccb 100644
--- a/xorg-server/Xi/getfocus.c
+++ b/xorg-server/Xi/getfocus.c
@@ -99,12 +99,11 @@ ProcXGetDeviceFocus(ClientPtr client)
     if (!dev->focus)
         return BadDevice;
 
-    rep = (xGetDeviceFocusReply) {
-        .repType = X_Reply,
-        .RepType = X_GetDeviceFocus,
-        .sequenceNumber = client->sequence,
-        .length = 0
-    };
+
+    rep.repType = X_Reply;
+    rep.RepType = X_GetDeviceFocus;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
 
     focus = dev->focus;
 
diff --git a/xorg-server/Xi/getkmap.c b/xorg-server/Xi/getkmap.c
index 87c197759..2cb9b0978 100644
--- a/xorg-server/Xi/getkmap.c
+++ b/xorg-server/Xi/getkmap.c
@@ -119,13 +119,13 @@ ProcXGetDeviceKeyMapping(ClientPtr client)
     if (!syms)
         return BadAlloc;
 
-    rep = (xGetDeviceKeyMappingReply) {
-        .repType = X_Reply,
-        .RepType = X_GetDeviceKeyMapping,
-        .sequenceNumber = client->sequence,
-        .keySymsPerKeyCode = syms->mapWidth,
-        .length = (syms->mapWidth * stuff->count) /* KeySyms are 4 bytes */
-    };
+
+    rep.repType = X_Reply;
+    rep.RepType = X_GetDeviceKeyMapping;
+    rep.sequenceNumber = client->sequence;
+    rep.keySymsPerKeyCode = syms->mapWidth;
+    rep.length = (syms->mapWidth * stuff->count); /* KeySyms are 4 bytes */
+
     WriteReplyToClient(client, sizeof(xGetDeviceKeyMappingReply), &rep);
 
     client->pSwapReplyFunc = (ReplySwapPtr) CopySwap32Write;
diff --git a/xorg-server/Xi/getmmap.c b/xorg-server/Xi/getmmap.c
index f07f2bb5c..6d55caa64 100644
--- a/xorg-server/Xi/getmmap.c
+++ b/xorg-server/Xi/getmmap.c
@@ -101,14 +101,13 @@ ProcXGetDeviceModifierMapping(ClientPtr client)
     if (ret != Success)
         return ret;
 
-    rep = (xGetDeviceModifierMappingReply) {
-        .repType = X_Reply,
-        .RepType = X_GetDeviceModifierMapping,
-        .sequenceNumber = client->sequence,
-        .numKeyPerModifier = max_keys_per_mod,
+
+    rep.repType = X_Reply;
+    rep.RepType = X_GetDeviceModifierMapping;
+    rep.sequenceNumber = client->sequence;
+    rep.numKeyPerModifier = max_keys_per_mod;
     /* length counts 4 byte quantities - there are 8 modifiers 1 byte big */
-        .length = max_keys_per_mod << 1
-    };
+    rep.length = max_keys_per_mod << 1;
 
     WriteReplyToClient(client, sizeof(xGetDeviceModifierMappingReply), &rep);
     WriteToClient(client, max_keys_per_mod * 8, modkeymap);
diff --git a/xorg-server/Xi/getprop.c b/xorg-server/Xi/getprop.c
index 4d6ce6338..92ae57a1e 100644
--- a/xorg-server/Xi/getprop.c
+++ b/xorg-server/Xi/getprop.c
@@ -101,13 +101,12 @@ ProcXGetDeviceDontPropagateList(ClientPtr client)
     REQUEST(xGetDeviceDontPropagateListReq);
     REQUEST_SIZE_MATCH(xGetDeviceDontPropagateListReq);
 
-    rep = (xGetDeviceDontPropagateListReply) {
-        .repType = X_Reply,
-        .RepType = X_GetDeviceDontPropagateList,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .count = 0
-    };
+
+    rep.repType = X_Reply;
+    rep.RepType = X_GetDeviceDontPropagateList;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.count = 0;
 
     rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
     if (rc != Success)
diff --git a/xorg-server/Xi/getselev.c b/xorg-server/Xi/getselev.c
index 60a46c2d1..cc8bffb13 100644
--- a/xorg-server/Xi/getselev.c
+++ b/xorg-server/Xi/getselev.c
@@ -102,14 +102,13 @@ ProcXGetSelectedExtensionEvents(ClientPtr client)
     REQUEST(xGetSelectedExtensionEventsReq);
     REQUEST_SIZE_MATCH(xGetSelectedExtensionEventsReq);
 
-    rep = (xGetSelectedExtensionEventsReply) {
-        .repType = X_Reply,
-        .RepType = X_GetSelectedExtensionEvents,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .this_client_count = 0,
-        .all_clients_count = 0
-    };
+
+    rep.repType = X_Reply;
+    rep.RepType = X_GetSelectedExtensionEvents;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.this_client_count = 0;
+    rep.all_clients_count = 0;
 
     rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
     if (rc != Success)
diff --git a/xorg-server/Xi/getvers.c b/xorg-server/Xi/getvers.c
index 829e69535..5a1880d9c 100644
--- a/xorg-server/Xi/getvers.c
+++ b/xorg-server/Xi/getvers.c
@@ -98,15 +98,14 @@ ProcXGetExtensionVersion(ClientPtr client)
                                         stuff->nbytes))
         return BadLength;
 
-    rep = (xGetExtensionVersionReply) {
-        .repType = X_Reply,
-        .RepType = X_GetExtensionVersion,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .major_version = XIVersion.major_version,
-        .minor_version = XIVersion.minor_version,
-        .present = TRUE
-    };
+    memset(&rep, 0, sizeof(xGetExtensionVersionReply));
+    rep.repType = X_Reply;
+    rep.RepType = X_GetExtensionVersion;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.major_version = XIVersion.major_version;
+    rep.minor_version = XIVersion.minor_version;
+    rep.present = TRUE;
 
     WriteReplyToClient(client, sizeof(xGetExtensionVersionReply), &rep);
 
diff --git a/xorg-server/Xi/grabdev.c b/xorg-server/Xi/grabdev.c
index 443ef56c1..52cdb1b7b 100644
--- a/xorg-server/Xi/grabdev.c
+++ b/xorg-server/Xi/grabdev.c
@@ -113,12 +113,11 @@ ProcXGrabDevice(ClientPtr client)
         bytes_to_int32(sizeof(xGrabDeviceReq)) + stuff->event_count)
         return BadLength;
 
-    rep = (xGrabDeviceReply) {
-        .repType = X_Reply,
-        .RepType = X_GrabDevice,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-    };
+
+    rep.repType = X_Reply;
+    rep.RepType = X_GrabDevice;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
 
     rc = dixLookupDevice(&dev, stuff->deviceid, client, DixGrabAccess);
     if (rc != Success)
diff --git a/xorg-server/Xi/grabdevb.c b/xorg-server/Xi/grabdevb.c
index 8b4ae698e..0f0e975a0 100644
--- a/xorg-server/Xi/grabdevb.c
+++ b/xorg-server/Xi/grabdevb.c
@@ -137,14 +137,13 @@ ProcXGrabDeviceButton(ClientPtr client)
                                   X_GrabDeviceButton)) != Success)
         return ret;
 
-    param = (GrabParameters) {
-        .grabtype = XI,
-        .ownerEvents = stuff->ownerEvents,
-        .this_device_mode = stuff->this_device_mode,
-        .other_devices_mode = stuff->other_devices_mode,
-        .grabWindow = stuff->grabWindow,
-        .modifiers = stuff->modifiers
-    };
+    memset(&param, 0, sizeof(param));
+    param.grabtype = XI;
+    param.ownerEvents = stuff->ownerEvents;
+    param.this_device_mode = stuff->this_device_mode;
+    param.other_devices_mode = stuff->other_devices_mode;
+    param.grabWindow = stuff->grabWindow;
+    param.modifiers = stuff->modifiers;
     mask.xi = tmp[stuff->grabbed_device].mask;
 
     ret = GrabButton(client, dev, mdev, stuff->button, &param, XI, &mask);
diff --git a/xorg-server/Xi/grabdevk.c b/xorg-server/Xi/grabdevk.c
index 8694f9e6d..b75518211 100644
--- a/xorg-server/Xi/grabdevk.c
+++ b/xorg-server/Xi/grabdevk.c
@@ -135,14 +135,13 @@ ProcXGrabDeviceKey(ClientPtr client)
                                   X_GrabDeviceKey)) != Success)
         return ret;
 
-    param = (GrabParameters) {
-        .grabtype = XI,
-        .ownerEvents = stuff->ownerEvents,
-        .this_device_mode = stuff->this_device_mode,
-        .other_devices_mode = stuff->other_devices_mode,
-        .grabWindow = stuff->grabWindow,
-        .modifiers = stuff->modifiers
-    };
+    memset(&param, 0, sizeof(param));
+    param.grabtype = XI;
+    param.ownerEvents = stuff->ownerEvents;
+    param.this_device_mode = stuff->this_device_mode;
+    param.other_devices_mode = stuff->other_devices_mode;
+    param.grabWindow = stuff->grabWindow;
+    param.modifiers = stuff->modifiers;
     mask.xi = tmp[stuff->grabbed_device].mask;
 
     ret = GrabKey(client, dev, mdev, stuff->key, &param, XI, &mask);
diff --git a/xorg-server/Xi/gtmotion.c b/xorg-server/Xi/gtmotion.c
index cde5351a6..1d39b2d1b 100644
--- a/xorg-server/Xi/gtmotion.c
+++ b/xorg-server/Xi/gtmotion.c
@@ -110,15 +110,15 @@ ProcXGetDeviceMotionEvents(ClientPtr client)
     if (dev->valuator->motionHintWindow)
         MaybeStopDeviceHint(dev, client);
     axes = v->numAxes;
-    rep = (xGetDeviceMotionEventsReply) {
-        .repType = X_Reply,
-        .RepType = X_GetDeviceMotionEvents,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .nEvents = 0,
-        .axes = axes,
-        .mode = Absolute        /* XXX we don't do relative at the moment */
-    };
+
+    rep.repType = X_Reply;
+    rep.RepType = X_GetDeviceMotionEvents;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.nEvents = 0;
+    rep.axes = axes;
+    rep.mode = Absolute;        /* XXX we don't do relative at the moment */
+    
     start = ClientTimeToServerTime(stuff->start);
     stop = ClientTimeToServerTime(stuff->stop);
     if (CompareTimeStamps(start, stop) == LATER ||
diff --git a/xorg-server/Xi/listdev.c b/xorg-server/Xi/listdev.c
index 014c61db0..bccfe35d1 100644
--- a/xorg-server/Xi/listdev.c
+++ b/xorg-server/Xi/listdev.c
@@ -342,12 +342,11 @@ ProcXListInputDevices(ClientPtr client)
 
     REQUEST_SIZE_MATCH(xListInputDevicesReq);
 
-    rep = (xListInputDevicesReply) {
-        .repType = X_Reply,
-        .RepType = X_ListInputDevices,
-        .sequenceNumber = client->sequence,
-        .length = 0
-    };
+    memset(&rep, 0, sizeof(xListInputDevicesReply));
+    rep.repType = X_Reply;
+    rep.RepType = X_ListInputDevices;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
 
     /* allocate space for saving skip value */
     skip = calloc(sizeof(Bool), inputInfo.numDevices);
diff --git a/xorg-server/Xi/makefile b/xorg-server/Xi/makefile
new file mode 100644
index 000000000..0c395d20e
--- /dev/null
+++ b/xorg-server/Xi/makefile
@@ -0,0 +1,56 @@
+CSRCS=allowev.c \
+	chgdctl.c \
+	chgfctl.c \
+	chgkbd.c \
+	chgkmap.c \
+	chgprop.c \
+	chgptr.c \
+	closedev.c \
+	devbell.c \
+	exevents.c \
+	extinit.c \
+	getbmap.c \
+	getdctl.c \
+	getfctl.c \
+	getfocus.c \
+	getkmap.c \
+	getmmap.c \
+	getprop.c \
+	getselev.c \
+	getvers.c \
+	grabdev.c \
+	grabdevb.c \
+	grabdevk.c \
+	gtmotion.c \
+	listdev.c \
+	opendev.c \
+	queryst.c \
+	selectev.c \
+	sendexev.c \
+	setbmap.c \
+	setdval.c \
+	setfocus.c \
+	setmmap.c \
+	setmode.c \
+	ungrdev.c \
+	ungrdevb.c \
+	ungrdevk.c \
+	xiallowev.c \
+	xibarriers.c \
+	xichangecursor.c \
+	xichangehierarchy.c \
+	xigetclientpointer.c \
+	xigrabdev.c \
+	xipassivegrab.c \
+	xiproperty.c \
+	xiquerydevice.c \
+	xiquerypointer.c \
+	xiqueryversion.c \
+	xiselectev.c \
+	xisetclientpointer.c \
+	xisetdevfocus.c \
+	xiwarppointer.c \
+	stubs.c
+
+LIBRARY=libXi
+
diff --git a/xorg-server/Xi/opendev.c b/xorg-server/Xi/opendev.c
index 6708bade1..f3cb9a463 100644
--- a/xorg-server/Xi/opendev.c
+++ b/xorg-server/Xi/opendev.c
@@ -114,9 +114,6 @@ ProcXOpenDevice(ClientPtr client)
     if (IsMaster(dev))
         return BadDevice;
 
-    if (status != Success)
-        return status;
-
     if (dev->key != NULL) {
         evbase[j].class = KeyClass;
         evbase[j++].event_type_base = event_base[KeyClass];
@@ -144,13 +141,12 @@ ProcXOpenDevice(ClientPtr client)
     }
     evbase[j].class = OtherClass;
     evbase[j++].event_type_base = event_base[OtherClass];
-    rep = (xOpenDeviceReply) {
-        .repType = X_Reply,
-        .RepType = X_OpenDevice,
-        .sequenceNumber = client->sequence,
-        .length = bytes_to_int32(j * sizeof(xInputClassInfo)),
-        .num_classes = j
-    };
+    memset(&rep, 0, sizeof(xOpenDeviceReply));
+    rep.repType = X_Reply;
+    rep.RepType = X_OpenDevice;
+    rep.sequenceNumber = client->sequence;
+    rep.length = bytes_to_int32(j * sizeof(xInputClassInfo));
+    rep.num_classes = j;
     WriteReplyToClient(client, sizeof(xOpenDeviceReply), &rep);
     WriteToClient(client, j * sizeof(xInputClassInfo), evbase);
     return Success;
diff --git a/xorg-server/Xi/queryst.c b/xorg-server/Xi/queryst.c
index 04a652be3..6b1f015c2 100644
--- a/xorg-server/Xi/queryst.c
+++ b/xorg-server/Xi/queryst.c
@@ -158,13 +158,13 @@ ProcXQueryDeviceState(ClientPtr client)
         }
     }
 
-    rep = (xQueryDeviceStateReply) {
-        .repType = X_Reply,
-        .RepType = X_QueryDeviceState,
-        .sequenceNumber = client->sequence,
-        .length = bytes_to_int32(total_length),
-        .num_classes = num_classes
-    };
+
+    rep.repType = X_Reply;
+    rep.RepType = X_QueryDeviceState;
+    rep.sequenceNumber = client->sequence;
+    rep.length = bytes_to_int32(total_length);
+    rep.num_classes = num_classes;
+
     WriteReplyToClient(client, sizeof(xQueryDeviceStateReply), &rep);
     if (total_length > 0)
         WriteToClient(client, total_length, savbuf);
diff --git a/xorg-server/Xi/setbmap.c b/xorg-server/Xi/setbmap.c
index 94796558d..4f0f4ab9d 100644
--- a/xorg-server/Xi/setbmap.c
+++ b/xorg-server/Xi/setbmap.c
@@ -100,13 +100,12 @@ ProcXSetDeviceButtonMapping(ClientPtr client)
     if (ret != Success)
         return ret;
 
-    rep = (xSetDeviceButtonMappingReply) {
-        .repType = X_Reply,
-        .RepType = X_SetDeviceButtonMapping,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .status = MappingSuccess
-    };
+
+    rep.repType = X_Reply;
+    rep.RepType = X_SetDeviceButtonMapping;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.status = MappingSuccess;
 
     ret =
         ApplyPointerMapping(dev, (CARD8 *) &stuff[1], stuff->map_length,
diff --git a/xorg-server/Xi/setdval.c b/xorg-server/Xi/setdval.c
index 4c9c99f55..79f3d2ab4 100644
--- a/xorg-server/Xi/setdval.c
+++ b/xorg-server/Xi/setdval.c
@@ -92,13 +92,12 @@ ProcXSetDeviceValuators(ClientPtr client)
     REQUEST(xSetDeviceValuatorsReq);
     REQUEST_AT_LEAST_SIZE(xSetDeviceValuatorsReq);
 
-    rep = (xSetDeviceValuatorsReply) {
-        .repType = X_Reply,
-        .RepType = X_SetDeviceValuators,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .status = Success
-    };
+
+    rep.repType = X_Reply;
+    rep.RepType = X_SetDeviceValuators;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.status = Success;
 
     if (stuff->length != bytes_to_int32(sizeof(xSetDeviceValuatorsReq)) +
         stuff->num_valuators)
diff --git a/xorg-server/Xi/setmmap.c b/xorg-server/Xi/setmmap.c
index 1320cfec7..0e6027f54 100644
--- a/xorg-server/Xi/setmmap.c
+++ b/xorg-server/Xi/setmmap.c
@@ -98,12 +98,11 @@ ProcXSetDeviceModifierMapping(ClientPtr client)
         (stuff->numKeyPerModifier << 1))
         return BadLength;
 
-    rep = (xSetDeviceModifierMappingReply) {
-        .repType = X_Reply,
-        .RepType = X_SetDeviceModifierMapping,
-        .sequenceNumber = client->sequence,
-        .length = 0
-    };
+
+    rep.repType = X_Reply;
+    rep.RepType = X_SetDeviceModifierMapping;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
 
     ret = dixLookupDevice(&dev, stuff->deviceid, client, DixManageAccess);
     if (ret != Success)
diff --git a/xorg-server/Xi/setmode.c b/xorg-server/Xi/setmode.c
index 535655257..df3880d11 100644
--- a/xorg-server/Xi/setmode.c
+++ b/xorg-server/Xi/setmode.c
@@ -92,12 +92,11 @@ ProcXSetDeviceMode(ClientPtr client)
     REQUEST(xSetDeviceModeReq);
     REQUEST_SIZE_MATCH(xSetDeviceModeReq);
 
-    rep = (xSetDeviceModeReply) {
-        .repType = X_Reply,
-        .RepType = X_SetDeviceMode,
-        .sequenceNumber = client->sequence,
-        .length = 0
-    };
+
+    rep.repType = X_Reply;
+    rep.RepType = X_SetDeviceMode;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
 
     rc = dixLookupDevice(&dev, stuff->deviceid, client, DixSetAttrAccess);
     if (rc != Success)
diff --git a/xorg-server/Xi/xibarriers.c b/xorg-server/Xi/xibarriers.c
index 7b7b83f1c..2aa4f51ff 100644
--- a/xorg-server/Xi/xibarriers.c
+++ b/xorg-server/Xi/xibarriers.c
@@ -398,19 +398,18 @@ input_constrain_cursor(DeviceIntPtr dev, ScreenPtr screen,
     struct PointerBarrier *nearest = NULL;
     PointerBarrierClientPtr c;
     Time ms = GetTimeInMillis();
-    BarrierEvent ev = {
-        .header = ET_Internal,
-        .type = 0,
-        .length = sizeof (BarrierEvent),
-        .time = ms,
-        .deviceid = dev->id,
-        .sourceid = dev->id,
-        .dx = dest_x - current_x,
-        .dy = dest_y - current_y,
-        .root = screen->root->drawable.id,
-    };
     InternalEvent *barrier_events = events;
     DeviceIntPtr master;
+    BarrierEvent ev;
+    ev.header = ET_Internal;
+    ev.type = 0;
+    ev.length = sizeof (BarrierEvent);
+    ev.time = ms;
+    ev.deviceid = dev->id;
+    ev.sourceid = dev->id;
+    ev.dx = dest_x - current_x;
+    ev.dy = dest_y - current_y;
+    ev.root = screen->root->drawable.id;
 
     if (nevents)
         *nevents = 0;
@@ -648,24 +647,24 @@ BarrierFreeBarrier(void *data, XID id)
     for (dev = inputInfo.devices; dev; dev = dev->next) {
         struct PointerBarrierDevice *pbd;
         int root_x, root_y;
-        BarrierEvent ev = {
-            .header = ET_Internal,
-            .type = ET_BarrierLeave,
-            .length = sizeof (BarrierEvent),
-            .time = ms,
-            /* .deviceid */
-            .sourceid = 0,
-            .barrierid = c->id,
-            .window = c->window,
-            .root = screen->root->drawable.id,
-            .dx = 0,
-            .dy = 0,
-            /* .root_x */
-            /* .root_y */
-            /* .dt */
-            /* .event_id */
-            .flags = XIBarrierPointerReleased,
-        };
+        BarrierEvent ev;
+        ev.header = ET_Internal;
+        ev.type = ET_BarrierLeave;
+        ev.length = sizeof (BarrierEvent);
+        ev.time = ms;
+        /* .deviceid */
+        ev.sourceid = 0;
+        ev.barrierid = c->id;
+        ev.window = c->window;
+        ev.root = screen->root->drawable.id;
+        ev.dx = 0;
+        ev.dy = 0;
+        /* .root_x */
+        /* .root_y */
+        /* .dt */
+        /* .event_id */
+        ev.flags = XIBarrierPointerReleased;
+
 
 
         if (dev->type != MASTER_POINTER)
@@ -729,22 +728,22 @@ static void remove_master_func(pointer res, XID id, pointer devid)
     pbd = GetBarrierDevice(barrier, *deviceid);
 
     if (pbd->hit) {
-        BarrierEvent ev = {
-            .header = ET_Internal,
-            .type =ET_BarrierLeave,
-            .length = sizeof (BarrierEvent),
-            .time = ms,
-            .deviceid = *deviceid,
-            .sourceid = 0,
-            .dx = 0,
-            .dy = 0,
-            .root = barrier->screen->root->drawable.id,
-            .window = barrier->window,
-            .dt = ms - pbd->last_timestamp,
-            .flags = XIBarrierPointerReleased,
-            .event_id = pbd->barrier_event_id,
-            .barrierid = barrier->id,
-        };
+        BarrierEvent ev;
+        ev.header = ET_Internal;
+        ev.type =ET_BarrierLeave;
+        ev.length = sizeof (BarrierEvent);
+        ev.time = ms;
+        ev.deviceid = *deviceid;
+        ev.sourceid = 0;
+        ev.dx = 0;
+        ev.dy = 0;
+        ev.root = barrier->screen->root->drawable.id;
+        ev.window = barrier->window;
+        ev.dt = ms - pbd->last_timestamp;
+        ev.flags = XIBarrierPointerReleased;
+        ev.event_id = pbd->barrier_event_id;
+        ev.barrierid = barrier->id;
+
 
         mieqEnqueue(dev, (InternalEvent *) &ev);
     }
diff --git a/xorg-server/Xi/xigetclientpointer.c b/xorg-server/Xi/xigetclientpointer.c
index 3c90d588d..6ab2867f7 100644
--- a/xorg-server/Xi/xigetclientpointer.c
+++ b/xorg-server/Xi/xigetclientpointer.c
@@ -75,14 +75,13 @@ ProcXIGetClientPointer(ClientPtr client)
     else
         winclient = client;
 
-    rep = (xXIGetClientPointerReply) {
-        .repType = X_Reply,
-        .RepType = X_XIGetClientPointer,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .set = (winclient->clientPtr != NULL),
-        .deviceid = (winclient->clientPtr) ? winclient->clientPtr->id : 0
-    };
+
+    rep.repType = X_Reply;
+    rep.RepType = X_XIGetClientPointer;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.set = (winclient->clientPtr != NULL);
+    rep.deviceid = (winclient->clientPtr) ? winclient->clientPtr->id : 0;
 
     WriteReplyToClient(client, sizeof(xXIGetClientPointerReply), &rep);
     return Success;
diff --git a/xorg-server/Xi/xigrabdev.c b/xorg-server/Xi/xigrabdev.c
index 09186e84f..a4344be4a 100644
--- a/xorg-server/Xi/xigrabdev.c
+++ b/xorg-server/Xi/xigrabdev.c
@@ -104,13 +104,12 @@ ProcXIGrabDevice(ClientPtr client)
     if (ret != Success)
         return ret;
 
-    rep = (xXIGrabDeviceReply) {
-        .repType = X_Reply,
-        .RepType = X_XIGrabDevice,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .status = status
-    };
+
+    rep.repType = X_Reply;
+    rep.RepType = X_XIGrabDevice;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.status = status;
 
     WriteReplyToClient(client, sizeof(rep), &rep);
     return ret;
diff --git a/xorg-server/Xi/xipassivegrab.c b/xorg-server/Xi/xipassivegrab.c
index 62a3a469f..b5b9e86c4 100644
--- a/xorg-server/Xi/xipassivegrab.c
+++ b/xorg-server/Xi/xipassivegrab.c
@@ -76,13 +76,7 @@ int
 ProcXIPassiveGrabDevice(ClientPtr client)
 {
     DeviceIntPtr dev, mod_dev;
-    xXIPassiveGrabDeviceReply rep = {
-        .repType = X_Reply,
-        .RepType = X_XIPassiveGrabDevice,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .num_modifiers = 0
-    };
+    xXIPassiveGrabDeviceReply rep;
     int i, ret = Success;
     uint32_t *modifiers;
     xXIGrabModifierInfo *modifiers_failed;
@@ -94,6 +88,12 @@ ProcXIPassiveGrabDevice(ClientPtr client)
     REQUEST(xXIPassiveGrabDeviceReq);
     REQUEST_AT_LEAST_SIZE(xXIPassiveGrabDeviceReq);
 
+    rep.repType = X_Reply;
+    rep.RepType = X_XIPassiveGrabDevice;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.num_modifiers = 0;
+
     if (stuff->deviceid == XIAllDevices)
         dev = inputInfo.all_devices;
     else if (stuff->deviceid == XIAllMasterDevices)
diff --git a/xorg-server/Xi/xiproperty.c b/xorg-server/Xi/xiproperty.c
index 796ba0948..ba5d99912 100644
--- a/xorg-server/Xi/xiproperty.c
+++ b/xorg-server/Xi/xiproperty.c
@@ -185,23 +185,23 @@ static void
 send_property_event(DeviceIntPtr dev, Atom property, int what)
 {
     int state = (what == XIPropertyDeleted) ? PropertyDelete : PropertyNewValue;
-    devicePropertyNotify event = {
-        .type = DevicePropertyNotify,
-        .deviceid = dev->id,
-        .state = state,
-        .atom = property,
-        .time = currentTime.milliseconds
-    };
-    xXIPropertyEvent xi2 = {
-        .type = GenericEvent,
-        .extension = IReqCode,
-        .length = 0,
-        .evtype = XI_PropertyEvent,
-        .deviceid = dev->id,
-        .time = currentTime.milliseconds,
-        .property = property,
-        .what = what
-    };
+    xXIPropertyEvent xi2; devicePropertyNotify event;
+    event.type = DevicePropertyNotify;
+    event.deviceid = dev->id;
+    event.state = state;
+    event.atom = property;
+    event.time = currentTime.milliseconds;
+
+
+    xi2.type = GenericEvent;
+    xi2.extension = IReqCode;
+    xi2.length = 0;
+    xi2.evtype = XI_PropertyEvent;
+    xi2.deviceid = dev->id;
+    xi2.time = currentTime.milliseconds;
+    xi2.property = property;
+    xi2.what = what;
+    
 
     SendEventToAllWindows(dev, DevicePropertyNotifyMask, (xEvent *) &event, 1);
 
@@ -865,13 +865,12 @@ ProcXListDeviceProperties(ClientPtr client)
     if (rc != Success)
         return rc;
 
-    rep = (xListDevicePropertiesReply) {
-        .repType = X_Reply,
-        .RepType = X_ListDeviceProperties,
-        .sequenceNumber = client->sequence,
-        .length = natoms,
-        .nAtoms = natoms
-    };
+
+    rep.repType = X_Reply;
+    rep.RepType = X_ListDeviceProperties;
+    rep.sequenceNumber = client->sequence;
+    rep.length = natoms;
+    rep.nAtoms = natoms;
 
     WriteReplyToClient(client, sizeof(xListDevicePropertiesReply), &rep);
     if (natoms) {
@@ -961,17 +960,16 @@ ProcXGetDeviceProperty(ClientPtr client)
     if (rc != Success)
         return rc;
 
-    reply = (xGetDevicePropertyReply) {
-        .repType = X_Reply,
-        .RepType = X_GetDeviceProperty,
-        .sequenceNumber = client->sequence,
-        .length = bytes_to_int32(length),
-        .propertyType = type,
-        .bytesAfter = bytes_after,
-        .nItems = nitems,
-        .format = format,
-        .deviceid = dev->id
-    };
+
+    reply.repType = X_Reply;
+    reply.RepType = X_GetDeviceProperty;
+    reply.sequenceNumber = client->sequence;
+    reply.length = bytes_to_int32(length);
+    reply.propertyType = type;
+    reply.bytesAfter = bytes_after;
+    reply.nItems = nitems;
+    reply.format = format;
+    reply.deviceid = dev->id;
 
     if (stuff->delete && (reply.bytesAfter == 0))
         send_property_event(dev, stuff->property, XIPropertyDeleted);
@@ -1105,13 +1103,12 @@ ProcXIListProperties(ClientPtr client)
     if (rc != Success)
         return rc;
 
-    rep = (xXIListPropertiesReply) {
-        .repType = X_Reply,
-        .RepType = X_XIListProperties,
-        .sequenceNumber = client->sequence,
-        .length = natoms,
-        .num_properties = natoms
-    };
+
+    rep.repType = X_Reply;
+    rep.RepType = X_XIListProperties;
+    rep.sequenceNumber = client->sequence;
+    rep.length = natoms;
+    rep.num_properties = natoms;
 
     WriteReplyToClient(client, sizeof(xXIListPropertiesReply), &rep);
     if (natoms) {
@@ -1201,16 +1198,15 @@ ProcXIGetProperty(ClientPtr client)
     if (rc != Success)
         return rc;
 
-    reply = (xXIGetPropertyReply) {
-        .repType = X_Reply,
-        .RepType = X_XIGetProperty,
-        .sequenceNumber = client->sequence,
-        .length = bytes_to_int32(length),
-        .type = type,
-        .bytes_after = bytes_after,
-        .num_items = nitems,
-        .format = format
-    };
+
+    reply.repType = X_Reply;
+    reply.RepType = X_XIGetProperty;
+    reply.sequenceNumber = client->sequence;
+    reply.length = bytes_to_int32(length);
+    reply.type = type;
+    reply.bytes_after = bytes_after;
+    reply.num_items = nitems;
+    reply.format = format;
 
     if (length && stuff->delete && (reply.bytes_after == 0))
         send_property_event(dev, stuff->property, XIPropertyDeleted);
diff --git a/xorg-server/Xi/xiquerydevice.c b/xorg-server/Xi/xiquerydevice.c
index 4e544f0f5..1d1090046 100644
--- a/xorg-server/Xi/xiquerydevice.c
+++ b/xorg-server/Xi/xiquerydevice.c
@@ -107,13 +107,12 @@ ProcXIQueryDevice(ClientPtr client)
         return BadAlloc;
     }
 
-    rep = (xXIQueryDeviceReply) {
-        .repType = X_Reply,
-        .RepType = X_XIQueryDevice,
-        .sequenceNumber = client->sequence,
-        .length = len / 4,
-        .num_devices = 0
-    };
+    memset(&rep, 0, sizeof(xXIQueryDeviceReply));
+    rep.repType = X_Reply;
+    rep.RepType = X_XIQueryDevice;
+    rep.sequenceNumber = client->sequence;
+    rep.length = len / 4;
+    rep.num_devices = 0;
 
     ptr = info;
     if (dev) {
diff --git a/xorg-server/Xi/xiquerypointer.c b/xorg-server/Xi/xiquerypointer.c
index e9bdd428d..a87326181 100644..100755
--- a/xorg-server/Xi/xiquerypointer.c
+++ b/xorg-server/Xi/xiquerypointer.c
@@ -122,16 +122,15 @@ ProcXIQueryPointer(ClientPtr client)
 
     pSprite = pDev->spriteInfo->sprite;
 
-    rep = (xXIQueryPointerReply) {
-        .repType = X_Reply,
-        .RepType = X_XIQueryPointer,
-        .sequenceNumber = client->sequence,
-        .length = 6,
-        .root = (GetCurrentRootWindow(pDev))->drawable.id,
-        .root_x = double_to_fp1616(pSprite->hot.x),
-        .root_y = double_to_fp1616(pSprite->hot.y),
-        .child = None
-    };
+    memset(&rep, 0, sizeof(rep));
+    rep.repType = X_Reply;
+    rep.RepType = X_XIQueryPointer;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 6;
+    rep.root = (GetCurrentRootWindow(pDev))->drawable.id;
+    rep.root_x = double_to_fp1616(pSprite->hot.x);
+    rep.root_y = double_to_fp1616(pSprite->hot.y);
+    rep.child = None;
 
     if (kbd) {
         state = &kbd->key->xkbInfo->state;
diff --git a/xorg-server/Xi/xiqueryversion.c b/xorg-server/Xi/xiqueryversion.c
index b807a53ce..057d019be 100644
--- a/xorg-server/Xi/xiqueryversion.c
+++ b/xorg-server/Xi/xiqueryversion.c
@@ -93,14 +93,13 @@ ProcXIQueryVersion(ClientPtr client)
         pXIClient->minor_version = minor;
     }
 
-    rep = (xXIQueryVersionReply) {
-        .repType = X_Reply,
-        .RepType = X_XIQueryVersion,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .major_version = major,
-        .minor_version = minor
-    };
+    memset(&rep, 0, sizeof(xXIQueryVersionReply));
+    rep.repType = X_Reply;
+    rep.RepType = X_XIQueryVersion;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.major_version = major;
+    rep.minor_version = minor;
 
     WriteReplyToClient(client, sizeof(xXIQueryVersionReply), &rep);
 
diff --git a/xorg-server/Xi/xiselectev.c b/xorg-server/Xi/xiselectev.c
index 45a996e4c..8592747f6 100644
--- a/xorg-server/Xi/xiselectev.c
+++ b/xorg-server/Xi/xiselectev.c
@@ -297,13 +297,12 @@ ProcXIGetSelectedEvents(ClientPtr client)
     if (rc != Success)
         return rc;
 
-    reply = (xXIGetSelectedEventsReply) {
-        .repType = X_Reply,
-        .RepType = X_XIGetSelectedEvents,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .num_masks = 0
-    };
+
+    reply.repType = X_Reply;
+    reply.RepType = X_XIGetSelectedEvents;
+    reply.sequenceNumber = client->sequence;
+    reply.length = 0;
+    reply.num_masks = 0;
 
     masks = wOtherInputMasks(win);
     if (masks) {
diff --git a/xorg-server/Xi/xisetdevfocus.c b/xorg-server/Xi/xisetdevfocus.c
index 372ec248a..aec822c6b 100644
--- a/xorg-server/Xi/xisetdevfocus.c
+++ b/xorg-server/Xi/xisetdevfocus.c
@@ -97,12 +97,11 @@ ProcXIGetFocus(ClientPtr client)
     if (!dev->focus)
         return BadDevice;
 
-    rep = (xXIGetFocusReply) {
-        .repType = X_Reply,
-        .RepType = X_XIGetFocus,
-        .sequenceNumber = client->sequence,
-        .length = 0
-    };
+
+    rep.repType = X_Reply;
+    rep.RepType = X_XIGetFocus;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
 
     if (dev->focus->win == NoneWin)
         rep.focus = None;
diff --git a/xorg-server/XtErrorDB b/xorg-server/XtErrorDB
new file mode 100644
index 000000000..312862419
--- /dev/null
+++ b/xorg-server/XtErrorDB
@@ -0,0 +1,236 @@
+#****************************************************************************
+#*                                                                          *
+#*                         COPYRIGHT (c) 1988 BY                            *
+#*             DIGITAL EQUIPMENT CORPORATION, MAYNARD, MASS.                *
+#*			   ALL RIGHTS RESERVED                              *
+#*                                                                          *
+#*  THIS SOFTWARE IS FURNISHED UNDER A LICENSE AND MAY BE USED AND  COPIED  *
+#*  ONLY  IN  ACCORDANCE  WITH  THE  TERMS  OF  SUCH  LICENSE AND WITH THE  *
+#*  INCLUSION OF THE ABOVE COPYRIGHT NOTICE.  THIS SOFTWARE OR  ANY  OTHER  *
+#*  COPIES  THEREOF MAY NOT BE PROVIDED OR OTHERWISE MADE AVAILABLE TO ANY  *
+#*  OTHER PERSON.  NO TITLE TO AND OWNERSHIP OF  THE  SOFTWARE  IS  HEREBY  *
+#*  TRANSFERRED.                                                            *
+#*                                                                          *
+#*  THE INFORMATION IN THIS SOFTWARE IS SUBJECT TO CHANGE  WITHOUT  NOTICE  *
+#*  AND  SHOULD  NOT  BE  CONSTRUED  AS  A COMMITMENT BY DIGITAL EQUIPMENT  *
+#*  CORPORATION.                                                            *
+#*                                                                          *
+#*  DIGITAL ASSUMES NO RESPONSIBILITY FOR THE USE OR  RELIABILITY  OF  ITS  *
+#*  SOFTWARE ON EQUIPMENT WHICH IS NOT SUPPLIED BY DIGITAL.                 *
+#*                                                                          *
+#****************************************************************************
+#*++
+#*  FACILITY:
+#*
+#*	< to be supplied >
+#*
+#*  ABSTRACT:
+#*
+#*	< to be supplied >
+#*
+#*  ENVIRONMENT:
+#*
+#*	< to be supplied >
+#*
+#*  MODIFICATION HISTORY:
+#*
+#*	< to be supplied >
+#*
+#*--
+#
+# toolkit error and warning messages - used in XtGetErrorDatabaseText
+#
+# toolkit error messages:
+#
+# CALLING SEQUENCE:
+#
+#    DWTERROR(key, message)						  
+#    	XtError (key, "dwtlibError", "DwtlibError", message, NULL, NULL)
+#
+#    XtError(name,type,class,defaultp,params,num_params)
+#    	(*errorHandler)(name,type,class,defaultp,params,num_params);
+#
+#    _XtDefaultError (name,type,class,defaultp,params,num_params)
+#    	XtGetErrorDatabaseText(name,type,class,defaultp, buffer, 1000);
+#
+#    XtGetErrorDatabaseText(name,type,class,defaultp, buffer, nbytes)
+#    	(void) sprintf(temp, "%s.%s", name, type);
+#    	(void) XrmGetResource(errorDB, temp, class, &type_str, &result);
+#
+attacheddbCircularDependency.dwtlibError: Circular dependency in Attached Dialog Box children
+ClipBoardBadDataType.dwtlibError: bad data type
+ClipBoardCorrupt.dwtlibError: internal error - corrupt data structure
+CvtStringToFontList.dwtlibError: String to FontList conversion needs character_set and screen
+fao_main.dwtlibError: DDIS CS functions have returned an undefined status
+HelpShellOneChild.dwtlibError: Helpshell widget only supports one child
+HiddenShellOneChild.dwtlibError: Hiddenshell widget only supports one child
+#
+# INTRINSIC ROUTINE ERROR MESSAGES
+#
+# CALLING SEQUENCE:
+#
+#    XtError(name,type,class,defaultp,params,num_params)
+#    	(*errorHandler)(name,type,class,defaultp,params,num_params);
+#
+#    _XtDefaultError (name,type,class,defaultp,params,num_params)
+#    	XtGetErrorDatabaseText(name,type,class,defaultp, buffer, 1000);
+#
+#    XtGetErrorDatabaseText(name,type,class,defaultp, buffer, nbytes)
+#    	(void) sprintf(temp, "%s.%s", name, type);
+#    	(void) XrmGetResource(errorDB, temp, class, &type_str, &result);
+#
+allocError.malloc:  Cannot perform malloc
+allocError.realloc: Cannot perform realloc
+allocError.calloc:  Cannot perform calloc
+wrongParameters.cvtIntOrPixelToXColor: Pixel to color conversion needs screen and colormap arguments
+wrongParameters.cvtStringToPixel: String to pixel conversion needs screen and colormap arguments
+wrongParameters.cvtStringToCursor: String to cursor conversion needs screen argument
+wrongParamters.cvtStringToFont: String to font conversion needs screen argument
+wrongParameters.cvtStringToFontStruct: String to cursor conversion needs screen argument
+invalidParent.xtCreateWidget: XtCreateWidget requires non-NULL parent
+invalidClass.xtCreateWidget: XtCreateWidget requires non-NULL widget class
+nullProc.insertChild: NULL insert_child procedure
+invalidParameter.removePopupFromParent: RemovePopupFromParent requires non-NULL popuplist
+invalidParent.xtCreatePopupShell: XtCreatePopupShell requires non-NULL parent
+invalidClass.xtCreatePopupShell: XtCreatePopupShell requires non-NULL widget class
+invalidClass.xtCreateApplicationShell: XtCreateApplicationShell requires non-NULL widget class
+invalidParent.xtMakeGeometryRequest: XtMakeGeometryRequest - NULL parent.  Use SetValues instead
+invalidParent.xtMakeGeometryRequest: XtMakeGeometryRequest - parent not composite
+invalidGeometryManager.xtMakeGeometryRequest: XtMakeGeometryRequest - parent has no geometry manger
+invalidDisplay.xtInitialize: Can't Open display
+invalidProcedure.realizeProc: No realize class procedure defined
+invalidProcedure.inheritanceProc: Unresolved inheritance operation
+communicationError.select: Select failed
+invalidParameter.xtAddInput: invalid condition passed to XtAddInput
+communicationError.notSelect: Error in notSelect
+communicationError.notSelect: Error in notSelect
+invalidClass.xtPopup: XtPopup requires a subclass of shellWidgetClass
+invalidClass.xtPopdown: XtPopdown requires a subclass of shellWidgetClass
+invalidArgCount.xtGetValues: Argument count > 0 on NULL argument list in XtGetValues
+invalidClass.constraintSetValue: Subclass of Constraint required in CallConstraintSetValues
+invalidArgCount.xtSetValues: Argument count > 0 on NULL argument list in XtSetValues
+noSelectionProperties.freeSelectionProperty: internal error: no selection property context for display
+invalidWindow.eventHandler: Event with wrong window
+invalidParameter.numberChildren: The root and popup shells widget only support one child
+invalidParameter.numberChildren: The root and popup shells widget only support one child
+missingEvent.shell: Events are disappearing from under Shell
+internalError.shell: Shell's window manager interaction is broken
+translationError.mergingTablesWithCycles: Trying to merge translation tables with cycles, and can't resolve this cycle
+invalidParameters.xtmenuPopup: XtMenuPopup called with num_params != 2
+invalidParameters.xtMenuPopup: Bad first parameter to _XtMenuPopup
+invalidPopup.xtMenuPopup: Can't find popup in _XtMenuPopup
+invalidParameters.xtMenuPopupAction: MenuPopup wants exactly one argument
+allocError.malloc: Cannot perform malloc
+allocError.realloc: Cannot perform realloc
+allocError.calloc: Cannot perform calloc
+#
+#
+# toolkit warning messages:
+#
+# CALLING SEQUENCE:
+#
+#    DWTWARNING(key, message)					  
+#    	XtWarning (key, "dwtlibWarning", "DwtlibWarning", message, NULL, NULL)
+#
+#    XtWarning(name,type,class,defaultp,params,num_params)
+#    	(*warningHandler)(name,type,class,defaultp,params,num_params);
+#
+#    _XtDefaultWarning (name,type,class,defaultp,params,num_params)
+#    	XtGetErrorDatabaseText(name,type,class,defaultp, buffer, 1000);
+#
+#    XtGetErrorDatabaseText(name,type,class,defaultp, buffer, nbytes)
+#    	(void) sprintf(temp, "%s.%s", name, type);
+#    	(void) XrmGetResource(errorDB, temp, class, &type_str, &result);
+#
+CSCharSetIdOutOfRange.dwtlibWarning: get_charset: Character set ID is out of range
+DialogPopupParent.dwtlibWarning: Parent of DwtModal/Modeless Dialog widget must be Shell
+STextCantFindPosition.dwtlibWarning: Can't find position in MovePreviousLine???
+MenuUnrealizedParent.dwtlibWarning: Can not create a popup menu with unrealized parent
+PulldownNoSubMenu.dwtlibWarning: Can not create a pulldown without a submenu.
+PulldownBadParent.dwtlibWarning: Pulldown widgets must have menuclass parents!
+PulldownBadParent.dwtlibWarning: Pulldown widgets must have menuclass parents!
+PushButton.dwtlibWarning: Accelerator translation table overflow
+ToggleButton.dwtlibWarning: Accelerator translation table overflow
+#
+# DRMSignalError.string: ", "DRMGeneralError",
+#            msg, NULL, 0) ;
+#
+# intrinsic routines warning messages
+#
+# CALLING SEQUENCE:
+#
+#    XtWarning(name,type,class,defaultp,params,num_params)
+#    	(*warningHandler)(name,type,class,defaultp,params,num_params);
+#
+#    _XtDefaultWarning (name,type,class,defaultp,params,num_params)
+#    	XtGetErrorDatabaseText(name,type,class,defaultp, buffer, 1000);
+#
+#    XtGetErrorDatabaseText(name,type,class,defaultp, buffer, nbytes)
+#    	(void) sprintf(temp, "%s.%s", name, type);
+#    	(void) XrmGetResource(errorDB, temp, class, &type_str, &result);
+#
+invalidCallbackList.xtAddCallback: Cannot find callback list in XtAddCallbacks
+invalidCallbackList.xtAddCallback: Cannot find callback list in XtAddCallbacks
+invalidCallbackList.xtRemoveCallback: Cannot find callback list in XtRemoveCallbacks
+invalidCallbackList.xtRemoveCallback: Cannot find callback list in XtRemoveCallbacks
+invalidCallbackList.xtRemoveAllCallback: Cannot find callback list in XtRemoveAllCallbacks
+invalidCallbackList.xtCallCallback: Cannot find callback list in XtCallCallbacks
+invalidCallbackList.xtOverrideCallback: Cannot find callback list in XtOverrideCallbacks
+invalidResourceName.computeArgs: Cannot find resource name %s as argument to conversion
+typeConversionError.noConverter: No type converter registered for '%s' to '%s' conversion
+conversionError.string: Cannot convert string \"%s\" to type %s
+wrongParameters.cvtIntToBoolean: Integer to Boolean conversion needs no extra arguments
+wrongParamters.cvtStringToBoolean: String to Boolean conversion needs no extra arguments
+wrongParamters.cvtIntToLongBoolean: Integer to LongBoolean conversion needs no extra arguments
+wrongParameters.cvtStringToLongBoolean: String to LongBoolean conversion needs no extra arguments
+noColormap.cvtStringToPixel: Cannot allocate colormap entry for \"%s\"
+wrongParameters.cvtStringToDisplay: String to Display conversion needs no extra arguments
+wrongParameters.cvtStringToFile: String to File conversion needs no extra arguments
+wrongParameters.cvtIntToFont: Integer to Font conversion needs no extra arguments
+wrongParameters.cvtStringToInt: String to Integer conversion needs no extra arguments
+wrongParameters.cvtStringToShort: String to Integer conversion needs no extra arguments
+wrongParameters.cvtStringToUnsignedChar: String to Integer conversion needs no extra arguments
+wrongParameters.cvtXColorToPixel: Color to Pixel conversion needs no extra arguments
+wrongParameters.cvtIntToPixel: Integer to Pixel conversion needs no extra arguments
+wrongParameters.cvtIntToPixmap: Integer to Pixmap conversion needs no extra arguments
+invalidDepth.setValues: Can't change widget depth
+versionMismatch.widget: Widget class %s version mismatch:\n  widget %d vs. intrinsics %d
+invalidWidget.removePopupFromParent: RemovePopupFromParent,widget not on parent list
+invalidProcedure.deleteChild: null delete_child procedure in XtDestroy
+registerWindowError.xtRegisterWindow: Attempt to change already registered window
+registerWindowError.xtUnregisterWindow: Attempt to unregister invalid window
+grabError.grabDestroyCallback: XtAddGrab requires exclusive grab if spring_loaded is TRUE
+grabError.xtRemoveGrab: XtRemoveGrab asked to remove a widget not on the grab list
+invalidShell.xtTranslateCoords: Widget has no shell ancestor
+invalidChild.xtUnmanageChildren: Null child passed to XtUnmanageChildren
+invalidChild.xtUnmanageChildren: Null child passed to XtUnmanageChildren
+ambigiousParent.xtUnmanageChildren: Not all children have same parent in XtUnmanageChildren
+invalidChild.xtManageChildren: null child passed to XtManageChildren
+invalidChild.xtManageChildren: null child passed to XtManageChildren
+ambigiousParent.xtManageChildren: Not all children have same parent in XtManageChildren
+unimplementedFunction.xtAddInput: XtAddInput is not implemented
+invalidProcedure.inputHandler: XtRemoveInput: Input handler not found
+unimplementedFunction.xtRemoveInput: XtRemoveInput is not implemented
+invalidParent.xtCopyFromParent: CopyFromParent must have non-NULL parent
+invalidArgCount.getResources: argument count > 0 on NULL argument list
+invalidResourceCount.getResources: resource count > 0 on NULL resource list
+invalidGeometry.xtMakeGeometryRequest: Shell subclass did not take care of geometry in XtSetValues
+invalidProcedure.set_values_almost: set_values_almost procedure shouldn't be NULL
+initializationError.xtInitialize: Initializing Resource Lists twice
+communicationError.windowManager: Window Manager is confused
+translationParseError.parseError: translation table syntax error: %s
+translationParseError.parseEvent: Events follow '+' repeat count
+translationParseError.parseEvent: Events follow '+' repeat count
+translationParseError.parseString: Missing \
+invalidParameters.compileAccelerators: String to TranslationTable needs no extra arguments
+invalidParameters.compileTranslations: String to TranslationTable needs no extra arguments
+translationError.xtTranslateInitialize: Intializing Translation manager twice
+#
+# ReportUnboundActions - warnings include state table - should split?
+#
+translationError.unboundActions: Actions not found
+translationError.ambigiousActions: Overriding earlier translation manager actions
+translationError.mergingNullTable: Old translation table was null, cannot modify
+invalidParameters.mergeTranslations: MergeTM to TranslationTable needs no extra arguments
+invalidPopup.unsupportedOperation: Pop-up menu creation is only supported on ButtonPress or EnterNotify events
+invalidPopup.unsupportedOperation: Pop-up menu creation is only supported on ButtonPress or EnterNotify events
diff --git a/xorg-server/composite/compalloc.c b/xorg-server/composite/compalloc.c
index cc69c68f2..e684c4360 100644
--- a/xorg-server/composite/compalloc.c
+++ b/xorg-server/composite/compalloc.c
@@ -169,7 +169,7 @@ compRedirectWindow(ClientPtr pClient, WindowPtr pWin, int update)
      * Now make sure there's a per-window structure to hang this from
      */
     if (!cw) {
-        cw = malloc(sizeof(CompWindowRec));
+        cw = calloc(1,sizeof(CompWindowRec));
         if (!cw) {
             free(ccw);
             return BadAlloc;
diff --git a/xorg-server/composite/compext.c b/xorg-server/composite/compext.c
index 8641eff5e..b0a70510b 100644
--- a/xorg-server/composite/compext.c
+++ b/xorg-server/composite/compext.c
@@ -108,15 +108,14 @@ static int
 ProcCompositeQueryVersion(ClientPtr client)
 {
     CompositeClientPtr pCompositeClient = GetCompositeClient(client);
-    xCompositeQueryVersionReply rep = {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0
-    };
+    xCompositeQueryVersionReply rep;
 
     REQUEST(xCompositeQueryVersionReq);
 
     REQUEST_SIZE_MATCH(xCompositeQueryVersionReq);
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
     if (stuff->majorVersion < SERVER_COMPOSITE_MAJOR_VERSION) {
         rep.majorVersion = stuff->majorVersion;
         rep.minorVersion = stuff->minorVersion;
@@ -313,12 +312,10 @@ ProcCompositeGetOverlayWindow(ClientPtr client)
         return rc;
     }
 
-    rep = (xCompositeGetOverlayWindowReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .overlayWin = cs->pOverlayWin->drawable.id
-    };
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.overlayWin = cs->pOverlayWin->drawable.id;
 
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
@@ -846,12 +843,10 @@ PanoramiXCompositeGetOverlayWindow(ClientPtr client)
 
     cs = GetCompScreen(screenInfo.screens[0]);
 
-    rep = (xCompositeGetOverlayWindowReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .overlayWin = cs->pOverlayWin->drawable.id
-    };
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.overlayWin = cs->pOverlayWin->drawable.id;
 
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
diff --git a/xorg-server/composite/compoverlay.c b/xorg-server/composite/compoverlay.c
index d3cfaf06f..3eafc2031 100644
--- a/xorg-server/composite/compoverlay.c
+++ b/xorg-server/composite/compoverlay.c
@@ -45,6 +45,10 @@
 #include <dix-config.h>
 #endif
 
+#ifdef CreateWindow
+#undef CreateWindow
+#endif
+
 #include "compint.h"
 #include "xace.h"
 
diff --git a/xorg-server/composite/makefile b/xorg-server/composite/makefile
new file mode 100644
index 000000000..1ab95ebba
--- /dev/null
+++ b/xorg-server/composite/makefile
@@ -0,0 +1,9 @@
+

+LIBRARY=libcomposite

+

+CSRCS = 	\

+	compalloc.c		\

+	compext.c		\

+	compinit.c		\

+	compoverlay.c		\

+	compwindow.c		

diff --git a/xorg-server/config/makefile b/xorg-server/config/makefile
new file mode 100644
index 000000000..937785271
--- /dev/null
+++ b/xorg-server/config/makefile
@@ -0,0 +1,4 @@
+CSRCS=config.c

+

+LIBRARY=libconfig

+

diff --git a/xorg-server/damageext/damageext.c b/xorg-server/damageext/damageext.c
index a942ffa68..8f4a72795 100644
--- a/xorg-server/damageext/damageext.c
+++ b/xorg-server/damageext/damageext.c
@@ -47,17 +47,15 @@ DamageExtNotify(DamageExtPtr pDamageExt, BoxPtr pBoxes, int nBoxes)
     int i;
 
     UpdateCurrentTimeIf();
-    ev = (xDamageNotifyEvent) {
-        .type = DamageEventBase + XDamageNotify,
-        .level = pDamageExt->level,
-        .drawable = pDamageExt->drawable,
-        .damage = pDamageExt->id,
-        .timestamp = currentTime.milliseconds,
-        .geometry.x = pDrawable->x,
-        .geometry.y = pDrawable->y,
-        .geometry.width = pDrawable->width,
-        .geometry.height = pDrawable->height
-    };
+    ev.type = DamageEventBase + XDamageNotify;
+    ev.level = pDamageExt->level;
+    ev.drawable = pDamageExt->drawable;
+    ev.damage = pDamageExt->id;
+    ev.timestamp = currentTime.milliseconds;
+    ev.geometry.x = pDrawable->x;
+    ev.geometry.y = pDrawable->y;
+    ev.geometry.width = pDrawable->width;
+    ev.geometry.height = pDrawable->height;
     if (pBoxes) {
         for (i = 0; i < nBoxes; i++) {
             ev.level = pDamageExt->level;
@@ -129,16 +127,14 @@ static int
 ProcDamageQueryVersion(ClientPtr client)
 {
     DamageClientPtr pDamageClient = GetDamageClient(client);
-    xDamageQueryVersionReply rep = {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0
-    };
+    xDamageQueryVersionReply rep;
 
     REQUEST(xDamageQueryVersionReq);
 
     REQUEST_SIZE_MATCH(xDamageQueryVersionReq);
-
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
     if (stuff->majorVersion < SERVER_DAMAGE_MAJOR_VERSION) {
         rep.majorVersion = stuff->majorVersion;
         rep.minorVersion = stuff->minorVersion;
diff --git a/xorg-server/damageext/makefile b/xorg-server/damageext/makefile
new file mode 100644
index 000000000..c8481cd3c
--- /dev/null
+++ b/xorg-server/damageext/makefile
@@ -0,0 +1,4 @@
+CSRCS=damageext.c

+

+LIBRARY=libdamageext

+

diff --git a/xorg-server/dbe/dbe.c b/xorg-server/dbe/dbe.c
index 9039d8045..38fd22b77 100644
--- a/xorg-server/dbe/dbe.c
+++ b/xorg-server/dbe/dbe.c
@@ -119,16 +119,16 @@ static int
 ProcDbeGetVersion(ClientPtr client)
 {
     /* REQUEST(xDbeGetVersionReq); */
-    xDbeGetVersionReply rep = {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .majorVersion = DBE_MAJOR_VERSION,
-        .minorVersion = DBE_MINOR_VERSION
-    };
+    xDbeGetVersionReply rep;
 
     REQUEST_SIZE_MATCH(xDbeGetVersionReq);
 
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+    rep.majorVersion = DBE_MAJOR_VERSION;
+    rep.minorVersion = DBE_MINOR_VERSION;
+
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
     }
@@ -668,12 +668,10 @@ ProcDbeGetVisualInfo(ClientPtr client)
         length += pScrVisInfo[i].count * sizeof(xDbeVisInfo);
     }
 
-    rep = (xDbeGetVisualInfoReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = bytes_to_int32(length),
-        .m = count
-    };
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = bytes_to_int32(length);
+    rep.m = count;
 
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
@@ -758,11 +756,7 @@ static int
 ProcDbeGetBackBufferAttributes(ClientPtr client)
 {
     REQUEST(xDbeGetBackBufferAttributesReq);
-    xDbeGetBackBufferAttributesReply rep = {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0
-    };
+    xDbeGetBackBufferAttributesReply rep;
     DbeWindowPrivPtr pDbeWindowPriv;
     int rc;
 
@@ -778,6 +772,10 @@ ProcDbeGetBackBufferAttributes(ClientPtr client)
         rep.attributes = None;
     }
 
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swapl(&rep.length);
diff --git a/xorg-server/dbe/makefile b/xorg-server/dbe/makefile
new file mode 100644
index 000000000..70fb81430
--- /dev/null
+++ b/xorg-server/dbe/makefile
@@ -0,0 +1,4 @@
+CSRCS=dbe.c midbe.c

+

+LIBRARY=libdbe

+

diff --git a/xorg-server/dix/Xserver-dtrace.h b/xorg-server/dix/Xserver-dtrace.h
new file mode 100644
index 000000000..52daf677e
--- /dev/null
+++ b/xorg-server/dix/Xserver-dtrace.h
@@ -0,0 +1,72 @@
+/* Copyright (c) 2006, Oracle and/or its affiliates. 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 (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.
+ */ 
+
+/*
+ * Generated by dtrace(1M), and then modified for backwards compatibility
+ * with older versions of dtrace.   Used if dtrace -h fails.
+ * (Since _ENABLED support was added after dtrace -h, this  assumes if 
+ *  dtrace -h fails, _ENABLED will too.)
+ */
+
+#ifndef	_XSERVER_DTRACE_H
+#define	_XSERVER_DTRACE_H
+
+#include <unistd.h>
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+#define	XSERVER_CLIENT_AUTH(arg0, arg1, arg2, arg3) \
+	winDebug4("XSERVER_CLIENT_AUTH: %d %s %d %d\n",arg0, arg1, arg2, arg3)
+#define	XSERVER_CLIENT_CONNECT(arg0, arg1) \
+	winDebug4("XSERVER_CLIENT_CONNECT: %d %d\n",arg0, arg1)
+#define	XSERVER_CLIENT_DISCONNECT(arg0) \
+	winDebug4("XSERVER_CLIENT_DISCONNECT: %d %d\n",arg0)
+#define	XSERVER_REQUEST_DONE(arg0, arg1, arg2, arg3, arg4) \
+	winDebug4("XSERVER_REQUEST_DONE: %s %d %d %d %d\n",arg0, arg1, arg2, arg3, arg4)
+#define	XSERVER_REQUEST_START(arg0, arg1, arg2, arg3, arg4) \
+	winDebug4("XSERVER_REQUEST_START: %s %d %d %d ->%p\n",arg0, arg1, arg2, arg3, arg4)
+#define	XSERVER_RESOURCE_ALLOC(arg0, arg1, arg2, arg3) \
+	winDebug4("XSERVER_RESOURCE_ALLOC: 0x%x 0x%x ->%p %s\n",arg0, arg1, arg2, arg3)
+#define	XSERVER_RESOURCE_FREE(arg0, arg1, arg2, arg3) \
+	winDebug4("XSERVER_RESOURCE_FREE: 0x%x 0x%x ->%p %s\n",arg0, arg1, arg2, arg3)
+#define	XSERVER_SEND_EVENT(arg0, arg1, arg2) \
+	winDebug4("XSERVER_SEND_EVENT: 0x%x 0x%x ->%p\n",arg0, arg1, arg2)
+#define	XSERVER_INPUT_EVENT(arg0, arg1, arg2, arg3, arg4, arg5, arg6) \
+	winDebug4("XSERVER_SEND_EVENT: %x %x %x %x %x %x %x\n", arg0, arg1, arg2, arg3, arg4, arg5, arg6)
+
+#define	XSERVER_CLIENT_AUTH_ENABLED() (1)
+#define	XSERVER_CLIENT_CONNECT_ENABLED() (1)
+#define	XSERVER_CLIENT_DISCONNECT_ENABLED() (1)
+#define	XSERVER_REQUEST_DONE_ENABLED() (1)
+#define	XSERVER_REQUEST_START_ENABLED() (1)
+#define	XSERVER_RESOURCE_ALLOC_ENABLED() (1)
+#define	XSERVER_RESOURCE_FREE_ENABLED() (1)
+#define	XSERVER_SEND_EVENT_ENABLED() (1)
+#define	XSERVER_INPUT_EVENT_ENABLED() (1)
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif	/* _XSERVER_DTRACE_H */
diff --git a/xorg-server/dix/colormap.c b/xorg-server/dix/colormap.c
index 39fddc9b1..9feb3e159 100644
--- a/xorg-server/dix/colormap.c
+++ b/xorg-server/dix/colormap.c
@@ -64,6 +64,10 @@ SOFTWARE.
 #include "privates.h"
 #include "xace.h"
 
+#ifdef _MSC_VER
+#define UpdateColors thisUpdateColors
+#endif
+
 static Pixel FindBestPixel(EntryPtr /*pentFirst */ ,
                            int /*size */ ,
                            xrgb * /*prgb */ ,
@@ -452,12 +456,12 @@ TellNoMap(WindowPtr pwin, Colormap * pmid)
 {
     if (wColormap(pwin) == *pmid) {
         /* This should be call to DeliverEvent */
-        xEvent xE = {
-            .u.colormap.window = pwin->drawable.id,
-            .u.colormap.colormap = None,
-            .u.colormap.new = TRUE,
-            .u.colormap.state = ColormapUninstalled
-        };
+        xEvent xE;
+        xE.u.colormap.window = pwin->drawable.id;
+        xE.u.colormap.colormap = None;
+        xE.u.colormap.new = TRUE;
+        xE.u.colormap.state = ColormapUninstalled;
+
         xE.u.u.type = ColormapNotify;
 #ifdef PANORAMIX
         if (noPanoramiXExtension || !pwin->drawable.pScreen->myNum)
@@ -484,12 +488,12 @@ TellLostMap(WindowPtr pwin, pointer value)
 #endif
     if (wColormap(pwin) == *pmid) {
         /* This should be call to DeliverEvent */
-        xEvent xE = {
-            .u.colormap.window = pwin->drawable.id,
-            .u.colormap.colormap = *pmid,
-            .u.colormap.new = FALSE,
-            .u.colormap.state = ColormapUninstalled
-        };
+        xEvent xE;
+        xE.u.colormap.window = pwin->drawable.id;
+        xE.u.colormap.colormap = *pmid;
+        xE.u.colormap.new = FALSE;
+        xE.u.colormap.state = ColormapUninstalled;
+
         xE.u.u.type = ColormapNotify;
         DeliverEvents(pwin, &xE, 1, (WindowPtr) NULL);
     }
@@ -509,12 +513,12 @@ TellGainedMap(WindowPtr pwin, pointer value)
 #endif
     if (wColormap(pwin) == *pmid) {
         /* This should be call to DeliverEvent */
-        xEvent xE = {
-            .u.colormap.window = pwin->drawable.id,
-            .u.colormap.colormap = *pmid,
-            .u.colormap.new = FALSE,
-            .u.colormap.state = ColormapInstalled
-        };
+        xEvent xE;
+        xE.u.colormap.window = pwin->drawable.id;
+        xE.u.colormap.colormap = *pmid;
+        xE.u.colormap.new = FALSE;
+        xE.u.colormap.state = ColormapInstalled;
+
         xE.u.u.type = ColormapNotify;
         DeliverEvents(pwin, &xE, 1, (WindowPtr) NULL);
     }
diff --git a/xorg-server/dix/devices.c b/xorg-server/dix/devices.c
index 3c7d480c6..f82b81ec0 100644
--- a/xorg-server/dix/devices.c
+++ b/xorg-server/dix/devices.c
@@ -86,6 +86,10 @@ SOFTWARE.
 #include "xichangehierarchy.h"  /* For XISendDeviceHierarchyEvent */
 #include "syncsrv.h"
 
+#ifdef _MSC_VER
+#define isfinite(val) _finite(val)
+#endif
+
 /** @file
  * This file handles input device-related stuff.
  */
@@ -326,14 +330,15 @@ AddInputDevice(ClientPtr client, DeviceProc deviceProc, Bool autoStart)
 void
 SendDevicePresenceEvent(int deviceid, int type)
 {
-    DeviceIntRec dummyDev = { .id =  XIAllDevices };
-    devicePresenceNotify ev = {
-        .type = DevicePresenceNotify,
-        .time = currentTime.milliseconds,
-        .devchange = type,
-        .deviceid = deviceid
-    };
+    DeviceIntRec dummyDev;
+    devicePresenceNotify ev;
 
+    memset(&dummyDev, 0, sizeof(DeviceIntRec));
+    ev.type = DevicePresenceNotify;
+    ev.time = currentTime.milliseconds;
+    ev.devchange = type;
+    ev.deviceid = deviceid;
+    dummyDev.id = XIAllDevices;
     SendEventToAllWindows(&dummyDev, DevicePresenceNotifyMask,
                           (xEvent *) &ev, 1);
 }
@@ -1023,6 +1028,10 @@ CloseDownDevices(void)
     for (dev = inputInfo.devices; dev; dev = dev->next) {
         if (!IsMaster(dev) && !IsFloating(dev))
             dev->master = NULL;
+        /* Initialise the sprite and paired members of all devices
+           to avoid crashes in CloseDevice later */
+        dev->spriteInfo->sprite=NULL;
+        dev->spriteInfo->paired=NULL;
     }
 
     CloseDeviceList(&inputInfo.devices);
@@ -1671,11 +1680,10 @@ ProcSetModifierMapping(ClientPtr client)
                             bytes_to_int32(sizeof(xSetModifierMappingReq))))
         return BadLength;
 
-    rep = (xSetModifierMappingReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0
-    };
+
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
 
     rc = change_modmap(client, PickKeyboard(client), (KeyCode *) &stuff[1],
                        stuff->numKeyPerModifier);
@@ -1703,13 +1711,12 @@ ProcGetModifierMapping(ClientPtr client)
     generate_modkeymap(client, PickKeyboard(client), &modkeymap,
                        &max_keys_per_mod);
 
-    rep = (xGetModifierMappingReply) {
-        .type = X_Reply,
-        .numKeyPerModifier = max_keys_per_mod,
-        .sequenceNumber = client->sequence,
+    memset(&rep, 0, sizeof(xGetModifierMappingReply));
+    rep.type = X_Reply;
+    rep.numKeyPerModifier = max_keys_per_mod;
+    rep.sequenceNumber = client->sequence;
     /* length counts 4 byte quantities - there are 8 modifiers 1 byte big */
-        .length = max_keys_per_mod << 1
-    };
+    rep.length = max_keys_per_mod << 1;
 
     WriteReplyToClient(client, sizeof(xGetModifierMappingReply), &rep);
     WriteToClient(client, max_keys_per_mod * 8, modkeymap);
@@ -1794,12 +1801,12 @@ ProcSetPointerMapping(ClientPtr client)
         bytes_to_int32(sizeof(xSetPointerMappingReq) + stuff->nElts))
         return BadLength;
 
-    rep = (xSetPointerMappingReply) {
-        .type = X_Reply,
-        .success = MappingSuccess,
-        .sequenceNumber = client->sequence,
-        .length = 0
-    };
+
+    rep.type = X_Reply;
+    rep.success = MappingSuccess;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    
     map = (BYTE *) &stuff[1];
 
     /* So we're bounded here by the number of core buttons.  This check
@@ -1868,13 +1875,13 @@ ProcGetKeyboardMapping(ClientPtr client)
     if (!syms)
         return BadAlloc;
 
-    rep = (xGetKeyboardMappingReply) {
-        .type = X_Reply,
-        .keySymsPerKeyCode = syms->mapWidth,
-        .sequenceNumber = client->sequence,
-        /* length is a count of 4 byte quantities and KeySyms are 4 bytes */
-        .length = syms->mapWidth * stuff->count
-    };
+    memset(&rep, 0, sizeof(xGetKeyboardMappingReply));
+    rep.type = X_Reply;
+    rep.keySymsPerKeyCode = syms->mapWidth;
+    rep.sequenceNumber = client->sequence;
+    /* length is a count of 4 byte quantities and KeySyms are 4 bytes */
+    rep.length = syms->mapWidth * stuff->count;
+
     WriteReplyToClient(client, sizeof(xGetKeyboardMappingReply), &rep);
     client->pSwapReplyFunc = (ReplySwapPtr) CopySwap32Write;
     WriteSwappedDataToClient(client,
@@ -1906,12 +1913,12 @@ ProcGetPointerMapping(ClientPtr client)
         return rc;
 
     nElts = (butc) ? butc->numButtons : 0;
-    rep = (xGetPointerMappingReply) {
-        .type = X_Reply,
-        .nElts = nElts,
-        .sequenceNumber = client->sequence,
-        .length = ((unsigned) nElts + (4 - 1)) / 4
-    };
+
+    rep.type = X_Reply;
+    rep.nElts = nElts;
+    rep.sequenceNumber = client->sequence;
+    rep.length = ((unsigned) nElts + (4 - 1)) / 4;
+
     WriteReplyToClient(client, sizeof(xGetPointerMappingReply), &rep);
     if (butc)
         WriteToClient(client, nElts, &butc->map[1]);
@@ -1958,7 +1965,7 @@ DoChangeKeyboardControl(ClientPtr client, DeviceIntPtr keybd, XID *vlist,
         vmask &= ~index2;
         switch (index2) {
         case KBKeyClickPercent:
-            t = (INT8) *vlist;
+            t = *vlist;
             vlist++;
             if (t == -1) {
                 t = defaultKeyboardControl.click;
@@ -2160,17 +2167,17 @@ ProcGetKeyboardControl(ClientPtr client)
     if (rc != Success)
         return rc;
 
-    rep = (xGetKeyboardControlReply) {
-        .type = X_Reply,
-        .globalAutoRepeat = ctrl->autoRepeat,
-        .sequenceNumber = client->sequence,
-        .length = 5,
-        .ledMask = ctrl->leds,
-        .keyClickPercent = ctrl->click,
-        .bellPercent = ctrl->bell,
-        .bellPitch = ctrl->bell_pitch,
-        .bellDuration = ctrl->bell_duration
-    };
+
+    rep.type = X_Reply;
+    rep.globalAutoRepeat = ctrl->autoRepeat;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 5;
+    rep.ledMask = ctrl->leds;
+    rep.keyClickPercent = ctrl->click;
+    rep.bellPercent = ctrl->bell;
+    rep.bellPitch = ctrl->bell_pitch;
+    rep.bellDuration = ctrl->bell_duration;
+    
     for (i = 0; i < 32; i++)
         rep.map[i] = ctrl->autoRepeats[i];
     WriteReplyToClient(client, sizeof(xGetKeyboardControlReply), &rep);
@@ -2305,14 +2312,14 @@ ProcGetPointerControl(ClientPtr client)
     if (rc != Success)
         return rc;
 
-    rep = (xGetPointerControlReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .accelNumerator = ctrl->num,
-        .accelDenominator = ctrl->den,
-        .threshold = ctrl->threshold
-    };
+
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.accelNumerator = ctrl->num;
+    rep.accelDenominator = ctrl->den;
+    rep.threshold = ctrl->threshold;
+    
     WriteReplyToClient(client, sizeof(xGenericReply), &rep);
     return Success;
 }
@@ -2356,10 +2363,10 @@ ProcGetMotionEvents(ClientPtr client)
 
     if (mouse->valuator->motionHintWindow)
         MaybeStopHint(mouse, client);
-    rep = (xGetMotionEventsReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence
-    };
+
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    
     nEvents = 0;
     start = ClientTimeToServerTime(stuff->start);
     stop = ClientTimeToServerTime(stuff->stop);
@@ -2407,11 +2414,10 @@ ProcQueryKeymap(ClientPtr client)
     CARD8 *down = keybd->key->down;
 
     REQUEST_SIZE_MATCH(xReq);
-    rep = (xQueryKeymapReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 2
-    };
+
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 2;
 
     rc = XaceHook(XACE_DEVICE_ACCESS, client, keybd, DixReadAccess);
     /* If rc is Success, we're allowed to copy out the keymap.
@@ -2457,14 +2463,13 @@ RecalculateMasterButtons(DeviceIntPtr slave)
 
     if (master->button && master->button->numButtons != maxbuttons) {
         int i;
-        DeviceChangedEvent event = {
-            .header = ET_Internal,
-            .type = ET_DeviceChanged,
-            .time = GetTimeInMillis(),
-            .deviceid = master->id,
-            .flags = DEVCHANGE_POINTER_EVENT | DEVCHANGE_DEVICE_CHANGE,
-            .buttons.num_buttons = maxbuttons
-        };
+        DeviceChangedEvent event; memset(&event, 0, sizeof(event));
+        event.header = ET_Internal;
+        event.type = ET_DeviceChanged;
+        event.time = GetTimeInMillis();
+        event.deviceid = master->id;
+        event.flags = DEVCHANGE_POINTER_EVENT | DEVCHANGE_DEVICE_CHANGE;
+        event.buttons.num_buttons = maxbuttons;
 
         master->button->numButtons = maxbuttons;
 
diff --git a/xorg-server/dix/dispatch.c b/xorg-server/dix/dispatch.c
index 8d6173525..b06017dd8 100644..100755
--- a/xorg-server/dix/dispatch.c
+++ b/xorg-server/dix/dispatch.c
@@ -1,3974 +1,4016 @@
-/************************************************************
-
-Copyright 1987, 1989, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-Copyright 1987, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-********************************************************/
-
-/* The panoramix components contained the following notice */
-/*****************************************************************
-
-Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
-BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL DAMAGES, OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of Digital Equipment Corporation
-shall not be used in advertising or otherwise to promote the sale, use or other
-dealings in this Software without prior written authorization from Digital
-Equipment Corporation.
-
-******************************************************************/
-
-/* XSERVER_DTRACE additions:
- * Copyright (c) 2005-2006, Oracle and/or its affiliates. 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 (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.
- */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#include <version-config.h>
-#endif
-
-#ifdef PANORAMIX_DEBUG
-#include <stdio.h>
-int ProcInitialConnection();
-#endif
-
-#include "windowstr.h"
-#include <X11/fonts/fontstruct.h>
-#include "dixfontstr.h"
-#include "gcstruct.h"
-#include "selection.h"
-#include "colormapst.h"
-#include "cursorstr.h"
-#include "scrnintstr.h"
-#include "opaque.h"
-#include "input.h"
-#include "servermd.h"
-#include "extnsionst.h"
-#include "dixfont.h"
-#include "dispatch.h"
-#include "swaprep.h"
-#include "swapreq.h"
-#include "privates.h"
-#include "xace.h"
-#include "inputstr.h"
-#include "xkbsrv.h"
-#include "site.h"
-#include "client.h"
-
-#ifdef XSERVER_DTRACE
-#include "registry.h"
-#include <sys/types.h>
-typedef const char *string;
-
-#include "Xserver-dtrace.h"
-#endif
-
-#define mskcnt ((MAXCLIENTS + 31) / 32)
-#define BITMASK(i) (1U << ((i) & 31))
-#define MASKIDX(i) ((i) >> 5)
-#define MASKWORD(buf, i) buf[MASKIDX(i)]
-#define BITSET(buf, i) MASKWORD(buf, i) |= BITMASK(i)
-#define BITCLEAR(buf, i) MASKWORD(buf, i) &= ~BITMASK(i)
-#define GETBIT(buf, i) (MASKWORD(buf, i) & BITMASK(i))
-
-xConnSetupPrefix connSetupPrefix;
-
-PaddingInfo PixmapWidthPaddingInfo[33];
-
-static ClientPtr grabClient;
-
-#define GrabNone 0
-#define GrabActive 1
-#define GrabKickout 2
-static int grabState = GrabNone;
-static long grabWaiters[mskcnt];
-CallbackListPtr ServerGrabCallback = NULL;
-HWEventQueuePtr checkForInput[2];
-int connBlockScreenStart;
-
-static void KillAllClients(void);
-
-static int nextFreeClientID;    /* always MIN free client ID */
-
-static int nClients;            /* number of authorized clients */
-
-CallbackListPtr ClientStateCallback;
-
-/* dispatchException & isItTimeToYield must be declared volatile since they
- * are modified by signal handlers - otherwise optimizer may assume it doesn't
- * need to actually check value in memory when used and may miss changes from
- * signal handlers.
- */
-volatile char dispatchException = 0;
-volatile char isItTimeToYield;
-
-#define SAME_SCREENS(a, b) (\
-    (a.pScreen == b.pScreen))
-
-void
-SetInputCheck(HWEventQueuePtr c0, HWEventQueuePtr c1)
-{
-    checkForInput[0] = c0;
-    checkForInput[1] = c1;
-}
-
-void
-UpdateCurrentTime(void)
-{
-    TimeStamp systime;
-
-    /* To avoid time running backwards, we must call GetTimeInMillis before
-     * calling ProcessInputEvents.
-     */
-    systime.months = currentTime.months;
-    systime.milliseconds = GetTimeInMillis();
-    if (systime.milliseconds < currentTime.milliseconds)
-        systime.months++;
-    if (*checkForInput[0] != *checkForInput[1])
-        ProcessInputEvents();
-    if (CompareTimeStamps(systime, currentTime) == LATER)
-        currentTime = systime;
-}
-
-/* Like UpdateCurrentTime, but can't call ProcessInputEvents */
-void
-UpdateCurrentTimeIf(void)
-{
-    TimeStamp systime;
-
-    systime.months = currentTime.months;
-    systime.milliseconds = GetTimeInMillis();
-    if (systime.milliseconds < currentTime.milliseconds)
-        systime.months++;
-    if (CompareTimeStamps(systime, currentTime) == LATER)
-        currentTime = systime;
-}
-
-#undef SMART_DEBUG
-
-#define SMART_SCHEDULE_DEFAULT_INTERVAL	20      /* ms */
-#define SMART_SCHEDULE_MAX_SLICE	200     /* ms */
-
-#if defined(WIN32) && !defined(__CYGWIN__)
-Bool SmartScheduleDisable = TRUE;
-#else
-Bool SmartScheduleDisable = FALSE;
-#endif
-long SmartScheduleSlice = SMART_SCHEDULE_DEFAULT_INTERVAL;
-long SmartScheduleInterval = SMART_SCHEDULE_DEFAULT_INTERVAL;
-long SmartScheduleMaxSlice = SMART_SCHEDULE_MAX_SLICE;
-long SmartScheduleTime;
-int SmartScheduleLatencyLimited = 0;
-static ClientPtr SmartLastClient;
-static int SmartLastIndex[SMART_MAX_PRIORITY - SMART_MIN_PRIORITY + 1];
-
-#ifdef SMART_DEBUG
-long SmartLastPrint;
-#endif
-
-void Dispatch(void);
-
-static int
-SmartScheduleClient(int *clientReady, int nready)
-{
-    ClientPtr pClient;
-    int i;
-    int client;
-    int bestPrio, best = 0;
-    int bestRobin, robin;
-    long now = SmartScheduleTime;
-    long idle;
-
-    bestPrio = -0x7fffffff;
-    bestRobin = 0;
-    idle = 2 * SmartScheduleSlice;
-    for (i = 0; i < nready; i++) {
-        client = clientReady[i];
-        pClient = clients[client];
-        /* Praise clients which are idle */
-        if ((now - pClient->smart_check_tick) >= idle) {
-            if (pClient->smart_priority < 0)
-                pClient->smart_priority++;
-        }
-        pClient->smart_check_tick = now;
-
-        /* check priority to select best client */
-        robin =
-            (pClient->index -
-             SmartLastIndex[pClient->smart_priority -
-                            SMART_MIN_PRIORITY]) & 0xff;
-        if (pClient->smart_priority > bestPrio ||
-            (pClient->smart_priority == bestPrio && robin > bestRobin)) {
-            bestPrio = pClient->smart_priority;
-            bestRobin = robin;
-            best = client;
-        }
-#ifdef SMART_DEBUG
-        if ((now - SmartLastPrint) >= 5000)
-            fprintf(stderr, " %2d: %3d", client, pClient->smart_priority);
-#endif
-    }
-#ifdef SMART_DEBUG
-    if ((now - SmartLastPrint) >= 5000) {
-        fprintf(stderr, " use %2d\n", best);
-        SmartLastPrint = now;
-    }
-#endif
-    pClient = clients[best];
-    SmartLastIndex[bestPrio - SMART_MIN_PRIORITY] = pClient->index;
-    /*
-     * Set current client pointer
-     */
-    if (SmartLastClient != pClient) {
-        pClient->smart_start_tick = now;
-        SmartLastClient = pClient;
-    }
-    /*
-     * Adjust slice
-     */
-    if (nready == 1 && SmartScheduleLatencyLimited == 0) {
-        /*
-         * If it's been a long time since another client
-         * has run, bump the slice up to get maximal
-         * performance from a single client
-         */
-        if ((now - pClient->smart_start_tick) > 1000 &&
-            SmartScheduleSlice < SmartScheduleMaxSlice) {
-            SmartScheduleSlice += SmartScheduleInterval;
-        }
-    }
-    else {
-        SmartScheduleSlice = SmartScheduleInterval;
-    }
-    return best;
-}
-
-void
-EnableLimitedSchedulingLatency(void)
-{
-    ++SmartScheduleLatencyLimited;
-    SmartScheduleSlice = SmartScheduleInterval;
-}
-
-void
-DisableLimitedSchedulingLatency(void)
-{
-    --SmartScheduleLatencyLimited;
-
-    /* protect against bugs */
-    if (SmartScheduleLatencyLimited < 0)
-        SmartScheduleLatencyLimited = 0;
-}
-
-void
-Dispatch(void)
-{
-    int *clientReady;           /* array of request ready clients */
-    int result;
-    ClientPtr client;
-    int nready;
-    HWEventQueuePtr *icheck = checkForInput;
-    long start_tick;
-
-    nextFreeClientID = 1;
-    nClients = 0;
-
-    clientReady = malloc(sizeof(int) * MaxClients);
-    if (!clientReady)
-        return;
-
-    SmartScheduleSlice = SmartScheduleInterval;
-    while (!dispatchException) {
-        if (*icheck[0] != *icheck[1]) {
-            ProcessInputEvents();
-            FlushIfCriticalOutputPending();
-        }
-
-        nready = WaitForSomething(clientReady);
-
-        if (nready && !SmartScheduleDisable) {
-            clientReady[0] = SmartScheduleClient(clientReady, nready);
-            nready = 1;
-        }
-       /***************** 
-	*  Handle events in round robin fashion, doing input between 
-	*  each round 
-	*****************/
-
-        while (!dispatchException && (--nready >= 0)) {
-            client = clients[clientReady[nready]];
-            if (!client) {
-                /* KillClient can cause this to happen */
-                continue;
-            }
-            /* GrabServer activation can cause this to be true */
-            if (grabState == GrabKickout) {
-                grabState = GrabActive;
-                break;
-            }
-            isItTimeToYield = FALSE;
-
-            start_tick = SmartScheduleTime;
-            while (!isItTimeToYield) {
-                if (*icheck[0] != *icheck[1])
-                    ProcessInputEvents();
-
-                FlushIfCriticalOutputPending();
-                if (!SmartScheduleDisable &&
-                    (SmartScheduleTime - start_tick) >= SmartScheduleSlice) {
-                    /* Penalize clients which consume ticks */
-                    if (client->smart_priority > SMART_MIN_PRIORITY)
-                        client->smart_priority--;
-                    break;
-                }
-                /* now, finally, deal with client requests */
-
-                /* Update currentTime so request time checks, such as for input
-                 * device grabs, are calculated correctly */
-                UpdateCurrentTimeIf();
-                result = ReadRequestFromClient(client);
-                if (result <= 0) {
-                    if (result < 0)
-                        CloseDownClient(client);
-                    break;
-                }
-
-                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
-                if (XSERVER_REQUEST_START_ENABLED())
-                    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, client->majorOp);
-                    if (result == Success)
-                        result =
-                            (*client->requestVector[client->majorOp]) (client);
-                    XaceHookAuditEnd(client, result);
-                }
-#ifdef XSERVER_DTRACE
-                if (XSERVER_REQUEST_DONE_ENABLED())
-                    XSERVER_REQUEST_DONE(LookupMajorName(client->majorOp),
-                                         client->majorOp, client->sequence,
-                                         client->index, result);
-#endif
-
-                if (client->noClientException != Success) {
-                    CloseDownClient(client);
-                    break;
-                }
-                else if (result != Success) {
-                    SendErrorToClient(client, client->majorOp,
-                                      client->minorOp,
-                                      client->errorValue, result);
-                    break;
-                }
-            }
-            FlushAllOutput();
-            client = clients[clientReady[nready]];
-            if (client)
-                client->smart_stop_tick = SmartScheduleTime;
-        }
-        dispatchException &= ~DE_PRIORITYCHANGE;
-    }
-#if defined(DDXBEFORERESET)
-    ddxBeforeReset();
-#endif
-    KillAllClients();
-    free(clientReady);
-    dispatchException &= ~DE_RESET;
-    SmartScheduleLatencyLimited = 0;
-}
-
-static int VendorRelease = VENDOR_RELEASE;
-static char *VendorString = VENDOR_NAME;
-
-void
-SetVendorRelease(int release)
-{
-    VendorRelease = release;
-}
-
-void
-SetVendorString(char *string)
-{
-    VendorString = string;
-}
-
-Bool
-CreateConnectionBlock(void)
-{
-    xConnSetup setup;
-    xWindowRoot root;
-    xDepth depth;
-    xVisualType visual;
-    xPixmapFormat format;
-    unsigned long vid;
-    int i, j, k, lenofblock, sizesofar = 0;
-    char *pBuf;
-
-    memset(&setup, 0, sizeof(xConnSetup));
-    /* Leave off the ridBase and ridMask, these must be sent with
-       connection */
-
-    setup.release = VendorRelease;
-    /*
-     * per-server image and bitmap parameters are defined in Xmd.h
-     */
-    setup.imageByteOrder = screenInfo.imageByteOrder;
-
-    setup.bitmapScanlineUnit = screenInfo.bitmapScanlineUnit;
-    setup.bitmapScanlinePad = screenInfo.bitmapScanlinePad;
-
-    setup.bitmapBitOrder = screenInfo.bitmapBitOrder;
-    setup.motionBufferSize = NumMotionEvents();
-    setup.numRoots = screenInfo.numScreens;
-    setup.nbytesVendor = strlen(VendorString);
-    setup.numFormats = screenInfo.numPixmapFormats;
-    setup.maxRequestSize = MAX_REQUEST_SIZE;
-    QueryMinMaxKeyCodes(&setup.minKeyCode, &setup.maxKeyCode);
-
-    lenofblock = sizeof(xConnSetup) +
-        pad_to_int32(setup.nbytesVendor) +
-        (setup.numFormats * sizeof(xPixmapFormat)) +
-        (setup.numRoots * sizeof(xWindowRoot));
-    ConnectionInfo = malloc(lenofblock);
-    if (!ConnectionInfo)
-        return FALSE;
-
-    memmove(ConnectionInfo, (char *) &setup, sizeof(xConnSetup));
-    sizesofar = sizeof(xConnSetup);
-    pBuf = ConnectionInfo + sizeof(xConnSetup);
-
-    memmove(pBuf, VendorString, (int) setup.nbytesVendor);
-    sizesofar += setup.nbytesVendor;
-    pBuf += setup.nbytesVendor;
-    i = padding_for_int32(setup.nbytesVendor);
-    sizesofar += i;
-    while (--i >= 0)
-        *pBuf++ = 0;
-
-    memset(&format, 0, sizeof(xPixmapFormat));
-    for (i = 0; i < screenInfo.numPixmapFormats; i++) {
-        format.depth = screenInfo.formats[i].depth;
-        format.bitsPerPixel = screenInfo.formats[i].bitsPerPixel;
-        format.scanLinePad = screenInfo.formats[i].scanlinePad;
-        memmove(pBuf, (char *) &format, sizeof(xPixmapFormat));
-        pBuf += sizeof(xPixmapFormat);
-        sizesofar += sizeof(xPixmapFormat);
-    }
-
-    connBlockScreenStart = sizesofar;
-    memset(&depth, 0, sizeof(xDepth));
-    memset(&visual, 0, sizeof(xVisualType));
-    for (i = 0; i < screenInfo.numScreens; i++) {
-        ScreenPtr pScreen;
-        DepthPtr pDepth;
-        VisualPtr pVisual;
-
-        pScreen = screenInfo.screens[i];
-        root.windowId = pScreen->root->drawable.id;
-        root.defaultColormap = pScreen->defColormap;
-        root.whitePixel = pScreen->whitePixel;
-        root.blackPixel = pScreen->blackPixel;
-        root.currentInputMask = 0;      /* filled in when sent */
-        root.pixWidth = pScreen->width;
-        root.pixHeight = pScreen->height;
-        root.mmWidth = pScreen->mmWidth;
-        root.mmHeight = pScreen->mmHeight;
-        root.minInstalledMaps = pScreen->minInstalledCmaps;
-        root.maxInstalledMaps = pScreen->maxInstalledCmaps;
-        root.rootVisualID = pScreen->rootVisual;
-        root.backingStore = pScreen->backingStoreSupport;
-        root.saveUnders = FALSE;
-        root.rootDepth = pScreen->rootDepth;
-        root.nDepths = pScreen->numDepths;
-        memmove(pBuf, (char *) &root, sizeof(xWindowRoot));
-        sizesofar += sizeof(xWindowRoot);
-        pBuf += sizeof(xWindowRoot);
-
-        pDepth = pScreen->allowedDepths;
-        for (j = 0; j < pScreen->numDepths; j++, pDepth++) {
-            lenofblock += sizeof(xDepth) +
-                (pDepth->numVids * sizeof(xVisualType));
-            pBuf = (char *) realloc(ConnectionInfo, lenofblock);
-            if (!pBuf) {
-                free(ConnectionInfo);
-                return FALSE;
-            }
-            ConnectionInfo = pBuf;
-            pBuf += sizesofar;
-            depth.depth = pDepth->depth;
-            depth.nVisuals = pDepth->numVids;
-            memmove(pBuf, (char *) &depth, sizeof(xDepth));
-            pBuf += sizeof(xDepth);
-            sizesofar += sizeof(xDepth);
-            for (k = 0; k < pDepth->numVids; k++) {
-                vid = pDepth->vids[k];
-                for (pVisual = pScreen->visuals;
-                     pVisual->vid != vid; pVisual++);
-                visual.visualID = vid;
-                visual.class = pVisual->class;
-                visual.bitsPerRGB = pVisual->bitsPerRGBValue;
-                visual.colormapEntries = pVisual->ColormapEntries;
-                visual.redMask = pVisual->redMask;
-                visual.greenMask = pVisual->greenMask;
-                visual.blueMask = pVisual->blueMask;
-                memmove(pBuf, (char *) &visual, sizeof(xVisualType));
-                pBuf += sizeof(xVisualType);
-                sizesofar += sizeof(xVisualType);
-            }
-        }
-    }
-    connSetupPrefix.success = xTrue;
-    connSetupPrefix.length = lenofblock / 4;
-    connSetupPrefix.majorVersion = X_PROTOCOL;
-    connSetupPrefix.minorVersion = X_PROTOCOL_REVISION;
-    return TRUE;
-}
-
-int
-ProcBadRequest(ClientPtr client)
-{
-    return BadRequest;
-}
-
-int
-ProcCreateWindow(ClientPtr client)
-{
-    WindowPtr pParent, pWin;
-
-    REQUEST(xCreateWindowReq);
-    int len, rc;
-
-    REQUEST_AT_LEAST_SIZE(xCreateWindowReq);
-
-    LEGAL_NEW_RESOURCE(stuff->wid, client);
-    rc = dixLookupWindow(&pParent, stuff->parent, client, DixAddAccess);
-    if (rc != Success)
-        return rc;
-    len = client->req_len - bytes_to_int32(sizeof(xCreateWindowReq));
-    if (Ones(stuff->mask) != len)
-        return BadLength;
-    if (!stuff->width || !stuff->height) {
-        client->errorValue = 0;
-        return BadValue;
-    }
-    pWin = CreateWindow(stuff->wid, pParent, stuff->x,
-                        stuff->y, stuff->width, stuff->height,
-                        stuff->borderWidth, stuff->class,
-                        stuff->mask, (XID *) &stuff[1],
-                        (int) stuff->depth, client, stuff->visual, &rc);
-    if (pWin) {
-        Mask mask = pWin->eventMask;
-
-        pWin->eventMask = 0;    /* subterfuge in case AddResource fails */
-        if (!AddResource(stuff->wid, RT_WINDOW, (pointer) pWin))
-            return BadAlloc;
-        pWin->eventMask = mask;
-    }
-    return rc;
-}
-
-int
-ProcChangeWindowAttributes(ClientPtr client)
-{
-    WindowPtr pWin;
-
-    REQUEST(xChangeWindowAttributesReq);
-    int len, rc;
-    Mask access_mode = 0;
-
-    REQUEST_AT_LEAST_SIZE(xChangeWindowAttributesReq);
-    access_mode |= (stuff->valueMask & CWEventMask) ? DixReceiveAccess : 0;
-    access_mode |= (stuff->valueMask & ~CWEventMask) ? DixSetAttrAccess : 0;
-    rc = dixLookupWindow(&pWin, stuff->window, client, access_mode);
-    if (rc != Success)
-        return rc;
-    len = client->req_len - bytes_to_int32(sizeof(xChangeWindowAttributesReq));
-    if (len != Ones(stuff->valueMask))
-        return BadLength;
-    return ChangeWindowAttributes(pWin,
-                                  stuff->valueMask, (XID *) &stuff[1], client);
-}
-
-int
-ProcGetWindowAttributes(ClientPtr client)
-{
-    WindowPtr pWin;
-
-    REQUEST(xResourceReq);
-    xGetWindowAttributesReply wa;
-    int rc;
-
-    REQUEST_SIZE_MATCH(xResourceReq);
-    rc = dixLookupWindow(&pWin, stuff->id, client, DixGetAttrAccess);
-    if (rc != Success)
-        return rc;
-    memset(&wa, 0, sizeof(xGetWindowAttributesReply));
-    GetWindowAttributes(pWin, client, &wa);
-    WriteReplyToClient(client, sizeof(xGetWindowAttributesReply), &wa);
-    return Success;
-}
-
-int
-ProcDestroyWindow(ClientPtr client)
-{
-    WindowPtr pWin;
-
-    REQUEST(xResourceReq);
-    int rc;
-
-    REQUEST_SIZE_MATCH(xResourceReq);
-    rc = dixLookupWindow(&pWin, stuff->id, client, DixDestroyAccess);
-    if (rc != Success)
-        return rc;
-    if (pWin->parent) {
-        rc = dixLookupWindow(&pWin, pWin->parent->drawable.id, client,
-                             DixRemoveAccess);
-        if (rc != Success)
-            return rc;
-        FreeResource(stuff->id, RT_NONE);
-    }
-    return Success;
-}
-
-int
-ProcDestroySubwindows(ClientPtr client)
-{
-    WindowPtr pWin;
-
-    REQUEST(xResourceReq);
-    int rc;
-
-    REQUEST_SIZE_MATCH(xResourceReq);
-    rc = dixLookupWindow(&pWin, stuff->id, client, DixRemoveAccess);
-    if (rc != Success)
-        return rc;
-    DestroySubwindows(pWin, client);
-    return Success;
-}
-
-int
-ProcChangeSaveSet(ClientPtr client)
-{
-    WindowPtr pWin;
-
-    REQUEST(xChangeSaveSetReq);
-    int rc;
-
-    REQUEST_SIZE_MATCH(xChangeSaveSetReq);
-    rc = dixLookupWindow(&pWin, stuff->window, client, DixManageAccess);
-    if (rc != Success)
-        return rc;
-    if (client->clientAsMask == (CLIENT_BITS(pWin->drawable.id)))
-        return BadMatch;
-    if ((stuff->mode == SetModeInsert) || (stuff->mode == SetModeDelete))
-        return AlterSaveSetForClient(client, pWin, stuff->mode, FALSE, TRUE);
-    client->errorValue = stuff->mode;
-    return BadValue;
-}
-
-int
-ProcReparentWindow(ClientPtr client)
-{
-    WindowPtr pWin, pParent;
-
-    REQUEST(xReparentWindowReq);
-    int rc;
-
-    REQUEST_SIZE_MATCH(xReparentWindowReq);
-    rc = dixLookupWindow(&pWin, stuff->window, client, DixManageAccess);
-    if (rc != Success)
-        return rc;
-    rc = dixLookupWindow(&pParent, stuff->parent, client, DixAddAccess);
-    if (rc != Success)
-        return rc;
-    if (!SAME_SCREENS(pWin->drawable, pParent->drawable))
-        return BadMatch;
-    if ((pWin->backgroundState == ParentRelative) &&
-        (pParent->drawable.depth != pWin->drawable.depth))
-        return BadMatch;
-    if ((pWin->drawable.class != InputOnly) &&
-        (pParent->drawable.class == InputOnly))
-        return BadMatch;
-    return ReparentWindow(pWin, pParent,
-                          (short) stuff->x, (short) stuff->y, client);
-}
-
-int
-ProcMapWindow(ClientPtr client)
-{
-    WindowPtr pWin;
-
-    REQUEST(xResourceReq);
-    int rc;
-
-    REQUEST_SIZE_MATCH(xResourceReq);
-    rc = dixLookupWindow(&pWin, stuff->id, client, DixShowAccess);
-    if (rc != Success)
-        return rc;
-    MapWindow(pWin, client);
-    /* update cache to say it is mapped */
-    return Success;
-}
-
-int
-ProcMapSubwindows(ClientPtr client)
-{
-    WindowPtr pWin;
-
-    REQUEST(xResourceReq);
-    int rc;
-
-    REQUEST_SIZE_MATCH(xResourceReq);
-    rc = dixLookupWindow(&pWin, stuff->id, client, DixListAccess);
-    if (rc != Success)
-        return rc;
-    MapSubwindows(pWin, client);
-    /* update cache to say it is mapped */
-    return Success;
-}
-
-int
-ProcUnmapWindow(ClientPtr client)
-{
-    WindowPtr pWin;
-
-    REQUEST(xResourceReq);
-    int rc;
-
-    REQUEST_SIZE_MATCH(xResourceReq);
-    rc = dixLookupWindow(&pWin, stuff->id, client, DixHideAccess);
-    if (rc != Success)
-        return rc;
-    UnmapWindow(pWin, FALSE);
-    /* update cache to say it is mapped */
-    return Success;
-}
-
-int
-ProcUnmapSubwindows(ClientPtr client)
-{
-    WindowPtr pWin;
-
-    REQUEST(xResourceReq);
-    int rc;
-
-    REQUEST_SIZE_MATCH(xResourceReq);
-    rc = dixLookupWindow(&pWin, stuff->id, client, DixListAccess);
-    if (rc != Success)
-        return rc;
-    UnmapSubwindows(pWin);
-    return Success;
-}
-
-int
-ProcConfigureWindow(ClientPtr client)
-{
-    WindowPtr pWin;
-
-    REQUEST(xConfigureWindowReq);
-    int len, rc;
-
-    REQUEST_AT_LEAST_SIZE(xConfigureWindowReq);
-    rc = dixLookupWindow(&pWin, stuff->window, client,
-                         DixManageAccess | DixSetAttrAccess);
-    if (rc != Success)
-        return rc;
-    len = client->req_len - bytes_to_int32(sizeof(xConfigureWindowReq));
-    if (Ones((Mask) stuff->mask) != len)
-        return BadLength;
-    return ConfigureWindow(pWin, (Mask) stuff->mask, (XID *) &stuff[1], client);
-}
-
-int
-ProcCirculateWindow(ClientPtr client)
-{
-    WindowPtr pWin;
-
-    REQUEST(xCirculateWindowReq);
-    int rc;
-
-    REQUEST_SIZE_MATCH(xCirculateWindowReq);
-    if ((stuff->direction != RaiseLowest) && (stuff->direction != LowerHighest)) {
-        client->errorValue = stuff->direction;
-        return BadValue;
-    }
-    rc = dixLookupWindow(&pWin, stuff->window, client, DixManageAccess);
-    if (rc != Success)
-        return rc;
-    CirculateWindow(pWin, (int) stuff->direction, client);
-    return Success;
-}
-
-static int
-GetGeometry(ClientPtr client, xGetGeometryReply * rep)
-{
-    DrawablePtr pDraw;
-    int rc;
-
-    REQUEST(xResourceReq);
-    REQUEST_SIZE_MATCH(xResourceReq);
-
-    rc = dixLookupDrawable(&pDraw, stuff->id, client, M_ANY, DixGetAttrAccess);
-    if (rc != Success)
-        return rc;
-
-    rep->type = X_Reply;
-    rep->length = 0;
-    rep->sequenceNumber = client->sequence;
-    rep->root = pDraw->pScreen->root->drawable.id;
-    rep->depth = pDraw->depth;
-    rep->width = pDraw->width;
-    rep->height = pDraw->height;
-
-    if (WindowDrawable(pDraw->type)) {
-        WindowPtr pWin = (WindowPtr) pDraw;
-
-        rep->x = pWin->origin.x - wBorderWidth(pWin);
-        rep->y = pWin->origin.y - wBorderWidth(pWin);
-        rep->borderWidth = pWin->borderWidth;
-    }
-    else {                      /* DRAWABLE_PIXMAP */
-
-        rep->x = rep->y = rep->borderWidth = 0;
-    }
-
-    return Success;
-}
-
-int
-ProcGetGeometry(ClientPtr client)
-{
-    xGetGeometryReply rep = { .type = X_Reply };
-    int status;
-
-    if ((status = GetGeometry(client, &rep)) != Success)
-        return status;
-
-    WriteReplyToClient(client, sizeof(xGetGeometryReply), &rep);
-    return Success;
-}
-
-int
-ProcQueryTree(ClientPtr client)
-{
-    xQueryTreeReply reply;
-    int rc, numChildren = 0;
-    WindowPtr pChild, pWin, pHead;
-    Window *childIDs = (Window *) NULL;
-
-    REQUEST(xResourceReq);
-
-    REQUEST_SIZE_MATCH(xResourceReq);
-    rc = dixLookupWindow(&pWin, stuff->id, client, DixListAccess);
-    if (rc != Success)
-        return rc;
-
-    reply = (xQueryTreeReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .root = pWin->drawable.pScreen->root->drawable.id,
-        .parent = (pWin->parent) ? pWin->parent->drawable.id : (Window) None
-    };
-    pHead = RealChildHead(pWin);
-    for (pChild = pWin->lastChild; pChild != pHead; pChild = pChild->prevSib)
-        numChildren++;
-    if (numChildren) {
-        int curChild = 0;
-
-        childIDs = malloc(numChildren * sizeof(Window));
-        if (!childIDs)
-            return BadAlloc;
-        for (pChild = pWin->lastChild; pChild != pHead;
-             pChild = pChild->prevSib)
-            childIDs[curChild++] = pChild->drawable.id;
-    }
-
-    reply.nChildren = numChildren;
-    reply.length = bytes_to_int32(numChildren * sizeof(Window));
-
-    WriteReplyToClient(client, sizeof(xQueryTreeReply), &reply);
-    if (numChildren) {
-        client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write;
-        WriteSwappedDataToClient(client, numChildren * sizeof(Window),
-                                 childIDs);
-        free(childIDs);
-    }
-
-    return Success;
-}
-
-int
-ProcInternAtom(ClientPtr client)
-{
-    Atom atom;
-    char *tchar;
-
-    REQUEST(xInternAtomReq);
-
-    REQUEST_FIXED_SIZE(xInternAtomReq, stuff->nbytes);
-    if ((stuff->onlyIfExists != xTrue) && (stuff->onlyIfExists != xFalse)) {
-        client->errorValue = stuff->onlyIfExists;
-        return BadValue;
-    }
-    tchar = (char *) &stuff[1];
-    atom = MakeAtom(tchar, stuff->nbytes, !stuff->onlyIfExists);
-    if (atom != BAD_RESOURCE) {
-        xInternAtomReply reply = {
-            .type = X_Reply,
-            .sequenceNumber = client->sequence,
-            .length = 0,
-            .atom = atom
-        };
-        WriteReplyToClient(client, sizeof(xInternAtomReply), &reply);
-        return Success;
-    }
-    else
-        return BadAlloc;
-}
-
-int
-ProcGetAtomName(ClientPtr client)
-{
-    const char *str;
-
-    REQUEST(xResourceReq);
-
-    REQUEST_SIZE_MATCH(xResourceReq);
-    if ((str = NameForAtom(stuff->id))) {
-        int len = strlen(str);
-        xGetAtomNameReply reply = {
-            .type = X_Reply,
-            .sequenceNumber = client->sequence,
-            .length = bytes_to_int32(len),
-            .nameLength = len
-        };
-
-        WriteReplyToClient(client, sizeof(xGetAtomNameReply), &reply);
-        WriteToClient(client, len, str);
-        return Success;
-    }
-    else {
-        client->errorValue = stuff->id;
-        return BadAtom;
-    }
-}
-
-int
-ProcGrabServer(ClientPtr client)
-{
-    int rc;
-
-    REQUEST_SIZE_MATCH(xReq);
-    if (grabState != GrabNone && client != grabClient) {
-        ResetCurrentRequest(client);
-        client->sequence--;
-        BITSET(grabWaiters, client->index);
-        IgnoreClient(client);
-        return Success;
-    }
-    rc = OnlyListenToOneClient(client);
-    if (rc != Success)
-        return rc;
-    grabState = GrabKickout;
-    grabClient = client;
-
-    if (ServerGrabCallback) {
-        ServerGrabInfoRec grabinfo;
-
-        grabinfo.client = client;
-        grabinfo.grabstate = SERVER_GRABBED;
-        CallCallbacks(&ServerGrabCallback, (pointer) &grabinfo);
-    }
-
-    return Success;
-}
-
-static void
-UngrabServer(ClientPtr client)
-{
-    int i;
-
-    grabState = GrabNone;
-    ListenToAllClients();
-    for (i = mskcnt; --i >= 0 && !grabWaiters[i];);
-    if (i >= 0) {
-        i <<= 5;
-        while (!GETBIT(grabWaiters, i))
-            i++;
-        BITCLEAR(grabWaiters, i);
-        AttendClient(clients[i]);
-    }
-
-    if (ServerGrabCallback) {
-        ServerGrabInfoRec grabinfo;
-
-        grabinfo.client = client;
-        grabinfo.grabstate = SERVER_UNGRABBED;
-        CallCallbacks(&ServerGrabCallback, (pointer) &grabinfo);
-    }
-}
-
-int
-ProcUngrabServer(ClientPtr client)
-{
-    REQUEST_SIZE_MATCH(xReq);
-    UngrabServer(client);
-    return Success;
-}
-
-int
-ProcTranslateCoords(ClientPtr client)
-{
-    REQUEST(xTranslateCoordsReq);
-
-    WindowPtr pWin, pDst;
-    xTranslateCoordsReply rep;
-    int rc;
-
-    REQUEST_SIZE_MATCH(xTranslateCoordsReq);
-    rc = dixLookupWindow(&pWin, stuff->srcWid, client, DixGetAttrAccess);
-    if (rc != Success)
-        return rc;
-    rc = dixLookupWindow(&pDst, stuff->dstWid, client, DixGetAttrAccess);
-    if (rc != Success)
-        return rc;
-
-    rep = (xTranslateCoordsReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0
-    };
-    if (!SAME_SCREENS(pWin->drawable, pDst->drawable)) {
-        rep.sameScreen = xFalse;
-        rep.child = None;
-        rep.dstX = rep.dstY = 0;
-    }
-    else {
-        INT16 x, y;
-
-        rep.sameScreen = xTrue;
-        rep.child = None;
-        /* computing absolute coordinates -- adjust to destination later */
-        x = pWin->drawable.x + stuff->srcX;
-        y = pWin->drawable.y + stuff->srcY;
-        pWin = pDst->firstChild;
-        while (pWin) {
-            BoxRec box;
-
-            if ((pWin->mapped) &&
-                (x >= pWin->drawable.x - wBorderWidth(pWin)) &&
-                (x < pWin->drawable.x + (int) pWin->drawable.width +
-                 wBorderWidth(pWin)) &&
-                (y >= pWin->drawable.y - wBorderWidth(pWin)) &&
-                (y < pWin->drawable.y + (int) pWin->drawable.height +
-                 wBorderWidth(pWin))
-                /* When a window is shaped, a further check
-                 * is made to see if the point is inside
-                 * borderSize
-                 */
-                && (!wBoundingShape(pWin) ||
-                    RegionContainsPoint(&pWin->borderSize, x, y, &box))
-
-                && (!wInputShape(pWin) ||
-                    RegionContainsPoint(wInputShape(pWin),
-                                        x - pWin->drawable.x,
-                                        y - pWin->drawable.y, &box))
-                ) {
-                rep.child = pWin->drawable.id;
-                pWin = (WindowPtr) NULL;
-            }
-            else
-                pWin = pWin->nextSib;
-        }
-        /* adjust to destination coordinates */
-        rep.dstX = x - pDst->drawable.x;
-        rep.dstY = y - pDst->drawable.y;
-    }
-    WriteReplyToClient(client, sizeof(xTranslateCoordsReply), &rep);
-    return Success;
-}
-
-int
-ProcOpenFont(ClientPtr client)
-{
-    int err;
-
-    REQUEST(xOpenFontReq);
-
-    REQUEST_FIXED_SIZE(xOpenFontReq, stuff->nbytes);
-    client->errorValue = stuff->fid;
-    LEGAL_NEW_RESOURCE(stuff->fid, client);
-    err = OpenFont(client, stuff->fid, (Mask) 0,
-                   stuff->nbytes, (char *) &stuff[1]);
-    if (err == Success) {
-        return Success;
-    }
-    else
-        return err;
-}
-
-int
-ProcCloseFont(ClientPtr client)
-{
-    FontPtr pFont;
-    int rc;
-
-    REQUEST(xResourceReq);
-
-    REQUEST_SIZE_MATCH(xResourceReq);
-    rc = dixLookupResourceByType((pointer *) &pFont, stuff->id, RT_FONT,
-                                 client, DixDestroyAccess);
-    if (rc == Success) {
-        FreeResource(stuff->id, RT_NONE);
-        return Success;
-    }
-    else {
-        client->errorValue = stuff->id;
-        return rc;
-    }
-}
-
-int
-ProcQueryFont(ClientPtr client)
-{
-    xQueryFontReply *reply;
-    FontPtr pFont;
-    int rc;
-
-    REQUEST(xResourceReq);
-    REQUEST_SIZE_MATCH(xResourceReq);
-
-    rc = dixLookupFontable(&pFont, stuff->id, client, DixGetAttrAccess);
-    if (rc != Success)
-        return rc;
-
-    {
-        xCharInfo *pmax = FONTINKMAX(pFont);
-        xCharInfo *pmin = FONTINKMIN(pFont);
-        int nprotoxcistructs;
-        int rlength;
-
-        nprotoxcistructs = (pmax->rightSideBearing == pmin->rightSideBearing &&
-                            pmax->leftSideBearing == pmin->leftSideBearing &&
-                            pmax->descent == pmin->descent &&
-                            pmax->ascent == pmin->ascent &&
-                            pmax->characterWidth == pmin->characterWidth) ?
-            0 : N2dChars(pFont);
-
-        rlength = sizeof(xQueryFontReply) +
-            FONTINFONPROPS(FONTCHARSET(pFont)) * sizeof(xFontProp) +
-            nprotoxcistructs * sizeof(xCharInfo);
-        reply = calloc(1, rlength);
-        if (!reply) {
-            return BadAlloc;
-        }
-
-        reply->type = X_Reply;
-        reply->length = bytes_to_int32(rlength - sizeof(xGenericReply));
-        reply->sequenceNumber = client->sequence;
-        QueryFont(pFont, reply, nprotoxcistructs);
-
-        WriteReplyToClient(client, rlength, reply);
-        free(reply);
-        return Success;
-    }
-}
-
-int
-ProcQueryTextExtents(ClientPtr client)
-{
-    xQueryTextExtentsReply reply;
-    FontPtr pFont;
-    ExtentInfoRec info;
-    unsigned long length;
-    int rc;
-
-    REQUEST(xQueryTextExtentsReq);
-    REQUEST_AT_LEAST_SIZE(xQueryTextExtentsReq);
-
-    rc = dixLookupFontable(&pFont, stuff->fid, client, DixGetAttrAccess);
-    if (rc != Success)
-        return rc;
-
-    length = client->req_len - bytes_to_int32(sizeof(xQueryTextExtentsReq));
-    length = length << 1;
-    if (stuff->oddLength) {
-        if (length == 0)
-            return BadLength;
-        length--;
-    }
-    if (!QueryTextExtents(pFont, length, (unsigned char *) &stuff[1], &info))
-        return BadAlloc;
-    reply = (xQueryTextExtentsReply) {
-        .type = X_Reply,
-        .drawDirection = info.drawDirection,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .fontAscent = info.fontAscent,
-        .fontDescent = info.fontDescent,
-        .overallAscent = info.overallAscent,
-        .overallDescent = info.overallDescent,
-        .overallWidth = info.overallWidth,
-        .overallLeft = info.overallLeft,
-        .overallRight = info.overallRight
-    };
-    WriteReplyToClient(client, sizeof(xQueryTextExtentsReply), &reply);
-    return Success;
-}
-
-int
-ProcListFonts(ClientPtr client)
-{
-    REQUEST(xListFontsReq);
-
-    REQUEST_FIXED_SIZE(xListFontsReq, stuff->nbytes);
-
-    return ListFonts(client, (unsigned char *) &stuff[1], stuff->nbytes,
-                     stuff->maxNames);
-}
-
-int
-ProcListFontsWithInfo(ClientPtr client)
-{
-    REQUEST(xListFontsWithInfoReq);
-
-    REQUEST_FIXED_SIZE(xListFontsWithInfoReq, stuff->nbytes);
-
-    return StartListFontsWithInfo(client, stuff->nbytes,
-                                  (unsigned char *) &stuff[1], stuff->maxNames);
-}
-
-/**
- *
- *  \param value must conform to DeleteType
- */
-int
-dixDestroyPixmap(pointer value, XID pid)
-{
-    PixmapPtr pPixmap = (PixmapPtr) value;
-
-    return (*pPixmap->drawable.pScreen->DestroyPixmap) (pPixmap);
-}
-
-int
-ProcCreatePixmap(ClientPtr client)
-{
-    PixmapPtr pMap;
-    DrawablePtr pDraw;
-
-    REQUEST(xCreatePixmapReq);
-    DepthPtr pDepth;
-    int i, rc;
-
-    REQUEST_SIZE_MATCH(xCreatePixmapReq);
-    client->errorValue = stuff->pid;
-    LEGAL_NEW_RESOURCE(stuff->pid, client);
-
-    rc = dixLookupDrawable(&pDraw, stuff->drawable, client, M_ANY,
-                           DixGetAttrAccess);
-    if (rc != Success)
-        return rc;
-
-    if (!stuff->width || !stuff->height) {
-        client->errorValue = 0;
-        return BadValue;
-    }
-    if (stuff->width > 32767 || stuff->height > 32767) {
-        /* It is allowed to try and allocate a pixmap which is larger than
-         * 32767 in either dimension. However, all of the framebuffer code
-         * is buggy and does not reliably draw to such big pixmaps, basically
-         * because the Region data structure operates with signed shorts
-         * for the rectangles in it.
-         *
-         * Furthermore, several places in the X server computes the
-         * size in bytes of the pixmap and tries to store it in an
-         * integer. This integer can overflow and cause the allocated size
-         * to be much smaller.
-         *
-         * So, such big pixmaps are rejected here with a BadAlloc
-         */
-        return BadAlloc;
-    }
-    if (stuff->depth != 1) {
-        pDepth = pDraw->pScreen->allowedDepths;
-        for (i = 0; i < pDraw->pScreen->numDepths; i++, pDepth++)
-            if (pDepth->depth == stuff->depth)
-                goto CreatePmap;
-        client->errorValue = stuff->depth;
-        return BadValue;
-    }
- CreatePmap:
-    pMap = (PixmapPtr) (*pDraw->pScreen->CreatePixmap)
-        (pDraw->pScreen, stuff->width, stuff->height, stuff->depth, 0);
-    if (pMap) {
-        pMap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
-        pMap->drawable.id = stuff->pid;
-        /* security creation/labeling check */
-        rc = XaceHook(XACE_RESOURCE_ACCESS, client, stuff->pid, RT_PIXMAP,
-                      pMap, RT_NONE, NULL, DixCreateAccess);
-        if (rc != Success) {
-            (*pDraw->pScreen->DestroyPixmap) (pMap);
-            return rc;
-        }
-        if (AddResource(stuff->pid, RT_PIXMAP, (pointer) pMap))
-            return Success;
-    }
-    return BadAlloc;
-}
-
-int
-ProcFreePixmap(ClientPtr client)
-{
-    PixmapPtr pMap;
-    int rc;
-
-    REQUEST(xResourceReq);
-    REQUEST_SIZE_MATCH(xResourceReq);
-
-    rc = dixLookupResourceByType((pointer *) &pMap, stuff->id, RT_PIXMAP,
-                                 client, DixDestroyAccess);
-    if (rc == Success) {
-        FreeResource(stuff->id, RT_NONE);
-        return Success;
-    }
-    else {
-        client->errorValue = stuff->id;
-        return rc;
-    }
-}
-
-int
-ProcCreateGC(ClientPtr client)
-{
-    int error, rc;
-    GC *pGC;
-    DrawablePtr pDraw;
-    unsigned len;
-
-    REQUEST(xCreateGCReq);
-
-    REQUEST_AT_LEAST_SIZE(xCreateGCReq);
-    client->errorValue = stuff->gc;
-    LEGAL_NEW_RESOURCE(stuff->gc, client);
-    rc = dixLookupDrawable(&pDraw, stuff->drawable, client, 0,
-                           DixGetAttrAccess);
-    if (rc != Success)
-        return rc;
-
-    len = client->req_len - bytes_to_int32(sizeof(xCreateGCReq));
-    if (len != Ones(stuff->mask))
-        return BadLength;
-    pGC = (GC *) CreateGC(pDraw, stuff->mask, (XID *) &stuff[1], &error,
-                          stuff->gc, client);
-    if (error != Success)
-        return error;
-    if (!AddResource(stuff->gc, RT_GC, (pointer) pGC))
-        return BadAlloc;
-    return Success;
-}
-
-int
-ProcChangeGC(ClientPtr client)
-{
-    GC *pGC;
-    int result;
-    unsigned len;
-
-    REQUEST(xChangeGCReq);
-    REQUEST_AT_LEAST_SIZE(xChangeGCReq);
-
-    result = dixLookupGC(&pGC, stuff->gc, client, DixSetAttrAccess);
-    if (result != Success)
-        return result;
-
-    len = client->req_len - bytes_to_int32(sizeof(xChangeGCReq));
-    if (len != Ones(stuff->mask))
-        return BadLength;
-
-    return ChangeGCXIDs(client, pGC, stuff->mask, (CARD32 *) &stuff[1]);
-}
-
-int
-ProcCopyGC(ClientPtr client)
-{
-    GC *dstGC;
-    GC *pGC;
-    int result;
-
-    REQUEST(xCopyGCReq);
-    REQUEST_SIZE_MATCH(xCopyGCReq);
-
-    result = dixLookupGC(&pGC, stuff->srcGC, client, DixGetAttrAccess);
-    if (result != Success)
-        return result;
-    result = dixLookupGC(&dstGC, stuff->dstGC, client, DixSetAttrAccess);
-    if (result != Success)
-        return result;
-    if ((dstGC->pScreen != pGC->pScreen) || (dstGC->depth != pGC->depth))
-        return BadMatch;
-    if (stuff->mask & ~GCAllBits) {
-        client->errorValue = stuff->mask;
-        return BadValue;
-    }
-    return CopyGC(pGC, dstGC, stuff->mask);
-}
-
-int
-ProcSetDashes(ClientPtr client)
-{
-    GC *pGC;
-    int result;
-
-    REQUEST(xSetDashesReq);
-
-    REQUEST_FIXED_SIZE(xSetDashesReq, stuff->nDashes);
-    if (stuff->nDashes == 0) {
-        client->errorValue = 0;
-        return BadValue;
-    }
-
-    result = dixLookupGC(&pGC, stuff->gc, client, DixSetAttrAccess);
-    if (result != Success)
-        return result;
-
-    /* If there's an error, either there's no sensible errorValue,
-     * or there was a dash segment of 0. */
-    client->errorValue = 0;
-    return SetDashes(pGC, stuff->dashOffset, stuff->nDashes,
-                     (unsigned char *) &stuff[1]);
-}
-
-int
-ProcSetClipRectangles(ClientPtr client)
-{
-    int nr, result;
-    GC *pGC;
-
-    REQUEST(xSetClipRectanglesReq);
-
-    REQUEST_AT_LEAST_SIZE(xSetClipRectanglesReq);
-    if ((stuff->ordering != Unsorted) && (stuff->ordering != YSorted) &&
-        (stuff->ordering != YXSorted) && (stuff->ordering != YXBanded)) {
-        client->errorValue = stuff->ordering;
-        return BadValue;
-    }
-    result = dixLookupGC(&pGC, stuff->gc, client, DixSetAttrAccess);
-    if (result != Success)
-        return result;
-
-    nr = (client->req_len << 2) - sizeof(xSetClipRectanglesReq);
-    if (nr & 4)
-        return BadLength;
-    nr >>= 3;
-    return SetClipRects(pGC, stuff->xOrigin, stuff->yOrigin,
-                        nr, (xRectangle *) &stuff[1], (int) stuff->ordering);
-}
-
-int
-ProcFreeGC(ClientPtr client)
-{
-    GC *pGC;
-    int rc;
-
-    REQUEST(xResourceReq);
-    REQUEST_SIZE_MATCH(xResourceReq);
-
-    rc = dixLookupGC(&pGC, stuff->id, client, DixDestroyAccess);
-    if (rc != Success)
-        return rc;
-
-    FreeResource(stuff->id, RT_NONE);
-    return Success;
-}
-
-int
-ProcClearToBackground(ClientPtr client)
-{
-    REQUEST(xClearAreaReq);
-    WindowPtr pWin;
-    int rc;
-
-    REQUEST_SIZE_MATCH(xClearAreaReq);
-    rc = dixLookupWindow(&pWin, stuff->window, client, DixWriteAccess);
-    if (rc != Success)
-        return rc;
-    if (pWin->drawable.class == InputOnly) {
-        client->errorValue = stuff->window;
-        return BadMatch;
-    }
-    if ((stuff->exposures != xTrue) && (stuff->exposures != xFalse)) {
-        client->errorValue = stuff->exposures;
-        return BadValue;
-    }
-    (*pWin->drawable.pScreen->ClearToBackground) (pWin, stuff->x, stuff->y,
-                                                  stuff->width, stuff->height,
-                                                  (Bool) stuff->exposures);
-    return Success;
-}
-
-int
-ProcCopyArea(ClientPtr client)
-{
-    DrawablePtr pDst;
-    DrawablePtr pSrc;
-    GC *pGC;
-
-    REQUEST(xCopyAreaReq);
-    RegionPtr pRgn;
-    int rc;
-
-    REQUEST_SIZE_MATCH(xCopyAreaReq);
-
-    VALIDATE_DRAWABLE_AND_GC(stuff->dstDrawable, pDst, DixWriteAccess);
-    if (stuff->dstDrawable != stuff->srcDrawable) {
-        rc = dixLookupDrawable(&pSrc, stuff->srcDrawable, client, 0,
-                               DixReadAccess);
-        if (rc != Success)
-            return rc;
-        if ((pDst->pScreen != pSrc->pScreen) || (pDst->depth != pSrc->depth)) {
-            client->errorValue = stuff->dstDrawable;
-            return BadMatch;
-        }
-    }
-    else
-        pSrc = pDst;
-
-    pRgn = (*pGC->ops->CopyArea) (pSrc, pDst, pGC, stuff->srcX, stuff->srcY,
-                                  stuff->width, stuff->height,
-                                  stuff->dstX, stuff->dstY);
-    if (pGC->graphicsExposures) {
-        (*pDst->pScreen->SendGraphicsExpose)
-            (client, pRgn, stuff->dstDrawable, X_CopyArea, 0);
-        if (pRgn)
-            RegionDestroy(pRgn);
-    }
-
-    return Success;
-}
-
-int
-ProcCopyPlane(ClientPtr client)
-{
-    DrawablePtr psrcDraw, pdstDraw;
-    GC *pGC;
-
-    REQUEST(xCopyPlaneReq);
-    RegionPtr pRgn;
-    int rc;
-
-    REQUEST_SIZE_MATCH(xCopyPlaneReq);
-
-    VALIDATE_DRAWABLE_AND_GC(stuff->dstDrawable, pdstDraw, DixWriteAccess);
-    if (stuff->dstDrawable != stuff->srcDrawable) {
-        rc = dixLookupDrawable(&psrcDraw, stuff->srcDrawable, client, 0,
-                               DixReadAccess);
-        if (rc != Success)
-            return rc;
-
-        if (pdstDraw->pScreen != psrcDraw->pScreen) {
-            client->errorValue = stuff->dstDrawable;
-            return BadMatch;
-        }
-    }
-    else
-        psrcDraw = pdstDraw;
-
-    /* Check to see if stuff->bitPlane has exactly ONE good bit set */
-    if (stuff->bitPlane == 0 || (stuff->bitPlane & (stuff->bitPlane - 1)) ||
-        (stuff->bitPlane > (1L << (psrcDraw->depth - 1)))) {
-        client->errorValue = stuff->bitPlane;
-        return BadValue;
-    }
-
-    pRgn =
-        (*pGC->ops->CopyPlane) (psrcDraw, pdstDraw, pGC, stuff->srcX,
-                                stuff->srcY, stuff->width, stuff->height,
-                                stuff->dstX, stuff->dstY, stuff->bitPlane);
-    if (pGC->graphicsExposures) {
-        (*pdstDraw->pScreen->SendGraphicsExpose)
-            (client, pRgn, stuff->dstDrawable, X_CopyPlane, 0);
-        if (pRgn)
-            RegionDestroy(pRgn);
-    }
-    return Success;
-}
-
-int
-ProcPolyPoint(ClientPtr client)
-{
-    int npoint;
-    GC *pGC;
-    DrawablePtr pDraw;
-
-    REQUEST(xPolyPointReq);
-
-    REQUEST_AT_LEAST_SIZE(xPolyPointReq);
-    if ((stuff->coordMode != CoordModeOrigin) &&
-        (stuff->coordMode != CoordModePrevious)) {
-        client->errorValue = stuff->coordMode;
-        return BadValue;
-    }
-    VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess);
-    npoint = bytes_to_int32((client->req_len << 2) - sizeof(xPolyPointReq));
-    if (npoint)
-        (*pGC->ops->PolyPoint) (pDraw, pGC, stuff->coordMode, npoint,
-                                (xPoint *) &stuff[1]);
-    return Success;
-}
-
-int
-ProcPolyLine(ClientPtr client)
-{
-    int npoint;
-    GC *pGC;
-    DrawablePtr pDraw;
-
-    REQUEST(xPolyLineReq);
-
-    REQUEST_AT_LEAST_SIZE(xPolyLineReq);
-    if ((stuff->coordMode != CoordModeOrigin) &&
-        (stuff->coordMode != CoordModePrevious)) {
-        client->errorValue = stuff->coordMode;
-        return BadValue;
-    }
-    VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess);
-    npoint = bytes_to_int32((client->req_len << 2) - sizeof(xPolyLineReq));
-    if (npoint > 1)
-        (*pGC->ops->Polylines) (pDraw, pGC, stuff->coordMode, npoint,
-                                (DDXPointPtr) &stuff[1]);
-    return Success;
-}
-
-int
-ProcPolySegment(ClientPtr client)
-{
-    int nsegs;
-    GC *pGC;
-    DrawablePtr pDraw;
-
-    REQUEST(xPolySegmentReq);
-
-    REQUEST_AT_LEAST_SIZE(xPolySegmentReq);
-    VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess);
-    nsegs = (client->req_len << 2) - sizeof(xPolySegmentReq);
-    if (nsegs & 4)
-        return BadLength;
-    nsegs >>= 3;
-    if (nsegs)
-        (*pGC->ops->PolySegment) (pDraw, pGC, nsegs, (xSegment *) &stuff[1]);
-    return Success;
-}
-
-int
-ProcPolyRectangle(ClientPtr client)
-{
-    int nrects;
-    GC *pGC;
-    DrawablePtr pDraw;
-
-    REQUEST(xPolyRectangleReq);
-
-    REQUEST_AT_LEAST_SIZE(xPolyRectangleReq);
-    VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess);
-    nrects = (client->req_len << 2) - sizeof(xPolyRectangleReq);
-    if (nrects & 4)
-        return BadLength;
-    nrects >>= 3;
-    if (nrects)
-        (*pGC->ops->PolyRectangle) (pDraw, pGC,
-                                    nrects, (xRectangle *) &stuff[1]);
-    return Success;
-}
-
-int
-ProcPolyArc(ClientPtr client)
-{
-    int narcs;
-    GC *pGC;
-    DrawablePtr pDraw;
-
-    REQUEST(xPolyArcReq);
-
-    REQUEST_AT_LEAST_SIZE(xPolyArcReq);
-    VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess);
-    narcs = (client->req_len << 2) - sizeof(xPolyArcReq);
-    if (narcs % sizeof(xArc))
-        return BadLength;
-    narcs /= sizeof(xArc);
-    if (narcs)
-        (*pGC->ops->PolyArc) (pDraw, pGC, narcs, (xArc *) &stuff[1]);
-    return Success;
-}
-
-int
-ProcFillPoly(ClientPtr client)
-{
-    int things;
-    GC *pGC;
-    DrawablePtr pDraw;
-
-    REQUEST(xFillPolyReq);
-
-    REQUEST_AT_LEAST_SIZE(xFillPolyReq);
-    if ((stuff->shape != Complex) && (stuff->shape != Nonconvex) &&
-        (stuff->shape != Convex)) {
-        client->errorValue = stuff->shape;
-        return BadValue;
-    }
-    if ((stuff->coordMode != CoordModeOrigin) &&
-        (stuff->coordMode != CoordModePrevious)) {
-        client->errorValue = stuff->coordMode;
-        return BadValue;
-    }
-
-    VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess);
-    things = bytes_to_int32((client->req_len << 2) - sizeof(xFillPolyReq));
-    if (things)
-        (*pGC->ops->FillPolygon) (pDraw, pGC, stuff->shape,
-                                  stuff->coordMode, things,
-                                  (DDXPointPtr) &stuff[1]);
-    return Success;
-}
-
-int
-ProcPolyFillRectangle(ClientPtr client)
-{
-    int things;
-    GC *pGC;
-    DrawablePtr pDraw;
-
-    REQUEST(xPolyFillRectangleReq);
-
-    REQUEST_AT_LEAST_SIZE(xPolyFillRectangleReq);
-    VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess);
-    things = (client->req_len << 2) - sizeof(xPolyFillRectangleReq);
-    if (things & 4)
-        return BadLength;
-    things >>= 3;
-
-    if (things)
-        (*pGC->ops->PolyFillRect) (pDraw, pGC, things,
-                                   (xRectangle *) &stuff[1]);
-    return Success;
-}
-
-int
-ProcPolyFillArc(ClientPtr client)
-{
-    int narcs;
-    GC *pGC;
-    DrawablePtr pDraw;
-
-    REQUEST(xPolyFillArcReq);
-
-    REQUEST_AT_LEAST_SIZE(xPolyFillArcReq);
-    VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess);
-    narcs = (client->req_len << 2) - sizeof(xPolyFillArcReq);
-    if (narcs % sizeof(xArc))
-        return BadLength;
-    narcs /= sizeof(xArc);
-    if (narcs)
-        (*pGC->ops->PolyFillArc) (pDraw, pGC, narcs, (xArc *) &stuff[1]);
-    return Success;
-}
-
-#ifdef MATCH_CLIENT_ENDIAN
-
-int
-ServerOrder(void)
-{
-    int whichbyte = 1;
-
-    if (*((char *) &whichbyte))
-        return LSBFirst;
-    return MSBFirst;
-}
-
-#define ClientOrder(client) ((client)->swapped ? !ServerOrder() : ServerOrder())
-
-void
-ReformatImage(char *base, int nbytes, int bpp, int order)
-{
-    switch (bpp) {
-    case 1:                    /* yuck */
-        if (BITMAP_BIT_ORDER != order)
-            BitOrderInvert((unsigned char *) base, nbytes);
-#if IMAGE_BYTE_ORDER != BITMAP_BIT_ORDER && BITMAP_SCANLINE_UNIT != 8
-        ReformatImage(base, nbytes, BITMAP_SCANLINE_UNIT, order);
-#endif
-        break;
-    case 4:
-        break;                  /* yuck */
-    case 8:
-        break;
-    case 16:
-        if (IMAGE_BYTE_ORDER != order)
-            TwoByteSwap((unsigned char *) base, nbytes);
-        break;
-    case 32:
-        if (IMAGE_BYTE_ORDER != order)
-            FourByteSwap((unsigned char *) base, nbytes);
-        break;
-    }
-}
-#else
-#define ReformatImage(b,n,bpp,o)
-#endif
-
-/* 64-bit server notes: the protocol restricts padding of images to
- * 8-, 16-, or 32-bits. We would like to have 64-bits for the server
- * to use internally. Removes need for internal alignment checking.
- * All of the PutImage functions could be changed individually, but
- * as currently written, they call other routines which require things
- * to be 64-bit padded on scanlines, so we changed things here.
- * If an image would be padded differently for 64- versus 32-, then
- * copy each scanline to a 64-bit padded scanline.
- * Also, we need to make sure that the image is aligned on a 64-bit
- * boundary, even if the scanlines are padded to our satisfaction.
- */
-int
-ProcPutImage(ClientPtr client)
-{
-    GC *pGC;
-    DrawablePtr pDraw;
-    long length;                /* length of scanline server padded */
-    long lengthProto;           /* length of scanline protocol padded */
-    char *tmpImage;
-
-    REQUEST(xPutImageReq);
-
-    REQUEST_AT_LEAST_SIZE(xPutImageReq);
-    VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess);
-    if (stuff->format == XYBitmap) {
-        if ((stuff->depth != 1) ||
-            (stuff->leftPad >= (unsigned int) screenInfo.bitmapScanlinePad))
-            return BadMatch;
-        length = BitmapBytePad(stuff->width + stuff->leftPad);
-    }
-    else if (stuff->format == XYPixmap) {
-        if ((pDraw->depth != stuff->depth) ||
-            (stuff->leftPad >= (unsigned int) screenInfo.bitmapScanlinePad))
-            return BadMatch;
-        length = BitmapBytePad(stuff->width + stuff->leftPad);
-        length *= stuff->depth;
-    }
-    else if (stuff->format == ZPixmap) {
-        if ((pDraw->depth != stuff->depth) || (stuff->leftPad != 0))
-            return BadMatch;
-        length = PixmapBytePad(stuff->width, stuff->depth);
-    }
-    else {
-        client->errorValue = stuff->format;
-        return BadValue;
-    }
-
-    tmpImage = (char *) &stuff[1];
-    lengthProto = length;
-
-    if ((bytes_to_int32(lengthProto * stuff->height) +
-         bytes_to_int32(sizeof(xPutImageReq))) != client->req_len)
-        return BadLength;
-
-    ReformatImage(tmpImage, lengthProto * stuff->height,
-                  stuff->format == ZPixmap ? BitsPerPixel(stuff->depth) : 1,
-                  ClientOrder(client));
-
-    (*pGC->ops->PutImage) (pDraw, pGC, stuff->depth, stuff->dstX, stuff->dstY,
-                           stuff->width, stuff->height,
-                           stuff->leftPad, stuff->format, tmpImage);
-
-    return Success;
-}
-
-static int
-DoGetImage(ClientPtr client, int format, Drawable drawable,
-           int x, int y, int width, int height,
-           Mask planemask, xGetImageReply ** im_return)
-{
-    DrawablePtr pDraw, pBoundingDraw;
-    int nlines, linesPerBuf, rc;
-    int linesDone;
-
-    /* coordinates relative to the bounding drawable */
-    int relx, rely;
-    long widthBytesLine, length;
-    Mask plane = 0;
-    char *pBuf;
-    xGetImageReply xgi;
-    RegionPtr pVisibleRegion = NULL;
-
-    if ((format != XYPixmap) && (format != ZPixmap)) {
-        client->errorValue = format;
-        return BadValue;
-    }
-    rc = dixLookupDrawable(&pDraw, drawable, client, 0, DixReadAccess);
-    if (rc != Success)
-        return rc;
-
-    memset(&xgi, 0, sizeof(xGetImageReply));
-
-    relx = x;
-    rely = y;
-
-    if (pDraw->type == DRAWABLE_WINDOW) {
-        WindowPtr pWin = (WindowPtr) pDraw;
-
-        /* "If the drawable is a window, the window must be viewable ... or a
-         * BadMatch error results" */
-        if (!pWin->viewable)
-            return BadMatch;
-
-        /* If the drawable is a window, the rectangle must be contained within
-         * its bounds (including the border). */
-        if (x < -wBorderWidth(pWin) ||
-            x + width > wBorderWidth(pWin) + (int) pDraw->width ||
-            y < -wBorderWidth(pWin) ||
-            y + height > wBorderWidth(pWin) + (int) pDraw->height)
-            return BadMatch;
-
-        relx += pDraw->x;
-        rely += pDraw->y;
-
-        if (pDraw->pScreen->GetWindowPixmap) {
-            PixmapPtr pPix = (*pDraw->pScreen->GetWindowPixmap) (pWin);
-
-            pBoundingDraw = &pPix->drawable;
-#ifdef COMPOSITE
-            relx -= pPix->screen_x;
-            rely -= pPix->screen_y;
-#endif
-        }
-        else {
-            pBoundingDraw = (DrawablePtr) pDraw->pScreen->root;
-        }
-
-        xgi.visual = wVisual(pWin);
-    }
-    else {
-        pBoundingDraw = pDraw;
-        xgi.visual = None;
-    }
-
-    /* "If the drawable is a pixmap, the given rectangle must be wholly
-     *  contained within the pixmap, or a BadMatch error results.  If the
-     *  drawable is a window [...] it must be the case that if there were no
-     *  inferiors or overlapping windows, the specified rectangle of the window
-     *  would be fully visible on the screen and wholly contained within the
-     *  outside edges of the window, or a BadMatch error results."
-     *
-     * We relax the window case slightly to mean that the rectangle must exist
-     * within the bounds of the window's backing pixmap.  In particular, this
-     * means that a GetImage request may succeed or fail with BadMatch depending
-     * on whether any of its ancestor windows are redirected.  */
-    if (relx < 0 || relx + width > (int) pBoundingDraw->width ||
-        rely < 0 || rely + height > (int) pBoundingDraw->height)
-        return BadMatch;
-
-    xgi.type = X_Reply;
-    xgi.sequenceNumber = client->sequence;
-    xgi.depth = pDraw->depth;
-    if (format == ZPixmap) {
-        widthBytesLine = PixmapBytePad(width, pDraw->depth);
-        length = widthBytesLine * height;
-
-    }
-    else {
-        widthBytesLine = BitmapBytePad(width);
-        plane = ((Mask) 1) << (pDraw->depth - 1);
-        /* only planes asked for */
-        length = widthBytesLine * height *
-            Ones(planemask & (plane | (plane - 1)));
-
-    }
-
-    xgi.length = length;
-
-    if (im_return) {
-        pBuf = calloc(1, sz_xGetImageReply + length);
-        if (!pBuf)
-            return BadAlloc;
-        if (widthBytesLine == 0)
-            linesPerBuf = 0;
-        else
-            linesPerBuf = height;
-        *im_return = (xGetImageReply *) pBuf;
-        *(xGetImageReply *) pBuf = xgi;
-        pBuf += sz_xGetImageReply;
-    }
-    else {
-        xgi.length = bytes_to_int32(xgi.length);
-        if (widthBytesLine == 0 || height == 0)
-            linesPerBuf = 0;
-        else if (widthBytesLine >= IMAGE_BUFSIZE)
-            linesPerBuf = 1;
-        else {
-            linesPerBuf = IMAGE_BUFSIZE / widthBytesLine;
-            if (linesPerBuf > height)
-                linesPerBuf = height;
-        }
-        length = linesPerBuf * widthBytesLine;
-        if (linesPerBuf < height) {
-            /* we have to make sure intermediate buffers don't need padding */
-            while ((linesPerBuf > 1) &&
-                   (length & ((1L << LOG2_BYTES_PER_SCANLINE_PAD) - 1))) {
-                linesPerBuf--;
-                length -= widthBytesLine;
-            }
-            while (length & ((1L << LOG2_BYTES_PER_SCANLINE_PAD) - 1)) {
-                linesPerBuf++;
-                length += widthBytesLine;
-            }
-        }
-        if (!(pBuf = calloc(1, length)))
-            return BadAlloc;
-        WriteReplyToClient(client, sizeof(xGetImageReply), &xgi);
-    }
-
-    if (pDraw->type == DRAWABLE_WINDOW) {
-        pVisibleRegion = NotClippedByChildren((WindowPtr) pDraw);
-        if (pVisibleRegion) {
-            RegionTranslate(pVisibleRegion, -pDraw->x, -pDraw->y);
-        }
-    }
-
-    if (linesPerBuf == 0) {
-        /* nothing to do */
-    }
-    else if (format == ZPixmap) {
-        linesDone = 0;
-        while (height - linesDone > 0) {
-            nlines = min(linesPerBuf, height - linesDone);
-            (*pDraw->pScreen->GetImage) (pDraw,
-                                         x,
-                                         y + linesDone,
-                                         width,
-                                         nlines,
-                                         format, planemask, (pointer) pBuf);
-            if (pVisibleRegion)
-                XaceCensorImage(client, pVisibleRegion, widthBytesLine,
-                                pDraw, x, y + linesDone, width,
-                                nlines, format, pBuf);
-
-            /* Note that this is NOT a call to WriteSwappedDataToClient,
-               as we do NOT byte swap */
-            if (!im_return) {
-                ReformatImage(pBuf, (int) (nlines * widthBytesLine),
-                              BitsPerPixel(pDraw->depth), ClientOrder(client));
-
-/* Don't split me, gcc pukes when you do */
-                WriteToClient(client, (int) (nlines * widthBytesLine), pBuf);
-            }
-            linesDone += nlines;
-        }
-    }
-    else {                      /* XYPixmap */
-
-        for (; plane; plane >>= 1) {
-            if (planemask & plane) {
-                linesDone = 0;
-                while (height - linesDone > 0) {
-                    nlines = min(linesPerBuf, height - linesDone);
-                    (*pDraw->pScreen->GetImage) (pDraw,
-                                                 x,
-                                                 y + linesDone,
-                                                 width,
-                                                 nlines,
-                                                 format, plane, (pointer) pBuf);
-                    if (pVisibleRegion)
-                        XaceCensorImage(client, pVisibleRegion,
-                                        widthBytesLine,
-                                        pDraw, x, y + linesDone, width,
-                                        nlines, format, pBuf);
-
-                    /* Note: NOT a call to WriteSwappedDataToClient,
-                       as we do NOT byte swap */
-                    if (im_return) {
-                        pBuf += nlines * widthBytesLine;
-                    }
-                    else {
-                        ReformatImage(pBuf,
-                                      (int) (nlines * widthBytesLine),
-                                      1, ClientOrder(client));
-
-/* Don't split me, gcc pukes when you do */
-                        WriteToClient(client, (int) (nlines * widthBytesLine),
-				      pBuf);
-                    }
-                    linesDone += nlines;
-                }
-            }
-        }
-    }
-    if (pVisibleRegion)
-        RegionDestroy(pVisibleRegion);
-    if (!im_return)
-        free(pBuf);
-    return Success;
-}
-
-int
-ProcGetImage(ClientPtr client)
-{
-    REQUEST(xGetImageReq);
-
-    REQUEST_SIZE_MATCH(xGetImageReq);
-
-    return DoGetImage(client, stuff->format, stuff->drawable,
-                      stuff->x, stuff->y,
-                      (int) stuff->width, (int) stuff->height,
-                      stuff->planeMask, (xGetImageReply **) NULL);
-}
-
-int
-ProcPolyText(ClientPtr client)
-{
-    int err;
-
-    REQUEST(xPolyTextReq);
-    DrawablePtr pDraw;
-    GC *pGC;
-
-    REQUEST_AT_LEAST_SIZE(xPolyTextReq);
-    VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess);
-
-    err = PolyText(client,
-                   pDraw,
-                   pGC,
-                   (unsigned char *) &stuff[1],
-                   ((unsigned char *) stuff) + (client->req_len << 2),
-                   stuff->x, stuff->y, stuff->reqType, stuff->drawable);
-
-    if (err == Success) {
-        return Success;
-    }
-    else
-        return err;
-}
-
-int
-ProcImageText8(ClientPtr client)
-{
-    int err;
-    DrawablePtr pDraw;
-    GC *pGC;
-
-    REQUEST(xImageTextReq);
-
-    REQUEST_FIXED_SIZE(xImageTextReq, stuff->nChars);
-    VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess);
-
-    err = ImageText(client,
-                    pDraw,
-                    pGC,
-                    stuff->nChars,
-                    (unsigned char *) &stuff[1],
-                    stuff->x, stuff->y, stuff->reqType, stuff->drawable);
-
-    if (err == Success) {
-        return Success;
-    }
-    else
-        return err;
-}
-
-int
-ProcImageText16(ClientPtr client)
-{
-    int err;
-    DrawablePtr pDraw;
-    GC *pGC;
-
-    REQUEST(xImageTextReq);
-
-    REQUEST_FIXED_SIZE(xImageTextReq, stuff->nChars << 1);
-    VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess);
-
-    err = ImageText(client,
-                    pDraw,
-                    pGC,
-                    stuff->nChars,
-                    (unsigned char *) &stuff[1],
-                    stuff->x, stuff->y, stuff->reqType, stuff->drawable);
-
-    if (err == Success) {
-        return Success;
-    }
-    else
-        return err;
-}
-
-int
-ProcCreateColormap(ClientPtr client)
-{
-    VisualPtr pVisual;
-    ColormapPtr pmap;
-    Colormap mid;
-    WindowPtr pWin;
-    ScreenPtr pScreen;
-
-    REQUEST(xCreateColormapReq);
-    int i, result;
-
-    REQUEST_SIZE_MATCH(xCreateColormapReq);
-
-    if ((stuff->alloc != AllocNone) && (stuff->alloc != AllocAll)) {
-        client->errorValue = stuff->alloc;
-        return BadValue;
-    }
-    mid = stuff->mid;
-    LEGAL_NEW_RESOURCE(mid, client);
-    result = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
-    if (result != Success)
-        return result;
-
-    pScreen = pWin->drawable.pScreen;
-    for (i = 0, pVisual = pScreen->visuals;
-         i < pScreen->numVisuals; i++, pVisual++) {
-        if (pVisual->vid != stuff->visual)
-            continue;
-        return CreateColormap(mid, pScreen, pVisual, &pmap,
-                              (int) stuff->alloc, client->index);
-    }
-    client->errorValue = stuff->visual;
-    return BadMatch;
-}
-
-int
-ProcFreeColormap(ClientPtr client)
-{
-    ColormapPtr pmap;
-    int rc;
-
-    REQUEST(xResourceReq);
-
-    REQUEST_SIZE_MATCH(xResourceReq);
-    rc = dixLookupResourceByType((pointer *) &pmap, stuff->id, RT_COLORMAP,
-                                 client, DixDestroyAccess);
-    if (rc == Success) {
-        /* Freeing a default colormap is a no-op */
-        if (!(pmap->flags & IsDefault))
-            FreeResource(stuff->id, RT_NONE);
-        return Success;
-    }
-    else {
-        client->errorValue = stuff->id;
-        return rc;
-    }
-}
-
-int
-ProcCopyColormapAndFree(ClientPtr client)
-{
-    Colormap mid;
-    ColormapPtr pSrcMap;
-
-    REQUEST(xCopyColormapAndFreeReq);
-    int rc;
-
-    REQUEST_SIZE_MATCH(xCopyColormapAndFreeReq);
-    mid = stuff->mid;
-    LEGAL_NEW_RESOURCE(mid, client);
-    rc = dixLookupResourceByType((pointer *) &pSrcMap, stuff->srcCmap,
-                                 RT_COLORMAP, client,
-                                 DixReadAccess | DixRemoveAccess);
-    if (rc == Success)
-        return CopyColormapAndFree(mid, pSrcMap, client->index);
-    client->errorValue = stuff->srcCmap;
-    return rc;
-}
-
-int
-ProcInstallColormap(ClientPtr client)
-{
-    ColormapPtr pcmp;
-    int rc;
-
-    REQUEST(xResourceReq);
-    REQUEST_SIZE_MATCH(xResourceReq);
-
-    rc = dixLookupResourceByType((pointer *) &pcmp, stuff->id, RT_COLORMAP,
-                                 client, DixInstallAccess);
-    if (rc != Success)
-        goto out;
-
-    rc = XaceHook(XACE_SCREEN_ACCESS, client, pcmp->pScreen, DixSetAttrAccess);
-    if (rc != Success) {
-        if (rc == BadValue)
-            rc = BadColor;
-        goto out;
-    }
-
-    (*(pcmp->pScreen->InstallColormap)) (pcmp);
-    return Success;
-
- out:
-    client->errorValue = stuff->id;
-    return rc;
-}
-
-int
-ProcUninstallColormap(ClientPtr client)
-{
-    ColormapPtr pcmp;
-    int rc;
-
-    REQUEST(xResourceReq);
-    REQUEST_SIZE_MATCH(xResourceReq);
-
-    rc = dixLookupResourceByType((pointer *) &pcmp, stuff->id, RT_COLORMAP,
-                                 client, DixUninstallAccess);
-    if (rc != Success)
-        goto out;
-
-    rc = XaceHook(XACE_SCREEN_ACCESS, client, pcmp->pScreen, DixSetAttrAccess);
-    if (rc != Success) {
-        if (rc == BadValue)
-            rc = BadColor;
-        goto out;
-    }
-
-    if (pcmp->mid != pcmp->pScreen->defColormap)
-        (*(pcmp->pScreen->UninstallColormap)) (pcmp);
-    return Success;
-
- out:
-    client->errorValue = stuff->id;
-    return rc;
-}
-
-int
-ProcListInstalledColormaps(ClientPtr client)
-{
-    xListInstalledColormapsReply *preply;
-    int nummaps, rc;
-    WindowPtr pWin;
-
-    REQUEST(xResourceReq);
-    REQUEST_SIZE_MATCH(xResourceReq);
-
-    rc = dixLookupWindow(&pWin, stuff->id, client, DixGetAttrAccess);
-    if (rc != Success)
-        return rc;
-
-    rc = XaceHook(XACE_SCREEN_ACCESS, client, pWin->drawable.pScreen,
-                  DixGetAttrAccess);
-    if (rc != Success)
-        return rc;
-
-    preply = malloc(sizeof(xListInstalledColormapsReply) +
-                    pWin->drawable.pScreen->maxInstalledCmaps *
-                    sizeof(Colormap));
-    if (!preply)
-        return BadAlloc;
-
-    preply->type = X_Reply;
-    preply->sequenceNumber = client->sequence;
-    nummaps = (*pWin->drawable.pScreen->ListInstalledColormaps)
-        (pWin->drawable.pScreen, (Colormap *) &preply[1]);
-    preply->nColormaps = nummaps;
-    preply->length = nummaps;
-    WriteReplyToClient(client, sizeof(xListInstalledColormapsReply), preply);
-    client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write;
-    WriteSwappedDataToClient(client, nummaps * sizeof(Colormap), &preply[1]);
-    free(preply);
-    return Success;
-}
-
-int
-ProcAllocColor(ClientPtr client)
-{
-    ColormapPtr pmap;
-    int rc;
-
-    REQUEST(xAllocColorReq);
-
-    REQUEST_SIZE_MATCH(xAllocColorReq);
-    rc = dixLookupResourceByType((pointer *) &pmap, stuff->cmap, RT_COLORMAP,
-                                 client, DixAddAccess);
-    if (rc == Success) {
-        xAllocColorReply acr = {
-            .type = X_Reply,
-            .sequenceNumber = client->sequence,
-            .length = 0,
-            .red = stuff->red,
-            .green = stuff->green,
-            .blue = stuff->blue,
-            .pixel = 0
-        };
-        if ((rc = AllocColor(pmap, &acr.red, &acr.green, &acr.blue,
-                             &acr.pixel, client->index)))
-            return rc;
-#ifdef PANORAMIX
-        if (noPanoramiXExtension || !pmap->pScreen->myNum)
-#endif
-            WriteReplyToClient(client, sizeof(xAllocColorReply), &acr);
-        return Success;
-
-    }
-    else {
-        client->errorValue = stuff->cmap;
-        return rc;
-    }
-}
-
-int
-ProcAllocNamedColor(ClientPtr client)
-{
-    ColormapPtr pcmp;
-    int rc;
-
-    REQUEST(xAllocNamedColorReq);
-
-    REQUEST_FIXED_SIZE(xAllocNamedColorReq, stuff->nbytes);
-    rc = dixLookupResourceByType((pointer *) &pcmp, stuff->cmap, RT_COLORMAP,
-                                 client, DixAddAccess);
-    if (rc == Success) {
-        xAllocNamedColorReply ancr = {
-            .type = X_Reply,
-            .sequenceNumber = client->sequence,
-            .length = 0
-        };
-        if (OsLookupColor
-            (pcmp->pScreen->myNum, (char *) &stuff[1], stuff->nbytes,
-             &ancr.exactRed, &ancr.exactGreen, &ancr.exactBlue)) {
-            ancr.screenRed = ancr.exactRed;
-            ancr.screenGreen = ancr.exactGreen;
-            ancr.screenBlue = ancr.exactBlue;
-            ancr.pixel = 0;
-            if ((rc = AllocColor(pcmp,
-                                 &ancr.screenRed, &ancr.screenGreen,
-                                 &ancr.screenBlue, &ancr.pixel, client->index)))
-                return rc;
-#ifdef PANORAMIX
-            if (noPanoramiXExtension || !pcmp->pScreen->myNum)
-#endif
-                WriteReplyToClient(client, sizeof(xAllocNamedColorReply),
-                                   &ancr);
-            return Success;
-        }
-        else
-            return BadName;
-
-    }
-    else {
-        client->errorValue = stuff->cmap;
-        return rc;
-    }
-}
-
-int
-ProcAllocColorCells(ClientPtr client)
-{
-    ColormapPtr pcmp;
-    int rc;
-
-    REQUEST(xAllocColorCellsReq);
-
-    REQUEST_SIZE_MATCH(xAllocColorCellsReq);
-    rc = dixLookupResourceByType((pointer *) &pcmp, stuff->cmap, RT_COLORMAP,
-                                 client, DixAddAccess);
-    if (rc == Success) {
-        int npixels, nmasks;
-        long length;
-        Pixel *ppixels, *pmasks;
-
-        npixels = stuff->colors;
-        if (!npixels) {
-            client->errorValue = npixels;
-            return BadValue;
-        }
-        if (stuff->contiguous != xTrue && stuff->contiguous != xFalse) {
-            client->errorValue = stuff->contiguous;
-            return BadValue;
-        }
-        nmasks = stuff->planes;
-        length = ((long) npixels + (long) nmasks) * sizeof(Pixel);
-        ppixels = malloc(length);
-        if (!ppixels)
-            return BadAlloc;
-        pmasks = ppixels + npixels;
-
-        if ((rc = AllocColorCells(client->index, pcmp, npixels, nmasks,
-                                  (Bool) stuff->contiguous, ppixels, pmasks))) {
-            free(ppixels);
-            return rc;
-        }
-#ifdef PANORAMIX
-        if (noPanoramiXExtension || !pcmp->pScreen->myNum)
-#endif
-        {
-            xAllocColorCellsReply accr = {
-                .type = X_Reply,
-                .sequenceNumber = client->sequence,
-                .length = bytes_to_int32(length),
-                .nPixels = npixels,
-                .nMasks = nmasks
-            };
-            WriteReplyToClient(client, sizeof(xAllocColorCellsReply), &accr);
-            client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write;
-            WriteSwappedDataToClient(client, length, ppixels);
-        }
-        free(ppixels);
-        return Success;
-    }
-    else {
-        client->errorValue = stuff->cmap;
-        return rc;
-    }
-}
-
-int
-ProcAllocColorPlanes(ClientPtr client)
-{
-    ColormapPtr pcmp;
-    int rc;
-
-    REQUEST(xAllocColorPlanesReq);
-
-    REQUEST_SIZE_MATCH(xAllocColorPlanesReq);
-    rc = dixLookupResourceByType((pointer *) &pcmp, stuff->cmap, RT_COLORMAP,
-                                 client, DixAddAccess);
-    if (rc == Success) {
-        xAllocColorPlanesReply acpr;
-        int npixels;
-        long length;
-        Pixel *ppixels;
-
-        npixels = stuff->colors;
-        if (!npixels) {
-            client->errorValue = npixels;
-            return BadValue;
-        }
-        if (stuff->contiguous != xTrue && stuff->contiguous != xFalse) {
-            client->errorValue = stuff->contiguous;
-            return BadValue;
-        }
-        acpr = (xAllocColorPlanesReply) {
-            .type = X_Reply,
-            .sequenceNumber = client->sequence,
-            .nPixels = npixels
-        };
-        length = (long) npixels *sizeof(Pixel);
-
-        ppixels = malloc(length);
-        if (!ppixels)
-            return BadAlloc;
-        if ((rc = AllocColorPlanes(client->index, pcmp, npixels,
-                                   (int) stuff->red, (int) stuff->green,
-                                   (int) stuff->blue, (Bool) stuff->contiguous,
-                                   ppixels, &acpr.redMask, &acpr.greenMask,
-                                   &acpr.blueMask))) {
-            free(ppixels);
-            return rc;
-        }
-        acpr.length = bytes_to_int32(length);
-#ifdef PANORAMIX
-        if (noPanoramiXExtension || !pcmp->pScreen->myNum)
-#endif
-        {
-            WriteReplyToClient(client, sizeof(xAllocColorPlanesReply), &acpr);
-            client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write;
-            WriteSwappedDataToClient(client, length, ppixels);
-        }
-        free(ppixels);
-        return Success;
-    }
-    else {
-        client->errorValue = stuff->cmap;
-        return rc;
-    }
-}
-
-int
-ProcFreeColors(ClientPtr client)
-{
-    ColormapPtr pcmp;
-    int rc;
-
-    REQUEST(xFreeColorsReq);
-
-    REQUEST_AT_LEAST_SIZE(xFreeColorsReq);
-    rc = dixLookupResourceByType((pointer *) &pcmp, stuff->cmap, RT_COLORMAP,
-                                 client, DixRemoveAccess);
-    if (rc == Success) {
-        int count;
-
-        if (pcmp->flags & AllAllocated)
-            return BadAccess;
-        count = bytes_to_int32((client->req_len << 2) - sizeof(xFreeColorsReq));
-        return FreeColors(pcmp, client->index, count,
-                          (Pixel *) &stuff[1], (Pixel) stuff->planeMask);
-    }
-    else {
-        client->errorValue = stuff->cmap;
-        return rc;
-    }
-}
-
-int
-ProcStoreColors(ClientPtr client)
-{
-    ColormapPtr pcmp;
-    int rc;
-
-    REQUEST(xStoreColorsReq);
-
-    REQUEST_AT_LEAST_SIZE(xStoreColorsReq);
-    rc = dixLookupResourceByType((pointer *) &pcmp, stuff->cmap, RT_COLORMAP,
-                                 client, DixWriteAccess);
-    if (rc == Success) {
-        int count;
-
-        count = (client->req_len << 2) - sizeof(xStoreColorsReq);
-        if (count % sizeof(xColorItem))
-            return BadLength;
-        count /= sizeof(xColorItem);
-        return StoreColors(pcmp, count, (xColorItem *) &stuff[1], client);
-    }
-    else {
-        client->errorValue = stuff->cmap;
-        return rc;
-    }
-}
-
-int
-ProcStoreNamedColor(ClientPtr client)
-{
-    ColormapPtr pcmp;
-    int rc;
-
-    REQUEST(xStoreNamedColorReq);
-
-    REQUEST_FIXED_SIZE(xStoreNamedColorReq, stuff->nbytes);
-    rc = dixLookupResourceByType((pointer *) &pcmp, stuff->cmap, RT_COLORMAP,
-                                 client, DixWriteAccess);
-    if (rc == Success) {
-        xColorItem def;
-
-        if (OsLookupColor(pcmp->pScreen->myNum, (char *) &stuff[1],
-                          stuff->nbytes, &def.red, &def.green, &def.blue)) {
-            def.flags = stuff->flags;
-            def.pixel = stuff->pixel;
-            return StoreColors(pcmp, 1, &def, client);
-        }
-        return BadName;
-    }
-    else {
-        client->errorValue = stuff->cmap;
-        return rc;
-    }
-}
-
-int
-ProcQueryColors(ClientPtr client)
-{
-    ColormapPtr pcmp;
-    int rc;
-
-    REQUEST(xQueryColorsReq);
-
-    REQUEST_AT_LEAST_SIZE(xQueryColorsReq);
-    rc = dixLookupResourceByType((pointer *) &pcmp, stuff->cmap, RT_COLORMAP,
-                                 client, DixReadAccess);
-    if (rc == Success) {
-        int count;
-        xrgb *prgbs;
-        xQueryColorsReply qcr;
-
-        count =
-            bytes_to_int32((client->req_len << 2) - sizeof(xQueryColorsReq));
-        prgbs = calloc(1, count * sizeof(xrgb));
-        if (!prgbs && count)
-            return BadAlloc;
-        if ((rc =
-             QueryColors(pcmp, count, (Pixel *) &stuff[1], prgbs, client))) {
-            free(prgbs);
-            return rc;
-        }
-        qcr = (xQueryColorsReply) {
-            .type = X_Reply,
-            .sequenceNumber = client->sequence,
-            .length = bytes_to_int32(count * sizeof(xrgb)),
-            .nColors = count
-        };
-        WriteReplyToClient(client, sizeof(xQueryColorsReply), &qcr);
-        if (count) {
-            client->pSwapReplyFunc = (ReplySwapPtr) SQColorsExtend;
-            WriteSwappedDataToClient(client, count * sizeof(xrgb), prgbs);
-        }
-        free(prgbs);
-        return Success;
-
-    }
-    else {
-        client->errorValue = stuff->cmap;
-        return rc;
-    }
-}
-
-int
-ProcLookupColor(ClientPtr client)
-{
-    ColormapPtr pcmp;
-    int rc;
-
-    REQUEST(xLookupColorReq);
-
-    REQUEST_FIXED_SIZE(xLookupColorReq, stuff->nbytes);
-    rc = dixLookupResourceByType((pointer *) &pcmp, stuff->cmap, RT_COLORMAP,
-                                 client, DixReadAccess);
-    if (rc == Success) {
-        CARD16 exactRed, exactGreen, exactBlue;
-
-        if (OsLookupColor
-            (pcmp->pScreen->myNum, (char *) &stuff[1], stuff->nbytes,
-             &exactRed, &exactGreen, &exactBlue)) {
-            xLookupColorReply lcr = {
-                .type = X_Reply,
-                .sequenceNumber = client->sequence,
-                .length = 0,
-                .exactRed = exactRed,
-                .exactGreen = exactGreen,
-                .exactBlue = exactBlue,
-                .screenRed = exactRed,
-                .screenGreen = exactGreen,
-                .screenBlue = exactBlue
-            };
-            (*pcmp->pScreen->ResolveColor) (&lcr.screenRed,
-                                            &lcr.screenGreen,
-                                            &lcr.screenBlue, pcmp->pVisual);
-            WriteReplyToClient(client, sizeof(xLookupColorReply), &lcr);
-            return Success;
-        }
-        return BadName;
-    }
-    else {
-        client->errorValue = stuff->cmap;
-        return rc;
-    }
-}
-
-int
-ProcCreateCursor(ClientPtr client)
-{
-    CursorPtr pCursor;
-    PixmapPtr src;
-    PixmapPtr msk;
-    unsigned char *srcbits;
-    unsigned char *mskbits;
-    unsigned short width, height;
-    long n;
-    CursorMetricRec cm;
-    int rc;
-
-    REQUEST(xCreateCursorReq);
-
-    REQUEST_SIZE_MATCH(xCreateCursorReq);
-    LEGAL_NEW_RESOURCE(stuff->cid, client);
-
-    rc = dixLookupResourceByType((pointer *) &src, stuff->source, RT_PIXMAP,
-                                 client, DixReadAccess);
-    if (rc != Success) {
-        client->errorValue = stuff->source;
-        return rc;
-    }
-
-    rc = dixLookupResourceByType((pointer *) &msk, stuff->mask, RT_PIXMAP,
-                                 client, DixReadAccess);
-    if (rc != Success) {
-        if (stuff->mask != None) {
-            client->errorValue = stuff->mask;
-            return rc;
-        }
-    }
-    else if (src->drawable.width != msk->drawable.width
-             || src->drawable.height != msk->drawable.height
-             || src->drawable.depth != 1 || msk->drawable.depth != 1)
-        return BadMatch;
-
-    width = src->drawable.width;
-    height = src->drawable.height;
-
-    if (stuff->x > width || stuff->y > height)
-        return BadMatch;
-
-    n = BitmapBytePad(width) * height;
-    srcbits = calloc(1, n);
-    if (!srcbits)
-        return BadAlloc;
-    mskbits = malloc(n);
-    if (!mskbits) {
-        free(srcbits);
-        return BadAlloc;
-    }
-
-    (*src->drawable.pScreen->GetImage) ((DrawablePtr) src, 0, 0, width, height,
-                                        XYPixmap, 1, (pointer) srcbits);
-    if (msk == (PixmapPtr) NULL) {
-        unsigned char *bits = mskbits;
-
-        while (--n >= 0)
-            *bits++ = ~0;
-    }
-    else {
-        /* zeroing the (pad) bits helps some ddx cursor handling */
-        memset((char *) mskbits, 0, n);
-        (*msk->drawable.pScreen->GetImage) ((DrawablePtr) msk, 0, 0, width,
-                                            height, XYPixmap, 1,
-                                            (pointer) mskbits);
-    }
-    cm.width = width;
-    cm.height = height;
-    cm.xhot = stuff->x;
-    cm.yhot = stuff->y;
-    rc = AllocARGBCursor(srcbits, mskbits, NULL, &cm,
-                         stuff->foreRed, stuff->foreGreen, stuff->foreBlue,
-                         stuff->backRed, stuff->backGreen, stuff->backBlue,
-                         &pCursor, client, stuff->cid);
-
-    if (rc != Success)
-        goto bail;
-    if (!AddResource(stuff->cid, RT_CURSOR, (pointer) pCursor)) {
-        rc = BadAlloc;
-        goto bail;
-    }
-
-    return Success;
- bail:
-    free(srcbits);
-    free(mskbits);
-    return rc;
-}
-
-int
-ProcCreateGlyphCursor(ClientPtr client)
-{
-    CursorPtr pCursor;
-    int res;
-
-    REQUEST(xCreateGlyphCursorReq);
-
-    REQUEST_SIZE_MATCH(xCreateGlyphCursorReq);
-    LEGAL_NEW_RESOURCE(stuff->cid, client);
-
-    res = AllocGlyphCursor(stuff->source, stuff->sourceChar,
-                           stuff->mask, stuff->maskChar,
-                           stuff->foreRed, stuff->foreGreen, stuff->foreBlue,
-                           stuff->backRed, stuff->backGreen, stuff->backBlue,
-                           &pCursor, client, stuff->cid);
-    if (res != Success)
-        return res;
-    if (AddResource(stuff->cid, RT_CURSOR, (pointer) pCursor))
-        return Success;
-    return BadAlloc;
-}
-
-int
-ProcFreeCursor(ClientPtr client)
-{
-    CursorPtr pCursor;
-    int rc;
-
-    REQUEST(xResourceReq);
-
-    REQUEST_SIZE_MATCH(xResourceReq);
-    rc = dixLookupResourceByType((pointer *) &pCursor, stuff->id, RT_CURSOR,
-                                 client, DixDestroyAccess);
-    if (rc == Success) {
-        FreeResource(stuff->id, RT_NONE);
-        return Success;
-    }
-    else {
-        client->errorValue = stuff->id;
-        return rc;
-    }
-}
-
-int
-ProcQueryBestSize(ClientPtr client)
-{
-    xQueryBestSizeReply reply;
-    DrawablePtr pDraw;
-    ScreenPtr pScreen;
-    int rc;
-
-    REQUEST(xQueryBestSizeReq);
-    REQUEST_SIZE_MATCH(xQueryBestSizeReq);
-
-    if ((stuff->class != CursorShape) &&
-        (stuff->class != TileShape) && (stuff->class != StippleShape)) {
-        client->errorValue = stuff->class;
-        return BadValue;
-    }
-
-    rc = dixLookupDrawable(&pDraw, stuff->drawable, client, M_ANY,
-                           DixGetAttrAccess);
-    if (rc != Success)
-        return rc;
-    if (stuff->class != CursorShape && pDraw->type == UNDRAWABLE_WINDOW)
-        return BadMatch;
-    pScreen = pDraw->pScreen;
-    rc = XaceHook(XACE_SCREEN_ACCESS, client, pScreen, DixGetAttrAccess);
-    if (rc != Success)
-        return rc;
-    (*pScreen->QueryBestSize) (stuff->class, &stuff->width,
-                               &stuff->height, pScreen);
-    reply = (xQueryBestSizeReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .width = stuff->width,
-        .height = stuff->height
-    };
-    WriteReplyToClient(client, sizeof(xQueryBestSizeReply), &reply);
-    return Success;
-}
-
-int
-ProcSetScreenSaver(ClientPtr client)
-{
-    int rc, i, blankingOption, exposureOption;
-
-    REQUEST(xSetScreenSaverReq);
-    REQUEST_SIZE_MATCH(xSetScreenSaverReq);
-
-    for (i = 0; i < screenInfo.numScreens; i++) {
-        rc = XaceHook(XACE_SCREENSAVER_ACCESS, client, screenInfo.screens[i],
-                      DixSetAttrAccess);
-        if (rc != Success)
-            return rc;
-    }
-
-    blankingOption = stuff->preferBlank;
-    if ((blankingOption != DontPreferBlanking) &&
-        (blankingOption != PreferBlanking) &&
-        (blankingOption != DefaultBlanking)) {
-        client->errorValue = blankingOption;
-        return BadValue;
-    }
-    exposureOption = stuff->allowExpose;
-    if ((exposureOption != DontAllowExposures) &&
-        (exposureOption != AllowExposures) &&
-        (exposureOption != DefaultExposures)) {
-        client->errorValue = exposureOption;
-        return BadValue;
-    }
-    if (stuff->timeout < -1) {
-        client->errorValue = stuff->timeout;
-        return BadValue;
-    }
-    if (stuff->interval < -1) {
-        client->errorValue = stuff->interval;
-        return BadValue;
-    }
-
-    if (blankingOption == DefaultBlanking)
-        ScreenSaverBlanking = defaultScreenSaverBlanking;
-    else
-        ScreenSaverBlanking = blankingOption;
-    if (exposureOption == DefaultExposures)
-        ScreenSaverAllowExposures = defaultScreenSaverAllowExposures;
-    else
-        ScreenSaverAllowExposures = exposureOption;
-
-    if (stuff->timeout >= 0)
-        ScreenSaverTime = stuff->timeout * MILLI_PER_SECOND;
-    else
-        ScreenSaverTime = defaultScreenSaverTime;
-    if (stuff->interval >= 0)
-        ScreenSaverInterval = stuff->interval * MILLI_PER_SECOND;
-    else
-        ScreenSaverInterval = defaultScreenSaverInterval;
-
-    SetScreenSaverTimer();
-    return Success;
-}
-
-int
-ProcGetScreenSaver(ClientPtr client)
-{
-    xGetScreenSaverReply rep;
-    int rc, i;
-
-    REQUEST_SIZE_MATCH(xReq);
-
-    for (i = 0; i < screenInfo.numScreens; i++) {
-        rc = XaceHook(XACE_SCREENSAVER_ACCESS, client, screenInfo.screens[i],
-                      DixGetAttrAccess);
-        if (rc != Success)
-            return rc;
-    }
-
-    rep = (xGetScreenSaverReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .timeout = ScreenSaverTime / MILLI_PER_SECOND,
-        .interval = ScreenSaverInterval / MILLI_PER_SECOND,
-        .preferBlanking = ScreenSaverBlanking,
-        .allowExposures = ScreenSaverAllowExposures
-    };
-    WriteReplyToClient(client, sizeof(xGetScreenSaverReply), &rep);
-    return Success;
-}
-
-int
-ProcChangeHosts(ClientPtr client)
-{
-    REQUEST(xChangeHostsReq);
-
-    REQUEST_FIXED_SIZE(xChangeHostsReq, stuff->hostLength);
-
-    if (stuff->mode == HostInsert)
-        return AddHost(client, (int) stuff->hostFamily,
-                       stuff->hostLength, (pointer) &stuff[1]);
-    if (stuff->mode == HostDelete)
-        return RemoveHost(client, (int) stuff->hostFamily,
-                          stuff->hostLength, (pointer) &stuff[1]);
-    client->errorValue = stuff->mode;
-    return BadValue;
-}
-
-int
-ProcListHosts(ClientPtr client)
-{
-    xListHostsReply reply;
-    int len, nHosts, result;
-    BOOL enabled;
-    pointer pdata;
-
-    /* REQUEST(xListHostsReq); */
-
-    REQUEST_SIZE_MATCH(xListHostsReq);
-
-    /* untrusted clients can't list hosts */
-    result = XaceHook(XACE_SERVER_ACCESS, client, DixReadAccess);
-    if (result != Success)
-        return result;
-
-    result = GetHosts(&pdata, &nHosts, &len, &enabled);
-    if (result != Success)
-        return result;
-
-    reply = (xListHostsReply) {
-        .type = X_Reply,
-        .enabled = enabled,
-        .sequenceNumber = client->sequence,
-        .length = bytes_to_int32(len),
-        .nHosts = nHosts
-    };
-    WriteReplyToClient(client, sizeof(xListHostsReply), &reply);
-    if (nHosts) {
-        client->pSwapReplyFunc = (ReplySwapPtr) SLHostsExtend;
-        WriteSwappedDataToClient(client, len, pdata);
-    }
-    free(pdata);
-    return Success;
-}
-
-int
-ProcChangeAccessControl(ClientPtr client)
-{
-    REQUEST(xSetAccessControlReq);
-
-    REQUEST_SIZE_MATCH(xSetAccessControlReq);
-    if ((stuff->mode != EnableAccess) && (stuff->mode != DisableAccess)) {
-        client->errorValue = stuff->mode;
-        return BadValue;
-    }
-    return ChangeAccessControl(client, stuff->mode == EnableAccess);
-}
-
-/*********************
- * CloseDownRetainedResources
- *
- *    Find all clients that are gone and have terminated in RetainTemporary 
- *    and destroy their resources.
- *********************/
-
-static void
-CloseDownRetainedResources(void)
-{
-    int i;
-    ClientPtr client;
-
-    for (i = 1; i < currentMaxClients; i++) {
-        client = clients[i];
-        if (client && (client->closeDownMode == RetainTemporary)
-            && (client->clientGone))
-            CloseDownClient(client);
-    }
-}
-
-int
-ProcKillClient(ClientPtr client)
-{
-    REQUEST(xResourceReq);
-    ClientPtr killclient;
-    int rc;
-
-    REQUEST_SIZE_MATCH(xResourceReq);
-    if (stuff->id == AllTemporary) {
-        CloseDownRetainedResources();
-        return Success;
-    }
-
-    rc = dixLookupClient(&killclient, stuff->id, client, DixDestroyAccess);
-    if (rc == Success) {
-        CloseDownClient(killclient);
-        /* if an LBX proxy gets killed, isItTimeToYield will be set */
-        if (isItTimeToYield || (client == killclient)) {
-            /* force yield and return Success, so that Dispatch()
-             * doesn't try to touch client
-             */
-            isItTimeToYield = TRUE;
-            return Success;
-        }
-        return Success;
-    }
-    else
-        return rc;
-}
-
-int
-ProcSetFontPath(ClientPtr client)
-{
-    unsigned char *ptr;
-    unsigned long nbytes, total;
-    long nfonts;
-    int n;
-
-    REQUEST(xSetFontPathReq);
-
-    REQUEST_AT_LEAST_SIZE(xSetFontPathReq);
-
-    nbytes = (client->req_len << 2) - sizeof(xSetFontPathReq);
-    total = nbytes;
-    ptr = (unsigned char *) &stuff[1];
-    nfonts = stuff->nFonts;
-    while (--nfonts >= 0) {
-        if ((total == 0) || (total < (n = (*ptr + 1))))
-            return BadLength;
-        total -= n;
-        ptr += n;
-    }
-    if (total >= 4)
-        return BadLength;
-    return SetFontPath(client, stuff->nFonts, (unsigned char *) &stuff[1]);
-}
-
-int
-ProcGetFontPath(ClientPtr client)
-{
-    xGetFontPathReply reply;
-    int rc, stringLens, numpaths;
-    unsigned char *bufferStart;
-
-    /* REQUEST (xReq); */
-
-    REQUEST_SIZE_MATCH(xReq);
-    rc = GetFontPath(client, &numpaths, &stringLens, &bufferStart);
-    if (rc != Success)
-        return rc;
-
-    reply = (xGetFontPathReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = bytes_to_int32(stringLens + numpaths),
-        .nPaths = numpaths
-    };
-
-    WriteReplyToClient(client, sizeof(xGetFontPathReply), &reply);
-    if (stringLens || numpaths)
-        WriteToClient(client, stringLens + numpaths, bufferStart);
-    return Success;
-}
-
-int
-ProcChangeCloseDownMode(ClientPtr client)
-{
-    int rc;
-
-    REQUEST(xSetCloseDownModeReq);
-    REQUEST_SIZE_MATCH(xSetCloseDownModeReq);
-
-    rc = XaceHook(XACE_CLIENT_ACCESS, client, client, DixManageAccess);
-    if (rc != Success)
-        return rc;
-
-    if ((stuff->mode == AllTemporary) ||
-        (stuff->mode == RetainPermanent) || (stuff->mode == RetainTemporary)) {
-        client->closeDownMode = stuff->mode;
-        return Success;
-    }
-    else {
-        client->errorValue = stuff->mode;
-        return BadValue;
-    }
-}
-
-int
-ProcForceScreenSaver(ClientPtr client)
-{
-    int rc;
-
-    REQUEST(xForceScreenSaverReq);
-
-    REQUEST_SIZE_MATCH(xForceScreenSaverReq);
-
-    if ((stuff->mode != ScreenSaverReset) && (stuff->mode != ScreenSaverActive)) {
-        client->errorValue = stuff->mode;
-        return BadValue;
-    }
-    rc = dixSaveScreens(client, SCREEN_SAVER_FORCER, (int) stuff->mode);
-    if (rc != Success)
-        return rc;
-    return Success;
-}
-
-int
-ProcNoOperation(ClientPtr client)
-{
-    REQUEST_AT_LEAST_SIZE(xReq);
-
-    /* noop -- don't do anything */
-    return Success;
-}
-
-/**********************
- * CloseDownClient
- *
- *  Client can either mark his resources destroy or retain.  If retained and
- *  then killed again, the client is really destroyed.
- *********************/
-
-char dispatchExceptionAtReset = DE_RESET;
-
-void
-CloseDownClient(ClientPtr client)
-{
-    Bool really_close_down = client->clientGone ||
-        client->closeDownMode == DestroyAll;
-
-    if (!client->clientGone) {
-        /* ungrab server if grabbing client dies */
-        if (grabState != GrabNone && grabClient == client) {
-            UngrabServer(client);
-        }
-        BITCLEAR(grabWaiters, client->index);
-        DeleteClientFromAnySelections(client);
-        ReleaseActiveGrabs(client);
-        DeleteClientFontStuff(client);
-        if (!really_close_down) {
-            /*  This frees resources that should never be retained
-             *  no matter what the close down mode is.  Actually we
-             *  could do this unconditionally, but it's probably
-             *  better not to traverse all the client's resources
-             *  twice (once here, once a few lines down in
-             *  FreeClientResources) in the common case of
-             *  really_close_down == TRUE.
-             */
-            FreeClientNeverRetainResources(client);
-            client->clientState = ClientStateRetained;
-            if (ClientStateCallback) {
-                NewClientInfoRec clientinfo;
-
-                clientinfo.client = client;
-                clientinfo.prefix = (xConnSetupPrefix *) NULL;
-                clientinfo.setup = (xConnSetup *) NULL;
-                CallCallbacks((&ClientStateCallback), (pointer) &clientinfo);
-            }
-        }
-        client->clientGone = TRUE;      /* so events aren't sent to client */
-        if (ClientIsAsleep(client))
-            ClientSignal(client);
-        ProcessWorkQueueZombies();
-        CloseDownConnection(client);
-
-        /* If the client made it to the Running stage, nClients has
-         * been incremented on its behalf, so we need to decrement it
-         * now.  If it hasn't gotten to Running, nClients has *not*
-         * been incremented, so *don't* decrement it.
-         */
-        if (client->clientState != ClientStateInitial) {
-            --nClients;
-        }
-    }
-
-    if (really_close_down) {
-        if (client->clientState == ClientStateRunning && nClients == 0)
-            dispatchException |= dispatchExceptionAtReset;
-
-        client->clientState = ClientStateGone;
-        if (ClientStateCallback) {
-            NewClientInfoRec clientinfo;
-
-            clientinfo.client = client;
-            clientinfo.prefix = (xConnSetupPrefix *) NULL;
-            clientinfo.setup = (xConnSetup *) NULL;
-            CallCallbacks((&ClientStateCallback), (pointer) &clientinfo);
-        }
-        FreeClientResources(client);
-        /* Disable client ID tracking. This must be done after
-         * ClientStateCallback. */
-        ReleaseClientIds(client);
-#ifdef XSERVER_DTRACE
-        XSERVER_CLIENT_DISCONNECT(client->index);
-#endif
-        if (client->index < nextFreeClientID)
-            nextFreeClientID = client->index;
-        clients[client->index] = NullClient;
-        SmartLastClient = NullClient;
-        dixFreeObjectWithPrivates(client, PRIVATE_CLIENT);
-
-        while (!clients[currentMaxClients - 1])
-            currentMaxClients--;
-    }
-}
-
-static void
-KillAllClients(void)
-{
-    int i;
-
-    for (i = 1; i < currentMaxClients; i++)
-        if (clients[i]) {
-            /* Make sure Retained clients are released. */
-            clients[i]->closeDownMode = DestroyAll;
-            CloseDownClient(clients[i]);
-        }
-}
-
-void
-InitClient(ClientPtr client, int i, pointer ospriv)
-{
-    client->index = i;
-    client->clientAsMask = ((Mask) i) << CLIENTOFFSET;
-    client->closeDownMode = i ? DestroyAll : RetainPermanent;
-    client->requestVector = InitialVector;
-    client->osPrivate = ospriv;
-    QueryMinMaxKeyCodes(&client->minKC, &client->maxKC);
-    client->smart_start_tick = SmartScheduleTime;
-    client->smart_stop_tick = SmartScheduleTime;
-    client->smart_check_tick = SmartScheduleTime;
-    client->clientIds = NULL;
-}
-
-/************************
- * int NextAvailableClient(ospriv)
- *
- * OS dependent portion can't assign client id's because of CloseDownModes.
- * Returns NULL if there are no free clients.
- *************************/
-
-ClientPtr
-NextAvailableClient(pointer ospriv)
-{
-    int i;
-    ClientPtr client;
-    xReq data;
-
-    i = nextFreeClientID;
-    if (i == MAXCLIENTS)
-        return (ClientPtr) NULL;
-    clients[i] = client =
-        dixAllocateObjectWithPrivates(ClientRec, PRIVATE_CLIENT);
-    if (!client)
-        return (ClientPtr) NULL;
-    InitClient(client, i, ospriv);
-    if (!InitClientResources(client)) {
-        dixFreeObjectWithPrivates(client, PRIVATE_CLIENT);
-        return (ClientPtr) NULL;
-    }
-    data.reqType = 1;
-    data.length = bytes_to_int32(sz_xReq + sz_xConnClientPrefix);
-    if (!InsertFakeRequest(client, (char *) &data, sz_xReq)) {
-        FreeClientResources(client);
-        dixFreeObjectWithPrivates(client, PRIVATE_CLIENT);
-        return (ClientPtr) NULL;
-    }
-    if (i == currentMaxClients)
-        currentMaxClients++;
-    while ((nextFreeClientID < MAXCLIENTS) && clients[nextFreeClientID])
-        nextFreeClientID++;
-
-    /* Enable client ID tracking. This must be done before
-     * ClientStateCallback. */
-    ReserveClientIds(client);
-
-    if (ClientStateCallback) {
-        NewClientInfoRec clientinfo;
-
-        clientinfo.client = client;
-        clientinfo.prefix = (xConnSetupPrefix *) NULL;
-        clientinfo.setup = (xConnSetup *) NULL;
-        CallCallbacks((&ClientStateCallback), (pointer) &clientinfo);
-    }
-    return client;
-}
-
-int
-ProcInitialConnection(ClientPtr client)
-{
-    REQUEST(xReq);
-    xConnClientPrefix *prefix;
-    int whichbyte = 1;
-    char order;
-
-    prefix = (xConnClientPrefix *) ((char *)stuff + sz_xReq);
-    order = prefix->byteOrder;
-    if (order != 'l' && order != 'B' && order != 'r' && order != 'R')
-	return client->noClientException = -1;
-    if (((*(char *) &whichbyte) && (order == 'B' || order == 'R')) ||
-	(!(*(char *) &whichbyte) && (order == 'l' || order == 'r'))) {
-	client->swapped = TRUE;
-	SwapConnClientPrefix(prefix);
-    }
-    stuff->reqType = 2;
-    stuff->length += bytes_to_int32(prefix->nbytesAuthProto) +
-        bytes_to_int32(prefix->nbytesAuthString);
-    if (client->swapped) {
-        swaps(&stuff->length);
-    }
-    if (order == 'r' || order == 'R') {
-	client->local = FALSE;
-    }
-    ResetCurrentRequest(client);
-    return Success;
-}
-
-static int
-SendConnSetup(ClientPtr client, const char *reason)
-{
-    xWindowRoot *root;
-    int i;
-    int numScreens;
-    char *lConnectionInfo;
-    xConnSetupPrefix *lconnSetupPrefix;
-
-    if (reason) {
-        xConnSetupPrefix csp;
-
-        csp.success = xFalse;
-        csp.lengthReason = strlen(reason);
-        csp.length = bytes_to_int32(csp.lengthReason);
-        csp.majorVersion = X_PROTOCOL;
-        csp.minorVersion = X_PROTOCOL_REVISION;
-        if (client->swapped)
-            WriteSConnSetupPrefix(client, &csp);
-        else
-            WriteToClient(client, sz_xConnSetupPrefix, &csp);
-        WriteToClient(client, (int) csp.lengthReason, reason);
-        return client->noClientException = -1;
-    }
-
-    numScreens = screenInfo.numScreens;
-    lConnectionInfo = ConnectionInfo;
-    lconnSetupPrefix = &connSetupPrefix;
-
-    /* We're about to start speaking X protocol back to the client by
-     * sending the connection setup info.  This means the authorization
-     * step is complete, and we can count the client as an
-     * authorized one.
-     */
-    nClients++;
-
-    client->requestVector = client->swapped ? SwappedProcVector : ProcVector;
-    client->sequence = 0;
-    ((xConnSetup *) lConnectionInfo)->ridBase = client->clientAsMask;
-    ((xConnSetup *) lConnectionInfo)->ridMask = RESOURCE_ID_MASK;
-#ifdef MATCH_CLIENT_ENDIAN
-    ((xConnSetup *) lConnectionInfo)->imageByteOrder = ClientOrder(client);
-    ((xConnSetup *) lConnectionInfo)->bitmapBitOrder = ClientOrder(client);
-#endif
-    /* fill in the "currentInputMask" */
-    root = (xWindowRoot *) (lConnectionInfo + connBlockScreenStart);
-#ifdef PANORAMIX
-    if (noPanoramiXExtension)
-        numScreens = screenInfo.numScreens;
-    else
-        numScreens = ((xConnSetup *) ConnectionInfo)->numRoots;
-#endif
-
-    for (i = 0; i < numScreens; i++) {
-        unsigned int j;
-        xDepth *pDepth;
-        WindowPtr pRoot = screenInfo.screens[i]->root;
-
-        root->currentInputMask = pRoot->eventMask | wOtherEventMasks(pRoot);
-        pDepth = (xDepth *) (root + 1);
-        for (j = 0; j < root->nDepths; j++) {
-            pDepth = (xDepth *) (((char *) (pDepth + 1)) +
-                                 pDepth->nVisuals * sizeof(xVisualType));
-        }
-        root = (xWindowRoot *) pDepth;
-    }
-
-    if (client->swapped) {
-        WriteSConnSetupPrefix(client, lconnSetupPrefix);
-        WriteSConnectionInfo(client,
-                             (unsigned long) (lconnSetupPrefix->length << 2),
-                             lConnectionInfo);
-    }
-    else {
-        WriteToClient(client, sizeof(xConnSetupPrefix), lconnSetupPrefix);
-        WriteToClient(client, (int) (lconnSetupPrefix->length << 2),
-		      lConnectionInfo);
-    }
-    client->clientState = ClientStateRunning;
-    if (ClientStateCallback) {
-        NewClientInfoRec clientinfo;
-
-        clientinfo.client = client;
-        clientinfo.prefix = lconnSetupPrefix;
-        clientinfo.setup = (xConnSetup *) lConnectionInfo;
-        CallCallbacks((&ClientStateCallback), (pointer) &clientinfo);
-    }
-    return Success;
-}
-
-int
-ProcEstablishConnection(ClientPtr client)
-{
-    const char *reason;
-    char *auth_proto, *auth_string;
-    xConnClientPrefix *prefix;
-
-    REQUEST(xReq);
-
-    prefix = (xConnClientPrefix *) ((char *) stuff + sz_xReq);
-    auth_proto = (char *) prefix + sz_xConnClientPrefix;
-    auth_string = auth_proto + pad_to_int32(prefix->nbytesAuthProto);
-    if ((prefix->majorVersion != X_PROTOCOL) ||
-        (prefix->minorVersion != X_PROTOCOL_REVISION))
-        reason = "Protocol version mismatch";
-    else
-        reason = ClientAuthorized(client,
-                                  (unsigned short) prefix->nbytesAuthProto,
-                                  auth_proto,
-                                  (unsigned short) prefix->nbytesAuthString,
-                                  auth_string);
-
-    return (SendConnSetup(client, reason));
-}
-
-void
-SendErrorToClient(ClientPtr client, unsigned majorCode, unsigned minorCode,
-                  XID resId, int errorCode)
-{
-    xError rep = {
-        .type = X_Error,
-        .errorCode = errorCode,
-        .resourceID = resId,
-        .minorCode = minorCode,
-        .majorCode = majorCode
-    };
-
-    WriteEventsToClient(client, 1, (xEvent *) &rep);
-}
-
-void
-MarkClientException(ClientPtr client)
-{
-    client->noClientException = -1;
-}
-
-/*
- * This array encodes the answer to the question "what is the log base 2
- * of the number of pixels that fit in a scanline pad unit?"
- * Note that ~0 is an invalid entry (mostly for the benefit of the reader).
- */
-static int answer[6][4] = {
-    /* pad   pad   pad     pad */
-    /*  8     16    32    64 */
-
-    {3, 4, 5, 6},               /* 1 bit per pixel */
-    {1, 2, 3, 4},               /* 4 bits per pixel */
-    {0, 1, 2, 3},               /* 8 bits per pixel */
-    {~0, 0, 1, 2},              /* 16 bits per pixel */
-    {~0, ~0, 0, 1},             /* 24 bits per pixel */
-    {~0, ~0, 0, 1}              /* 32 bits per pixel */
-};
-
-/*
- * This array gives the answer to the question "what is the first index for
- * the answer array above given the number of bits per pixel?"
- * Note that ~0 is an invalid entry (mostly for the benefit of the reader).
- */
-static int indexForBitsPerPixel[33] = {
-    ~0, 0, ~0, ~0,              /* 1 bit per pixel */
-    1, ~0, ~0, ~0,              /* 4 bits per pixel */
-    2, ~0, ~0, ~0,              /* 8 bits per pixel */
-    ~0, ~0, ~0, ~0,
-    3, ~0, ~0, ~0,              /* 16 bits per pixel */
-    ~0, ~0, ~0, ~0,
-    4, ~0, ~0, ~0,              /* 24 bits per pixel */
-    ~0, ~0, ~0, ~0,
-    5                           /* 32 bits per pixel */
-};
-
-/*
- * This array gives the bytesperPixel value for cases where the number
- * of bits per pixel is a multiple of 8 but not a power of 2.
- */
-static int answerBytesPerPixel[33] = {
-    ~0, 0, ~0, ~0,              /* 1 bit per pixel */
-    0, ~0, ~0, ~0,              /* 4 bits per pixel */
-    0, ~0, ~0, ~0,              /* 8 bits per pixel */
-    ~0, ~0, ~0, ~0,
-    0, ~0, ~0, ~0,              /* 16 bits per pixel */
-    ~0, ~0, ~0, ~0,
-    3, ~0, ~0, ~0,              /* 24 bits per pixel */
-    ~0, ~0, ~0, ~0,
-    0                           /* 32 bits per pixel */
-};
-
-/*
- * This array gives the answer to the question "what is the second index for
- * the answer array above given the number of bits per scanline pad unit?"
- * Note that ~0 is an invalid entry (mostly for the benefit of the reader).
- */
-static int indexForScanlinePad[65] = {
-    ~0, ~0, ~0, ~0,
-    ~0, ~0, ~0, ~0,
-    0, ~0, ~0, ~0,              /* 8 bits per scanline pad unit */
-    ~0, ~0, ~0, ~0,
-    1, ~0, ~0, ~0,              /* 16 bits per scanline pad unit */
-    ~0, ~0, ~0, ~0,
-    ~0, ~0, ~0, ~0,
-    ~0, ~0, ~0, ~0,
-    2, ~0, ~0, ~0,              /* 32 bits per scanline pad unit */
-    ~0, ~0, ~0, ~0,
-    ~0, ~0, ~0, ~0,
-    ~0, ~0, ~0, ~0,
-    ~0, ~0, ~0, ~0,
-    ~0, ~0, ~0, ~0,
-    ~0, ~0, ~0, ~0,
-    ~0, ~0, ~0, ~0,
-    3                           /* 64 bits per scanline pad unit */
-};
-
-/*
-	grow the array of screenRecs if necessary.
-	call the device-supplied initialization procedure
-with its screen number, a pointer to its ScreenRec, argc, and argv.
-	return the number of successfully installed screens.
-
-*/
-
-static int init_screen(ScreenPtr pScreen, int i, Bool gpu)
-{
-    int scanlinepad, format, depth, bitsPerPixel, j, k;
-
-    dixInitScreenSpecificPrivates(pScreen);
-
-    if (!dixAllocatePrivates(&pScreen->devPrivates, PRIVATE_SCREEN)) {
-        return -1;
-    }
-    pScreen->myNum = i;
-    if (gpu) {
-        pScreen->myNum += GPU_SCREEN_OFFSET;
-        pScreen->isGPU = TRUE;
-    }
-    pScreen->totalPixmapSize = 0;       /* computed in CreateScratchPixmapForScreen */
-    pScreen->ClipNotify = 0;    /* for R4 ddx compatibility */
-    pScreen->CreateScreenResources = 0;
-
-    xorg_list_init(&pScreen->pixmap_dirty_list);
-    xorg_list_init(&pScreen->unattached_list);
-    xorg_list_init(&pScreen->output_slave_list);
-    xorg_list_init(&pScreen->offload_slave_list);
-
-    /*
-     * This loop gets run once for every Screen that gets added,
-     * but thats ok.  If the ddx layer initializes the formats
-     * one at a time calling AddScreen() after each, then each
-     * iteration will make it a little more accurate.  Worst case
-     * we do this loop N * numPixmapFormats where N is # of screens.
-     * Anyway, this must be called after InitOutput and before the
-     * screen init routine is called.
-     */
-    for (format = 0; format < screenInfo.numPixmapFormats; format++) {
-        depth = screenInfo.formats[format].depth;
-        bitsPerPixel = screenInfo.formats[format].bitsPerPixel;
-        scanlinepad = screenInfo.formats[format].scanlinePad;
-        j = indexForBitsPerPixel[bitsPerPixel];
-        k = indexForScanlinePad[scanlinepad];
-        PixmapWidthPaddingInfo[depth].padPixelsLog2 = answer[j][k];
-        PixmapWidthPaddingInfo[depth].padRoundUp =
-            (scanlinepad / bitsPerPixel) - 1;
-        j = indexForBitsPerPixel[8];    /* bits per byte */
-        PixmapWidthPaddingInfo[depth].padBytesLog2 = answer[j][k];
-        PixmapWidthPaddingInfo[depth].bitsPerPixel = bitsPerPixel;
-        if (answerBytesPerPixel[bitsPerPixel]) {
-            PixmapWidthPaddingInfo[depth].notPower2 = 1;
-            PixmapWidthPaddingInfo[depth].bytesPerPixel =
-                answerBytesPerPixel[bitsPerPixel];
-        }
-        else {
-            PixmapWidthPaddingInfo[depth].notPower2 = 0;
-        }
-    }
-    return 0;
-}
-
-int
-AddScreen(Bool (*pfnInit) (ScreenPtr /*pScreen */ ,
-                           int /*argc */ ,
-                           char **      /*argv */
-          ), int argc, char **argv)
-{
-
-    int i;
-    ScreenPtr pScreen;
-    Bool ret;
-
-    i = screenInfo.numScreens;
-    if (i == MAXSCREENS)
-        return -1;
-
-    pScreen = (ScreenPtr) calloc(1, sizeof(ScreenRec));
-    if (!pScreen)
-        return -1;
-
-    ret = init_screen(pScreen, i, FALSE);
-    if (ret != 0) {
-        free(pScreen);
-        return ret;
-    }
-    /* This is where screen specific stuff gets initialized.  Load the
-       screen structure, call the hardware, whatever.
-       This is also where the default colormap should be allocated and
-       also pixel values for blackPixel, whitePixel, and the cursor
-       Note that InitScreen is NOT allowed to modify argc, argv, or
-       any of the strings pointed to by argv.  They may be passed to
-       multiple screens.
-     */
-    screenInfo.screens[i] = pScreen;
-    screenInfo.numScreens++;
-    if (!(*pfnInit) (pScreen, argc, argv)) {
-        dixFreeScreenSpecificPrivates(pScreen);
-        dixFreePrivates(pScreen->devPrivates, PRIVATE_SCREEN);
-        free(pScreen);
-        screenInfo.numScreens--;
-        return -1;
-    }
-
-    update_desktop_dimensions();
-
-    dixRegisterScreenPrivateKey(&cursorScreenDevPriv, pScreen, PRIVATE_CURSOR,
-                                0);
-
-    return i;
-}
-
-int
-AddGPUScreen(Bool (*pfnInit) (ScreenPtr /*pScreen */ ,
-                              int /*argc */ ,
-                              char **      /*argv */
-                              ),
-             int argc, char **argv)
-{
-    int i;
-    ScreenPtr pScreen;
-    Bool ret;
-
-    i = screenInfo.numGPUScreens;
-    if (i == MAXGPUSCREENS)
-        return -1;
-
-    pScreen = (ScreenPtr) calloc(1, sizeof(ScreenRec));
-    if (!pScreen)
-        return -1;
-
-    ret = init_screen(pScreen, i, TRUE);
-    if (ret != 0) {
-        free(pScreen);
-        return ret;
-    }
-
-    /* This is where screen specific stuff gets initialized.  Load the
-       screen structure, call the hardware, whatever.
-       This is also where the default colormap should be allocated and
-       also pixel values for blackPixel, whitePixel, and the cursor
-       Note that InitScreen is NOT allowed to modify argc, argv, or
-       any of the strings pointed to by argv.  They may be passed to
-       multiple screens.
-     */
-    screenInfo.gpuscreens[i] = pScreen;
-    screenInfo.numGPUScreens++;
-    if (!(*pfnInit) (pScreen, argc, argv)) {
-        dixFreePrivates(pScreen->devPrivates, PRIVATE_SCREEN);
-        free(pScreen);
-        screenInfo.numGPUScreens--;
-        return -1;
-    }
-
-    update_desktop_dimensions();
-
-    return i;
-}
-
-void
-RemoveGPUScreen(ScreenPtr pScreen)
-{
-    int idx, j;
-    if (!pScreen->isGPU)
-        return;
-
-    idx = pScreen->myNum - GPU_SCREEN_OFFSET;
-    for (j = idx; j < screenInfo.numGPUScreens - 1; j++) {
-        screenInfo.gpuscreens[j] = screenInfo.gpuscreens[j + 1];
-        screenInfo.gpuscreens[j]->myNum = j + GPU_SCREEN_OFFSET;
-    }
-    screenInfo.numGPUScreens--;
-
-    /* this gets freed later in the resource list, but without
-     * the screen existing it causes crashes - so remove it here */
-    if (pScreen->defColormap)
-        FreeResource(pScreen->defColormap, RT_COLORMAP);
-    free(pScreen);
-
-}
-
-void
-AttachUnboundGPU(ScreenPtr pScreen, ScreenPtr new)
-{
-    assert(new->isGPU);
-    assert(!new->current_master);
-    xorg_list_add(&new->unattached_head, &pScreen->unattached_list);
-    new->current_master = pScreen;
-}
-
-void
-DetachUnboundGPU(ScreenPtr slave)
-{
-    assert(slave->isGPU);
-    xorg_list_del(&slave->unattached_head);
-    slave->current_master = NULL;
-}
-
-void
-AttachOutputGPU(ScreenPtr pScreen, ScreenPtr new)
-{
-    assert(new->isGPU);
-    assert(!new->current_master);
-    xorg_list_add(&new->output_head, &pScreen->output_slave_list);
-    new->current_master = pScreen;
-}
-
-void
-DetachOutputGPU(ScreenPtr slave)
-{
-    assert(slave->isGPU);
-    xorg_list_del(&slave->output_head);
-    slave->current_master = NULL;
-}
-
-void
-AttachOffloadGPU(ScreenPtr pScreen, ScreenPtr new)
-{
-    assert(new->isGPU);
-    assert(!new->current_master);
-    xorg_list_add(&new->offload_head, &pScreen->offload_slave_list);
-    new->current_master = pScreen;
-}
-
-void
-DetachOffloadGPU(ScreenPtr slave)
-{
-    assert(slave->isGPU);
-    xorg_list_del(&slave->offload_head);
-    slave->current_master = NULL;
-}
-
+/************************************************************

+

+Copyright 1987, 1989, 1998  The Open Group

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that

+copyright notice and this permission notice appear in supporting

+documentation.

+

+The above copyright notice and this permission notice shall be included in

+all copies or substantial portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

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

+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+

+Except as contained in this notice, the name of The Open Group shall not be

+used in advertising or otherwise to promote the sale, use or other dealings

+in this Software without prior written authorization from The Open Group.

+

+Copyright 1987, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.

+

+                        All Rights Reserved

+

+Permission to use, copy, modify, and distribute this software and its 

+documentation for any purpose and without fee is hereby granted, 

+provided that the above copyright notice appear in all copies and that

+both that copyright notice and this permission notice appear in 

+supporting documentation, and that the name of Digital not be

+used in advertising or publicity pertaining to distribution of the

+software without specific, written prior permission.  

+

+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING

+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL

+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR

+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,

+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,

+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS

+SOFTWARE.

+

+********************************************************/

+

+/* The panoramix components contained the following notice */

+/*****************************************************************

+

+Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.

+

+Permission is hereby granted, free of charge, to any person obtaining a copy

+of this software and associated documentation files (the "Software"), to deal

+in the Software without restriction, including without limitation the rights

+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

+copies of the Software.

+

+The above copyright notice and this permission notice shall be included in

+all copies or substantial portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

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

+DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,

+BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL DAMAGES, OR OTHER LIABILITY,

+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR

+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+

+Except as contained in this notice, the name of Digital Equipment Corporation

+shall not be used in advertising or otherwise to promote the sale, use or other

+dealings in this Software without prior written authorization from Digital

+Equipment Corporation.

+

+******************************************************************/

+

+/* XSERVER_DTRACE additions:

+ * Copyright (c) 2005-2006, Oracle and/or its affiliates. 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 (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.

+ */

+

+#ifdef HAVE_DIX_CONFIG_H

+#include <dix-config.h>

+#include <version-config.h>

+#endif

+

+#ifdef CreateWindow

+#undef CreateWindow

+#endif

+

+#ifdef PANORAMIX_DEBUG

+#include <stdio.h>

+int ProcInitialConnection();

+#endif

+

+#include "windowstr.h"

+#include <X11/fonts/fontstruct.h>

+#include "dixfontstr.h"

+#include "gcstruct.h"

+#include "selection.h"

+#include "colormapst.h"

+#include "cursorstr.h"

+#include "scrnintstr.h"

+#include "opaque.h"

+#include "input.h"

+#include "servermd.h"

+#include "extnsionst.h"

+#include "dixfont.h"

+#include "dispatch.h"

+#include "swaprep.h"

+#include "swapreq.h"

+#include "privates.h"

+#include "xace.h"

+#include "inputstr.h"

+#include "xkbsrv.h"

+#include "site.h"

+#include "client.h"

+

+#ifdef XSERVER_DTRACE

+#include "registry.h"

+#include <sys/types.h>

+typedef const char *string;

+

+#include "Xserver-dtrace.h"

+#endif

+

+#define mskcnt ((MAXCLIENTS + 31) / 32)

+#define BITMASK(i) (1U << ((i) & 31))

+#define MASKIDX(i) ((i) >> 5)

+#define MASKWORD(buf, i) buf[MASKIDX(i)]

+#define BITSET(buf, i) MASKWORD(buf, i) |= BITMASK(i)

+#define BITCLEAR(buf, i) MASKWORD(buf, i) &= ~BITMASK(i)

+#define GETBIT(buf, i) (MASKWORD(buf, i) & BITMASK(i))

+

+xConnSetupPrefix connSetupPrefix;

+

+PaddingInfo PixmapWidthPaddingInfo[33];

+

+static ClientPtr grabClient;

+

+#define GrabNone 0

+#define GrabActive 1

+#define GrabKickout 2

+static int grabState = GrabNone;

+static long grabWaiters[mskcnt];

+CallbackListPtr ServerGrabCallback = NULL;

+HWEventQueuePtr checkForInput[2];

+int connBlockScreenStart;

+

+static void KillAllClients(void);

+

+static int nextFreeClientID;    /* always MIN free client ID */

+

+static int nClients;            /* number of authorized clients */

+

+CallbackListPtr ClientStateCallback;

+

+/* dispatchException & isItTimeToYield must be declared volatile since they

+ * are modified by signal handlers - otherwise optimizer may assume it doesn't

+ * need to actually check value in memory when used and may miss changes from

+ * signal handlers.

+ */

+volatile char dispatchException = 0;

+volatile char isItTimeToYield;

+

+#define SAME_SCREENS(a, b) (\

+    (a.pScreen == b.pScreen))

+

+void

+SetInputCheck(HWEventQueuePtr c0, HWEventQueuePtr c1)

+{

+    checkForInput[0] = c0;

+    checkForInput[1] = c1;

+}

+

+void

+UpdateCurrentTime(void)

+{

+    TimeStamp systime;

+

+    /* To avoid time running backwards, we must call GetTimeInMillis before

+     * calling ProcessInputEvents.

+     */

+    systime.months = currentTime.months;

+    systime.milliseconds = GetTimeInMillis();

+    if (systime.milliseconds < currentTime.milliseconds)

+        systime.months++;

+    if (*checkForInput[0] != *checkForInput[1])

+        ProcessInputEvents();

+    if (CompareTimeStamps(systime, currentTime) == LATER)

+        currentTime = systime;

+}

+

+/* Like UpdateCurrentTime, but can't call ProcessInputEvents */

+void

+UpdateCurrentTimeIf(void)

+{

+    TimeStamp systime;

+

+    systime.months = currentTime.months;

+    systime.milliseconds = GetTimeInMillis();

+    if (systime.milliseconds < currentTime.milliseconds)

+        systime.months++;

+    if (CompareTimeStamps(systime, currentTime) == LATER)

+        currentTime = systime;

+}

+

+#undef SMART_DEBUG

+

+#define SMART_SCHEDULE_DEFAULT_INTERVAL	20      /* ms */

+#define SMART_SCHEDULE_MAX_SLICE	200     /* ms */

+

+#if defined(WIN32) && !defined(__CYGWIN__) && !defined(_MSC_VER)

+Bool SmartScheduleDisable = TRUE;

+#else

+Bool SmartScheduleDisable = FALSE;

+#endif

+long SmartScheduleSlice = SMART_SCHEDULE_DEFAULT_INTERVAL;

+long SmartScheduleInterval = SMART_SCHEDULE_DEFAULT_INTERVAL;

+long SmartScheduleMaxSlice = SMART_SCHEDULE_MAX_SLICE;

+long SmartScheduleTime;

+int SmartScheduleLatencyLimited = 0;

+static ClientPtr SmartLastClient;

+static int SmartLastIndex[SMART_MAX_PRIORITY - SMART_MIN_PRIORITY + 1];

+

+#ifdef SMART_DEBUG

+long SmartLastPrint;

+#endif

+

+void Dispatch(void);

+

+static int

+SmartScheduleClient(int *clientReady, int nready)

+{

+    ClientPtr pClient;

+    int i;

+    int client;

+    int bestPrio, best = 0;

+    int bestRobin, robin;

+    long now = SmartScheduleTime;

+    long idle;

+

+    bestPrio = -0x7fffffff;

+    bestRobin = 0;

+    idle = 2 * SmartScheduleSlice;

+    for (i = 0; i < nready; i++) {

+        client = clientReady[i];

+        pClient = clients[client];

+        /* Praise clients which are idle */

+        if ((now - pClient->smart_check_tick) >= idle) {

+            if (pClient->smart_priority < 0)

+                pClient->smart_priority++;

+        }

+        pClient->smart_check_tick = now;

+

+        /* check priority to select best client */

+        robin =

+            (pClient->index -

+             SmartLastIndex[pClient->smart_priority -

+                            SMART_MIN_PRIORITY]) & 0xff;

+        if (pClient->smart_priority > bestPrio ||

+            (pClient->smart_priority == bestPrio && robin > bestRobin)) {

+            bestPrio = pClient->smart_priority;

+            bestRobin = robin;

+            best = client;

+        }

+#ifdef SMART_DEBUG

+        if ((now - SmartLastPrint) >= 5000)

+            fprintf(stderr, " %2d: %3d", client, pClient->smart_priority);

+#endif

+    }

+#ifdef SMART_DEBUG

+    if ((now - SmartLastPrint) >= 5000) {

+        fprintf(stderr, " use %2d\n", best);

+        SmartLastPrint = now;

+    }

+#endif

+    pClient = clients[best];

+    SmartLastIndex[bestPrio - SMART_MIN_PRIORITY] = pClient->index;

+    /*

+     * Set current client pointer

+     */

+    if (SmartLastClient != pClient) {

+        pClient->smart_start_tick = now;

+        SmartLastClient = pClient;

+    }

+    /*

+     * Adjust slice

+     */

+    if (nready == 1 && SmartScheduleLatencyLimited == 0) {

+        /*

+         * If it's been a long time since another client

+         * has run, bump the slice up to get maximal

+         * performance from a single client

+         */

+        if ((now - pClient->smart_start_tick) > 1000 &&

+            SmartScheduleSlice < SmartScheduleMaxSlice) {

+            SmartScheduleSlice += SmartScheduleInterval;

+        }

+    }

+    else {

+        SmartScheduleSlice = SmartScheduleInterval;

+    }

+    return best;

+}

+

+void

+EnableLimitedSchedulingLatency(void)

+{

+    ++SmartScheduleLatencyLimited;

+    SmartScheduleSlice = SmartScheduleInterval;

+}

+

+void

+DisableLimitedSchedulingLatency(void)

+{

+    --SmartScheduleLatencyLimited;

+

+    /* protect against bugs */

+    if (SmartScheduleLatencyLimited < 0)

+        SmartScheduleLatencyLimited = 0;

+}

+

+void

+Dispatch(void)

+{

+    int *clientReady;           /* array of request ready clients */

+    int result;

+    ClientPtr client;

+    int nready;

+    HWEventQueuePtr *icheck = checkForInput;

+    long start_tick;

+

+    nextFreeClientID = 1;

+    nClients = 0;

+

+    clientReady = malloc(sizeof(int) * MaxClients);

+    if (!clientReady)

+        return;

+

+    SmartScheduleSlice = SmartScheduleInterval;

+    while (!dispatchException) {

+        if (*icheck[0] != *icheck[1]) {

+            ProcessInputEvents();

+            FlushIfCriticalOutputPending();

+        }

+

+        nready = WaitForSomething(clientReady);

+

+        if (nready && !SmartScheduleDisable) {

+            clientReady[0] = SmartScheduleClient(clientReady, nready);

+            nready = 1;

+        }

+       /***************** 

+	*  Handle events in round robin fashion, doing input between 

+	*  each round 

+	*****************/

+

+        while (!dispatchException && (--nready >= 0)) {

+            client = clients[clientReady[nready]];

+            if (!client) {

+                /* KillClient can cause this to happen */

+                continue;

+            }

+            /* GrabServer activation can cause this to be true */

+            if (grabState == GrabKickout) {

+                grabState = GrabActive;

+                break;

+            }

+            isItTimeToYield = FALSE;

+

+            start_tick = SmartScheduleTime;

+            while (!isItTimeToYield) {

+#ifdef XSERVER_DTRACE

+                CARD8 StartMajorOp;

+#endif

+                if (*icheck[0] != *icheck[1])

+                    ProcessInputEvents();

+

+                FlushIfCriticalOutputPending();

+                if (!SmartScheduleDisable &&

+                    (SmartScheduleTime - start_tick) >= SmartScheduleSlice) {

+                    /* Penalize clients which consume ticks */

+                    if (client->smart_priority > SMART_MIN_PRIORITY)

+                        client->smart_priority--;

+                    break;

+                }

+                /* now, finally, deal with client requests */

+

+                /* Update currentTime so request time checks, such as for input

+                 * device grabs, are calculated correctly */

+                UpdateCurrentTimeIf();

+                result = ReadRequestFromClient(client);

+                if (result <= 0) {

+                    if (result < 0)

+                        CloseDownClient(client);

+                    break;

+                }

+

+                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

+                if (XSERVER_REQUEST_START_ENABLED())

+                {

+                    StartMajorOp=client->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, client->majorOp);

+                    if (result == Success)

+                        result =

+                            (*client->requestVector[client->majorOp]) (client);

+                    XaceHookAuditEnd(client, result);

+                }

+#ifdef XSERVER_DTRACE

+                if (XSERVER_REQUEST_DONE_ENABLED())

+                {

+                  if (result!=Success)

+                  {

+                    char Message[255];

+                    sprintf(Message,"ERROR: %s (0x%x)",LookupMajorName(client->majorOp),client->errorValue);

+                    XSERVER_REQUEST_DONE(Message,

+                                         client->majorOp, client->sequence,

+                                         client->index, result);

+                  }

+                  else

+                  {

+                    if (StartMajorOp!=client->majorOp)

+                    {

+                      char Message[255];

+                      sprintf(Message,"Changed request: %s -> %s",LookupMajorName(StartMajorOp),LookupMajorName(client->majorOp));

+                      XSERVER_REQUEST_DONE(Message,

+                                           client->majorOp, client->sequence,

+                                           client->index, result);

+                    }

+                    else

+                    {

+                      XSERVER_REQUEST_DONE(LookupMajorName(client->majorOp),

+                                           client->majorOp, client->sequence,

+                                           client->index, result);

+                    }

+                  }

+                }

+#endif

+

+                if (client->noClientException != Success) {

+                    CloseDownClient(client);

+                    break;

+                }

+                else if (result != Success) {

+                    SendErrorToClient(client, client->majorOp,

+                                      client->minorOp,

+                                      client->errorValue, result);

+                    break;

+                }

+            }

+            FlushAllOutput();

+            client = clients[clientReady[nready]];

+            if (client)

+                client->smart_stop_tick = SmartScheduleTime;

+        }

+        dispatchException &= ~DE_PRIORITYCHANGE;

+    }

+#if defined(DDXBEFORERESET)

+    ddxBeforeReset();

+#endif

+    KillAllClients();

+    free(clientReady);

+    dispatchException &= ~DE_RESET;

+    SmartScheduleLatencyLimited = 0;

+}

+

+static int VendorRelease = VENDOR_RELEASE;

+static char *VendorString = VENDOR_NAME;

+

+void

+SetVendorRelease(int release)

+{

+    VendorRelease = release;

+}

+

+void

+SetVendorString(char *string)

+{

+    VendorString = string;

+}

+

+Bool

+CreateConnectionBlock(void)

+{

+    xConnSetup setup;

+    xWindowRoot root;

+    xDepth depth;

+    xVisualType visual;

+    xPixmapFormat format;

+    unsigned long vid;

+    int i, j, k, lenofblock, sizesofar = 0;

+    char *pBuf;

+

+    memset(&setup, 0, sizeof(xConnSetup));

+    /* Leave off the ridBase and ridMask, these must be sent with

+       connection */

+

+    setup.release = VendorRelease;

+    /*

+     * per-server image and bitmap parameters are defined in Xmd.h

+     */

+    setup.imageByteOrder = screenInfo.imageByteOrder;

+

+    setup.bitmapScanlineUnit = screenInfo.bitmapScanlineUnit;

+    setup.bitmapScanlinePad = screenInfo.bitmapScanlinePad;

+

+    setup.bitmapBitOrder = screenInfo.bitmapBitOrder;

+    setup.motionBufferSize = NumMotionEvents();

+    setup.numRoots = screenInfo.numScreens;

+    setup.nbytesVendor = strlen(VendorString);

+    setup.numFormats = screenInfo.numPixmapFormats;

+    setup.maxRequestSize = MAX_REQUEST_SIZE;

+    QueryMinMaxKeyCodes(&setup.minKeyCode, &setup.maxKeyCode);

+

+    lenofblock = sizeof(xConnSetup) +

+        pad_to_int32(setup.nbytesVendor) +

+        (setup.numFormats * sizeof(xPixmapFormat)) +

+        (setup.numRoots * sizeof(xWindowRoot));

+    ConnectionInfo = malloc(lenofblock);

+    if (!ConnectionInfo)

+        return FALSE;

+

+    memmove(ConnectionInfo, (char *) &setup, sizeof(xConnSetup));

+    sizesofar = sizeof(xConnSetup);

+    pBuf = ConnectionInfo + sizeof(xConnSetup);

+

+    memmove(pBuf, VendorString, (int) setup.nbytesVendor);

+    sizesofar += setup.nbytesVendor;

+    pBuf += setup.nbytesVendor;

+    i = padding_for_int32(setup.nbytesVendor);

+    sizesofar += i;

+    while (--i >= 0)

+        *pBuf++ = 0;

+

+    memset(&format, 0, sizeof(xPixmapFormat));

+    for (i = 0; i < screenInfo.numPixmapFormats; i++) {

+        format.depth = screenInfo.formats[i].depth;

+        format.bitsPerPixel = screenInfo.formats[i].bitsPerPixel;

+        format.scanLinePad = screenInfo.formats[i].scanlinePad;

+        memmove(pBuf, (char *) &format, sizeof(xPixmapFormat));

+        pBuf += sizeof(xPixmapFormat);

+        sizesofar += sizeof(xPixmapFormat);

+    }

+

+    connBlockScreenStart = sizesofar;

+    memset(&depth, 0, sizeof(xDepth));

+    memset(&visual, 0, sizeof(xVisualType));

+    for (i = 0; i < screenInfo.numScreens; i++) {

+        ScreenPtr pScreen;

+        DepthPtr pDepth;

+        VisualPtr pVisual;

+

+        pScreen = screenInfo.screens[i];

+        root.windowId = pScreen->root->drawable.id;

+        root.defaultColormap = pScreen->defColormap;

+        root.whitePixel = pScreen->whitePixel;

+        root.blackPixel = pScreen->blackPixel;

+        root.currentInputMask = 0;      /* filled in when sent */

+        root.pixWidth = pScreen->width;

+        root.pixHeight = pScreen->height;

+        root.mmWidth = pScreen->mmWidth;

+        root.mmHeight = pScreen->mmHeight;

+        root.minInstalledMaps = pScreen->minInstalledCmaps;

+        root.maxInstalledMaps = pScreen->maxInstalledCmaps;

+        root.rootVisualID = pScreen->rootVisual;

+        root.backingStore = pScreen->backingStoreSupport;

+        root.saveUnders = FALSE;

+        root.rootDepth = pScreen->rootDepth;

+        root.nDepths = pScreen->numDepths;

+        memmove(pBuf, (char *) &root, sizeof(xWindowRoot));

+        sizesofar += sizeof(xWindowRoot);

+        pBuf += sizeof(xWindowRoot);

+

+        pDepth = pScreen->allowedDepths;

+        for (j = 0; j < pScreen->numDepths; j++, pDepth++) {

+            lenofblock += sizeof(xDepth) +

+                (pDepth->numVids * sizeof(xVisualType));

+            pBuf = (char *) realloc(ConnectionInfo, lenofblock);

+            if (!pBuf) {

+                free(ConnectionInfo);

+                return FALSE;

+            }

+            ConnectionInfo = pBuf;

+            pBuf += sizesofar;

+            depth.depth = pDepth->depth;

+            depth.nVisuals = pDepth->numVids;

+            memmove(pBuf, (char *) &depth, sizeof(xDepth));

+            pBuf += sizeof(xDepth);

+            sizesofar += sizeof(xDepth);

+            for (k = 0; k < pDepth->numVids; k++) {

+                vid = pDepth->vids[k];

+                for (pVisual = pScreen->visuals;

+                     pVisual->vid != vid; pVisual++);

+                visual.visualID = vid;

+                visual.class = pVisual->class;

+                visual.bitsPerRGB = pVisual->bitsPerRGBValue;

+                visual.colormapEntries = pVisual->ColormapEntries;

+                visual.redMask = pVisual->redMask;

+                visual.greenMask = pVisual->greenMask;

+                visual.blueMask = pVisual->blueMask;

+                memmove(pBuf, (char *) &visual, sizeof(xVisualType));

+                pBuf += sizeof(xVisualType);

+                sizesofar += sizeof(xVisualType);

+            }

+        }

+    }

+    connSetupPrefix.success = xTrue;

+    connSetupPrefix.length = lenofblock / 4;

+    connSetupPrefix.majorVersion = X_PROTOCOL;

+    connSetupPrefix.minorVersion = X_PROTOCOL_REVISION;

+    return TRUE;

+}

+

+int

+ProcBadRequest(ClientPtr client)

+{

+    return BadRequest;

+}

+

+int

+ProcCreateWindow(ClientPtr client)

+{

+    WindowPtr pParent, pWin;

+

+    REQUEST(xCreateWindowReq);

+    int len, rc;

+

+    REQUEST_AT_LEAST_SIZE(xCreateWindowReq);

+

+    LEGAL_NEW_RESOURCE(stuff->wid, client);

+    rc = dixLookupWindow(&pParent, stuff->parent, client, DixAddAccess);

+    if (rc != Success)

+        return rc;

+    len = client->req_len - bytes_to_int32(sizeof(xCreateWindowReq));

+    if (Ones(stuff->mask) != len)

+        return BadLength;

+    if (!stuff->width || !stuff->height) {

+        client->errorValue = 0;

+        return BadValue;

+    }

+    pWin = CreateWindow(stuff->wid, pParent, stuff->x,

+                        stuff->y, stuff->width, stuff->height,

+                        stuff->borderWidth, stuff->class,

+                        stuff->mask, (XID *) &stuff[1],

+                        (int) stuff->depth, client, stuff->visual, &rc);

+    if (pWin) {

+        Mask mask = pWin->eventMask;

+

+        pWin->eventMask = 0;    /* subterfuge in case AddResource fails */

+        if (!AddResource(stuff->wid, RT_WINDOW, (pointer) pWin))

+            return BadAlloc;

+        pWin->eventMask = mask;

+    }

+    return rc;

+}

+

+int

+ProcChangeWindowAttributes(ClientPtr client)

+{

+    WindowPtr pWin;

+

+    REQUEST(xChangeWindowAttributesReq);

+    int len, rc;

+    Mask access_mode = 0;

+

+    REQUEST_AT_LEAST_SIZE(xChangeWindowAttributesReq);

+    access_mode |= (stuff->valueMask & CWEventMask) ? DixReceiveAccess : 0;

+    access_mode |= (stuff->valueMask & ~CWEventMask) ? DixSetAttrAccess : 0;

+    rc = dixLookupWindow(&pWin, stuff->window, client, access_mode);

+    if (rc != Success)

+        return rc;

+    len = client->req_len - bytes_to_int32(sizeof(xChangeWindowAttributesReq));

+    if (len != Ones(stuff->valueMask))

+        return BadLength;

+    return ChangeWindowAttributes(pWin,

+                                  stuff->valueMask, (XID *) &stuff[1], client);

+}

+

+int

+ProcGetWindowAttributes(ClientPtr client)

+{

+    WindowPtr pWin;

+

+    REQUEST(xResourceReq);

+    xGetWindowAttributesReply wa;

+    int rc;

+

+    REQUEST_SIZE_MATCH(xResourceReq);

+    rc = dixLookupWindow(&pWin, stuff->id, client, DixGetAttrAccess);

+    if (rc != Success)

+        return rc;

+    memset(&wa, 0, sizeof(xGetWindowAttributesReply));

+    GetWindowAttributes(pWin, client, &wa);

+    WriteReplyToClient(client, sizeof(xGetWindowAttributesReply), &wa);

+    return Success;

+}

+

+int

+ProcDestroyWindow(ClientPtr client)

+{

+    WindowPtr pWin;

+

+    REQUEST(xResourceReq);

+    int rc;

+

+    REQUEST_SIZE_MATCH(xResourceReq);

+    rc = dixLookupWindow(&pWin, stuff->id, client, DixDestroyAccess);

+    if (rc != Success)

+        return rc;

+    if (pWin->parent) {

+        rc = dixLookupWindow(&pWin, pWin->parent->drawable.id, client,

+                             DixRemoveAccess);

+        if (rc != Success)

+            return rc;

+        FreeResource(stuff->id, RT_NONE);

+    }

+    return Success;

+}

+

+int

+ProcDestroySubwindows(ClientPtr client)

+{

+    WindowPtr pWin;

+

+    REQUEST(xResourceReq);

+    int rc;

+

+    REQUEST_SIZE_MATCH(xResourceReq);

+    rc = dixLookupWindow(&pWin, stuff->id, client, DixRemoveAccess);

+    if (rc != Success)

+        return rc;

+    DestroySubwindows(pWin, client);

+    return Success;

+}

+

+int

+ProcChangeSaveSet(ClientPtr client)

+{

+    WindowPtr pWin;

+

+    REQUEST(xChangeSaveSetReq);

+    int rc;

+

+    REQUEST_SIZE_MATCH(xChangeSaveSetReq);

+    rc = dixLookupWindow(&pWin, stuff->window, client, DixManageAccess);

+    if (rc != Success)

+        return rc;

+    if (client->clientAsMask == (CLIENT_BITS(pWin->drawable.id)))

+        return BadMatch;

+    if ((stuff->mode == SetModeInsert) || (stuff->mode == SetModeDelete))

+        return AlterSaveSetForClient(client, pWin, stuff->mode, FALSE, TRUE);

+    client->errorValue = stuff->mode;

+    return BadValue;

+}

+

+int

+ProcReparentWindow(ClientPtr client)

+{

+    WindowPtr pWin, pParent;

+

+    REQUEST(xReparentWindowReq);

+    int rc;

+

+    REQUEST_SIZE_MATCH(xReparentWindowReq);

+    rc = dixLookupWindow(&pWin, stuff->window, client, DixManageAccess);

+    if (rc != Success)

+        return rc;

+    rc = dixLookupWindow(&pParent, stuff->parent, client, DixAddAccess);

+    if (rc != Success)

+        return rc;

+    if (!SAME_SCREENS(pWin->drawable, pParent->drawable))

+        return BadMatch;

+    if ((pWin->backgroundState == ParentRelative) &&

+        (pParent->drawable.depth != pWin->drawable.depth))

+        return BadMatch;

+    if ((pWin->drawable.class != InputOnly) &&

+        (pParent->drawable.class == InputOnly))

+        return BadMatch;

+    return ReparentWindow(pWin, pParent,

+                          (short) stuff->x, (short) stuff->y, client);

+}

+

+int

+ProcMapWindow(ClientPtr client)

+{

+    WindowPtr pWin;

+

+    REQUEST(xResourceReq);

+    int rc;

+

+    REQUEST_SIZE_MATCH(xResourceReq);

+    rc = dixLookupWindow(&pWin, stuff->id, client, DixShowAccess);

+    if (rc != Success)

+        return rc;

+    MapWindow(pWin, client);

+    /* update cache to say it is mapped */

+    return Success;

+}

+

+int

+ProcMapSubwindows(ClientPtr client)

+{

+    WindowPtr pWin;

+

+    REQUEST(xResourceReq);

+    int rc;

+

+    REQUEST_SIZE_MATCH(xResourceReq);

+    rc = dixLookupWindow(&pWin, stuff->id, client, DixListAccess);

+    if (rc != Success)

+        return rc;

+    MapSubwindows(pWin, client);

+    /* update cache to say it is mapped */

+    return Success;

+}

+

+int

+ProcUnmapWindow(ClientPtr client)

+{

+    WindowPtr pWin;

+

+    REQUEST(xResourceReq);

+    int rc;

+

+    REQUEST_SIZE_MATCH(xResourceReq);

+    rc = dixLookupWindow(&pWin, stuff->id, client, DixHideAccess);

+    if (rc != Success)

+        return rc;

+    UnmapWindow(pWin, FALSE);

+    /* update cache to say it is mapped */

+    return Success;

+}

+

+int

+ProcUnmapSubwindows(ClientPtr client)

+{

+    WindowPtr pWin;

+

+    REQUEST(xResourceReq);

+    int rc;

+

+    REQUEST_SIZE_MATCH(xResourceReq);

+    rc = dixLookupWindow(&pWin, stuff->id, client, DixListAccess);

+    if (rc != Success)

+        return rc;

+    UnmapSubwindows(pWin);

+    return Success;

+}

+

+int

+ProcConfigureWindow(ClientPtr client)

+{

+    WindowPtr pWin;

+

+    REQUEST(xConfigureWindowReq);

+    int len, rc;

+

+    REQUEST_AT_LEAST_SIZE(xConfigureWindowReq);

+    rc = dixLookupWindow(&pWin, stuff->window, client,

+                         DixManageAccess | DixSetAttrAccess);

+    if (rc != Success)

+        return rc;

+    len = client->req_len - bytes_to_int32(sizeof(xConfigureWindowReq));

+    if (Ones((Mask) stuff->mask) != len)

+        return BadLength;

+    return ConfigureWindow(pWin, (Mask) stuff->mask, (XID *) &stuff[1], client);

+}

+

+int

+ProcCirculateWindow(ClientPtr client)

+{

+    WindowPtr pWin;

+

+    REQUEST(xCirculateWindowReq);

+    int rc;

+

+    REQUEST_SIZE_MATCH(xCirculateWindowReq);

+    if ((stuff->direction != RaiseLowest) && (stuff->direction != LowerHighest)) {

+        client->errorValue = stuff->direction;

+        return BadValue;

+    }

+    rc = dixLookupWindow(&pWin, stuff->window, client, DixManageAccess);

+    if (rc != Success)

+        return rc;

+    CirculateWindow(pWin, (int) stuff->direction, client);

+    return Success;

+}

+

+static int

+GetGeometry(ClientPtr client, xGetGeometryReply * rep)

+{

+    DrawablePtr pDraw;

+    int rc;

+

+    REQUEST(xResourceReq);

+    REQUEST_SIZE_MATCH(xResourceReq);

+

+    rc = dixLookupDrawable(&pDraw, stuff->id, client, M_ANY, DixGetAttrAccess);

+    if (rc != Success)

+        return rc;

+

+    rep->type = X_Reply;

+    rep->length = 0;

+    rep->sequenceNumber = client->sequence;

+    rep->root = pDraw->pScreen->root->drawable.id;

+    rep->depth = pDraw->depth;

+    rep->width = pDraw->width;

+    rep->height = pDraw->height;

+

+    if (WindowDrawable(pDraw->type)) {

+        WindowPtr pWin = (WindowPtr) pDraw;

+

+        rep->x = pWin->origin.x - wBorderWidth(pWin);

+        rep->y = pWin->origin.y - wBorderWidth(pWin);

+        rep->borderWidth = pWin->borderWidth;

+    }

+    else {                      /* DRAWABLE_PIXMAP */

+

+        rep->x = rep->y = rep->borderWidth = 0;

+    }

+

+    return Success;

+}

+

+int

+ProcGetGeometry(ClientPtr client)

+{

+    xGetGeometryReply rep;

+    int status;

+

+    memset(&rep, 0, sizeof(xGetGeometryReply));

+    rep.type = X_Reply ;

+    if ((status = GetGeometry(client, &rep)) != Success)

+        return status;

+

+    WriteReplyToClient(client, sizeof(xGetGeometryReply), &rep);

+    return Success;

+}

+

+#ifdef WIN32

+/* Do not return the clipboard window in ProcQueryTree, cause this may cause

+   the clipboard client being closed when connecting through xdmcp.

+*/

+extern Window g_iClipboardWindow;

+

+#endif

+int

+ProcQueryTree(ClientPtr client)

+{

+    xQueryTreeReply reply;

+    int rc, numChildren = 0;

+    WindowPtr pChild, pWin, pHead;

+    Window *childIDs = (Window *) NULL;

+

+    REQUEST(xResourceReq);

+

+    REQUEST_SIZE_MATCH(xResourceReq);

+    rc = dixLookupWindow(&pWin, stuff->id, client, DixListAccess);

+    if (rc != Success)

+        return rc;

+    memset(&reply, 0, sizeof(xQueryTreeReply));

+    reply.type = X_Reply;

+    reply.sequenceNumber = client->sequence;

+    reply.root = pWin->drawable.pScreen->root->drawable.id;

+    reply.parent =  (pWin->parent) ? pWin->parent->drawable.id : (Window) None;

+

+    pHead = RealChildHead(pWin);

+    for (pChild = pWin->lastChild; pChild != pHead; pChild = pChild->prevSib)

+#ifdef WIN32

+        if (pChild->drawable.id!=g_iClipboardWindow)

+#endif

+            numChildren++;

+    if (numChildren) {

+        int curChild = 0;

+

+        childIDs = malloc(numChildren * sizeof(Window));

+        if (!childIDs)

+            return BadAlloc;

+        for (pChild = pWin->lastChild; pChild != pHead;

+             pChild = pChild->prevSib)

+#ifdef WIN32

+	         if (pChild->drawable.id!=g_iClipboardWindow)

+#endif

+            childIDs[curChild++] = pChild->drawable.id;

+    }

+

+    reply.nChildren = numChildren;

+    reply.length = bytes_to_int32(numChildren * sizeof(Window));

+

+    WriteReplyToClient(client, sizeof(xQueryTreeReply), &reply);

+    if (numChildren) {

+        client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write;

+        WriteSwappedDataToClient(client, numChildren * sizeof(Window),

+                                 childIDs);

+        free(childIDs);

+    }

+

+    return Success;

+}

+

+int

+ProcInternAtom(ClientPtr client)

+{

+    Atom atom;

+    char *tchar;

+

+    REQUEST(xInternAtomReq);

+

+    REQUEST_FIXED_SIZE(xInternAtomReq, stuff->nbytes);

+    if ((stuff->onlyIfExists != xTrue) && (stuff->onlyIfExists != xFalse)) {

+        client->errorValue = stuff->onlyIfExists;

+        return BadValue;

+    }

+    tchar = (char *) &stuff[1];

+    atom = MakeAtom(tchar, stuff->nbytes, !stuff->onlyIfExists);

+    if (atom != BAD_RESOURCE) {

+        xInternAtomReply reply; memset(&reply, 0, sizeof(xInternAtomReply));

+        reply.type = X_Reply;

+        reply.sequenceNumber = client->sequence;

+        reply.length = 0;

+        reply.atom = atom;

+

+        WriteReplyToClient(client, sizeof(xInternAtomReply), &reply);

+        return Success;

+    }

+    else

+        return BadAlloc;

+}

+

+int

+ProcGetAtomName(ClientPtr client)

+{

+    const char *str;

+

+    REQUEST(xResourceReq);

+

+    REQUEST_SIZE_MATCH(xResourceReq);

+    if ((str = NameForAtom(stuff->id))) {

+        xGetAtomNameReply reply;

+        int len = strlen(str);

+        memset(&reply, 0, sizeof(xGetAtomNameReply));

+        reply.type = X_Reply;

+        reply.sequenceNumber = client->sequence;

+        reply.length = bytes_to_int32(len);

+        reply.nameLength = len;

+        WriteReplyToClient(client, sizeof(xGetAtomNameReply), &reply);

+        WriteToClient(client, len, str);

+        return Success;

+    }

+    else {

+        client->errorValue = stuff->id;

+        return BadAtom;

+    }

+}

+

+int

+ProcGrabServer(ClientPtr client)

+{

+    int rc;

+

+    REQUEST_SIZE_MATCH(xReq);

+    if (grabState != GrabNone && client != grabClient) {

+        ResetCurrentRequest(client);

+        client->sequence--;

+        BITSET(grabWaiters, client->index);

+        IgnoreClient(client);

+        return Success;

+    }

+    rc = OnlyListenToOneClient(client);

+    if (rc != Success)

+        return rc;

+    grabState = GrabKickout;

+    grabClient = client;

+

+    if (ServerGrabCallback) {

+        ServerGrabInfoRec grabinfo;

+

+        grabinfo.client = client;

+        grabinfo.grabstate = SERVER_GRABBED;

+        CallCallbacks(&ServerGrabCallback, (pointer) &grabinfo);

+    }

+

+    return Success;

+}

+

+static void

+UngrabServer(ClientPtr client)

+{

+    int i;

+

+    grabState = GrabNone;

+    ListenToAllClients();

+    for (i = mskcnt; --i >= 0 && !grabWaiters[i];);

+    if (i >= 0) {

+        i <<= 5;

+        while (!GETBIT(grabWaiters, i))

+            i++;

+        BITCLEAR(grabWaiters, i);

+        AttendClient(clients[i]);

+    }

+

+    if (ServerGrabCallback) {

+        ServerGrabInfoRec grabinfo;

+

+        grabinfo.client = client;

+        grabinfo.grabstate = SERVER_UNGRABBED;

+        CallCallbacks(&ServerGrabCallback, (pointer) &grabinfo);

+    }

+}

+

+int

+ProcUngrabServer(ClientPtr client)

+{

+    REQUEST_SIZE_MATCH(xReq);

+    UngrabServer(client);

+    return Success;

+}

+

+int

+ProcTranslateCoords(ClientPtr client)

+{

+    REQUEST(xTranslateCoordsReq);

+

+    WindowPtr pWin, pDst;

+    xTranslateCoordsReply rep;

+    int rc;

+

+    REQUEST_SIZE_MATCH(xTranslateCoordsReq);

+    rc = dixLookupWindow(&pWin, stuff->srcWid, client, DixGetAttrAccess);

+    if (rc != Success)

+        return rc;

+    rc = dixLookupWindow(&pDst, stuff->dstWid, client, DixGetAttrAccess);

+    if (rc != Success)

+        return rc;

+    memset(&rep, 0, sizeof(xTranslateCoordsReply));

+    rep.type = X_Reply;

+    rep.sequenceNumber = client->sequence;

+    rep.length = 0;

+

+    if (!SAME_SCREENS(pWin->drawable, pDst->drawable)) {

+        rep.sameScreen = xFalse;

+        rep.child = None;

+        rep.dstX = rep.dstY = 0;

+    }

+    else {

+        INT16 x, y;

+

+        rep.sameScreen = xTrue;

+        rep.child = None;

+        /* computing absolute coordinates -- adjust to destination later */

+        x = pWin->drawable.x + stuff->srcX;

+        y = pWin->drawable.y + stuff->srcY;

+        pWin = pDst->firstChild;

+        while (pWin) {

+            BoxRec box;

+

+            if ((pWin->mapped) &&

+                (x >= pWin->drawable.x - wBorderWidth(pWin)) &&

+                (x < pWin->drawable.x + (int) pWin->drawable.width +

+                 wBorderWidth(pWin)) &&

+                (y >= pWin->drawable.y - wBorderWidth(pWin)) &&

+                (y < pWin->drawable.y + (int) pWin->drawable.height +

+                 wBorderWidth(pWin))

+                /* When a window is shaped, a further check

+                 * is made to see if the point is inside

+                 * borderSize

+                 */

+                && (!wBoundingShape(pWin) ||

+                    RegionContainsPoint(&pWin->borderSize, x, y, &box))

+

+                && (!wInputShape(pWin) ||

+                    RegionContainsPoint(wInputShape(pWin),

+                                        x - pWin->drawable.x,

+                                        y - pWin->drawable.y, &box))

+                ) {

+                rep.child = pWin->drawable.id;

+                pWin = (WindowPtr) NULL;

+            }

+            else

+                pWin = pWin->nextSib;

+        }

+        /* adjust to destination coordinates */

+        rep.dstX = x - pDst->drawable.x;

+        rep.dstY = y - pDst->drawable.y;

+    }

+    WriteReplyToClient(client, sizeof(xTranslateCoordsReply), &rep);

+    return Success;

+}

+

+int

+ProcOpenFont(ClientPtr client)

+{

+    int err;

+

+    REQUEST(xOpenFontReq);

+

+    REQUEST_FIXED_SIZE(xOpenFontReq, stuff->nbytes);

+    client->errorValue = stuff->fid;

+    LEGAL_NEW_RESOURCE(stuff->fid, client);

+    err = OpenFont(client, stuff->fid, (Mask) 0,

+                   stuff->nbytes, (char *) &stuff[1]);

+    if (err == Success) {

+        return Success;

+    }

+    else

+        return err;

+}

+

+int

+ProcCloseFont(ClientPtr client)

+{

+    FontPtr pFont;

+    int rc;

+

+    REQUEST(xResourceReq);

+

+    REQUEST_SIZE_MATCH(xResourceReq);

+    rc = dixLookupResourceByType((pointer *) &pFont, stuff->id, RT_FONT,

+                                 client, DixDestroyAccess);

+    if (rc == Success) {

+        FreeResource(stuff->id, RT_NONE);

+        return Success;

+    }

+    else {

+        client->errorValue = stuff->id;

+        return rc;

+    }

+}

+

+int

+ProcQueryFont(ClientPtr client)

+{

+    xQueryFontReply *reply;

+    FontPtr pFont;

+    int rc;

+

+    REQUEST(xResourceReq);

+    REQUEST_SIZE_MATCH(xResourceReq);

+

+    rc = dixLookupFontable(&pFont, stuff->id, client, DixGetAttrAccess);

+    if (rc != Success)

+        return rc;

+

+    {

+        xCharInfo *pmax = FONTINKMAX(pFont);

+        xCharInfo *pmin = FONTINKMIN(pFont);

+        int nprotoxcistructs;

+        int rlength;

+

+        nprotoxcistructs = (pmax->rightSideBearing == pmin->rightSideBearing &&

+                            pmax->leftSideBearing == pmin->leftSideBearing &&

+                            pmax->descent == pmin->descent &&

+                            pmax->ascent == pmin->ascent &&

+                            pmax->characterWidth == pmin->characterWidth) ?

+            0 : N2dChars(pFont);

+

+        rlength = sizeof(xQueryFontReply) +

+            FONTINFONPROPS(FONTCHARSET(pFont)) * sizeof(xFontProp) +

+            nprotoxcistructs * sizeof(xCharInfo);

+        reply = calloc(1, rlength);

+        if (!reply) {

+            return BadAlloc;

+        }

+

+        reply->type = X_Reply;

+        reply->length = bytes_to_int32(rlength - sizeof(xGenericReply));

+        reply->sequenceNumber = client->sequence;

+        QueryFont(pFont, reply, nprotoxcistructs);

+

+        WriteReplyToClient(client, rlength, reply);

+        free(reply);

+        return Success;

+    }

+}

+

+int

+ProcQueryTextExtents(ClientPtr client)

+{

+    xQueryTextExtentsReply reply;

+    FontPtr pFont;

+    ExtentInfoRec info;

+    unsigned long length;

+    int rc;

+

+    REQUEST(xQueryTextExtentsReq);

+    REQUEST_AT_LEAST_SIZE(xQueryTextExtentsReq);

+

+    rc = dixLookupFontable(&pFont, stuff->fid, client, DixGetAttrAccess);

+    if (rc != Success)

+        return rc;

+

+    length = client->req_len - bytes_to_int32(sizeof(xQueryTextExtentsReq));

+    length = length << 1;

+    if (stuff->oddLength) {

+        if (length == 0)

+            return BadLength;

+        length--;

+    }

+    if (!QueryTextExtents(pFont, length, (unsigned char *) &stuff[1], &info))

+        return BadAlloc;

+

+    reply.type = X_Reply;

+    reply.drawDirection = info.drawDirection;

+    reply.sequenceNumber = client->sequence;

+    reply.length = 0;

+    reply.fontAscent = info.fontAscent;

+    reply.fontDescent = info.fontDescent;

+    reply.overallAscent = info.overallAscent;

+    reply.overallDescent = info.overallDescent;

+    reply.overallWidth = info.overallWidth;

+    reply.overallLeft = info.overallLeft;

+    reply.overallRight = info.overallRight;

+

+    WriteReplyToClient(client, sizeof(xQueryTextExtentsReply), &reply);

+    return Success;

+}

+

+int

+ProcListFonts(ClientPtr client)

+{

+    REQUEST(xListFontsReq);

+

+    REQUEST_FIXED_SIZE(xListFontsReq, stuff->nbytes);

+

+    return ListFonts(client, (unsigned char *) &stuff[1], stuff->nbytes,

+                     stuff->maxNames);

+}

+

+int

+ProcListFontsWithInfo(ClientPtr client)

+{

+    REQUEST(xListFontsWithInfoReq);

+

+    REQUEST_FIXED_SIZE(xListFontsWithInfoReq, stuff->nbytes);

+

+    return StartListFontsWithInfo(client, stuff->nbytes,

+                                  (unsigned char *) &stuff[1], stuff->maxNames);

+}

+

+/**

+ *

+ *  \param value must conform to DeleteType

+ */

+int

+dixDestroyPixmap(pointer value, XID pid)

+{

+    PixmapPtr pPixmap = (PixmapPtr) value;

+

+    return (*pPixmap->drawable.pScreen->DestroyPixmap) (pPixmap);

+}

+

+int

+ProcCreatePixmap(ClientPtr client)

+{

+    PixmapPtr pMap;

+    DrawablePtr pDraw;

+

+    REQUEST(xCreatePixmapReq);

+    DepthPtr pDepth;

+    int i, rc;

+

+    REQUEST_SIZE_MATCH(xCreatePixmapReq);

+    client->errorValue = stuff->pid;

+    LEGAL_NEW_RESOURCE(stuff->pid, client);

+

+    rc = dixLookupDrawable(&pDraw, stuff->drawable, client, M_ANY,

+                           DixGetAttrAccess);

+    if (rc != Success)

+        return rc;

+

+    if (!stuff->width || !stuff->height) {

+        client->errorValue = 0;

+        return BadValue;

+    }

+    if (stuff->width > 32767 || stuff->height > 32767) {

+        /* It is allowed to try and allocate a pixmap which is larger than

+         * 32767 in either dimension. However, all of the framebuffer code

+         * is buggy and does not reliably draw to such big pixmaps, basically

+         * because the Region data structure operates with signed shorts

+         * for the rectangles in it.

+         *

+         * Furthermore, several places in the X server computes the

+         * size in bytes of the pixmap and tries to store it in an

+         * integer. This integer can overflow and cause the allocated size

+         * to be much smaller.

+         *

+         * So, such big pixmaps are rejected here with a BadAlloc

+         */

+        return BadAlloc;

+    }

+    if (stuff->depth != 1) {

+        pDepth = pDraw->pScreen->allowedDepths;

+        for (i = 0; i < pDraw->pScreen->numDepths; i++, pDepth++)

+            if (pDepth->depth == stuff->depth)

+                goto CreatePmap;

+        client->errorValue = stuff->depth;

+        return BadValue;

+    }

+ CreatePmap:

+    pMap = (PixmapPtr) (*pDraw->pScreen->CreatePixmap)

+        (pDraw->pScreen, stuff->width, stuff->height, stuff->depth, 0);

+    if (pMap) {

+        pMap->drawable.serialNumber = NEXT_SERIAL_NUMBER;

+        pMap->drawable.id = stuff->pid;

+        /* security creation/labeling check */

+        rc = XaceHook(XACE_RESOURCE_ACCESS, client, stuff->pid, RT_PIXMAP,

+                      pMap, RT_NONE, NULL, DixCreateAccess);

+        if (rc != Success) {

+            (*pDraw->pScreen->DestroyPixmap) (pMap);

+            return rc;

+        }

+        if (AddResource(stuff->pid, RT_PIXMAP, (pointer) pMap))

+            return Success;

+    }

+    return BadAlloc;

+}

+

+int

+ProcFreePixmap(ClientPtr client)

+{

+    PixmapPtr pMap;

+    int rc;

+

+    REQUEST(xResourceReq);

+    REQUEST_SIZE_MATCH(xResourceReq);

+

+    rc = dixLookupResourceByType((pointer *) &pMap, stuff->id, RT_PIXMAP,

+                                 client, DixDestroyAccess);

+    if (rc == Success) {

+        FreeResource(stuff->id, RT_NONE);

+        return Success;

+    }

+    else {

+        client->errorValue = stuff->id;

+        return rc;

+    }

+}

+

+int

+ProcCreateGC(ClientPtr client)

+{

+    int error, rc;

+    GC *pGC;

+    DrawablePtr pDraw;

+    unsigned len;

+

+    REQUEST(xCreateGCReq);

+

+    REQUEST_AT_LEAST_SIZE(xCreateGCReq);

+    client->errorValue = stuff->gc;

+    LEGAL_NEW_RESOURCE(stuff->gc, client);

+    rc = dixLookupDrawable(&pDraw, stuff->drawable, client, 0,

+                           DixGetAttrAccess);

+    if (rc != Success)

+        return rc;

+

+    len = client->req_len - bytes_to_int32(sizeof(xCreateGCReq));

+    if (len != Ones(stuff->mask))

+        return BadLength;

+    pGC = (GC *) CreateGC(pDraw, stuff->mask, (XID *) &stuff[1], &error,

+                          stuff->gc, client);

+    if (error != Success)

+        return error;

+    if (!AddResource(stuff->gc, RT_GC, (pointer) pGC))

+        return BadAlloc;

+    return Success;

+}

+

+int

+ProcChangeGC(ClientPtr client)

+{

+    GC *pGC;

+    int result;

+    unsigned len;

+

+    REQUEST(xChangeGCReq);

+    REQUEST_AT_LEAST_SIZE(xChangeGCReq);

+

+    result = dixLookupGC(&pGC, stuff->gc, client, DixSetAttrAccess);

+    if (result != Success)

+        return result;

+

+    len = client->req_len - bytes_to_int32(sizeof(xChangeGCReq));

+    if (len != Ones(stuff->mask))

+        return BadLength;

+

+    return ChangeGCXIDs(client, pGC, stuff->mask, (CARD32 *) &stuff[1]);

+}

+

+int

+ProcCopyGC(ClientPtr client)

+{

+    GC *dstGC;

+    GC *pGC;

+    int result;

+

+    REQUEST(xCopyGCReq);

+    REQUEST_SIZE_MATCH(xCopyGCReq);

+

+    result = dixLookupGC(&pGC, stuff->srcGC, client, DixGetAttrAccess);

+    if (result != Success)

+        return result;

+    result = dixLookupGC(&dstGC, stuff->dstGC, client, DixSetAttrAccess);

+    if (result != Success)

+        return result;

+    if ((dstGC->pScreen != pGC->pScreen) || (dstGC->depth != pGC->depth))

+        return BadMatch;

+    if (stuff->mask & ~GCAllBits) {

+        client->errorValue = stuff->mask;

+        return BadValue;

+    }

+    return CopyGC(pGC, dstGC, stuff->mask);

+}

+

+int

+ProcSetDashes(ClientPtr client)

+{

+    GC *pGC;

+    int result;

+

+    REQUEST(xSetDashesReq);

+

+    REQUEST_FIXED_SIZE(xSetDashesReq, stuff->nDashes);

+    if (stuff->nDashes == 0) {

+        client->errorValue = 0;

+        return BadValue;

+    }

+

+    result = dixLookupGC(&pGC, stuff->gc, client, DixSetAttrAccess);

+    if (result != Success)

+        return result;

+

+    /* If there's an error, either there's no sensible errorValue,

+     * or there was a dash segment of 0. */

+    client->errorValue = 0;

+    return SetDashes(pGC, stuff->dashOffset, stuff->nDashes,

+                     (unsigned char *) &stuff[1]);

+}

+

+int

+ProcSetClipRectangles(ClientPtr client)

+{

+    int nr, result;

+    GC *pGC;

+

+    REQUEST(xSetClipRectanglesReq);

+

+    REQUEST_AT_LEAST_SIZE(xSetClipRectanglesReq);

+    if ((stuff->ordering != Unsorted) && (stuff->ordering != YSorted) &&

+        (stuff->ordering != YXSorted) && (stuff->ordering != YXBanded)) {

+        client->errorValue = stuff->ordering;

+        return BadValue;

+    }

+    result = dixLookupGC(&pGC, stuff->gc, client, DixSetAttrAccess);

+    if (result != Success)

+        return result;

+

+    nr = (client->req_len << 2) - sizeof(xSetClipRectanglesReq);

+    if (nr & 4)

+        return BadLength;

+    nr >>= 3;

+    return SetClipRects(pGC, stuff->xOrigin, stuff->yOrigin,

+                        nr, (xRectangle *) &stuff[1], (int) stuff->ordering);

+}

+

+int

+ProcFreeGC(ClientPtr client)

+{

+    GC *pGC;

+    int rc;

+

+    REQUEST(xResourceReq);

+    REQUEST_SIZE_MATCH(xResourceReq);

+

+    rc = dixLookupGC(&pGC, stuff->id, client, DixDestroyAccess);

+    if (rc != Success)

+        return rc;

+

+    FreeResource(stuff->id, RT_NONE);

+    return Success;

+}

+

+int

+ProcClearToBackground(ClientPtr client)

+{

+    REQUEST(xClearAreaReq);

+    WindowPtr pWin;

+    int rc;

+

+    REQUEST_SIZE_MATCH(xClearAreaReq);

+    rc = dixLookupWindow(&pWin, stuff->window, client, DixWriteAccess);

+    if (rc != Success)

+        return rc;

+    if (pWin->drawable.class == InputOnly) {

+        client->errorValue = stuff->window;

+        return BadMatch;

+    }

+    if ((stuff->exposures != xTrue) && (stuff->exposures != xFalse)) {

+        client->errorValue = stuff->exposures;

+        return BadValue;

+    }

+    (*pWin->drawable.pScreen->ClearToBackground) (pWin, stuff->x, stuff->y,

+                                                  stuff->width, stuff->height,

+                                                  (Bool) stuff->exposures);

+    return Success;

+}

+

+int

+ProcCopyArea(ClientPtr client)

+{

+    DrawablePtr pDst;

+    DrawablePtr pSrc;

+    GC *pGC;

+

+    REQUEST(xCopyAreaReq);

+    RegionPtr pRgn;

+    int rc;

+

+    REQUEST_SIZE_MATCH(xCopyAreaReq);

+

+    VALIDATE_DRAWABLE_AND_GC(stuff->dstDrawable, pDst, DixWriteAccess);

+    if (stuff->dstDrawable != stuff->srcDrawable) {

+        rc = dixLookupDrawable(&pSrc, stuff->srcDrawable, client, 0,

+                               DixReadAccess);

+        if (rc != Success)

+            return rc;

+        if ((pDst->pScreen != pSrc->pScreen) || (pDst->depth != pSrc->depth)) {

+            client->errorValue = stuff->dstDrawable;

+            return BadMatch;

+        }

+    }

+    else

+        pSrc = pDst;

+

+    pRgn = (*pGC->ops->CopyArea) (pSrc, pDst, pGC, stuff->srcX, stuff->srcY,

+                                  stuff->width, stuff->height,

+                                  stuff->dstX, stuff->dstY);

+    if (pGC->graphicsExposures) {

+        (*pDst->pScreen->SendGraphicsExpose)

+            (client, pRgn, stuff->dstDrawable, X_CopyArea, 0);

+        if (pRgn)

+            RegionDestroy(pRgn);

+    }

+

+    return Success;

+}

+

+int

+ProcCopyPlane(ClientPtr client)

+{

+    DrawablePtr psrcDraw, pdstDraw;

+    GC *pGC;

+

+    REQUEST(xCopyPlaneReq);

+    RegionPtr pRgn;

+    int rc;

+

+    REQUEST_SIZE_MATCH(xCopyPlaneReq);

+

+    VALIDATE_DRAWABLE_AND_GC(stuff->dstDrawable, pdstDraw, DixWriteAccess);

+    if (stuff->dstDrawable != stuff->srcDrawable) {

+        rc = dixLookupDrawable(&psrcDraw, stuff->srcDrawable, client, 0,

+                               DixReadAccess);

+        if (rc != Success)

+            return rc;

+

+        if (pdstDraw->pScreen != psrcDraw->pScreen) {

+            client->errorValue = stuff->dstDrawable;

+            return BadMatch;

+        }

+    }

+    else

+        psrcDraw = pdstDraw;

+

+    /* Check to see if stuff->bitPlane has exactly ONE good bit set */

+    if (stuff->bitPlane == 0 || (stuff->bitPlane & (stuff->bitPlane - 1)) ||

+        (stuff->bitPlane > (1L << (psrcDraw->depth - 1)))) {

+        client->errorValue = stuff->bitPlane;

+        return BadValue;

+    }

+

+    pRgn =

+        (*pGC->ops->CopyPlane) (psrcDraw, pdstDraw, pGC, stuff->srcX,

+                                stuff->srcY, stuff->width, stuff->height,

+                                stuff->dstX, stuff->dstY, stuff->bitPlane);

+    if (pGC->graphicsExposures) {

+        (*pdstDraw->pScreen->SendGraphicsExpose)

+            (client, pRgn, stuff->dstDrawable, X_CopyPlane, 0);

+        if (pRgn)

+            RegionDestroy(pRgn);

+    }

+    return Success;

+}

+

+int

+ProcPolyPoint(ClientPtr client)

+{

+    int npoint;

+    GC *pGC;

+    DrawablePtr pDraw;

+

+    REQUEST(xPolyPointReq);

+

+    REQUEST_AT_LEAST_SIZE(xPolyPointReq);

+    if ((stuff->coordMode != CoordModeOrigin) &&

+        (stuff->coordMode != CoordModePrevious)) {

+        client->errorValue = stuff->coordMode;

+        return BadValue;

+    }

+    VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess);

+    npoint = bytes_to_int32((client->req_len << 2) - sizeof(xPolyPointReq));

+    if (npoint)

+        (*pGC->ops->PolyPoint) (pDraw, pGC, stuff->coordMode, npoint,

+                                (xPoint *) &stuff[1]);

+    return Success;

+}

+

+int

+ProcPolyLine(ClientPtr client)

+{

+    int npoint;

+    GC *pGC;

+    DrawablePtr pDraw;

+

+    REQUEST(xPolyLineReq);

+

+    REQUEST_AT_LEAST_SIZE(xPolyLineReq);

+    if ((stuff->coordMode != CoordModeOrigin) &&

+        (stuff->coordMode != CoordModePrevious)) {

+        client->errorValue = stuff->coordMode;

+        return BadValue;

+    }

+    VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess);

+    npoint = bytes_to_int32((client->req_len << 2) - sizeof(xPolyLineReq));

+    if (npoint > 1)

+        (*pGC->ops->Polylines) (pDraw, pGC, stuff->coordMode, npoint,

+                                (DDXPointPtr) &stuff[1]);

+    return Success;

+}

+

+int

+ProcPolySegment(ClientPtr client)

+{

+    int nsegs;

+    GC *pGC;

+    DrawablePtr pDraw;

+

+    REQUEST(xPolySegmentReq);

+

+    REQUEST_AT_LEAST_SIZE(xPolySegmentReq);

+    VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess);

+    nsegs = (client->req_len << 2) - sizeof(xPolySegmentReq);

+    if (nsegs & 4)

+        return BadLength;

+    nsegs >>= 3;

+    if (nsegs)

+        (*pGC->ops->PolySegment) (pDraw, pGC, nsegs, (xSegment *) &stuff[1]);

+    return Success;

+}

+

+int

+ProcPolyRectangle(ClientPtr client)

+{

+    int nrects;

+    GC *pGC;

+    DrawablePtr pDraw;

+

+    REQUEST(xPolyRectangleReq);

+

+    REQUEST_AT_LEAST_SIZE(xPolyRectangleReq);

+    VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess);

+    nrects = (client->req_len << 2) - sizeof(xPolyRectangleReq);

+    if (nrects & 4)

+        return BadLength;

+    nrects >>= 3;

+    if (nrects)

+        (*pGC->ops->PolyRectangle) (pDraw, pGC,

+                                    nrects, (xRectangle *) &stuff[1]);

+    return Success;

+}

+

+int

+ProcPolyArc(ClientPtr client)

+{

+    int narcs;

+    GC *pGC;

+    DrawablePtr pDraw;

+

+    REQUEST(xPolyArcReq);

+

+    REQUEST_AT_LEAST_SIZE(xPolyArcReq);

+    VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess);

+    narcs = (client->req_len << 2) - sizeof(xPolyArcReq);

+    if (narcs % sizeof(xArc))

+        return BadLength;

+    narcs /= sizeof(xArc);

+    if (narcs)

+        (*pGC->ops->PolyArc) (pDraw, pGC, narcs, (xArc *) &stuff[1]);

+    return Success;

+}

+

+int

+ProcFillPoly(ClientPtr client)

+{

+    int things;

+    GC *pGC;

+    DrawablePtr pDraw;

+

+    REQUEST(xFillPolyReq);

+

+    REQUEST_AT_LEAST_SIZE(xFillPolyReq);

+    if ((stuff->shape != Complex) && (stuff->shape != Nonconvex) &&

+        (stuff->shape != Convex)) {

+        client->errorValue = stuff->shape;

+        return BadValue;

+    }

+    if ((stuff->coordMode != CoordModeOrigin) &&

+        (stuff->coordMode != CoordModePrevious)) {

+        client->errorValue = stuff->coordMode;

+        return BadValue;

+    }

+

+    VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess);

+    things = bytes_to_int32((client->req_len << 2) - sizeof(xFillPolyReq));

+    if (things)

+        (*pGC->ops->FillPolygon) (pDraw, pGC, stuff->shape,

+                                  stuff->coordMode, things,

+                                  (DDXPointPtr) &stuff[1]);

+    return Success;

+}

+

+int

+ProcPolyFillRectangle(ClientPtr client)

+{

+    int things;

+    GC *pGC;

+    DrawablePtr pDraw;

+

+    REQUEST(xPolyFillRectangleReq);

+

+    REQUEST_AT_LEAST_SIZE(xPolyFillRectangleReq);

+    VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess);

+    things = (client->req_len << 2) - sizeof(xPolyFillRectangleReq);

+    if (things & 4)

+        return BadLength;

+    things >>= 3;

+

+    if (things)

+        (*pGC->ops->PolyFillRect) (pDraw, pGC, things,

+                                   (xRectangle *) &stuff[1]);

+    return Success;

+}

+

+int

+ProcPolyFillArc(ClientPtr client)

+{

+    int narcs;

+    GC *pGC;

+    DrawablePtr pDraw;

+

+    REQUEST(xPolyFillArcReq);

+

+    REQUEST_AT_LEAST_SIZE(xPolyFillArcReq);

+    VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess);

+    narcs = (client->req_len << 2) - sizeof(xPolyFillArcReq);

+    if (narcs % sizeof(xArc))

+        return BadLength;

+    narcs /= sizeof(xArc);

+    if (narcs)

+        (*pGC->ops->PolyFillArc) (pDraw, pGC, narcs, (xArc *) &stuff[1]);

+    return Success;

+}

+

+#ifdef MATCH_CLIENT_ENDIAN

+

+int

+ServerOrder(void)

+{

+    int whichbyte = 1;

+

+    if (*((char *) &whichbyte))

+        return LSBFirst;

+    return MSBFirst;

+}

+

+#define ClientOrder(client) ((client)->swapped ? !ServerOrder() : ServerOrder())

+

+void

+ReformatImage(char *base, int nbytes, int bpp, int order)

+{

+    switch (bpp) {

+    case 1:                    /* yuck */

+        if (BITMAP_BIT_ORDER != order)

+            BitOrderInvert((unsigned char *) base, nbytes);

+#if IMAGE_BYTE_ORDER != BITMAP_BIT_ORDER && BITMAP_SCANLINE_UNIT != 8

+        ReformatImage(base, nbytes, BITMAP_SCANLINE_UNIT, order);

+#endif

+        break;

+    case 4:

+        break;                  /* yuck */

+    case 8:

+        break;

+    case 16:

+        if (IMAGE_BYTE_ORDER != order)

+            TwoByteSwap((unsigned char *) base, nbytes);

+        break;

+    case 32:

+        if (IMAGE_BYTE_ORDER != order)

+            FourByteSwap((unsigned char *) base, nbytes);

+        break;

+    }

+}

+#else

+#define ReformatImage(b,n,bpp,o)

+#endif

+

+/* 64-bit server notes: the protocol restricts padding of images to

+ * 8-, 16-, or 32-bits. We would like to have 64-bits for the server

+ * to use internally. Removes need for internal alignment checking.

+ * All of the PutImage functions could be changed individually, but

+ * as currently written, they call other routines which require things

+ * to be 64-bit padded on scanlines, so we changed things here.

+ * If an image would be padded differently for 64- versus 32-, then

+ * copy each scanline to a 64-bit padded scanline.

+ * Also, we need to make sure that the image is aligned on a 64-bit

+ * boundary, even if the scanlines are padded to our satisfaction.

+ */

+int

+ProcPutImage(ClientPtr client)

+{

+    GC *pGC;

+    DrawablePtr pDraw;

+    long length;                /* length of scanline server padded */

+    long lengthProto;           /* length of scanline protocol padded */

+    char *tmpImage;

+

+    REQUEST(xPutImageReq);

+

+    REQUEST_AT_LEAST_SIZE(xPutImageReq);

+    VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess);

+    if (stuff->format == XYBitmap) {

+        if ((stuff->depth != 1) ||

+            (stuff->leftPad >= (unsigned int) screenInfo.bitmapScanlinePad))

+            return BadMatch;

+        length = BitmapBytePad(stuff->width + stuff->leftPad);

+    }

+    else if (stuff->format == XYPixmap) {

+        if ((pDraw->depth != stuff->depth) ||

+            (stuff->leftPad >= (unsigned int) screenInfo.bitmapScanlinePad))

+            return BadMatch;

+        length = BitmapBytePad(stuff->width + stuff->leftPad);

+        length *= stuff->depth;

+    }

+    else if (stuff->format == ZPixmap) {

+        if ((pDraw->depth != stuff->depth) || (stuff->leftPad != 0))

+            return BadMatch;

+        length = PixmapBytePad(stuff->width, stuff->depth);

+    }

+    else {

+        client->errorValue = stuff->format;

+        return BadValue;

+    }

+

+    tmpImage = (char *) &stuff[1];

+    lengthProto = length;

+

+    if ((bytes_to_int32(lengthProto * stuff->height) +

+         bytes_to_int32(sizeof(xPutImageReq))) != client->req_len)

+        return BadLength;

+

+    ReformatImage(tmpImage, lengthProto * stuff->height,

+                  stuff->format == ZPixmap ? BitsPerPixel(stuff->depth) : 1,

+                  ClientOrder(client));

+

+    (*pGC->ops->PutImage) (pDraw, pGC, stuff->depth, stuff->dstX, stuff->dstY,

+                           stuff->width, stuff->height,

+                           stuff->leftPad, stuff->format, tmpImage);

+

+    return Success;

+}

+

+static int

+DoGetImage(ClientPtr client, int format, Drawable drawable,

+           int x, int y, int width, int height,

+           Mask planemask, xGetImageReply ** im_return)

+{

+    DrawablePtr pDraw, pBoundingDraw;

+    int nlines, linesPerBuf, rc;

+    int linesDone;

+

+    /* coordinates relative to the bounding drawable */

+    int relx, rely;

+    long widthBytesLine, length;

+    Mask plane = 0;

+    char *pBuf;

+    xGetImageReply xgi;

+    RegionPtr pVisibleRegion = NULL;

+

+    if ((format != XYPixmap) && (format != ZPixmap)) {

+        client->errorValue = format;

+        return BadValue;

+    }

+    rc = dixLookupDrawable(&pDraw, drawable, client, 0, DixReadAccess);

+    if (rc != Success)

+        return rc;

+

+    memset(&xgi, 0, sizeof(xGetImageReply));

+

+    relx = x;

+    rely = y;

+

+    if (pDraw->type == DRAWABLE_WINDOW) {

+        WindowPtr pWin = (WindowPtr) pDraw;

+

+        /* "If the drawable is a window, the window must be viewable ... or a

+         * BadMatch error results" */

+        if (!pWin->viewable)

+            return BadMatch;

+

+        /* If the drawable is a window, the rectangle must be contained within

+         * its bounds (including the border). */

+        if (x < -wBorderWidth(pWin) ||

+            x + width > wBorderWidth(pWin) + (int) pDraw->width ||

+            y < -wBorderWidth(pWin) ||

+            y + height > wBorderWidth(pWin) + (int) pDraw->height)

+            return BadMatch;

+

+        relx += pDraw->x;

+        rely += pDraw->y;

+

+        if (pDraw->pScreen->GetWindowPixmap) {

+            PixmapPtr pPix = (*pDraw->pScreen->GetWindowPixmap) (pWin);

+

+            pBoundingDraw = &pPix->drawable;

+#ifdef COMPOSITE

+            relx -= pPix->screen_x;

+            rely -= pPix->screen_y;

+#endif

+        }

+        else {

+            pBoundingDraw = (DrawablePtr) pDraw->pScreen->root;

+        }

+

+        xgi.visual = wVisual(pWin);

+    }

+    else {

+        pBoundingDraw = pDraw;

+        xgi.visual = None;

+    }

+

+    /* "If the drawable is a pixmap, the given rectangle must be wholly

+     *  contained within the pixmap, or a BadMatch error results.  If the

+     *  drawable is a window [...] it must be the case that if there were no

+     *  inferiors or overlapping windows, the specified rectangle of the window

+     *  would be fully visible on the screen and wholly contained within the

+     *  outside edges of the window, or a BadMatch error results."

+     *

+     * We relax the window case slightly to mean that the rectangle must exist

+     * within the bounds of the window's backing pixmap.  In particular, this

+     * means that a GetImage request may succeed or fail with BadMatch depending

+     * on whether any of its ancestor windows are redirected.  */

+    if (relx < 0 || relx + width > (int) pBoundingDraw->width ||

+        rely < 0 || rely + height > (int) pBoundingDraw->height)

+        return BadMatch;

+

+    xgi.type = X_Reply;

+    xgi.sequenceNumber = client->sequence;

+    xgi.depth = pDraw->depth;

+    if (format == ZPixmap) {

+        widthBytesLine = PixmapBytePad(width, pDraw->depth);

+        length = widthBytesLine * height;

+

+    }

+    else {

+        widthBytesLine = BitmapBytePad(width);

+        plane = ((Mask) 1) << (pDraw->depth - 1);

+        /* only planes asked for */

+        length = widthBytesLine * height *

+            Ones(planemask & (plane | (plane - 1)));

+

+    }

+

+    xgi.length = length;

+

+    if (im_return) {

+        pBuf = calloc(1, sz_xGetImageReply + length);

+        if (!pBuf)

+            return BadAlloc;

+        if (widthBytesLine == 0)

+            linesPerBuf = 0;

+        else

+            linesPerBuf = height;

+        *im_return = (xGetImageReply *) pBuf;

+        *(xGetImageReply *) pBuf = xgi;

+        pBuf += sz_xGetImageReply;

+    }

+    else {

+        xgi.length = bytes_to_int32(xgi.length);

+        if (widthBytesLine == 0 || height == 0)

+            linesPerBuf = 0;

+        else if (widthBytesLine >= IMAGE_BUFSIZE)

+            linesPerBuf = 1;

+        else {

+            linesPerBuf = IMAGE_BUFSIZE / widthBytesLine;

+            if (linesPerBuf > height)

+                linesPerBuf = height;

+        }

+        length = linesPerBuf * widthBytesLine;

+        if (linesPerBuf < height) {

+            /* we have to make sure intermediate buffers don't need padding */

+            while ((linesPerBuf > 1) &&

+                   (length & ((1L << LOG2_BYTES_PER_SCANLINE_PAD) - 1))) {

+                linesPerBuf--;

+                length -= widthBytesLine;

+            }

+            while (length & ((1L << LOG2_BYTES_PER_SCANLINE_PAD) - 1)) {

+                linesPerBuf++;

+                length += widthBytesLine;

+            }

+        }

+        if (!(pBuf = calloc(1, length)))

+            return BadAlloc;

+        WriteReplyToClient(client, sizeof(xGetImageReply), &xgi);

+    }

+

+    if (pDraw->type == DRAWABLE_WINDOW) {

+        pVisibleRegion = NotClippedByChildren((WindowPtr) pDraw);

+        if (pVisibleRegion) {

+            RegionTranslate(pVisibleRegion, -pDraw->x, -pDraw->y);

+        }

+    }

+

+    if (linesPerBuf == 0) {

+        /* nothing to do */

+    }

+    else if (format == ZPixmap) {

+        linesDone = 0;

+        while (height - linesDone > 0) {

+            nlines = min(linesPerBuf, height - linesDone);

+            (*pDraw->pScreen->GetImage) (pDraw,

+                                         x,

+                                         y + linesDone,

+                                         width,

+                                         nlines,

+                                         format, planemask, (pointer) pBuf);

+            if (pVisibleRegion)

+                XaceCensorImage(client, pVisibleRegion, widthBytesLine,

+                                pDraw, x, y + linesDone, width,

+                                nlines, format, pBuf);

+

+            /* Note that this is NOT a call to WriteSwappedDataToClient,

+               as we do NOT byte swap */

+            if (!im_return) {

+                ReformatImage(pBuf, (int) (nlines * widthBytesLine),

+                              BitsPerPixel(pDraw->depth), ClientOrder(client));

+

+/* Don't split me, gcc pukes when you do */

+                WriteToClient(client, (int) (nlines * widthBytesLine), pBuf);

+            }

+            linesDone += nlines;

+        }

+    }

+    else {                      /* XYPixmap */

+

+        for (; plane; plane >>= 1) {

+            if (planemask & plane) {

+                linesDone = 0;

+                while (height - linesDone > 0) {

+                    nlines = min(linesPerBuf, height - linesDone);

+                    (*pDraw->pScreen->GetImage) (pDraw,

+                                                 x,

+                                                 y + linesDone,

+                                                 width,

+                                                 nlines,

+                                                 format, plane, (pointer) pBuf);

+                    if (pVisibleRegion)

+                        XaceCensorImage(client, pVisibleRegion,

+                                        widthBytesLine,

+                                        pDraw, x, y + linesDone, width,

+                                        nlines, format, pBuf);

+

+                    /* Note: NOT a call to WriteSwappedDataToClient,

+                       as we do NOT byte swap */

+                    if (im_return) {

+                        pBuf += nlines * widthBytesLine;

+                    }

+                    else {

+                        ReformatImage(pBuf,

+                                      (int) (nlines * widthBytesLine),

+                                      1, ClientOrder(client));

+

+/* Don't split me, gcc pukes when you do */

+                        WriteToClient(client, (int) (nlines * widthBytesLine),

+				      pBuf);

+                    }

+                    linesDone += nlines;

+                }

+            }

+        }

+    }

+    if (pVisibleRegion)

+        RegionDestroy(pVisibleRegion);

+    if (!im_return)

+        free(pBuf);

+    return Success;

+}

+

+int

+ProcGetImage(ClientPtr client)

+{

+    REQUEST(xGetImageReq);

+

+    REQUEST_SIZE_MATCH(xGetImageReq);

+

+    return DoGetImage(client, stuff->format, stuff->drawable,

+                      stuff->x, stuff->y,

+                      (int) stuff->width, (int) stuff->height,

+                      stuff->planeMask, (xGetImageReply **) NULL);

+}

+

+int

+ProcPolyText(ClientPtr client)

+{

+    int err;

+

+    REQUEST(xPolyTextReq);

+    DrawablePtr pDraw;

+    GC *pGC;

+

+    REQUEST_AT_LEAST_SIZE(xPolyTextReq);

+    VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess);

+

+    err = PolyText(client,

+                   pDraw,

+                   pGC,

+                   (unsigned char *) &stuff[1],

+                   ((unsigned char *) stuff) + (client->req_len << 2),

+                   stuff->x, stuff->y, stuff->reqType, stuff->drawable);

+

+    if (err == Success) {

+        return Success;

+    }

+    else

+        return err;

+}

+

+int

+ProcImageText8(ClientPtr client)

+{

+    int err;

+    DrawablePtr pDraw;

+    GC *pGC;

+

+    REQUEST(xImageTextReq);

+

+    REQUEST_FIXED_SIZE(xImageTextReq, stuff->nChars);

+    VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess);

+

+    err = ImageText(client,

+                    pDraw,

+                    pGC,

+                    stuff->nChars,

+                    (unsigned char *) &stuff[1],

+                    stuff->x, stuff->y, stuff->reqType, stuff->drawable);

+

+    if (err == Success) {

+        return Success;

+    }

+    else

+        return err;

+}

+

+int

+ProcImageText16(ClientPtr client)

+{

+    int err;

+    DrawablePtr pDraw;

+    GC *pGC;

+

+    REQUEST(xImageTextReq);

+

+    REQUEST_FIXED_SIZE(xImageTextReq, stuff->nChars << 1);

+    VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess);

+

+    err = ImageText(client,

+                    pDraw,

+                    pGC,

+                    stuff->nChars,

+                    (unsigned char *) &stuff[1],

+                    stuff->x, stuff->y, stuff->reqType, stuff->drawable);

+

+    if (err == Success) {

+        return Success;

+    }

+    else

+        return err;

+}

+

+int

+ProcCreateColormap(ClientPtr client)

+{

+    VisualPtr pVisual;

+    ColormapPtr pmap;

+    Colormap mid;

+    WindowPtr pWin;

+    ScreenPtr pScreen;

+

+    REQUEST(xCreateColormapReq);

+    int i, result;

+

+    REQUEST_SIZE_MATCH(xCreateColormapReq);

+

+    if ((stuff->alloc != AllocNone) && (stuff->alloc != AllocAll)) {

+        client->errorValue = stuff->alloc;

+        return BadValue;

+    }

+    mid = stuff->mid;

+    LEGAL_NEW_RESOURCE(mid, client);

+    result = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);

+    if (result != Success)

+        return result;

+

+    pScreen = pWin->drawable.pScreen;

+    for (i = 0, pVisual = pScreen->visuals;

+         i < pScreen->numVisuals; i++, pVisual++) {

+        if (pVisual->vid != stuff->visual)

+            continue;

+        return CreateColormap(mid, pScreen, pVisual, &pmap,

+                              (int) stuff->alloc, client->index);

+    }

+    client->errorValue = stuff->visual;

+    return BadMatch;

+}

+

+int

+ProcFreeColormap(ClientPtr client)

+{

+    ColormapPtr pmap;

+    int rc;

+

+    REQUEST(xResourceReq);

+

+    REQUEST_SIZE_MATCH(xResourceReq);

+    rc = dixLookupResourceByType((pointer *) &pmap, stuff->id, RT_COLORMAP,

+                                 client, DixDestroyAccess);

+    if (rc == Success) {

+        /* Freeing a default colormap is a no-op */

+        if (!(pmap->flags & IsDefault))

+            FreeResource(stuff->id, RT_NONE);

+        return Success;

+    }

+    else {

+        client->errorValue = stuff->id;

+        return rc;

+    }

+}

+

+int

+ProcCopyColormapAndFree(ClientPtr client)

+{

+    Colormap mid;

+    ColormapPtr pSrcMap;

+

+    REQUEST(xCopyColormapAndFreeReq);

+    int rc;

+

+    REQUEST_SIZE_MATCH(xCopyColormapAndFreeReq);

+    mid = stuff->mid;

+    LEGAL_NEW_RESOURCE(mid, client);

+    rc = dixLookupResourceByType((pointer *) &pSrcMap, stuff->srcCmap,

+                                 RT_COLORMAP, client,

+                                 DixReadAccess | DixRemoveAccess);

+    if (rc == Success)

+        return CopyColormapAndFree(mid, pSrcMap, client->index);

+    client->errorValue = stuff->srcCmap;

+    return rc;

+}

+

+int

+ProcInstallColormap(ClientPtr client)

+{

+    ColormapPtr pcmp;

+    int rc;

+

+    REQUEST(xResourceReq);

+    REQUEST_SIZE_MATCH(xResourceReq);

+

+    rc = dixLookupResourceByType((pointer *) &pcmp, stuff->id, RT_COLORMAP,

+                                 client, DixInstallAccess);

+    if (rc != Success)

+        goto out;

+

+    rc = XaceHook(XACE_SCREEN_ACCESS, client, pcmp->pScreen, DixSetAttrAccess);

+    if (rc != Success) {

+        if (rc == BadValue)

+            rc = BadColor;

+        goto out;

+    }

+

+    (*(pcmp->pScreen->InstallColormap)) (pcmp);

+    return Success;

+

+ out:

+    client->errorValue = stuff->id;

+    return rc;

+}

+

+int

+ProcUninstallColormap(ClientPtr client)

+{

+    ColormapPtr pcmp;

+    int rc;

+

+    REQUEST(xResourceReq);

+    REQUEST_SIZE_MATCH(xResourceReq);

+

+    rc = dixLookupResourceByType((pointer *) &pcmp, stuff->id, RT_COLORMAP,

+                                 client, DixUninstallAccess);

+    if (rc != Success)

+        goto out;

+

+    rc = XaceHook(XACE_SCREEN_ACCESS, client, pcmp->pScreen, DixSetAttrAccess);

+    if (rc != Success) {

+        if (rc == BadValue)

+            rc = BadColor;

+        goto out;

+    }

+

+    if (pcmp->mid != pcmp->pScreen->defColormap)

+        (*(pcmp->pScreen->UninstallColormap)) (pcmp);

+    return Success;

+

+ out:

+    client->errorValue = stuff->id;

+    return rc;

+}

+

+int

+ProcListInstalledColormaps(ClientPtr client)

+{

+    xListInstalledColormapsReply *preply;

+    int nummaps, rc;

+    WindowPtr pWin;

+

+    REQUEST(xResourceReq);

+    REQUEST_SIZE_MATCH(xResourceReq);

+

+    rc = dixLookupWindow(&pWin, stuff->id, client, DixGetAttrAccess);

+    if (rc != Success)

+        return rc;

+

+    rc = XaceHook(XACE_SCREEN_ACCESS, client, pWin->drawable.pScreen,

+                  DixGetAttrAccess);

+    if (rc != Success)

+        return rc;

+

+    preply = malloc(sizeof(xListInstalledColormapsReply) +

+                    pWin->drawable.pScreen->maxInstalledCmaps *

+                    sizeof(Colormap));

+    if (!preply)

+        return BadAlloc;

+

+    preply->type = X_Reply;

+    preply->sequenceNumber = client->sequence;

+    nummaps = (*pWin->drawable.pScreen->ListInstalledColormaps)

+        (pWin->drawable.pScreen, (Colormap *) &preply[1]);

+    preply->nColormaps = nummaps;

+    preply->length = nummaps;

+    WriteReplyToClient(client, sizeof(xListInstalledColormapsReply), preply);

+    client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write;

+    WriteSwappedDataToClient(client, nummaps * sizeof(Colormap), &preply[1]);

+    free(preply);

+    return Success;

+}

+

+int

+ProcAllocColor(ClientPtr client)

+{

+    ColormapPtr pmap;

+    int rc;

+

+    REQUEST(xAllocColorReq);

+

+    REQUEST_SIZE_MATCH(xAllocColorReq);

+    rc = dixLookupResourceByType((pointer *) &pmap, stuff->cmap, RT_COLORMAP,

+                                 client, DixAddAccess);

+    if (rc == Success) {

+        xAllocColorReply acr;

+        acr.type = X_Reply;

+        acr.sequenceNumber = client->sequence;

+        acr.length = 0;

+        acr.red = stuff->red;

+        acr.green = stuff->green;

+        acr.blue = stuff->blue;

+        acr.pixel = 0;

+        if ((rc = AllocColor(pmap, &acr.red, &acr.green, &acr.blue,

+                             &acr.pixel, client->index)))

+            return rc;

+#ifdef PANORAMIX

+        if (noPanoramiXExtension || !pmap->pScreen->myNum)

+#endif

+            WriteReplyToClient(client, sizeof(xAllocColorReply), &acr);

+        return Success;

+

+    }

+    else {

+        client->errorValue = stuff->cmap;

+        return rc;

+    }

+}

+

+int

+ProcAllocNamedColor(ClientPtr client)

+{

+    ColormapPtr pcmp;

+    int rc;

+

+    REQUEST(xAllocNamedColorReq);

+

+    REQUEST_FIXED_SIZE(xAllocNamedColorReq, stuff->nbytes);

+    rc = dixLookupResourceByType((pointer *) &pcmp, stuff->cmap, RT_COLORMAP,

+                                 client, DixAddAccess);

+    if (rc == Success) {

+        xAllocNamedColorReply ancr;

+        ancr.type = X_Reply;

+        ancr.sequenceNumber = client->sequence;

+        ancr.length = 0;

+

+        if (OsLookupColor

+            (pcmp->pScreen->myNum, (char *) &stuff[1], stuff->nbytes,

+             &ancr.exactRed, &ancr.exactGreen, &ancr.exactBlue)) {

+            ancr.screenRed = ancr.exactRed;

+            ancr.screenGreen = ancr.exactGreen;

+            ancr.screenBlue = ancr.exactBlue;

+            ancr.pixel = 0;

+            if ((rc = AllocColor(pcmp,

+                                 &ancr.screenRed, &ancr.screenGreen,

+                                 &ancr.screenBlue, &ancr.pixel, client->index)))

+                return rc;

+#ifdef PANORAMIX

+            if (noPanoramiXExtension || !pcmp->pScreen->myNum)

+#endif

+                WriteReplyToClient(client, sizeof(xAllocNamedColorReply),

+                                   &ancr);

+            return Success;

+        }

+        else

+            return BadName;

+

+    }

+    else {

+        client->errorValue = stuff->cmap;

+        return rc;

+    }

+}

+

+int

+ProcAllocColorCells(ClientPtr client)

+{

+    ColormapPtr pcmp;

+    int rc;

+

+    REQUEST(xAllocColorCellsReq);

+

+    REQUEST_SIZE_MATCH(xAllocColorCellsReq);

+    rc = dixLookupResourceByType((pointer *) &pcmp, stuff->cmap, RT_COLORMAP,

+                                 client, DixAddAccess);

+    if (rc == Success) {

+        int npixels, nmasks;

+        long length;

+        Pixel *ppixels, *pmasks;

+

+        npixels = stuff->colors;

+        if (!npixels) {

+            client->errorValue = npixels;

+            return BadValue;

+        }

+        if (stuff->contiguous != xTrue && stuff->contiguous != xFalse) {

+            client->errorValue = stuff->contiguous;

+            return BadValue;

+        }

+        nmasks = stuff->planes;

+        length = ((long) npixels + (long) nmasks) * sizeof(Pixel);

+        ppixels = malloc(length);

+        if (!ppixels)

+            return BadAlloc;

+        pmasks = ppixels + npixels;

+

+        if ((rc = AllocColorCells(client->index, pcmp, npixels, nmasks,

+                                  (Bool) stuff->contiguous, ppixels, pmasks))) {

+            free(ppixels);

+            return rc;

+        }

+#ifdef PANORAMIX

+        if (noPanoramiXExtension || !pcmp->pScreen->myNum)

+#endif

+        {

+            xAllocColorCellsReply accr;

+            accr.type = X_Reply;

+            accr.sequenceNumber = client->sequence;

+            accr.length = bytes_to_int32(length);

+            accr.nPixels = npixels;

+            accr.nMasks = nmasks;

+            WriteReplyToClient(client, sizeof(xAllocColorCellsReply), &accr);

+            client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write;

+            WriteSwappedDataToClient(client, length, ppixels);

+        }

+        free(ppixels);

+        return Success;

+    }

+    else {

+        client->errorValue = stuff->cmap;

+        return rc;

+    }

+}

+

+int

+ProcAllocColorPlanes(ClientPtr client)

+{

+    ColormapPtr pcmp;

+    int rc;

+

+    REQUEST(xAllocColorPlanesReq);

+

+    REQUEST_SIZE_MATCH(xAllocColorPlanesReq);

+    rc = dixLookupResourceByType((pointer *) &pcmp, stuff->cmap, RT_COLORMAP,

+                                 client, DixAddAccess);

+    if (rc == Success) {

+        xAllocColorPlanesReply acpr;

+        int npixels;

+        long length;

+        Pixel *ppixels;

+

+        npixels = stuff->colors;

+        if (!npixels) {

+            client->errorValue = npixels;

+            return BadValue;

+        }

+        if (stuff->contiguous != xTrue && stuff->contiguous != xFalse) {

+            client->errorValue = stuff->contiguous;

+            return BadValue;

+        }

+

+        acpr.type = X_Reply;

+        acpr.sequenceNumber = client->sequence;

+        acpr.nPixels = npixels;

+        

+        length = (long) npixels *sizeof(Pixel);

+

+        ppixels = malloc(length);

+        if (!ppixels)

+            return BadAlloc;

+        if ((rc = AllocColorPlanes(client->index, pcmp, npixels,

+                                   (int) stuff->red, (int) stuff->green,

+                                   (int) stuff->blue, (Bool) stuff->contiguous,

+                                   ppixels, &acpr.redMask, &acpr.greenMask,

+                                   &acpr.blueMask))) {

+            free(ppixels);

+            return rc;

+        }

+        acpr.length = bytes_to_int32(length);

+#ifdef PANORAMIX

+        if (noPanoramiXExtension || !pcmp->pScreen->myNum)

+#endif

+        {

+            WriteReplyToClient(client, sizeof(xAllocColorPlanesReply), &acpr);

+            client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write;

+            WriteSwappedDataToClient(client, length, ppixels);

+        }

+        free(ppixels);

+        return Success;

+    }

+    else {

+        client->errorValue = stuff->cmap;

+        return rc;

+    }

+}

+

+int

+ProcFreeColors(ClientPtr client)

+{

+    ColormapPtr pcmp;

+    int rc;

+

+    REQUEST(xFreeColorsReq);

+

+    REQUEST_AT_LEAST_SIZE(xFreeColorsReq);

+    rc = dixLookupResourceByType((pointer *) &pcmp, stuff->cmap, RT_COLORMAP,

+                                 client, DixRemoveAccess);

+    if (rc == Success) {

+        int count;

+

+        if (pcmp->flags & AllAllocated)

+            return BadAccess;

+        count = bytes_to_int32((client->req_len << 2) - sizeof(xFreeColorsReq));

+        return FreeColors(pcmp, client->index, count,

+                          (Pixel *) &stuff[1], (Pixel) stuff->planeMask);

+    }

+    else {

+        client->errorValue = stuff->cmap;

+        return rc;

+    }

+}

+

+int

+ProcStoreColors(ClientPtr client)

+{

+    ColormapPtr pcmp;

+    int rc;

+

+    REQUEST(xStoreColorsReq);

+

+    REQUEST_AT_LEAST_SIZE(xStoreColorsReq);

+    rc = dixLookupResourceByType((pointer *) &pcmp, stuff->cmap, RT_COLORMAP,

+                                 client, DixWriteAccess);

+    if (rc == Success) {

+        int count;

+

+        count = (client->req_len << 2) - sizeof(xStoreColorsReq);

+        if (count % sizeof(xColorItem))

+            return BadLength;

+        count /= sizeof(xColorItem);

+        return StoreColors(pcmp, count, (xColorItem *) &stuff[1], client);

+    }

+    else {

+        client->errorValue = stuff->cmap;

+        return rc;

+    }

+}

+

+int

+ProcStoreNamedColor(ClientPtr client)

+{

+    ColormapPtr pcmp;

+    int rc;

+

+    REQUEST(xStoreNamedColorReq);

+

+    REQUEST_FIXED_SIZE(xStoreNamedColorReq, stuff->nbytes);

+    rc = dixLookupResourceByType((pointer *) &pcmp, stuff->cmap, RT_COLORMAP,

+                                 client, DixWriteAccess);

+    if (rc == Success) {

+        xColorItem def;

+

+        if (OsLookupColor(pcmp->pScreen->myNum, (char *) &stuff[1],

+                          stuff->nbytes, &def.red, &def.green, &def.blue)) {

+            def.flags = stuff->flags;

+            def.pixel = stuff->pixel;

+            return StoreColors(pcmp, 1, &def, client);

+        }

+        return BadName;

+    }

+    else {

+        client->errorValue = stuff->cmap;

+        return rc;

+    }

+}

+

+int

+ProcQueryColors(ClientPtr client)

+{

+    ColormapPtr pcmp;

+    int rc;

+

+    REQUEST(xQueryColorsReq);

+

+    REQUEST_AT_LEAST_SIZE(xQueryColorsReq);

+    rc = dixLookupResourceByType((pointer *) &pcmp, stuff->cmap, RT_COLORMAP,

+                                 client, DixReadAccess);

+    if (rc == Success) {

+        int count;

+        xrgb *prgbs;

+        xQueryColorsReply qcr;

+

+        count =

+            bytes_to_int32((client->req_len << 2) - sizeof(xQueryColorsReq));

+        prgbs = calloc(1, count * sizeof(xrgb));

+        if (!prgbs && count)

+            return BadAlloc;

+        if ((rc =

+             QueryColors(pcmp, count, (Pixel *) &stuff[1], prgbs, client))) {

+            free(prgbs);

+            return rc;

+        }

+        memset(&qcr, 0, sizeof(xQueryColorsReply));

+        qcr.type = X_Reply;

+        qcr.sequenceNumber = client->sequence;

+        qcr.length = bytes_to_int32(count * sizeof(xrgb));

+        qcr.nColors = count;

+        

+        WriteReplyToClient(client, sizeof(xQueryColorsReply), &qcr);

+        if (count) {

+            client->pSwapReplyFunc = (ReplySwapPtr) SQColorsExtend;

+            WriteSwappedDataToClient(client, count * sizeof(xrgb), prgbs);

+        }

+        free(prgbs);

+        return Success;

+

+    }

+    else {

+        client->errorValue = stuff->cmap;

+        return rc;

+    }

+}

+

+int

+ProcLookupColor(ClientPtr client)

+{

+    ColormapPtr pcmp;

+    int rc;

+

+    REQUEST(xLookupColorReq);

+

+    REQUEST_FIXED_SIZE(xLookupColorReq, stuff->nbytes);

+    rc = dixLookupResourceByType((pointer *) &pcmp, stuff->cmap, RT_COLORMAP,

+                                 client, DixReadAccess);

+    if (rc == Success) {

+        CARD16 exactRed, exactGreen, exactBlue;

+

+        if (OsLookupColor

+            (pcmp->pScreen->myNum, (char *) &stuff[1], stuff->nbytes,

+             &exactRed, &exactGreen, &exactBlue)) {

+            xLookupColorReply lcr;

+            lcr.type = X_Reply;

+            lcr.sequenceNumber = client->sequence;

+            lcr.length = 0;

+            lcr.exactRed = exactRed;

+            lcr.exactGreen = exactGreen;

+            lcr.exactBlue = exactBlue;

+            lcr.screenRed = exactRed;

+            lcr.screenGreen = exactGreen;

+            lcr.screenBlue = exactBlue;

+            

+            (*pcmp->pScreen->ResolveColor) (&lcr.screenRed,

+                                            &lcr.screenGreen,

+                                            &lcr.screenBlue, pcmp->pVisual);

+            WriteReplyToClient(client, sizeof(xLookupColorReply), &lcr);

+            return Success;

+        }

+        return BadName;

+    }

+    else {

+        client->errorValue = stuff->cmap;

+        return rc;

+    }

+}

+

+int

+ProcCreateCursor(ClientPtr client)

+{

+    CursorPtr pCursor;

+    PixmapPtr src;

+    PixmapPtr msk;

+    unsigned char *srcbits;

+    unsigned char *mskbits;

+    unsigned short width, height;

+    long n;

+    CursorMetricRec cm;

+    int rc;

+

+    REQUEST(xCreateCursorReq);

+

+    REQUEST_SIZE_MATCH(xCreateCursorReq);

+    LEGAL_NEW_RESOURCE(stuff->cid, client);

+

+    rc = dixLookupResourceByType((pointer *) &src, stuff->source, RT_PIXMAP,

+                                 client, DixReadAccess);

+    if (rc != Success) {

+        client->errorValue = stuff->source;

+        return rc;

+    }

+

+    rc = dixLookupResourceByType((pointer *) &msk, stuff->mask, RT_PIXMAP,

+                                 client, DixReadAccess);

+    if (rc != Success) {

+        if (stuff->mask != None) {

+            client->errorValue = stuff->mask;

+            return rc;

+        }

+    }

+    else if (src->drawable.width != msk->drawable.width

+             || src->drawable.height != msk->drawable.height

+             || src->drawable.depth != 1 || msk->drawable.depth != 1)

+        return BadMatch;

+

+    width = src->drawable.width;

+    height = src->drawable.height;

+

+    if (stuff->x > width || stuff->y > height)

+        return BadMatch;

+

+    n = BitmapBytePad(width) * height;

+    srcbits = calloc(1, n);

+    if (!srcbits)

+        return BadAlloc;

+    mskbits = malloc(n);

+    if (!mskbits) {

+        free(srcbits);

+        return BadAlloc;

+    }

+

+    (*src->drawable.pScreen->GetImage) ((DrawablePtr) src, 0, 0, width, height,

+                                        XYPixmap, 1, (pointer) srcbits);

+    if (msk == (PixmapPtr) NULL) {

+        unsigned char *bits = mskbits;

+

+        while (--n >= 0)

+            *bits++ = ~0;

+    }

+    else {

+        /* zeroing the (pad) bits helps some ddx cursor handling */

+        memset((char *) mskbits, 0, n);

+        (*msk->drawable.pScreen->GetImage) ((DrawablePtr) msk, 0, 0, width,

+                                            height, XYPixmap, 1,

+                                            (pointer) mskbits);

+    }

+    cm.width = width;

+    cm.height = height;

+    cm.xhot = stuff->x;

+    cm.yhot = stuff->y;

+    rc = AllocARGBCursor(srcbits, mskbits, NULL, &cm,

+                         stuff->foreRed, stuff->foreGreen, stuff->foreBlue,

+                         stuff->backRed, stuff->backGreen, stuff->backBlue,

+                         &pCursor, client, stuff->cid);

+

+    if (rc != Success)

+        goto bail;

+    if (!AddResource(stuff->cid, RT_CURSOR, (pointer) pCursor)) {

+        rc = BadAlloc;

+        goto bail;

+    }

+

+    return Success;

+ bail:

+    free(srcbits);

+    free(mskbits);

+    return rc;

+}

+

+int

+ProcCreateGlyphCursor(ClientPtr client)

+{

+    CursorPtr pCursor;

+    int res;

+

+    REQUEST(xCreateGlyphCursorReq);

+

+    REQUEST_SIZE_MATCH(xCreateGlyphCursorReq);

+    LEGAL_NEW_RESOURCE(stuff->cid, client);

+

+    res = AllocGlyphCursor(stuff->source, stuff->sourceChar,

+                           stuff->mask, stuff->maskChar,

+                           stuff->foreRed, stuff->foreGreen, stuff->foreBlue,

+                           stuff->backRed, stuff->backGreen, stuff->backBlue,

+                           &pCursor, client, stuff->cid);

+    if (res != Success)

+        return res;

+    if (AddResource(stuff->cid, RT_CURSOR, (pointer) pCursor))

+        return Success;

+    return BadAlloc;

+}

+

+int

+ProcFreeCursor(ClientPtr client)

+{

+    CursorPtr pCursor;

+    int rc;

+

+    REQUEST(xResourceReq);

+

+    REQUEST_SIZE_MATCH(xResourceReq);

+    rc = dixLookupResourceByType((pointer *) &pCursor, stuff->id, RT_CURSOR,

+                                 client, DixDestroyAccess);

+    if (rc == Success) {

+        FreeResource(stuff->id, RT_NONE);

+        return Success;

+    }

+    else {

+        client->errorValue = stuff->id;

+        return rc;

+    }

+}

+

+int

+ProcQueryBestSize(ClientPtr client)

+{

+    xQueryBestSizeReply reply;

+    DrawablePtr pDraw;

+    ScreenPtr pScreen;

+    int rc;

+

+    REQUEST(xQueryBestSizeReq);

+    REQUEST_SIZE_MATCH(xQueryBestSizeReq);

+

+    if ((stuff->class != CursorShape) &&

+        (stuff->class != TileShape) && (stuff->class != StippleShape)) {

+        client->errorValue = stuff->class;

+        return BadValue;

+    }

+

+    rc = dixLookupDrawable(&pDraw, stuff->drawable, client, M_ANY,

+                           DixGetAttrAccess);

+    if (rc != Success)

+        return rc;

+    if (stuff->class != CursorShape && pDraw->type == UNDRAWABLE_WINDOW)

+        return BadMatch;

+    pScreen = pDraw->pScreen;

+    rc = XaceHook(XACE_SCREEN_ACCESS, client, pScreen, DixGetAttrAccess);

+    if (rc != Success)

+        return rc;

+    (*pScreen->QueryBestSize) (stuff->class, &stuff->width,

+                               &stuff->height, pScreen);

+    memset(&reply, 0, sizeof(xQueryBestSizeReply));

+    reply.type = X_Reply;

+    reply.sequenceNumber = client->sequence;

+    reply.length = 0;

+    reply.width = stuff->width;

+    reply.height = stuff->height;

+    

+    WriteReplyToClient(client, sizeof(xQueryBestSizeReply), &reply);

+    return Success;

+}

+

+int

+ProcSetScreenSaver(ClientPtr client)

+{

+    int rc, i, blankingOption, exposureOption;

+

+    REQUEST(xSetScreenSaverReq);

+    REQUEST_SIZE_MATCH(xSetScreenSaverReq);

+

+    for (i = 0; i < screenInfo.numScreens; i++) {

+        rc = XaceHook(XACE_SCREENSAVER_ACCESS, client, screenInfo.screens[i],

+                      DixSetAttrAccess);

+        if (rc != Success)

+            return rc;

+    }

+

+    blankingOption = stuff->preferBlank;

+    if ((blankingOption != DontPreferBlanking) &&

+        (blankingOption != PreferBlanking) &&

+        (blankingOption != DefaultBlanking)) {

+        client->errorValue = blankingOption;

+        return BadValue;

+    }

+    exposureOption = stuff->allowExpose;

+    if ((exposureOption != DontAllowExposures) &&

+        (exposureOption != AllowExposures) &&

+        (exposureOption != DefaultExposures)) {

+        client->errorValue = exposureOption;

+        return BadValue;

+    }

+    if (stuff->timeout < -1) {

+        client->errorValue = stuff->timeout;

+        return BadValue;

+    }

+    if (stuff->interval < -1) {

+        client->errorValue = stuff->interval;

+        return BadValue;

+    }

+

+    if (blankingOption == DefaultBlanking)

+        ScreenSaverBlanking = defaultScreenSaverBlanking;

+    else

+        ScreenSaverBlanking = blankingOption;

+    if (exposureOption == DefaultExposures)

+        ScreenSaverAllowExposures = defaultScreenSaverAllowExposures;

+    else

+        ScreenSaverAllowExposures = exposureOption;

+

+    if (stuff->timeout >= 0)

+        ScreenSaverTime = stuff->timeout * MILLI_PER_SECOND;

+    else

+        ScreenSaverTime = defaultScreenSaverTime;

+    if (stuff->interval >= 0)

+        ScreenSaverInterval = stuff->interval * MILLI_PER_SECOND;

+    else

+        ScreenSaverInterval = defaultScreenSaverInterval;

+

+    SetScreenSaverTimer();

+    return Success;

+}

+

+int

+ProcGetScreenSaver(ClientPtr client)

+{

+    xGetScreenSaverReply rep;

+    int rc, i;

+

+    REQUEST_SIZE_MATCH(xReq);

+

+    for (i = 0; i < screenInfo.numScreens; i++) {

+        rc = XaceHook(XACE_SCREENSAVER_ACCESS, client, screenInfo.screens[i],

+                      DixGetAttrAccess);

+        if (rc != Success)

+            return rc;

+    }

+

+

+    rep.type = X_Reply;

+    rep.sequenceNumber = client->sequence;

+    rep.length = 0;

+    rep.timeout = ScreenSaverTime / MILLI_PER_SECOND;

+    rep.interval = ScreenSaverInterval / MILLI_PER_SECOND;

+    rep.preferBlanking = ScreenSaverBlanking;

+    rep.allowExposures = ScreenSaverAllowExposures;

+    

+    WriteReplyToClient(client, sizeof(xGetScreenSaverReply), &rep);

+    return Success;

+}

+

+int

+ProcChangeHosts(ClientPtr client)

+{

+    REQUEST(xChangeHostsReq);

+

+    REQUEST_FIXED_SIZE(xChangeHostsReq, stuff->hostLength);

+

+    if (stuff->mode == HostInsert)

+        return AddHost(client, (int) stuff->hostFamily,

+                       stuff->hostLength, (pointer) &stuff[1]);

+    if (stuff->mode == HostDelete)

+        return RemoveHost(client, (int) stuff->hostFamily,

+                          stuff->hostLength, (pointer) &stuff[1]);

+    client->errorValue = stuff->mode;

+    return BadValue;

+}

+

+int

+ProcListHosts(ClientPtr client)

+{

+    xListHostsReply reply;

+    int len, nHosts, result;

+    BOOL enabled;

+    pointer pdata;

+

+    /* REQUEST(xListHostsReq); */

+

+    REQUEST_SIZE_MATCH(xListHostsReq);

+

+    /* untrusted clients can't list hosts */

+    result = XaceHook(XACE_SERVER_ACCESS, client, DixReadAccess);

+    if (result != Success)

+        return result;

+

+    result = GetHosts(&pdata, &nHosts, &len, &enabled);

+    if (result != Success)

+        return result;

+

+    

+    reply.type = X_Reply;

+    reply.enabled = enabled;

+    reply.sequenceNumber = client->sequence;

+    reply.length = bytes_to_int32(len);

+    reply.nHosts = nHosts;

+    

+    WriteReplyToClient(client, sizeof(xListHostsReply), &reply);

+    if (nHosts) {

+        client->pSwapReplyFunc = (ReplySwapPtr) SLHostsExtend;

+        WriteSwappedDataToClient(client, len, pdata);

+    }

+    free(pdata);

+    return Success;

+}

+

+int

+ProcChangeAccessControl(ClientPtr client)

+{

+    REQUEST(xSetAccessControlReq);

+

+    REQUEST_SIZE_MATCH(xSetAccessControlReq);

+    if ((stuff->mode != EnableAccess) && (stuff->mode != DisableAccess)) {

+        client->errorValue = stuff->mode;

+        return BadValue;

+    }

+    return ChangeAccessControl(client, stuff->mode == EnableAccess);

+}

+

+/*********************

+ * CloseDownRetainedResources

+ *

+ *    Find all clients that are gone and have terminated in RetainTemporary 

+ *    and destroy their resources.

+ *********************/

+

+static void

+CloseDownRetainedResources(void)

+{

+    int i;

+    ClientPtr client;

+

+    for (i = 1; i < currentMaxClients; i++) {

+        client = clients[i];

+        if (client && (client->closeDownMode == RetainTemporary)

+            && (client->clientGone))

+            CloseDownClient(client);

+    }

+}

+

+int

+ProcKillClient(ClientPtr client)

+{

+    REQUEST(xResourceReq);

+    ClientPtr killclient;

+    int rc;

+

+    REQUEST_SIZE_MATCH(xResourceReq);

+    if (stuff->id == AllTemporary) {

+        CloseDownRetainedResources();

+        return Success;

+    }

+

+    rc = dixLookupClient(&killclient, stuff->id, client, DixDestroyAccess);

+    if (rc == Success) {

+        CloseDownClient(killclient);

+        /* if an LBX proxy gets killed, isItTimeToYield will be set */

+        if (isItTimeToYield || (client == killclient)) {

+            /* force yield and return Success, so that Dispatch()

+             * doesn't try to touch client

+             */

+            isItTimeToYield = TRUE;

+            return Success;

+        }

+        return Success;

+    }

+    else

+        return rc;

+}

+

+int

+ProcSetFontPath(ClientPtr client)

+{

+    unsigned char *ptr;

+    unsigned long nbytes, total;

+    long nfonts;

+    int n;

+

+    REQUEST(xSetFontPathReq);

+

+    REQUEST_AT_LEAST_SIZE(xSetFontPathReq);

+

+    nbytes = (client->req_len << 2) - sizeof(xSetFontPathReq);

+    total = nbytes;

+    ptr = (unsigned char *) &stuff[1];

+    nfonts = stuff->nFonts;

+    while (--nfonts >= 0) {

+        if ((total == 0) || (total < (n = (*ptr + 1))))

+            return BadLength;

+        total -= n;

+        ptr += n;

+    }

+    if (total >= 4)

+        return BadLength;

+    return SetFontPath(client, stuff->nFonts, (unsigned char *) &stuff[1]);

+}

+

+int

+ProcGetFontPath(ClientPtr client)

+{

+    xGetFontPathReply reply;

+    int rc, stringLens, numpaths;

+    unsigned char *bufferStart;

+

+    /* REQUEST (xReq); */

+

+    REQUEST_SIZE_MATCH(xReq);

+    rc = GetFontPath(client, &numpaths, &stringLens, &bufferStart);

+    if (rc != Success)

+        return rc;

+

+

+    reply.type = X_Reply;

+    reply.sequenceNumber = client->sequence;

+    reply.length = bytes_to_int32(stringLens + numpaths);

+    reply.nPaths = numpaths;

+

+    WriteReplyToClient(client, sizeof(xGetFontPathReply), &reply);

+    if (stringLens || numpaths)

+        WriteToClient(client, stringLens + numpaths, bufferStart);

+    return Success;

+}

+

+int

+ProcChangeCloseDownMode(ClientPtr client)

+{

+    int rc;

+

+    REQUEST(xSetCloseDownModeReq);

+    REQUEST_SIZE_MATCH(xSetCloseDownModeReq);

+

+    rc = XaceHook(XACE_CLIENT_ACCESS, client, client, DixManageAccess);

+    if (rc != Success)

+        return rc;

+

+    if ((stuff->mode == AllTemporary) ||

+        (stuff->mode == RetainPermanent) || (stuff->mode == RetainTemporary)) {

+        client->closeDownMode = stuff->mode;

+        return Success;

+    }

+    else {

+        client->errorValue = stuff->mode;

+        return BadValue;

+    }

+}

+

+int

+ProcForceScreenSaver(ClientPtr client)

+{

+    int rc;

+

+    REQUEST(xForceScreenSaverReq);

+

+    REQUEST_SIZE_MATCH(xForceScreenSaverReq);

+

+    if ((stuff->mode != ScreenSaverReset) && (stuff->mode != ScreenSaverActive)) {

+        client->errorValue = stuff->mode;

+        return BadValue;

+    }

+    rc = dixSaveScreens(client, SCREEN_SAVER_FORCER, (int) stuff->mode);

+    if (rc != Success)

+        return rc;

+    return Success;

+}

+

+int

+ProcNoOperation(ClientPtr client)

+{

+    REQUEST_AT_LEAST_SIZE(xReq);

+

+    /* noop -- don't do anything */

+    return Success;

+}

+

+/**********************

+ * CloseDownClient

+ *

+ *  Client can either mark his resources destroy or retain.  If retained and

+ *  then killed again, the client is really destroyed.

+ *********************/

+

+char dispatchExceptionAtReset = DE_RESET;

+

+void

+CloseDownClient(ClientPtr client)

+{

+    Bool really_close_down = client->clientGone ||

+        client->closeDownMode == DestroyAll;

+

+    if (!client->clientGone) {

+        /* ungrab server if grabbing client dies */

+        if (grabState != GrabNone && grabClient == client) {

+            UngrabServer(client);

+        }

+        BITCLEAR(grabWaiters, client->index);

+        DeleteClientFromAnySelections(client);

+        ReleaseActiveGrabs(client);

+        DeleteClientFontStuff(client);

+        if (!really_close_down) {

+            /*  This frees resources that should never be retained

+             *  no matter what the close down mode is.  Actually we

+             *  could do this unconditionally, but it's probably

+             *  better not to traverse all the client's resources

+             *  twice (once here, once a few lines down in

+             *  FreeClientResources) in the common case of

+             *  really_close_down == TRUE.

+             */

+            FreeClientNeverRetainResources(client);

+            client->clientState = ClientStateRetained;

+            if (ClientStateCallback) {

+                NewClientInfoRec clientinfo;

+

+                clientinfo.client = client;

+                clientinfo.prefix = (xConnSetupPrefix *) NULL;

+                clientinfo.setup = (xConnSetup *) NULL;

+                CallCallbacks((&ClientStateCallback), (pointer) &clientinfo);

+            }

+        }

+        client->clientGone = TRUE;      /* so events aren't sent to client */

+        if (ClientIsAsleep(client))

+            ClientSignal(client);

+        ProcessWorkQueueZombies();

+        CloseDownConnection(client);

+

+        /* If the client made it to the Running stage, nClients has

+         * been incremented on its behalf, so we need to decrement it

+         * now.  If it hasn't gotten to Running, nClients has *not*

+         * been incremented, so *don't* decrement it.

+         */

+        if (client->clientState != ClientStateInitial) {

+            --nClients;

+        }

+    }

+

+    if (really_close_down) {

+        if (client->clientState == ClientStateRunning && nClients == 0)

+            dispatchException |= dispatchExceptionAtReset;

+

+        client->clientState = ClientStateGone;

+        if (ClientStateCallback) {

+            NewClientInfoRec clientinfo;

+

+            clientinfo.client = client;

+            clientinfo.prefix = (xConnSetupPrefix *) NULL;

+            clientinfo.setup = (xConnSetup *) NULL;

+            CallCallbacks((&ClientStateCallback), (pointer) &clientinfo);

+        }

+        FreeClientResources(client);

+        /* Disable client ID tracking. This must be done after

+         * ClientStateCallback. */

+        ReleaseClientIds(client);

+#ifdef XSERVER_DTRACE

+        XSERVER_CLIENT_DISCONNECT(client->index);

+#endif

+        if (client->index < nextFreeClientID)

+            nextFreeClientID = client->index;

+        clients[client->index] = NullClient;

+        SmartLastClient = NullClient;

+        dixFreeObjectWithPrivates(client, PRIVATE_CLIENT);

+

+        while (!clients[currentMaxClients - 1])

+            currentMaxClients--;

+    }

+}

+

+static void

+KillAllClients(void)

+{

+    int i;

+

+    for (i = 1; i < currentMaxClients; i++)

+        if (clients[i]) {

+            /* Make sure Retained clients are released. */

+            clients[i]->closeDownMode = DestroyAll;

+            CloseDownClient(clients[i]);

+        }

+}

+

+void

+InitClient(ClientPtr client, int i, pointer ospriv)

+{

+    client->index = i;

+    client->clientAsMask = ((Mask) i) << CLIENTOFFSET;

+    client->closeDownMode = i ? DestroyAll : RetainPermanent;

+    client->requestVector = InitialVector;

+    client->osPrivate = ospriv;

+    QueryMinMaxKeyCodes(&client->minKC, &client->maxKC);

+    client->smart_start_tick = SmartScheduleTime;

+    client->smart_stop_tick = SmartScheduleTime;

+    client->smart_check_tick = SmartScheduleTime;

+    client->clientIds = NULL;

+}

+

+/************************

+ * int NextAvailableClient(ospriv)

+ *

+ * OS dependent portion can't assign client id's because of CloseDownModes.

+ * Returns NULL if there are no free clients.

+ *************************/

+

+ClientPtr

+NextAvailableClient(pointer ospriv)

+{

+    int i;

+    ClientPtr client;

+    xReq data;

+

+    i = nextFreeClientID;

+    if (i == MAXCLIENTS)

+        return (ClientPtr) NULL;

+    clients[i] = client =

+        dixAllocateObjectWithPrivates(ClientRec, PRIVATE_CLIENT);

+    if (!client)

+        return (ClientPtr) NULL;

+    InitClient(client, i, ospriv);

+    if (!InitClientResources(client)) {

+        dixFreeObjectWithPrivates(client, PRIVATE_CLIENT);

+        return (ClientPtr) NULL;

+    }

+    data.reqType = 1;

+    data.length = bytes_to_int32(sz_xReq + sz_xConnClientPrefix);

+    if (!InsertFakeRequest(client, (char *) &data, sz_xReq)) {

+        FreeClientResources(client);

+        dixFreeObjectWithPrivates(client, PRIVATE_CLIENT);

+        return (ClientPtr) NULL;

+    }

+    if (i == currentMaxClients)

+        currentMaxClients++;

+    while ((nextFreeClientID < MAXCLIENTS) && clients[nextFreeClientID])

+        nextFreeClientID++;

+

+    /* Enable client ID tracking. This must be done before

+     * ClientStateCallback. */

+    ReserveClientIds(client);

+

+    if (ClientStateCallback) {

+        NewClientInfoRec clientinfo;

+

+        clientinfo.client = client;

+        clientinfo.prefix = (xConnSetupPrefix *) NULL;

+        clientinfo.setup = (xConnSetup *) NULL;

+        CallCallbacks((&ClientStateCallback), (pointer) &clientinfo);

+    }

+    return client;

+}

+

+int

+ProcInitialConnection(ClientPtr client)

+{

+    REQUEST(xReq);

+    xConnClientPrefix *prefix;

+    int whichbyte = 1;

+    char order;

+

+    prefix = (xConnClientPrefix *) ((char *)stuff + sz_xReq);

+    order = prefix->byteOrder;

+    if (order != 'l' && order != 'B' && order != 'r' && order != 'R')

+	return client->noClientException = -1;

+    if (((*(char *) &whichbyte) && (order == 'B' || order == 'R')) ||

+	(!(*(char *) &whichbyte) && (order == 'l' || order == 'r'))) {

+	client->swapped = TRUE;

+	SwapConnClientPrefix(prefix);

+    }

+    stuff->reqType = 2;

+    stuff->length += bytes_to_int32(prefix->nbytesAuthProto) +

+        bytes_to_int32(prefix->nbytesAuthString);

+    if (client->swapped) {

+        swaps(&stuff->length);

+    }

+    if (order == 'r' || order == 'R') {

+	client->local = FALSE;

+    }

+    ResetCurrentRequest(client);

+    return Success;

+}

+

+static int

+SendConnSetup(ClientPtr client, const char *reason)

+{

+    xWindowRoot *root;

+    int i;

+    int numScreens;

+    char *lConnectionInfo;

+    xConnSetupPrefix *lconnSetupPrefix;

+

+    if (reason) {

+        xConnSetupPrefix csp;

+

+        csp.success = xFalse;

+        csp.lengthReason = strlen(reason);

+        csp.length = bytes_to_int32(csp.lengthReason);

+        csp.majorVersion = X_PROTOCOL;

+        csp.minorVersion = X_PROTOCOL_REVISION;

+        if (client->swapped)

+            WriteSConnSetupPrefix(client, &csp);

+        else

+            WriteToClient(client, sz_xConnSetupPrefix, &csp);

+        WriteToClient(client, (int) csp.lengthReason, reason);

+        return client->noClientException = -1;

+    }

+

+    numScreens = screenInfo.numScreens;

+    lConnectionInfo = ConnectionInfo;

+    lconnSetupPrefix = &connSetupPrefix;

+

+    /* We're about to start speaking X protocol back to the client by

+     * sending the connection setup info.  This means the authorization

+     * step is complete, and we can count the client as an

+     * authorized one.

+     */

+    nClients++;

+

+    client->requestVector = client->swapped ? SwappedProcVector : ProcVector;

+    client->sequence = 0;

+    ((xConnSetup *) lConnectionInfo)->ridBase = client->clientAsMask;

+    ((xConnSetup *) lConnectionInfo)->ridMask = RESOURCE_ID_MASK;

+#ifdef MATCH_CLIENT_ENDIAN

+    ((xConnSetup *) lConnectionInfo)->imageByteOrder = ClientOrder(client);

+    ((xConnSetup *) lConnectionInfo)->bitmapBitOrder = ClientOrder(client);

+#endif

+    /* fill in the "currentInputMask" */

+    root = (xWindowRoot *) (lConnectionInfo + connBlockScreenStart);

+#ifdef PANORAMIX

+    if (noPanoramiXExtension)

+        numScreens = screenInfo.numScreens;

+    else

+        numScreens = ((xConnSetup *) ConnectionInfo)->numRoots;

+#endif

+

+    for (i = 0; i < numScreens; i++) {

+        unsigned int j;

+        xDepth *pDepth;

+        WindowPtr pRoot = screenInfo.screens[i]->root;

+

+        root->currentInputMask = pRoot->eventMask | wOtherEventMasks(pRoot);

+        pDepth = (xDepth *) (root + 1);

+        for (j = 0; j < root->nDepths; j++) {

+            pDepth = (xDepth *) (((char *) (pDepth + 1)) +

+                                 pDepth->nVisuals * sizeof(xVisualType));

+        }

+        root = (xWindowRoot *) pDepth;

+    }

+

+    if (client->swapped) {

+        WriteSConnSetupPrefix(client, lconnSetupPrefix);

+        WriteSConnectionInfo(client,

+                             (unsigned long) (lconnSetupPrefix->length << 2),

+                             lConnectionInfo);

+    }

+    else {

+        WriteToClient(client, sizeof(xConnSetupPrefix), lconnSetupPrefix);

+        WriteToClient(client, (int) (lconnSetupPrefix->length << 2),

+		      lConnectionInfo);

+    }

+    client->clientState = ClientStateRunning;

+    if (ClientStateCallback) {

+        NewClientInfoRec clientinfo;

+

+        clientinfo.client = client;

+        clientinfo.prefix = lconnSetupPrefix;

+        clientinfo.setup = (xConnSetup *) lConnectionInfo;

+        CallCallbacks((&ClientStateCallback), (pointer) &clientinfo);

+    }

+    return Success;

+}

+

+int

+ProcEstablishConnection(ClientPtr client)

+{

+    const char *reason;

+    char *auth_proto, *auth_string;

+    xConnClientPrefix *prefix;

+

+    REQUEST(xReq);

+

+    prefix = (xConnClientPrefix *) ((char *) stuff + sz_xReq);

+    auth_proto = (char *) prefix + sz_xConnClientPrefix;

+    auth_string = auth_proto + pad_to_int32(prefix->nbytesAuthProto);

+    if ((prefix->majorVersion != X_PROTOCOL) ||

+        (prefix->minorVersion != X_PROTOCOL_REVISION))

+        reason = "Protocol version mismatch";

+    else

+        reason = ClientAuthorized(client,

+                                  (unsigned short) prefix->nbytesAuthProto,

+                                  auth_proto,

+                                  (unsigned short) prefix->nbytesAuthString,

+                                  auth_string);

+

+    return (SendConnSetup(client, reason));

+}

+

+void

+SendErrorToClient(ClientPtr client, unsigned majorCode, unsigned minorCode,

+                  XID resId, int errorCode)

+{

+    xError rep; memset(&rep, 0, sizeof(xError));

+    rep.type = X_Error;

+    rep.errorCode = errorCode;

+    rep.resourceID = resId;

+    rep.minorCode = minorCode;

+    rep.majorCode = majorCode;

+

+    WriteEventsToClient(client, 1, (xEvent *) &rep);

+}

+

+void

+MarkClientException(ClientPtr client)

+{

+    client->noClientException = -1;

+}

+

+/*

+ * This array encodes the answer to the question "what is the log base 2

+ * of the number of pixels that fit in a scanline pad unit?"

+ * Note that ~0 is an invalid entry (mostly for the benefit of the reader).

+ */

+static int answer[6][4] = {

+    /* pad   pad   pad     pad */

+    /*  8     16    32    64 */

+

+    {3, 4, 5, 6},               /* 1 bit per pixel */

+    {1, 2, 3, 4},               /* 4 bits per pixel */

+    {0, 1, 2, 3},               /* 8 bits per pixel */

+    {~0, 0, 1, 2},              /* 16 bits per pixel */

+    {~0, ~0, 0, 1},             /* 24 bits per pixel */

+    {~0, ~0, 0, 1}              /* 32 bits per pixel */

+};

+

+/*

+ * This array gives the answer to the question "what is the first index for

+ * the answer array above given the number of bits per pixel?"

+ * Note that ~0 is an invalid entry (mostly for the benefit of the reader).

+ */

+static int indexForBitsPerPixel[33] = {

+    ~0, 0, ~0, ~0,              /* 1 bit per pixel */

+    1, ~0, ~0, ~0,              /* 4 bits per pixel */

+    2, ~0, ~0, ~0,              /* 8 bits per pixel */

+    ~0, ~0, ~0, ~0,

+    3, ~0, ~0, ~0,              /* 16 bits per pixel */

+    ~0, ~0, ~0, ~0,

+    4, ~0, ~0, ~0,              /* 24 bits per pixel */

+    ~0, ~0, ~0, ~0,

+    5                           /* 32 bits per pixel */

+};

+

+/*

+ * This array gives the bytesperPixel value for cases where the number

+ * of bits per pixel is a multiple of 8 but not a power of 2.

+ */

+static int answerBytesPerPixel[33] = {

+    ~0, 0, ~0, ~0,              /* 1 bit per pixel */

+    0, ~0, ~0, ~0,              /* 4 bits per pixel */

+    0, ~0, ~0, ~0,              /* 8 bits per pixel */

+    ~0, ~0, ~0, ~0,

+    0, ~0, ~0, ~0,              /* 16 bits per pixel */

+    ~0, ~0, ~0, ~0,

+    3, ~0, ~0, ~0,              /* 24 bits per pixel */

+    ~0, ~0, ~0, ~0,

+    0                           /* 32 bits per pixel */

+};

+

+/*

+ * This array gives the answer to the question "what is the second index for

+ * the answer array above given the number of bits per scanline pad unit?"

+ * Note that ~0 is an invalid entry (mostly for the benefit of the reader).

+ */

+static int indexForScanlinePad[65] = {

+    ~0, ~0, ~0, ~0,

+    ~0, ~0, ~0, ~0,

+    0, ~0, ~0, ~0,              /* 8 bits per scanline pad unit */

+    ~0, ~0, ~0, ~0,

+    1, ~0, ~0, ~0,              /* 16 bits per scanline pad unit */

+    ~0, ~0, ~0, ~0,

+    ~0, ~0, ~0, ~0,

+    ~0, ~0, ~0, ~0,

+    2, ~0, ~0, ~0,              /* 32 bits per scanline pad unit */

+    ~0, ~0, ~0, ~0,

+    ~0, ~0, ~0, ~0,

+    ~0, ~0, ~0, ~0,

+    ~0, ~0, ~0, ~0,

+    ~0, ~0, ~0, ~0,

+    ~0, ~0, ~0, ~0,

+    ~0, ~0, ~0, ~0,

+    3                           /* 64 bits per scanline pad unit */

+};

+

+/*

+	grow the array of screenRecs if necessary.

+	call the device-supplied initialization procedure

+with its screen number, a pointer to its ScreenRec, argc, and argv.

+	return the number of successfully installed screens.

+

+*/

+

+static int init_screen(ScreenPtr pScreen, int i, Bool gpu)

+{

+    int scanlinepad, format, depth, bitsPerPixel, j, k;

+

+    dixInitScreenSpecificPrivates(pScreen);

+

+    if (!dixAllocatePrivates(&pScreen->devPrivates, PRIVATE_SCREEN)) {

+        return -1;

+    }

+    pScreen->myNum = i;

+    if (gpu) {

+        pScreen->myNum += GPU_SCREEN_OFFSET;

+        pScreen->isGPU = TRUE;

+    }

+    pScreen->totalPixmapSize = 0;       /* computed in CreateScratchPixmapForScreen */

+    pScreen->ClipNotify = 0;    /* for R4 ddx compatibility */

+    pScreen->CreateScreenResources = 0;

+

+    xorg_list_init(&pScreen->pixmap_dirty_list);

+    xorg_list_init(&pScreen->unattached_list);

+    xorg_list_init(&pScreen->output_slave_list);

+    xorg_list_init(&pScreen->offload_slave_list);

+

+    /*

+     * This loop gets run once for every Screen that gets added,

+     * but thats ok.  If the ddx layer initializes the formats

+     * one at a time calling AddScreen() after each, then each

+     * iteration will make it a little more accurate.  Worst case

+     * we do this loop N * numPixmapFormats where N is # of screens.

+     * Anyway, this must be called after InitOutput and before the

+     * screen init routine is called.

+     */

+    for (format = 0; format < screenInfo.numPixmapFormats; format++) {

+        depth = screenInfo.formats[format].depth;

+        bitsPerPixel = screenInfo.formats[format].bitsPerPixel;

+        scanlinepad = screenInfo.formats[format].scanlinePad;

+        j = indexForBitsPerPixel[bitsPerPixel];

+        k = indexForScanlinePad[scanlinepad];

+        PixmapWidthPaddingInfo[depth].padPixelsLog2 = answer[j][k];

+        PixmapWidthPaddingInfo[depth].padRoundUp =

+            (scanlinepad / bitsPerPixel) - 1;

+        j = indexForBitsPerPixel[8];    /* bits per byte */

+        PixmapWidthPaddingInfo[depth].padBytesLog2 = answer[j][k];

+        PixmapWidthPaddingInfo[depth].bitsPerPixel = bitsPerPixel;

+        if (answerBytesPerPixel[bitsPerPixel]) {

+            PixmapWidthPaddingInfo[depth].notPower2 = 1;

+            PixmapWidthPaddingInfo[depth].bytesPerPixel =

+                answerBytesPerPixel[bitsPerPixel];

+        }

+        else {

+            PixmapWidthPaddingInfo[depth].notPower2 = 0;

+        }

+    }

+    return 0;

+}

+

+int

+AddScreen(Bool (*pfnInit) (ScreenPtr /*pScreen */ ,

+                           int /*argc */ ,

+                           char **      /*argv */

+          ), int argc, char **argv)

+{

+

+    int i;

+    ScreenPtr pScreen;

+    Bool ret;

+

+    i = screenInfo.numScreens;

+    if (i == MAXSCREENS)

+        return -1;

+

+    pScreen = (ScreenPtr) calloc(1, sizeof(ScreenRec));

+    if (!pScreen)

+        return -1;

+

+    ret = init_screen(pScreen, i, FALSE);

+    if (ret != 0) {

+        free(pScreen);

+        return ret;

+    }

+    /* This is where screen specific stuff gets initialized.  Load the

+       screen structure, call the hardware, whatever.

+       This is also where the default colormap should be allocated and

+       also pixel values for blackPixel, whitePixel, and the cursor

+       Note that InitScreen is NOT allowed to modify argc, argv, or

+       any of the strings pointed to by argv.  They may be passed to

+       multiple screens.

+     */

+    screenInfo.screens[i] = pScreen;

+    screenInfo.numScreens++;

+    if (!(*pfnInit) (pScreen, argc, argv)) {

+        dixFreeScreenSpecificPrivates(pScreen);

+        dixFreePrivates(pScreen->devPrivates, PRIVATE_SCREEN);

+        free(pScreen);

+        screenInfo.numScreens--;

+        return -1;

+    }

+

+    update_desktop_dimensions();

+

+    dixRegisterScreenPrivateKey(&cursorScreenDevPriv, pScreen, PRIVATE_CURSOR,

+                                0);

+

+    return i;

+}

+

+int

+AddGPUScreen(Bool (*pfnInit) (ScreenPtr /*pScreen */ ,

+                              int /*argc */ ,

+                              char **      /*argv */

+                              ),

+             int argc, char **argv)

+{

+    int i;

+    ScreenPtr pScreen;

+    Bool ret;

+

+    i = screenInfo.numGPUScreens;

+    if (i == MAXGPUSCREENS)

+        return -1;

+

+    pScreen = (ScreenPtr) calloc(1, sizeof(ScreenRec));

+    if (!pScreen)

+        return -1;

+

+    ret = init_screen(pScreen, i, TRUE);

+    if (ret != 0) {

+        free(pScreen);

+        return ret;

+    }

+

+    /* This is where screen specific stuff gets initialized.  Load the

+       screen structure, call the hardware, whatever.

+       This is also where the default colormap should be allocated and

+       also pixel values for blackPixel, whitePixel, and the cursor

+       Note that InitScreen is NOT allowed to modify argc, argv, or

+       any of the strings pointed to by argv.  They may be passed to

+       multiple screens.

+     */

+    screenInfo.gpuscreens[i] = pScreen;

+    screenInfo.numGPUScreens++;

+    if (!(*pfnInit) (pScreen, argc, argv)) {

+        dixFreePrivates(pScreen->devPrivates, PRIVATE_SCREEN);

+        free(pScreen);

+        screenInfo.numGPUScreens--;

+        return -1;

+    }

+

+    update_desktop_dimensions();

+

+    return i;

+}

+

+void

+RemoveGPUScreen(ScreenPtr pScreen)

+{

+    int idx, j;

+    if (!pScreen->isGPU)

+        return;

+

+    idx = pScreen->myNum - GPU_SCREEN_OFFSET;

+    for (j = idx; j < screenInfo.numGPUScreens - 1; j++) {

+        screenInfo.gpuscreens[j] = screenInfo.gpuscreens[j + 1];

+        screenInfo.gpuscreens[j]->myNum = j + GPU_SCREEN_OFFSET;

+    }

+    screenInfo.numGPUScreens--;

+

+    /* this gets freed later in the resource list, but without

+     * the screen existing it causes crashes - so remove it here */

+    if (pScreen->defColormap)

+        FreeResource(pScreen->defColormap, RT_COLORMAP);

+    free(pScreen);

+

+}

+

+void

+AttachUnboundGPU(ScreenPtr pScreen, ScreenPtr new)

+{

+    assert(new->isGPU);

+    assert(!new->current_master);

+    xorg_list_add(&new->unattached_head, &pScreen->unattached_list);

+    new->current_master = pScreen;

+}

+

+void

+DetachUnboundGPU(ScreenPtr slave)

+{

+    assert(slave->isGPU);

+    xorg_list_del(&slave->unattached_head);

+    slave->current_master = NULL;

+}

+

+void

+AttachOutputGPU(ScreenPtr pScreen, ScreenPtr new)

+{

+    assert(new->isGPU);

+    assert(!new->current_master);

+    xorg_list_add(&new->output_head, &pScreen->output_slave_list);

+    new->current_master = pScreen;

+}

+

+void

+DetachOutputGPU(ScreenPtr slave)

+{

+    assert(slave->isGPU);

+    xorg_list_del(&slave->output_head);

+    slave->current_master = NULL;

+}

+

+void

+AttachOffloadGPU(ScreenPtr pScreen, ScreenPtr new)

+{

+    assert(new->isGPU);

+    assert(!new->current_master);

+    xorg_list_add(&new->offload_head, &pScreen->offload_slave_list);

+    new->current_master = pScreen;

+}

+

+void

+DetachOffloadGPU(ScreenPtr slave)

+{

+    assert(slave->isGPU);

+    xorg_list_del(&slave->offload_head);

+    slave->current_master = NULL;

+}

+

diff --git a/xorg-server/dix/dixfonts.c b/xorg-server/dix/dixfonts.c
index feb765d1c..22c236553 100644
--- a/xorg-server/dix/dixfonts.c
+++ b/xorg-server/dix/dixfonts.c
@@ -133,6 +133,7 @@ SetDefaultFont(char *defaultfontname)
     int err;
     FontPtr pf;
     XID fid;
+    static FontPtr last_pf;
 
     fid = FakeClientID(0);
     err = OpenFont(serverClient, fid, FontLoadAll | FontOpenSync,
@@ -141,9 +142,10 @@ SetDefaultFont(char *defaultfontname)
         return FALSE;
     err = dixLookupResourceByType((pointer *) &pf, fid, RT_FONT, serverClient,
                                   DixReadAccess);
-    if (err != Success)
+    if (err == Success) last_pf = pf;
+    if (last_pf == (FontPtr) NULL)
         return FALSE;
-    defaultFont = pf;
+    defaultFont = last_pf;
     return TRUE;
 }
 
@@ -240,7 +242,8 @@ doOpenFont(ClientPtr client, OFclosurePtr c)
     char *alias, *newname;
     int newlen;
     int aliascount = 20;
-
+    Bool fromDispatch = c->from_dispatch;
+    Bool finished = FALSE;
     /*
      * Decide at runtime what FontFormat to use.
      */
@@ -264,6 +267,8 @@ doOpenFont(ClientPtr client, OFclosurePtr c)
 #endif
         BitmapFormatScanlineUnit8;
 
+    c->from_dispatch = FALSE;
+
     if (client->clientGone) {
         if (c->current_fpe < c->num_fpes) {
             fpe = c->fpe_list[c->current_fpe];
@@ -363,13 +368,16 @@ doOpenFont(ClientPtr client, OFclosurePtr c)
                           c->fontid, FontToXError(err));
     }
     ClientWakeup(c->client);
+    finished = TRUE;
  xinerama_sleep:
-    for (i = 0; i < c->num_fpes; i++) {
-        FreeFPE(c->fpe_list[i]);
+    if (finished || fromDispatch) {
+        for (i = 0; i < c->num_fpes; i++) {
+            FreeFPE(c->fpe_list[i]);
+        }
+        free(c->fpe_list);
+        free(c->fontname);
+        free(c);
     }
-    free(c->fpe_list);
-    free(c->fontname);
-    free(c);
     return TRUE;
 }
 
@@ -441,6 +449,7 @@ OpenFont(ClientPtr client, XID fid, Mask flags, unsigned lenfname,
     c->num_fpes = num_fpes;
     c->fnamelen = lenfname;
     c->flags = flags;
+    c->from_dispatch = TRUE;
     c->non_cachable_font = cached;
 
     (void) doOpenFont(client, c);
@@ -567,6 +576,10 @@ doListFontsAndAliases(ClientPtr client, LFclosurePtr c)
     char *bufptr;
     char *bufferStart;
     int aliascount = 0;
+    Bool fromDispatch = c->from_dispatch;
+    Bool finished = FALSE;
+
+    c->from_dispatch = FALSE;
 
     if (client->clientGone) {
         if (c->current.current_fpe < c->num_fpes) {
@@ -753,12 +766,11 @@ doListFontsAndAliases(ClientPtr client, LFclosurePtr c)
     for (i = 0; i < nnames; i++)
         stringLens += (names->length[i] <= 255) ? names->length[i] : 0;
 
-    reply = (xListFontsReply) {
-        .type = X_Reply,
-        .length = bytes_to_int32(stringLens + nnames),
-        .nFonts = nnames,
-        .sequenceNumber = client->sequence
-    };
+    memset(&reply, 0, sizeof(xListFontsReply));
+    reply.type = X_Reply;
+    reply.length = bytes_to_int32(stringLens + nnames);
+    reply.nFonts = nnames;
+    reply.sequenceNumber = client->sequence;
 
     bufptr = bufferStart = malloc(reply.length << 2);
 
@@ -788,13 +800,16 @@ doListFontsAndAliases(ClientPtr client, LFclosurePtr c)
 
  bail:
     ClientWakeup(client);
+    finished = TRUE;
  xinerama_sleep:
-    for (i = 0; i < c->num_fpes; i++)
-        FreeFPE(c->fpe_list[i]);
-    free(c->fpe_list);
-    free(c->savedName);
-    FreeFontNames(names);
-    free(c);
+    if (finished || fromDispatch) {
+        for (i = 0; i < c->num_fpes; i++)
+            FreeFPE(c->fpe_list[i]);
+        free(c->fpe_list);
+        free(c->savedName);
+        FreeFontNames(names);
+        free(c);
+    }
     free(resolved);
     return TRUE;
 }
@@ -845,6 +860,7 @@ ListFonts(ClientPtr client, unsigned char *pattern, unsigned length,
     c->current.list_started = FALSE;
     c->current.private = 0;
     c->haveSaved = FALSE;
+    c->from_dispatch = TRUE;
     c->savedName = 0;
     doListFontsAndAliases(client, c);
     return Success;
@@ -856,6 +872,8 @@ doListFontsWithInfo(ClientPtr client, LFWIclosurePtr c)
     FontPathElementPtr fpe;
     int err = Successful;
     char *name;
+    Bool fromDispatch = c->from_dispatch;
+    Bool finished = FALSE;
     int namelen;
     int numFonts;
     FontInfoRec fontInfo, *pFontInfo;
@@ -866,6 +884,8 @@ doListFontsWithInfo(ClientPtr client, LFWIclosurePtr c)
     int aliascount = 0;
     xListFontsWithInfoReply finalReply;
 
+    c->from_dispatch = FALSE;
+
     if (client->clientGone) {
         if (c->current.current_fpe < c->num_fpes) {
             fpe = c->fpe_list[c->current.current_fpe];
@@ -1031,22 +1051,24 @@ doListFontsWithInfo(ClientPtr client, LFWIclosurePtr c)
     }
  finish:
     length = sizeof(xListFontsWithInfoReply);
-    finalReply = (xListFontsWithInfoReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = bytes_to_int32(sizeof(xListFontsWithInfoReply)
-                                 - sizeof(xGenericReply))
-    };
+    memset((char *) &finalReply, 0, sizeof(xListFontsWithInfoReply));
+    finalReply.type = X_Reply;
+    finalReply.sequenceNumber = client->sequence;
+    finalReply.length = bytes_to_int32(sizeof(xListFontsWithInfoReply)
+                                       - sizeof(xGenericReply));
     WriteSwappedDataToClient(client, length, &finalReply);
  bail:
     ClientWakeup(client);
+    finished = TRUE;
  xinerama_sleep:
-    for (i = 0; i < c->num_fpes; i++)
-        FreeFPE(c->fpe_list[i]);
-    free(c->reply);
-    free(c->fpe_list);
-    free(c->savedName);
-    free(c);
+    if (finished || fromDispatch) {
+        for (i = 0; i < c->num_fpes; i++)
+            FreeFPE(c->fpe_list[i]);
+        free(c->reply);
+        free(c->fpe_list);
+        free(c->savedName);
+        free(c);
+    }
     return TRUE;
 }
 
@@ -1093,6 +1115,7 @@ StartListFontsWithInfo(ClientPtr client, int length, unsigned char *pattern,
     c->current.private = 0;
     c->savedNumFonts = 0;
     c->haveSaved = FALSE;
+    c->from_dispatch = TRUE;
     c->savedName = 0;
     doListFontsWithInfo(client, c);
     return Success;
@@ -1102,7 +1125,7 @@ StartListFontsWithInfo(ClientPtr client, int length, unsigned char *pattern,
 
 #define TextEltHeader 2
 #define FontShiftSize 5
-static ChangeGCVal clearGC[] = { {.ptr = NullPixmap} };
+static ChangeGCVal clearGC[] = { NullPixmap };
 
 #define clearGCmask (GCClipMask)
 
@@ -1115,6 +1138,10 @@ doPolyText(ClientPtr client, PTclosurePtr c)
     FontPathElementPtr fpe;
     GC *origGC = NULL;
     int itemSize = c->reqType == X_PolyText8 ? 1 : 2;
+    Bool fromDispatch = c->from_dispatch;
+    Bool finished = FALSE;
+
+    c->from_dispatch = FALSE;
 
     if (client->clientGone) {
         fpe = c->pGC->font->fpe;
@@ -1352,16 +1379,19 @@ doPolyText(ClientPtr client, PTclosurePtr c)
     }
     if (ClientIsAsleep(client)) {
         ClientWakeup(c->client);
+        finished = TRUE;
  xinerama_sleep:
-        ChangeGC(NullClient, c->pGC, clearGCmask, clearGC);
+        if (finished || fromDispatch) {
+            ChangeGC(NullClient, c->pGC, clearGCmask, clearGC);
 
-        /* Unreference the font from the scratch GC */
-        CloseFont(c->pGC->font, (Font) 0);
-        c->pGC->font = NullFont;
+            /* Unreference the font from the scratch GC */
+            CloseFont(c->pGC->font, (Font) 0);
+            c->pGC->font = NullFont;
 
-        FreeScratchGC(c->pGC);
-        free(c->data);
-        free(c);
+            FreeScratchGC(c->pGC);
+            free(c->data);
+            free(c);
+        }
     }
     return TRUE;
 }
@@ -1396,6 +1426,10 @@ doImageText(ClientPtr client, ITclosurePtr c)
     int err = Success, lgerr;   /* err is in X error, not font error, space */
     FontPathElementPtr fpe;
     int itemSize = c->reqType == X_ImageText8 ? 1 : 2;
+    Bool fromDispatch = c->from_dispatch;
+    Bool finished = FALSE;
+
+    c->from_dispatch = FALSE;
 
     if (client->clientGone) {
         fpe = c->pGC->font->fpe;
@@ -1496,16 +1530,19 @@ doImageText(ClientPtr client, ITclosurePtr c)
     }
     if (ClientIsAsleep(client)) {
         ClientWakeup(c->client);
+        finished = TRUE;
  xinerama_sleep:
-        ChangeGC(NullClient, c->pGC, clearGCmask, clearGC);
+        if (finished || fromDispatch) {
+            ChangeGC(NullClient, c->pGC, clearGCmask, clearGC);
 
-        /* Unreference the font from the scratch GC */
-        CloseFont(c->pGC->font, (Font) 0);
-        c->pGC->font = NullFont;
+            /* Unreference the font from the scratch GC */
+            CloseFont(c->pGC->font, (Font) 0);
+            c->pGC->font = NullFont;
 
-        FreeScratchGC(c->pGC);
-        free(c->data);
-        free(c);
+            FreeScratchGC(c->pGC);
+            free(c->data);
+            free(c);
+        }
     }
     return TRUE;
 }
diff --git a/xorg-server/dix/enterleave.c b/xorg-server/dix/enterleave.c
index 54f4b8554..a651c68b3 100644
--- a/xorg-server/dix/enterleave.c
+++ b/xorg-server/dix/enterleave.c
@@ -828,14 +828,13 @@ DeviceFocusEvent(DeviceIntPtr dev, int type, int mode, int detail,
     free(xi2event);
 
     /* XI 1.x event */
-    event = (deviceFocus) {
-        .deviceid = dev->id,
-        .mode = mode,
-        .type = (type == XI_FocusIn) ? DeviceFocusIn : DeviceFocusOut,
-        .detail = detail,
-        .window = pWin->drawable.id,
-        .time = currentTime.milliseconds
-    };
+
+    event.deviceid = dev->id;
+    event.mode = mode;
+    event.type = (type == XI_FocusIn) ? DeviceFocusIn : DeviceFocusOut;
+    event.detail = detail;
+    event.window = pWin->drawable.id;
+    event.time = currentTime.milliseconds;
 
     DeliverEventsToWindow(dev, pWin, (xEvent *) &event, 1,
                           DeviceFocusChangeMask, NullGrab);
diff --git a/xorg-server/dix/eventconvert.c b/xorg-server/dix/eventconvert.c
index 2c411cf40..de754e4d4 100644
--- a/xorg-server/dix/eventconvert.c
+++ b/xorg-server/dix/eventconvert.c
@@ -141,7 +141,7 @@ EventToCore(InternalEvent *event, xEvent **core_out, int *count_out)
         core->u.keyButtonPointer.time = e->time;
         core->u.keyButtonPointer.rootX = e->root_x;
         core->u.keyButtonPointer.rootY = e->root_y;
-        core->u.keyButtonPointer.state = e->corestate;
+        core->u.keyButtonPointer.state = e->corestate&0xffff;
         core->u.keyButtonPointer.root = e->root;
         EventSetKeyRepeatFlag(core, (e->type == ET_KeyPress && e->key_repeat));
         ret = Success;
diff --git a/xorg-server/dix/events.c b/xorg-server/dix/events.c
index f72cdc7c4..cb9440b7c 100644
--- a/xorg-server/dix/events.c
+++ b/xorg-server/dix/events.c
@@ -747,7 +747,10 @@ CheckPhysLimits(DeviceIntPtr pDev, CursorPtr cursor, Bool generateEvents,
         (new.x != pSprite->hotPhys.x) || (new.y != pSprite->hotPhys.y)) {
 #ifdef PANORAMIX
         if (!noPanoramiXExtension)
-            XineramaSetCursorPosition(pDev, new.x, new.y, generateEvents);
+        {
+            if (pScreen && ((new.x != pSprite->hotPhys.x) || (new.y != pSprite->hotPhys.y)))
+                XineramaSetCursorPosition(pDev, new.x, new.y, generateEvents);
+        }
         else
 #endif
         {
@@ -1172,7 +1175,7 @@ void
 PlayReleasedEvents(void)
 {
     QdEventPtr tmp;
-    QdEventPtr qe;
+    QdEventPtr qe=NULL;
     DeviceIntPtr dev;
     DeviceIntPtr pDev;
 
@@ -1506,7 +1509,7 @@ void
 DeactivatePointerGrab(DeviceIntPtr mouse)
 {
     GrabPtr grab = mouse->deviceGrab.grab;
-    DeviceIntPtr dev;
+    DeviceIntPtr dev=mouse;
     Bool wasPassive = mouse->deviceGrab.fromPassiveGrab;
     Bool wasImplicit = (mouse->deviceGrab.fromPassiveGrab &&
                         mouse->deviceGrab.implicitGrab);
@@ -2280,7 +2283,7 @@ DeliverRawEvent(RawDeviceEvent *ev, DeviceIntPtr device)
     rc = EventToXI2((InternalEvent *) ev, (xEvent **) &xi);
     if (rc != Success) {
         ErrorF("[Xi] %s: XI2 conversion failed in %s (%d)\n",
-               __func__, device->name, rc);
+               __FUNCTION__, device->name, rc);
         return;
     }
 
@@ -2864,15 +2867,14 @@ ActivateFocusInGrab(DeviceIntPtr dev, WindowPtr old, WindowPtr win)
     if (win == NoneWin || win == PointerRootWin)
         return FALSE;
 
-    event = (DeviceEvent) {
-        .header = ET_Internal,
-        .type = ET_FocusIn,
-        .length = sizeof(DeviceEvent),
-        .time = GetTimeInMillis(),
-        .deviceid = dev->id,
-        .sourceid = dev->id,
-        .detail.button = 0
-    };
+    memset(&event, 0, sizeof(DeviceEvent));
+    event.header = ET_Internal;
+    event.type = ET_FocusIn;
+    event.length = sizeof(DeviceEvent);
+    event.time = GetTimeInMillis();
+    event.deviceid = dev->id;
+    event.sourceid = dev->id;
+    event.detail.button = 0;
     rc = (CheckPassiveGrabsOnWindow(win, dev, (InternalEvent *) &event, FALSE,
                                     TRUE) != NULL);
     if (rc)
@@ -2902,15 +2904,14 @@ ActivateEnterGrab(DeviceIntPtr dev, WindowPtr old, WindowPtr win)
         (*dev->deviceGrab.DeactivateGrab) (dev);
     }
 
-    event = (DeviceEvent) {
-        .header = ET_Internal,
-        .type = ET_Enter,
-        .length = sizeof(DeviceEvent),
-        .time = GetTimeInMillis(),
-        .deviceid = dev->id,
-        .sourceid = dev->id,
-        .detail.button = 0
-    };
+    memset(&event, 0, sizeof(DeviceEvent));
+    event.header = ET_Internal;
+    event.type = ET_Enter;
+    event.length = sizeof(DeviceEvent);
+    event.time = GetTimeInMillis();
+    event.deviceid = dev->id;
+    event.sourceid = dev->id;
+    event.detail.button = 0;
     rc = (CheckPassiveGrabsOnWindow(win, dev, (InternalEvent *) &event, FALSE,
                                     TRUE) != NULL);
     if (rc)
@@ -2937,6 +2938,9 @@ CheckMotion(DeviceEvent *ev, DeviceIntPtr pDev)
 
     verify_internal_event((InternalEvent *) ev);
 
+    if (!pSprite)
+      return FALSE;
+
     prevSpriteWin = pSprite->win;
 
     if (ev && !syncEvents.playingEvents) {
@@ -4358,6 +4362,7 @@ OtherClientGone(pointer value, XID id)
         prev = other;
     }
     FatalError("client not on event list");
+    return BadValue; // to avoid warning
 }
 
 int
@@ -4489,10 +4494,7 @@ CoreEnterLeaveEvent(DeviceIntPtr mouse,
                     int type,
                     int mode, int detail, WindowPtr pWin, Window child)
 {
-    xEvent event = {
-        .u.u.type = type,
-        .u.u.detail = detail
-    };
+    xEvent event;
     WindowPtr focus;
     DeviceIntPtr keybd;
     GrabPtr grab = mouse->deviceGrab.grab;
@@ -4512,6 +4514,9 @@ CoreEnterLeaveEvent(DeviceIntPtr mouse,
         mask = pWin->eventMask | wOtherEventMasks(pWin);
     }
 
+    memset(&event, 0, sizeof(xEvent));
+    event.u.u.type = type;
+    event.u.u.detail = detail;
     event.u.enterLeave.time = currentTime.milliseconds;
     event.u.enterLeave.rootX = mouse->spriteInfo->sprite->hot.x;
     event.u.enterLeave.rootY = mouse->spriteInfo->sprite->hot.y;
@@ -4542,16 +4547,17 @@ CoreEnterLeaveEvent(DeviceIntPtr mouse,
     }
 
     if ((type == EnterNotify) && (mask & KeymapStateMask)) {
-        xKeymapEvent ke = {
-            .type = KeymapNotify
-        };
+        xKeymapEvent ke;
         ClientPtr client = grab ? rClient(grab) : wClient(pWin);
         int rc;
 
         rc = XaceHook(XACE_DEVICE_ACCESS, client, keybd, DixReadAccess);
         if (rc == Success)
             memcpy((char *) &ke.map[0], (char *) &keybd->key->down[1], 31);
+        else
+            memset((char *) &ke.map[0], 0, 31);        
 
+        ke.type = KeymapNotify;
         if (grab)
             TryClientEvents(rClient(grab), keybd, (xEvent *) &ke, 1,
                             mask, KeymapStateMask, grab);
@@ -4636,10 +4642,10 @@ DeviceEnterLeaveEvent(DeviceIntPtr mouse,
 void
 CoreFocusEvent(DeviceIntPtr dev, int type, int mode, int detail, WindowPtr pWin)
 {
-    xEvent event = {
-        .u.u.type = type,
-        .u.u.detail = detail
-    };
+    xEvent event; memset(&event, 0, sizeof(xEvent));
+    event.u.u.type = type;
+    event.u.u.detail = detail;
+
     event.u.focus.mode = mode;
     event.u.focus.window = pWin->drawable.id;
 
@@ -4647,16 +4653,17 @@ CoreFocusEvent(DeviceIntPtr dev, int type, int mode, int detail, WindowPtr pWin)
                           GetEventFilter(dev, &event), NullGrab);
     if ((type == FocusIn) &&
         ((pWin->eventMask | wOtherEventMasks(pWin)) & KeymapStateMask)) {
-        xKeymapEvent ke = {
-            .type = KeymapNotify
-        };
+        xKeymapEvent ke;
         ClientPtr client = wClient(pWin);
         int rc;
 
         rc = XaceHook(XACE_DEVICE_ACCESS, client, dev, DixReadAccess);
         if (rc == Success)
             memcpy((char *) &ke.map[0], (char *) &dev->key->down[1], 31);
+        else
+            memset((char *) &ke.map[0], 0, 31);
 
+        ke.type = KeymapNotify;
         DeliverEventsToWindow(dev, pWin, (xEvent *) &ke, 1,
                               KeymapStateMask, NullGrab);
     }
@@ -4798,12 +4805,11 @@ ProcGetInputFocus(ClientPtr client)
     if (rc != Success)
         return rc;
 
-    rep = (xGetInputFocusReply) {
-        .type = X_Reply,
-        .length = 0,
-        .sequenceNumber = client->sequence,
-        .revertTo = focus->revert
-    };
+    memset(&rep, 0, sizeof(xGetInputFocusReply));
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+    rep.revertTo = focus->revert;
 
     if (focus->win == NoneWin)
         rep.focus = None;
@@ -4874,12 +4880,11 @@ ProcGrabPointer(ClientPtr client)
     if (oldCursor && status == GrabSuccess)
         FreeCursor(oldCursor, (Cursor) 0);
 
-    rep = (xGrabPointerReply) {
-        .type = X_Reply,
-        .status = status,
-        .sequenceNumber = client->sequence,
-        .length = 0
-    };
+    memset(&rep, 0, sizeof(xGrabPointerReply));
+    rep.type = X_Reply;
+    rep.status = status;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
     WriteReplyToClient(client, sizeof(xGrabPointerReply), &rep);
     return Success;
 }
@@ -5115,12 +5120,11 @@ ProcGrabKeyboard(ClientPtr client)
     if (result != Success)
         return result;
 
-    rep = (xGrabKeyboardReply) {
-        .type = X_Reply,
-        .status = status,
-        .sequenceNumber = client->sequence,
-        .length = 0
-    };
+    memset(&rep, 0, sizeof(xGrabKeyboardReply));
+    rep.type = X_Reply;
+    rep.status = status,
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
     WriteReplyToClient(client, sizeof(xGrabKeyboardReply), &rep);
     return Success;
 }
@@ -5183,16 +5187,16 @@ ProcQueryPointer(ClientPtr client)
     pSprite = mouse->spriteInfo->sprite;
     if (mouse->valuator->motionHintWindow)
         MaybeStopHint(mouse, client);
-    rep = (xQueryPointerReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .mask = event_get_corestate(mouse, keyboard),
-        .root = (GetCurrentRootWindow(mouse))->drawable.id,
-        .rootX = pSprite->hot.x,
-        .rootY = pSprite->hot.y,
-        .child = None
-    };
+    memset(&rep, 0, sizeof(xQueryPointerReply));
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.mask = event_get_corestate(mouse, keyboard);
+    rep.root = (GetCurrentRootWindow(mouse))->drawable.id;
+    rep.rootX = pSprite->hot.x;
+    rep.rootY = pSprite->hot.y;
+    rep.child = None;
+    
     if (pSprite->hot.pScreen == pWin->drawable.pScreen) {
         rep.sameScreen = xTrue;
         rep.winX = pSprite->hot.x - pWin->drawable.x;
@@ -5242,7 +5246,8 @@ void
 InitEvents(void)
 {
     int i;
-    QdEventPtr qe, tmp;
+    QdEventPtr qe=NULL;
+    QdEventPtr tmp;
 
     inputInfo.numDevices = 0;
     inputInfo.devices = (DeviceIntPtr) NULL;
@@ -5460,13 +5465,12 @@ ProcGrabKey(ClientPtr client)
 
     REQUEST_SIZE_MATCH(xGrabKeyReq);
 
-    param = (GrabParameters) {
-        .grabtype = CORE,
-        .ownerEvents = stuff->ownerEvents,
-        .this_device_mode = stuff->keyboardMode,
-        .other_devices_mode = stuff->pointerMode,
-        .modifiers = stuff->modifiers
-    };
+    memset(&param, 0, sizeof(param));
+    param.grabtype = CORE;
+    param.ownerEvents = stuff->ownerEvents;
+    param.this_device_mode = stuff->keyboardMode;
+    param.other_devices_mode = stuff->pointerMode;
+    param.modifiers = stuff->modifiers;
 
     rc = CheckGrabValues(client, &param);
     if (rc != Success)
@@ -5567,13 +5571,12 @@ ProcGrabButton(ClientPtr client)
     if (rc != Success)
         return rc;
 
-    param = (GrabParameters) {
-        .grabtype = CORE,
-        .ownerEvents = stuff->ownerEvents,
-        .this_device_mode = stuff->keyboardMode,
-        .other_devices_mode = stuff->pointerMode,
-        .modifiers = stuff->modifiers
-    };
+    memset(&param, 0, sizeof(param));
+    param.grabtype = CORE;
+    param.ownerEvents = stuff->ownerEvents;
+    param.this_device_mode = stuff->keyboardMode;
+    param.other_devices_mode = stuff->pointerMode;
+    param.modifiers = stuff->modifiers;
 
     mask.core = stuff->eventMask;
 
diff --git a/xorg-server/dix/extension.c b/xorg-server/dix/extension.c
index 6380db364..bdbbf014c 100644
--- a/xorg-server/dix/extension.c
+++ b/xorg-server/dix/extension.c
@@ -252,12 +252,11 @@ ProcQueryExtension(ClientPtr client)
 
     REQUEST_FIXED_SIZE(xQueryExtensionReq, stuff->nbytes);
 
-    reply = (xQueryExtensionReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .major_opcode = 0
-    };
+    memset(&reply, 0, sizeof(xQueryExtensionReply));
+    reply.type = X_Reply;
+    reply.sequenceNumber = client->sequence;
+    reply.length = 0;
+    reply.major_opcode = 0;
 
     if (!NumExtensions)
         reply.present = xFalse;
@@ -285,12 +284,12 @@ ProcListExtensions(ClientPtr client)
 
     REQUEST_SIZE_MATCH(xReq);
 
-    reply = (xListExtensionsReply) {
-        .type = X_Reply,
-        .nExtensions = 0,
-        .sequenceNumber = client->sequence,
-        .length = 0
-    };
+    memset(&reply, 0, sizeof(xListExtensionsReply));
+    reply.type = X_Reply;
+    reply.nExtensions = 0;
+    reply.sequenceNumber = client->sequence;
+    reply.length = 0;
+    
     buffer = NULL;
 
     if (NumExtensions) {
diff --git a/xorg-server/dix/gc.c b/xorg-server/dix/gc.c
index f46e0ddc4..fc13f46a0 100644
--- a/xorg-server/dix/gc.c
+++ b/xorg-server/dix/gc.c
@@ -320,12 +320,30 @@ ChangeGC(ClientPtr client, GC * pGC, BITS32 mask, ChangeGCValPtr pUnion)
             break;
         }
         case GCClipXOrigin:
+            #ifndef _DEBUG
             NEXTVAL(INT16, pGC->clipOrg.x);
-
+            #else
+            {
+                long Val;
+                NEXTVAL(long, Val);
+                if (abs(Val)>65535)
+                    ErrorF("Value received for GCClipXOrigin is too large %x\n",Val);
+                pGC->clipOrg.x=(INT16)(Val&0xffff);
+            }
+            #endif
             break;
         case GCClipYOrigin:
+            #ifndef _DEBUG
             NEXTVAL(INT16, pGC->clipOrg.y);
-
+            #else
+            {
+                long Val;
+                NEXTVAL(long, Val);
+                if (abs(Val)>65535)
+                    ErrorF("Value received for GCClipYOrigin is too large %x\n",Val);
+                pGC->clipOrg.y=(INT16)(Val&0xffff);
+            }
+            #endif
             break;
         case GCClipMask:
             NEXT_PTR(PixmapPtr, pPixmap);
diff --git a/xorg-server/dix/getevents.c b/xorg-server/dix/getevents.c
index a1e193815..ad45149d2 100644
--- a/xorg-server/dix/getevents.c
+++ b/xorg-server/dix/getevents.c
@@ -75,6 +75,21 @@ typedef const char *string;
 #include <Xserver-dtrace.h>
 #endif
 
+#ifdef _MSC_VER
+#include <math.h>
+
+float roundf(float f)
+{
+  return ((f<0.0f) ? ceil(f-.5)  : floor (f+.5));
+}
+double roundd(double f)
+{
+  return ((f<0.0) ? ceil(f-.5)  : floor (f+.5));
+}
+#define lroundf(val)   ((int)roundf(val))
+#define lround(val)   ((int)roundd(val))
+#endif
+
 /* Number of motion history events to store. */
 #define MOTION_HISTORY_SIZE 256
 
@@ -1062,7 +1077,7 @@ GetKeyboardEvents(InternalEvent *events, DeviceIntPtr pDev, int type,
 #endif
 
     /* refuse events from disabled devices */
-    if (!pDev->enabled)
+    if (!pDev || !pDev->enabled)
         return 0;
 
     if (!events || !pDev->key || !pDev->focus || !pDev->kbdfeed ||
@@ -1167,7 +1182,12 @@ FreeEventList(InternalEvent *list, int num_events)
 static void
 transform(struct pixman_f_transform *m, double *x, double *y)
 {
-    struct pixman_f_vector p = {.v = {*x, *y, 1} };
+    struct pixman_f_vector p;
+    
+    p.v[0] = *x;
+    p.v[1] = *y;
+    p.v[2] = 1;
+
     pixman_f_transform_point(m, &p);
 
     *x = p.v[0];
diff --git a/xorg-server/dix/inpututils.c b/xorg-server/dix/inpututils.c
index 9e38e1742..c27799030 100644
--- a/xorg-server/dix/inpututils.c
+++ b/xorg-server/dix/inpututils.c
@@ -71,13 +71,14 @@ static void
 do_butmap_change(DeviceIntPtr dev, CARD8 *map, int len, ClientPtr client)
 {
     int i;
-    xEvent core_mn = { .u.u.type = MappingNotify };
+    xEvent core_mn;
     deviceMappingNotify xi_mn;
 
     /* The map in ButtonClassRec refers to button numbers, whereas the
      * protocol is zero-indexed.  Sigh. */
     memcpy(&(dev->button->map[1]), map, len);
 
+    core_mn.u.u.type = MappingNotify;
     core_mn.u.mappingNotify.request = MappingPointer;
 
     /* 0 is the server client. */
@@ -92,12 +93,11 @@ do_butmap_change(DeviceIntPtr dev, CARD8 *map, int len, ClientPtr client)
         WriteEventsToClient(clients[i], 1, &core_mn);
     }
 
-    xi_mn = (deviceMappingNotify) {
-        .type = DeviceMappingNotify,
-        .request = MappingPointer,
-        .deviceid = dev->id,
-        .time = GetTimeInMillis()
-    };
+
+    xi_mn.type = DeviceMappingNotify;
+    xi_mn.request = MappingPointer;
+    xi_mn.deviceid = dev->id;
+    xi_mn.time = GetTimeInMillis();
 
     SendEventToAllWindows(dev, DeviceMappingNotifyMask, (xEvent *) &xi_mn, 1);
 }
diff --git a/xorg-server/dix/main.c b/xorg-server/dix/main.c
index fb935c969..eceab0c01 100644
--- a/xorg-server/dix/main.c
+++ b/xorg-server/dix/main.c
@@ -116,6 +116,10 @@ Equipment Corporation.
 #include "dpmsproc.h"
 #endif
 
+#ifdef _DEBUG
+#include <crtdbg.h>
+#endif
+
 extern void Dispatch(void);
 
 #ifdef XQUARTZ
@@ -136,9 +140,50 @@ main(int argc, char *argv[], char *envp[])
 {
     int i;
     HWEventQueueType alwaysCheckForInput[2];
-
+    #ifdef _DEBUG
+    //int TmpFlag=_CrtSetDbgFlag( _CRTDBG_REPORT_FLAG);
+    
+    //TmpFlag|=_CRTDBG_ALLOC_MEM_DF;
+    //TmpFlag|=_CRTDBG_DELAY_FREE_MEM_DF;
+    //TmpFlag|=_CRTDBG_CHECK_ALWAYS_DF;
+    //TmpFlag|=_CRTDBG_CHECK_CRT_DF;
+    //TmpFlag|=_CRTDBG_LEAK_CHECK_DF;
+    
+    //_CrtSetDbgFlag(TmpFlag);
+    #endif
+
+    ptw32_processInitialize();
     display = "0";
 
+    #ifdef WIN32
+
+    if (InitWSA()<0)
+    {
+      printf("Error initialising WSA\n");
+      return -1;
+    }
+    /* In Win32 we have different threads call Xlib functions (depending
+       on the commandline options given).
+       XInitThreads has to be called before
+       any xlib function is called (aoccording to the man page) */
+    XInitThreads();
+    /* change the current directory to the directory where the vcxsrv.exe executable is installed.
+       This is needed because the font directories are relative to the current directory.
+     */
+     {
+       char ModuleFilename[MAX_PATH];
+       char *pSlash;
+       GetModuleFileName(NULL,ModuleFilename,sizeof(ModuleFilename));
+       pSlash=strrchr(ModuleFilename,'\\');
+       if (pSlash)
+       {
+         *pSlash='\0';
+         chdir(ModuleFilename);
+       }
+     }
+    OsVendorPreInit(argc, argv);
+    #endif
+
     InitRegions();
 
     CheckUserParameters(argc, argv, envp);
@@ -164,7 +209,6 @@ main(int argc, char *argv[], char *envp[])
 #endif
         InitBlockAndWakeupHandlers();
         /* Perform any operating system dependent initializations you'd like */
-        OsInit();
         if (serverGeneration == 1) {
             CreateWellKnownSockets();
             for (i = 1; i < MAXCLIENTS; i++)
@@ -178,6 +222,7 @@ main(int argc, char *argv[], char *envp[])
             ResetWellKnownSockets();
         clients[0] = serverClient;
         currentMaxClients = 1;
+        OsInit();
 
         /* Initialize privates before first allocation */
         dixResetPrivates();
@@ -292,6 +337,11 @@ main(int argc, char *argv[], char *envp[])
 
         NotifyParentProcess();
 
+        #ifdef _MSC_VER
+        // initialise here because doing it in InitInput failes because keyboard device is not started yet then
+        winInitializeModeKeyStates ();
+        #endif
+
         Dispatch();
 
 #ifdef XQUARTZ
diff --git a/xorg-server/dix/makefile b/xorg-server/dix/makefile
new file mode 100644
index 000000000..a7e9e3249
--- /dev/null
+++ b/xorg-server/dix/makefile
@@ -0,0 +1,45 @@
+ifeq ($(DEBUG),1)

+DEFINES += FONTDEBUG XSERVER_DTRACE

+endif

+

+INCLUDES += ..\composite ..\miext\sync

+

+LIBRARY=libdix

+

+libdix_la_SOURCES = 	\

+	atom.c		\

+	colormap.c	\

+	cursor.c	\

+	devices.c	\

+	dispatch.c	\

+	dispatch.h	\

+	dixfonts.c	\

+	dixutils.c	\

+	enterleave.c	\

+	enterleave.h	\

+	events.c	\

+	eventconvert.c  \

+	extension.c	\

+	ffs.c		\

+	gc.c		\

+	getevents.c	\

+	globals.c	\

+	glyphcurs.c	\

+	grabs.c		\

+	initatoms.c	\

+	inpututils.c	\

+	pixmap.c	\

+	privates.c	\

+	property.c	\

+	ptrveloc.c	\

+	region.c	\

+	registry.c	\

+	resource.c	\

+	selection.c	\

+	swaprep.c	\

+	swapreq.c	\

+	tables.c	\

+	touch.c		\

+	window.c

+

+CSRCS = $(filter %.c,$(libdix_la_SOURCES))

diff --git a/xorg-server/dix/privates.c b/xorg-server/dix/privates.c
index 55b9345a7..6f03bbcdb 100644
--- a/xorg-server/dix/privates.c
+++ b/xorg-server/dix/privates.c
@@ -67,66 +67,77 @@ from The Open Group.
 static DevPrivateSetRec global_keys[PRIVATE_LAST];
 
 static const Bool xselinux_private[PRIVATE_LAST] = {
-    [PRIVATE_SCREEN] = TRUE,
-    [PRIVATE_CLIENT] = TRUE,
-    [PRIVATE_WINDOW] = TRUE,
-    [PRIVATE_PIXMAP] = TRUE,
-    [PRIVATE_GC] = TRUE,
-    [PRIVATE_CURSOR] = TRUE,
-    [PRIVATE_COLORMAP] = TRUE,
-    [PRIVATE_DEVICE] = TRUE,
-    [PRIVATE_EXTENSION] = TRUE,
-    [PRIVATE_SELECTION] = TRUE,
-    [PRIVATE_PROPERTY] = TRUE,
-    [PRIVATE_PICTURE] = TRUE,
-    [PRIVATE_GLYPHSET] = TRUE,
+    /* PRIVATE_XSELINUX,*/    FALSE,
+    /* PRIVATE_SCREEN,*/      TRUE,
+    /* [PRIVATE_EXTENSION] =*/TRUE,
+    /* [PRIVATE_COLORMAP] =*/ TRUE,
+    /* [PRIVATE_DEVICE] =*/   TRUE,
+    /* [PRIVATE_CLIENT] = */  TRUE,
+    /* [PRIVATE_PROPERTY] =*/ TRUE,
+    /* [PRIVATE_SELECTION] =*/TRUE,
+    /* [PRIVATE_WINDOW] =*/   TRUE,
+    /* [PRIVATE_PIXMAP] =*/   TRUE,
+    /* [PRIVATE_GC] =*/       TRUE,
+    /* [PRIVATE_CURSOR] =*/   TRUE,
+    /* PRIVATE_CURSOR_BITS,*/ FALSE,
+    /* PRIVATE_DBE_WINDOW,*/  FALSE,
+    /* PRIVATE_DAMAGE,*/      FALSE,
+    /* PRIVATE_GLYPH,*/       FALSE,
+    /* [PRIVATE_GLYPHSET] =*/ TRUE,
+    /* [PRIVATE_PICTURE] =*/  TRUE
 };
 
 static const char *key_names[PRIVATE_LAST] = {
     /* XSELinux uses the same private keys for numerous objects */
-    [PRIVATE_XSELINUX] = "XSELINUX",
+    /*[PRIVATE_XSELINUX] =*/ "XSELINUX",
 
     /* Otherwise, you get a private in just the requested structure
      */
     /* These can have objects created before all of the keys are registered */
-    [PRIVATE_SCREEN] = "SCREEN",
-    [PRIVATE_EXTENSION] = "EXTENSION",
-    [PRIVATE_COLORMAP] = "COLORMAP",
-    [PRIVATE_DEVICE] = "DEVICE",
+    /*[PRIVATE_SCREEN] =*/ "SCREEN",
+    /*[PRIVATE_EXTENSION] =*/ "EXTENSION",
+    /*[PRIVATE_COLORMAP] =*/ "COLORMAP",
+    /*[PRIVATE_DEVICE] =*/ "DEVICE",
 
     /* These cannot have any objects before all relevant keys are registered */
-    [PRIVATE_CLIENT] = "CLIENT",
-    [PRIVATE_PROPERTY] = "PROPERTY",
-    [PRIVATE_SELECTION] = "SELECTION",
-    [PRIVATE_WINDOW] = "WINDOW",
-    [PRIVATE_PIXMAP] = "PIXMAP",
-    [PRIVATE_GC] = "GC",
-    [PRIVATE_CURSOR] = "CURSOR",
-    [PRIVATE_CURSOR_BITS] = "CURSOR_BITS",
+    /*[PRIVATE_CLIENT] =*/ "CLIENT",
+    /*[PRIVATE_PROPERTY] =*/ "PROPERTY",
+    /*[PRIVATE_SELECTION] =*/ "SELECTION",
+    /*[PRIVATE_WINDOW] =*/ "WINDOW",
+    /*[PRIVATE_PIXMAP] =*/ "PIXMAP",
+    /*[PRIVATE_GC] =*/ "GC",
+    /*[PRIVATE_CURSOR] =*/ "CURSOR",
+    /*[PRIVATE_CURSOR_BITS] =*/ "CURSOR_BITS",
 
     /* extension privates */
-    [PRIVATE_DBE_WINDOW] = "DBE_WINDOW",
-    [PRIVATE_DAMAGE] = "DAMAGE",
-    [PRIVATE_GLYPH] = "GLYPH",
-    [PRIVATE_GLYPHSET] = "GLYPHSET",
-    [PRIVATE_PICTURE] = "PICTURE",
-    [PRIVATE_SYNC_FENCE] = "SYNC_FENCE",
+    /*[PRIVATE_DBE_WINDOW] =*/ "DBE_WINDOW",
+    /*[PRIVATE_DAMAGE] =*/ "DAMAGE",
+    /*[PRIVATE_GLYPH] =*/ "GLYPH",
+    /*[PRIVATE_GLYPHSET] =*/ "GLYPHSET",
+    /*[PRIVATE_PICTURE] =*/ "PICTURE",
+    /*[PRIVATE_SYNC_FENCE] =*/ "SYNC_FENCE",
 };
 
 static const Bool screen_specific_private[PRIVATE_LAST] = {
-    [PRIVATE_SCREEN] = FALSE,
-    [PRIVATE_CLIENT] = FALSE,
-    [PRIVATE_WINDOW] = TRUE,
-    [PRIVATE_PIXMAP] = TRUE,
-    [PRIVATE_GC] = TRUE,
-    [PRIVATE_CURSOR] = FALSE,
-    [PRIVATE_COLORMAP] = FALSE,
-    [PRIVATE_DEVICE] = FALSE,
-    [PRIVATE_EXTENSION] = FALSE,
-    [PRIVATE_SELECTION] = FALSE,
-    [PRIVATE_PROPERTY] = FALSE,
-    [PRIVATE_PICTURE] = TRUE,
-    [PRIVATE_GLYPHSET] = FALSE,
+    /*[PRIVATE_XSELINUX] =*/ FALSE,
+    /*[PRIVATE_SCREEN] =*/ FALSE,
+    /*[PRIVATE_EXTENSION] =*/ FALSE,
+    /*[PRIVATE_COLORMAP] =*/ FALSE,
+    /*[PRIVATE_DEVICE] =*/ FALSE,
+    /*[PRIVATE_CLIENT] =*/ FALSE,
+    /*[PRIVATE_PROPERTY] =*/ FALSE,
+    /*[PRIVATE_SELECTION] =*/ FALSE,
+    /*[PRIVATE_WINDOW] =*/ TRUE,
+    /*[PRIVATE_PIXMAP] =*/ TRUE,
+    /*[PRIVATE_GC] =*/ TRUE,
+    /*[PRIVATE_CURSOR] =*/ FALSE,
+    /*[PRIVATE_CURSOR_BITS] =*/ FALSE,
+    /*[PRIVATE_DBE_WINDOW] =*/ FALSE,
+    /*[PRIVATE_DAMAGE] =*/ FALSE,
+    /*[PRIVATE_GLYPH] =*/ FALSE,
+    /*[PRIVATE_GLYPHSET] =*/ FALSE,
+    /*[PRIVATE_PICTURE] =*/ TRUE,
+    /*[PRIVATE_SYNC_FENCE] =*/ FALSE
 };
 
 typedef Bool (*FixupFunc) (PrivatePtr *privates, int offset, unsigned bytes);
@@ -289,11 +300,25 @@ fixupDevices(FixupFunc fixup, unsigned bytes)
 }
 
 static Bool (*const allocated_early[PRIVATE_LAST]) (FixupFunc, unsigned) = {
-    [PRIVATE_SCREEN] = fixupScreens,
-    [PRIVATE_CLIENT] = fixupServerClient,
-    [PRIVATE_EXTENSION] = fixupExtensions,
-    [PRIVATE_COLORMAP] = fixupDefaultColormaps,
-    [PRIVATE_DEVICE] = fixupDevices,
+    /*PRIVATE_XSELINUX,*/     NULL,
+    /*PRIVATE_SCREEN =*/      fixupScreens,
+    /*PRIVATE_EXTENSION =*/   fixupExtensions,
+    /*PRIVATE_COLORMAP =*/    fixupDefaultColormaps,
+    /*PRIVATE_DEVICE,*/       fixupDevices,
+    /*PRIVATE_CLIENT =*/      fixupServerClient,
+    /*PRIVATE_PROPERTY,*/     NULL,
+    /*PRIVATE_SELECTION,*/    NULL,
+    /*PRIVATE_WINDOW,*/       NULL,
+    /*PRIVATE_PIXMAP,*/       NULL,
+    /*PRIVATE_GC,*/           NULL,
+    /*PRIVATE_CURSOR,*/       NULL,
+    /*PRIVATE_CURSOR_BITS,*/  NULL,
+    /*PRIVATE_DBE_WINDOW,*/   NULL,
+    /*PRIVATE_DAMAGE,*/       NULL,
+    /*PRIVATE_GLYPH,*/        NULL,
+    /*PRIVATE_GLYPHSET,*/     NULL,
+    /*PRIVATE_PICTURE,*/      NULL,
+    /*PRIVATE_SYNC_FENCE,*/   NULL
 };
 
 static void
diff --git a/xorg-server/dix/property.c b/xorg-server/dix/property.c
index dec409024..833c3ca59 100644
--- a/xorg-server/dix/property.c
+++ b/xorg-server/dix/property.c
@@ -108,12 +108,12 @@ dixLookupProperty(PropertyPtr *result, WindowPtr pWin, Atom propertyName,
 static void
 deliverPropertyNotifyEvent(WindowPtr pWin, int state, Atom atom)
 {
-    xEvent event = {
-        .u.property.window = pWin->drawable.id,
-        .u.property.state = state,
-        .u.property.atom = atom,
-        .u.property.time = currentTime.milliseconds
-    };
+    xEvent event; memset(&event, 0, sizeof(xEvent));
+    event.u.property.window = pWin->drawable.id;
+    event.u.property.state = state;
+    event.u.property.atom = atom;
+    event.u.property.time = currentTime.milliseconds;
+
     event.u.u.type = PropertyNotify;
     DeliverEvents(pWin, &event, 1, (WindowPtr) NULL);
 }
@@ -414,15 +414,14 @@ DeleteAllWindowProperties(WindowPtr pWin)
 static int
 NullPropertyReply(ClientPtr client, ATOM propertyType, int format)
 {
-    xGetPropertyReply reply = {
-        .type = X_Reply,
-        .format = format,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .propertyType = propertyType,
-        .bytesAfter = 0,
-        .nItems = 0
-    };
+    xGetPropertyReply reply;
+    reply.type = X_Reply;
+    reply.format = format;
+    reply.sequenceNumber = client->sequence;
+    reply.length = 0;
+    reply.propertyType = propertyType;
+    reply.bytesAfter = 0;
+    reply.nItems = 0;
     WriteReplyToClient(client, sizeof(xGenericReply), &reply);
     return Success;
 }
@@ -483,15 +482,14 @@ ProcGetProperty(ClientPtr client)
 
     if (((stuff->type != pProp->type) && (stuff->type != AnyPropertyType))
         ) {
-        reply = (xGetPropertyReply) {
-            .type = X_Reply,
-            .sequenceNumber = client->sequence,
-            .bytesAfter = pProp->size,
-            .format = pProp->format,
-            .length = 0,
-            .nItems = 0,
-            .propertyType = pProp->type
-        };
+        memset(&reply, 0, sizeof(xGetPropertyReply));
+        reply.type = X_Reply;
+        reply.sequenceNumber = client->sequence;
+        reply.bytesAfter = pProp->size;
+        reply.format = pProp->format;
+        reply.length = 0;
+        reply.nItems = 0;
+        reply.propertyType = pProp->type;
         WriteReplyToClient(client, sizeof(xGenericReply), &reply);
         return Success;
     }
@@ -512,15 +510,14 @@ ProcGetProperty(ClientPtr client)
 
     len = min(n - ind, 4 * stuff->longLength);
 
-    reply = (xGetPropertyReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .bytesAfter = n - (ind + len),
-        .format = pProp->format,
-        .length = bytes_to_int32(len),
-        .nItems = len / (pProp->format / 8),
-        .propertyType = pProp->type
-    };
+    memset(&reply, 0, sizeof(xGetPropertyReply));
+    reply.type = X_Reply;
+    reply.sequenceNumber = client->sequence,
+    reply.bytesAfter = n - (ind + len);
+    reply.format = pProp->format;
+    reply.length = bytes_to_int32(len);
+    reply.nItems = len / (pProp->format / 8);
+    reply.propertyType = pProp->type;
 
     if (stuff->delete && (reply.bytesAfter == 0))
         deliverPropertyNotifyEvent(pWin, PropertyDelete, pProp->propertyName);
@@ -595,12 +592,12 @@ ProcListProperties(ClientPtr client)
         }
     }
 
-    xlpr = (xListPropertiesReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = bytes_to_int32(numProps * sizeof(Atom)),
-        .nProperties = numProps
-    };
+
+    xlpr.type = X_Reply;
+    xlpr.sequenceNumber = client->sequence;
+    xlpr.length = bytes_to_int32(numProps * sizeof(Atom));
+    xlpr.nProperties = numProps;
+    
     WriteReplyToClient(client, sizeof(xGenericReply), &xlpr);
     if (numProps) {
         client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write;
diff --git a/xorg-server/dix/ptrveloc.c b/xorg-server/dix/ptrveloc.c
index c7994b03d..7d3d9f938 100644
--- a/xorg-server/dix/ptrveloc.c
+++ b/xorg-server/dix/ptrveloc.c
@@ -26,6 +26,10 @@
 #include <dix-config.h>
 #endif
 
+#ifdef _MSC_VER
+#define _USE_MATH_DEFINES
+#endif
+
 #include <math.h>
 #include <ptrveloc.h>
 #include <exevents.h>
@@ -60,6 +64,11 @@
  *
  ****************************************************************************/
 
+#ifdef _MSC_VER
+#define inline __inline
+#define lrintf(val) ((int)val)
+#endif
+
 /* fwds */
 static double
 SimpleSmoothProfile(DeviceIntPtr dev, DeviceVelocityPtr vel, double velocity,
diff --git a/xorg-server/dix/registry.c b/xorg-server/dix/registry.c
index 5bad0fdd4..18344f417 100644
--- a/xorg-server/dix/registry.c
+++ b/xorg-server/dix/registry.c
@@ -25,6 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include "resource.h"
@@ -207,7 +208,7 @@ RegisterResourceName(RESTYPE resource, const char *name)
     resource &= TypeMask;
 
     while (resource >= nresource) {
-        if (!double_size(&resources, nresource, sizeof(char *)))
+        if (!double_size((void*)&resources, nresource, sizeof(char *)))
             return;
         nresource = nresource ? nresource * 2 : BASE_SIZE;
     }
@@ -286,7 +287,7 @@ LookupResourceName(RESTYPE resource)
 void
 dixResetRegistry(void)
 {
-    ExtensionEntry extEntry = { .name = CORE };
+    ExtensionEntry extEntry;
 
     /* Free all memory */
     while (nmajor--) {
@@ -305,7 +306,7 @@ dixResetRegistry(void)
         free(errors[nerror]);
     free(errors);
 
-    free(resources);
+    free((void*)resources);
 
     requests = NULL;
     nminor = NULL;
@@ -336,6 +337,8 @@ dixResetRegistry(void)
     RegisterResourceName(RT_PASSIVEGRAB, "PASSIVE GRAB");
 
     /* Add the core protocol */
+    memset(&extEntry, 0, sizeof(extEntry));
+    extEntry.name = CORE;
     RegisterExtensionNames(&extEntry);
 }
 
diff --git a/xorg-server/dix/resource.c b/xorg-server/dix/resource.c
index 2aafa343c..c04b5578e 100644
--- a/xorg-server/dix/resource.c
+++ b/xorg-server/dix/resource.c
@@ -432,66 +432,66 @@ FindGCSubRes(pointer value, FindAllRes func, pointer cdata)
 static struct ResourceType *resourceTypes;
 
 static const struct ResourceType predefTypes[] = {
-    [RT_NONE & (RC_LASTPREDEF - 1)] = {
-                                       .deleteFunc = (DeleteType) NoopDDA,
-                                       .sizeFunc = GetDefaultBytes,
-                                       .findSubResFunc = DefaultFindSubRes,
-                                       .errorValue = BadValue,
-                                       },
-    [RT_WINDOW & (RC_LASTPREDEF - 1)] = {
-                                         .deleteFunc = DeleteWindow,
-                                         .sizeFunc = GetWindowBytes,
-                                         .findSubResFunc = FindWindowSubRes,
-                                         .errorValue = BadWindow,
-                                         },
-    [RT_PIXMAP & (RC_LASTPREDEF - 1)] = {
-                                         .deleteFunc = dixDestroyPixmap,
-                                         .sizeFunc = GetPixmapBytes,
-                                         .findSubResFunc = DefaultFindSubRes,
-                                         .errorValue = BadPixmap,
-                                         },
-    [RT_GC & (RC_LASTPREDEF - 1)] = {
-                                     .deleteFunc = FreeGC,
-                                     .sizeFunc = GetGcBytes,
-                                     .findSubResFunc = FindGCSubRes,
-                                     .errorValue = BadGC,
-                                     },
-    [RT_FONT & (RC_LASTPREDEF - 1)] = {
-                                       .deleteFunc = CloseFont,
-                                       .sizeFunc = GetDefaultBytes,
-                                       .findSubResFunc = DefaultFindSubRes,
-                                       .errorValue = BadFont,
-                                       },
-    [RT_CURSOR & (RC_LASTPREDEF - 1)] = {
-                                         .deleteFunc = FreeCursor,
-                                         .sizeFunc = GetDefaultBytes,
-                                         .findSubResFunc = DefaultFindSubRes,
-                                         .errorValue = BadCursor,
-                                         },
-    [RT_COLORMAP & (RC_LASTPREDEF - 1)] = {
-                                           .deleteFunc = FreeColormap,
-                                           .sizeFunc = GetDefaultBytes,
-                                           .findSubResFunc = DefaultFindSubRes,
-                                           .errorValue = BadColor,
-                                           },
-    [RT_CMAPENTRY & (RC_LASTPREDEF - 1)] = {
-                                            .deleteFunc = FreeClientPixels,
-                                            .sizeFunc = GetDefaultBytes,
-                                            .findSubResFunc = DefaultFindSubRes,
-                                            .errorValue = BadColor,
-                                            },
-    [RT_OTHERCLIENT & (RC_LASTPREDEF - 1)] = {
-                                              .deleteFunc = OtherClientGone,
-                                              .sizeFunc = GetDefaultBytes,
-                                              .findSubResFunc = DefaultFindSubRes,
-                                              .errorValue = BadValue,
-                                              },
-    [RT_PASSIVEGRAB & (RC_LASTPREDEF - 1)] = {
-                                              .deleteFunc = DeletePassiveGrab,
-                                              .sizeFunc = GetDefaultBytes,
-                                              .findSubResFunc = DefaultFindSubRes,
-                                              .errorValue = BadValue,
-                                              },
+  /* [RT_NONE & (RC_LASTPREDEF - 1)] = */ {
+  /*.deleteFunc = */(DeleteType)NoopDDA,
+  /*.sizeFunc = */GetDefaultBytes,
+  /*.findSubResFunc = */DefaultFindSubRes,
+  /*.errorValue = */BadValue,
+    },
+  /* [RT_WINDOW & (RC_LASTPREDEF - 1)] = */ {
+  /*.deleteFunc = */DeleteWindow,
+  /*.sizeFunc = */GetWindowBytes,
+  /*.findSubResFunc = */FindWindowSubRes,
+  /*.errorValue = */BadWindow,
+    },
+  /* [RT_PIXMAP & (RC_LASTPREDEF - 1)] = */ {
+  /*.deleteFunc = */dixDestroyPixmap,
+  /*.sizeFunc = */GetPixmapBytes,
+  /*.findSubResFunc = */DefaultFindSubRes,
+  /*.errorValue = */BadPixmap,
+    },
+  /* [RT_GC & (RC_LASTPREDEF - 1)] = */ {
+  /*.deleteFunc = */FreeGC,
+  /*.sizeFunc = */GetGcBytes,
+  /*.findSubResFunc = */FindGCSubRes,
+  /*.errorValue = */BadGC,
+    },
+  /* [RT_FONT & (RC_LASTPREDEF - 1)] = */ {
+  /*.deleteFunc = */CloseFont,
+  /*.sizeFunc = */GetDefaultBytes,
+  /*.findSubResFunc = */DefaultFindSubRes,
+  /*.errorValue = */BadFont,
+    },
+  /* [RT_CURSOR & (RC_LASTPREDEF - 1)] = */ {
+  /*.deleteFunc = */FreeCursor,
+  /*.sizeFunc = */GetDefaultBytes,
+  /*.findSubResFunc = */DefaultFindSubRes,
+  /*.errorValue = */BadCursor,
+    },
+  /* [RT_COLORMAP & (RC_LASTPREDEF - 1)] = */ {
+  /*.deleteFunc = */FreeColormap,
+  /*.sizeFunc = */GetDefaultBytes,
+  /*.findSubResFunc = */DefaultFindSubRes,
+  /*.errorValue = */BadColor,
+    },
+  /* [RT_CMAPENTRY & (RC_LASTPREDEF - 1)] = */ {
+  /*.deleteFunc = */FreeClientPixels,
+  /*.sizeFunc = */GetDefaultBytes,
+  /*.findSubResFunc = */DefaultFindSubRes,
+  /*.errorValue = */BadColor,
+    },
+  /* [RT_OTHERCLIENT & (RC_LASTPREDEF - 1)] = */ {
+  /*.deleteFunc = */OtherClientGone,
+  /*.sizeFunc = */GetDefaultBytes,
+  /*.findSubResFunc = */DefaultFindSubRes,
+  /*.errorValue = */BadValue,
+    },
+  /* [RT_PASSIVEGRAB & (RC_LASTPREDEF - 1)] = */ {
+  /*.deleteFunc = */DeletePassiveGrab,
+  /*.sizeFunc = */GetDefaultBytes,
+  /*.findSubResFunc = */DefaultFindSubRes,
+  /*.errorValue = */BadValue,
+    },
 };
 
 CallbackListPtr ResourceStateCallback;
diff --git a/xorg-server/dix/selection.c b/xorg-server/dix/selection.c
index e905b1ec2..060afb808 100644
--- a/xorg-server/dix/selection.c
+++ b/xorg-server/dix/selection.c
@@ -181,11 +181,11 @@ ProcSetSelectionOwner(ClientPtr client)
         if (CompareTimeStamps(time, pSel->lastTimeChanged) == EARLIER)
             return Success;
         if (pSel->client && (!pWin || (pSel->client != client))) {
-            xEvent event = {
-                .u.selectionClear.time = time.milliseconds,
-                .u.selectionClear.window = pSel->window,
-                .u.selectionClear.atom = pSel->selection
-            };
+            xEvent event;
+            event.u.selectionClear.time = time.milliseconds;
+            event.u.selectionClear.window = pSel->window;
+            event.u.selectionClear.atom = pSel->selection;
+            
             event.u.u.type = SelectionClear;
             WriteEventsToClient(pSel->client, 1, &event);
         }
@@ -238,11 +238,10 @@ ProcGetSelectionOwner(ClientPtr client)
         return BadAtom;
     }
 
-    reply = (xGetSelectionOwnerReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-    };
+    memset(&reply, 0, sizeof(xGetSelectionOwnerReply));
+    reply.type = X_Reply;
+    reply.sequenceNumber = client->sequence;
+    reply.length = 0;
 
     rc = dixLookupSelection(&pSel, stuff->id, client, DixGetAttrAccess);
     if (rc == Success)
diff --git a/xorg-server/dix/swapreq.c b/xorg-server/dix/swapreq.c
index 0f6d49ef0..6f9d4d891 100644
--- a/xorg-server/dix/swapreq.c
+++ b/xorg-server/dix/swapreq.c
@@ -283,7 +283,7 @@ SProcConvertSelection(ClientPtr client)
 int
 SProcSendEvent(ClientPtr client)
 {
-    xEvent eventT = { .u.u.type = 0 };
+    xEvent eventT;
     EventSwapPtr proc;
 
     REQUEST(xSendEventReq);
@@ -296,6 +296,7 @@ SProcSendEvent(ClientPtr client)
     proc = EventSwapVector[stuff->event.u.u.type & 0177];
     if (!proc || proc == NotImplemented)        /* no swapping proc; invalid event type? */
         return BadValue;
+    eventT.u.u.type = 0;
     (*proc) (&stuff->event, &eventT);
     stuff->event = eventT;
 
diff --git a/xorg-server/dix/window.c b/xorg-server/dix/window.c
index a5b28a630..46cdfdee5 100644
--- a/xorg-server/dix/window.c
+++ b/xorg-server/dix/window.c
@@ -827,16 +827,16 @@ CreateWindow(Window wid, WindowPtr pParent, int x, int y, unsigned w,
     }
 
     if (SubSend(pParent)) {
-        xEvent event = {
-            .u.createNotify.window = wid,
-            .u.createNotify.parent = pParent->drawable.id,
-            .u.createNotify.x = x,
-            .u.createNotify.y = y,
-            .u.createNotify.width = w,
-            .u.createNotify.height = h,
-            .u.createNotify.borderWidth = bw,
-            .u.createNotify.override = pWin->overrideRedirect
-        };
+        xEvent event; memset(&event, 0, sizeof(xEvent));
+        event.u.createNotify.window = wid;
+        event.u.createNotify.parent = pParent->drawable.id;
+        event.u.createNotify.x = x;
+        event.u.createNotify.y = y;
+        event.u.createNotify.width = w;
+        event.u.createNotify.height = h;
+        event.u.createNotify.borderWidth = bw;
+        event.u.createNotify.override = pWin->overrideRedirect;
+        
         event.u.u.type = CreateNotify;
         DeliverEvents(pParent, &event, 1, NullWindow);
     }
@@ -924,7 +924,9 @@ CrushTree(WindowPtr pWin)
         while (1) {
             pParent = pChild->parent;
             if (SubStrSend(pChild, pParent)) {
-                xEvent event = { .u.u.type = DestroyNotify };
+                xEvent event;
+                memset(&event, 0, sizeof(xEvent));
+                event.u.u.type = DestroyNotify;
                 event.u.destroyNotify.window = pChild->drawable.id;
                 DeliverEvents(pChild, &event, 1, NullWindow);
             }
@@ -966,7 +968,9 @@ DeleteWindow(pointer value, XID wid)
 
     pParent = pWin->parent;
     if (wid && pParent && SubStrSend(pWin, pParent)) {
-        xEvent event = { .u.u.type = DestroyNotify };
+        xEvent event;
+        memset(&event, 0, sizeof(xEvent));
+        event.u.u.type = DestroyNotify;
         event.u.destroyNotify.window = pWin->drawable.id;
         DeliverEvents(pWin, &event, 1, NullWindow);
     }
@@ -1351,12 +1355,12 @@ ChangeWindowAttributes(WindowPtr pWin, Mask vmask, XID *vlist, ClientPtr client)
                         CheckWindowOptionalNeed(pChild);
                 }
 
-                xE = (xEvent) {
-                    .u.colormap.window = pWin->drawable.id,
-                    .u.colormap.colormap = cmap,
-                    .u.colormap.new = xTrue,
-                    .u.colormap.state = IsMapInstalled(cmap, pWin)
-                };
+
+                xE.u.colormap.window = pWin->drawable.id;
+                xE.u.colormap.colormap = cmap;
+                xE.u.colormap.new = xTrue;
+                xE.u.colormap.state = IsMapInstalled(cmap, pWin);
+                
                 xE.u.u.type = ColormapNotify;
                 DeliverEvents(pWin, &xE, 1, NullWindow);
             }
@@ -1744,11 +1748,11 @@ ResizeChildrenWinSize(WindowPtr pWin, int dx, int dy, int dw, int dh)
             GravityTranslate(cwsx, cwsy, cwsx - dx, cwsy - dy, dw, dh,
                              pSib->winGravity, &cwsx, &cwsy);
             if (cwsx != pSib->origin.x || cwsy != pSib->origin.y) {
-                xEvent event = {
-                    .u.gravity.window = pSib->drawable.id,
-                    .u.gravity.x = cwsx - wBorderWidth(pSib),
-                    .u.gravity.y = cwsy - wBorderWidth(pSib)
-                };
+                xEvent event;
+                event.u.gravity.window = pSib->drawable.id;
+                event.u.gravity.x = cwsx - wBorderWidth(pSib);
+                event.u.gravity.y = cwsy - wBorderWidth(pSib);
+                
                 event.u.u.type = GravityNotify;
                 DeliverEvents(pSib, &event, 1, NullWindow);
                 pSib->origin.x = cwsx;
@@ -2173,17 +2177,17 @@ ConfigureWindow(WindowPtr pWin, Mask mask, XID *vlist, ClientPtr client)
         pSib = pWin->nextSib;
 
     if ((!pWin->overrideRedirect) && (RedirectSend(pParent))) {
-        xEvent event = {
-            .u.configureRequest.window = pWin->drawable.id,
-            .u.configureRequest.sibling = (mask & CWSibling) ? sibwid : None,
-            .u.configureRequest.x = x,
-            .u.configureRequest.y = y,
-            .u.configureRequest.width = w,
-            .u.configureRequest.height = h,
-            .u.configureRequest.borderWidth = bw,
-            .u.configureRequest.valueMask = mask,
-            .u.configureRequest.parent = pParent->drawable.id
-        };
+        xEvent event; memset(&event, 0, sizeof(xEvent));
+        event.u.configureRequest.window = pWin->drawable.id;
+        event.u.configureRequest.sibling = (mask & CWSibling) ? sibwid : None;
+        event.u.configureRequest.x = x;
+        event.u.configureRequest.y = y;
+        event.u.configureRequest.width = w;
+        event.u.configureRequest.height = h;
+        event.u.configureRequest.borderWidth = bw;
+        event.u.configureRequest.valueMask = mask;
+        event.u.configureRequest.parent = pParent->drawable.id;
+
         event.u.u.type = ConfigureRequest;
         event.u.u.detail = (mask & CWStackMode) ? smode : Above;
 #ifdef PANORAMIX
@@ -2202,11 +2206,11 @@ ConfigureWindow(WindowPtr pWin, Mask mask, XID *vlist, ClientPtr client)
 
         if (size_change &&
             ((pWin->eventMask | wOtherEventMasks(pWin)) & ResizeRedirectMask)) {
-            xEvent eventT = {
-                .u.resizeRequest.window = pWin->drawable.id,
-                .u.resizeRequest.width = w,
-                .u.resizeRequest.height = h
-            };
+            xEvent eventT; memset(&eventT, 0, sizeof(xEvent));
+            eventT.u.resizeRequest.window = pWin->drawable.id;
+            eventT.u.resizeRequest.width = w;
+            eventT.u.resizeRequest.height = h;
+            
             eventT.u.u.type = ResizeRequest;
             if (MaybeDeliverEventsToClient(pWin, &eventT, 1,
                                            ResizeRedirectMask, client) == 1) {
@@ -2258,16 +2262,16 @@ ConfigureWindow(WindowPtr pWin, Mask mask, XID *vlist, ClientPtr client)
     }
 
     if (SubStrSend(pWin, pParent)) {
-        xEvent event = {
-            .u.configureNotify.window = pWin->drawable.id,
-            .u.configureNotify.aboveSibling = pSib ? pSib->drawable.id : None,
-            .u.configureNotify.x = x,
-            .u.configureNotify.y = y,
-            .u.configureNotify.width = w,
-            .u.configureNotify.height = h,
-            .u.configureNotify.borderWidth = bw,
-            .u.configureNotify.override = pWin->overrideRedirect
-        };
+        xEvent event; memset(&event, 0, sizeof(xEvent));
+        event.u.configureNotify.window = pWin->drawable.id;
+        event.u.configureNotify.aboveSibling = pSib ? pSib->drawable.id : None;
+        event.u.configureNotify.x = x;
+        event.u.configureNotify.y = y;
+        event.u.configureNotify.width = w;
+        event.u.configureNotify.height = h;
+        event.u.configureNotify.borderWidth = bw;
+        event.u.configureNotify.override = pWin->overrideRedirect;
+        
         event.u.u.type = ConfigureNotify;
 #ifdef PANORAMIX
         if (!noPanoramiXExtension && (!pParent || !pParent->parent)) {
@@ -2347,13 +2351,12 @@ CirculateWindow(WindowPtr pParent, int direction, ClientPtr client)
             return Success;
     }
 
-    event = (xEvent) {
-        .u.circulate.window = pWin->drawable.id,
-        .u.circulate.parent = pParent->drawable.id,
-        .u.circulate.event = pParent->drawable.id,
-        .u.circulate.place = (direction == RaiseLowest) ?
-                              PlaceOnTop : PlaceOnBottom,
-    };
+
+    event.u.circulate.window = pWin->drawable.id;
+    event.u.circulate.parent = pParent->drawable.id;
+    event.u.circulate.event = pParent->drawable.id;
+    event.u.circulate.place = (direction == RaiseLowest) ?
+                              PlaceOnTop : PlaceOnBottom;
 
     if (RedirectSend(pParent)) {
         event.u.u.type = CirculateRequest;
@@ -2406,13 +2409,13 @@ ReparentWindow(WindowPtr pWin, WindowPtr pParent,
     if (WasMapped)
         UnmapWindow(pWin, FALSE);
 
-    event = (xEvent) {
-        .u.reparent.window = pWin->drawable.id,
-        .u.reparent.parent = pParent->drawable.id,
-        .u.reparent.x = x,
-        .u.reparent.y = y,
-        .u.reparent.override = pWin->overrideRedirect
-    };
+    memset(&event, 0, sizeof(xEvent));
+    event.u.reparent.window = pWin->drawable.id;
+    event.u.reparent.parent = pParent->drawable.id;
+    event.u.reparent.x = x;
+    event.u.reparent.y = y;
+    event.u.reparent.override = pWin->overrideRedirect;
+    
     event.u.u.type = ReparentNotify;
 #ifdef PANORAMIX
     if (!noPanoramiXExtension && !pParent->parent) {
@@ -2508,10 +2511,10 @@ RealizeTree(WindowPtr pWin)
 static Bool
 MaybeDeliverMapRequest(WindowPtr pWin, WindowPtr pParent, ClientPtr client)
 {
-    xEvent event = {
-        .u.mapRequest.window = pWin->drawable.id,
-        .u.mapRequest.parent = pParent->drawable.id
-    };
+    xEvent event; memset(&event, 0, sizeof(event));
+    event.u.mapRequest.window = pWin->drawable.id;
+    event.u.mapRequest.parent = pParent->drawable.id;
+
     event.u.u.type = MapRequest;
 
     return MaybeDeliverEventsToClient(pParent, &event, 1,
@@ -2522,10 +2525,10 @@ MaybeDeliverMapRequest(WindowPtr pWin, WindowPtr pParent, ClientPtr client)
 static void
 DeliverMapNotify(WindowPtr pWin)
 {
-    xEvent event = {
-        .u.mapNotify.window = pWin->drawable.id,
-        .u.mapNotify.override = pWin->overrideRedirect,
-    };
+    xEvent event; memset(&event, 0, sizeof(event));
+    event.u.mapNotify.window = pWin->drawable.id;
+    event.u.mapNotify.override = pWin->overrideRedirect;
+
     event.u.u.type = MapNotify;
     DeliverEvents(pWin, &event, 1, NullWindow);
 }
@@ -2715,10 +2718,10 @@ UnrealizeTree(WindowPtr pWin, Bool fromConfigure)
 static void
 DeliverUnmapNotify(WindowPtr pWin, Bool fromConfigure)
 {
-    xEvent event = {
-        .u.unmapNotify.window = pWin->drawable.id,
-        .u.unmapNotify.fromConfigure = fromConfigure
-    };
+    xEvent event; memset(&event, 0, sizeof(event));
+    event.u.unmapNotify.window = pWin->drawable.id;
+    event.u.unmapNotify.fromConfigure = fromConfigure;
+
     event.u.u.type = UnmapNotify;
     DeliverEvents(pWin, &event, 1, NullWindow);
 }
@@ -2984,10 +2987,10 @@ SendVisibilityNotify(WindowPtr pWin)
     }
 #endif
 
-    event = (xEvent) {
-        .u.visibility.window = pWin->drawable.id,
-        .u.visibility.state = visibility
-    };
+    memset(&event, 0, sizeof(xEvent));
+    event.u.visibility.window = pWin->drawable.id;
+    event.u.visibility.state = visibility;
+    
     event.u.u.type = VisibilityNotify;
     DeliverEvents(pWin, &event, 1, NullWindow);
 }
diff --git a/xorg-server/exa/exa_accel.c b/xorg-server/exa/exa_accel.c
index 0e948f414..5279b765c 100644
--- a/xorg-server/exa/exa_accel.c
+++ b/xorg-server/exa/exa_accel.c
@@ -236,7 +236,7 @@ exaPutImage(DrawablePtr pDrawable, GCPtr pGC, int depth, int x, int y,
                          bits);
 }
 
-static Bool inline
+static Bool __inline
 exaCopyNtoNTwoDir(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
                   GCPtr pGC, BoxPtr pbox, int nbox, int dx, int dy)
 {
diff --git a/xorg-server/exa/exa_migration_classic.c b/xorg-server/exa/exa_migration_classic.c
index e890f6754..65bbb17ce 100644
--- a/xorg-server/exa/exa_migration_classic.c
+++ b/xorg-server/exa/exa_migration_classic.c
@@ -379,8 +379,8 @@ exaDoMoveInPixmap(ExaMigrationPtr migrate)
 void
 exaMoveInPixmap_classic(PixmapPtr pPixmap)
 {
-    static ExaMigrationRec migrate = {.as_dst = FALSE,.as_src = TRUE,
-        .pReg = NULL
+    static ExaMigrationRec migrate =  {FALSE, TRUE,
+        NULL, NULL
     };
 
     migrate.pPix = pPixmap;
@@ -422,8 +422,8 @@ exaDoMoveOutPixmap(ExaMigrationPtr migrate)
 void
 exaMoveOutPixmap_classic(PixmapPtr pPixmap)
 {
-    static ExaMigrationRec migrate = {.as_dst = FALSE,.as_src = TRUE,
-        .pReg = NULL
+    static ExaMigrationRec migrate = { FALSE, TRUE,
+        NULL, NULL
     };
 
     migrate.pPix = pPixmap;
@@ -628,7 +628,7 @@ exaDoMigration_classic(ExaMigrationPtr pixmaps, int npixmaps, Bool can_accel)
             if (!exaPixmapIsDirty(pixmaps[i].pPix) &&
                 !exaAssertNotDirty(pixmaps[i].pPix))
                 ErrorF("%s: Pixmap %d dirty but not marked as such!\n",
-                       __func__, i);
+                       __FUNCTION__, i);
         }
     }
     /* If anything is pinned in system memory, we won't be able to
diff --git a/xorg-server/exa/exa_unaccel.c b/xorg-server/exa/exa_unaccel.c
index b0a0011cb..3bfbb4fe9 100644
--- a/xorg-server/exa/exa_unaccel.c
+++ b/xorg-server/exa/exa_unaccel.c
@@ -730,7 +730,7 @@ exaGetPixmapFirstPixel(PixmapPtr pPixmap)
         return pixel;
     }
     default:
-        FatalError("%s called for invalid bpp %d\n", __func__,
+        FatalError("%s called for invalid bpp %d\n", __FUNCTION__,
                    pPixmap->drawable.bitsPerPixel);
     }
 }
diff --git a/xorg-server/exa/makefile b/xorg-server/exa/makefile
new file mode 100644
index 000000000..5ad11a1ed
--- /dev/null
+++ b/xorg-server/exa/makefile
@@ -0,0 +1,14 @@
+LIBRARY=libexa

+

+CSRCS = \

+	exa.c \

+	exa_classic.c \

+	exa_migration_classic.c \

+	exa_driver.c \

+	exa_mixed.c \

+	exa_migration_mixed.c \

+	exa_accel.c \

+	exa_glyphs.c \

+	exa_offscreen.c \

+	exa_render.c \

+	exa_unaccel.c

diff --git a/xorg-server/fb/fb.h b/xorg-server/fb/fb.h
index b869d122c..248e9d86e 100644
--- a/xorg-server/fb/fb.h
+++ b/xorg-server/fb/fb.h
@@ -1133,29 +1133,6 @@ fbCopyNtoN(DrawablePtr pSrcDrawable,
            int dy,
            Bool reverse, Bool upsidedown, Pixel bitplane, void *closure);
 
-/* Compatibility wrapper, to be removed at next ABI change. */
-extern _X_EXPORT void
-
-fbCopyRegion(DrawablePtr pSrcDrawable,
-             DrawablePtr pDstDrawable,
-             GCPtr pGC,
-             RegionPtr pDstRegion,
-             int dx,
-             int dy, fbCopyProc copyProc, Pixel bitPlane, void *closure);
-
-/* Compatibility wrapper, to be removed at next ABI change. */
-extern _X_EXPORT RegionPtr
-
-fbDoCopy(DrawablePtr pSrcDrawable,
-         DrawablePtr pDstDrawable,
-         GCPtr pGC,
-         int xIn,
-         int yIn,
-         int widthSrc,
-         int heightSrc,
-         int xOut,
-         int yOut, fbCopyProc copyProc, Pixel bitplane, void *closure);
-
 extern _X_EXPORT void
 
 fbCopy1toN(DrawablePtr pSrcDrawable,
diff --git a/xorg-server/fb/fbcopy.c b/xorg-server/fb/fbcopy.c
index e9c252a5e..541ef713b 100644
--- a/xorg-server/fb/fbcopy.c
+++ b/xorg-server/fb/fbcopy.c
@@ -28,33 +28,6 @@
 
 #include "fb.h"
 
-/* Compatibility wrapper, to be removed at next ABI change. */
-void
-fbCopyRegion(DrawablePtr pSrcDrawable,
-             DrawablePtr pDstDrawable,
-             GCPtr pGC,
-             RegionPtr pDstRegion,
-             int dx, int dy, fbCopyProc copyProc, Pixel bitPlane, void *closure)
-{
-    miCopyRegion(pSrcDrawable, pDstDrawable, pGC, pDstRegion, dx, dy, copyProc,
-                 bitPlane, closure);
-}
-
-/* Compatibility wrapper, to be removed at next ABI change. */
-RegionPtr
-fbDoCopy(DrawablePtr pSrcDrawable,
-         DrawablePtr pDstDrawable,
-         GCPtr pGC,
-         int xIn,
-         int yIn,
-         int widthSrc,
-         int heightSrc,
-         int xOut, int yOut, fbCopyProc copyProc, Pixel bitPlane, void *closure)
-{
-    return miDoCopy(pSrcDrawable, pDstDrawable, pGC, xIn, yIn, widthSrc,
-                    heightSrc, xOut, yOut, copyProc, bitPlane, closure);
-}
-
 void
 fbCopyNtoN(DrawablePtr pSrcDrawable,
            DrawablePtr pDstDrawable,
diff --git a/xorg-server/fb/fbpixmap.c b/xorg-server/fb/fbpixmap.c
index fbcdca99c..ace078a00 100644
--- a/xorg-server/fb/fbpixmap.c
+++ b/xorg-server/fb/fbpixmap.c
@@ -300,24 +300,14 @@ fbPixmapToRegion(PixmapPtr pPix)
 
 #ifdef FB_DEBUG
 
-#ifndef WIN32
 #include <stdio.h>
-#else
-#include <dbg.h>
-#endif
 
 static Bool
 fbValidateBits(FbStip * bits, int stride, FbStip data)
 {
     while (stride--) {
         if (*bits != data) {
-#ifdef WIN32
-            NCD_DEBUG((DEBUG_FAILURE,
-                       "fdValidateBits failed at 0x%x (is 0x%x want 0x%x)",
-                       bits, *bits, data));
-#else
-            fprintf(stderr, "fbValidateBits failed\n");
-#endif
+            fprintf (stderr, "fbValidateBits failed at 0x%x (is 0x%x want 0x%x)\n",bits, *bits, data);
             return FALSE;
         }
         bits++;
diff --git a/xorg-server/fb/makefile b/xorg-server/fb/makefile
new file mode 100644
index 000000000..717c07332
--- /dev/null
+++ b/xorg-server/fb/makefile
@@ -0,0 +1,37 @@
+

+LIBRARY=libfb

+

+CCFLAGS:=$(CCFLAGS:-RTCc=)

+

+

+CSRCS = 	\

+	fb24_32.c	\

+	fballpriv.c	\

+	fbarc.c		\

+	fbbits.c	\

+	fbblt.c		\

+	fbbltone.c	\

+	fbcopy.c	\

+	fbfill.c	\

+	fbfillrect.c	\

+	fbfillsp.c	\

+	fbgc.c		\

+	fbgetsp.c	\

+	fbglyph.c	\

+	fbimage.c	\

+	fbline.c	\

+	fboverlay.c	\

+	fbpict.c	\

+	fbpixmap.c	\

+	fbpoint.c	\

+	fbpush.c	\

+	fbscreen.c	\

+	fbseg.c		\

+	fbsetsp.c	\

+	fbsolid.c	\

+	fbstipple.c	\

+	fbtile.c	\

+	fbtrap.c	\

+	fbutil.c	\

+	fbwindow.c \

+	fbcmap_mi.c

diff --git a/xorg-server/fb/wfbrename.h b/xorg-server/fb/wfbrename.h
index 588440c2b..24db14293 100644
--- a/xorg-server/fb/wfbrename.h
+++ b/xorg-server/fb/wfbrename.h
@@ -44,7 +44,6 @@
 #define fbCopyNto1 wfbCopyNto1
 #define fbCopyNtoN wfbCopyNtoN
 #define fbCopyPlane wfbCopyPlane
-#define fbCopyRegion wfbCopyRegion
 #define fbCopyWindow wfbCopyWindow
 #define fbCopyWindowProc wfbCopyWindowProc
 #define fbCreateDefColormap wfbCreateDefColormap
@@ -54,7 +53,6 @@
 #define fbCreateWindow wfbCreateWindow
 #define fbDestroyPixmap wfbDestroyPixmap
 #define fbDestroyWindow wfbDestroyWindow
-#define fbDoCopy wfbDoCopy
 #define fbDots wfbDots
 #define fbDots16 wfbDots16
 #define fbDots24 wfbDots24
diff --git a/xorg-server/fonts.src/100dpi/makefile b/xorg-server/fonts.src/100dpi/makefile
new file mode 100644
index 000000000..7112c3275
--- /dev/null
+++ b/xorg-server/fonts.src/100dpi/makefile
@@ -0,0 +1,357 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+INC_BDF_RULES=1
+
+UTIL_DIR = ..\font-util
+
+load_makefile $(UTIL_DIR)\makefile MAKESERVER=0 DEBUG=$(DEBUG)
+
+UCS2ANY = $(UTIL_DIR)\$(OBJDIR)\ucs2any.exe
+
+   # The following rule is to avoid parallel build problems
+.PHONY: buildtoolsfirst
+buildtoolsfirst: $(BDFTOPCF) $(UCS2ANY)
+
+all: buildtoolsfirst
+
+DESTDIR=$(MHMAKECONF)\xorg-server\fonts\100dpi
+
+BDF2UCS_FONT_FILES = \
+	lutBS08 \
+	lutBS10 \
+	lutBS12 \
+	lutBS14 \
+	lutBS18 \
+	lutBS19 \
+	lutBS24 \
+	lutRS08 \
+	lutRS10 \
+	lutRS12 \
+	lutRS14 \
+	lutRS18 \
+	lutRS19 \
+	lutRS24 \
+	lubB08 \
+	lubB10 \
+	lubB12 \
+	lubB14 \
+	lubB18 \
+	lubB19 \
+	lubB24 \
+	lubBI08 \
+	lubBI10 \
+	lubBI12 \
+	lubBI14 \
+	lubBI18 \
+	lubBI19 \
+	lubBI24 \
+	lubI08 \
+	lubI10 \
+	lubI12 \
+	lubI14 \
+	lubI18 \
+	lubI19 \
+	lubI24 \
+	luBIS08 \
+	luBIS10 \
+	luBIS12 \
+	luBIS14 \
+	luBIS18 \
+	luBIS19 \
+	luBIS24 \
+	lubR08 \
+	lubR10 \
+	lubR12 \
+	lubR14 \
+	lubR18 \
+	lubR19 \
+	lubR24 \
+	luBS08 \
+	luBS10 \
+	luBS12 \
+	luBS14 \
+	luBS18 \
+	luBS19 \
+	luBS24 \
+	luIS08 \
+	luIS10 \
+	luIS12 \
+	luIS14 \
+	luIS18 \
+	luIS19 \
+	luIS24 \
+	luRS08 \
+	luRS10 \
+	luRS12 \
+	luRS14 \
+	luRS18 \
+	luRS19 \
+	luRS24 \
+	UTB___10 \
+	UTB___12 \
+	UTB___14 \
+	UTB___18 \
+	UTB___24 \
+	UTBI__10 \
+	UTBI__12 \
+	UTBI__14 \
+	UTBI__18 \
+	UTBI__24 \
+	UTI___10 \
+	UTI___12 \
+	UTI___14 \
+	UTI___18 \
+	UTI___24 \
+	UTRG__10 \
+	UTRG__12 \
+	UTRG__14 \
+	UTRG__18 \
+	UTRG__24 \
+	courB08 \
+	courB10 \
+	courB12 \
+	courB14 \
+	courB18 \
+	courB24 \
+	courBO08 \
+	courBO10 \
+	courBO12 \
+	courBO14 \
+	courBO18 \
+	courBO24 \
+	courO08 \
+	courO10 \
+	courO12 \
+	courO14 \
+	courO18 \
+	courO24 \
+	courR08 \
+	courR10 \
+	courR12 \
+	courR14 \
+	courR18 \
+	courR24 \
+	helvB08 \
+	helvB10 \
+	helvB12 \
+	helvB14 \
+	helvB18 \
+	helvB24 \
+	helvBO08 \
+	helvBO10 \
+	helvBO12 \
+	helvBO14 \
+	helvBO18 \
+	helvBO24 \
+	helvO08 \
+	helvO10 \
+	helvO12 \
+	helvO14 \
+	helvO18 \
+	helvO24 \
+	helvR08 \
+	helvR10 \
+	helvR12 \
+	helvR14 \
+	helvR18 \
+	helvR24 \
+	ncenB08 \
+	ncenB10 \
+	ncenB12 \
+	ncenB14 \
+	ncenB18 \
+	ncenB24 \
+	ncenBI08 \
+	ncenBI10 \
+	ncenBI12 \
+	ncenBI14 \
+	ncenBI18 \
+	ncenBI24 \
+	ncenI08 \
+	ncenI10 \
+	ncenI12 \
+	ncenI14 \
+	ncenI18 \
+	ncenI24 \
+	ncenR08 \
+	ncenR10 \
+	ncenR12 \
+	ncenR14 \
+	ncenR18 \
+	ncenR24 \
+	timB08 \
+	timB10 \
+	timB12 \
+	timB14 \
+	timB18 \
+	timB24 \
+	timBI08 \
+	timBI10 \
+	timBI12 \
+	timBI14 \
+	timBI18 \
+	timBI24 \
+	timI08 \
+	timI10 \
+	timI12 \
+	timI14 \
+	timI18 \
+	timI24 \
+	timR08 \
+	timR10 \
+	timR12 \
+	timR14 \
+	timR18 \
+	timR24
+EXTRA_FONT_FILES = \
+	symb08 \
+	symb10 \
+	symb12 \
+	symb14 \
+	symb18 \
+	symb24 \
+	charB08 \
+	charB10 \
+	charB12 \
+	charB14 \
+	charB18 \
+	charB24 \
+	charBI08 \
+	charBI10 \
+	charBI12 \
+	charBI14 \
+	charBI18 \
+	charBI24 \
+	charI08 \
+	charI10 \
+	charI12 \
+	charI14 \
+	charI18 \
+	charI24 \
+	charR08 \
+	charR10 \
+	charR12 \
+	charR14 \
+	charR18 \
+	charR24 \
+	tech14 \
+	techB14 \
+	term14 \
+	termB14
+FONT_FILES = $(BDF2UCS_FONT_FILES) $(EXTRA_FONT_FILES)
+
+BDF_FILES = $(FONT_FILES:%=%.bdf)
+PCF_FILES = $(FONT_FILES:%=$(DESTDIR)\%.pcf.gz)
+
+ISO8859_1_PCF_FILES = $(BDF2UCS_FONT_FILES:%=$(DESTDIR)\%-ISO8859-1.pcf.gz)
+
+ISO8859_2_PCF_FILES = $(BDF2UCS_FONT_FILES:%=$(DESTDIR)\%-ISO8859-2.pcf.gz)
+
+ISO8859_3_PCF_FILES = $(BDF2UCS_FONT_FILES:%=$(DESTDIR)\%-ISO8859-3.pcf.gz)
+
+ISO8859_4_PCF_FILES = $(BDF2UCS_FONT_FILES:%=$(DESTDIR)\%-ISO8859-4.pcf.gz)
+
+ISO8859_9_PCF_FILES = $(BDF2UCS_FONT_FILES:%=$(DESTDIR)\%-ISO8859-9.pcf.gz)
+
+ISO8859_10_PCF_FILES = $(BDF2UCS_FONT_FILES:%=$(DESTDIR)\%-ISO8859-10.pcf.gz)
+
+ISO8859_13_PCF_FILES = $(BDF2UCS_FONT_FILES:%=$(DESTDIR)\%-ISO8859-13.pcf.gz)
+
+ISO8859_14_PCF_FILES = $(BDF2UCS_FONT_FILES:%=$(DESTDIR)\%-ISO8859-14.pcf.gz)
+
+ISO8859_15_PCF_FILES = $(BDF2UCS_FONT_FILES:%=$(DESTDIR)\%-ISO8859-15.pcf.gz)
+
+$(DESTDIR)\%-ISO8859-1.pcf.gz: %.bdf
+	@del -e $(<:%.bdf=%-ISO8859-1.bdf)
+	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-1 ISO8859-1
+	@del -e $@
+	$(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-1.bdf) | gzip > $@
+	@del $(<:%.bdf=%-ISO8859-1.bdf)
+
+$(DESTDIR)\%-ISO8859-2.pcf.gz: %.bdf
+	@del -e $(<:%.bdf=%-ISO8859-2.bdf)
+	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-2 ISO8859-2
+	@del -e $@
+	$(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-2.bdf) | gzip > $@
+	@del $(<:%.bdf=%-ISO8859-2.bdf)
+
+$(DESTDIR)\%-ISO8859-3.pcf.gz: %.bdf
+	@del -e $(<:%.bdf=%-ISO8859-3.bdf)
+	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-3 ISO8859-3
+	@del -e $@
+	$(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-3.bdf) | gzip > $@
+	@del $(<:%.bdf=%-ISO8859-3.bdf)
+
+$(DESTDIR)\%-ISO8859-4.pcf.gz: %.bdf
+	@del -e $(<:%.bdf=%-ISO8859-4.bdf)
+	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-4 ISO8859-4
+	@del -e $@
+	$(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-4.bdf) | gzip > $@
+	@del $(<:%.bdf=%-ISO8859-4.bdf)
+
+$(DESTDIR)\%-ISO8859-9.pcf.gz: %.bdf
+	@del -e $(<:%.bdf=%-ISO8859-9.bdf)
+	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-9 ISO8859-9
+	@del -e $@
+	$(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-9.bdf) | gzip > $@
+	@del $(<:%.bdf=%-ISO8859-9.bdf)
+
+$(DESTDIR)\%-ISO8859-10.pcf.gz: %.bdf
+	@del -e $(<:%.bdf=%-ISO8859-10.bdf)
+	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-10 ISO8859-10
+	@del -e $@
+	$(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-10.bdf) | gzip > $@
+	@del $(<:%.bdf=%-ISO8859-10.bdf)
+
+$(DESTDIR)\%-ISO8859-13.pcf.gz: %.bdf
+	@del -e $(<:%.bdf=%-ISO8859-13.bdf)
+	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-13 ISO8859-13
+	@del -e $@
+	$(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-13.bdf) | gzip > $@
+	@del $(<:%.bdf=%-ISO8859-13.bdf)
+
+$(DESTDIR)\%-ISO8859-14.pcf.gz: %.bdf
+	@del -e $(<:%.bdf=%-ISO8859-14.bdf)
+	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-14 ISO8859-14
+	@del -e $@
+	$(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-14.bdf) | gzip > $@
+	@del $(<:%.bdf=%-ISO8859-14.bdf)
+
+$(DESTDIR)\%-ISO8859-15.pcf.gz: %.bdf
+	@del -e $(<:%.bdf=%-ISO8859-15.bdf)
+	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-15 ISO8859-15
+	@del -e $@
+	$(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-15.bdf) | gzip > $@
+	@del $(<:%.bdf=%-ISO8859-15.bdf)
+
+font_DATA = \
+	$(PCF_FILES) \
+	$(ISO8859_1_PCF_FILES) \
+	$(ISO8859_2_PCF_FILES) \
+	$(ISO8859_3_PCF_FILES) \
+	$(ISO8859_4_PCF_FILES) \
+	$(ISO8859_9_PCF_FILES) \
+	$(ISO8859_10_PCF_FILES) \
+	$(ISO8859_13_PCF_FILES) \
+	$(ISO8859_14_PCF_FILES) \
+	$(ISO8859_15_PCF_FILES)
+
+all: $(DESTDIR) $(DESTDIR)\fonts.dir $(DESTDIR)\fonts.alias
+
+MKFONTSCALE=$(MHMAKECONF)\mkfontscale\$(OBJDIR)\mkfontscale.exe
+
+load_makefile $(MHMAKECONF)\mkfontscale\makefile MAKESERVER=0 DEBUG=$(DEBUG)
+
+$(DESTDIR)\fonts.scale: $(font_DATA) $(MKFONTSCALE)
+	del -e $@
+	cd $(DESTDIR) & $(MKFONTSCALE) .
+
+$(DESTDIR)\fonts.dir: $(DESTDIR)\fonts.scale $(font_DATA) $(MKFONTSCALE)
+	del -e $@
+	cd $(DESTDIR) & $(MKFONTSCALE) -b -s -l .
+
+$(DESTDIR)\fonts.alias: fonts.alias
+	copy $< $@
+
diff --git a/xorg-server/fonts.src/75dpi/makefile b/xorg-server/fonts.src/75dpi/makefile
new file mode 100644
index 000000000..2467889d9
--- /dev/null
+++ b/xorg-server/fonts.src/75dpi/makefile
@@ -0,0 +1,357 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+INC_BDF_RULES=1
+
+UTIL_DIR = ..\font-util
+
+load_makefile $(UTIL_DIR)\makefile MAKESERVER=0 DEBUG=$(DEBUG)
+
+UCS2ANY = $(UTIL_DIR)\$(OBJDIR)\ucs2any.exe
+
+   # The following rule is to avoid parallel build problems
+.PHONY: buildtoolsfirst
+buildtoolsfirst: $(BDFTOPCF) $(UCS2ANY)
+
+all: buildtoolsfirst
+
+DESTDIR=$(MHMAKECONF)\xorg-server\fonts\75dpi
+
+BDF2UCS_FONT_FILES = \
+	lutBS08 \
+	lutBS10 \
+	lutBS12 \
+	lutBS14 \
+	lutBS18 \
+	lutBS19 \
+	lutBS24 \
+	lutRS08 \
+	lutRS10 \
+	lutRS12 \
+	lutRS14 \
+	lutRS18 \
+	lutRS19 \
+	lutRS24 \
+	UTB___10 \
+	UTB___12 \
+	UTB___14 \
+	UTB___18 \
+	UTB___24 \
+	UTBI__10 \
+	UTBI__12 \
+	UTBI__14 \
+	UTBI__18 \
+	UTBI__24 \
+	UTI___10 \
+	UTI___12 \
+	UTI___14 \
+	UTI___18 \
+	UTI___24 \
+	UTRG__10 \
+	UTRG__12 \
+	UTRG__14 \
+	UTRG__18 \
+	UTRG__24 \
+	courB08 \
+	courB10 \
+	courB12 \
+	courB14 \
+	courB18 \
+	courB24 \
+	courBO08 \
+	courBO10 \
+	courBO12 \
+	courBO14 \
+	courBO18 \
+	courBO24 \
+	courO08 \
+	courO10 \
+	courO12 \
+	courO14 \
+	courO18 \
+	courO24 \
+	courR08 \
+	courR10 \
+	courR12 \
+	courR14 \
+	courR18 \
+	courR24 \
+	helvB08 \
+	helvB10 \
+	helvB12 \
+	helvB14 \
+	helvB18 \
+	helvB24 \
+	helvBO08 \
+	helvBO10 \
+	helvBO12 \
+	helvBO14 \
+	helvBO18 \
+	helvBO24 \
+	helvO08 \
+	helvO10 \
+	helvO12 \
+	helvO14 \
+	helvO18 \
+	helvO24 \
+	helvR08 \
+	helvR10 \
+	helvR12 \
+	helvR14 \
+	helvR18 \
+	helvR24 \
+	ncenB08 \
+	ncenB10 \
+	ncenB12 \
+	ncenB14 \
+	ncenB18 \
+	ncenB24 \
+	ncenBI08 \
+	ncenBI10 \
+	ncenBI12 \
+	ncenBI14 \
+	ncenBI18 \
+	ncenBI24 \
+	ncenI08 \
+	ncenI10 \
+	ncenI12 \
+	ncenI14 \
+	ncenI18 \
+	ncenI24 \
+	ncenR08 \
+	ncenR10 \
+	ncenR12 \
+	ncenR14 \
+	ncenR18 \
+	ncenR24 \
+	timB08 \
+	timB10 \
+	timB12 \
+	timB14 \
+	timB18 \
+	timB24 \
+	timBI08 \
+	timBI10 \
+	timBI12 \
+	timBI14 \
+	timBI18 \
+	timBI24 \
+	timI08 \
+	timI10 \
+	timI12 \
+	timI14 \
+	timI18 \
+	timI24 \
+	timR08 \
+	timR10 \
+	timR12 \
+	timR14 \
+	timR18 \
+	timR24 \
+	lubB08 \
+	lubB10 \
+	lubB12 \
+	lubB14 \
+	lubB18 \
+	lubB19 \
+	lubB24 \
+	lubBI08 \
+	lubBI10 \
+	lubBI12 \
+	lubBI14 \
+	lubBI18 \
+	lubBI19 \
+	lubBI24 \
+	lubI08 \
+	lubI10 \
+	lubI12 \
+	lubI14 \
+	lubI18 \
+	lubI19 \
+	lubI24 \
+	luBIS08 \
+	luBIS10 \
+	luBIS12 \
+	luBIS14 \
+	luBIS18 \
+	luBIS19 \
+	luBIS24 \
+	lubR08 \
+	lubR10 \
+	lubR12 \
+	lubR14 \
+	lubR18 \
+	lubR19 \
+	lubR24 \
+	luBS08 \
+	luBS10 \
+	luBS12 \
+	luBS14 \
+	luBS18 \
+	luBS19 \
+	luBS24 \
+	luIS08 \
+	luIS10 \
+	luIS12 \
+	luIS14 \
+	luIS18 \
+	luIS19 \
+	luIS24 \
+	luRS08 \
+	luRS10 \
+	luRS12 \
+	luRS14 \
+	luRS18 \
+	luRS19 \
+	luRS24
+EXTRA_FONT_FILES = \
+	charB08 \
+	charB10 \
+	charB12 \
+	charB14 \
+	charB18 \
+	charB24 \
+	charBI08 \
+	charBI10 \
+	charBI12 \
+	charBI14 \
+	charBI18 \
+	charBI24 \
+	charI08 \
+	charI10 \
+	charI12 \
+	charI14 \
+	charI18 \
+	charI24 \
+	charR08 \
+	charR10 \
+	charR12 \
+	charR14 \
+	charR18 \
+	charR24 \
+	tech14 \
+	techB14 \
+	term14 \
+	termB14 \
+	symb08 \
+	symb10 \
+	symb12 \
+	symb14 \
+	symb18 \
+	symb24
+FONT_FILES = $(BDF2UCS_FONT_FILES) $(EXTRA_FONT_FILES)
+
+BDF_FILES = $(FONT_FILES:%=%.bdf)
+PCF_FILES = $(FONT_FILES:%=$(DESTDIR)\%.pcf.gz)
+
+ISO8859_1_PCF_FILES = $(BDF2UCS_FONT_FILES:%=$(DESTDIR)\%-ISO8859-1.pcf.gz)
+
+ISO8859_2_PCF_FILES = $(BDF2UCS_FONT_FILES:%=$(DESTDIR)\%-ISO8859-2.pcf.gz)
+
+ISO8859_3_PCF_FILES = $(BDF2UCS_FONT_FILES:%=$(DESTDIR)\%-ISO8859-3.pcf.gz)
+
+ISO8859_4_PCF_FILES = $(BDF2UCS_FONT_FILES:%=$(DESTDIR)\%-ISO8859-4.pcf.gz)
+
+ISO8859_9_PCF_FILES = $(BDF2UCS_FONT_FILES:%=$(DESTDIR)\%-ISO8859-9.pcf.gz)
+
+ISO8859_10_PCF_FILES = $(BDF2UCS_FONT_FILES:%=$(DESTDIR)\%-ISO8859-10.pcf.gz)
+
+ISO8859_13_PCF_FILES = $(BDF2UCS_FONT_FILES:%=$(DESTDIR)\%-ISO8859-13.pcf.gz)
+
+ISO8859_14_PCF_FILES = $(BDF2UCS_FONT_FILES:%=$(DESTDIR)\%-ISO8859-14.pcf.gz)
+
+ISO8859_15_PCF_FILES = $(BDF2UCS_FONT_FILES:%=$(DESTDIR)\%-ISO8859-15.pcf.gz)
+
+$(DESTDIR)\%-ISO8859-1.pcf.gz: %.bdf
+	@del -e $(<:%.bdf=%-ISO8859-1.bdf)
+	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-1 ISO8859-1
+	@del -e $@
+	$(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-1.bdf) | gzip > $@
+	@del $(<:%.bdf=%-ISO8859-1.bdf)
+
+$(DESTDIR)\%-ISO8859-2.pcf.gz: %.bdf
+	@del -e $(<:%.bdf=%-ISO8859-2.bdf)
+	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-2 ISO8859-2
+	@del -e $@
+	$(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-2.bdf) | gzip > $@
+	@del $(<:%.bdf=%-ISO8859-2.bdf)
+
+$(DESTDIR)\%-ISO8859-3.pcf.gz: %.bdf
+	@del -e $(<:%.bdf=%-ISO8859-3.bdf)
+	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-3 ISO8859-3
+	@del -e $@
+	$(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-3.bdf) | gzip > $@
+	@del $(<:%.bdf=%-ISO8859-3.bdf)
+
+$(DESTDIR)\%-ISO8859-4.pcf.gz: %.bdf
+	@del -e $(<:%.bdf=%-ISO8859-4.bdf)
+	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-4 ISO8859-4
+	@del -e $@
+	$(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-4.bdf) | gzip > $@
+	@del $(<:%.bdf=%-ISO8859-4.bdf)
+
+$(DESTDIR)\%-ISO8859-9.pcf.gz: %.bdf
+	@del -e $(<:%.bdf=%-ISO8859-9.bdf)
+	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-9 ISO8859-9
+	@del -e $@
+	$(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-9.bdf) | gzip > $@
+	@del $(<:%.bdf=%-ISO8859-9.bdf)
+
+$(DESTDIR)\%-ISO8859-10.pcf.gz: %.bdf
+	@del -e $(<:%.bdf=%-ISO8859-10.bdf)
+	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-10 ISO8859-10
+	@del -e $@
+	$(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-10.bdf) | gzip > $@
+	@del $(<:%.bdf=%-ISO8859-10.bdf)
+
+$(DESTDIR)\%-ISO8859-13.pcf.gz: %.bdf
+	@del -e $(<:%.bdf=%-ISO8859-13.bdf)
+	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-13 ISO8859-13
+	@del -e $@
+	$(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-13.bdf) | gzip > $@
+	@del $(<:%.bdf=%-ISO8859-13.bdf)
+
+$(DESTDIR)\%-ISO8859-14.pcf.gz: %.bdf
+	@del -e $(<:%.bdf=%-ISO8859-14.bdf)
+	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-14 ISO8859-14
+	@del -e $@
+	$(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-14.bdf) | gzip > $@
+	@del $(<:%.bdf=%-ISO8859-14.bdf)
+
+$(DESTDIR)\%-ISO8859-15.pcf.gz: %.bdf
+	@del -e $(<:%.bdf=%-ISO8859-15.bdf)
+	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-15 ISO8859-15
+	@del -e $@
+	$(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-15.bdf) | gzip > $@
+	@del $(<:%.bdf=%-ISO8859-15.bdf)
+
+font_DATA = \
+	$(PCF_FILES) \
+	$(ISO8859_1_PCF_FILES) \
+	$(ISO8859_2_PCF_FILES) \
+	$(ISO8859_3_PCF_FILES) \
+	$(ISO8859_4_PCF_FILES) \
+	$(ISO8859_9_PCF_FILES) \
+	$(ISO8859_10_PCF_FILES) \
+	$(ISO8859_13_PCF_FILES) \
+	$(ISO8859_14_PCF_FILES) \
+	$(ISO8859_15_PCF_FILES)
+
+all: $(DESTDIR) $(DESTDIR)\fonts.dir $(DESTDIR)\fonts.alias
+
+MKFONTSCALE=$(MHMAKECONF)\mkfontscale\$(OBJDIR)\mkfontscale.exe
+
+load_makefile $(MHMAKECONF)\mkfontscale\makefile MAKESERVER=0 DEBUG=$(DEBUG)
+
+$(DESTDIR)\fonts.scale: $(font_DATA) $(MKFONTSCALE)
+	del -e $@
+	cd $(DESTDIR) & $(MKFONTSCALE) .
+
+$(DESTDIR)\fonts.dir: $(DESTDIR)\fonts.scale $(font_DATA) $(MKFONTSCALE)
+	del -e $@
+	cd $(DESTDIR) & $(MKFONTSCALE) -b -s -l .
+
+$(DESTDIR)\fonts.alias: fonts.alias
+	copy $< $@
+
diff --git a/xorg-server/fonts.src/OTF/makefile b/xorg-server/fonts.src/OTF/makefile
new file mode 100644
index 000000000..7187a55c7
--- /dev/null
+++ b/xorg-server/fonts.src/OTF/makefile
@@ -0,0 +1,53 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+INC_BDF_RULES=1
+
+DESTDIR=$(MHMAKECONF)\xorg-server\fonts\OTF
+
+FONT_FILES = \
+	SyrCOMAdiabene.otf \
+	SyrCOMAntioch.otf \
+	SyrCOMBatnanBold.otf \
+	SyrCOMBatnan.otf \
+	SyrCOMCtesiphon.otf \
+	SyrCOMEdessa.otf \
+	SyrCOMJerusalemBold.otf \
+	SyrCOMJerusalemItalic.otf \
+	SyrCOMJerusalem.otf \
+	SyrCOMJerusalemOutline.otf \
+	SyrCOMKharput.otf \
+	SyrCOMMalankara.otf \
+	SyrCOMMardinBold.otf \
+	SyrCOMMardin.otf \
+	SyrCOMMidyat.otf \
+	SyrCOMNisibin.otf \
+	SyrCOMNisibinOutline.otf \
+	SyrCOMQenNeshrin.otf \
+	SyrCOMTalada.otf \
+	SyrCOMTurAbdin.otf \
+	SyrCOMUrhoyBold.otf \
+	SyrCOMUrhoy.otf \
+	GohaTibebZemen.otf
+
+fontdir = .
+font_DATA = $(FONT_FILES:%=$(DESTDIR)\%)
+
+all: $(DESTDIR) $(DESTDIR)\fonts.dir
+
+MKFONTSCALE=$(MHMAKECONF)\mkfontscale\$(OBJDIR)\mkfontscale.exe
+
+load_makefile $(MHMAKECONF)\mkfontscale\makefile MAKESERVER=0 DEBUG=$(DEBUG)
+
+$(DESTDIR)\fonts.scale: $(font_DATA) $(MKFONTSCALE)
+	del -e $@
+	cd $(DESTDIR) & $(MKFONTSCALE) .
+
+$(DESTDIR)\fonts.dir: $(DESTDIR)\fonts.scale $(font_DATA) $(MKFONTSCALE)
+	del -e $@
+	cd $(DESTDIR) & $(MKFONTSCALE) -b -s -l .
+#	$(FCCACHE) $(DESTDIR)
+
+$(DESTDIR)\%.otf: %.otf
+	copy $< $@
diff --git a/xorg-server/fonts.src/Speedo/makefile b/xorg-server/fonts.src/Speedo/makefile
new file mode 100644
index 000000000..e1cf21315
--- /dev/null
+++ b/xorg-server/fonts.src/Speedo/makefile
@@ -0,0 +1,39 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+INC_BDF_RULES=1
+
+DESTDIR=$(MHMAKECONF)\xorg-server\fonts\Speedo
+
+FONT_FILES = \
+	font0419.spd \
+	font0582.spd \
+	font0583.spd \
+	font0611.spd \
+	font0648.spd \
+	font0649.spd \
+	font0709.spd \
+	font0710.spd \
+	fonts.scale
+
+fontdir = .
+font_DATA = $(FONT_FILES:%=$(DESTDIR)\%)
+
+$(DESTDIR)\fonts.dir: $(DESTDIR)\fonts.scale
+
+all: $(DESTDIR) $(DESTDIR)\fonts.dir
+
+MKFONTSCALE=$(MHMAKECONF)\mkfontscale\$(OBJDIR)\mkfontscale.exe
+
+load_makefile $(MHMAKECONF)\mkfontscale\makefile MAKESERVER=0 DEBUG=$(DEBUG)
+
+$(DESTDIR)\fonts.dir: $(font_DATA) $(MKFONTSCALE)
+	del -e $@
+	cd $(DESTDIR) & $(MKFONTSCALE) -b -s -l .
+
+$(DESTDIR)\%.spd: %.spd
+	copy $< $@
+
+$(DESTDIR)\%.scale: %.scale
+	copy $< $@
diff --git a/xorg-server/fonts.src/TTF/makefile b/xorg-server/fonts.src/TTF/makefile
new file mode 100644
index 000000000..c5518f230
--- /dev/null
+++ b/xorg-server/fonts.src/TTF/makefile
@@ -0,0 +1,54 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+INC_BDF_RULES=1
+
+DESTDIR=$(MHMAKECONF)\xorg-server\fonts\TTF
+
+
+FONT_FILES = \
+	luximbi.ttf \
+	luximb.ttf \
+	luximri.ttf \
+	luximr.ttf \
+	luxirbi.ttf \
+	luxirb.ttf \
+	luxirri.ttf \
+	luxirr.ttf \
+	luxisbi.ttf \
+	luxisb.ttf \
+	luxisri.ttf \
+	luxisr.ttf \
+	Vera.ttf \
+	VeraBd.ttf \
+	VeraBI.ttf \
+	VeraIt.ttf \
+	VeraMoBd.ttf \
+	VeraMoBI.ttf \
+	VeraMoIt.ttf \
+	VeraMono.ttf \
+	VeraSe.ttf \
+	VeraSeBd.ttf \
+	GohaTibebZemen.ttf
+
+fontdir = .
+font_DATA = $(FONT_FILES:%=$(DESTDIR)\%)
+
+all: $(DESTDIR) $(DESTDIR)\fonts.dir
+
+MKFONTSCALE=$(MHMAKECONF)\mkfontscale\$(OBJDIR)\mkfontscale.exe
+
+load_makefile $(MHMAKECONF)\mkfontscale\makefile MAKESERVER=0 DEBUG=$(DEBUG)
+
+$(DESTDIR)\fonts.scale: $(font_DATA) $(MKFONTSCALE)
+	del -e $@
+	cd $(DESTDIR) & $(MKFONTSCALE) .
+
+$(DESTDIR)\fonts.dir: $(DESTDIR)\fonts.scale $(font_DATA) $(MKFONTSCALE)
+	del -e $@
+	cd $(DESTDIR) & $(MKFONTSCALE) -b -s -l .
+#	$(FCCACHE) $(DESTDIR)
+
+$(DESTDIR)\%.ttf: %.ttf
+	copy $< $@
diff --git a/xorg-server/fonts.src/Type1/makefile b/xorg-server/fonts.src/Type1/makefile
new file mode 100644
index 000000000..1c5935cfd
--- /dev/null
+++ b/xorg-server/fonts.src/Type1/makefile
@@ -0,0 +1,93 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+INC_BDF_RULES=1
+
+DESTDIR=$(MHMAKECONF)\xorg-server\fonts\Type1
+
+FONT_FILES = \
+	cursor.pfa \
+	UTB_____.afm \
+	UTBI____.afm \
+	UTBI____.pfa \
+	UTB_____.pfa \
+	UTI_____.afm \
+	UTI_____.pfa \
+	UTRG____.afm \
+	UTRG____.pfa \
+	cour.afm \
+	courb.afm \
+	courbi.afm \
+	courbi.pfa \
+	courb.pfa \
+	couri.afm \
+	couri.pfa \
+	cour.pfa \
+	l047013t.afm \
+	l047013t.pfa \
+	l047016t.afm \
+	l047016t.pfa \
+	l047033t.afm \
+	l047033t.pfa \
+	l047036t.afm \
+	l047036t.pfa \
+	l048013t.afm \
+	l048013t.pfa \
+	l048016t.afm \
+	l048016t.pfa \
+	l048033t.afm \
+	l048033t.pfa \
+	l048036t.afm \
+	l048036t.pfa \
+	l049013t.afm \
+	l049013t.pfa \
+	l049016t.afm \
+	l049016t.pfa \
+	l049033t.afm \
+	l049033t.pfa \
+	l049036t.afm \
+	l049036t.pfa \
+	c0419bt_.afm \
+	c0419bt_.pfb \
+	c0582bt_.afm \
+	c0582bt_.pfb \
+	c0583bt_.afm \
+	c0583bt_.pfb \
+	c0611bt_.afm \
+	c0611bt_.pfb \
+	c0632bt_.afm \
+	c0632bt_.pfb \
+	c0633bt_.afm \
+	c0633bt_.pfb \
+	c0648bt_.afm \
+	c0648bt_.pfb \
+	c0649bt_.afm \
+	c0649bt_.pfb
+
+fontdir = .
+font_DATA = $(FONT_FILES:%=$(DESTDIR)\%)
+
+all: $(DESTDIR) $(DESTDIR)\fonts.dir
+
+MKFONTSCALE=$(MHMAKECONF)\mkfontscale\$(OBJDIR)\mkfontscale.exe
+
+load_makefile $(MHMAKECONF)\mkfontscale\makefile MAKESERVER=0 DEBUG=$(DEBUG)
+
+$(DESTDIR)\fonts.scale: $(font_DATA) $(MKFONTSCALE)
+	del -e $@
+	cd $(DESTDIR) & $(MKFONTSCALE) .
+
+$(DESTDIR)\fonts.dir: $(DESTDIR)\fonts.scale $(font_DATA) $(MKFONTSCALE)
+	del -e $@
+	cd $(DESTDIR) & $(MKFONTSCALE) -b -s -l .
+#	$(FCCACHE) $(DESTDIR)
+
+$(DESTDIR)\%.afm: %.afm
+	copy $< $@
+
+$(DESTDIR)\%.pfb: %.pfb
+	copy $< $@
+
+$(DESTDIR)\%.pfa: %.pfa
+	copy $< $@
diff --git a/xorg-server/fonts.src/cyrillic/makefile b/xorg-server/fonts.src/cyrillic/makefile
new file mode 100644
index 000000000..f544bba4b
--- /dev/null
+++ b/xorg-server/fonts.src/cyrillic/makefile
@@ -0,0 +1,114 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+INC_BDF_RULES=1
+
+DESTDIR=$(MHMAKECONF)\xorg-server\fonts\cyrillic
+
+FONT_FILES = \
+	proof9x16 \
+	koi12x24b \
+	koi12x24 \
+	koi5x8 \
+	koi6x13b \
+	koi6x13 \
+	koi6x9 \
+	koi7x14b \
+	koi7x14 \
+	koi8x13 \
+	koi8x16b \
+	koi8x16 \
+	koi9x15b \
+	koi9x15 \
+	koi9x18b \
+	koi9x18 \
+	screen8x16b \
+	screen8x16 \
+	crox1cb \
+	crox1c \
+	crox1cbo \
+	crox1co \
+	crox1hb \
+	crox1h \
+	crox1hbo \
+	crox1ho \
+	crox1tb \
+	crox1t \
+	crox1tbo \
+	crox1to \
+	crox2cb \
+	crox2c \
+	crox2cbo \
+	crox2co \
+	crox2hb \
+	crox2h \
+	crox2hbo \
+	crox2ho \
+	crox2tb \
+	crox2t \
+	crox2tbo \
+	crox2to \
+	crox3cb \
+	crox3c \
+	crox3cbo \
+	crox3co \
+	crox3hb \
+	crox3h \
+	crox3hbo \
+	crox3ho \
+	crox3tb \
+	crox3t \
+	crox3tbo \
+	crox3to \
+	crox4hb \
+	crox4h \
+	crox4hbo \
+	crox4ho \
+	crox4tb \
+	crox4t \
+	crox4tbo \
+	crox4to \
+	crox5hb \
+	crox5h \
+	crox5hbo \
+	crox5ho \
+	crox5tb \
+	crox5t \
+	crox5tbo \
+	crox5to \
+	crox6hb \
+	crox6h \
+	crox6hbo \
+	crox6ho \
+	crox6tb \
+	crox6t \
+	crox6tbo \
+	crox6to \
+	koi10x16b \
+	koi10x20 \
+	koi6x10 \
+	koinil2
+
+BDF_FILES = $(FONT_FILES:%=%.bdf)
+PCF_FILES = $(FONT_FILES:%=$(DESTDIR)\%.pcf.gz)
+
+font_DATA = $(PCF_FILES)
+
+MKFONTSCALE=$(MHMAKECONF)\mkfontscale\$(OBJDIR)\mkfontscale.exe
+
+load_makefile $(MHMAKECONF)\mkfontscale\makefile MAKESERVER=0 DEBUG=$(DEBUG)
+
+all: $(DESTDIR) $(MKFONTSCALE) $(DESTDIR)\fonts.dir $(DESTDIR)\fonts.alias
+
+$(DESTDIR)\fonts.scale: $(font_DATA) $(MKFONTSCALE)
+	del -e $@
+	cd $(DESTDIR) & $(MKFONTSCALE) .
+
+$(DESTDIR)\fonts.dir: $(DESTDIR)\fonts.scale $(font_DATA) $(MKFONTSCALE)
+	del -e $@
+	cd $(DESTDIR) & $(MKFONTSCALE) -b -s -l .
+
+
+$(DESTDIR)\fonts.alias: fonts.alias
+	copy $< $@
diff --git a/xorg-server/fonts.src/encodings/large/makefile b/xorg-server/fonts.src/encodings/large/makefile
new file mode 100644
index 000000000..0f168d046
--- /dev/null
+++ b/xorg-server/fonts.src/encodings/large/makefile
@@ -0,0 +1,40 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+INC_BDF_RULES=1
+
+DESTDIR=$(MHMAKECONF)\xorg-server\fonts\encodings\large
+
+ENCODING_FILES =		\
+	big5.eten-0.enc		\
+	big5hkscs-0.enc		\
+	cns11643-1.enc		\
+	cns11643-2.enc		\
+	cns11643-3.enc		\
+	gb18030-0.enc		\
+	gb18030.2000-0.enc	\
+	gb18030.2000-1.enc	\
+	gb2312.1980-0.enc	\
+	gbk-0.enc		\
+	jisx0201.1976-0.enc	\
+	jisx0208.1990-0.enc	\
+	jisx0212.1990-0.enc	\
+	ksc5601.1987-0.enc	\
+	ksc5601.1992-3.enc	\
+	sun.unicode.india-0.enc
+
+COMPRESSED = $(ENCODING_FILES:%=$(DESTDIR)\%.gz)
+
+DATA_FILES = $(COMPRESSED)
+
+MKFONTSCALE=$(MHMAKECONF)\mkfontscale\$(OBJDIR)\mkfontscale.exe
+
+load_makefile $(MHMAKECONF)\mkfontscale\makefile MAKESERVER=0 DEBUG=$(DEBUG)
+
+all: $(DESTDIR)\encodings.dir
+
+$(DESTDIR)\encodings.dir: $(DATA_FILES) $(MKFONTSCALE)
+	cd "$(DESTDIR)" & $(MKFONTSCALE) -b -s -l -n -r -p .\large -e . .
+
+
diff --git a/xorg-server/fonts.src/encodings/makefile b/xorg-server/fonts.src/encodings/makefile
new file mode 100644
index 000000000..548d56ce5
--- /dev/null
+++ b/xorg-server/fonts.src/encodings/makefile
@@ -0,0 +1,63 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+load_makefile large\makefile MAKESERVER=0 DEBUG=0
+
+INC_BDF_RULES=1
+
+DESTDIR=$(MHMAKECONF)\xorg-server\fonts\encodings
+
+ENCODING_FILES =		\
+	adobe-dingbats.enc	\
+	adobe-standard.enc	\
+	adobe-symbol.enc	\
+	armscii-8.enc		\
+	ascii-0.enc		\
+	dec-special.enc		\
+	ibm-cp437.enc		\
+	ibm-cp850.enc		\
+	ibm-cp852.enc		\
+	ibm-cp866.enc		\
+	iso8859-11.enc		\
+	iso8859-13.enc		\
+	iso8859-16.enc		\
+	iso8859-6.16.enc	\
+	iso8859-6.8x.enc	\
+	microsoft-cp1250.enc	\
+	microsoft-cp1251.enc	\
+	microsoft-cp1252.enc	\
+	microsoft-cp1253.enc	\
+	microsoft-cp1254.enc	\
+	microsoft-cp1255.enc	\
+	microsoft-cp1256.enc	\
+	microsoft-cp1257.enc	\
+	microsoft-cp1258.enc	\
+	microsoft-win3.1.enc	\
+	mulearabic-0.enc	\
+	mulearabic-1.enc	\
+	mulearabic-2.enc	\
+	mulelao-1.enc		\
+	suneu-greek.enc		\
+	tcvn-0.enc		\
+	tis620-2.enc		\
+	viscii1.1-1.enc
+
+COMPRESSED = $(ENCODING_FILES:%=$(DESTDIR)\%.gz)
+
+DATA_FILES = $(COMPRESSED)
+
+MKFONTSCALE=$(MHMAKECONF)\mkfontscale\$(OBJDIR)\mkfontscale.exe
+
+load_makefile $(MHMAKECONF)\mkfontscale\makefile MAKESERVER=0 DEBUG=$(DEBUG)
+
+$(DESTDIR)\encodings.dir: $(DATA_FILES) $(DESTDIR)\large\encodings.dir $(MKFONTSCALE)
+	cd "$(DESTDIR)" & $(MKFONTSCALE) -b -s -l -n -r -p . -e . -e large .
+
+all: $(DESTDIR)\encodings.dir
+
+.PHONY: cleanthis
+cleanthis:
+	del -e $(DESTDIR)
+
+clean: cleanthis
+
diff --git a/xorg-server/fonts.src/font-util/makefile b/xorg-server/fonts.src/font-util/makefile
new file mode 100644
index 000000000..13e196a03
--- /dev/null
+++ b/xorg-server/fonts.src/font-util/makefile
@@ -0,0 +1,5 @@
+TTYAPP = ucs2any
+
+CSRCS = ucs2any.c
+
+DEFINES += NEED_BASENAME
diff --git a/xorg-server/fonts.src/fonts.conf b/xorg-server/fonts.src/fonts.conf
new file mode 100644
index 000000000..9e6ec7487
--- /dev/null
+++ b/xorg-server/fonts.src/fonts.conf
@@ -0,0 +1,118 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+
+<!--
+  Accept deprecated 'mono' alias, replacing it with 'monospace'
+-->
+	<match target="pattern">
+		<test qual="any" name="family">
+			<string>mono</string>
+		</test>
+		<edit name="family" mode="assign" binding="same">
+			<string>monospace</string>
+		</edit>
+	</match>
+
+<!--
+  Accept alternate 'sans serif' spelling, replacing it with 'sans-serif'
+-->
+	<match target="pattern">
+		<test qual="any" name="family">
+			<string>sans serif</string>
+		</test>
+		<edit name="family" mode="assign" binding="same">
+			<string>sans-serif</string>
+		</edit>
+	</match>
+
+<!--
+  Accept deprecated 'sans' alias, replacing it with 'sans-serif'
+-->
+	<match target="pattern">
+		<test qual="any" name="family">
+			<string>sans</string>
+		</test>
+		<edit name="family" mode="assign" binding="same">
+			<string>sans-serif</string>
+		</edit>
+	</match>
+
+<!-- Font cache directory list -->
+
+	<config>
+<!--
+  These are the default Unicode chars that are expected to be blank
+  in fonts.  All other blank chars are assumed to be broken and
+  won't appear in the resulting charsets
+ -->
+		<blank>
+			<int>0x0020</int>	<!-- SPACE -->
+			<int>0x00A0</int>	<!-- NO-BREAK SPACE -->
+			<int>0x00AD</int>	<!-- SOFT HYPHEN -->
+			<int>0x034F</int>	<!-- COMBINING GRAPHEME JOINER -->
+			<int>0x0600</int>	<!-- ARABIC NUMBER SIGN -->
+			<int>0x0601</int>	<!-- ARABIC SIGN SANAH -->
+			<int>0x0602</int>	<!-- ARABIC FOOTNOTE MARKER -->
+			<int>0x0603</int>	<!-- ARABIC SIGN SAFHA -->
+			<int>0x06DD</int>	<!-- ARABIC END OF AYAH -->
+			<int>0x070F</int>	<!-- SYRIAC ABBREVIATION MARK -->
+			<int>0x115F</int>	<!-- HANGUL CHOSEONG FILLER -->
+			<int>0x1160</int>	<!-- HANGUL JUNGSEONG FILLER -->
+			<int>0x1680</int>	<!-- OGHAM SPACE MARK -->
+			<int>0x17B4</int>	<!-- KHMER VOWEL INHERENT AQ -->
+			<int>0x17B5</int>	<!-- KHMER VOWEL INHERENT AA -->
+			<int>0x180E</int>	<!-- MONGOLIAN VOWEL SEPARATOR -->
+			<int>0x2000</int>	<!-- EN QUAD -->
+			<int>0x2001</int>	<!-- EM QUAD -->
+			<int>0x2002</int>	<!-- EN SPACE -->
+			<int>0x2003</int>	<!-- EM SPACE -->
+			<int>0x2004</int>	<!-- THREE-PER-EM SPACE -->
+			<int>0x2005</int>	<!-- FOUR-PER-EM SPACE -->
+			<int>0x2006</int>	<!-- SIX-PER-EM SPACE -->
+			<int>0x2007</int>	<!-- FIGURE SPACE -->
+			<int>0x2008</int>	<!-- PUNCTUATION SPACE -->
+			<int>0x2009</int>	<!-- THIN SPACE -->
+			<int>0x200A</int>	<!-- HAIR SPACE -->
+			<int>0x200B</int>	<!-- ZERO WIDTH SPACE -->
+			<int>0x200C</int>	<!-- ZERO WIDTH NON-JOINER -->
+			<int>0x200D</int>	<!-- ZERO WIDTH JOINER -->
+			<int>0x200E</int>	<!-- LEFT-TO-RIGHT MARK -->
+			<int>0x200F</int>	<!-- RIGHT-TO-LEFT MARK -->
+			<int>0x2028</int>	<!-- LINE SEPARATOR -->
+			<int>0x2029</int>	<!-- PARAGRAPH SEPARATOR -->
+			<int>0x202A</int>	<!-- LEFT-TO-RIGHT EMBEDDING -->
+			<int>0x202B</int>	<!-- RIGHT-TO-LEFT EMBEDDING -->
+			<int>0x202C</int>	<!-- POP DIRECTIONAL FORMATTING -->
+			<int>0x202D</int>	<!-- LEFT-TO-RIGHT OVERRIDE -->
+			<int>0x202E</int>	<!-- RIGHT-TO-LEFT OVERRIDE -->
+			<int>0x202F</int>	<!-- NARROW NO-BREAK SPACE -->
+			<int>0x205F</int>	<!-- MEDIUM MATHEMATICAL SPACE -->
+			<int>0x2060</int>	<!-- WORD JOINER -->
+			<int>0x2061</int>	<!-- FUNCTION APPLICATION -->
+			<int>0x2062</int>	<!-- INVISIBLE TIMES -->
+			<int>0x2063</int>	<!-- INVISIBLE SEPARATOR -->
+			<int>0x206A</int>	<!-- INHIBIT SYMMETRIC SWAPPING -->
+			<int>0x206B</int>	<!-- ACTIVATE SYMMETRIC SWAPPING -->
+			<int>0x206C</int>	<!-- INHIBIT ARABIC FORM SHAPING -->
+			<int>0x206D</int>	<!-- ACTIVATE ARABIC FORM SHAPING -->
+			<int>0x206E</int>	<!-- NATIONAL DIGIT SHAPES -->
+			<int>0x206F</int>	<!-- NOMINAL DIGIT SHAPES -->
+			<int>0x2800</int>	<!-- BRAILLE PATTERN BLANK -->
+			<int>0x3000</int>	<!-- IDEOGRAPHIC SPACE -->
+			<int>0x3164</int>	<!-- HANGUL FILLER -->
+			<int>0xFEFF</int>	<!-- ZERO WIDTH NO-BREAK SPACE -->
+			<int>0xFFA0</int>	<!-- HALFWIDTH HANGUL FILLER -->
+			<int>0xFFF9</int>	<!-- INTERLINEAR ANNOTATION ANCHOR -->
+			<int>0xFFFA</int>	<!-- INTERLINEAR ANNOTATION SEPARATOR -->
+			<int>0xFFFB</int>	<!-- INTERLINEAR ANNOTATION TERMINATOR -->
+		</blank>
+<!--
+  Rescan configuration every 30 seconds when FcFontSetList is called
+ -->
+		<rescan>
+			<int>30</int>
+		</rescan>
+	</config>
+
+</fontconfig>
diff --git a/xorg-server/fonts.src/makefile b/xorg-server/fonts.src/makefile
new file mode 100644
index 000000000..3d00b2006
--- /dev/null
+++ b/xorg-server/fonts.src/makefile
@@ -0,0 +1,8 @@
+SUBDIRS=font-util 75dpi 100dpi cyrillic encodings misc OTF Speedo TTF Type1 terminus-font
+
+DESTDIR=$(MHMAKECONF)\xorg-server\fonts
+
+all: $(DESTDIR)\fonts.conf
+
+$(DESTDIR)\fonts.conf: fonts.conf
+	copy $< $@
diff --git a/xorg-server/fonts.src/misc/makefile b/xorg-server/fonts.src/misc/makefile
new file mode 100644
index 000000000..95d736477
--- /dev/null
+++ b/xorg-server/fonts.src/misc/makefile
@@ -0,0 +1,345 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+INC_BDF_RULES=1
+
+UTIL_DIR = ..\font-util
+
+load_makefile $(UTIL_DIR)\makefile MAKESERVER=0 DEBUG=$(DEBUG)
+
+UCS2ANY = $(UTIL_DIR)\$(OBJDIR)\ucs2any.exe
+
+   # The following rule is to avoid parallel build problems
+.PHONY: buildtoolsfirst
+buildtoolsfirst: $(BDFTOPCF) $(UCS2ANY)
+
+all: buildtoolsfirst
+
+DESTDIR=$(MHMAKECONF)\xorg-server\fonts\misc
+
+BDF2UCS_FONT_FILES = \
+	clR6x12 \
+	4x6 \
+	5x7 \
+	5x8 \
+	6x9 \
+	6x10 \
+	6x12 \
+	6x13 \
+	6x13B \
+	6x13O \
+	7x13 \
+	7x13B \
+	7x13O \
+	7x14 \
+	7x14B \
+	8x13 \
+	8x13B \
+	8x13O \
+	9x15 \
+	9x15B \
+	9x18 \
+	9x18B \
+	10x20
+BDF2UCS_8_FONT_FILES = \
+	clR6x12 \
+	4x6 \
+	5x7 \
+	5x8 \
+	6x9 \
+	6x10 \
+	6x12 \
+	6x13 \
+	6x13B \
+	7x13 \
+	7x13B \
+	7x14 \
+	7x14B \
+	8x13 \
+	8x13B \
+	9x15 \
+	9x15B \
+	9x18 \
+	9x18B \
+	10x20
+BDF2UCS_11_FONT_FILES = \
+	6x13 \
+	7x13 \
+	7x13B \
+	7x13O \
+	7x14 \
+	7x14B \
+	9x15 \
+	9x15B \
+	9x18 \
+	10x20
+BDF2UCS_KOI8_FONT_FILES = \
+	clR6x12 \
+	4x6 \
+	5x7 \
+	5x8 \
+	6x9 \
+	6x10 \
+	6x12 \
+	6x13 \
+	7x13 \
+	7x14 \
+	8x13 \
+	9x15 \
+	9x18 \
+	10x20
+BDF2UCS_JISX0201_FONT_FILES = \
+	7x14
+EXTRA_FONT_FILES = \
+	12x13ja \
+	18x18ja \
+	18x18ko \
+	k14 \
+	nil2 \
+	micro \
+	jiskan16 \
+	jiskan24 \
+	gb16fs \
+	gb16st \
+	gb24st \
+	deccurs \
+	decsess \
+	arabic24 \
+	cursor \
+	hanglg16 \
+	hanglm16 \
+	hanglm24 \
+	cu12 \
+	cu-alt12 \
+	cu-arabic12 \
+	cuarabic12 \
+	cu-devnag12 \
+	cudevnag12 \
+	cu-lig12 \
+	cu-pua12 \
+	clB6x10 \
+	clB6x12 \
+	clB8x10 \
+	clB8x12 \
+	clB8x13 \
+	clB8x14 \
+	clB8x16 \
+	clB8x8 \
+	clB9x15 \
+	clI6x12 \
+	clI8x8 \
+	clR4x6 \
+	clR5x10 \
+	clR5x6 \
+	clR5x8 \
+	clR6x10 \
+	clR6x13 \
+	clR6x6 \
+	clR6x8 \
+	clR7x10 \
+	clR7x12 \
+	clR7x14 \
+	clR7x8 \
+	clR8x10 \
+	clR8x12 \
+	clR8x13 \
+	clR8x14 \
+	clR8x16 \
+	clR8x8 \
+	clR9x15 \
+	12x24 \
+	12x24rk \
+	8x16 \
+	8x16rk \
+	olcursor \
+	olgl10 \
+	olgl12 \
+	olgl14 \
+	olgl19
+
+FONT_FILES = $(BDF2UCS_FONT_FILES) $(EXTRA_FONT_FILES)
+
+BDF_FILES = $(FONT_FILES:%=%.bdf)
+PCF_FILES = $(FONT_FILES:%=$(DESTDIR)\%.pcf.gz)
+
+ISO8859_1_PCF_FILES = $(BDF2UCS_FONT_FILES:%=$(DESTDIR)\%-ISO8859-1.pcf.gz)
+
+ISO8859_2_PCF_FILES = $(BDF2UCS_FONT_FILES:%=$(DESTDIR)\%-ISO8859-2.pcf.gz)
+
+ISO8859_3_PCF_FILES = $(BDF2UCS_FONT_FILES:%=$(DESTDIR)\%-ISO8859-3.pcf.gz)
+
+ISO8859_4_PCF_FILES = $(BDF2UCS_FONT_FILES:%=$(DESTDIR)\%-ISO8859-4.pcf.gz)
+
+ISO8859_5_PCF_FILES = $(BDF2UCS_FONT_FILES:%=$(DESTDIR)\%-ISO8859-5.pcf.gz)
+
+ISO8859_7_PCF_FILES = $(BDF2UCS_FONT_FILES:%=$(DESTDIR)\%-ISO8859-7.pcf.gz)
+
+ISO8859_8_PCF_FILES = $(BDF2UCS_8_FONT_FILES:%=$(DESTDIR)\%-ISO8859-8.pcf.gz)
+
+ISO8859_9_PCF_FILES = $(BDF2UCS_FONT_FILES:%=$(DESTDIR)\%-ISO8859-9.pcf.gz)
+
+ISO8859_10_PCF_FILES = $(BDF2UCS_FONT_FILES:%=$(DESTDIR)\%-ISO8859-10.pcf.gz)
+
+ISO8859_11_PCF_FILES = $(BDF2UCS_11_FONT_FILES:%=$(DESTDIR)\%-ISO8859-11.pcf.gz)
+
+ISO8859_13_PCF_FILES = $(BDF2UCS_FONT_FILES:%=$(DESTDIR)\%-ISO8859-13.pcf.gz)
+
+ISO8859_14_PCF_FILES = $(BDF2UCS_FONT_FILES:%=$(DESTDIR)\%-ISO8859-14.pcf.gz)
+
+ISO8859_15_PCF_FILES = $(BDF2UCS_FONT_FILES:%=$(DESTDIR)\%-ISO8859-15.pcf.gz)
+
+ISO8859_16_PCF_FILES = $(BDF2UCS_FONT_FILES:%=$(DESTDIR)\%-ISO8859-16.pcf.gz)
+
+KOI8_R_PCF_FILES = $(BDF2UCS_KOI8_FONT_FILES:%=$(DESTDIR)\%-KOI8-R.pcf.gz)
+
+JISX0201_PCF_FILES = $(BDF2UCS_JISX0201_FONT_FILES:%=$(DESTDIR)\%-JISX0201.1976-0.pcf.gz)
+
+$(DESTDIR)\%-ISO8859-1.pcf.gz: %.bdf
+	@del -e $(<:%.bdf=%-ISO8859-1.bdf)
+	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-1 ISO8859-1
+	@del -e $@
+	$(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-1.bdf) | gzip > $@
+	@del $(<:%.bdf=%-ISO8859-1.bdf)
+
+$(DESTDIR)\%-ISO8859-2.pcf.gz: %.bdf
+	@del -e $(<:%.bdf=%-ISO8859-2.bdf)
+	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-2 ISO8859-2
+	@del -e $@
+	$(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-2.bdf) | gzip > $@
+	@del $(<:%.bdf=%-ISO8859-2.bdf)
+
+$(DESTDIR)\%-ISO8859-3.pcf.gz: %.bdf
+	@del -e $(<:%.bdf=%-ISO8859-3.bdf)
+	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-3 ISO8859-3
+	@del -e $@
+	$(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-3.bdf) | gzip > $@
+	@del $(<:%.bdf=%-ISO8859-3.bdf)
+
+$(DESTDIR)\%-ISO8859-4.pcf.gz: %.bdf
+	@del -e $(<:%.bdf=%-ISO8859-4.bdf)
+	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-4 ISO8859-4
+	@del -e $@
+	$(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-4.bdf) | gzip > $@
+	@del $(<:%.bdf=%-ISO8859-4.bdf)
+
+$(DESTDIR)\%-ISO8859-5.pcf.gz: %.bdf
+	@del -e $(<:%.bdf=%-ISO8859-5.bdf)
+	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-5 ISO8859-5
+	@del -e $@
+	$(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-5.bdf) | gzip > $@
+	@del $(<:%.bdf=%-ISO8859-5.bdf)
+
+$(DESTDIR)\%-ISO8859-7.pcf.gz: %.bdf
+	@del -e $(<:%.bdf=%-ISO8859-7.bdf)
+	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-7 ISO8859-7
+	@del -e $@
+	$(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-7.bdf) | gzip > $@
+	@del $(<:%.bdf=%-ISO8859-7.bdf)
+
+$(DESTDIR)\%-ISO8859-8.pcf.gz: %.bdf
+	@del -e $(<:%.bdf=%-ISO8859-8.bdf)
+	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-8 ISO8859-8
+	@del -e $@
+	$(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-8.bdf) | gzip > $@
+	@del $(<:%.bdf=%-ISO8859-8.bdf)
+
+$(DESTDIR)\%-ISO8859-9.pcf.gz: %.bdf
+	@del -e $(<:%.bdf=%-ISO8859-9.bdf)
+	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-9 ISO8859-9
+	@del -e $@
+	$(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-9.bdf) | gzip > $@
+	@del $(<:%.bdf=%-ISO8859-9.bdf)
+
+$(DESTDIR)\%-ISO8859-10.pcf.gz: %.bdf
+	@del -e $(<:%.bdf=%-ISO8859-10.bdf)
+	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-10 ISO8859-10
+	@del -e $@
+	$(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-10.bdf) | gzip > $@
+	@del $(<:%.bdf=%-ISO8859-10.bdf)
+
+$(DESTDIR)\%-ISO8859-11.pcf.gz: %.bdf
+	@del -e $(<:%.bdf=%-ISO8859-11.bdf)
+	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-11 ISO8859-11
+	@del -e $@
+	$(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-11.bdf) | gzip > $@
+	@del $(<:%.bdf=%-ISO8859-11.bdf)
+
+$(DESTDIR)\%-ISO8859-13.pcf.gz: %.bdf
+	@del -e $(<:%.bdf=%-ISO8859-13.bdf)
+	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-13 ISO8859-13
+	@del -e $@
+	$(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-13.bdf) | gzip > $@
+	@del $(<:%.bdf=%-ISO8859-13.bdf)
+
+$(DESTDIR)\%-ISO8859-14.pcf.gz: %.bdf
+	@del -e $(<:%.bdf=%-ISO8859-14.bdf)
+	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-14 ISO8859-14
+	@del -e $@
+	$(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-14.bdf) | gzip > $@
+	@del $(<:%.bdf=%-ISO8859-14.bdf)
+
+$(DESTDIR)\%-ISO8859-15.pcf.gz: %.bdf
+	@del -e $(<:%.bdf=%-ISO8859-15.bdf)
+	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-15 ISO8859-15
+	@del -e $@
+	$(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-15.bdf) | gzip > $@
+	@del $(<:%.bdf=%-ISO8859-15.bdf)
+
+$(DESTDIR)\%-ISO8859-16.pcf.gz: %.bdf
+	@del -e $(<:%.bdf=%-ISO8859-16.bdf)
+	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-16 ISO8859-16
+	@del -e $@
+	$(BDFTOPCF) -t $(<:%.bdf=%-ISO8859-16.bdf) | gzip > $@
+	@del $(<:%.bdf=%-ISO8859-16.bdf)
+
+$(DESTDIR)\%-KOI8-R.pcf.gz: %.bdf
+	@del -e $(<:%.bdf=%-KOI8-R.bdf)
+	$(UCS2ANY) $< $(UTIL_DIR)\map-KOI8-R KOI8-R
+	@del -e $@
+	$(BDFTOPCF) -t $(<:%.bdf=%-KOI8-R.bdf) | gzip > $@
+	@del $(<:%.bdf=%-KOI8-R.bdf)
+
+$(DESTDIR)\%-JISX0201.1976-0.pcf.gz: %.bdf
+	@del -e $(<:%.bdf=%-JISX0201.1976-0.bdf)
+	$(UCS2ANY) $< $(UTIL_DIR)\map-JISX0201.1976-0 JISX0201.1976-0
+	@del -e $@
+	$(BDFTOPCF) -t $(<:%.bdf=%-JISX0201.1976-0.bdf) | gzip > $@
+	@del $(<:%.bdf=%-JISX0201.1976-0.bdf)
+
+font_DATA = \
+	$(PCF_FILES) \
+	$(ISO8859_1_PCF_FILES) \
+	$(ISO8859_2_PCF_FILES) \
+	$(ISO8859_3_PCF_FILES) \
+	$(ISO8859_4_PCF_FILES) \
+	$(ISO8859_5_PCF_FILES) \
+	$(ISO8859_7_PCF_FILES) \
+	$(ISO8859_8_PCF_FILES) \
+	$(ISO8859_9_PCF_FILES) \
+	$(ISO8859_10_PCF_FILES) \
+	$(ISO8859_11_PCF_FILES) \
+	$(ISO8859_13_PCF_FILES) \
+	$(ISO8859_14_PCF_FILES) \
+	$(ISO8859_15_PCF_FILES) \
+	$(ISO8859_16_PCF_FILES) \
+	$(KOI8_R_PCF_FILES) \
+	$(JISX0201_PCF_FILES)
+
+all: $(DESTDIR) $(DESTDIR)\fonts.dir $(DESTDIR)\fonts.alias
+
+MKFONTSCALE=$(MHMAKECONF)\mkfontscale\$(OBJDIR)\mkfontscale.exe
+
+load_makefile $(MHMAKECONF)\mkfontscale\makefile MAKESERVER=0 DEBUG=$(DEBUG)
+
+$(DESTDIR)\fonts.scale: $(font_DATA) $(MKFONTSCALE)
+	del -e $@
+	cd $(DESTDIR) & $(MKFONTSCALE) .
+
+$(DESTDIR)\fonts.dir: $(DESTDIR)\fonts.scale $(font_DATA) $(MKFONTSCALE)
+	del -e $@
+	cd $(DESTDIR) & $(MKFONTSCALE) -b -s -l .
+
+$(DESTDIR)\fonts.alias: fonts.alias
+	copy $< $@
+
diff --git a/xorg-server/fonts.src/terminus-font/Makefile b/xorg-server/fonts.src/terminus-font/Makefile
index 727e99277..c8cb4f0fc 100644
--- a/xorg-server/fonts.src/terminus-font/Makefile
+++ b/xorg-server/fonts.src/terminus-font/Makefile
@@ -1,11 +1,18 @@
-PERL	= perl
-AWK	= awk
-UCS2VGA	= $(PERL) ./ucstoany.pl +f
-UNI2TXT	= $(AWK) '{ printf("0x%02X\tU+%s\n", FNR-1, $$1) }'
-BDF2PSF	= $(PERL) ./bdftopsf.pl +u
-BDF2RAW	= $(PERL) ./bdftopsf.pl -h
-UCS2X11	= $(PERL) ./ucstoany.pl
-BDF2PCF	= bdftopcf
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+UCS2ANY = perl ucstoany.pl
+
+INC_BDF_RULES=1
+
+   # The following rule is to avoid parallel build problems
+.PHONY: buildtoolsfirst
+buildtoolsfirst: $(BDFTOPCF)
+
+all: buildtoolsfirst
+
+DESTDIR=$(MHMAKECONF)\xorg-server\fonts\terminus-font
 
 R_88591	= ISO8859 1
 R_88592	= ISO8859 2
@@ -25,37 +32,6 @@ R_PT254	= Paratype PT254
 R_XOS42	= XOS4 2
 R_10646	= ISO10646 1
 
-PSF_12N	= ter-112n.psf ter-212n.psf ter-712n.psf ter-912n.psf ter-c12n.psf ter-d12n.psf ter-g12n.psf ter-i12n.psf ter-k12n.psf ter-m12n.psf ter-p12n.psf ter-u12n.psf ter-v12n.psf
-PSF_14N	= ter-114n.psf ter-214n.psf ter-714n.psf ter-914n.psf ter-c14n.psf ter-d14n.psf ter-g14n.psf ter-i14n.psf ter-k14n.psf ter-m14n.psf ter-p14n.psf ter-u14n.psf ter-v14n.psf
-PSF_14B	= ter-114b.psf ter-214b.psf ter-714b.psf ter-914b.psf ter-c14b.psf ter-d14b.psf ter-g14b.psf ter-i14b.psf ter-k14b.psf ter-m14b.psf ter-p14b.psf ter-u14b.psf ter-v14b.psf
-PSF_14F	= ter-114f.psf ter-214f.psf ter-714f.psf ter-914f.psf ter-c14f.psf ter-d14f.psf ter-g14f.psf ter-i14f.psf ter-k14f.psf ter-m14f.psf ter-p14f.psf ter-u14f.psf ter-v14f.psf
-PSF_16N	= ter-116n.psf ter-216n.psf ter-716n.psf ter-916n.psf ter-c16n.psf ter-d16n.psf ter-g16n.psf ter-i16n.psf ter-k16n.psf ter-m16n.psf ter-p16n.psf ter-u16n.psf ter-v16n.psf
-PSF_16B	= ter-116b.psf ter-216b.psf ter-716b.psf ter-916b.psf ter-c16b.psf ter-d16b.psf ter-g16b.psf ter-i16b.psf ter-k16b.psf ter-m16b.psf ter-p16b.psf ter-u16b.psf ter-v16b.psf
-PSF_16F	= ter-116f.psf ter-216f.psf ter-716f.psf ter-916f.psf ter-c16f.psf ter-d16f.psf ter-g16f.psf ter-i16f.psf ter-k16f.psf ter-m16f.psf ter-p16f.psf ter-u16f.psf ter-v16f.psf
-PSF_20N	= ter-120n.psf ter-220n.psf ter-720n.psf ter-920n.psf ter-c20n.psf ter-d20n.psf ter-g20n.psf ter-i20n.psf ter-k20n.psf ter-m20n.psf ter-p20n.psf ter-u20n.psf ter-v20n.psf
-PSF_20B	= ter-120b.psf ter-220b.psf ter-720b.psf ter-920b.psf ter-c20b.psf ter-d20b.psf ter-g20b.psf ter-i20b.psf ter-k20b.psf ter-m20b.psf ter-p20b.psf ter-u20b.psf ter-v20b.psf
-PSF_22N	= ter-122n.psf ter-222n.psf ter-722n.psf ter-922n.psf ter-c22n.psf ter-d22n.psf ter-g22n.psf ter-i22n.psf ter-k22n.psf ter-m22n.psf ter-p22n.psf ter-u22n.psf ter-v22n.psf
-PSF_22B	= ter-122b.psf ter-222b.psf ter-722b.psf ter-922b.psf ter-c22b.psf ter-d22b.psf ter-g22b.psf ter-i22b.psf ter-k22b.psf ter-m22b.psf ter-p22b.psf ter-u22b.psf ter-v22b.psf
-PSF_24N	= ter-124n.psf ter-224n.psf ter-724n.psf ter-924n.psf ter-c24n.psf ter-d24n.psf ter-g24n.psf ter-i24n.psf ter-k24n.psf ter-m24n.psf ter-p24n.psf ter-u24n.psf ter-v24n.psf
-PSF_24B	= ter-124b.psf ter-224b.psf ter-724b.psf ter-924b.psf ter-c24b.psf ter-d24b.psf ter-g24b.psf ter-i24b.psf ter-k24b.psf ter-m24b.psf ter-p24b.psf ter-u24b.psf ter-v24b.psf
-PSF_28N	= ter-128n.psf ter-228n.psf ter-728n.psf ter-928n.psf ter-c28n.psf ter-d28n.psf ter-g28n.psf ter-i28n.psf ter-k28n.psf ter-m28n.psf ter-p28n.psf ter-u28n.psf ter-v28n.psf
-PSF_28B	= ter-128b.psf ter-228b.psf ter-728b.psf ter-928b.psf ter-c28b.psf ter-d28b.psf ter-g28b.psf ter-i28b.psf ter-k28b.psf ter-m28b.psf ter-p28b.psf ter-u28b.psf ter-v28b.psf
-PSF_32N	= ter-132n.psf ter-232n.psf ter-732n.psf ter-932n.psf ter-c32n.psf ter-d32n.psf ter-g32n.psf ter-i32n.psf ter-k32n.psf ter-m32n.psf ter-p32n.psf ter-u32n.psf ter-v32n.psf
-PSF_32B	= ter-132b.psf ter-232b.psf ter-732b.psf ter-932b.psf ter-c32b.psf ter-d32b.psf ter-g32b.psf ter-i32b.psf ter-k32b.psf ter-m32b.psf ter-p32b.psf ter-u32b.psf ter-v32b.psf
-PSF	= $(PSF_12N) $(PSF_14N) $(PSF_14B) $(PSF_14F) $(PSF_16N) $(PSF_16B) $(PSF_16F) $(PSF_20N) $(PSF_20B) $(PSF_22N) $(PSF_22B) $(PSF_24N) $(PSF_24B) $(PSF_28N) $(PSF_28B) $(PSF_32N) $(PSF_32B)
-
-TXT_WIN	= cp1252.txt cp1250.txt cp1253.txt cp1254.txt cp1251.txt cp1257.txt pt154.txt
-TXT_MIX	= 8859-16.txt cp437.txt koi8-r.txt koi8-u.txt mik.txt pt254.txt
-TXT	= $(TXT_WIN) $(TXT_MIX)
-
-RAW_14N	= ter-114n.raw ter-214n.raw ter-514n.raw ter-714n.raw ter-914n.raw ter-c14n.raw ter-d14n.raw ter-f14n.raw ter-g14n.raw ter-i14n.raw ter-k14n.raw ter-p14n.raw ter-u14n.raw
-RAW_14B	= ter-114b.raw ter-214b.raw ter-514b.raw ter-714b.raw ter-914b.raw ter-c14b.raw ter-d14b.raw ter-f14b.raw ter-g14b.raw ter-i14b.raw ter-k14b.raw ter-p14b.raw ter-u14b.raw
-RAW_14F	= ter-114f.raw ter-214f.raw ter-514f.raw ter-714f.raw ter-914f.raw ter-c14f.raw ter-d14f.raw ter-f14f.raw ter-g14f.raw ter-i14f.raw ter-k14f.raw ter-p14f.raw ter-u14f.raw
-RAW_16N	= ter-116n.raw ter-216n.raw ter-516n.raw ter-716n.raw ter-916n.raw ter-c16n.raw ter-d16n.raw ter-f16n.raw ter-g16n.raw ter-i16n.raw ter-k16n.raw ter-p16n.raw ter-u16n.raw
-RAW_16B	= ter-116b.raw ter-216b.raw ter-516b.raw ter-716b.raw ter-916b.raw ter-c16b.raw ter-d16b.raw ter-f16b.raw ter-g16b.raw ter-i16b.raw ter-k16b.raw ter-p16b.raw ter-u16b.raw
-RAW_16F	= ter-116f.raw ter-216f.raw ter-516f.raw ter-716f.raw ter-916f.raw ter-c16f.raw ter-d16f.raw ter-f16f.raw ter-g16f.raw ter-i16f.raw ter-k16f.raw ter-p16f.raw ter-u16f.raw
-RAW	= $(RAW_14N) $(RAW_14B) $(RAW_14F) $(RAW_16N) $(RAW_16B) $(RAW_16F)
-
 PCF_12N	= ter-112n.pcf ter-212n.pcf ter-512n.pcf ter-712n.pcf ter-912n.pcf ter-c12n.pcf ter-d12n.pcf ter-f12n.pcf ter-g12n.pcf ter-k12n.pcf ter-p12n.pcf ter-u12n.pcf ter-x12n.pcf
 PCF_12B	= ter-112b.pcf ter-212b.pcf ter-512b.pcf ter-712b.pcf ter-912b.pcf ter-c12b.pcf ter-d12b.pcf ter-f12b.pcf ter-g12b.pcf ter-k12b.pcf ter-p12b.pcf ter-u12b.pcf ter-x12b.pcf
 PCF_14N	= ter-114n.pcf ter-214n.pcf ter-514n.pcf ter-714n.pcf ter-914n.pcf ter-c14n.pcf ter-d14n.pcf ter-f14n.pcf ter-g14n.pcf ter-k14n.pcf ter-p14n.pcf ter-u14n.pcf ter-x14n.pcf
@@ -75,1099 +51,6 @@ PCF_32B	= ter-132b.pcf ter-232b.pcf ter-532b.pcf ter-732b.pcf ter-932b.pcf ter-c
 PCF	= $(PCF_12N) $(PCF_12B) $(PCF_14N) $(PCF_14B) $(PCF_16N) $(PCF_16B) $(PCF_20N) $(PCF_20B) $(PCF_22N) $(PCF_22B) $(PCF_24N) $(PCF_24B) $(PCF_28N) $(PCF_28B) $(PCF_32N) $(PCF_32B)
 PCF_N12	= $(PCF_12N) $(PCF_14N) $(PCF_14B) $(PCF_16N) $(PCF_16B) $(PCF_20N) $(PCF_20B) $(PCF_22N) $(PCF_22B) $(PCF_24N) $(PCF_24B) $(PCF_28N) $(PCF_28B) $(PCF_32N) $(PCF_32B)
 
-EEE	= ter-x12n.pcf ter-x12b.pcf ter-x14n.pcf ter-x14b.pcf ter-x16n.pcf ter-x16b.pcf ter-x20n.pcf ter-x20b.pcf ter-x22n.pcf ter-x22b.pcf
-EEE_N12	= ter-x12n.pcf ter-x14n.pcf ter-x14b.pcf ter-x16n.pcf ter-x16b.pcf ter-x20n.pcf ter-x20b.pcf ter-x22n.pcf ter-x22b.pcf
-
-all: $(PSF) $(PCF)
-psf: $(PSF)
-txt: $(TXT)
-raw: $(RAW)
-pcf: $(PCF)
-n12: $(PCF_N12)
-eee: $(EEE)
-e12: $(EEE_N12)
-
-DESTDIR	=
-prefix	= /usr/local
-psfdir	= $(prefix)/share/consolefonts
-x11dir	= $(prefix)/share/fonts/terminus
-
-install: $(PSF) $(PCF)
-	mkdir -p $(DESTDIR)$(psfdir)
-	for i in $(PSF) ; do gzip -c $$i > $(DESTDIR)$(psfdir)/$$i.gz ; done
-	mkdir -p $(DESTDIR)$(x11dir)
-	for i in $(PCF) ; do gzip -c $$i > $(DESTDIR)$(x11dir)/$$i.gz ; done
-
-uninstall:
-	for i in $(PSF) ; do rm -f $(DESTDIR)$(psfdir)/$$i.gz ; done
-	for i in $(PCF) ; do rm -f $(DESTDIR)$(x11dir)/$$i.gz ; done
-
-fontdir:
-	mkfontscale $(DESTDIR)$(x11dir)
-	mkfontdir $(DESTDIR)$(x11dir)
-	fc-cache $(DESTDIR)$(x11dir)
-
-V_88591	= uni/vgagr.uni uni/ascii-h.uni uni/win-1252.uni
-V_88592	= uni/vgagr.uni uni/ascii-h.uni uni/vga-1250.uni uni/8859-2.uni
-V_88597	= uni/vgagr.uni uni/ascii-h.uni uni/vga-1253.uni uni/8859-7.uni
-V_88599	= uni/vgagr.uni uni/ascii-h.uni uni/win-1254.uni
-V_W1251	= uni/vgagr.uni uni/ascii-h.uni uni/vga-1251.uni uni/win-1251.uni
-V_8859D	= uni/vgagr.uni uni/ascii-h.uni uni/vga-1257.uni uni/8859-13.uni
-V_8859G	= uni/vgagr.uni uni/ascii-h.uni uni/nls-1250.uni uni/8859-16.uni
-V_PCIBM	= uni/cntrl.uni uni/ascii-h.uni uni/ibm-437.uni
-V_KOI8R	= uni/cntrl.uni uni/ascii-h.uni uni/koibm8-r.uni
-F_KOI8R	= uni/cntrl.uni uni/ascii-h.uni uni/koi8-r.uni
-V_KOI8U	= uni/cntrl.uni uni/ascii-h.uni uni/koibm8-u.uni
-F_KOI8U	= uni/cntrl.uni uni/ascii-h.uni uni/koi8-u.uni
-V_BGMIK	= uni/cntrl.uni uni/ascii-h.uni uni/bg-mik.uni
-V_PT154	= uni/vgagr.uni uni/ascii-h.uni uni/pt-154.uni
-V_XOS42	= uni/xos4-2.uni
-
-D_88591	= dup/vgagr.dup dup/ascii-h.dup
-D_88592	= dup/vgagr.dup dup/ascii-h.dup
-D_88597	= dup/vgagr.dup dup/ascii-h.dup
-D_88599	= dup/vgagr.dup dup/ascii-h.dup
-D_W1251	= dup/vgagr.dup dup/ascii-h.dup
-D_8859D	= dup/vgagr.dup dup/ascii-h.dup
-D_8859G	= dup/vgagr.dup dup/ascii-h.dup
-D_PCIBM	= dup/cntrl.dup dup/ascii-h.dup dup/ibm-437.dup
-D_KOI8R	= dup/cntrl.dup dup/ascii-h.dup dup/koi8.dup
-D_KOI8U	= dup/cntrl.dup dup/ascii-h.dup dup/koi8.dup
-D_BGMIK	= dup/cntrl.dup dup/ascii-h.dup dup/ibm-437.dup
-D_PT154	= dup/vgagr.dup dup/ascii-h.dup
-D_XOS42	= dup/vgagr.dup dup/xos4-2.dup
-
-ter-112n.psf: ter-u12n.bdf $(V_88591) $(D_88591)
-	$(UCS2VGA) ter-u12n.bdf $(R_88591) $(V_88591) | $(BDF2PSF) -o $@ - $(D_88591)
-
-ter-212n.psf: ter-u12n.bdf $(V_88592) $(D_88592)
-	$(UCS2VGA) ter-u12n.bdf $(R_88592) $(V_88592) | $(BDF2PSF) -o $@ - $(D_88592)
-
-ter-712n.psf: ter-u12n.bdf $(V_88597) $(D_88597)
-	$(UCS2VGA) ter-u12n.bdf $(R_88597) $(V_88597) | $(BDF2PSF) -o $@ - $(D_88597)
-
-ter-912n.psf: ter-u12n.bdf $(V_88599) $(D_88599)
-	$(UCS2VGA) ter-u12n.bdf $(R_88599) $(V_88599) | $(BDF2PSF) -o $@ - $(D_88599)
-
-ter-c12n.psf: ter-u12n.bdf $(V_W1251) $(D_W1251)
-	$(UCS2VGA) ter-u12n.bdf $(R_W1251) $(V_W1251) | $(BDF2PSF) -o $@ - $(D_W1251)
-
-ter-d12n.psf: ter-u12n.bdf $(V_8859D) $(D_8859D)
-	$(UCS2VGA) ter-u12n.bdf $(R_8859D) $(V_8859D) | $(BDF2PSF) -o $@ - $(D_8859G)
-
-ter-g12n.psf: ter-u12n.bdf $(V_8859G) $(D_8859G)
-	$(UCS2VGA) ter-u12n.bdf $(R_8859G) $(V_8859G) | $(BDF2PSF) -o $@ - $(D_8859G)
-
-ter-i12n.psf: ter-u12n.bdf $(V_PCIBM) $(D_PCIBM)
-	$(UCS2VGA) ter-u12n.bdf $(R_PCIBM) $(V_PCIBM) | $(BDF2PSF) -o $@ - $(D_PCIBM)
-
-ter-k12n.psf: ter-u12n.bdf $(F_KOI8R) $(D_KOI8R)
-	$(UCS2VGA) ter-u12n.bdf $(R_KOI8R) $(F_KOI8R) | $(BDF2PSF) -o $@ - $(D_KOI8R)
-
-ter-m12n.psf: ter-u12n.bdf $(V_BGMIK) $(D_BGMIK)
-	$(UCS2VGA) ter-u12n.bdf $(R_BGMIK) $(V_BGMIK) | $(BDF2PSF) -o $@ - $(D_BGMIK)
-
-ter-p12n.psf: ter-u12n.bdf $(V_PT154) $(D_PT154)
-	$(UCS2VGA) ter-u12n.bdf $(R_PT154) $(V_PT154) | $(BDF2PSF) -o $@ - $(D_PT154)
-
-ter-u12n.psf: ter-u12n.bdf $(F_KOI8U) $(D_KOI8U)
-	$(UCS2VGA) ter-u12n.bdf $(R_KOI8U) $(F_KOI8U) | $(BDF2PSF) -o $@ - $(D_KOI8U)
-
-ter-v12n.psf: ter-u12n.bdf $(V_XOS42) $(D_XOS42)
-	$(UCS2VGA) ter-u12n.bdf $(R_XOS42) $(V_XOS42) | $(BDF2PSF) -o $@ - $(D_XOS42)
-
-ter-114n.psf: ter-u14n.bdf $(V_88591) $(D_88591)
-	$(UCS2VGA) ter-u14n.bdf $(R_88591) $(V_88591) | $(BDF2PSF) -o $@ - $(D_88591)
-
-ter-114b.psf: ter-u14v.bdf $(V_88591) $(D_88591)
-	$(UCS2VGA) ter-u14v.bdf $(R_88591) $(V_88591) | $(BDF2PSF) -o $@ - $(D_88591)
-
-ter-114f.psf: ter-u14b.bdf $(V_88591) $(D_88591)
-	$(UCS2VGA) ter-u14b.bdf $(R_88591) $(V_88591) | $(BDF2PSF) -o $@ - $(D_88591)
-
-ter-214n.psf: ter-u14n.bdf $(V_88592) $(D_88592)
-	$(UCS2VGA) ter-u14n.bdf $(R_88592) $(V_88592) | $(BDF2PSF) -o $@ - $(D_88592)
-
-ter-214b.psf: ter-u14v.bdf $(V_88592) $(D_88592)
-	$(UCS2VGA) ter-u14v.bdf $(R_88592) $(V_88592) | $(BDF2PSF) -o $@ - $(D_88592)
-
-ter-214f.psf: ter-u14b.bdf $(V_88592) $(D_88592)
-	$(UCS2VGA) ter-u14b.bdf $(R_88592) $(V_88592) | $(BDF2PSF) -o $@ - $(D_88592)
-
-ter-714n.psf: ter-u14n.bdf $(V_88597) $(D_88597)
-	$(UCS2VGA) ter-u14n.bdf $(R_88597) $(V_88597) | $(BDF2PSF) -o $@ - $(D_88597)
-
-ter-714b.psf: ter-u14v.bdf $(V_88597) $(D_88597)
-	$(UCS2VGA) ter-u14v.bdf $(R_88597) $(V_88597) | $(BDF2PSF) -o $@ - $(D_88597)
-
-ter-714f.psf: ter-u14b.bdf $(V_88597) $(D_88597)
-	$(UCS2VGA) ter-u14b.bdf $(R_88597) $(V_88597) | $(BDF2PSF) -o $@ - $(D_88597)
-
-ter-914n.psf: ter-u14n.bdf $(V_88599) $(D_88599)
-	$(UCS2VGA) ter-u14n.bdf $(R_88599) $(V_88599) | $(BDF2PSF) -o $@ - $(D_88599)
-
-ter-914b.psf: ter-u14v.bdf $(V_88599) $(D_88599)
-	$(UCS2VGA) ter-u14v.bdf $(R_88599) $(V_88599) | $(BDF2PSF) -o $@ - $(D_88599)
-
-ter-914f.psf: ter-u14b.bdf $(V_88599) $(D_88599)
-	$(UCS2VGA) ter-u14b.bdf $(R_88599) $(V_88599) | $(BDF2PSF) -o $@ - $(D_88599)
-
-ter-c14n.psf: ter-u14n.bdf $(V_W1251) $(D_W1251)
-	$(UCS2VGA) ter-u14n.bdf $(R_W1251) $(V_W1251) | $(BDF2PSF) -o $@ - $(D_W1251)
-
-ter-c14b.psf: ter-u14v.bdf $(V_W1251) $(D_W1251)
-	$(UCS2VGA) ter-u14v.bdf $(R_W1251) $(V_W1251) | $(BDF2PSF) -o $@ - $(D_W1251)
-
-ter-c14f.psf: ter-u14b.bdf $(V_W1251) $(D_W1251)
-	$(UCS2VGA) ter-u14b.bdf $(R_W1251) $(V_W1251) | $(BDF2PSF) -o $@ - $(D_W1251)
-
-ter-d14n.psf: ter-u14n.bdf $(V_8859D) $(D_8859D)
-	$(UCS2VGA) ter-u14n.bdf $(R_8859D) $(V_8859D) | $(BDF2PSF) -o $@ - $(D_8859G)
-
-ter-d14b.psf: ter-u14v.bdf $(V_8859D) $(D_8859D)
-	$(UCS2VGA) ter-u14v.bdf $(R_8859D) $(V_8859D) | $(BDF2PSF) -o $@ - $(D_8859G)
-
-ter-d14f.psf: ter-u14b.bdf $(V_8859D) $(D_8859D)
-	$(UCS2VGA) ter-u14b.bdf $(R_8859D) $(V_8859D) | $(BDF2PSF) -o $@ - $(D_8859G)
-
-ter-g14n.psf: ter-u14n.bdf $(V_8859G) $(D_8859G)
-	$(UCS2VGA) ter-u14n.bdf $(R_8859G) $(V_8859G) | $(BDF2PSF) -o $@ - $(D_8859G)
-
-ter-g14b.psf: ter-u14v.bdf $(V_8859G) $(D_8859G)
-	$(UCS2VGA) ter-u14v.bdf $(R_8859G) $(V_8859G) | $(BDF2PSF) -o $@ - $(D_8859G)
-
-ter-g14f.psf: ter-u14b.bdf $(V_8859G) $(D_8859G)
-	$(UCS2VGA) ter-u14b.bdf $(R_8859G) $(V_8859G) | $(BDF2PSF) -o $@ - $(D_8859G)
-
-ter-i14n.psf: ter-u14n.bdf $(V_PCIBM) $(D_PCIBM)
-	$(UCS2VGA) ter-u14n.bdf $(R_PCIBM) $(V_PCIBM) | $(BDF2PSF) -o $@ - $(D_PCIBM)
-
-ter-i14b.psf: ter-u14v.bdf $(V_PCIBM) $(D_PCIBM)
-	$(UCS2VGA) ter-u14v.bdf $(R_PCIBM) $(V_PCIBM) | $(BDF2PSF) -o $@ - $(D_PCIBM)
-
-ter-i14f.psf: ter-u14b.bdf $(V_PCIBM) $(D_PCIBM)
-	$(UCS2VGA) ter-u14b.bdf $(R_PCIBM) $(V_PCIBM) | $(BDF2PSF) -o $@ - $(D_PCIBM)
-
-ter-k14n.psf: ter-u14n.bdf $(V_KOI8R) $(D_KOI8R)
-	$(UCS2VGA) ter-u14n.bdf $(R_KOI8R) $(V_KOI8R) | $(BDF2PSF) -o $@ - $(D_KOI8R)
-
-ter-k14b.psf: ter-u14v.bdf $(V_KOI8R) $(D_KOI8R)
-	$(UCS2VGA) ter-u14v.bdf $(R_KOI8R) $(V_KOI8R) | $(BDF2PSF) -o $@ - $(D_KOI8R)
-
-ter-k14f.psf: ter-u14b.bdf $(V_KOI8R) $(D_KOI8R)
-	$(UCS2VGA) ter-u14b.bdf $(R_KOI8R) $(V_KOI8R) | $(BDF2PSF) -o $@ - $(D_KOI8R)
-
-ter-m14n.psf: ter-u14n.bdf $(V_BGMIK) $(D_BGMIK)
-	$(UCS2VGA) ter-u14n.bdf $(R_BGMIK) $(V_BGMIK) | $(BDF2PSF) -o $@ - $(D_BGMIK)
-
-ter-m14b.psf: ter-u14v.bdf $(V_BGMIK) $(D_BGMIK)
-	$(UCS2VGA) ter-u14v.bdf $(R_BGMIK) $(V_BGMIK) | $(BDF2PSF) -o $@ - $(D_BGMIK)
-
-ter-m14f.psf: ter-u14b.bdf $(V_BGMIK) $(D_BGMIK)
-	$(UCS2VGA) ter-u14b.bdf $(R_BGMIK) $(V_BGMIK) | $(BDF2PSF) -o $@ - $(D_BGMIK)
-
-ter-p14n.psf: ter-u14n.bdf $(V_PT154) $(D_PT154)
-	$(UCS2VGA) ter-u14n.bdf $(R_PT154) $(V_PT154) | $(BDF2PSF) -o $@ - $(D_PT154)
-
-ter-p14b.psf: ter-u14v.bdf $(V_PT154) $(D_PT154)
-	$(UCS2VGA) ter-u14v.bdf $(R_PT154) $(V_PT154) | $(BDF2PSF) -o $@ - $(D_PT154)
-
-ter-p14f.psf: ter-u14b.bdf $(V_PT154) $(D_PT154)
-	$(UCS2VGA) ter-u14b.bdf $(R_PT154) $(V_PT154) | $(BDF2PSF) -o $@ - $(D_PT154)
-
-ter-u14n.psf: ter-u14n.bdf $(V_KOI8U) $(D_KOI8U)
-	$(UCS2VGA) ter-u14n.bdf $(R_KOI8U) $(V_KOI8U) | $(BDF2PSF) -o $@ - $(D_KOI8U)
-
-ter-u14b.psf: ter-u14v.bdf $(V_KOI8U) $(D_KOI8U)
-	$(UCS2VGA) ter-u14v.bdf $(R_KOI8U) $(V_KOI8U) | $(BDF2PSF) -o $@ - $(D_KOI8U)
-
-ter-u14f.psf: ter-u14b.bdf $(V_KOI8U) $(D_KOI8U)
-	$(UCS2VGA) ter-u14b.bdf $(R_KOI8U) $(V_KOI8U) | $(BDF2PSF) -o $@ - $(D_KOI8U)
-
-ter-v14n.psf: ter-u14n.bdf $(V_XOS42) $(D_XOS42)
-	$(UCS2VGA) ter-u14n.bdf $(R_XOS42) $(V_XOS42) | $(BDF2PSF) -o $@ - $(D_XOS42)
-
-ter-v14b.psf: ter-u14v.bdf $(V_XOS42) $(D_XOS42)
-	$(UCS2VGA) ter-u14v.bdf $(R_XOS42) $(V_XOS42) | $(BDF2PSF) -o $@ - $(D_XOS42)
-
-ter-v14f.psf: ter-u14b.bdf $(V_XOS42) $(D_XOS42)
-	$(UCS2VGA) ter-u14b.bdf $(R_XOS42) $(V_XOS42) | $(BDF2PSF) -o $@ - $(D_XOS42)
-
-ter-116n.psf: ter-u16n.bdf $(V_88591) $(D_88591)
-	$(UCS2VGA) ter-u16n.bdf $(R_88591) $(V_88591) | $(BDF2PSF) -o $@ - $(D_88591)
-
-ter-116b.psf: ter-u16v.bdf $(V_88591) $(D_88591)
-	$(UCS2VGA) ter-u16v.bdf $(R_88591) $(V_88591) | $(BDF2PSF) -o $@ - $(D_88591)
-
-ter-116f.psf: ter-u16b.bdf $(V_88591) $(D_88591)
-	$(UCS2VGA) ter-u16b.bdf $(R_88591) $(V_88591) | $(BDF2PSF) -o $@ - $(D_88591)
-
-ter-216n.psf: ter-u16n.bdf $(V_88592) $(D_88592)
-	$(UCS2VGA) ter-u16n.bdf $(R_88592) $(V_88592) | $(BDF2PSF) -o $@ - $(D_88592)
-
-ter-216b.psf: ter-u16v.bdf $(V_88592) $(D_88592)
-	$(UCS2VGA) ter-u16v.bdf $(R_88592) $(V_88592) | $(BDF2PSF) -o $@ - $(D_88592)
-
-ter-216f.psf: ter-u16b.bdf $(V_88592) $(D_88592)
-	$(UCS2VGA) ter-u16b.bdf $(R_88592) $(V_88592) | $(BDF2PSF) -o $@ - $(D_88592)
-
-ter-716n.psf: ter-u16n.bdf $(V_88597) $(D_88597)
-	$(UCS2VGA) ter-u16n.bdf $(R_88597) $(V_88597) | $(BDF2PSF) -o $@ - $(D_88597)
-
-ter-716b.psf: ter-u16v.bdf $(V_88597) $(D_88597)
-	$(UCS2VGA) ter-u16v.bdf $(R_88597) $(V_88597) | $(BDF2PSF) -o $@ - $(D_88597)
-
-ter-716f.psf: ter-u16b.bdf $(V_88597) $(D_88597)
-	$(UCS2VGA) ter-u16b.bdf $(R_88597) $(V_88597) | $(BDF2PSF) -o $@ - $(D_88597)
-
-ter-916n.psf: ter-u16n.bdf $(V_88599) $(D_88599)
-	$(UCS2VGA) ter-u16n.bdf $(R_88599) $(V_88599) | $(BDF2PSF) -o $@ - $(D_88599)
-
-ter-916b.psf: ter-u16v.bdf $(V_88599) $(D_88599)
-	$(UCS2VGA) ter-u16v.bdf $(R_88599) $(V_88599) | $(BDF2PSF) -o $@ - $(D_88599)
-
-ter-916f.psf: ter-u16b.bdf $(V_88599) $(D_88599)
-	$(UCS2VGA) ter-u16b.bdf $(R_88599) $(V_88599) | $(BDF2PSF) -o $@ - $(D_88599)
-
-ter-c16n.psf: ter-u16n.bdf $(V_W1251) $(D_W1251)
-	$(UCS2VGA) ter-u16n.bdf $(R_W1251) $(V_W1251) | $(BDF2PSF) -o $@ - $(D_W1251)
-
-ter-c16b.psf: ter-u16v.bdf $(V_W1251) $(D_W1251)
-	$(UCS2VGA) ter-u16v.bdf $(R_W1251) $(V_W1251) | $(BDF2PSF) -o $@ - $(D_W1251)
-
-ter-c16f.psf: ter-u16b.bdf $(V_W1251) $(D_W1251)
-	$(UCS2VGA) ter-u16b.bdf $(R_W1251) $(V_W1251) | $(BDF2PSF) -o $@ - $(D_W1251)
-
-ter-d16n.psf: ter-u16n.bdf $(V_8859D) $(D_8859D)
-	$(UCS2VGA) ter-u16n.bdf $(R_8859D) $(V_8859D) | $(BDF2PSF) -o $@ - $(D_8859G)
-
-ter-d16b.psf: ter-u16v.bdf $(V_8859D) $(D_8859D)
-	$(UCS2VGA) ter-u16v.bdf $(R_8859D) $(V_8859D) | $(BDF2PSF) -o $@ - $(D_8859G)
-
-ter-d16f.psf: ter-u16b.bdf $(V_8859D) $(D_8859D)
-	$(UCS2VGA) ter-u16b.bdf $(R_8859D) $(V_8859D) | $(BDF2PSF) -o $@ - $(D_8859G)
-
-ter-g16n.psf: ter-u16n.bdf $(V_8859G) $(D_8859G)
-	$(UCS2VGA) ter-u16n.bdf $(R_8859G) $(V_8859G) | $(BDF2PSF) -o $@ - $(D_8859G)
-
-ter-g16b.psf: ter-u16v.bdf $(V_8859G) $(D_8859G)
-	$(UCS2VGA) ter-u16v.bdf $(R_8859G) $(V_8859G) | $(BDF2PSF) -o $@ - $(D_8859G)
-
-ter-g16f.psf: ter-u16b.bdf $(V_8859G) $(D_8859G)
-	$(UCS2VGA) ter-u16b.bdf $(R_8859G) $(V_8859G) | $(BDF2PSF) -o $@ - $(D_8859G)
-
-ter-i16n.psf: ter-u16n.bdf $(V_PCIBM) $(D_PCIBM)
-	$(UCS2VGA) ter-u16n.bdf $(R_PCIBM) $(V_PCIBM) | $(BDF2PSF) -o $@ - $(D_PCIBM)
-
-ter-i16b.psf: ter-u16v.bdf $(V_PCIBM) $(D_PCIBM)
-	$(UCS2VGA) ter-u16v.bdf $(R_PCIBM) $(V_PCIBM) | $(BDF2PSF) -o $@ - $(D_PCIBM)
-
-ter-i16f.psf: ter-u16b.bdf $(V_PCIBM) $(D_PCIBM)
-	$(UCS2VGA) ter-u16b.bdf $(R_PCIBM) $(V_PCIBM) | $(BDF2PSF) -o $@ - $(D_PCIBM)
-
-ter-k16n.psf: ter-u16n.bdf $(V_KOI8R) $(D_KOI8R)
-	$(UCS2VGA) ter-u16n.bdf $(R_KOI8R) $(V_KOI8R) | $(BDF2PSF) -o $@ - $(D_KOI8R)
-
-ter-k16b.psf: ter-u16v.bdf $(V_KOI8R) $(D_KOI8R)
-	$(UCS2VGA) ter-u16v.bdf $(R_KOI8R) $(V_KOI8R) | $(BDF2PSF) -o $@ - $(D_KOI8R)
-
-ter-k16f.psf: ter-u16b.bdf $(V_KOI8R) $(D_KOI8R)
-	$(UCS2VGA) ter-u16b.bdf $(R_KOI8R) $(V_KOI8R) | $(BDF2PSF) -o $@ - $(D_KOI8R)
-
-ter-m16n.psf: ter-u16n.bdf $(V_BGMIK) $(D_BGMIK)
-	$(UCS2VGA) ter-u16n.bdf $(R_BGMIK) $(V_BGMIK) | $(BDF2PSF) -o $@ - $(D_BGMIK)
-
-ter-m16b.psf: ter-u16v.bdf $(V_BGMIK) $(D_BGMIK)
-	$(UCS2VGA) ter-u16v.bdf $(R_BGMIK) $(V_BGMIK) | $(BDF2PSF) -o $@ - $(D_BGMIK)
-
-ter-m16f.psf: ter-u16b.bdf $(V_BGMIK) $(D_BGMIK)
-	$(UCS2VGA) ter-u16b.bdf $(R_BGMIK) $(V_BGMIK) | $(BDF2PSF) -o $@ - $(D_BGMIK)
-
-ter-p16n.psf: ter-u16n.bdf $(V_PT154) $(D_PT154)
-	$(UCS2VGA) ter-u16n.bdf $(R_PT154) $(V_PT154) | $(BDF2PSF) -o $@ - $(D_PT154)
-
-ter-p16b.psf: ter-u16v.bdf $(V_PT154) $(D_PT154)
-	$(UCS2VGA) ter-u16v.bdf $(R_PT154) $(V_PT154) | $(BDF2PSF) -o $@ - $(D_PT154)
-
-ter-p16f.psf: ter-u16b.bdf $(V_PT154) $(D_PT154)
-	$(UCS2VGA) ter-u16b.bdf $(R_PT154) $(V_PT154) | $(BDF2PSF) -o $@ - $(D_PT154)
-
-ter-u16n.psf: ter-u16n.bdf $(V_KOI8U) $(D_KOI8U)
-	$(UCS2VGA) ter-u16n.bdf $(R_KOI8U) $(V_KOI8U) | $(BDF2PSF) -o $@ - $(D_KOI8U)
-
-ter-u16b.psf: ter-u16v.bdf $(V_KOI8U) $(D_KOI8U)
-	$(UCS2VGA) ter-u16v.bdf $(R_KOI8U) $(V_KOI8U) | $(BDF2PSF) -o $@ - $(D_KOI8U)
-
-ter-u16f.psf: ter-u16b.bdf $(V_KOI8U) $(D_KOI8U)
-	$(UCS2VGA) ter-u16b.bdf $(R_KOI8U) $(V_KOI8U) | $(BDF2PSF) -o $@ - $(D_KOI8U)
-
-ter-v16n.psf: ter-u16n.bdf $(V_XOS42) $(D_XOS42)
-	$(UCS2VGA) ter-u16n.bdf $(R_XOS42) $(V_XOS42) | $(BDF2PSF) -o $@ - $(D_XOS42)
-
-ter-v16b.psf: ter-u16v.bdf $(V_XOS42) $(D_XOS42)
-	$(UCS2VGA) ter-u16v.bdf $(R_XOS42) $(V_XOS42) | $(BDF2PSF) -o $@ - $(D_XOS42)
-
-ter-v16f.psf: ter-u16b.bdf $(V_XOS42) $(D_XOS42)
-	$(UCS2VGA) ter-u16b.bdf $(R_XOS42) $(V_XOS42) | $(BDF2PSF) -o $@ - $(D_XOS42)
-
-ter-120n.psf: ter-u20n.bdf $(V_88591) $(D_88591)
-	$(UCS2VGA) ter-u20n.bdf $(R_88591) $(V_88591) | $(BDF2PSF) -o $@ - $(D_88591)
-
-ter-120b.psf: ter-u20b.bdf $(V_88591) $(D_88591)
-	$(UCS2VGA) ter-u20b.bdf $(R_88591) $(V_88591) | $(BDF2PSF) -o $@ - $(D_88591)
-
-ter-220n.psf: ter-u20n.bdf $(V_88592) $(D_88592)
-	$(UCS2VGA) ter-u20n.bdf $(R_88592) $(V_88592) | $(BDF2PSF) -o $@ - $(D_88592)
-
-ter-220b.psf: ter-u20b.bdf $(V_88592) $(D_88592)
-	$(UCS2VGA) ter-u20b.bdf $(R_88592) $(V_88592) | $(BDF2PSF) -o $@ - $(D_88592)
-
-ter-720n.psf: ter-u20n.bdf $(V_88597) $(D_88597)
-	$(UCS2VGA) ter-u20n.bdf $(R_88597) $(V_88597) | $(BDF2PSF) -o $@ - $(D_88597)
-
-ter-720b.psf: ter-u20b.bdf $(V_88597) $(D_88597)
-	$(UCS2VGA) ter-u20b.bdf $(R_88597) $(V_88597) | $(BDF2PSF) -o $@ - $(D_88597)
-
-ter-920n.psf: ter-u20n.bdf $(V_88599) $(D_88599)
-	$(UCS2VGA) ter-u20n.bdf $(R_88599) $(V_88599) | $(BDF2PSF) -o $@ - $(D_88599)
-
-ter-920b.psf: ter-u20b.bdf $(V_88599) $(D_88599)
-	$(UCS2VGA) ter-u20b.bdf $(R_88599) $(V_88599) | $(BDF2PSF) -o $@ - $(D_88599)
-
-ter-c20n.psf: ter-u20n.bdf $(V_W1251) $(D_W1251)
-	$(UCS2VGA) ter-u20n.bdf $(R_W1251) $(V_W1251) | $(BDF2PSF) -o $@ - $(D_W1251)
-
-ter-c20b.psf: ter-u20b.bdf $(V_W1251) $(D_W1251)
-	$(UCS2VGA) ter-u20b.bdf $(R_W1251) $(V_W1251) | $(BDF2PSF) -o $@ - $(D_W1251)
-
-ter-d20n.psf: ter-u20n.bdf $(V_8859D) $(D_8859D)
-	$(UCS2VGA) ter-u20n.bdf $(R_8859D) $(V_8859D) | $(BDF2PSF) -o $@ - $(D_8859G)
-
-ter-d20b.psf: ter-u20b.bdf $(V_8859D) $(D_8859D)
-	$(UCS2VGA) ter-u20b.bdf $(R_8859D) $(V_8859D) | $(BDF2PSF) -o $@ - $(D_8859G)
-
-ter-g20n.psf: ter-u20n.bdf $(V_8859G) $(D_8859G)
-	$(UCS2VGA) ter-u20n.bdf $(R_8859G) $(V_8859G) | $(BDF2PSF) -o $@ - $(D_8859G)
-
-ter-g20b.psf: ter-u20b.bdf $(V_8859G) $(D_8859G)
-	$(UCS2VGA) ter-u20b.bdf $(R_8859G) $(V_8859G) | $(BDF2PSF) -o $@ - $(D_8859G)
-
-ter-i20n.psf: ter-u20n.bdf $(V_PCIBM) $(D_PCIBM)
-	$(UCS2VGA) ter-u20n.bdf $(R_PCIBM) $(V_PCIBM) | $(BDF2PSF) -o $@ - $(D_PCIBM)
-
-ter-i20b.psf: ter-u20b.bdf $(V_PCIBM) $(D_PCIBM)
-	$(UCS2VGA) ter-u20b.bdf $(R_PCIBM) $(V_PCIBM) | $(BDF2PSF) -o $@ - $(D_PCIBM)
-
-ter-k20n.psf: ter-u20n.bdf $(F_KOI8R) $(D_KOI8R)
-	$(UCS2VGA) ter-u20n.bdf $(R_KOI8R) $(F_KOI8R) | $(BDF2PSF) -o $@ - $(D_KOI8R)
-
-ter-k20b.psf: ter-u20b.bdf $(F_KOI8R) $(D_KOI8R)
-	$(UCS2VGA) ter-u20b.bdf $(R_KOI8R) $(F_KOI8R) | $(BDF2PSF) -o $@ - $(D_KOI8R)
-
-ter-m20n.psf: ter-u20n.bdf $(V_BGMIK) $(D_BGMIK)
-	$(UCS2VGA) ter-u20n.bdf $(R_BGMIK) $(V_BGMIK) | $(BDF2PSF) -o $@ - $(D_BGMIK)
-
-ter-m20b.psf: ter-u20b.bdf $(V_BGMIK) $(D_BGMIK)
-	$(UCS2VGA) ter-u20b.bdf $(R_BGMIK) $(V_BGMIK) | $(BDF2PSF) -o $@ - $(D_BGMIK)
-
-ter-p20n.psf: ter-u20n.bdf $(V_PT154) $(D_PT154)
-	$(UCS2VGA) ter-u20n.bdf $(R_PT154) $(V_PT154) | $(BDF2PSF) -o $@ - $(D_PT154)
-
-ter-p20b.psf: ter-u20b.bdf $(V_PT154) $(D_PT154)
-	$(UCS2VGA) ter-u20b.bdf $(R_PT154) $(V_PT154) | $(BDF2PSF) -o $@ - $(D_PT154)
-
-ter-u20n.psf: ter-u20n.bdf $(F_KOI8U) $(D_KOI8U)
-	$(UCS2VGA) ter-u20n.bdf $(R_KOI8U) $(F_KOI8U) | $(BDF2PSF) -o $@ - $(D_KOI8U)
-
-ter-u20b.psf: ter-u20b.bdf $(F_KOI8U) $(D_KOI8U)
-	$(UCS2VGA) ter-u20b.bdf $(R_KOI8U) $(F_KOI8U) | $(BDF2PSF) -o $@ - $(D_KOI8U)
-
-ter-v20n.psf: ter-u20n.bdf $(V_XOS42) $(D_XOS42)
-	$(UCS2VGA) ter-u20n.bdf $(R_XOS42) $(V_XOS42) | $(BDF2PSF) -o $@ - $(D_XOS42)
-
-ter-v20b.psf: ter-u20b.bdf $(V_XOS42) $(D_XOS42)
-	$(UCS2VGA) ter-u20b.bdf $(R_XOS42) $(V_XOS42) | $(BDF2PSF) -o $@ - $(D_XOS42)
-
-ter-122n.psf: ter-u22n.bdf $(V_88591) $(D_88591)
-	$(UCS2VGA) ter-u22n.bdf $(R_88591) $(V_88591) | $(BDF2PSF) -o $@ - $(D_88591)
-
-ter-122b.psf: ter-u22b.bdf $(V_88591) $(D_88591)
-	$(UCS2VGA) ter-u22b.bdf $(R_88591) $(V_88591) | $(BDF2PSF) -o $@ - $(D_88591)
-
-ter-222n.psf: ter-u22n.bdf $(V_88592) $(D_88592)
-	$(UCS2VGA) ter-u22n.bdf $(R_88592) $(V_88592) | $(BDF2PSF) -o $@ - $(D_88592)
-
-ter-222b.psf: ter-u22b.bdf $(V_88592) $(D_88592)
-	$(UCS2VGA) ter-u22b.bdf $(R_88592) $(V_88592) | $(BDF2PSF) -o $@ - $(D_88592)
-
-ter-722n.psf: ter-u22n.bdf $(V_88597) $(D_88597)
-	$(UCS2VGA) ter-u22n.bdf $(R_88597) $(V_88597) | $(BDF2PSF) -o $@ - $(D_88597)
-
-ter-722b.psf: ter-u22b.bdf $(V_88597) $(D_88597)
-	$(UCS2VGA) ter-u22b.bdf $(R_88597) $(V_88597) | $(BDF2PSF) -o $@ - $(D_88597)
-
-ter-922n.psf: ter-u22n.bdf $(V_88599) $(D_88599)
-	$(UCS2VGA) ter-u22n.bdf $(R_88599) $(V_88599) | $(BDF2PSF) -o $@ - $(D_88599)
-
-ter-922b.psf: ter-u22b.bdf $(V_88599) $(D_88599)
-	$(UCS2VGA) ter-u22b.bdf $(R_88599) $(V_88599) | $(BDF2PSF) -o $@ - $(D_88599)
-
-ter-c22n.psf: ter-u22n.bdf $(V_W1251) $(D_W1251)
-	$(UCS2VGA) ter-u22n.bdf $(R_W1251) $(V_W1251) | $(BDF2PSF) -o $@ - $(D_W1251)
-
-ter-c22b.psf: ter-u22b.bdf $(V_W1251) $(D_W1251)
-	$(UCS2VGA) ter-u22b.bdf $(R_W1251) $(V_W1251) | $(BDF2PSF) -o $@ - $(D_W1251)
-
-ter-d22n.psf: ter-u22n.bdf $(V_8859D) $(D_8859D)
-	$(UCS2VGA) ter-u22n.bdf $(R_8859D) $(V_8859D) | $(BDF2PSF) -o $@ - $(D_8859G)
-
-ter-d22b.psf: ter-u22b.bdf $(V_8859D) $(D_8859D)
-	$(UCS2VGA) ter-u22b.bdf $(R_8859D) $(V_8859D) | $(BDF2PSF) -o $@ - $(D_8859G)
-
-ter-g22n.psf: ter-u22n.bdf $(V_8859G) $(D_8859G)
-	$(UCS2VGA) ter-u22n.bdf $(R_8859G) $(V_8859G) | $(BDF2PSF) -o $@ - $(D_8859G)
-
-ter-g22b.psf: ter-u22b.bdf $(V_8859G) $(D_8859G)
-	$(UCS2VGA) ter-u22b.bdf $(R_8859G) $(V_8859G) | $(BDF2PSF) -o $@ - $(D_8859G)
-
-ter-i22n.psf: ter-u22n.bdf $(V_PCIBM) $(D_PCIBM)
-	$(UCS2VGA) ter-u22n.bdf $(R_PCIBM) $(V_PCIBM) | $(BDF2PSF) -o $@ - $(D_PCIBM)
-
-ter-i22b.psf: ter-u22b.bdf $(V_PCIBM) $(D_PCIBM)
-	$(UCS2VGA) ter-u22b.bdf $(R_PCIBM) $(V_PCIBM) | $(BDF2PSF) -o $@ - $(D_PCIBM)
-
-ter-k22n.psf: ter-u22n.bdf $(F_KOI8R) $(D_KOI8R)
-	$(UCS2VGA) ter-u22n.bdf $(R_KOI8R) $(F_KOI8R) | $(BDF2PSF) -o $@ - $(D_KOI8R)
-
-ter-k22b.psf: ter-u22b.bdf $(F_KOI8R) $(D_KOI8R)
-	$(UCS2VGA) ter-u22b.bdf $(R_KOI8R) $(F_KOI8R) | $(BDF2PSF) -o $@ - $(D_KOI8R)
-
-ter-m22n.psf: ter-u22n.bdf $(V_BGMIK) $(D_BGMIK)
-	$(UCS2VGA) ter-u22n.bdf $(R_BGMIK) $(V_BGMIK) | $(BDF2PSF) -o $@ - $(D_BGMIK)
-
-ter-m22b.psf: ter-u22b.bdf $(V_BGMIK) $(D_BGMIK)
-	$(UCS2VGA) ter-u22b.bdf $(R_BGMIK) $(V_BGMIK) | $(BDF2PSF) -o $@ - $(D_BGMIK)
-
-ter-p22n.psf: ter-u22n.bdf $(V_PT154) $(D_PT154)
-	$(UCS2VGA) ter-u22n.bdf $(R_PT154) $(V_PT154) | $(BDF2PSF) -o $@ - $(D_PT154)
-
-ter-p22b.psf: ter-u22b.bdf $(V_PT154) $(D_PT154)
-	$(UCS2VGA) ter-u22b.bdf $(R_PT154) $(V_PT154) | $(BDF2PSF) -o $@ - $(D_PT154)
-
-ter-u22n.psf: ter-u22n.bdf $(F_KOI8U) $(D_KOI8U)
-	$(UCS2VGA) ter-u22n.bdf $(R_KOI8U) $(F_KOI8U) | $(BDF2PSF) -o $@ - $(D_KOI8U)
-
-ter-u22b.psf: ter-u22b.bdf $(F_KOI8U) $(D_KOI8U)
-	$(UCS2VGA) ter-u22b.bdf $(R_KOI8U) $(F_KOI8U) | $(BDF2PSF) -o $@ - $(D_KOI8U)
-
-ter-v22n.psf: ter-u22n.bdf $(V_XOS42) $(D_XOS42)
-	$(UCS2VGA) ter-u22n.bdf $(R_XOS42) $(V_XOS42) | $(BDF2PSF) -o $@ - $(D_XOS42)
-
-ter-v22b.psf: ter-u22b.bdf $(V_XOS42) $(D_XOS42)
-	$(UCS2VGA) ter-u22b.bdf $(R_XOS42) $(V_XOS42) | $(BDF2PSF) -o $@ - $(D_XOS42)
-
-ter-124n.psf: ter-u24n.bdf $(V_88591) $(D_88591)
-	$(UCS2VGA) ter-u24n.bdf $(R_88591) $(V_88591) | $(BDF2PSF) -o $@ - $(D_88591)
-
-ter-124b.psf: ter-u24b.bdf $(V_88591) $(D_88591)
-	$(UCS2VGA) ter-u24b.bdf $(R_88591) $(V_88591) | $(BDF2PSF) -o $@ - $(D_88591)
-
-ter-224n.psf: ter-u24n.bdf $(V_88592) $(D_88592)
-	$(UCS2VGA) ter-u24n.bdf $(R_88592) $(V_88592) | $(BDF2PSF) -o $@ - $(D_88592)
-
-ter-224b.psf: ter-u24b.bdf $(V_88592) $(D_88592)
-	$(UCS2VGA) ter-u24b.bdf $(R_88592) $(V_88592) | $(BDF2PSF) -o $@ - $(D_88592)
-
-ter-724n.psf: ter-u24n.bdf $(V_88597) $(D_88597)
-	$(UCS2VGA) ter-u24n.bdf $(R_88597) $(V_88597) | $(BDF2PSF) -o $@ - $(D_88597)
-
-ter-724b.psf: ter-u24b.bdf $(V_88597) $(D_88597)
-	$(UCS2VGA) ter-u24b.bdf $(R_88597) $(V_88597) | $(BDF2PSF) -o $@ - $(D_88597)
-
-ter-924n.psf: ter-u24n.bdf $(V_88599) $(D_88599)
-	$(UCS2VGA) ter-u24n.bdf $(R_88599) $(V_88599) | $(BDF2PSF) -o $@ - $(D_88599)
-
-ter-924b.psf: ter-u24b.bdf $(V_88599) $(D_88599)
-	$(UCS2VGA) ter-u24b.bdf $(R_88599) $(V_88599) | $(BDF2PSF) -o $@ - $(D_88599)
-
-ter-c24n.psf: ter-u24n.bdf $(V_W1251) $(D_W1251)
-	$(UCS2VGA) ter-u24n.bdf $(R_W1251) $(V_W1251) | $(BDF2PSF) -o $@ - $(D_W1251)
-
-ter-c24b.psf: ter-u24b.bdf $(V_W1251) $(D_W1251)
-	$(UCS2VGA) ter-u24b.bdf $(R_W1251) $(V_W1251) | $(BDF2PSF) -o $@ - $(D_W1251)
-
-ter-d24n.psf: ter-u24n.bdf $(V_8859D) $(D_8859D)
-	$(UCS2VGA) ter-u24n.bdf $(R_8859D) $(V_8859D) | $(BDF2PSF) -o $@ - $(D_8859G)
-
-ter-d24b.psf: ter-u24b.bdf $(V_8859D) $(D_8859D)
-	$(UCS2VGA) ter-u24b.bdf $(R_8859D) $(V_8859D) | $(BDF2PSF) -o $@ - $(D_8859G)
-
-ter-g24n.psf: ter-u24n.bdf $(V_8859G) $(D_8859G)
-	$(UCS2VGA) ter-u24n.bdf $(R_8859G) $(V_8859G) | $(BDF2PSF) -o $@ - $(D_8859G)
-
-ter-g24b.psf: ter-u24b.bdf $(V_8859G) $(D_8859G)
-	$(UCS2VGA) ter-u24b.bdf $(R_8859G) $(V_8859G) | $(BDF2PSF) -o $@ - $(D_8859G)
-
-ter-i24n.psf: ter-u24n.bdf $(V_PCIBM) $(D_PCIBM)
-	$(UCS2VGA) ter-u24n.bdf $(R_PCIBM) $(V_PCIBM) | $(BDF2PSF) -o $@ - $(D_PCIBM)
-
-ter-i24b.psf: ter-u24b.bdf $(V_PCIBM) $(D_PCIBM)
-	$(UCS2VGA) ter-u24b.bdf $(R_PCIBM) $(V_PCIBM) | $(BDF2PSF) -o $@ - $(D_PCIBM)
-
-ter-k24n.psf: ter-u24n.bdf $(F_KOI8R) $(D_KOI8R)
-	$(UCS2VGA) ter-u24n.bdf $(R_KOI8R) $(F_KOI8R) | $(BDF2PSF) -o $@ - $(D_KOI8R)
-
-ter-k24b.psf: ter-u24b.bdf $(F_KOI8R) $(D_KOI8R)
-	$(UCS2VGA) ter-u24b.bdf $(R_KOI8R) $(F_KOI8R) | $(BDF2PSF) -o $@ - $(D_KOI8R)
-
-ter-m24n.psf: ter-u24n.bdf $(V_BGMIK) $(D_BGMIK)
-	$(UCS2VGA) ter-u24n.bdf $(R_BGMIK) $(V_BGMIK) | $(BDF2PSF) -o $@ - $(D_BGMIK)
-
-ter-m24b.psf: ter-u24b.bdf $(V_BGMIK) $(D_BGMIK)
-	$(UCS2VGA) ter-u24b.bdf $(R_BGMIK) $(V_BGMIK) | $(BDF2PSF) -o $@ - $(D_BGMIK)
-
-ter-p24n.psf: ter-u24n.bdf $(V_PT154) $(D_PT154)
-	$(UCS2VGA) ter-u24n.bdf $(R_PT154) $(V_PT154) | $(BDF2PSF) -o $@ - $(D_PT154)
-
-ter-p24b.psf: ter-u24b.bdf $(V_PT154) $(D_PT154)
-	$(UCS2VGA) ter-u24b.bdf $(R_PT154) $(V_PT154) | $(BDF2PSF) -o $@ - $(D_PT154)
-
-ter-u24n.psf: ter-u24n.bdf $(F_KOI8U) $(D_KOI8U)
-	$(UCS2VGA) ter-u24n.bdf $(R_KOI8U) $(F_KOI8U) | $(BDF2PSF) -o $@ - $(D_KOI8U)
-
-ter-u24b.psf: ter-u24b.bdf $(F_KOI8U) $(D_KOI8U)
-	$(UCS2VGA) ter-u24b.bdf $(R_KOI8U) $(F_KOI8U) | $(BDF2PSF) -o $@ - $(D_KOI8U)
-
-ter-v24n.psf: ter-u24n.bdf $(V_XOS42) $(D_XOS42)
-	$(UCS2VGA) ter-u24n.bdf $(R_XOS42) $(V_XOS42) | $(BDF2PSF) -o $@ - $(D_XOS42)
-
-ter-v24b.psf: ter-u24b.bdf $(V_XOS42) $(D_XOS42)
-	$(UCS2VGA) ter-u24b.bdf $(R_XOS42) $(V_XOS42) | $(BDF2PSF) -o $@ - $(D_XOS42)
-
-ter-128n.psf: ter-u28n.bdf $(V_88591) $(D_88591)
-	$(UCS2VGA) ter-u28n.bdf $(R_88591) $(V_88591) | $(BDF2PSF) -o $@ - $(D_88591)
-
-ter-128b.psf: ter-u28b.bdf $(V_88591) $(D_88591)
-	$(UCS2VGA) ter-u28b.bdf $(R_88591) $(V_88591) | $(BDF2PSF) -o $@ - $(D_88591)
-
-ter-228n.psf: ter-u28n.bdf $(V_88592) $(D_88592)
-	$(UCS2VGA) ter-u28n.bdf $(R_88592) $(V_88592) | $(BDF2PSF) -o $@ - $(D_88592)
-
-ter-228b.psf: ter-u28b.bdf $(V_88592) $(D_88592)
-	$(UCS2VGA) ter-u28b.bdf $(R_88592) $(V_88592) | $(BDF2PSF) -o $@ - $(D_88592)
-
-ter-728n.psf: ter-u28n.bdf $(V_88597) $(D_88597)
-	$(UCS2VGA) ter-u28n.bdf $(R_88597) $(V_88597) | $(BDF2PSF) -o $@ - $(D_88597)
-
-ter-728b.psf: ter-u28b.bdf $(V_88597) $(D_88597)
-	$(UCS2VGA) ter-u28b.bdf $(R_88597) $(V_88597) | $(BDF2PSF) -o $@ - $(D_88597)
-
-ter-928n.psf: ter-u28n.bdf $(V_88599) $(D_88599)
-	$(UCS2VGA) ter-u28n.bdf $(R_88599) $(V_88599) | $(BDF2PSF) -o $@ - $(D_88599)
-
-ter-928b.psf: ter-u28b.bdf $(V_88599) $(D_88599)
-	$(UCS2VGA) ter-u28b.bdf $(R_88599) $(V_88599) | $(BDF2PSF) -o $@ - $(D_88599)
-
-ter-c28n.psf: ter-u28n.bdf $(V_W1251) $(D_W1251)
-	$(UCS2VGA) ter-u28n.bdf $(R_W1251) $(V_W1251) | $(BDF2PSF) -o $@ - $(D_W1251)
-
-ter-c28b.psf: ter-u28b.bdf $(V_W1251) $(D_W1251)
-	$(UCS2VGA) ter-u28b.bdf $(R_W1251) $(V_W1251) | $(BDF2PSF) -o $@ - $(D_W1251)
-
-ter-d28n.psf: ter-u28n.bdf $(V_8859D) $(D_8859D)
-	$(UCS2VGA) ter-u28n.bdf $(R_8859D) $(V_8859D) | $(BDF2PSF) -o $@ - $(D_8859G)
-
-ter-d28b.psf: ter-u28b.bdf $(V_8859D) $(D_8859D)
-	$(UCS2VGA) ter-u28b.bdf $(R_8859D) $(V_8859D) | $(BDF2PSF) -o $@ - $(D_8859G)
-
-ter-g28n.psf: ter-u28n.bdf $(V_8859G) $(D_8859G)
-	$(UCS2VGA) ter-u28n.bdf $(R_8859G) $(V_8859G) | $(BDF2PSF) -o $@ - $(D_8859G)
-
-ter-g28b.psf: ter-u28b.bdf $(V_8859G) $(D_8859G)
-	$(UCS2VGA) ter-u28b.bdf $(R_8859G) $(V_8859G) | $(BDF2PSF) -o $@ - $(D_8859G)
-
-ter-i28n.psf: ter-u28n.bdf $(V_PCIBM) $(D_PCIBM)
-	$(UCS2VGA) ter-u28n.bdf $(R_PCIBM) $(V_PCIBM) | $(BDF2PSF) -o $@ - $(D_PCIBM)
-
-ter-i28b.psf: ter-u28b.bdf $(V_PCIBM) $(D_PCIBM)
-	$(UCS2VGA) ter-u28b.bdf $(R_PCIBM) $(V_PCIBM) | $(BDF2PSF) -o $@ - $(D_PCIBM)
-
-ter-k28n.psf: ter-u28n.bdf $(F_KOI8R) $(D_KOI8R)
-	$(UCS2VGA) ter-u28n.bdf $(R_KOI8R) $(F_KOI8R) | $(BDF2PSF) -o $@ - $(D_KOI8R)
-
-ter-k28b.psf: ter-u28b.bdf $(F_KOI8R) $(D_KOI8R)
-	$(UCS2VGA) ter-u28b.bdf $(R_KOI8R) $(F_KOI8R) | $(BDF2PSF) -o $@ - $(D_KOI8R)
-
-ter-m28n.psf: ter-u28n.bdf $(V_BGMIK) $(D_BGMIK)
-	$(UCS2VGA) ter-u28n.bdf $(R_BGMIK) $(V_BGMIK) | $(BDF2PSF) -o $@ - $(D_BGMIK)
-
-ter-m28b.psf: ter-u28b.bdf $(V_BGMIK) $(D_BGMIK)
-	$(UCS2VGA) ter-u28b.bdf $(R_BGMIK) $(V_BGMIK) | $(BDF2PSF) -o $@ - $(D_BGMIK)
-
-ter-p28n.psf: ter-u28n.bdf $(V_PT154) $(D_PT154)
-	$(UCS2VGA) ter-u28n.bdf $(R_PT154) $(V_PT154) | $(BDF2PSF) -o $@ - $(D_PT154)
-
-ter-p28b.psf: ter-u28b.bdf $(V_PT154) $(D_PT154)
-	$(UCS2VGA) ter-u28b.bdf $(R_PT154) $(V_PT154) | $(BDF2PSF) -o $@ - $(D_PT154)
-
-ter-u28n.psf: ter-u28n.bdf $(F_KOI8U) $(D_KOI8U)
-	$(UCS2VGA) ter-u28n.bdf $(R_KOI8U) $(F_KOI8U) | $(BDF2PSF) -o $@ - $(D_KOI8U)
-
-ter-u28b.psf: ter-u28b.bdf $(F_KOI8U) $(D_KOI8U)
-	$(UCS2VGA) ter-u28b.bdf $(R_KOI8U) $(F_KOI8U) | $(BDF2PSF) -o $@ - $(D_KOI8U)
-
-ter-v28n.psf: ter-u28n.bdf $(V_XOS42) $(D_XOS42)
-	$(UCS2VGA) ter-u28n.bdf $(R_XOS42) $(V_XOS42) | $(BDF2PSF) -o $@ - $(D_XOS42)
-
-ter-v28b.psf: ter-u28b.bdf $(V_XOS42) $(D_XOS42)
-	$(UCS2VGA) ter-u28b.bdf $(R_XOS42) $(V_XOS42) | $(BDF2PSF) -o $@ - $(D_XOS42)
-
-ter-132n.psf: ter-u32n.bdf $(V_88591) $(D_88591)
-	$(UCS2VGA) ter-u32n.bdf $(R_88591) $(V_88591) | $(BDF2PSF) -o $@ - $(D_88591)
-
-ter-132b.psf: ter-u32b.bdf $(V_88591) $(D_88591)
-	$(UCS2VGA) ter-u32b.bdf $(R_88591) $(V_88591) | $(BDF2PSF) -o $@ - $(D_88591)
-
-ter-232n.psf: ter-u32n.bdf $(V_88592) $(D_88592)
-	$(UCS2VGA) ter-u32n.bdf $(R_88592) $(V_88592) | $(BDF2PSF) -o $@ - $(D_88592)
-
-ter-232b.psf: ter-u32b.bdf $(V_88592) $(D_88592)
-	$(UCS2VGA) ter-u32b.bdf $(R_88592) $(V_88592) | $(BDF2PSF) -o $@ - $(D_88592)
-
-ter-732n.psf: ter-u32n.bdf $(V_88597) $(D_88597)
-	$(UCS2VGA) ter-u32n.bdf $(R_88597) $(V_88597) | $(BDF2PSF) -o $@ - $(D_88597)
-
-ter-732b.psf: ter-u32b.bdf $(V_88597) $(D_88597)
-	$(UCS2VGA) ter-u32b.bdf $(R_88597) $(V_88597) | $(BDF2PSF) -o $@ - $(D_88597)
-
-ter-932n.psf: ter-u32n.bdf $(V_88599) $(D_88599)
-	$(UCS2VGA) ter-u32n.bdf $(R_88599) $(V_88599) | $(BDF2PSF) -o $@ - $(D_88599)
-
-ter-932b.psf: ter-u32b.bdf $(V_88599) $(D_88599)
-	$(UCS2VGA) ter-u32b.bdf $(R_88599) $(V_88599) | $(BDF2PSF) -o $@ - $(D_88599)
-
-ter-c32n.psf: ter-u32n.bdf $(V_W1251) $(D_W1251)
-	$(UCS2VGA) ter-u32n.bdf $(R_W1251) $(V_W1251) | $(BDF2PSF) -o $@ - $(D_W1251)
-
-ter-c32b.psf: ter-u32b.bdf $(V_W1251) $(D_W1251)
-	$(UCS2VGA) ter-u32b.bdf $(R_W1251) $(V_W1251) | $(BDF2PSF) -o $@ - $(D_W1251)
-
-ter-d32n.psf: ter-u32n.bdf $(V_8859D) $(D_8859D)
-	$(UCS2VGA) ter-u32n.bdf $(R_8859D) $(V_8859D) | $(BDF2PSF) -o $@ - $(D_8859G)
-
-ter-d32b.psf: ter-u32b.bdf $(V_8859D) $(D_8859D)
-	$(UCS2VGA) ter-u32b.bdf $(R_8859D) $(V_8859D) | $(BDF2PSF) -o $@ - $(D_8859G)
-
-ter-g32n.psf: ter-u32n.bdf $(V_8859G) $(D_8859G)
-	$(UCS2VGA) ter-u32n.bdf $(R_8859G) $(V_8859G) | $(BDF2PSF) -o $@ - $(D_8859G)
-
-ter-g32b.psf: ter-u32b.bdf $(V_8859G) $(D_8859G)
-	$(UCS2VGA) ter-u32b.bdf $(R_8859G) $(V_8859G) | $(BDF2PSF) -o $@ - $(D_8859G)
-
-ter-i32n.psf: ter-u32n.bdf $(V_PCIBM) $(D_PCIBM)
-	$(UCS2VGA) ter-u32n.bdf $(R_PCIBM) $(V_PCIBM) | $(BDF2PSF) -o $@ - $(D_PCIBM)
-
-ter-i32b.psf: ter-u32b.bdf $(V_PCIBM) $(D_PCIBM)
-	$(UCS2VGA) ter-u32b.bdf $(R_PCIBM) $(V_PCIBM) | $(BDF2PSF) -o $@ - $(D_PCIBM)
-
-ter-k32n.psf: ter-u32n.bdf $(F_KOI8R) $(D_KOI8R)
-	$(UCS2VGA) ter-u32n.bdf $(R_KOI8R) $(F_KOI8R) | $(BDF2PSF) -o $@ - $(D_KOI8R)
-
-ter-k32b.psf: ter-u32b.bdf $(F_KOI8R) $(D_KOI8R)
-	$(UCS2VGA) ter-u32b.bdf $(R_KOI8R) $(F_KOI8R) | $(BDF2PSF) -o $@ - $(D_KOI8R)
-
-ter-m32n.psf: ter-u32n.bdf $(V_BGMIK) $(D_BGMIK)
-	$(UCS2VGA) ter-u32n.bdf $(R_BGMIK) $(V_BGMIK) | $(BDF2PSF) -o $@ - $(D_BGMIK)
-
-ter-m32b.psf: ter-u32b.bdf $(V_BGMIK) $(D_BGMIK)
-	$(UCS2VGA) ter-u32b.bdf $(R_BGMIK) $(V_BGMIK) | $(BDF2PSF) -o $@ - $(D_BGMIK)
-
-ter-p32n.psf: ter-u32n.bdf $(V_PT154) $(D_PT154)
-	$(UCS2VGA) ter-u32n.bdf $(R_PT154) $(V_PT154) | $(BDF2PSF) -o $@ - $(D_PT154)
-
-ter-p32b.psf: ter-u32b.bdf $(V_PT154) $(D_PT154)
-	$(UCS2VGA) ter-u32b.bdf $(R_PT154) $(V_PT154) | $(BDF2PSF) -o $@ - $(D_PT154)
-
-ter-u32n.psf: ter-u32n.bdf $(F_KOI8U) $(D_KOI8U)
-	$(UCS2VGA) ter-u32n.bdf $(R_KOI8U) $(F_KOI8U) | $(BDF2PSF) -o $@ - $(D_KOI8U)
-
-ter-u32b.psf: ter-u32b.bdf $(F_KOI8U) $(D_KOI8U)
-	$(UCS2VGA) ter-u32b.bdf $(R_KOI8U) $(F_KOI8U) | $(BDF2PSF) -o $@ - $(D_KOI8U)
-
-ter-v32n.psf: ter-u32n.bdf $(V_XOS42) $(D_XOS42)
-	$(UCS2VGA) ter-u32n.bdf $(R_XOS42) $(V_XOS42) | $(BDF2PSF) -o $@ - $(D_XOS42)
-
-ter-v32b.psf: ter-u32b.bdf $(V_XOS42) $(D_XOS42)
-	$(UCS2VGA) ter-u32b.bdf $(R_XOS42) $(V_XOS42) | $(BDF2PSF) -o $@ - $(D_XOS42)
-
-install-psf: $(PSF)
-	mkdir -p $(DESTDIR)$(psfdir)
-	for i in $(PSF) ; do gzip -c $$i > $(DESTDIR)$(psfdir)/$$i.gz ; done
-
-uninstall-psf:
-	for i in $(PSF) ; do rm -f $(DESTDIR)$(psfdir)/$$i.gz ; done
-
-T_W1252	= uni/cntrl.uni uni/ascii-h.uni uni/win-1252.uni
-T_W1250	= uni/cntrl.uni uni/ascii-h.uni uni/win-1250.uni
-T_W1253	= uni/cntrl.uni uni/ascii-h.uni uni/win-1253.uni
-T_W1254	= uni/cntrl.uni uni/ascii-h.uni uni/win-1254.uni
-T_W1251	= uni/cntrl.uni uni/ascii-h.uni uni/x11-1251.uni uni/win-1251.uni
-T_W1257	= uni/cntrl.uni uni/ascii-h.uni uni/x11-1257.uni uni/win-1257.uni
-T_8859G	= uni/cntrl.uni uni/ascii-h.uni uni/empty.uni uni/8859-16.uni
-T_PCIBM	= uni/cntrl.uni uni/ascii-h.uni uni/ibm-437.uni
-T_KOI8R	= uni/cntrl.uni uni/ascii-h.uni uni/koi8-r.uni
-T_KOI8U	= uni/cntrl.uni uni/ascii-h.uni uni/koi8-u.uni
-T_BGMIK	= uni/cntrl.uni uni/ascii-h.uni uni/bg-mik.uni
-T_PT154	= uni/cntrl.uni uni/ascii-h.uni uni/pt-154.uni
-T_PT254	= uni/cntrl.uni uni/ascii-h.uni uni/pt-254.uni
-
-cp1252.txt: $(T_W1252)
-	cat $(T_W1252) | $(UNI2TXT) > $@
-
-cp1250.txt: $(T_W1250)
-	cat $(T_W1250) | $(UNI2TXT) > $@
-
-cp1253.txt: $(T_W1253)
-	cat $(T_W1253) | $(UNI2TXT) > $@
-
-cp1254.txt: $(T_W1254)
-	cat $(T_W1254) | $(UNI2TXT) > $@
-
-cp1251.txt: $(T_W1251)
-	cat $(T_W1251) | $(UNI2TXT) > $@
-
-cp1257.txt: $(T_W1257)
-	cat $(T_W1257) | $(UNI2TXT) > $@
-
-8859-16.txt: $(T_8859G)
-	cat $(T_8859G) | $(UNI2TXT) > $@
-
-cp437.txt: $(T_PCIBM)
-	cat $(T_PCIBM) | $(UNI2TXT) > $@
-
-koi8-r.txt: $(T_KOI8R)
-	cat $(T_KOI8R) | $(UNI2TXT) > $@
-
-koi8-u.txt: $(T_KOI8U)
-	cat $(T_KOI8U) | $(UNI2TXT) > $@
-
-mik.txt: $(T_BGMIK)
-	cat $(T_BGMIK) | $(UNI2TXT) > $@
-
-pt154.txt: $(T_PT154)
-	cat $(T_PT154) | $(UNI2TXT) > $@
-
-pt254.txt: $(T_PT254)
-	cat $(T_PT254) | $(UNI2TXT) > $@
-
-TESTDIR	=
-acmdir	= $(prefix)/share/consoletrans
-
-install-acm: $(TXT)
-	mkdir -p $(DESTDIR)$(acmdir)
-	for i in $(TXT) ; do \
-		a=`echo $$i | sed -e "s/\.txt$$/.acm.gz/"` ; \
-		if test ! -f $(TESTDIR)$(acmdir)/$$a ; then \
-			tail -n 128 $$i | grep -v FFFF | gzip > $(DESTDIR)$(acmdir)/$$a ; \
-		fi ; \
-	done
-
-unidir	= $(prefix)/share/kbd/consoletrans
-
-install-uni: $(TXT)
-	mkdir -p $(DESTDIR)$(unidir)
-	for i in $(TXT) ; do \
-		u=`echo $$i | sed -e "s/\.txt$$/_to_uni.trans/"` ; \
-		if test ! -f $(TESTDIR)$(unidir)/$$u ; then \
-			sed -e "s/FFFF/FFFD/" $$i > $(DESTDIR)$(unidir)/$$u ; \
-		fi ; \
-	done
-
-ref	= $(psfdir)/README.terminus
-
-install-ref: README
-	sed -e"/^2\.4/,/^2\.5/p" -n README | grep -v "^2\." > $(DESTDIR)$(ref)
-
-uninstall-ref:
-	rm -f $(DESTDIR)$(ref)
-
-B_88591	= uni/cntrl.uni uni/ascii-h.uni uni/win-1252.uni
-B_88592	= uni/cntrl.uni uni/ascii-h.uni uni/empty.uni uni/8859-2.uni
-B_88595	= uni/cntrl.uni uni/ascii-h.uni uni/empty.uni uni/8859-5.uni
-B_88597	= uni/cntrl.uni uni/ascii-h.uni uni/empty.uni uni/8859-7.uni
-B_88599	= uni/cntrl.uni uni/ascii-h.uni uni/win-1254.uni
-B_W1251	= uni/cntrl.uni uni/ascii-h.uni uni/x11-1251.uni uni/win-1251.uni
-B_8859D	= uni/cntrl.uni uni/ascii-h.uni uni/x11-1257.uni uni/8859-13.uni
-B_8859F	= uni/cntrl.uni uni/ascii-h.uni uni/empty.uni uni/8859-15.uni
-B_8859G	= uni/cntrl.uni uni/ascii-h.uni uni/empty.uni uni/8859-16.uni
-B_PCIBM	= uni/cntrl.uni uni/ascii-h.uni uni/ibm-437.uni
-B_KOI8R	= uni/cntrl.uni uni/ascii-h.uni uni/koi8-r.uni
-B_KOI8U	= uni/cntrl.uni uni/ascii-h.uni uni/koi8-u.uni
-B_PT154	= uni/cntrl.uni uni/ascii-h.uni uni/pt-154.uni
-
-ter-114n.raw: ter-u14n.bdf $(B_88591)
-	$(UCS2VGA) ter-u14n.bdf $(R_88591) $(B_88591) | $(BDF2RAW) -o $@
-
-ter-114b.raw: ter-u14v.bdf $(B_88591)
-	$(UCS2VGA) ter-u14v.bdf $(R_88591) $(B_88591) | $(BDF2RAW) -o $@
-
-ter-114f.raw: ter-u14b.bdf $(B_88591)
-	$(UCS2VGA) ter-u14b.bdf $(R_88591) $(B_88591) | $(BDF2RAW) -o $@
-
-ter-214n.raw: ter-u14n.bdf $(B_88592)
-	$(UCS2VGA) ter-u14n.bdf $(R_88592) $(B_88592) | $(BDF2RAW) -o $@
-
-ter-214b.raw: ter-u14v.bdf $(B_88592)
-	$(UCS2VGA) ter-u14v.bdf $(R_88592) $(B_88592) | $(BDF2RAW) -o $@
-
-ter-214f.raw: ter-u14b.bdf $(B_88592)
-	$(UCS2VGA) ter-u14b.bdf $(R_88592) $(B_88592) | $(BDF2RAW) -o $@
-
-ter-514n.raw: ter-u14n.bdf $(B_88595)
-	$(UCS2VGA) ter-u14n.bdf $(R_88595) $(B_88595) | $(BDF2RAW) -o $@
-
-ter-514b.raw: ter-u14v.bdf $(B_88595)
-	$(UCS2VGA) ter-u14v.bdf $(R_88595) $(B_88595) | $(BDF2RAW) -o $@
-
-ter-514f.raw: ter-u14b.bdf $(B_88595)
-	$(UCS2VGA) ter-u14b.bdf $(R_88595) $(B_88595) | $(BDF2RAW) -o $@
-
-ter-714n.raw: ter-u14n.bdf $(B_88597)
-	$(UCS2VGA) ter-u14n.bdf $(R_88597) $(B_88597) | $(BDF2RAW) -o $@
-
-ter-714b.raw: ter-u14v.bdf $(B_88597)
-	$(UCS2VGA) ter-u14v.bdf $(R_88597) $(B_88597) | $(BDF2RAW) -o $@
-
-ter-714f.raw: ter-u14b.bdf $(B_88597)
-	$(UCS2VGA) ter-u14b.bdf $(R_88597) $(B_88597) | $(BDF2RAW) -o $@
-
-ter-914n.raw: ter-u14n.bdf $(B_88599)
-	$(UCS2VGA) ter-u14n.bdf $(R_88599) $(B_88599) | $(BDF2RAW) -o $@
-
-ter-914b.raw: ter-u14v.bdf $(B_88599)
-	$(UCS2VGA) ter-u14v.bdf $(R_88599) $(B_88599) | $(BDF2RAW) -o $@
-
-ter-914f.raw: ter-u14b.bdf $(B_88599)
-	$(UCS2VGA) ter-u14b.bdf $(R_88599) $(B_88599) | $(BDF2RAW) -o $@
-
-ter-c14n.raw: ter-u14n.bdf $(B_W1251)
-	$(UCS2VGA) ter-u14n.bdf $(R_W1251) $(B_W1251) | $(BDF2RAW) -o $@
-
-ter-c14b.raw: ter-u14v.bdf $(B_W1251)
-	$(UCS2VGA) ter-u14v.bdf $(R_W1251) $(B_W1251) | $(BDF2RAW) -o $@
-
-ter-c14f.raw: ter-u14b.bdf $(B_W1251)
-	$(UCS2VGA) ter-u14b.bdf $(R_W1251) $(B_W1251) | $(BDF2RAW) -o $@
-
-ter-d14n.raw: ter-u14n.bdf $(B_8859D)
-	$(UCS2VGA) ter-u14n.bdf $(R_8859D) $(B_8859D) | $(BDF2RAW) -o $@
-
-ter-d14b.raw: ter-u14v.bdf $(B_8859D)
-	$(UCS2VGA) ter-u14v.bdf $(R_8859D) $(B_8859D) | $(BDF2RAW) -o $@
-
-ter-d14f.raw: ter-u14b.bdf $(B_8859D)
-	$(UCS2VGA) ter-u14b.bdf $(R_8859D) $(B_8859D) | $(BDF2RAW) -o $@
-
-ter-f14n.raw: ter-u14n.bdf $(B_8859F)
-	$(UCS2VGA) ter-u14n.bdf $(R_8859F) $(B_8859F) | $(BDF2RAW) -o $@
-
-ter-f14b.raw: ter-u14v.bdf $(B_8859F)
-	$(UCS2VGA) ter-u14v.bdf $(R_8859F) $(B_8859F) | $(BDF2RAW) -o $@
-
-ter-f14f.raw: ter-u14b.bdf $(B_8859F)
-	$(UCS2VGA) ter-u14b.bdf $(R_8859F) $(B_8859F) | $(BDF2RAW) -o $@
-
-ter-g14n.raw: ter-u14n.bdf $(B_8859G)
-	$(UCS2VGA) ter-u14n.bdf $(R_8859G) $(B_8859G) | $(BDF2RAW) -o $@
-
-ter-g14b.raw: ter-u14v.bdf $(B_8859G)
-	$(UCS2VGA) ter-u14v.bdf $(R_8859G) $(B_8859G) | $(BDF2RAW) -o $@
-
-ter-g14f.raw: ter-u14b.bdf $(B_8859G)
-	$(UCS2VGA) ter-u14b.bdf $(R_8859G) $(B_8859G) | $(BDF2RAW) -o $@
-
-ter-i14n.raw: ter-u14n.bdf $(B_PCIBM)
-	$(UCS2VGA) ter-u14n.bdf $(R_PCIBM) $(B_PCIBM) | $(BDF2RAW) -o $@
-
-ter-i14b.raw: ter-u14v.bdf $(B_PCIBM)
-	$(UCS2VGA) ter-u14v.bdf $(R_PCIBM) $(B_PCIBM) | $(BDF2RAW) -o $@
-
-ter-i14f.raw: ter-u14b.bdf $(B_PCIBM)
-	$(UCS2VGA) ter-u14b.bdf $(R_PCIBM) $(B_PCIBM) | $(BDF2RAW) -o $@
-
-ter-k14n.raw: ter-u14n.bdf $(B_KOI8R)
-	$(UCS2VGA) ter-u14n.bdf $(R_KOI8R) $(B_KOI8R) | $(BDF2RAW) -o $@
-
-ter-k14b.raw: ter-u14v.bdf $(B_KOI8R)
-	$(UCS2VGA) ter-u14v.bdf $(R_KOI8R) $(B_KOI8R) | $(BDF2RAW) -o $@
-
-ter-k14f.raw: ter-u14b.bdf $(B_KOI8R)
-	$(UCS2VGA) ter-u14b.bdf $(R_KOI8R) $(B_KOI8R) | $(BDF2RAW) -o $@
-
-ter-p14n.raw: ter-u14n.bdf $(B_PT154)
-	$(UCS2VGA) ter-u14n.bdf $(R_PT154) $(B_PT154) | $(BDF2RAW) -o $@
-
-ter-p14b.raw: ter-u14v.bdf $(B_PT154)
-	$(UCS2VGA) ter-u14v.bdf $(R_PT154) $(B_PT154) | $(BDF2RAW) -o $@
-
-ter-p14f.raw: ter-u14b.bdf $(B_PT154)
-	$(UCS2VGA) ter-u14b.bdf $(R_PT154) $(B_PT154) | $(BDF2RAW) -o $@
-
-ter-u14n.raw: ter-u14n.bdf $(B_KOI8U)
-	$(UCS2VGA) ter-u14n.bdf $(R_KOI8U) $(B_KOI8U) | $(BDF2RAW) -o $@
-
-ter-u14b.raw: ter-u14v.bdf $(B_KOI8U)
-	$(UCS2VGA) ter-u14v.bdf $(R_KOI8U) $(B_KOI8U) | $(BDF2RAW) -o $@
-
-ter-u14f.raw: ter-u14b.bdf $(B_KOI8U)
-	$(UCS2VGA) ter-u14b.bdf $(R_KOI8U) $(B_KOI8U) | $(BDF2RAW) -o $@
-
-ter-116n.raw: ter-u16n.bdf $(B_88591)
-	$(UCS2VGA) ter-u16n.bdf $(R_88591) $(B_88591) | $(BDF2RAW) -o $@
-
-ter-116b.raw: ter-u16v.bdf $(B_88591)
-	$(UCS2VGA) ter-u16v.bdf $(R_88591) $(B_88591) | $(BDF2RAW) -o $@
-
-ter-116f.raw: ter-u16b.bdf $(B_88591)
-	$(UCS2VGA) ter-u16b.bdf $(R_88591) $(B_88591) | $(BDF2RAW) -o $@
-
-ter-216n.raw: ter-u16n.bdf $(B_88592)
-	$(UCS2VGA) ter-u16n.bdf $(R_88592) $(B_88592) | $(BDF2RAW) -o $@
-
-ter-216b.raw: ter-u16v.bdf $(B_88592)
-	$(UCS2VGA) ter-u16v.bdf $(R_88592) $(B_88592) | $(BDF2RAW) -o $@
-
-ter-216f.raw: ter-u16b.bdf $(B_88592)
-	$(UCS2VGA) ter-u16b.bdf $(R_88592) $(B_88592) | $(BDF2RAW) -o $@
-
-ter-516n.raw: ter-u16n.bdf $(B_88595)
-	$(UCS2VGA) ter-u16n.bdf $(R_88595) $(B_88595) | $(BDF2RAW) -o $@
-
-ter-516b.raw: ter-u16v.bdf $(B_88595)
-	$(UCS2VGA) ter-u16v.bdf $(R_88595) $(B_88595) | $(BDF2RAW) -o $@
-
-ter-516f.raw: ter-u16b.bdf $(B_88595)
-	$(UCS2VGA) ter-u16b.bdf $(R_88595) $(B_88595) | $(BDF2RAW) -o $@
-
-ter-716n.raw: ter-u16n.bdf $(B_88597)
-	$(UCS2VGA) ter-u16n.bdf $(R_88597) $(B_88597) | $(BDF2RAW) -o $@
-
-ter-716b.raw: ter-u16v.bdf $(B_88597)
-	$(UCS2VGA) ter-u16v.bdf $(R_88597) $(B_88597) | $(BDF2RAW) -o $@
-
-ter-716f.raw: ter-u16b.bdf $(B_88597)
-	$(UCS2VGA) ter-u16b.bdf $(R_88597) $(B_88597) | $(BDF2RAW) -o $@
-
-ter-916n.raw: ter-u16n.bdf $(B_88599)
-	$(UCS2VGA) ter-u16n.bdf $(R_88599) $(B_88599) | $(BDF2RAW) -o $@
-
-ter-916b.raw: ter-u16v.bdf $(B_88599)
-	$(UCS2VGA) ter-u16v.bdf $(R_88599) $(B_88599) | $(BDF2RAW) -o $@
-
-ter-916f.raw: ter-u16b.bdf $(B_88599)
-	$(UCS2VGA) ter-u16b.bdf $(R_88599) $(B_88599) | $(BDF2RAW) -o $@
-
-ter-c16n.raw: ter-u16n.bdf $(B_W1251)
-	$(UCS2VGA) ter-u16n.bdf $(R_W1251) $(B_W1251) | $(BDF2RAW) -o $@
-
-ter-c16b.raw: ter-u16v.bdf $(B_W1251)
-	$(UCS2VGA) ter-u16v.bdf $(R_W1251) $(B_W1251) | $(BDF2RAW) -o $@
-
-ter-c16f.raw: ter-u16b.bdf $(B_W1251)
-	$(UCS2VGA) ter-u16b.bdf $(R_W1251) $(B_W1251) | $(BDF2RAW) -o $@
-
-ter-d16n.raw: ter-u16n.bdf $(B_8859D)
-	$(UCS2VGA) ter-u16n.bdf $(R_8859D) $(B_8859D) | $(BDF2RAW) -o $@
-
-ter-d16b.raw: ter-u16v.bdf $(B_8859D)
-	$(UCS2VGA) ter-u16v.bdf $(R_8859D) $(B_8859D) | $(BDF2RAW) -o $@
-
-ter-d16f.raw: ter-u16b.bdf $(B_8859D)
-	$(UCS2VGA) ter-u16b.bdf $(R_8859D) $(B_8859D) | $(BDF2RAW) -o $@
-
-ter-f16n.raw: ter-u16n.bdf $(B_8859F)
-	$(UCS2VGA) ter-u16n.bdf $(R_8859F) $(B_8859F) | $(BDF2RAW) -o $@
-
-ter-f16b.raw: ter-u16v.bdf $(B_8859F)
-	$(UCS2VGA) ter-u16v.bdf $(R_8859F) $(B_8859F) | $(BDF2RAW) -o $@
-
-ter-f16f.raw: ter-u16b.bdf $(B_8859F)
-	$(UCS2VGA) ter-u16b.bdf $(R_8859F) $(B_8859F) | $(BDF2RAW) -o $@
-
-ter-g16n.raw: ter-u16n.bdf $(B_8859G)
-	$(UCS2VGA) ter-u16n.bdf $(R_8859G) $(B_8859G) | $(BDF2RAW) -o $@
-
-ter-g16b.raw: ter-u16v.bdf $(B_8859G)
-	$(UCS2VGA) ter-u16v.bdf $(R_8859G) $(B_8859G) | $(BDF2RAW) -o $@
-
-ter-g16f.raw: ter-u16b.bdf $(B_8859G)
-	$(UCS2VGA) ter-u16b.bdf $(R_8859G) $(B_8859G) | $(BDF2RAW) -o $@
-
-ter-i16n.raw: ter-u16n.bdf $(B_PCIBM)
-	$(UCS2VGA) ter-u16n.bdf $(R_PCIBM) $(B_PCIBM) | $(BDF2RAW) -o $@
-
-ter-i16b.raw: ter-u16v.bdf $(B_PCIBM)
-	$(UCS2VGA) ter-u16v.bdf $(R_PCIBM) $(B_PCIBM) | $(BDF2RAW) -o $@
-
-ter-i16f.raw: ter-u16b.bdf $(B_PCIBM)
-	$(UCS2VGA) ter-u16b.bdf $(R_PCIBM) $(B_PCIBM) | $(BDF2RAW) -o $@
-
-ter-k16n.raw: ter-u16n.bdf $(B_KOI8R)
-	$(UCS2VGA) ter-u16n.bdf $(R_KOI8R) $(B_KOI8R) | $(BDF2RAW) -o $@
-
-ter-k16b.raw: ter-u16v.bdf $(B_KOI8R)
-	$(UCS2VGA) ter-u16v.bdf $(R_KOI8R) $(B_KOI8R) | $(BDF2RAW) -o $@
-
-ter-k16f.raw: ter-u16b.bdf $(B_KOI8R)
-	$(UCS2VGA) ter-u16b.bdf $(R_KOI8R) $(B_KOI8R) | $(BDF2RAW) -o $@
-
-ter-p16n.raw: ter-u16n.bdf $(B_PT154)
-	$(UCS2VGA) ter-u16n.bdf $(R_PT154) $(B_PT154) | $(BDF2RAW) -o $@
-
-ter-p16b.raw: ter-u16v.bdf $(B_PT154)
-	$(UCS2VGA) ter-u16v.bdf $(R_PT154) $(B_PT154) | $(BDF2RAW) -o $@
-
-ter-p16f.raw: ter-u16b.bdf $(B_PT154)
-	$(UCS2VGA) ter-u16b.bdf $(R_PT154) $(B_PT154) | $(BDF2RAW) -o $@
-
-ter-u16n.raw: ter-u16n.bdf $(B_KOI8U)
-	$(UCS2VGA) ter-u16n.bdf $(R_KOI8U) $(B_KOI8U) | $(BDF2RAW) -o $@
-
-ter-u16b.raw: ter-u16v.bdf $(B_KOI8U)
-	$(UCS2VGA) ter-u16v.bdf $(R_KOI8U) $(B_KOI8U) | $(BDF2RAW) -o $@
-
-ter-u16f.raw: ter-u16b.bdf $(B_KOI8U)
-	$(UCS2VGA) ter-u16b.bdf $(R_KOI8U) $(B_KOI8U) | $(BDF2RAW) -o $@
-
-rawdir	= $(prefix)/share/misc/pcvtfonts
-
-RAW_14	= $(RAW_14N) $(RAW_14B) $(RAW_14F)
-RAW_16	= $(RAW_16N) $(RAW_16B) $(RAW_16F)
-
-point14	= echo $$i | sed -e "s/14//" -e "s/raw$$/814/"
-point16	= echo $$i | sed -e "s/16//" -e "s/raw$$/816/"
-
-install.raw: $(RAW)
-	mkdir -p $(DESTDIR)$(rawdir)
-	for i in $(RAW_14) ; do cp -f $$i $(DESTDIR)$(rawdir)/`$(point14)` ; done
-	for i in $(RAW_16) ; do cp -f $$i $(DESTDIR)$(rawdir)/`$(point16)` ; done
-
-uninstall.raw:
-	for i in $(RAW_14) ; do rm -f $(DESTDIR)$(rawdir)/`$(point14)` ; done
-	for i in $(RAW_16) ; do rm -f $(DESTDIR)$(rawdir)/`$(point16)` ; done
-
-minus14	= echo $$i | sed -e "s/14//" -e "s/\.raw$$/-8x14/"
-minus16	= echo $$i | sed -e "s/16//" -e "s/\.raw$$/-8x16/"
-
-install-raw: $(RAW)
-	mkdir -p $(DESTDIR)$(rawdir)
-	for i in $(RAW_14) ; do cp -f $$i $(DESTDIR)$(rawdir)/`$(minus14)` ; done
-	for i in $(RAW_16) ; do cp -f $$i $(DESTDIR)$(rawdir)/`$(minus16)` ; done
-
-uninstall-raw:
-	for i in $(RAW_14) ; do rm -f $(DESTDIR)$(rawdir)/`$(minus14)` ; done
-	for i in $(RAW_16) ; do rm -f $(DESTDIR)$(rawdir)/`$(minus16)` ; done
-
 X_88591	= uni/x11gr.uni uni/ascii-h.uni uni/win-1252.uni
 X_88592	= uni/x11gr.uni uni/ascii-h.uni uni/empty.uni uni/8859-2.uni
 X_88595	= uni/x11gr.uni uni/ascii-h.uni uni/empty.uni uni/8859-5.uni
@@ -1182,643 +65,1067 @@ X_KOI8U	= uni/x11gr.uni uni/ascii-h.uni uni/koi8-u.uni
 X_PT154	= uni/x11gr.uni uni/ascii-h.uni uni/pt-154.uni
 X_10646	= uni/x11gr.uni uni/10646-1.uni
 
-ter-112n.pcf: ter-u12n.bdf $(X_88591)
-	$(UCS2X11) ter-u12n.bdf $(R_88591) $(X_88591) | $(BDF2PCF) -o $@
-
-ter-112b.pcf: ter-u12b.bdf $(X_88591)
-	$(UCS2X11) ter-u12b.bdf $(R_88591) $(X_88591) | $(BDF2PCF) -o $@
-
-ter-212n.pcf: ter-u12n.bdf $(X_88592)
-	$(UCS2X11) ter-u12n.bdf $(R_88592) $(X_88592) | $(BDF2PCF) -o $@
-
-ter-212b.pcf: ter-u12b.bdf $(X_88592)
-	$(UCS2X11) ter-u12b.bdf $(R_88592) $(X_88592) | $(BDF2PCF) -o $@
-
-ter-512n.pcf: ter-u12n.bdf $(X_88595)
-	$(UCS2X11) ter-u12n.bdf $(R_88595) $(X_88595) | $(BDF2PCF) -o $@
-
-ter-512b.pcf: ter-u12b.bdf $(X_88595)
-	$(UCS2X11) ter-u12b.bdf $(R_88595) $(X_88595) | $(BDF2PCF) -o $@
-
-ter-712n.pcf: ter-u12n.bdf $(X_88597)
-	$(UCS2X11) ter-u12n.bdf $(R_88597) $(X_88597) | $(BDF2PCF) -o $@
-
-ter-712b.pcf: ter-u12b.bdf $(X_88597)
-	$(UCS2X11) ter-u12b.bdf $(R_88597) $(X_88597) | $(BDF2PCF) -o $@
-
-ter-912n.pcf: ter-u12n.bdf $(X_88599)
-	$(UCS2X11) ter-u12n.bdf $(R_88599) $(X_88599) | $(BDF2PCF) -o $@
-
-ter-912b.pcf: ter-u12b.bdf $(X_88599)
-	$(UCS2X11) ter-u12b.bdf $(R_88599) $(X_88599) | $(BDF2PCF) -o $@
-
-ter-c12n.pcf: ter-u12n.bdf $(X_W1251)
-	$(UCS2X11) ter-u12n.bdf $(R_W1251) $(X_W1251) | $(BDF2PCF) -o $@
-
-ter-c12b.pcf: ter-u12b.bdf $(X_W1251)
-	$(UCS2X11) ter-u12b.bdf $(R_W1251) $(X_W1251) | $(BDF2PCF) -o $@
-
-ter-d12n.pcf: ter-u12n.bdf $(X_8859D)
-	$(UCS2X11) ter-u12n.bdf $(R_8859D) $(X_8859D) | $(BDF2PCF) -o $@
-
-ter-d12b.pcf: ter-u12b.bdf $(X_8859D)
-	$(UCS2X11) ter-u12b.bdf $(R_8859D) $(X_8859D) | $(BDF2PCF) -o $@
-
-ter-f12n.pcf: ter-u12n.bdf $(X_8859F)
-	$(UCS2X11) ter-u12n.bdf $(R_8859F) $(X_8859F) | $(BDF2PCF) -o $@
-
-ter-f12b.pcf: ter-u12b.bdf $(X_8859F)
-	$(UCS2X11) ter-u12b.bdf $(R_8859F) $(X_8859F) | $(BDF2PCF) -o $@
-
-ter-g12n.pcf: ter-u12n.bdf $(X_8859G)
-	$(UCS2X11) ter-u12n.bdf $(R_8859G) $(X_8859G) | $(BDF2PCF) -o $@
-
-ter-g12b.pcf: ter-u12b.bdf $(X_8859G)
-	$(UCS2X11) ter-u12b.bdf $(R_8859G) $(X_8859G) | $(BDF2PCF) -o $@
-
-ter-k12n.pcf: ter-u12n.bdf $(X_KOI8R)
-	$(UCS2X11) ter-u12n.bdf $(R_KOI8R) $(X_KOI8R) | $(BDF2PCF) -o $@
-
-ter-k12b.pcf: ter-u12b.bdf $(X_KOI8R)
-	$(UCS2X11) ter-u12b.bdf $(R_KOI8R) $(X_KOI8R) | $(BDF2PCF) -o $@
-
-ter-p12n.pcf: ter-u12n.bdf $(X_PT154)
-	$(UCS2X11) ter-u12n.bdf $(R_PT154) $(X_PT154) | $(BDF2PCF) -o $@
-
-ter-p12b.pcf: ter-u12b.bdf $(X_PT154)
-	$(UCS2X11) ter-u12b.bdf $(R_PT154) $(X_PT154) | $(BDF2PCF) -o $@
-
-ter-u12n.pcf: ter-u12n.bdf $(X_KOI8U)
-	$(UCS2X11) ter-u12n.bdf $(R_KOI8U) $(X_KOI8U) | $(BDF2PCF) -o $@
-
-ter-u12b.pcf: ter-u12b.bdf $(X_KOI8U)
-	$(UCS2X11) ter-u12b.bdf $(R_KOI8U) $(X_KOI8U) | $(BDF2PCF) -o $@
-
-ter-x12n.pcf: ter-u12n.bdf $(X_10646)
-	$(UCS2X11) ter-u12n.bdf $(R_10646) $(X_10646) | $(BDF2PCF) -o $@
-
-ter-x12b.pcf: ter-u12b.bdf $(X_10646)
-	$(UCS2X11) ter-u12b.bdf $(R_10646) $(X_10646) | $(BDF2PCF) -o $@
-
-ter-114n.pcf: ter-u14n.bdf $(X_88591)
-	$(UCS2X11) ter-u14n.bdf $(R_88591) $(X_88591) | $(BDF2PCF) -o $@
-
-ter-114b.pcf: ter-u14b.bdf $(X_88591)
-	$(UCS2X11) ter-u14b.bdf $(R_88591) $(X_88591) | $(BDF2PCF) -o $@
-
-ter-214n.pcf: ter-u14n.bdf $(X_88592)
-	$(UCS2X11) ter-u14n.bdf $(R_88592) $(X_88592) | $(BDF2PCF) -o $@
-
-ter-214b.pcf: ter-u14b.bdf $(X_88592)
-	$(UCS2X11) ter-u14b.bdf $(R_88592) $(X_88592) | $(BDF2PCF) -o $@
-
-ter-514n.pcf: ter-u14n.bdf $(X_88595)
-	$(UCS2X11) ter-u14n.bdf $(R_88595) $(X_88595) | $(BDF2PCF) -o $@
-
-ter-514b.pcf: ter-u14b.bdf $(X_88595)
-	$(UCS2X11) ter-u14b.bdf $(R_88595) $(X_88595) | $(BDF2PCF) -o $@
-
-ter-714n.pcf: ter-u14n.bdf $(X_88597)
-	$(UCS2X11) ter-u14n.bdf $(R_88597) $(X_88597) | $(BDF2PCF) -o $@
-
-ter-714b.pcf: ter-u14b.bdf $(X_88597)
-	$(UCS2X11) ter-u14b.bdf $(R_88597) $(X_88597) | $(BDF2PCF) -o $@
-
-ter-914n.pcf: ter-u14n.bdf $(X_88599)
-	$(UCS2X11) ter-u14n.bdf $(R_88599) $(X_88599) | $(BDF2PCF) -o $@
-
-ter-914b.pcf: ter-u14b.bdf $(X_88599)
-	$(UCS2X11) ter-u14b.bdf $(R_88599) $(X_88599) | $(BDF2PCF) -o $@
-
-ter-c14n.pcf: ter-u14n.bdf $(X_W1251)
-	$(UCS2X11) ter-u14n.bdf $(R_W1251) $(X_W1251) | $(BDF2PCF) -o $@
-
-ter-c14b.pcf: ter-u14b.bdf $(X_W1251)
-	$(UCS2X11) ter-u14b.bdf $(R_W1251) $(X_W1251) | $(BDF2PCF) -o $@
-
-ter-d14n.pcf: ter-u14n.bdf $(X_8859D)
-	$(UCS2X11) ter-u14n.bdf $(R_8859D) $(X_8859D) | $(BDF2PCF) -o $@
-
-ter-d14b.pcf: ter-u14b.bdf $(X_8859D)
-	$(UCS2X11) ter-u14b.bdf $(R_8859D) $(X_8859D) | $(BDF2PCF) -o $@
-
-ter-f14n.pcf: ter-u14n.bdf $(X_8859F)
-	$(UCS2X11) ter-u14n.bdf $(R_8859F) $(X_8859F) | $(BDF2PCF) -o $@
-
-ter-f14b.pcf: ter-u14b.bdf $(X_8859F)
-	$(UCS2X11) ter-u14b.bdf $(R_8859F) $(X_8859F) | $(BDF2PCF) -o $@
-
-ter-g14n.pcf: ter-u14n.bdf $(X_8859G)
-	$(UCS2X11) ter-u14n.bdf $(R_8859G) $(X_8859G) | $(BDF2PCF) -o $@
-
-ter-g14b.pcf: ter-u14b.bdf $(X_8859G)
-	$(UCS2X11) ter-u14b.bdf $(R_8859G) $(X_8859G) | $(BDF2PCF) -o $@
-
-ter-k14n.pcf: ter-u14n.bdf $(X_KOI8R)
-	$(UCS2X11) ter-u14n.bdf $(R_KOI8R) $(X_KOI8R) | $(BDF2PCF) -o $@
-
-ter-k14b.pcf: ter-u14b.bdf $(X_KOI8R)
-	$(UCS2X11) ter-u14b.bdf $(R_KOI8R) $(X_KOI8R) | $(BDF2PCF) -o $@
-
-ter-p14n.pcf: ter-u14n.bdf $(X_PT154)
-	$(UCS2X11) ter-u14n.bdf $(R_PT154) $(X_PT154) | $(BDF2PCF) -o $@
-
-ter-p14b.pcf: ter-u14b.bdf $(X_PT154)
-	$(UCS2X11) ter-u14b.bdf $(R_PT154) $(X_PT154) | $(BDF2PCF) -o $@
-
-ter-u14n.pcf: ter-u14n.bdf $(X_KOI8U)
-	$(UCS2X11) ter-u14n.bdf $(R_KOI8U) $(X_KOI8U) | $(BDF2PCF) -o $@
-
-ter-u14b.pcf: ter-u14b.bdf $(X_KOI8U)
-	$(UCS2X11) ter-u14b.bdf $(R_KOI8U) $(X_KOI8U) | $(BDF2PCF) -o $@
-
-ter-x14n.pcf: ter-u14n.bdf $(X_10646)
-	$(UCS2X11) ter-u14n.bdf $(R_10646) $(X_10646) | $(BDF2PCF) -o $@
-
-ter-x14b.pcf: ter-u14b.bdf $(X_10646)
-	$(UCS2X11) ter-u14b.bdf $(R_10646) $(X_10646) | $(BDF2PCF) -o $@
-
-ter-116n.pcf: ter-u16n.bdf $(X_88591)
-	$(UCS2X11) ter-u16n.bdf $(R_88591) $(X_88591) | $(BDF2PCF) -o $@
-
-ter-116b.pcf: ter-u16b.bdf $(X_88591)
-	$(UCS2X11) ter-u16b.bdf $(R_88591) $(X_88591) | $(BDF2PCF) -o $@
-
-ter-216n.pcf: ter-u16n.bdf $(X_88592)
-	$(UCS2X11) ter-u16n.bdf $(R_88592) $(X_88592) | $(BDF2PCF) -o $@
-
-ter-216b.pcf: ter-u16b.bdf $(X_88592)
-	$(UCS2X11) ter-u16b.bdf $(R_88592) $(X_88592) | $(BDF2PCF) -o $@
-
-ter-516n.pcf: ter-u16n.bdf $(X_88595)
-	$(UCS2X11) ter-u16n.bdf $(R_88595) $(X_88595) | $(BDF2PCF) -o $@
-
-ter-516b.pcf: ter-u16b.bdf $(X_88595)
-	$(UCS2X11) ter-u16b.bdf $(R_88595) $(X_88595) | $(BDF2PCF) -o $@
-
-ter-716n.pcf: ter-u16n.bdf $(X_88597)
-	$(UCS2X11) ter-u16n.bdf $(R_88597) $(X_88597) | $(BDF2PCF) -o $@
-
-ter-716b.pcf: ter-u16b.bdf $(X_88597)
-	$(UCS2X11) ter-u16b.bdf $(R_88597) $(X_88597) | $(BDF2PCF) -o $@
-
-ter-916n.pcf: ter-u16n.bdf $(X_88599)
-	$(UCS2X11) ter-u16n.bdf $(R_88599) $(X_88599) | $(BDF2PCF) -o $@
-
-ter-916b.pcf: ter-u16b.bdf $(X_88599)
-	$(UCS2X11) ter-u16b.bdf $(R_88599) $(X_88599) | $(BDF2PCF) -o $@
-
-ter-c16n.pcf: ter-u16n.bdf $(X_W1251)
-	$(UCS2X11) ter-u16n.bdf $(R_W1251) $(X_W1251) | $(BDF2PCF) -o $@
-
-ter-c16b.pcf: ter-u16b.bdf $(X_W1251)
-	$(UCS2X11) ter-u16b.bdf $(R_W1251) $(X_W1251) | $(BDF2PCF) -o $@
-
-ter-d16n.pcf: ter-u16n.bdf $(X_8859D)
-	$(UCS2X11) ter-u16n.bdf $(R_8859D) $(X_8859D) | $(BDF2PCF) -o $@
-
-ter-d16b.pcf: ter-u16b.bdf $(X_8859D)
-	$(UCS2X11) ter-u16b.bdf $(R_8859D) $(X_8859D) | $(BDF2PCF) -o $@
-
-ter-f16n.pcf: ter-u16n.bdf $(X_8859F)
-	$(UCS2X11) ter-u16n.bdf $(R_8859F) $(X_8859F) | $(BDF2PCF) -o $@
-
-ter-f16b.pcf: ter-u16b.bdf $(X_8859F)
-	$(UCS2X11) ter-u16b.bdf $(R_8859F) $(X_8859F) | $(BDF2PCF) -o $@
-
-ter-g16n.pcf: ter-u16n.bdf $(X_8859G)
-	$(UCS2X11) ter-u16n.bdf $(R_8859G) $(X_8859G) | $(BDF2PCF) -o $@
-
-ter-g16b.pcf: ter-u16b.bdf $(X_8859G)
-	$(UCS2X11) ter-u16b.bdf $(R_8859G) $(X_8859G) | $(BDF2PCF) -o $@
-
-ter-k16n.pcf: ter-u16n.bdf $(X_KOI8R)
-	$(UCS2X11) ter-u16n.bdf $(R_KOI8R) $(X_KOI8R) | $(BDF2PCF) -o $@
-
-ter-k16b.pcf: ter-u16b.bdf $(X_KOI8R)
-	$(UCS2X11) ter-u16b.bdf $(R_KOI8R) $(X_KOI8R) | $(BDF2PCF) -o $@
-
-ter-p16n.pcf: ter-u16n.bdf $(X_PT154)
-	$(UCS2X11) ter-u16n.bdf $(R_PT154) $(X_PT154) | $(BDF2PCF) -o $@
-
-ter-p16b.pcf: ter-u16b.bdf $(X_PT154)
-	$(UCS2X11) ter-u16b.bdf $(R_PT154) $(X_PT154) | $(BDF2PCF) -o $@
-
-ter-u16n.pcf: ter-u16n.bdf $(X_KOI8U)
-	$(UCS2X11) ter-u16n.bdf $(R_KOI8U) $(X_KOI8U) | $(BDF2PCF) -o $@
-
-ter-u16b.pcf: ter-u16b.bdf $(X_KOI8U)
-	$(UCS2X11) ter-u16b.bdf $(R_KOI8U) $(X_KOI8U) | $(BDF2PCF) -o $@
-
-ter-x16n.pcf: ter-u16n.bdf $(X_10646)
-	$(UCS2X11) ter-u16n.bdf $(R_10646) $(X_10646) | $(BDF2PCF) -o $@
-
-ter-x16b.pcf: ter-u16b.bdf $(X_10646)
-	$(UCS2X11) ter-u16b.bdf $(R_10646) $(X_10646) | $(BDF2PCF) -o $@
-
-ter-120n.pcf: ter-u20n.bdf $(X_88591)
-	$(UCS2X11) ter-u20n.bdf $(R_88591) $(X_88591) | $(BDF2PCF) -o $@
-
-ter-120b.pcf: ter-u20b.bdf $(X_88591)
-	$(UCS2X11) ter-u20b.bdf $(R_88591) $(X_88591) | $(BDF2PCF) -o $@
-
-ter-220n.pcf: ter-u20n.bdf $(X_88592)
-	$(UCS2X11) ter-u20n.bdf $(R_88592) $(X_88592) | $(BDF2PCF) -o $@
-
-ter-220b.pcf: ter-u20b.bdf $(X_88592)
-	$(UCS2X11) ter-u20b.bdf $(R_88592) $(X_88592) | $(BDF2PCF) -o $@
-
-ter-520n.pcf: ter-u20n.bdf $(X_88595)
-	$(UCS2X11) ter-u20n.bdf $(R_88595) $(X_88595) | $(BDF2PCF) -o $@
-
-ter-520b.pcf: ter-u20b.bdf $(X_88595)
-	$(UCS2X11) ter-u20b.bdf $(R_88595) $(X_88595) | $(BDF2PCF) -o $@
-
-ter-720n.pcf: ter-u20n.bdf $(X_88597)
-	$(UCS2X11) ter-u20n.bdf $(R_88597) $(X_88597) | $(BDF2PCF) -o $@
-
-ter-720b.pcf: ter-u20b.bdf $(X_88597)
-	$(UCS2X11) ter-u20b.bdf $(R_88597) $(X_88597) | $(BDF2PCF) -o $@
-
-ter-920n.pcf: ter-u20n.bdf $(X_88599)
-	$(UCS2X11) ter-u20n.bdf $(R_88599) $(X_88599) | $(BDF2PCF) -o $@
-
-ter-920b.pcf: ter-u20b.bdf $(X_88599)
-	$(UCS2X11) ter-u20b.bdf $(R_88599) $(X_88599) | $(BDF2PCF) -o $@
-
-ter-c20n.pcf: ter-u20n.bdf $(X_W1251)
-	$(UCS2X11) ter-u20n.bdf $(R_W1251) $(X_W1251) | $(BDF2PCF) -o $@
-
-ter-c20b.pcf: ter-u20b.bdf $(X_W1251)
-	$(UCS2X11) ter-u20b.bdf $(R_W1251) $(X_W1251) | $(BDF2PCF) -o $@
-
-ter-d20n.pcf: ter-u20n.bdf $(X_8859D)
-	$(UCS2X11) ter-u20n.bdf $(R_8859D) $(X_8859D) | $(BDF2PCF) -o $@
-
-ter-d20b.pcf: ter-u20b.bdf $(X_8859D)
-	$(UCS2X11) ter-u20b.bdf $(R_8859D) $(X_8859D) | $(BDF2PCF) -o $@
-
-ter-f20n.pcf: ter-u20n.bdf $(X_8859F)
-	$(UCS2X11) ter-u20n.bdf $(R_8859F) $(X_8859F) | $(BDF2PCF) -o $@
-
-ter-f20b.pcf: ter-u20b.bdf $(X_8859F)
-	$(UCS2X11) ter-u20b.bdf $(R_8859F) $(X_8859F) | $(BDF2PCF) -o $@
-
-ter-g20n.pcf: ter-u20n.bdf $(X_8859G)
-	$(UCS2X11) ter-u20n.bdf $(R_8859G) $(X_8859G) | $(BDF2PCF) -o $@
-
-ter-g20b.pcf: ter-u20b.bdf $(X_8859G)
-	$(UCS2X11) ter-u20b.bdf $(R_8859G) $(X_8859G) | $(BDF2PCF) -o $@
-
-ter-k20n.pcf: ter-u20n.bdf $(X_KOI8R)
-	$(UCS2X11) ter-u20n.bdf $(R_KOI8R) $(X_KOI8R) | $(BDF2PCF) -o $@
-
-ter-k20b.pcf: ter-u20b.bdf $(X_KOI8R)
-	$(UCS2X11) ter-u20b.bdf $(R_KOI8R) $(X_KOI8R) | $(BDF2PCF) -o $@
-
-ter-p20n.pcf: ter-u20n.bdf $(X_PT154)
-	$(UCS2X11) ter-u20n.bdf $(R_PT154) $(X_PT154) | $(BDF2PCF) -o $@
-
-ter-p20b.pcf: ter-u20b.bdf $(X_PT154)
-	$(UCS2X11) ter-u20b.bdf $(R_PT154) $(X_PT154) | $(BDF2PCF) -o $@
-
-ter-u20n.pcf: ter-u20n.bdf $(X_KOI8U)
-	$(UCS2X11) ter-u20n.bdf $(R_KOI8U) $(X_KOI8U) | $(BDF2PCF) -o $@
-
-ter-u20b.pcf: ter-u20b.bdf $(X_KOI8U)
-	$(UCS2X11) ter-u20b.bdf $(R_KOI8U) $(X_KOI8U) | $(BDF2PCF) -o $@
-
-ter-x20n.pcf: ter-u20n.bdf $(X_10646)
-	$(UCS2X11) ter-u20n.bdf $(R_10646) $(X_10646) | $(BDF2PCF) -o $@
-
-ter-x20b.pcf: ter-u20b.bdf $(X_10646)
-	$(UCS2X11) ter-u20b.bdf $(R_10646) $(X_10646) | $(BDF2PCF) -o $@
-
-ter-122n.pcf: ter-u22n.bdf $(X_88591)
-	$(UCS2X11) ter-u22n.bdf $(R_88591) $(X_88591) | $(BDF2PCF) -o $@
-
-ter-122b.pcf: ter-u22b.bdf $(X_88591)
-	$(UCS2X11) ter-u22b.bdf $(R_88591) $(X_88591) | $(BDF2PCF) -o $@
-
-ter-222n.pcf: ter-u22n.bdf $(X_88592)
-	$(UCS2X11) ter-u22n.bdf $(R_88592) $(X_88592) | $(BDF2PCF) -o $@
-
-ter-222b.pcf: ter-u22b.bdf $(X_88592)
-	$(UCS2X11) ter-u22b.bdf $(R_88592) $(X_88592) | $(BDF2PCF) -o $@
-
-ter-522n.pcf: ter-u22n.bdf $(X_88595)
-	$(UCS2X11) ter-u22n.bdf $(R_88595) $(X_88595) | $(BDF2PCF) -o $@
-
-ter-522b.pcf: ter-u22b.bdf $(X_88595)
-	$(UCS2X11) ter-u22b.bdf $(R_88595) $(X_88595) | $(BDF2PCF) -o $@
-
-ter-722n.pcf: ter-u22n.bdf $(X_88597)
-	$(UCS2X11) ter-u22n.bdf $(R_88597) $(X_88597) | $(BDF2PCF) -o $@
-
-ter-722b.pcf: ter-u22b.bdf $(X_88597)
-	$(UCS2X11) ter-u22b.bdf $(R_88597) $(X_88597) | $(BDF2PCF) -o $@
-
-ter-922n.pcf: ter-u22n.bdf $(X_88599)
-	$(UCS2X11) ter-u22n.bdf $(R_88599) $(X_88599) | $(BDF2PCF) -o $@
-
-ter-922b.pcf: ter-u22b.bdf $(X_88599)
-	$(UCS2X11) ter-u22b.bdf $(R_88599) $(X_88599) | $(BDF2PCF) -o $@
-
-ter-c22n.pcf: ter-u22n.bdf $(X_W1251)
-	$(UCS2X11) ter-u22n.bdf $(R_W1251) $(X_W1251) | $(BDF2PCF) -o $@
-
-ter-c22b.pcf: ter-u22b.bdf $(X_W1251)
-	$(UCS2X11) ter-u22b.bdf $(R_W1251) $(X_W1251) | $(BDF2PCF) -o $@
-
-ter-d22n.pcf: ter-u22n.bdf $(X_8859D)
-	$(UCS2X11) ter-u22n.bdf $(R_8859D) $(X_8859D) | $(BDF2PCF) -o $@
-
-ter-d22b.pcf: ter-u22b.bdf $(X_8859D)
-	$(UCS2X11) ter-u22b.bdf $(R_8859D) $(X_8859D) | $(BDF2PCF) -o $@
-
-ter-f22n.pcf: ter-u22n.bdf $(X_8859F)
-	$(UCS2X11) ter-u22n.bdf $(R_8859F) $(X_8859F) | $(BDF2PCF) -o $@
-
-ter-f22b.pcf: ter-u22b.bdf $(X_8859F)
-	$(UCS2X11) ter-u22b.bdf $(R_8859F) $(X_8859F) | $(BDF2PCF) -o $@
-
-ter-g22n.pcf: ter-u22n.bdf $(X_8859G)
-	$(UCS2X11) ter-u22n.bdf $(R_8859G) $(X_8859G) | $(BDF2PCF) -o $@
-
-ter-g22b.pcf: ter-u22b.bdf $(X_8859G)
-	$(UCS2X11) ter-u22b.bdf $(R_8859G) $(X_8859G) | $(BDF2PCF) -o $@
-
-ter-k22n.pcf: ter-u22n.bdf $(X_KOI8R)
-	$(UCS2X11) ter-u22n.bdf $(R_KOI8R) $(X_KOI8R) | $(BDF2PCF) -o $@
-
-ter-k22b.pcf: ter-u22b.bdf $(X_KOI8R)
-	$(UCS2X11) ter-u22b.bdf $(R_KOI8R) $(X_KOI8R) | $(BDF2PCF) -o $@
-
-ter-p22n.pcf: ter-u22n.bdf $(X_PT154)
-	$(UCS2X11) ter-u22n.bdf $(R_PT154) $(X_PT154) | $(BDF2PCF) -o $@
-
-ter-p22b.pcf: ter-u22b.bdf $(X_PT154)
-	$(UCS2X11) ter-u22b.bdf $(R_PT154) $(X_PT154) | $(BDF2PCF) -o $@
-
-ter-u22n.pcf: ter-u22n.bdf $(X_KOI8U)
-	$(UCS2X11) ter-u22n.bdf $(R_KOI8U) $(X_KOI8U) | $(BDF2PCF) -o $@
-
-ter-u22b.pcf: ter-u22b.bdf $(X_KOI8U)
-	$(UCS2X11) ter-u22b.bdf $(R_KOI8U) $(X_KOI8U) | $(BDF2PCF) -o $@
-
-ter-x22n.pcf: ter-u22n.bdf $(X_10646)
-	$(UCS2X11) ter-u22n.bdf $(R_10646) $(X_10646) | $(BDF2PCF) -o $@
-
-ter-x22b.pcf: ter-u22b.bdf $(X_10646)
-	$(UCS2X11) ter-u22b.bdf $(R_10646) $(X_10646) | $(BDF2PCF) -o $@
-
-ter-124n.pcf: ter-u24n.bdf $(X_88591)
-	$(UCS2X11) ter-u24n.bdf $(R_88591) $(X_88591) | $(BDF2PCF) -o $@
-
-ter-124b.pcf: ter-u24b.bdf $(X_88591)
-	$(UCS2X11) ter-u24b.bdf $(R_88591) $(X_88591) | $(BDF2PCF) -o $@
-
-ter-224n.pcf: ter-u24n.bdf $(X_88592)
-	$(UCS2X11) ter-u24n.bdf $(R_88592) $(X_88592) | $(BDF2PCF) -o $@
-
-ter-224b.pcf: ter-u24b.bdf $(X_88592)
-	$(UCS2X11) ter-u24b.bdf $(R_88592) $(X_88592) | $(BDF2PCF) -o $@
-
-ter-524n.pcf: ter-u24n.bdf $(X_88595)
-	$(UCS2X11) ter-u24n.bdf $(R_88595) $(X_88595) | $(BDF2PCF) -o $@
-
-ter-524b.pcf: ter-u24b.bdf $(X_88595)
-	$(UCS2X11) ter-u24b.bdf $(R_88595) $(X_88595) | $(BDF2PCF) -o $@
-
-ter-724n.pcf: ter-u24n.bdf $(X_88597)
-	$(UCS2X11) ter-u24n.bdf $(R_88597) $(X_88597) | $(BDF2PCF) -o $@
-
-ter-724b.pcf: ter-u24b.bdf $(X_88597)
-	$(UCS2X11) ter-u24b.bdf $(R_88597) $(X_88597) | $(BDF2PCF) -o $@
-
-ter-924n.pcf: ter-u24n.bdf $(X_88599)
-	$(UCS2X11) ter-u24n.bdf $(R_88599) $(X_88599) | $(BDF2PCF) -o $@
-
-ter-924b.pcf: ter-u24b.bdf $(X_88599)
-	$(UCS2X11) ter-u24b.bdf $(R_88599) $(X_88599) | $(BDF2PCF) -o $@
-
-ter-c24n.pcf: ter-u24n.bdf $(X_W1251)
-	$(UCS2X11) ter-u24n.bdf $(R_W1251) $(X_W1251) | $(BDF2PCF) -o $@
-
-ter-c24b.pcf: ter-u24b.bdf $(X_W1251)
-	$(UCS2X11) ter-u24b.bdf $(R_W1251) $(X_W1251) | $(BDF2PCF) -o $@
-
-ter-d24n.pcf: ter-u24n.bdf $(X_8859D)
-	$(UCS2X11) ter-u24n.bdf $(R_8859D) $(X_8859D) | $(BDF2PCF) -o $@
-
-ter-d24b.pcf: ter-u24b.bdf $(X_8859D)
-	$(UCS2X11) ter-u24b.bdf $(R_8859D) $(X_8859D) | $(BDF2PCF) -o $@
-
-ter-f24n.pcf: ter-u24n.bdf $(X_8859F)
-	$(UCS2X11) ter-u24n.bdf $(R_8859F) $(X_8859F) | $(BDF2PCF) -o $@
-
-ter-f24b.pcf: ter-u24b.bdf $(X_8859F)
-	$(UCS2X11) ter-u24b.bdf $(R_8859F) $(X_8859F) | $(BDF2PCF) -o $@
-
-ter-g24n.pcf: ter-u24n.bdf $(X_8859G)
-	$(UCS2X11) ter-u24n.bdf $(R_8859G) $(X_8859G) | $(BDF2PCF) -o $@
-
-ter-g24b.pcf: ter-u24b.bdf $(X_8859G)
-	$(UCS2X11) ter-u24b.bdf $(R_8859G) $(X_8859G) | $(BDF2PCF) -o $@
-
-ter-k24n.pcf: ter-u24n.bdf $(X_KOI8R)
-	$(UCS2X11) ter-u24n.bdf $(R_KOI8R) $(X_KOI8R) | $(BDF2PCF) -o $@
-
-ter-k24b.pcf: ter-u24b.bdf $(X_KOI8R)
-	$(UCS2X11) ter-u24b.bdf $(R_KOI8R) $(X_KOI8R) | $(BDF2PCF) -o $@
-
-ter-p24n.pcf: ter-u24n.bdf $(X_PT154)
-	$(UCS2X11) ter-u24n.bdf $(R_PT154) $(X_PT154) | $(BDF2PCF) -o $@
-
-ter-p24b.pcf: ter-u24b.bdf $(X_PT154)
-	$(UCS2X11) ter-u24b.bdf $(R_PT154) $(X_PT154) | $(BDF2PCF) -o $@
-
-ter-u24n.pcf: ter-u24n.bdf $(X_KOI8U)
-	$(UCS2X11) ter-u24n.bdf $(R_KOI8U) $(X_KOI8U) | $(BDF2PCF) -o $@
-
-ter-u24b.pcf: ter-u24b.bdf $(X_KOI8U)
-	$(UCS2X11) ter-u24b.bdf $(R_KOI8U) $(X_KOI8U) | $(BDF2PCF) -o $@
-
-ter-x24n.pcf: ter-u24n.bdf $(X_10646)
-	$(UCS2X11) ter-u24n.bdf $(R_10646) $(X_10646) | $(BDF2PCF) -o $@
-
-ter-x24b.pcf: ter-u24b.bdf $(X_10646)
-	$(UCS2X11) ter-u24b.bdf $(R_10646) $(X_10646) | $(BDF2PCF) -o $@
-
-ter-128n.pcf: ter-u28n.bdf $(X_88591)
-	$(UCS2X11) ter-u28n.bdf $(R_88591) $(X_88591) | $(BDF2PCF) -o $@
-
-ter-128b.pcf: ter-u28b.bdf $(X_88591)
-	$(UCS2X11) ter-u28b.bdf $(R_88591) $(X_88591) | $(BDF2PCF) -o $@
-
-ter-228n.pcf: ter-u28n.bdf $(X_88592)
-	$(UCS2X11) ter-u28n.bdf $(R_88592) $(X_88592) | $(BDF2PCF) -o $@
-
-ter-228b.pcf: ter-u28b.bdf $(X_88592)
-	$(UCS2X11) ter-u28b.bdf $(R_88592) $(X_88592) | $(BDF2PCF) -o $@
-
-ter-528n.pcf: ter-u28n.bdf $(X_88595)
-	$(UCS2X11) ter-u28n.bdf $(R_88595) $(X_88595) | $(BDF2PCF) -o $@
-
-ter-528b.pcf: ter-u28b.bdf $(X_88595)
-	$(UCS2X11) ter-u28b.bdf $(R_88595) $(X_88595) | $(BDF2PCF) -o $@
-
-ter-728n.pcf: ter-u28n.bdf $(X_88597)
-	$(UCS2X11) ter-u28n.bdf $(R_88597) $(X_88597) | $(BDF2PCF) -o $@
-
-ter-728b.pcf: ter-u28b.bdf $(X_88597)
-	$(UCS2X11) ter-u28b.bdf $(R_88597) $(X_88597) | $(BDF2PCF) -o $@
-
-ter-928n.pcf: ter-u28n.bdf $(X_88599)
-	$(UCS2X11) ter-u28n.bdf $(R_88599) $(X_88599) | $(BDF2PCF) -o $@
-
-ter-928b.pcf: ter-u28b.bdf $(X_88599)
-	$(UCS2X11) ter-u28b.bdf $(R_88599) $(X_88599) | $(BDF2PCF) -o $@
-
-ter-c28n.pcf: ter-u28n.bdf $(X_W1251)
-	$(UCS2X11) ter-u28n.bdf $(R_W1251) $(X_W1251) | $(BDF2PCF) -o $@
-
-ter-c28b.pcf: ter-u28b.bdf $(X_W1251)
-	$(UCS2X11) ter-u28b.bdf $(R_W1251) $(X_W1251) | $(BDF2PCF) -o $@
-
-ter-d28n.pcf: ter-u28n.bdf $(X_8859D)
-	$(UCS2X11) ter-u28n.bdf $(R_8859D) $(X_8859D) | $(BDF2PCF) -o $@
-
-ter-d28b.pcf: ter-u28b.bdf $(X_8859D)
-	$(UCS2X11) ter-u28b.bdf $(R_8859D) $(X_8859D) | $(BDF2PCF) -o $@
-
-ter-f28n.pcf: ter-u28n.bdf $(X_8859F)
-	$(UCS2X11) ter-u28n.bdf $(R_8859F) $(X_8859F) | $(BDF2PCF) -o $@
-
-ter-f28b.pcf: ter-u28b.bdf $(X_8859F)
-	$(UCS2X11) ter-u28b.bdf $(R_8859F) $(X_8859F) | $(BDF2PCF) -o $@
-
-ter-g28n.pcf: ter-u28n.bdf $(X_8859G)
-	$(UCS2X11) ter-u28n.bdf $(R_8859G) $(X_8859G) | $(BDF2PCF) -o $@
-
-ter-g28b.pcf: ter-u28b.bdf $(X_8859G)
-	$(UCS2X11) ter-u28b.bdf $(R_8859G) $(X_8859G) | $(BDF2PCF) -o $@
-
-ter-k28n.pcf: ter-u28n.bdf $(X_KOI8R)
-	$(UCS2X11) ter-u28n.bdf $(R_KOI8R) $(X_KOI8R) | $(BDF2PCF) -o $@
-
-ter-k28b.pcf: ter-u28b.bdf $(X_KOI8R)
-	$(UCS2X11) ter-u28b.bdf $(R_KOI8R) $(X_KOI8R) | $(BDF2PCF) -o $@
-
-ter-p28n.pcf: ter-u28n.bdf $(X_PT154)
-	$(UCS2X11) ter-u28n.bdf $(R_PT154) $(X_PT154) | $(BDF2PCF) -o $@
-
-ter-p28b.pcf: ter-u28b.bdf $(X_PT154)
-	$(UCS2X11) ter-u28b.bdf $(R_PT154) $(X_PT154) | $(BDF2PCF) -o $@
-
-ter-u28n.pcf: ter-u28n.bdf $(X_KOI8U)
-	$(UCS2X11) ter-u28n.bdf $(R_KOI8U) $(X_KOI8U) | $(BDF2PCF) -o $@
-
-ter-u28b.pcf: ter-u28b.bdf $(X_KOI8U)
-	$(UCS2X11) ter-u28b.bdf $(R_KOI8U) $(X_KOI8U) | $(BDF2PCF) -o $@
-
-ter-x28n.pcf: ter-u28n.bdf $(X_10646)
-	$(UCS2X11) ter-u28n.bdf $(R_10646) $(X_10646) | $(BDF2PCF) -o $@
-
-ter-x28b.pcf: ter-u28b.bdf $(X_10646)
-	$(UCS2X11) ter-u28b.bdf $(R_10646) $(X_10646) | $(BDF2PCF) -o $@
-
-ter-132n.pcf: ter-u32n.bdf $(X_88591)
-	$(UCS2X11) ter-u32n.bdf $(R_88591) $(X_88591) | $(BDF2PCF) -o $@
-
-ter-132b.pcf: ter-u32b.bdf $(X_88591)
-	$(UCS2X11) ter-u32b.bdf $(R_88591) $(X_88591) | $(BDF2PCF) -o $@
-
-ter-232n.pcf: ter-u32n.bdf $(X_88592)
-	$(UCS2X11) ter-u32n.bdf $(R_88592) $(X_88592) | $(BDF2PCF) -o $@
-
-ter-232b.pcf: ter-u32b.bdf $(X_88592)
-	$(UCS2X11) ter-u32b.bdf $(R_88592) $(X_88592) | $(BDF2PCF) -o $@
-
-ter-532n.pcf: ter-u32n.bdf $(X_88595)
-	$(UCS2X11) ter-u32n.bdf $(R_88595) $(X_88595) | $(BDF2PCF) -o $@
-
-ter-532b.pcf: ter-u32b.bdf $(X_88595)
-	$(UCS2X11) ter-u32b.bdf $(R_88595) $(X_88595) | $(BDF2PCF) -o $@
-
-ter-732n.pcf: ter-u32n.bdf $(X_88597)
-	$(UCS2X11) ter-u32n.bdf $(R_88597) $(X_88597) | $(BDF2PCF) -o $@
-
-ter-732b.pcf: ter-u32b.bdf $(X_88597)
-	$(UCS2X11) ter-u32b.bdf $(R_88597) $(X_88597) | $(BDF2PCF) -o $@
-
-ter-932n.pcf: ter-u32n.bdf $(X_88599)
-	$(UCS2X11) ter-u32n.bdf $(R_88599) $(X_88599) | $(BDF2PCF) -o $@
-
-ter-932b.pcf: ter-u32b.bdf $(X_88599)
-	$(UCS2X11) ter-u32b.bdf $(R_88599) $(X_88599) | $(BDF2PCF) -o $@
-
-ter-c32n.pcf: ter-u32n.bdf $(X_W1251)
-	$(UCS2X11) ter-u32n.bdf $(R_W1251) $(X_W1251) | $(BDF2PCF) -o $@
-
-ter-c32b.pcf: ter-u32b.bdf $(X_W1251)
-	$(UCS2X11) ter-u32b.bdf $(R_W1251) $(X_W1251) | $(BDF2PCF) -o $@
-
-ter-d32n.pcf: ter-u32n.bdf $(X_8859D)
-	$(UCS2X11) ter-u32n.bdf $(R_8859D) $(X_8859D) | $(BDF2PCF) -o $@
-
-ter-d32b.pcf: ter-u32b.bdf $(X_8859D)
-	$(UCS2X11) ter-u32b.bdf $(R_8859D) $(X_8859D) | $(BDF2PCF) -o $@
-
-ter-f32n.pcf: ter-u32n.bdf $(X_8859F)
-	$(UCS2X11) ter-u32n.bdf $(R_8859F) $(X_8859F) | $(BDF2PCF) -o $@
-
-ter-f32b.pcf: ter-u32b.bdf $(X_8859F)
-	$(UCS2X11) ter-u32b.bdf $(R_8859F) $(X_8859F) | $(BDF2PCF) -o $@
-
-ter-g32n.pcf: ter-u32n.bdf $(X_8859G)
-	$(UCS2X11) ter-u32n.bdf $(R_8859G) $(X_8859G) | $(BDF2PCF) -o $@
-
-ter-g32b.pcf: ter-u32b.bdf $(X_8859G)
-	$(UCS2X11) ter-u32b.bdf $(R_8859G) $(X_8859G) | $(BDF2PCF) -o $@
-
-ter-k32n.pcf: ter-u32n.bdf $(X_KOI8R)
-	$(UCS2X11) ter-u32n.bdf $(R_KOI8R) $(X_KOI8R) | $(BDF2PCF) -o $@
-
-ter-k32b.pcf: ter-u32b.bdf $(X_KOI8R)
-	$(UCS2X11) ter-u32b.bdf $(R_KOI8R) $(X_KOI8R) | $(BDF2PCF) -o $@
-
-ter-p32n.pcf: ter-u32n.bdf $(X_PT154)
-	$(UCS2X11) ter-u32n.bdf $(R_PT154) $(X_PT154) | $(BDF2PCF) -o $@
-
-ter-p32b.pcf: ter-u32b.bdf $(X_PT154)
-	$(UCS2X11) ter-u32b.bdf $(R_PT154) $(X_PT154) | $(BDF2PCF) -o $@
-
-ter-u32n.pcf: ter-u32n.bdf $(X_KOI8U)
-	$(UCS2X11) ter-u32n.bdf $(R_KOI8U) $(X_KOI8U) | $(BDF2PCF) -o $@
-
-ter-u32b.pcf: ter-u32b.bdf $(X_KOI8U)
-	$(UCS2X11) ter-u32b.bdf $(R_KOI8U) $(X_KOI8U) | $(BDF2PCF) -o $@
-
-ter-x32n.pcf: ter-u32n.bdf $(X_10646)
-	$(UCS2X11) ter-u32n.bdf $(R_10646) $(X_10646) | $(BDF2PCF) -o $@
+BASETARGETNAME=$(notdir $(@:%.gz=%))
+
+$(DESTDIR)\ter-112n.pcf.gz: ter-u12n.bdf $(X_88591)
+	$(UCS2ANY) ter-u12n.bdf $(R_88591) $(X_88591) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-112b.pcf.gz: ter-u12b.bdf $(X_88591)
+	$(UCS2ANY) ter-u12b.bdf $(R_88591) $(X_88591) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-212n.pcf.gz: ter-u12n.bdf $(X_88592)
+	$(UCS2ANY) ter-u12n.bdf $(R_88592) $(X_88592) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-212b.pcf.gz: ter-u12b.bdf $(X_88592)
+	$(UCS2ANY) ter-u12b.bdf $(R_88592) $(X_88592) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-512n.pcf.gz: ter-u12n.bdf $(X_88595)
+	$(UCS2ANY) ter-u12n.bdf $(R_88595) $(X_88595) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-512b.pcf.gz: ter-u12b.bdf $(X_88595)
+	$(UCS2ANY) ter-u12b.bdf $(R_88595) $(X_88595) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-712n.pcf.gz: ter-u12n.bdf $(X_88597)
+	$(UCS2ANY) ter-u12n.bdf $(R_88597) $(X_88597) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-712b.pcf.gz: ter-u12b.bdf $(X_88597)
+	$(UCS2ANY) ter-u12b.bdf $(R_88597) $(X_88597) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-912n.pcf.gz: ter-u12n.bdf $(X_88599)
+	$(UCS2ANY) ter-u12n.bdf $(R_88599) $(X_88599) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-912b.pcf.gz: ter-u12b.bdf $(X_88599)
+	$(UCS2ANY) ter-u12b.bdf $(R_88599) $(X_88599) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-c12n.pcf.gz: ter-u12n.bdf $(X_W1251)
+	$(UCS2ANY) ter-u12n.bdf $(R_W1251) $(X_W1251) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-c12b.pcf.gz: ter-u12b.bdf $(X_W1251)
+	$(UCS2ANY) ter-u12b.bdf $(R_W1251) $(X_W1251) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-d12n.pcf.gz: ter-u12n.bdf $(X_8859D)
+	$(UCS2ANY) ter-u12n.bdf $(R_8859D) $(X_8859D) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-d12b.pcf.gz: ter-u12b.bdf $(X_8859D)
+	$(UCS2ANY) ter-u12b.bdf $(R_8859D) $(X_8859D) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-f12n.pcf.gz: ter-u12n.bdf $(X_8859F)
+	$(UCS2ANY) ter-u12n.bdf $(R_8859F) $(X_8859F) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-f12b.pcf.gz: ter-u12b.bdf $(X_8859F)
+	$(UCS2ANY) ter-u12b.bdf $(R_8859F) $(X_8859F) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-g12n.pcf.gz: ter-u12n.bdf $(X_8859G)
+	$(UCS2ANY) ter-u12n.bdf $(R_8859G) $(X_8859G) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-g12b.pcf.gz: ter-u12b.bdf $(X_8859G)
+	$(UCS2ANY) ter-u12b.bdf $(R_8859G) $(X_8859G) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-k12n.pcf.gz: ter-u12n.bdf $(X_KOI8R)
+	$(UCS2ANY) ter-u12n.bdf $(R_KOI8R) $(X_KOI8R) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-k12b.pcf.gz: ter-u12b.bdf $(X_KOI8R)
+	$(UCS2ANY) ter-u12b.bdf $(R_KOI8R) $(X_KOI8R) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-p12n.pcf.gz: ter-u12n.bdf $(X_PT154)
+	$(UCS2ANY) ter-u12n.bdf $(R_PT154) $(X_PT154) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-p12b.pcf.gz: ter-u12b.bdf $(X_PT154)
+	$(UCS2ANY) ter-u12b.bdf $(R_PT154) $(X_PT154) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-u12n.pcf.gz: ter-u12n.bdf $(X_KOI8U)
+	$(UCS2ANY) ter-u12n.bdf $(R_KOI8U) $(X_KOI8U) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-u12b.pcf.gz: ter-u12b.bdf $(X_KOI8U)
+	$(UCS2ANY) ter-u12b.bdf $(R_KOI8U) $(X_KOI8U) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-x12n.pcf.gz: ter-u12n.bdf $(X_10646)
+	$(UCS2ANY) ter-u12n.bdf $(R_10646) $(X_10646) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-x12b.pcf.gz: ter-u12b.bdf $(X_10646)
+	$(UCS2ANY) ter-u12b.bdf $(R_10646) $(X_10646) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-114n.pcf.gz: ter-u14n.bdf $(X_88591)
+	$(UCS2ANY) ter-u14n.bdf $(R_88591) $(X_88591) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-114b.pcf.gz: ter-u14b.bdf $(X_88591)
+	$(UCS2ANY) ter-u14b.bdf $(R_88591) $(X_88591) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-214n.pcf.gz: ter-u14n.bdf $(X_88592)
+	$(UCS2ANY) ter-u14n.bdf $(R_88592) $(X_88592) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-214b.pcf.gz: ter-u14b.bdf $(X_88592)
+	$(UCS2ANY) ter-u14b.bdf $(R_88592) $(X_88592) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-514n.pcf.gz: ter-u14n.bdf $(X_88595)
+	$(UCS2ANY) ter-u14n.bdf $(R_88595) $(X_88595) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-514b.pcf.gz: ter-u14b.bdf $(X_88595)
+	$(UCS2ANY) ter-u14b.bdf $(R_88595) $(X_88595) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-714n.pcf.gz: ter-u14n.bdf $(X_88597)
+	$(UCS2ANY) ter-u14n.bdf $(R_88597) $(X_88597) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-714b.pcf.gz: ter-u14b.bdf $(X_88597)
+	$(UCS2ANY) ter-u14b.bdf $(R_88597) $(X_88597) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-914n.pcf.gz: ter-u14n.bdf $(X_88599)
+	$(UCS2ANY) ter-u14n.bdf $(R_88599) $(X_88599) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-914b.pcf.gz: ter-u14b.bdf $(X_88599)
+	$(UCS2ANY) ter-u14b.bdf $(R_88599) $(X_88599) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-c14n.pcf.gz: ter-u14n.bdf $(X_W1251)
+	$(UCS2ANY) ter-u14n.bdf $(R_W1251) $(X_W1251) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-c14b.pcf.gz: ter-u14b.bdf $(X_W1251)
+	$(UCS2ANY) ter-u14b.bdf $(R_W1251) $(X_W1251) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-d14n.pcf.gz: ter-u14n.bdf $(X_8859D)
+	$(UCS2ANY) ter-u14n.bdf $(R_8859D) $(X_8859D) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-d14b.pcf.gz: ter-u14b.bdf $(X_8859D)
+	$(UCS2ANY) ter-u14b.bdf $(R_8859D) $(X_8859D) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-f14n.pcf.gz: ter-u14n.bdf $(X_8859F)
+	$(UCS2ANY) ter-u14n.bdf $(R_8859F) $(X_8859F) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-f14b.pcf.gz: ter-u14b.bdf $(X_8859F)
+	$(UCS2ANY) ter-u14b.bdf $(R_8859F) $(X_8859F) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-g14n.pcf.gz: ter-u14n.bdf $(X_8859G)
+	$(UCS2ANY) ter-u14n.bdf $(R_8859G) $(X_8859G) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-g14b.pcf.gz: ter-u14b.bdf $(X_8859G)
+	$(UCS2ANY) ter-u14b.bdf $(R_8859G) $(X_8859G) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-k14n.pcf.gz: ter-u14n.bdf $(X_KOI8R)
+	$(UCS2ANY) ter-u14n.bdf $(R_KOI8R) $(X_KOI8R) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-k14b.pcf.gz: ter-u14b.bdf $(X_KOI8R)
+	$(UCS2ANY) ter-u14b.bdf $(R_KOI8R) $(X_KOI8R) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-p14n.pcf.gz: ter-u14n.bdf $(X_PT154)
+	$(UCS2ANY) ter-u14n.bdf $(R_PT154) $(X_PT154) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-p14b.pcf.gz: ter-u14b.bdf $(X_PT154)
+	$(UCS2ANY) ter-u14b.bdf $(R_PT154) $(X_PT154) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-u14n.pcf.gz: ter-u14n.bdf $(X_KOI8U)
+	$(UCS2ANY) ter-u14n.bdf $(R_KOI8U) $(X_KOI8U) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-u14b.pcf.gz: ter-u14b.bdf $(X_KOI8U)
+	$(UCS2ANY) ter-u14b.bdf $(R_KOI8U) $(X_KOI8U) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-x14n.pcf.gz: ter-u14n.bdf $(X_10646)
+	$(UCS2ANY) ter-u14n.bdf $(R_10646) $(X_10646) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-x14b.pcf.gz: ter-u14b.bdf $(X_10646)
+	$(UCS2ANY) ter-u14b.bdf $(R_10646) $(X_10646) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-116n.pcf.gz: ter-u16n.bdf $(X_88591)
+	$(UCS2ANY) ter-u16n.bdf $(R_88591) $(X_88591) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-116b.pcf.gz: ter-u16b.bdf $(X_88591)
+	$(UCS2ANY) ter-u16b.bdf $(R_88591) $(X_88591) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-216n.pcf.gz: ter-u16n.bdf $(X_88592)
+	$(UCS2ANY) ter-u16n.bdf $(R_88592) $(X_88592) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-216b.pcf.gz: ter-u16b.bdf $(X_88592)
+	$(UCS2ANY) ter-u16b.bdf $(R_88592) $(X_88592) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-516n.pcf.gz: ter-u16n.bdf $(X_88595)
+	$(UCS2ANY) ter-u16n.bdf $(R_88595) $(X_88595) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-516b.pcf.gz: ter-u16b.bdf $(X_88595)
+	$(UCS2ANY) ter-u16b.bdf $(R_88595) $(X_88595) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-716n.pcf.gz: ter-u16n.bdf $(X_88597)
+	$(UCS2ANY) ter-u16n.bdf $(R_88597) $(X_88597) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-716b.pcf.gz: ter-u16b.bdf $(X_88597)
+	$(UCS2ANY) ter-u16b.bdf $(R_88597) $(X_88597) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-916n.pcf.gz: ter-u16n.bdf $(X_88599)
+	$(UCS2ANY) ter-u16n.bdf $(R_88599) $(X_88599) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-916b.pcf.gz: ter-u16b.bdf $(X_88599)
+	$(UCS2ANY) ter-u16b.bdf $(R_88599) $(X_88599) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-c16n.pcf.gz: ter-u16n.bdf $(X_W1251)
+	$(UCS2ANY) ter-u16n.bdf $(R_W1251) $(X_W1251) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-c16b.pcf.gz: ter-u16b.bdf $(X_W1251)
+	$(UCS2ANY) ter-u16b.bdf $(R_W1251) $(X_W1251) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-d16n.pcf.gz: ter-u16n.bdf $(X_8859D)
+	$(UCS2ANY) ter-u16n.bdf $(R_8859D) $(X_8859D) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-d16b.pcf.gz: ter-u16b.bdf $(X_8859D)
+	$(UCS2ANY) ter-u16b.bdf $(R_8859D) $(X_8859D) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-f16n.pcf.gz: ter-u16n.bdf $(X_8859F)
+	$(UCS2ANY) ter-u16n.bdf $(R_8859F) $(X_8859F) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-f16b.pcf.gz: ter-u16b.bdf $(X_8859F)
+	$(UCS2ANY) ter-u16b.bdf $(R_8859F) $(X_8859F) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-g16n.pcf.gz: ter-u16n.bdf $(X_8859G)
+	$(UCS2ANY) ter-u16n.bdf $(R_8859G) $(X_8859G) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-g16b.pcf.gz: ter-u16b.bdf $(X_8859G)
+	$(UCS2ANY) ter-u16b.bdf $(R_8859G) $(X_8859G) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-k16n.pcf.gz: ter-u16n.bdf $(X_KOI8R)
+	$(UCS2ANY) ter-u16n.bdf $(R_KOI8R) $(X_KOI8R) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-k16b.pcf.gz: ter-u16b.bdf $(X_KOI8R)
+	$(UCS2ANY) ter-u16b.bdf $(R_KOI8R) $(X_KOI8R) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-p16n.pcf.gz: ter-u16n.bdf $(X_PT154)
+	$(UCS2ANY) ter-u16n.bdf $(R_PT154) $(X_PT154) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-p16b.pcf.gz: ter-u16b.bdf $(X_PT154)
+	$(UCS2ANY) ter-u16b.bdf $(R_PT154) $(X_PT154) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-u16n.pcf.gz: ter-u16n.bdf $(X_KOI8U)
+	$(UCS2ANY) ter-u16n.bdf $(R_KOI8U) $(X_KOI8U) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-u16b.pcf.gz: ter-u16b.bdf $(X_KOI8U)
+	$(UCS2ANY) ter-u16b.bdf $(R_KOI8U) $(X_KOI8U) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-x16n.pcf.gz: ter-u16n.bdf $(X_10646)
+	$(UCS2ANY) ter-u16n.bdf $(R_10646) $(X_10646) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-x16b.pcf.gz: ter-u16b.bdf $(X_10646)
+	$(UCS2ANY) ter-u16b.bdf $(R_10646) $(X_10646) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-120n.pcf.gz: ter-u20n.bdf $(X_88591)
+	$(UCS2ANY) ter-u20n.bdf $(R_88591) $(X_88591) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-120b.pcf.gz: ter-u20b.bdf $(X_88591)
+	$(UCS2ANY) ter-u20b.bdf $(R_88591) $(X_88591) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-220n.pcf.gz: ter-u20n.bdf $(X_88592)
+	$(UCS2ANY) ter-u20n.bdf $(R_88592) $(X_88592) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-220b.pcf.gz: ter-u20b.bdf $(X_88592)
+	$(UCS2ANY) ter-u20b.bdf $(R_88592) $(X_88592) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-520n.pcf.gz: ter-u20n.bdf $(X_88595)
+	$(UCS2ANY) ter-u20n.bdf $(R_88595) $(X_88595) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-520b.pcf.gz: ter-u20b.bdf $(X_88595)
+	$(UCS2ANY) ter-u20b.bdf $(R_88595) $(X_88595) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-720n.pcf.gz: ter-u20n.bdf $(X_88597)
+	$(UCS2ANY) ter-u20n.bdf $(R_88597) $(X_88597) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-720b.pcf.gz: ter-u20b.bdf $(X_88597)
+	$(UCS2ANY) ter-u20b.bdf $(R_88597) $(X_88597) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-920n.pcf.gz: ter-u20n.bdf $(X_88599)
+	$(UCS2ANY) ter-u20n.bdf $(R_88599) $(X_88599) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-920b.pcf.gz: ter-u20b.bdf $(X_88599)
+	$(UCS2ANY) ter-u20b.bdf $(R_88599) $(X_88599) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-c20n.pcf.gz: ter-u20n.bdf $(X_W1251)
+	$(UCS2ANY) ter-u20n.bdf $(R_W1251) $(X_W1251) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-c20b.pcf.gz: ter-u20b.bdf $(X_W1251)
+	$(UCS2ANY) ter-u20b.bdf $(R_W1251) $(X_W1251) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-d20n.pcf.gz: ter-u20n.bdf $(X_8859D)
+	$(UCS2ANY) ter-u20n.bdf $(R_8859D) $(X_8859D) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-d20b.pcf.gz: ter-u20b.bdf $(X_8859D)
+	$(UCS2ANY) ter-u20b.bdf $(R_8859D) $(X_8859D) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-f20n.pcf.gz: ter-u20n.bdf $(X_8859F)
+	$(UCS2ANY) ter-u20n.bdf $(R_8859F) $(X_8859F) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-f20b.pcf.gz: ter-u20b.bdf $(X_8859F)
+	$(UCS2ANY) ter-u20b.bdf $(R_8859F) $(X_8859F) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-g20n.pcf.gz: ter-u20n.bdf $(X_8859G)
+	$(UCS2ANY) ter-u20n.bdf $(R_8859G) $(X_8859G) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-g20b.pcf.gz: ter-u20b.bdf $(X_8859G)
+	$(UCS2ANY) ter-u20b.bdf $(R_8859G) $(X_8859G) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-k20n.pcf.gz: ter-u20n.bdf $(X_KOI8R)
+	$(UCS2ANY) ter-u20n.bdf $(R_KOI8R) $(X_KOI8R) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-k20b.pcf.gz: ter-u20b.bdf $(X_KOI8R)
+	$(UCS2ANY) ter-u20b.bdf $(R_KOI8R) $(X_KOI8R) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-p20n.pcf.gz: ter-u20n.bdf $(X_PT154)
+	$(UCS2ANY) ter-u20n.bdf $(R_PT154) $(X_PT154) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-p20b.pcf.gz: ter-u20b.bdf $(X_PT154)
+	$(UCS2ANY) ter-u20b.bdf $(R_PT154) $(X_PT154) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-u20n.pcf.gz: ter-u20n.bdf $(X_KOI8U)
+	$(UCS2ANY) ter-u20n.bdf $(R_KOI8U) $(X_KOI8U) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-u20b.pcf.gz: ter-u20b.bdf $(X_KOI8U)
+	$(UCS2ANY) ter-u20b.bdf $(R_KOI8U) $(X_KOI8U) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-x20n.pcf.gz: ter-u20n.bdf $(X_10646)
+	$(UCS2ANY) ter-u20n.bdf $(R_10646) $(X_10646) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-x20b.pcf.gz: ter-u20b.bdf $(X_10646)
+	$(UCS2ANY) ter-u20b.bdf $(R_10646) $(X_10646) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-122n.pcf.gz: ter-u22n.bdf $(X_88591)
+	$(UCS2ANY) ter-u22n.bdf $(R_88591) $(X_88591) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-122b.pcf.gz: ter-u22b.bdf $(X_88591)
+	$(UCS2ANY) ter-u22b.bdf $(R_88591) $(X_88591) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-222n.pcf.gz: ter-u22n.bdf $(X_88592)
+	$(UCS2ANY) ter-u22n.bdf $(R_88592) $(X_88592) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-222b.pcf.gz: ter-u22b.bdf $(X_88592)
+	$(UCS2ANY) ter-u22b.bdf $(R_88592) $(X_88592) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-522n.pcf.gz: ter-u22n.bdf $(X_88595)
+	$(UCS2ANY) ter-u22n.bdf $(R_88595) $(X_88595) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-522b.pcf.gz: ter-u22b.bdf $(X_88595)
+	$(UCS2ANY) ter-u22b.bdf $(R_88595) $(X_88595) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-722n.pcf.gz: ter-u22n.bdf $(X_88597)
+	$(UCS2ANY) ter-u22n.bdf $(R_88597) $(X_88597) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-722b.pcf.gz: ter-u22b.bdf $(X_88597)
+	$(UCS2ANY) ter-u22b.bdf $(R_88597) $(X_88597) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-922n.pcf.gz: ter-u22n.bdf $(X_88599)
+	$(UCS2ANY) ter-u22n.bdf $(R_88599) $(X_88599) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-922b.pcf.gz: ter-u22b.bdf $(X_88599)
+	$(UCS2ANY) ter-u22b.bdf $(R_88599) $(X_88599) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-c22n.pcf.gz: ter-u22n.bdf $(X_W1251)
+	$(UCS2ANY) ter-u22n.bdf $(R_W1251) $(X_W1251) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-c22b.pcf.gz: ter-u22b.bdf $(X_W1251)
+	$(UCS2ANY) ter-u22b.bdf $(R_W1251) $(X_W1251) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-d22n.pcf.gz: ter-u22n.bdf $(X_8859D)
+	$(UCS2ANY) ter-u22n.bdf $(R_8859D) $(X_8859D) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-d22b.pcf.gz: ter-u22b.bdf $(X_8859D)
+	$(UCS2ANY) ter-u22b.bdf $(R_8859D) $(X_8859D) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-f22n.pcf.gz: ter-u22n.bdf $(X_8859F)
+	$(UCS2ANY) ter-u22n.bdf $(R_8859F) $(X_8859F) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-f22b.pcf.gz: ter-u22b.bdf $(X_8859F)
+	$(UCS2ANY) ter-u22b.bdf $(R_8859F) $(X_8859F) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-g22n.pcf.gz: ter-u22n.bdf $(X_8859G)
+	$(UCS2ANY) ter-u22n.bdf $(R_8859G) $(X_8859G) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-g22b.pcf.gz: ter-u22b.bdf $(X_8859G)
+	$(UCS2ANY) ter-u22b.bdf $(R_8859G) $(X_8859G) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-k22n.pcf.gz: ter-u22n.bdf $(X_KOI8R)
+	$(UCS2ANY) ter-u22n.bdf $(R_KOI8R) $(X_KOI8R) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-k22b.pcf.gz: ter-u22b.bdf $(X_KOI8R)
+	$(UCS2ANY) ter-u22b.bdf $(R_KOI8R) $(X_KOI8R) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-p22n.pcf.gz: ter-u22n.bdf $(X_PT154)
+	$(UCS2ANY) ter-u22n.bdf $(R_PT154) $(X_PT154) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-p22b.pcf.gz: ter-u22b.bdf $(X_PT154)
+	$(UCS2ANY) ter-u22b.bdf $(R_PT154) $(X_PT154) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-u22n.pcf.gz: ter-u22n.bdf $(X_KOI8U)
+	$(UCS2ANY) ter-u22n.bdf $(R_KOI8U) $(X_KOI8U) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-u22b.pcf.gz: ter-u22b.bdf $(X_KOI8U)
+	$(UCS2ANY) ter-u22b.bdf $(R_KOI8U) $(X_KOI8U) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-x22n.pcf.gz: ter-u22n.bdf $(X_10646)
+	$(UCS2ANY) ter-u22n.bdf $(R_10646) $(X_10646) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-x22b.pcf.gz: ter-u22b.bdf $(X_10646)
+	$(UCS2ANY) ter-u22b.bdf $(R_10646) $(X_10646) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-124n.pcf.gz: ter-u24n.bdf $(X_88591)
+	$(UCS2ANY) ter-u24n.bdf $(R_88591) $(X_88591) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-124b.pcf.gz: ter-u24b.bdf $(X_88591)
+	$(UCS2ANY) ter-u24b.bdf $(R_88591) $(X_88591) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-224n.pcf.gz: ter-u24n.bdf $(X_88592)
+	$(UCS2ANY) ter-u24n.bdf $(R_88592) $(X_88592) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-224b.pcf.gz: ter-u24b.bdf $(X_88592)
+	$(UCS2ANY) ter-u24b.bdf $(R_88592) $(X_88592) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-524n.pcf.gz: ter-u24n.bdf $(X_88595)
+	$(UCS2ANY) ter-u24n.bdf $(R_88595) $(X_88595) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-524b.pcf.gz: ter-u24b.bdf $(X_88595)
+	$(UCS2ANY) ter-u24b.bdf $(R_88595) $(X_88595) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-724n.pcf.gz: ter-u24n.bdf $(X_88597)
+	$(UCS2ANY) ter-u24n.bdf $(R_88597) $(X_88597) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-724b.pcf.gz: ter-u24b.bdf $(X_88597)
+	$(UCS2ANY) ter-u24b.bdf $(R_88597) $(X_88597) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-924n.pcf.gz: ter-u24n.bdf $(X_88599)
+	$(UCS2ANY) ter-u24n.bdf $(R_88599) $(X_88599) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-924b.pcf.gz: ter-u24b.bdf $(X_88599)
+	$(UCS2ANY) ter-u24b.bdf $(R_88599) $(X_88599) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-c24n.pcf.gz: ter-u24n.bdf $(X_W1251)
+	$(UCS2ANY) ter-u24n.bdf $(R_W1251) $(X_W1251) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-c24b.pcf.gz: ter-u24b.bdf $(X_W1251)
+	$(UCS2ANY) ter-u24b.bdf $(R_W1251) $(X_W1251) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-d24n.pcf.gz: ter-u24n.bdf $(X_8859D)
+	$(UCS2ANY) ter-u24n.bdf $(R_8859D) $(X_8859D) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-d24b.pcf.gz: ter-u24b.bdf $(X_8859D)
+	$(UCS2ANY) ter-u24b.bdf $(R_8859D) $(X_8859D) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-f24n.pcf.gz: ter-u24n.bdf $(X_8859F)
+	$(UCS2ANY) ter-u24n.bdf $(R_8859F) $(X_8859F) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-f24b.pcf.gz: ter-u24b.bdf $(X_8859F)
+	$(UCS2ANY) ter-u24b.bdf $(R_8859F) $(X_8859F) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-g24n.pcf.gz: ter-u24n.bdf $(X_8859G)
+	$(UCS2ANY) ter-u24n.bdf $(R_8859G) $(X_8859G) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-g24b.pcf.gz: ter-u24b.bdf $(X_8859G)
+	$(UCS2ANY) ter-u24b.bdf $(R_8859G) $(X_8859G) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-k24n.pcf.gz: ter-u24n.bdf $(X_KOI8R)
+	$(UCS2ANY) ter-u24n.bdf $(R_KOI8R) $(X_KOI8R) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-k24b.pcf.gz: ter-u24b.bdf $(X_KOI8R)
+	$(UCS2ANY) ter-u24b.bdf $(R_KOI8R) $(X_KOI8R) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-p24n.pcf.gz: ter-u24n.bdf $(X_PT154)
+	$(UCS2ANY) ter-u24n.bdf $(R_PT154) $(X_PT154) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-p24b.pcf.gz: ter-u24b.bdf $(X_PT154)
+	$(UCS2ANY) ter-u24b.bdf $(R_PT154) $(X_PT154) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-u24n.pcf.gz: ter-u24n.bdf $(X_KOI8U)
+	$(UCS2ANY) ter-u24n.bdf $(R_KOI8U) $(X_KOI8U) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-u24b.pcf.gz: ter-u24b.bdf $(X_KOI8U)
+	$(UCS2ANY) ter-u24b.bdf $(R_KOI8U) $(X_KOI8U) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-x24n.pcf.gz: ter-u24n.bdf $(X_10646)
+	$(UCS2ANY) ter-u24n.bdf $(R_10646) $(X_10646) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-x24b.pcf.gz: ter-u24b.bdf $(X_10646)
+	$(UCS2ANY) ter-u24b.bdf $(R_10646) $(X_10646) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-128n.pcf.gz: ter-u28n.bdf $(X_88591)
+	$(UCS2ANY) ter-u28n.bdf $(R_88591) $(X_88591) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-128b.pcf.gz: ter-u28b.bdf $(X_88591)
+	$(UCS2ANY) ter-u28b.bdf $(R_88591) $(X_88591) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-228n.pcf.gz: ter-u28n.bdf $(X_88592)
+	$(UCS2ANY) ter-u28n.bdf $(R_88592) $(X_88592) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-228b.pcf.gz: ter-u28b.bdf $(X_88592)
+	$(UCS2ANY) ter-u28b.bdf $(R_88592) $(X_88592) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-528n.pcf.gz: ter-u28n.bdf $(X_88595)
+	$(UCS2ANY) ter-u28n.bdf $(R_88595) $(X_88595) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-528b.pcf.gz: ter-u28b.bdf $(X_88595)
+	$(UCS2ANY) ter-u28b.bdf $(R_88595) $(X_88595) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-728n.pcf.gz: ter-u28n.bdf $(X_88597)
+	$(UCS2ANY) ter-u28n.bdf $(R_88597) $(X_88597) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-728b.pcf.gz: ter-u28b.bdf $(X_88597)
+	$(UCS2ANY) ter-u28b.bdf $(R_88597) $(X_88597) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-928n.pcf.gz: ter-u28n.bdf $(X_88599)
+	$(UCS2ANY) ter-u28n.bdf $(R_88599) $(X_88599) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-928b.pcf.gz: ter-u28b.bdf $(X_88599)
+	$(UCS2ANY) ter-u28b.bdf $(R_88599) $(X_88599) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-c28n.pcf.gz: ter-u28n.bdf $(X_W1251)
+	$(UCS2ANY) ter-u28n.bdf $(R_W1251) $(X_W1251) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-c28b.pcf.gz: ter-u28b.bdf $(X_W1251)
+	$(UCS2ANY) ter-u28b.bdf $(R_W1251) $(X_W1251) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-d28n.pcf.gz: ter-u28n.bdf $(X_8859D)
+	$(UCS2ANY) ter-u28n.bdf $(R_8859D) $(X_8859D) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-d28b.pcf.gz: ter-u28b.bdf $(X_8859D)
+	$(UCS2ANY) ter-u28b.bdf $(R_8859D) $(X_8859D) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-f28n.pcf.gz: ter-u28n.bdf $(X_8859F)
+	$(UCS2ANY) ter-u28n.bdf $(R_8859F) $(X_8859F) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-f28b.pcf.gz: ter-u28b.bdf $(X_8859F)
+	$(UCS2ANY) ter-u28b.bdf $(R_8859F) $(X_8859F) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-g28n.pcf.gz: ter-u28n.bdf $(X_8859G)
+	$(UCS2ANY) ter-u28n.bdf $(R_8859G) $(X_8859G) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-g28b.pcf.gz: ter-u28b.bdf $(X_8859G)
+	$(UCS2ANY) ter-u28b.bdf $(R_8859G) $(X_8859G) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-k28n.pcf.gz: ter-u28n.bdf $(X_KOI8R)
+	$(UCS2ANY) ter-u28n.bdf $(R_KOI8R) $(X_KOI8R) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-k28b.pcf.gz: ter-u28b.bdf $(X_KOI8R)
+	$(UCS2ANY) ter-u28b.bdf $(R_KOI8R) $(X_KOI8R) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-p28n.pcf.gz: ter-u28n.bdf $(X_PT154)
+	$(UCS2ANY) ter-u28n.bdf $(R_PT154) $(X_PT154) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-p28b.pcf.gz: ter-u28b.bdf $(X_PT154)
+	$(UCS2ANY) ter-u28b.bdf $(R_PT154) $(X_PT154) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-u28n.pcf.gz: ter-u28n.bdf $(X_KOI8U)
+	$(UCS2ANY) ter-u28n.bdf $(R_KOI8U) $(X_KOI8U) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-u28b.pcf.gz: ter-u28b.bdf $(X_KOI8U)
+	$(UCS2ANY) ter-u28b.bdf $(R_KOI8U) $(X_KOI8U) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-x28n.pcf.gz: ter-u28n.bdf $(X_10646)
+	$(UCS2ANY) ter-u28n.bdf $(R_10646) $(X_10646) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-x28b.pcf.gz: ter-u28b.bdf $(X_10646)
+	$(UCS2ANY) ter-u28b.bdf $(R_10646) $(X_10646) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-132n.pcf.gz: ter-u32n.bdf $(X_88591)
+	$(UCS2ANY) ter-u32n.bdf $(R_88591) $(X_88591) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-132b.pcf.gz: ter-u32b.bdf $(X_88591)
+	$(UCS2ANY) ter-u32b.bdf $(R_88591) $(X_88591) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-232n.pcf.gz: ter-u32n.bdf $(X_88592)
+	$(UCS2ANY) ter-u32n.bdf $(R_88592) $(X_88592) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-232b.pcf.gz: ter-u32b.bdf $(X_88592)
+	$(UCS2ANY) ter-u32b.bdf $(R_88592) $(X_88592) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-532n.pcf.gz: ter-u32n.bdf $(X_88595)
+	$(UCS2ANY) ter-u32n.bdf $(R_88595) $(X_88595) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-532b.pcf.gz: ter-u32b.bdf $(X_88595)
+	$(UCS2ANY) ter-u32b.bdf $(R_88595) $(X_88595) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-732n.pcf.gz: ter-u32n.bdf $(X_88597)
+	$(UCS2ANY) ter-u32n.bdf $(R_88597) $(X_88597) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-732b.pcf.gz: ter-u32b.bdf $(X_88597)
+	$(UCS2ANY) ter-u32b.bdf $(R_88597) $(X_88597) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-932n.pcf.gz: ter-u32n.bdf $(X_88599)
+	$(UCS2ANY) ter-u32n.bdf $(R_88599) $(X_88599) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-932b.pcf.gz: ter-u32b.bdf $(X_88599)
+	$(UCS2ANY) ter-u32b.bdf $(R_88599) $(X_88599) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-c32n.pcf.gz: ter-u32n.bdf $(X_W1251)
+	$(UCS2ANY) ter-u32n.bdf $(R_W1251) $(X_W1251) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-c32b.pcf.gz: ter-u32b.bdf $(X_W1251)
+	$(UCS2ANY) ter-u32b.bdf $(R_W1251) $(X_W1251) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-d32n.pcf.gz: ter-u32n.bdf $(X_8859D)
+	$(UCS2ANY) ter-u32n.bdf $(R_8859D) $(X_8859D) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-d32b.pcf.gz: ter-u32b.bdf $(X_8859D)
+	$(UCS2ANY) ter-u32b.bdf $(R_8859D) $(X_8859D) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-f32n.pcf.gz: ter-u32n.bdf $(X_8859F)
+	$(UCS2ANY) ter-u32n.bdf $(R_8859F) $(X_8859F) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-f32b.pcf.gz: ter-u32b.bdf $(X_8859F)
+	$(UCS2ANY) ter-u32b.bdf $(R_8859F) $(X_8859F) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-g32n.pcf.gz: ter-u32n.bdf $(X_8859G)
+	$(UCS2ANY) ter-u32n.bdf $(R_8859G) $(X_8859G) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-g32b.pcf.gz: ter-u32b.bdf $(X_8859G)
+	$(UCS2ANY) ter-u32b.bdf $(R_8859G) $(X_8859G) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-k32n.pcf.gz: ter-u32n.bdf $(X_KOI8R)
+	$(UCS2ANY) ter-u32n.bdf $(R_KOI8R) $(X_KOI8R) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-k32b.pcf.gz: ter-u32b.bdf $(X_KOI8R)
+	$(UCS2ANY) ter-u32b.bdf $(R_KOI8R) $(X_KOI8R) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-p32n.pcf.gz: ter-u32n.bdf $(X_PT154)
+	$(UCS2ANY) ter-u32n.bdf $(R_PT154) $(X_PT154) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-p32b.pcf.gz: ter-u32b.bdf $(X_PT154)
+	$(UCS2ANY) ter-u32b.bdf $(R_PT154) $(X_PT154) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-u32n.pcf.gz: ter-u32n.bdf $(X_KOI8U)
+	$(UCS2ANY) ter-u32n.bdf $(R_KOI8U) $(X_KOI8U) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-u32b.pcf.gz: ter-u32b.bdf $(X_KOI8U)
+	$(UCS2ANY) ter-u32b.bdf $(R_KOI8U) $(X_KOI8U) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-x32n.pcf.gz: ter-u32n.bdf $(X_10646)
+	$(UCS2ANY) ter-u32n.bdf $(R_10646) $(X_10646) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
+
+$(DESTDIR)\ter-x32b.pcf.gz: ter-u32b.bdf $(X_10646)
+	$(UCS2ANY) ter-u32b.bdf $(R_10646) $(X_10646) | $(BDFTOPCF) -t -o $(BASETARGETNAME)
+	gzip -c $(BASETARGETNAME) > $@
+	del $(BASETARGETNAME)
 
-ter-x32b.pcf: ter-u32b.bdf $(X_10646)
-	$(UCS2X11) ter-u32b.bdf $(R_10646) $(X_10646) | $(BDF2PCF) -o $@
 
-install-pcf: $(PCF)
-	mkdir -p $(DESTDIR)$(x11dir)
-	for i in $(PCF) ; do gzip -c $$i > $(DESTDIR)$(x11dir)/$$i.gz ; done
+font_DATA = $(PCF:%=$(DESTDIR)\%.gz) $(PCF_N12:%=$(DESTDIR)\%.gz)
+
+destdir: $(DESTDIR)
+
+all: $(DESTDIR) $(DESTDIR)\fonts.dir $(DESTDIR)\fonts.alias
+
+MKFONTSCALE=$(MHMAKECONF)\mkfontscale\$(OBJDIR)\mkfontscale.exe
 
-uninstall-pcf:
-	for i in $(PCF) ; do rm -f $(DESTDIR)$(x11dir)/$$i.gz ; done
+load_makefile $(MHMAKECONF)\mkfontscale\makefile MAKESERVER=0 DEBUG=$(DEBUG)
+
+$(DESTDIR)\fonts.scale: $(font_DATA) $(MKFONTSCALE)
+	del -e $@
+	cd $(DESTDIR) & $(MKFONTSCALE) .
 
-install-n12: $(PCF_N12)
-	mkdir -p $(DESTDIR)$(x11dir)
-	for i in $(PCF_N12) ; do gzip -c $$i > $(DESTDIR)$(x11dir)/$$i.gz ; done
+$(DESTDIR)\fonts.dir: $(DESTDIR)\fonts.scale $(font_DATA) $(MKFONTSCALE)
+	del -e $@
+	cd $(DESTDIR) & $(MKFONTSCALE) -b -s -l .
 
-uninstall-n12:
-	for i in $(PCF_N12) ; do rm -f $(DESTDIR)$(x11dir)/$$i.gz ; done
+$(DESTDIR)\fonts.alias: xfonts-terminus.alias
+	copy $< $@
 
-clean:
-	rm -f *.psf *.txt *.raw *.pcf
diff --git a/xorg-server/fonts.src/terminus-font/xfonts-terminus.alias b/xorg-server/fonts.src/terminus-font/xfonts-terminus.alias
new file mode 100644
index 000000000..0147b94b3
--- /dev/null
+++ b/xorg-server/fonts.src/terminus-font/xfonts-terminus.alias
@@ -0,0 +1,212 @@
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! Run the command `update-fonts-alias misc' if you edit this file. !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!!
+terminus-12	-xos4-terminus-medium-r-normal--12-120-72-72-c-60-iso10646-1
+terminus-14	-xos4-terminus-medium-r-normal--14-140-72-72-c-80-iso10646-1
+terminus-16	-xos4-terminus-medium-r-normal--16-160-72-72-c-80-iso10646-1
+terminus-20	-xos4-terminus-medium-r-normal--20-200-72-72-c-100-iso10646-1
+terminus-22	-xos4-terminus-medium-r-normal--22-220-72-72-c-110-iso10646-1
+terminus-24	-xos4-terminus-medium-r-normal--24-240-72-72-c-120-iso10646-1
+terminus-28	-xos4-terminus-medium-r-normal--28-280-72-72-c-140-iso10646-1
+terminus-32	-xos4-terminus-medium-r-normal--32-320-72-72-c-160-iso10646-1
+terminus-bold-12	-xos4-terminus-bold-r-normal--12-120-72-72-c-60-iso10646-1
+terminus-bold-14	-xos4-terminus-bold-r-normal--14-140-72-72-c-80-iso10646-1
+terminus-bold-16	-xos4-terminus-bold-r-normal--16-160-72-72-c-80-iso10646-1
+terminus-bold-20	-xos4-terminus-bold-r-normal--20-200-72-72-c-100-iso10646-1
+terminus-bold-22	-xos4-terminus-bold-r-normal--22-220-72-72-c-110-iso10646-1
+terminus-bold-24	-xos4-terminus-bold-r-normal--24-240-72-72-c-120-iso10646-1
+terminus-bold-28	-xos4-terminus-bold-r-normal--28-280-72-72-c-140-iso10646-1
+terminus-bold-32	-xos4-terminus-bold-r-normal--32-320-72-72-c-160-iso10646-1
+terminus-cp1251-12	-xos4-terminus-medium-r-normal--12-120-72-72-c-60-microsoft-cp1251
+terminus-cp1251-14	-xos4-terminus-medium-r-normal--14-140-72-72-c-80-microsoft-cp1251
+terminus-cp1251-16	-xos4-terminus-medium-r-normal--16-160-72-72-c-80-microsoft-cp1251
+terminus-cp1251-20	-xos4-terminus-medium-r-normal--20-200-72-72-c-100-microsoft-cp1251
+terminus-cp1251-22	-xos4-terminus-medium-r-normal--22-220-72-72-c-110-microsoft-cp1251
+terminus-cp1251-24	-xos4-terminus-medium-r-normal--24-240-72-72-c-120-microsoft-cp1251
+terminus-cp1251-28	-xos4-terminus-medium-r-normal--28-280-72-72-c-140-microsoft-cp1251
+terminus-cp1251-32	-xos4-terminus-medium-r-normal--32-320-72-72-c-160-microsoft-cp1251
+terminus-cp1251-bold-12	-xos4-terminus-bold-r-normal--12-120-72-72-c-60-microsoft-cp1251
+terminus-cp1251-bold-14	-xos4-terminus-bold-r-normal--14-140-72-72-c-80-microsoft-cp1251
+terminus-cp1251-bold-16	-xos4-terminus-bold-r-normal--16-160-72-72-c-80-microsoft-cp1251
+terminus-cp1251-bold-20	-xos4-terminus-bold-r-normal--20-200-72-72-c-100-microsoft-cp1251
+terminus-cp1251-bold-22	-xos4-terminus-bold-r-normal--22-220-72-72-c-110-microsoft-cp1251
+terminus-cp1251-bold-24	-xos4-terminus-bold-r-normal--24-240-72-72-c-120-microsoft-cp1251
+terminus-cp1251-bold-28	-xos4-terminus-bold-r-normal--28-280-72-72-c-140-microsoft-cp1251
+terminus-cp1251-bold-32	-xos4-terminus-bold-r-normal--32-320-72-72-c-160-microsoft-cp1251
+terminus-pt154-12	-xos4-terminus-medium-r-normal--12-120-72-72-c-60-paratype-pt154
+terminus-pt154-14	-xos4-terminus-medium-r-normal--14-140-72-72-c-80-paratype-pt154
+terminus-pt154-16	-xos4-terminus-medium-r-normal--16-160-72-72-c-80-paratype-pt154
+terminus-pt154-20	-xos4-terminus-medium-r-normal--20-200-72-72-c-100-paratype-pt154
+terminus-pt154-22	-xos4-terminus-medium-r-normal--22-220-72-72-c-110-paratype-pt154
+terminus-pt154-24	-xos4-terminus-medium-r-normal--24-240-72-72-c-120-paratype-pt154
+terminus-pt154-28	-xos4-terminus-medium-r-normal--28-280-72-72-c-140-paratype-pt154
+terminus-pt154-32	-xos4-terminus-medium-r-normal--32-320-72-72-c-160-paratype-pt154
+terminus-pt154-bold-12	-xos4-terminus-bold-r-normal--12-120-72-72-c-60-paratype-pt154
+terminus-pt154-bold-14	-xos4-terminus-bold-r-normal--14-140-72-72-c-80-paratype-pt154
+terminus-pt154-bold-16	-xos4-terminus-bold-r-normal--16-160-72-72-c-80-paratype-pt154
+terminus-pt154-bold-20	-xos4-terminus-bold-r-normal--20-200-72-72-c-100-paratype-pt154
+terminus-pt154-bold-22	-xos4-terminus-bold-r-normal--22-220-72-72-c-110-paratype-pt154
+terminus-pt154-bold-24	-xos4-terminus-bold-r-normal--24-240-72-72-c-120-paratype-pt154
+terminus-pt154-bold-28	-xos4-terminus-bold-r-normal--28-280-72-72-c-140-paratype-pt154
+terminus-pt154-bold-32	-xos4-terminus-bold-r-normal--32-320-72-72-c-160-paratype-pt154
+terminus-koi8-r-12	-xos4-terminus-medium-r-normal--12-120-72-72-c-60-koi8-r
+terminus-koi8-r-14	-xos4-terminus-medium-r-normal--14-140-72-72-c-80-koi8-r
+terminus-koi8-r-16	-xos4-terminus-medium-r-normal--16-160-72-72-c-80-koi8-r
+terminus-koi8-r-20	-xos4-terminus-medium-r-normal--20-200-72-72-c-100-koi8-r
+terminus-koi8-r-22	-xos4-terminus-medium-r-normal--22-220-72-72-c-110-koi8-r
+terminus-koi8-r-24	-xos4-terminus-medium-r-normal--24-240-72-72-c-120-koi8-r
+terminus-koi8-r-28	-xos4-terminus-medium-r-normal--28-280-72-72-c-140-koi8-r
+terminus-koi8-r-32	-xos4-terminus-medium-r-normal--32-320-72-72-c-160-koi8-r
+terminus-koi8-r-bold-12	-xos4-terminus-bold-r-normal--12-120-72-72-c-60-koi8-r
+terminus-koi8-r-bold-14	-xos4-terminus-bold-r-normal--14-140-72-72-c-80-koi8-r
+terminus-koi8-r-bold-16	-xos4-terminus-bold-r-normal--16-160-72-72-c-80-koi8-r
+terminus-koi8-r-bold-20	-xos4-terminus-bold-r-normal--20-200-72-72-c-100-koi8-r
+terminus-koi8-r-bold-22	-xos4-terminus-bold-r-normal--22-220-72-72-c-110-koi8-r
+terminus-koi8-r-bold-24	-xos4-terminus-bold-r-normal--24-240-72-72-c-120-koi8-r
+terminus-koi8-r-bold-28	-xos4-terminus-bold-r-normal--28-280-72-72-c-140-koi8-r
+terminus-koi8-r-bold-32	-xos4-terminus-bold-r-normal--32-320-72-72-c-160-koi8-r
+terminus-koi8-u-12	-xos4-terminus-medium-r-normal--12-120-72-72-c-60-koi8-u
+terminus-koi8-u-14	-xos4-terminus-medium-r-normal--14-140-72-72-c-80-koi8-u
+terminus-koi8-u-16	-xos4-terminus-medium-r-normal--16-160-72-72-c-80-koi8-u
+terminus-koi8-u-20	-xos4-terminus-medium-r-normal--20-200-72-72-c-100-koi8-u
+terminus-koi8-u-22	-xos4-terminus-medium-r-normal--22-220-72-72-c-110-koi8-u
+terminus-koi8-u-24	-xos4-terminus-medium-r-normal--24-240-72-72-c-120-koi8-u
+terminus-koi8-u-28	-xos4-terminus-medium-r-normal--28-280-72-72-c-140-koi8-u
+terminus-koi8-u-32	-xos4-terminus-medium-r-normal--32-320-72-72-c-160-koi8-u
+terminus-koi8-u-bold-12	-xos4-terminus-bold-r-normal--12-120-72-72-c-60-koi8-u
+terminus-koi8-u-bold-14	-xos4-terminus-bold-r-normal--14-140-72-72-c-80-koi8-u
+terminus-koi8-u-bold-16	-xos4-terminus-bold-r-normal--16-160-72-72-c-80-koi8-u
+terminus-koi8-u-bold-20	-xos4-terminus-bold-r-normal--20-200-72-72-c-100-koi8-u
+terminus-koi8-u-bold-22	-xos4-terminus-bold-r-normal--22-220-72-72-c-110-koi8-u
+terminus-koi8-u-bold-24	-xos4-terminus-bold-r-normal--24-240-72-72-c-120-koi8-u
+terminus-koi8-u-bold-28	-xos4-terminus-bold-r-normal--28-280-72-72-c-140-koi8-u
+terminus-koi8-u-bold-32	-xos4-terminus-bold-r-normal--32-320-72-72-c-160-koi8-u
+terminus-iso8859-1-12	-xos4-terminus-medium-r-normal--12-120-72-72-c-60-iso8859-1
+terminus-iso8859-1-14	-xos4-terminus-medium-r-normal--14-140-72-72-c-80-iso8859-1
+terminus-iso8859-1-16	-xos4-terminus-medium-r-normal--16-160-72-72-c-80-iso8859-1
+terminus-iso8859-1-20	-xos4-terminus-medium-r-normal--20-200-72-72-c-100-iso8859-1
+terminus-iso8859-1-22	-xos4-terminus-medium-r-normal--22-220-72-72-c-110-iso8859-1
+terminus-iso8859-1-24	-xos4-terminus-medium-r-normal--24-240-72-72-c-120-iso8859-1
+terminus-iso8859-1-28	-xos4-terminus-medium-r-normal--28-280-72-72-c-140-iso8859-1
+terminus-iso8859-1-32	-xos4-terminus-medium-r-normal--32-320-72-72-c-160-iso8859-1
+terminus-iso8859-1-bold-12	-xos4-terminus-bold-r-normal--12-120-72-72-c-60-iso8859-1
+terminus-iso8859-1-bold-14	-xos4-terminus-bold-r-normal--14-140-72-72-c-80-iso8859-1
+terminus-iso8859-1-bold-16	-xos4-terminus-bold-r-normal--16-160-72-72-c-80-iso8859-1
+terminus-iso8859-1-bold-20	-xos4-terminus-bold-r-normal--20-200-72-72-c-100-iso8859-1
+terminus-iso8859-1-bold-22	-xos4-terminus-bold-r-normal--22-220-72-72-c-110-iso8859-1
+terminus-iso8859-1-bold-24	-xos4-terminus-bold-r-normal--24-240-72-72-c-120-iso8859-1
+terminus-iso8859-1-bold-28	-xos4-terminus-bold-r-normal--28-280-72-72-c-140-iso8859-1
+terminus-iso8859-1-bold-32	-xos4-terminus-bold-r-normal--32-320-72-72-c-160-iso8859-1
+terminus-iso8859-2-12	-xos4-terminus-medium-r-normal--12-120-72-72-c-60-iso8859-2
+terminus-iso8859-2-14	-xos4-terminus-medium-r-normal--14-140-72-72-c-80-iso8859-2
+terminus-iso8859-2-16	-xos4-terminus-medium-r-normal--16-160-72-72-c-80-iso8859-2
+terminus-iso8859-2-20	-xos4-terminus-medium-r-normal--20-200-72-72-c-100-iso8859-2
+terminus-iso8859-2-22	-xos4-terminus-medium-r-normal--22-220-72-72-c-110-iso8859-2
+terminus-iso8859-2-24	-xos4-terminus-medium-r-normal--24-240-72-72-c-120-iso8859-2
+terminus-iso8859-2-28	-xos4-terminus-medium-r-normal--28-280-72-72-c-140-iso8859-2
+terminus-iso8859-2-32	-xos4-terminus-medium-r-normal--32-320-72-72-c-160-iso8859-2
+terminus-iso8859-2-bold-12	-xos4-terminus-bold-r-normal--12-120-72-72-c-60-iso8859-2
+terminus-iso8859-2-bold-14	-xos4-terminus-bold-r-normal--14-140-72-72-c-80-iso8859-2
+terminus-iso8859-2-bold-16	-xos4-terminus-bold-r-normal--16-160-72-72-c-80-iso8859-2
+terminus-iso8859-2-bold-20	-xos4-terminus-bold-r-normal--20-200-72-72-c-100-iso8859-2
+terminus-iso8859-2-bold-22	-xos4-terminus-bold-r-normal--22-220-72-72-c-110-iso8859-2
+terminus-iso8859-2-bold-24	-xos4-terminus-bold-r-normal--24-240-72-72-c-120-iso8859-2
+terminus-iso8859-2-bold-28	-xos4-terminus-bold-r-normal--28-280-72-72-c-140-iso8859-2
+terminus-iso8859-2-bold-32	-xos4-terminus-bold-r-normal--32-320-72-72-c-160-iso8859-2
+terminus-iso8859-5-12	-xos4-terminus-medium-r-normal--12-120-72-72-c-60-iso8859-5
+terminus-iso8859-5-14	-xos4-terminus-medium-r-normal--14-140-72-72-c-80-iso8859-5
+terminus-iso8859-5-16	-xos4-terminus-medium-r-normal--16-160-72-72-c-80-iso8859-5
+terminus-iso8859-5-20	-xos4-terminus-medium-r-normal--20-200-72-72-c-100-iso8859-5
+terminus-iso8859-5-22	-xos4-terminus-medium-r-normal--22-220-72-72-c-110-iso8859-5
+terminus-iso8859-5-24	-xos4-terminus-medium-r-normal--24-240-72-72-c-120-iso8859-5
+terminus-iso8859-5-28	-xos4-terminus-medium-r-normal--28-280-72-72-c-140-iso8859-5
+terminus-iso8859-5-32	-xos4-terminus-medium-r-normal--32-320-72-72-c-160-iso8859-5
+terminus-iso8859-5-bold-12	-xos4-terminus-bold-r-normal--12-120-72-72-c-60-iso8859-5
+terminus-iso8859-5-bold-14	-xos4-terminus-bold-r-normal--14-140-72-72-c-80-iso8859-5
+terminus-iso8859-5-bold-16	-xos4-terminus-bold-r-normal--16-160-72-72-c-80-iso8859-5
+terminus-iso8859-5-bold-20	-xos4-terminus-bold-r-normal--20-200-72-72-c-100-iso8859-5
+terminus-iso8859-5-bold-22	-xos4-terminus-bold-r-normal--22-220-72-72-c-110-iso8859-5
+terminus-iso8859-5-bold-24	-xos4-terminus-bold-r-normal--24-240-72-72-c-120-iso8859-5
+terminus-iso8859-5-bold-28	-xos4-terminus-bold-r-normal--28-280-72-72-c-140-iso8859-5
+terminus-iso8859-5-bold-32	-xos4-terminus-bold-r-normal--32-320-72-72-c-160-iso8859-5
+terminus-iso8859-7-12	-xos4-terminus-medium-r-normal--12-120-72-72-c-60-iso8859-7
+terminus-iso8859-7-14	-xos4-terminus-medium-r-normal--14-140-72-72-c-80-iso8859-7
+terminus-iso8859-7-16	-xos4-terminus-medium-r-normal--16-160-72-72-c-80-iso8859-7
+terminus-iso8859-7-20	-xos4-terminus-medium-r-normal--20-200-72-72-c-100-iso8859-7
+terminus-iso8859-7-22	-xos4-terminus-medium-r-normal--22-220-72-72-c-110-iso8859-7
+terminus-iso8859-7-24	-xos4-terminus-medium-r-normal--24-240-72-72-c-120-iso8859-7
+terminus-iso8859-7-28	-xos4-terminus-medium-r-normal--28-280-72-72-c-140-iso8859-7
+terminus-iso8859-7-32	-xos4-terminus-medium-r-normal--32-320-72-72-c-160-iso8859-7
+terminus-iso8859-7-bold-12	-xos4-terminus-bold-r-normal--12-120-72-72-c-60-iso8859-7
+terminus-iso8859-7-bold-14	-xos4-terminus-bold-r-normal--14-140-72-72-c-80-iso8859-7
+terminus-iso8859-7-bold-16	-xos4-terminus-bold-r-normal--16-160-72-72-c-80-iso8859-7
+terminus-iso8859-7-bold-20	-xos4-terminus-bold-r-normal--20-200-72-72-c-100-iso8859-7
+terminus-iso8859-7-bold-22	-xos4-terminus-bold-r-normal--22-220-72-72-c-110-iso8859-7
+terminus-iso8859-7-bold-24	-xos4-terminus-bold-r-normal--24-240-72-72-c-120-iso8859-7
+terminus-iso8859-7-bold-28	-xos4-terminus-bold-r-normal--28-280-72-72-c-140-iso8859-7
+terminus-iso8859-7-bold-32	-xos4-terminus-bold-r-normal--32-320-72-72-c-160-iso8859-7
+terminus-iso8859-9-12	-xos4-terminus-medium-r-normal--12-120-72-72-c-60-iso8859-9
+terminus-iso8859-9-14	-xos4-terminus-medium-r-normal--14-140-72-72-c-80-iso8859-9
+terminus-iso8859-9-16	-xos4-terminus-medium-r-normal--16-160-72-72-c-80-iso8859-9
+terminus-iso8859-9-20	-xos4-terminus-medium-r-normal--20-200-72-72-c-100-iso8859-9
+terminus-iso8859-9-22	-xos4-terminus-medium-r-normal--22-220-72-72-c-110-iso8859-9
+terminus-iso8859-9-24	-xos4-terminus-medium-r-normal--24-240-72-72-c-120-iso8859-9
+terminus-iso8859-9-28	-xos4-terminus-medium-r-normal--28-280-72-72-c-140-iso8859-9
+terminus-iso8859-9-32	-xos4-terminus-medium-r-normal--32-320-72-72-c-160-iso8859-9
+terminus-iso8859-9-bold-12	-xos4-terminus-bold-r-normal--12-120-72-72-c-60-iso8859-9
+terminus-iso8859-9-bold-14	-xos4-terminus-bold-r-normal--14-140-72-72-c-80-iso8859-9
+terminus-iso8859-9-bold-16	-xos4-terminus-bold-r-normal--16-160-72-72-c-80-iso8859-9
+terminus-iso8859-9-bold-20	-xos4-terminus-bold-r-normal--20-200-72-72-c-100-iso8859-9
+terminus-iso8859-9-bold-22	-xos4-terminus-bold-r-normal--22-220-72-72-c-110-iso8859-9
+terminus-iso8859-9-bold-24	-xos4-terminus-bold-r-normal--24-240-72-72-c-120-iso8859-9
+terminus-iso8859-9-bold-28	-xos4-terminus-bold-r-normal--28-280-72-72-c-140-iso8859-9
+terminus-iso8859-9-bold-32	-xos4-terminus-bold-r-normal--32-320-72-72-c-160-iso8859-9
+terminus-iso8859-13-12	-xos4-terminus-medium-r-normal--12-120-72-72-c-60-iso8859-13
+terminus-iso8859-13-14	-xos4-terminus-medium-r-normal--14-140-72-72-c-80-iso8859-13
+terminus-iso8859-13-16	-xos4-terminus-medium-r-normal--16-160-72-72-c-80-iso8859-13
+terminus-iso8859-13-20	-xos4-terminus-medium-r-normal--20-200-72-72-c-100-iso8859-13
+terminus-iso8859-13-22	-xos4-terminus-medium-r-normal--22-220-72-72-c-110-iso8859-13
+terminus-iso8859-13-24	-xos4-terminus-medium-r-normal--24-240-72-72-c-120-iso8859-13
+terminus-iso8859-13-28	-xos4-terminus-medium-r-normal--28-280-72-72-c-140-iso8859-13
+terminus-iso8859-13-32	-xos4-terminus-medium-r-normal--32-320-72-72-c-160-iso8859-13
+terminus-iso8859-13-bold-12	-xos4-terminus-bold-r-normal--12-120-72-72-c-60-iso8859-13
+terminus-iso8859-13-bold-14	-xos4-terminus-bold-r-normal--14-140-72-72-c-80-iso8859-13
+terminus-iso8859-13-bold-16	-xos4-terminus-bold-r-normal--16-160-72-72-c-80-iso8859-13
+terminus-iso8859-13-bold-20	-xos4-terminus-bold-r-normal--20-200-72-72-c-100-iso8859-13
+terminus-iso8859-13-bold-22	-xos4-terminus-bold-r-normal--22-220-72-72-c-110-iso8859-13
+terminus-iso8859-13-bold-24	-xos4-terminus-bold-r-normal--24-240-72-72-c-120-iso8859-13
+terminus-iso8859-13-bold-28	-xos4-terminus-bold-r-normal--28-280-72-72-c-140-iso8859-13
+terminus-iso8859-13-bold-32	-xos4-terminus-bold-r-normal--32-320-72-72-c-160-iso8859-13
+terminus-iso8859-15-12	-xos4-terminus-medium-r-normal--12-120-72-72-c-60-iso8859-15
+terminus-iso8859-15-14	-xos4-terminus-medium-r-normal--14-140-72-72-c-80-iso8859-15
+terminus-iso8859-15-16	-xos4-terminus-medium-r-normal--16-160-72-72-c-80-iso8859-15
+terminus-iso8859-15-20	-xos4-terminus-medium-r-normal--20-200-72-72-c-100-iso8859-15
+terminus-iso8859-15-22	-xos4-terminus-medium-r-normal--22-220-72-72-c-110-iso8859-15
+terminus-iso8859-15-24	-xos4-terminus-medium-r-normal--24-240-72-72-c-120-iso8859-15
+terminus-iso8859-15-28	-xos4-terminus-medium-r-normal--28-280-72-72-c-140-iso8859-15
+terminus-iso8859-15-32	-xos4-terminus-medium-r-normal--32-320-72-72-c-160-iso8859-15
+terminus-iso8859-15-bold-12	-xos4-terminus-bold-r-normal--12-120-72-72-c-60-iso8859-15
+terminus-iso8859-15-bold-14	-xos4-terminus-bold-r-normal--14-140-72-72-c-80-iso8859-15
+terminus-iso8859-15-bold-16	-xos4-terminus-bold-r-normal--16-160-72-72-c-80-iso8859-15
+terminus-iso8859-15-bold-20	-xos4-terminus-bold-r-normal--20-200-72-72-c-100-iso8859-15
+terminus-iso8859-15-bold-22	-xos4-terminus-bold-r-normal--22-220-72-72-c-110-iso8859-15
+terminus-iso8859-15-bold-24	-xos4-terminus-bold-r-normal--24-240-72-72-c-120-iso8859-15
+terminus-iso8859-15-bold-28	-xos4-terminus-bold-r-normal--28-280-72-72-c-140-iso8859-15
+terminus-iso8859-15-bold-32	-xos4-terminus-bold-r-normal--32-320-72-72-c-160-iso8859-15
+terminus-iso8859-16-12	-xos4-terminus-medium-r-normal--12-120-72-72-c-60-iso8859-16
+terminus-iso8859-16-14	-xos4-terminus-medium-r-normal--14-140-72-72-c-80-iso8859-16
+terminus-iso8859-16-16	-xos4-terminus-medium-r-normal--16-160-72-72-c-80-iso8859-16
+terminus-iso8859-16-20	-xos4-terminus-medium-r-normal--20-200-72-72-c-100-iso8859-16
+terminus-iso8859-16-22	-xos4-terminus-medium-r-normal--22-220-72-72-c-110-iso8859-16
+terminus-iso8859-16-24	-xos4-terminus-medium-r-normal--24-240-72-72-c-120-iso8859-16
+terminus-iso8859-16-28	-xos4-terminus-medium-r-normal--28-280-72-72-c-140-iso8859-16
+terminus-iso8859-16-32	-xos4-terminus-medium-r-normal--32-320-72-72-c-160-iso8859-16
+terminus-iso8859-16-bold-12	-xos4-terminus-bold-r-normal--12-120-72-72-c-60-iso8859-16
+terminus-iso8859-16-bold-14	-xos4-terminus-bold-r-normal--14-140-72-72-c-80-iso8859-16
+terminus-iso8859-16-bold-16	-xos4-terminus-bold-r-normal--16-160-72-72-c-80-iso8859-16
+terminus-iso8859-16-bold-20	-xos4-terminus-bold-r-normal--20-200-72-72-c-100-iso8859-16
+terminus-iso8859-16-bold-22	-xos4-terminus-bold-r-normal--22-220-72-72-c-110-iso8859-16
+terminus-iso8859-16-bold-24	-xos4-terminus-bold-r-normal--24-240-72-72-c-120-iso8859-16
+terminus-iso8859-16-bold-28	-xos4-terminus-bold-r-normal--28-280-72-72-c-140-iso8859-16
+terminus-iso8859-16-bold-32	-xos4-terminus-bold-r-normal--32-320-72-72-c-160-iso8859-16
diff --git a/xorg-server/glx/dispatch.h b/xorg-server/glx/dispatch.h
index 720865304..618049e01 100644
--- a/xorg-server/glx/dispatch.h
+++ b/xorg-server/glx/dispatch.h
@@ -26,8 +26,10 @@
  */
 
 #if !defined( _DISPATCH_H_ )
-#define _DISPATCH_H_
+#  define _DISPATCH_H_
 
+
+#include "glapitable.h"
 /**
  * \file main/dispatch.h
  * Macros for handling GL dispatch tables.
@@ -45,6 +47,11 @@
 #include "main/mfeatures.h"
 #endif
 
+#ifdef _MSC_VER
+#ifndef INLINE
+#define INLINE __inline
+#endif
+#endif
 #define CALL_by_offset(disp, cast, offset, parameters) \
     (*(cast (GET_by_offset(disp, offset)))) parameters
 #define GET_by_offset(disp, offset) \
@@ -62,7 +69,7 @@
     } while(0)
 
 /* total number of offsets below */
-#define _gloffset_COUNT 973
+#define _gloffset_COUNT 1027
 
 #define _gloffset_NewList 0
 #define _gloffset_EndList 1
@@ -438,1236 +445,1510 @@
 #define _gloffset_TexImage3D 371
 #define _gloffset_TexSubImage3D 372
 #define _gloffset_CopyTexSubImage3D 373
-#define _gloffset_ActiveTextureARB 374
-#define _gloffset_ClientActiveTextureARB 375
-#define _gloffset_MultiTexCoord1dARB 376
-#define _gloffset_MultiTexCoord1dvARB 377
+#define _gloffset_ActiveTexture 374
+#define _gloffset_ClientActiveTexture 375
+#define _gloffset_MultiTexCoord1d 376
+#define _gloffset_MultiTexCoord1dv 377
 #define _gloffset_MultiTexCoord1fARB 378
 #define _gloffset_MultiTexCoord1fvARB 379
-#define _gloffset_MultiTexCoord1iARB 380
-#define _gloffset_MultiTexCoord1ivARB 381
-#define _gloffset_MultiTexCoord1sARB 382
-#define _gloffset_MultiTexCoord1svARB 383
-#define _gloffset_MultiTexCoord2dARB 384
-#define _gloffset_MultiTexCoord2dvARB 385
+#define _gloffset_MultiTexCoord1i 380
+#define _gloffset_MultiTexCoord1iv 381
+#define _gloffset_MultiTexCoord1s 382
+#define _gloffset_MultiTexCoord1sv 383
+#define _gloffset_MultiTexCoord2d 384
+#define _gloffset_MultiTexCoord2dv 385
 #define _gloffset_MultiTexCoord2fARB 386
 #define _gloffset_MultiTexCoord2fvARB 387
-#define _gloffset_MultiTexCoord2iARB 388
-#define _gloffset_MultiTexCoord2ivARB 389
-#define _gloffset_MultiTexCoord2sARB 390
-#define _gloffset_MultiTexCoord2svARB 391
-#define _gloffset_MultiTexCoord3dARB 392
-#define _gloffset_MultiTexCoord3dvARB 393
+#define _gloffset_MultiTexCoord2i 388
+#define _gloffset_MultiTexCoord2iv 389
+#define _gloffset_MultiTexCoord2s 390
+#define _gloffset_MultiTexCoord2sv 391
+#define _gloffset_MultiTexCoord3d 392
+#define _gloffset_MultiTexCoord3dv 393
 #define _gloffset_MultiTexCoord3fARB 394
 #define _gloffset_MultiTexCoord3fvARB 395
-#define _gloffset_MultiTexCoord3iARB 396
-#define _gloffset_MultiTexCoord3ivARB 397
-#define _gloffset_MultiTexCoord3sARB 398
-#define _gloffset_MultiTexCoord3svARB 399
-#define _gloffset_MultiTexCoord4dARB 400
-#define _gloffset_MultiTexCoord4dvARB 401
+#define _gloffset_MultiTexCoord3i 396
+#define _gloffset_MultiTexCoord3iv 397
+#define _gloffset_MultiTexCoord3s 398
+#define _gloffset_MultiTexCoord3sv 399
+#define _gloffset_MultiTexCoord4d 400
+#define _gloffset_MultiTexCoord4dv 401
 #define _gloffset_MultiTexCoord4fARB 402
 #define _gloffset_MultiTexCoord4fvARB 403
-#define _gloffset_MultiTexCoord4iARB 404
-#define _gloffset_MultiTexCoord4ivARB 405
-#define _gloffset_MultiTexCoord4sARB 406
-#define _gloffset_MultiTexCoord4svARB 407
+#define _gloffset_MultiTexCoord4i 404
+#define _gloffset_MultiTexCoord4iv 405
+#define _gloffset_MultiTexCoord4s 406
+#define _gloffset_MultiTexCoord4sv 407
 
 #if !FEATURE_remap_table
 
-#define _gloffset_AttachShader 408
-#define _gloffset_CreateProgram 409
-#define _gloffset_CreateShader 410
-#define _gloffset_DeleteProgram 411
-#define _gloffset_DeleteShader 412
-#define _gloffset_DetachShader 413
-#define _gloffset_GetAttachedShaders 414
-#define _gloffset_GetProgramInfoLog 415
-#define _gloffset_GetProgramiv 416
-#define _gloffset_GetShaderInfoLog 417
-#define _gloffset_GetShaderiv 418
-#define _gloffset_IsProgram 419
-#define _gloffset_IsShader 420
-#define _gloffset_StencilFuncSeparate 421
-#define _gloffset_StencilMaskSeparate 422
-#define _gloffset_StencilOpSeparate 423
-#define _gloffset_UniformMatrix2x3fv 424
-#define _gloffset_UniformMatrix2x4fv 425
-#define _gloffset_UniformMatrix3x2fv 426
-#define _gloffset_UniformMatrix3x4fv 427
-#define _gloffset_UniformMatrix4x2fv 428
-#define _gloffset_UniformMatrix4x3fv 429
-#define _gloffset_ClampColor 430
-#define _gloffset_ClearBufferfi 431
-#define _gloffset_ClearBufferfv 432
-#define _gloffset_ClearBufferiv 433
-#define _gloffset_ClearBufferuiv 434
-#define _gloffset_GetStringi 435
-#define _gloffset_TexBuffer 436
-#define _gloffset_FramebufferTexture 437
-#define _gloffset_GetBufferParameteri64v 438
-#define _gloffset_GetInteger64i_v 439
-#define _gloffset_VertexAttribDivisor 440
-#define _gloffset_LoadTransposeMatrixdARB 441
-#define _gloffset_LoadTransposeMatrixfARB 442
-#define _gloffset_MultTransposeMatrixdARB 443
-#define _gloffset_MultTransposeMatrixfARB 444
-#define _gloffset_SampleCoverageARB 445
-#define _gloffset_CompressedTexImage1DARB 446
-#define _gloffset_CompressedTexImage2DARB 447
-#define _gloffset_CompressedTexImage3DARB 448
-#define _gloffset_CompressedTexSubImage1DARB 449
-#define _gloffset_CompressedTexSubImage2DARB 450
-#define _gloffset_CompressedTexSubImage3DARB 451
-#define _gloffset_GetCompressedTexImageARB 452
-#define _gloffset_DisableVertexAttribArrayARB 453
-#define _gloffset_EnableVertexAttribArrayARB 454
-#define _gloffset_GetProgramEnvParameterdvARB 455
-#define _gloffset_GetProgramEnvParameterfvARB 456
-#define _gloffset_GetProgramLocalParameterdvARB 457
-#define _gloffset_GetProgramLocalParameterfvARB 458
-#define _gloffset_GetProgramStringARB 459
-#define _gloffset_GetProgramivARB 460
-#define _gloffset_GetVertexAttribdvARB 461
-#define _gloffset_GetVertexAttribfvARB 462
-#define _gloffset_GetVertexAttribivARB 463
-#define _gloffset_ProgramEnvParameter4dARB 464
-#define _gloffset_ProgramEnvParameter4dvARB 465
-#define _gloffset_ProgramEnvParameter4fARB 466
-#define _gloffset_ProgramEnvParameter4fvARB 467
-#define _gloffset_ProgramLocalParameter4dARB 468
-#define _gloffset_ProgramLocalParameter4dvARB 469
-#define _gloffset_ProgramLocalParameter4fARB 470
-#define _gloffset_ProgramLocalParameter4fvARB 471
-#define _gloffset_ProgramStringARB 472
-#define _gloffset_VertexAttrib1dARB 473
-#define _gloffset_VertexAttrib1dvARB 474
-#define _gloffset_VertexAttrib1fARB 475
-#define _gloffset_VertexAttrib1fvARB 476
-#define _gloffset_VertexAttrib1sARB 477
-#define _gloffset_VertexAttrib1svARB 478
-#define _gloffset_VertexAttrib2dARB 479
-#define _gloffset_VertexAttrib2dvARB 480
-#define _gloffset_VertexAttrib2fARB 481
-#define _gloffset_VertexAttrib2fvARB 482
-#define _gloffset_VertexAttrib2sARB 483
-#define _gloffset_VertexAttrib2svARB 484
-#define _gloffset_VertexAttrib3dARB 485
-#define _gloffset_VertexAttrib3dvARB 486
-#define _gloffset_VertexAttrib3fARB 487
-#define _gloffset_VertexAttrib3fvARB 488
-#define _gloffset_VertexAttrib3sARB 489
-#define _gloffset_VertexAttrib3svARB 490
-#define _gloffset_VertexAttrib4NbvARB 491
-#define _gloffset_VertexAttrib4NivARB 492
-#define _gloffset_VertexAttrib4NsvARB 493
-#define _gloffset_VertexAttrib4NubARB 494
-#define _gloffset_VertexAttrib4NubvARB 495
-#define _gloffset_VertexAttrib4NuivARB 496
-#define _gloffset_VertexAttrib4NusvARB 497
-#define _gloffset_VertexAttrib4bvARB 498
-#define _gloffset_VertexAttrib4dARB 499
-#define _gloffset_VertexAttrib4dvARB 500
-#define _gloffset_VertexAttrib4fARB 501
-#define _gloffset_VertexAttrib4fvARB 502
-#define _gloffset_VertexAttrib4ivARB 503
-#define _gloffset_VertexAttrib4sARB 504
-#define _gloffset_VertexAttrib4svARB 505
-#define _gloffset_VertexAttrib4ubvARB 506
-#define _gloffset_VertexAttrib4uivARB 507
-#define _gloffset_VertexAttrib4usvARB 508
-#define _gloffset_VertexAttribPointerARB 509
-#define _gloffset_BindBufferARB 510
-#define _gloffset_BufferDataARB 511
-#define _gloffset_BufferSubDataARB 512
-#define _gloffset_DeleteBuffersARB 513
-#define _gloffset_GenBuffersARB 514
-#define _gloffset_GetBufferParameterivARB 515
-#define _gloffset_GetBufferPointervARB 516
-#define _gloffset_GetBufferSubDataARB 517
-#define _gloffset_IsBufferARB 518
-#define _gloffset_MapBufferARB 519
-#define _gloffset_UnmapBufferARB 520
-#define _gloffset_BeginQueryARB 521
-#define _gloffset_DeleteQueriesARB 522
-#define _gloffset_EndQueryARB 523
-#define _gloffset_GenQueriesARB 524
-#define _gloffset_GetQueryObjectivARB 525
-#define _gloffset_GetQueryObjectuivARB 526
-#define _gloffset_GetQueryivARB 527
-#define _gloffset_IsQueryARB 528
-#define _gloffset_AttachObjectARB 529
-#define _gloffset_CompileShaderARB 530
-#define _gloffset_CreateProgramObjectARB 531
-#define _gloffset_CreateShaderObjectARB 532
-#define _gloffset_DeleteObjectARB 533
-#define _gloffset_DetachObjectARB 534
-#define _gloffset_GetActiveUniformARB 535
-#define _gloffset_GetAttachedObjectsARB 536
-#define _gloffset_GetHandleARB 537
-#define _gloffset_GetInfoLogARB 538
-#define _gloffset_GetObjectParameterfvARB 539
-#define _gloffset_GetObjectParameterivARB 540
-#define _gloffset_GetShaderSourceARB 541
-#define _gloffset_GetUniformLocationARB 542
-#define _gloffset_GetUniformfvARB 543
-#define _gloffset_GetUniformivARB 544
-#define _gloffset_LinkProgramARB 545
-#define _gloffset_ShaderSourceARB 546
-#define _gloffset_Uniform1fARB 547
-#define _gloffset_Uniform1fvARB 548
-#define _gloffset_Uniform1iARB 549
-#define _gloffset_Uniform1ivARB 550
-#define _gloffset_Uniform2fARB 551
-#define _gloffset_Uniform2fvARB 552
-#define _gloffset_Uniform2iARB 553
-#define _gloffset_Uniform2ivARB 554
-#define _gloffset_Uniform3fARB 555
-#define _gloffset_Uniform3fvARB 556
-#define _gloffset_Uniform3iARB 557
-#define _gloffset_Uniform3ivARB 558
-#define _gloffset_Uniform4fARB 559
-#define _gloffset_Uniform4fvARB 560
-#define _gloffset_Uniform4iARB 561
-#define _gloffset_Uniform4ivARB 562
-#define _gloffset_UniformMatrix2fvARB 563
-#define _gloffset_UniformMatrix3fvARB 564
-#define _gloffset_UniformMatrix4fvARB 565
-#define _gloffset_UseProgramObjectARB 566
-#define _gloffset_ValidateProgramARB 567
-#define _gloffset_BindAttribLocationARB 568
-#define _gloffset_GetActiveAttribARB 569
-#define _gloffset_GetAttribLocationARB 570
-#define _gloffset_DrawBuffersARB 571
-#define _gloffset_ClampColorARB 572
-#define _gloffset_DrawArraysInstancedARB 573
-#define _gloffset_DrawElementsInstancedARB 574
-#define _gloffset_RenderbufferStorageMultisample 575
-#define _gloffset_FramebufferTextureARB 576
-#define _gloffset_FramebufferTextureFaceARB 577
-#define _gloffset_ProgramParameteriARB 578
-#define _gloffset_VertexAttribDivisorARB 579
-#define _gloffset_FlushMappedBufferRange 580
-#define _gloffset_MapBufferRange 581
-#define _gloffset_TexBufferARB 582
-#define _gloffset_BindVertexArray 583
-#define _gloffset_GenVertexArrays 584
-#define _gloffset_CopyBufferSubData 585
-#define _gloffset_ClientWaitSync 586
-#define _gloffset_DeleteSync 587
-#define _gloffset_FenceSync 588
-#define _gloffset_GetInteger64v 589
-#define _gloffset_GetSynciv 590
-#define _gloffset_IsSync 591
-#define _gloffset_WaitSync 592
-#define _gloffset_DrawElementsBaseVertex 593
-#define _gloffset_DrawElementsInstancedBaseVertex 594
-#define _gloffset_DrawRangeElementsBaseVertex 595
-#define _gloffset_MultiDrawElementsBaseVertex 596
-#define _gloffset_BlendEquationSeparateiARB 597
-#define _gloffset_BlendEquationiARB 598
-#define _gloffset_BlendFuncSeparateiARB 599
-#define _gloffset_BlendFunciARB 600
-#define _gloffset_BindSampler 601
-#define _gloffset_DeleteSamplers 602
-#define _gloffset_GenSamplers 603
-#define _gloffset_GetSamplerParameterIiv 604
-#define _gloffset_GetSamplerParameterIuiv 605
-#define _gloffset_GetSamplerParameterfv 606
-#define _gloffset_GetSamplerParameteriv 607
-#define _gloffset_IsSampler 608
-#define _gloffset_SamplerParameterIiv 609
-#define _gloffset_SamplerParameterIuiv 610
-#define _gloffset_SamplerParameterf 611
-#define _gloffset_SamplerParameterfv 612
-#define _gloffset_SamplerParameteri 613
-#define _gloffset_SamplerParameteriv 614
-#define _gloffset_ColorP3ui 615
-#define _gloffset_ColorP3uiv 616
-#define _gloffset_ColorP4ui 617
-#define _gloffset_ColorP4uiv 618
-#define _gloffset_MultiTexCoordP1ui 619
-#define _gloffset_MultiTexCoordP1uiv 620
-#define _gloffset_MultiTexCoordP2ui 621
-#define _gloffset_MultiTexCoordP2uiv 622
-#define _gloffset_MultiTexCoordP3ui 623
-#define _gloffset_MultiTexCoordP3uiv 624
-#define _gloffset_MultiTexCoordP4ui 625
-#define _gloffset_MultiTexCoordP4uiv 626
-#define _gloffset_NormalP3ui 627
-#define _gloffset_NormalP3uiv 628
-#define _gloffset_SecondaryColorP3ui 629
-#define _gloffset_SecondaryColorP3uiv 630
-#define _gloffset_TexCoordP1ui 631
-#define _gloffset_TexCoordP1uiv 632
-#define _gloffset_TexCoordP2ui 633
-#define _gloffset_TexCoordP2uiv 634
-#define _gloffset_TexCoordP3ui 635
-#define _gloffset_TexCoordP3uiv 636
-#define _gloffset_TexCoordP4ui 637
-#define _gloffset_TexCoordP4uiv 638
-#define _gloffset_VertexAttribP1ui 639
-#define _gloffset_VertexAttribP1uiv 640
-#define _gloffset_VertexAttribP2ui 641
-#define _gloffset_VertexAttribP2uiv 642
-#define _gloffset_VertexAttribP3ui 643
-#define _gloffset_VertexAttribP3uiv 644
-#define _gloffset_VertexAttribP4ui 645
-#define _gloffset_VertexAttribP4uiv 646
-#define _gloffset_VertexP2ui 647
-#define _gloffset_VertexP2uiv 648
-#define _gloffset_VertexP3ui 649
-#define _gloffset_VertexP3uiv 650
-#define _gloffset_VertexP4ui 651
-#define _gloffset_VertexP4uiv 652
-#define _gloffset_BindTransformFeedback 653
-#define _gloffset_DeleteTransformFeedbacks 654
-#define _gloffset_DrawTransformFeedback 655
-#define _gloffset_GenTransformFeedbacks 656
-#define _gloffset_IsTransformFeedback 657
-#define _gloffset_PauseTransformFeedback 658
-#define _gloffset_ResumeTransformFeedback 659
-#define _gloffset_ClearDepthf 660
-#define _gloffset_DepthRangef 661
-#define _gloffset_GetShaderPrecisionFormat 662
-#define _gloffset_ReleaseShaderCompiler 663
-#define _gloffset_ShaderBinary 664
-#define _gloffset_GetGraphicsResetStatusARB 665
-#define _gloffset_GetnColorTableARB 666
-#define _gloffset_GetnCompressedTexImageARB 667
-#define _gloffset_GetnConvolutionFilterARB 668
-#define _gloffset_GetnHistogramARB 669
-#define _gloffset_GetnMapdvARB 670
-#define _gloffset_GetnMapfvARB 671
-#define _gloffset_GetnMapivARB 672
-#define _gloffset_GetnMinmaxARB 673
-#define _gloffset_GetnPixelMapfvARB 674
-#define _gloffset_GetnPixelMapuivARB 675
-#define _gloffset_GetnPixelMapusvARB 676
-#define _gloffset_GetnPolygonStippleARB 677
-#define _gloffset_GetnSeparableFilterARB 678
-#define _gloffset_GetnTexImageARB 679
-#define _gloffset_GetnUniformdvARB 680
-#define _gloffset_GetnUniformfvARB 681
-#define _gloffset_GetnUniformivARB 682
-#define _gloffset_GetnUniformuivARB 683
-#define _gloffset_ReadnPixelsARB 684
-#define _gloffset_TexStorage1D 685
-#define _gloffset_TexStorage2D 686
-#define _gloffset_TexStorage3D 687
-#define _gloffset_TextureStorage1DEXT 688
-#define _gloffset_TextureStorage2DEXT 689
-#define _gloffset_TextureStorage3DEXT 690
-#define _gloffset_PolygonOffsetEXT 691
-#define _gloffset_GetPixelTexGenParameterfvSGIS 692
-#define _gloffset_GetPixelTexGenParameterivSGIS 693
-#define _gloffset_PixelTexGenParameterfSGIS 694
-#define _gloffset_PixelTexGenParameterfvSGIS 695
-#define _gloffset_PixelTexGenParameteriSGIS 696
-#define _gloffset_PixelTexGenParameterivSGIS 697
-#define _gloffset_SampleMaskSGIS 698
-#define _gloffset_SamplePatternSGIS 699
-#define _gloffset_ColorPointerEXT 700
-#define _gloffset_EdgeFlagPointerEXT 701
-#define _gloffset_IndexPointerEXT 702
-#define _gloffset_NormalPointerEXT 703
-#define _gloffset_TexCoordPointerEXT 704
-#define _gloffset_VertexPointerEXT 705
-#define _gloffset_PointParameterfEXT 706
-#define _gloffset_PointParameterfvEXT 707
-#define _gloffset_LockArraysEXT 708
-#define _gloffset_UnlockArraysEXT 709
-#define _gloffset_SecondaryColor3bEXT 710
-#define _gloffset_SecondaryColor3bvEXT 711
-#define _gloffset_SecondaryColor3dEXT 712
-#define _gloffset_SecondaryColor3dvEXT 713
-#define _gloffset_SecondaryColor3fEXT 714
-#define _gloffset_SecondaryColor3fvEXT 715
-#define _gloffset_SecondaryColor3iEXT 716
-#define _gloffset_SecondaryColor3ivEXT 717
-#define _gloffset_SecondaryColor3sEXT 718
-#define _gloffset_SecondaryColor3svEXT 719
-#define _gloffset_SecondaryColor3ubEXT 720
-#define _gloffset_SecondaryColor3ubvEXT 721
-#define _gloffset_SecondaryColor3uiEXT 722
-#define _gloffset_SecondaryColor3uivEXT 723
-#define _gloffset_SecondaryColor3usEXT 724
-#define _gloffset_SecondaryColor3usvEXT 725
-#define _gloffset_SecondaryColorPointerEXT 726
-#define _gloffset_MultiDrawArraysEXT 727
-#define _gloffset_MultiDrawElementsEXT 728
-#define _gloffset_FogCoordPointerEXT 729
-#define _gloffset_FogCoorddEXT 730
-#define _gloffset_FogCoorddvEXT 731
-#define _gloffset_FogCoordfEXT 732
-#define _gloffset_FogCoordfvEXT 733
-#define _gloffset_PixelTexGenSGIX 734
-#define _gloffset_BlendFuncSeparateEXT 735
-#define _gloffset_FlushVertexArrayRangeNV 736
-#define _gloffset_VertexArrayRangeNV 737
-#define _gloffset_CombinerInputNV 738
-#define _gloffset_CombinerOutputNV 739
-#define _gloffset_CombinerParameterfNV 740
-#define _gloffset_CombinerParameterfvNV 741
-#define _gloffset_CombinerParameteriNV 742
-#define _gloffset_CombinerParameterivNV 743
-#define _gloffset_FinalCombinerInputNV 744
-#define _gloffset_GetCombinerInputParameterfvNV 745
-#define _gloffset_GetCombinerInputParameterivNV 746
-#define _gloffset_GetCombinerOutputParameterfvNV 747
-#define _gloffset_GetCombinerOutputParameterivNV 748
-#define _gloffset_GetFinalCombinerInputParameterfvNV 749
-#define _gloffset_GetFinalCombinerInputParameterivNV 750
-#define _gloffset_ResizeBuffersMESA 751
-#define _gloffset_WindowPos2dMESA 752
-#define _gloffset_WindowPos2dvMESA 753
-#define _gloffset_WindowPos2fMESA 754
-#define _gloffset_WindowPos2fvMESA 755
-#define _gloffset_WindowPos2iMESA 756
-#define _gloffset_WindowPos2ivMESA 757
-#define _gloffset_WindowPos2sMESA 758
-#define _gloffset_WindowPos2svMESA 759
-#define _gloffset_WindowPos3dMESA 760
-#define _gloffset_WindowPos3dvMESA 761
-#define _gloffset_WindowPos3fMESA 762
-#define _gloffset_WindowPos3fvMESA 763
-#define _gloffset_WindowPos3iMESA 764
-#define _gloffset_WindowPos3ivMESA 765
-#define _gloffset_WindowPos3sMESA 766
-#define _gloffset_WindowPos3svMESA 767
-#define _gloffset_WindowPos4dMESA 768
-#define _gloffset_WindowPos4dvMESA 769
-#define _gloffset_WindowPos4fMESA 770
-#define _gloffset_WindowPos4fvMESA 771
-#define _gloffset_WindowPos4iMESA 772
-#define _gloffset_WindowPos4ivMESA 773
-#define _gloffset_WindowPos4sMESA 774
-#define _gloffset_WindowPos4svMESA 775
-#define _gloffset_MultiModeDrawArraysIBM 776
-#define _gloffset_MultiModeDrawElementsIBM 777
-#define _gloffset_DeleteFencesNV 778
-#define _gloffset_FinishFenceNV 779
-#define _gloffset_GenFencesNV 780
-#define _gloffset_GetFenceivNV 781
-#define _gloffset_IsFenceNV 782
-#define _gloffset_SetFenceNV 783
-#define _gloffset_TestFenceNV 784
-#define _gloffset_AreProgramsResidentNV 785
-#define _gloffset_BindProgramNV 786
-#define _gloffset_DeleteProgramsNV 787
-#define _gloffset_ExecuteProgramNV 788
-#define _gloffset_GenProgramsNV 789
-#define _gloffset_GetProgramParameterdvNV 790
-#define _gloffset_GetProgramParameterfvNV 791
-#define _gloffset_GetProgramStringNV 792
-#define _gloffset_GetProgramivNV 793
-#define _gloffset_GetTrackMatrixivNV 794
-#define _gloffset_GetVertexAttribPointervNV 795
-#define _gloffset_GetVertexAttribdvNV 796
-#define _gloffset_GetVertexAttribfvNV 797
-#define _gloffset_GetVertexAttribivNV 798
-#define _gloffset_IsProgramNV 799
-#define _gloffset_LoadProgramNV 800
-#define _gloffset_ProgramParameters4dvNV 801
-#define _gloffset_ProgramParameters4fvNV 802
-#define _gloffset_RequestResidentProgramsNV 803
-#define _gloffset_TrackMatrixNV 804
-#define _gloffset_VertexAttrib1dNV 805
-#define _gloffset_VertexAttrib1dvNV 806
-#define _gloffset_VertexAttrib1fNV 807
-#define _gloffset_VertexAttrib1fvNV 808
-#define _gloffset_VertexAttrib1sNV 809
-#define _gloffset_VertexAttrib1svNV 810
-#define _gloffset_VertexAttrib2dNV 811
-#define _gloffset_VertexAttrib2dvNV 812
-#define _gloffset_VertexAttrib2fNV 813
-#define _gloffset_VertexAttrib2fvNV 814
-#define _gloffset_VertexAttrib2sNV 815
-#define _gloffset_VertexAttrib2svNV 816
-#define _gloffset_VertexAttrib3dNV 817
-#define _gloffset_VertexAttrib3dvNV 818
-#define _gloffset_VertexAttrib3fNV 819
-#define _gloffset_VertexAttrib3fvNV 820
-#define _gloffset_VertexAttrib3sNV 821
-#define _gloffset_VertexAttrib3svNV 822
-#define _gloffset_VertexAttrib4dNV 823
-#define _gloffset_VertexAttrib4dvNV 824
-#define _gloffset_VertexAttrib4fNV 825
-#define _gloffset_VertexAttrib4fvNV 826
-#define _gloffset_VertexAttrib4sNV 827
-#define _gloffset_VertexAttrib4svNV 828
-#define _gloffset_VertexAttrib4ubNV 829
-#define _gloffset_VertexAttrib4ubvNV 830
-#define _gloffset_VertexAttribPointerNV 831
-#define _gloffset_VertexAttribs1dvNV 832
-#define _gloffset_VertexAttribs1fvNV 833
-#define _gloffset_VertexAttribs1svNV 834
-#define _gloffset_VertexAttribs2dvNV 835
-#define _gloffset_VertexAttribs2fvNV 836
-#define _gloffset_VertexAttribs2svNV 837
-#define _gloffset_VertexAttribs3dvNV 838
-#define _gloffset_VertexAttribs3fvNV 839
-#define _gloffset_VertexAttribs3svNV 840
-#define _gloffset_VertexAttribs4dvNV 841
-#define _gloffset_VertexAttribs4fvNV 842
-#define _gloffset_VertexAttribs4svNV 843
-#define _gloffset_VertexAttribs4ubvNV 844
-#define _gloffset_GetTexBumpParameterfvATI 845
-#define _gloffset_GetTexBumpParameterivATI 846
-#define _gloffset_TexBumpParameterfvATI 847
-#define _gloffset_TexBumpParameterivATI 848
-#define _gloffset_AlphaFragmentOp1ATI 849
-#define _gloffset_AlphaFragmentOp2ATI 850
-#define _gloffset_AlphaFragmentOp3ATI 851
-#define _gloffset_BeginFragmentShaderATI 852
-#define _gloffset_BindFragmentShaderATI 853
-#define _gloffset_ColorFragmentOp1ATI 854
-#define _gloffset_ColorFragmentOp2ATI 855
-#define _gloffset_ColorFragmentOp3ATI 856
-#define _gloffset_DeleteFragmentShaderATI 857
-#define _gloffset_EndFragmentShaderATI 858
-#define _gloffset_GenFragmentShadersATI 859
-#define _gloffset_PassTexCoordATI 860
-#define _gloffset_SampleMapATI 861
-#define _gloffset_SetFragmentShaderConstantATI 862
-#define _gloffset_PointParameteriNV 863
-#define _gloffset_PointParameterivNV 864
-#define _gloffset_ActiveStencilFaceEXT 865
-#define _gloffset_BindVertexArrayAPPLE 866
-#define _gloffset_DeleteVertexArraysAPPLE 867
-#define _gloffset_GenVertexArraysAPPLE 868
-#define _gloffset_IsVertexArrayAPPLE 869
-#define _gloffset_GetProgramNamedParameterdvNV 870
-#define _gloffset_GetProgramNamedParameterfvNV 871
-#define _gloffset_ProgramNamedParameter4dNV 872
-#define _gloffset_ProgramNamedParameter4dvNV 873
-#define _gloffset_ProgramNamedParameter4fNV 874
-#define _gloffset_ProgramNamedParameter4fvNV 875
-#define _gloffset_PrimitiveRestartIndexNV 876
-#define _gloffset_PrimitiveRestartNV 877
-#define _gloffset_DepthBoundsEXT 878
-#define _gloffset_BlendEquationSeparateEXT 879
-#define _gloffset_BindFramebufferEXT 880
-#define _gloffset_BindRenderbufferEXT 881
-#define _gloffset_CheckFramebufferStatusEXT 882
-#define _gloffset_DeleteFramebuffersEXT 883
-#define _gloffset_DeleteRenderbuffersEXT 884
-#define _gloffset_FramebufferRenderbufferEXT 885
-#define _gloffset_FramebufferTexture1DEXT 886
-#define _gloffset_FramebufferTexture2DEXT 887
-#define _gloffset_FramebufferTexture3DEXT 888
-#define _gloffset_GenFramebuffersEXT 889
-#define _gloffset_GenRenderbuffersEXT 890
-#define _gloffset_GenerateMipmapEXT 891
-#define _gloffset_GetFramebufferAttachmentParameterivEXT 892
-#define _gloffset_GetRenderbufferParameterivEXT 893
-#define _gloffset_IsFramebufferEXT 894
-#define _gloffset_IsRenderbufferEXT 895
-#define _gloffset_RenderbufferStorageEXT 896
-#define _gloffset_BlitFramebufferEXT 897
-#define _gloffset_BufferParameteriAPPLE 898
-#define _gloffset_FlushMappedBufferRangeAPPLE 899
-#define _gloffset_BindFragDataLocationEXT 900
-#define _gloffset_GetFragDataLocationEXT 901
-#define _gloffset_GetUniformuivEXT 902
-#define _gloffset_GetVertexAttribIivEXT 903
-#define _gloffset_GetVertexAttribIuivEXT 904
-#define _gloffset_Uniform1uiEXT 905
-#define _gloffset_Uniform1uivEXT 906
-#define _gloffset_Uniform2uiEXT 907
-#define _gloffset_Uniform2uivEXT 908
-#define _gloffset_Uniform3uiEXT 909
-#define _gloffset_Uniform3uivEXT 910
-#define _gloffset_Uniform4uiEXT 911
-#define _gloffset_Uniform4uivEXT 912
-#define _gloffset_VertexAttribI1iEXT 913
-#define _gloffset_VertexAttribI1ivEXT 914
-#define _gloffset_VertexAttribI1uiEXT 915
-#define _gloffset_VertexAttribI1uivEXT 916
-#define _gloffset_VertexAttribI2iEXT 917
-#define _gloffset_VertexAttribI2ivEXT 918
-#define _gloffset_VertexAttribI2uiEXT 919
-#define _gloffset_VertexAttribI2uivEXT 920
-#define _gloffset_VertexAttribI3iEXT 921
-#define _gloffset_VertexAttribI3ivEXT 922
-#define _gloffset_VertexAttribI3uiEXT 923
-#define _gloffset_VertexAttribI3uivEXT 924
-#define _gloffset_VertexAttribI4bvEXT 925
-#define _gloffset_VertexAttribI4iEXT 926
-#define _gloffset_VertexAttribI4ivEXT 927
-#define _gloffset_VertexAttribI4svEXT 928
-#define _gloffset_VertexAttribI4ubvEXT 929
-#define _gloffset_VertexAttribI4uiEXT 930
-#define _gloffset_VertexAttribI4uivEXT 931
-#define _gloffset_VertexAttribI4usvEXT 932
-#define _gloffset_VertexAttribIPointerEXT 933
-#define _gloffset_FramebufferTextureLayerEXT 934
-#define _gloffset_ColorMaskIndexedEXT 935
-#define _gloffset_DisableIndexedEXT 936
-#define _gloffset_EnableIndexedEXT 937
-#define _gloffset_GetBooleanIndexedvEXT 938
-#define _gloffset_GetIntegerIndexedvEXT 939
-#define _gloffset_IsEnabledIndexedEXT 940
-#define _gloffset_ClearColorIiEXT 941
-#define _gloffset_ClearColorIuiEXT 942
-#define _gloffset_GetTexParameterIivEXT 943
-#define _gloffset_GetTexParameterIuivEXT 944
-#define _gloffset_TexParameterIivEXT 945
-#define _gloffset_TexParameterIuivEXT 946
-#define _gloffset_BeginConditionalRenderNV 947
-#define _gloffset_EndConditionalRenderNV 948
-#define _gloffset_BeginTransformFeedbackEXT 949
-#define _gloffset_BindBufferBaseEXT 950
-#define _gloffset_BindBufferOffsetEXT 951
-#define _gloffset_BindBufferRangeEXT 952
-#define _gloffset_EndTransformFeedbackEXT 953
-#define _gloffset_GetTransformFeedbackVaryingEXT 954
-#define _gloffset_TransformFeedbackVaryingsEXT 955
-#define _gloffset_ProvokingVertexEXT 956
-#define _gloffset_GetTexParameterPointervAPPLE 957
-#define _gloffset_TextureRangeAPPLE 958
-#define _gloffset_GetObjectParameterivAPPLE 959
-#define _gloffset_ObjectPurgeableAPPLE 960
-#define _gloffset_ObjectUnpurgeableAPPLE 961
-#define _gloffset_ActiveProgramEXT 962
-#define _gloffset_CreateShaderProgramEXT 963
-#define _gloffset_UseShaderProgramEXT 964
-#define _gloffset_TextureBarrierNV 965
-#define _gloffset_StencilFuncSeparateATI 966
-#define _gloffset_ProgramEnvParameters4fvEXT 967
-#define _gloffset_ProgramLocalParameters4fvEXT 968
-#define _gloffset_GetQueryObjecti64vEXT 969
-#define _gloffset_GetQueryObjectui64vEXT 970
-#define _gloffset_EGLImageTargetRenderbufferStorageOES 971
-#define _gloffset_EGLImageTargetTexture2DOES 972
-
-#else                           /* !FEATURE_remap_table */
-
-#define driDispatchRemapTable_size 565
-extern int driDispatchRemapTable[driDispatchRemapTable_size];
-
-#define AttachShader_remap_index 0
-#define CreateProgram_remap_index 1
-#define CreateShader_remap_index 2
-#define DeleteProgram_remap_index 3
-#define DeleteShader_remap_index 4
-#define DetachShader_remap_index 5
-#define GetAttachedShaders_remap_index 6
-#define GetProgramInfoLog_remap_index 7
-#define GetProgramiv_remap_index 8
-#define GetShaderInfoLog_remap_index 9
-#define GetShaderiv_remap_index 10
-#define IsProgram_remap_index 11
-#define IsShader_remap_index 12
-#define StencilFuncSeparate_remap_index 13
-#define StencilMaskSeparate_remap_index 14
-#define StencilOpSeparate_remap_index 15
-#define UniformMatrix2x3fv_remap_index 16
-#define UniformMatrix2x4fv_remap_index 17
-#define UniformMatrix3x2fv_remap_index 18
-#define UniformMatrix3x4fv_remap_index 19
-#define UniformMatrix4x2fv_remap_index 20
-#define UniformMatrix4x3fv_remap_index 21
-#define ClampColor_remap_index 22
-#define ClearBufferfi_remap_index 23
-#define ClearBufferfv_remap_index 24
-#define ClearBufferiv_remap_index 25
-#define ClearBufferuiv_remap_index 26
-#define GetStringi_remap_index 27
-#define TexBuffer_remap_index 28
-#define FramebufferTexture_remap_index 29
-#define GetBufferParameteri64v_remap_index 30
-#define GetInteger64i_v_remap_index 31
-#define VertexAttribDivisor_remap_index 32
-#define LoadTransposeMatrixdARB_remap_index 33
-#define LoadTransposeMatrixfARB_remap_index 34
-#define MultTransposeMatrixdARB_remap_index 35
-#define MultTransposeMatrixfARB_remap_index 36
-#define SampleCoverageARB_remap_index 37
-#define CompressedTexImage1DARB_remap_index 38
-#define CompressedTexImage2DARB_remap_index 39
-#define CompressedTexImage3DARB_remap_index 40
-#define CompressedTexSubImage1DARB_remap_index 41
-#define CompressedTexSubImage2DARB_remap_index 42
-#define CompressedTexSubImage3DARB_remap_index 43
-#define GetCompressedTexImageARB_remap_index 44
-#define DisableVertexAttribArrayARB_remap_index 45
-#define EnableVertexAttribArrayARB_remap_index 46
-#define GetProgramEnvParameterdvARB_remap_index 47
-#define GetProgramEnvParameterfvARB_remap_index 48
-#define GetProgramLocalParameterdvARB_remap_index 49
-#define GetProgramLocalParameterfvARB_remap_index 50
-#define GetProgramStringARB_remap_index 51
-#define GetProgramivARB_remap_index 52
-#define GetVertexAttribdvARB_remap_index 53
-#define GetVertexAttribfvARB_remap_index 54
-#define GetVertexAttribivARB_remap_index 55
-#define ProgramEnvParameter4dARB_remap_index 56
-#define ProgramEnvParameter4dvARB_remap_index 57
-#define ProgramEnvParameter4fARB_remap_index 58
-#define ProgramEnvParameter4fvARB_remap_index 59
-#define ProgramLocalParameter4dARB_remap_index 60
-#define ProgramLocalParameter4dvARB_remap_index 61
-#define ProgramLocalParameter4fARB_remap_index 62
-#define ProgramLocalParameter4fvARB_remap_index 63
-#define ProgramStringARB_remap_index 64
-#define VertexAttrib1dARB_remap_index 65
-#define VertexAttrib1dvARB_remap_index 66
-#define VertexAttrib1fARB_remap_index 67
-#define VertexAttrib1fvARB_remap_index 68
-#define VertexAttrib1sARB_remap_index 69
-#define VertexAttrib1svARB_remap_index 70
-#define VertexAttrib2dARB_remap_index 71
-#define VertexAttrib2dvARB_remap_index 72
-#define VertexAttrib2fARB_remap_index 73
-#define VertexAttrib2fvARB_remap_index 74
-#define VertexAttrib2sARB_remap_index 75
-#define VertexAttrib2svARB_remap_index 76
-#define VertexAttrib3dARB_remap_index 77
-#define VertexAttrib3dvARB_remap_index 78
-#define VertexAttrib3fARB_remap_index 79
-#define VertexAttrib3fvARB_remap_index 80
-#define VertexAttrib3sARB_remap_index 81
-#define VertexAttrib3svARB_remap_index 82
-#define VertexAttrib4NbvARB_remap_index 83
-#define VertexAttrib4NivARB_remap_index 84
-#define VertexAttrib4NsvARB_remap_index 85
-#define VertexAttrib4NubARB_remap_index 86
-#define VertexAttrib4NubvARB_remap_index 87
-#define VertexAttrib4NuivARB_remap_index 88
-#define VertexAttrib4NusvARB_remap_index 89
-#define VertexAttrib4bvARB_remap_index 90
-#define VertexAttrib4dARB_remap_index 91
-#define VertexAttrib4dvARB_remap_index 92
-#define VertexAttrib4fARB_remap_index 93
-#define VertexAttrib4fvARB_remap_index 94
-#define VertexAttrib4ivARB_remap_index 95
-#define VertexAttrib4sARB_remap_index 96
-#define VertexAttrib4svARB_remap_index 97
-#define VertexAttrib4ubvARB_remap_index 98
-#define VertexAttrib4uivARB_remap_index 99
-#define VertexAttrib4usvARB_remap_index 100
-#define VertexAttribPointerARB_remap_index 101
-#define BindBufferARB_remap_index 102
-#define BufferDataARB_remap_index 103
-#define BufferSubDataARB_remap_index 104
-#define DeleteBuffersARB_remap_index 105
-#define GenBuffersARB_remap_index 106
-#define GetBufferParameterivARB_remap_index 107
-#define GetBufferPointervARB_remap_index 108
-#define GetBufferSubDataARB_remap_index 109
-#define IsBufferARB_remap_index 110
-#define MapBufferARB_remap_index 111
-#define UnmapBufferARB_remap_index 112
-#define BeginQueryARB_remap_index 113
-#define DeleteQueriesARB_remap_index 114
-#define EndQueryARB_remap_index 115
-#define GenQueriesARB_remap_index 116
-#define GetQueryObjectivARB_remap_index 117
-#define GetQueryObjectuivARB_remap_index 118
-#define GetQueryivARB_remap_index 119
-#define IsQueryARB_remap_index 120
-#define AttachObjectARB_remap_index 121
-#define CompileShaderARB_remap_index 122
-#define CreateProgramObjectARB_remap_index 123
-#define CreateShaderObjectARB_remap_index 124
-#define DeleteObjectARB_remap_index 125
-#define DetachObjectARB_remap_index 126
-#define GetActiveUniformARB_remap_index 127
-#define GetAttachedObjectsARB_remap_index 128
-#define GetHandleARB_remap_index 129
-#define GetInfoLogARB_remap_index 130
-#define GetObjectParameterfvARB_remap_index 131
-#define GetObjectParameterivARB_remap_index 132
-#define GetShaderSourceARB_remap_index 133
-#define GetUniformLocationARB_remap_index 134
-#define GetUniformfvARB_remap_index 135
-#define GetUniformivARB_remap_index 136
-#define LinkProgramARB_remap_index 137
-#define ShaderSourceARB_remap_index 138
-#define Uniform1fARB_remap_index 139
-#define Uniform1fvARB_remap_index 140
-#define Uniform1iARB_remap_index 141
-#define Uniform1ivARB_remap_index 142
-#define Uniform2fARB_remap_index 143
-#define Uniform2fvARB_remap_index 144
-#define Uniform2iARB_remap_index 145
-#define Uniform2ivARB_remap_index 146
-#define Uniform3fARB_remap_index 147
-#define Uniform3fvARB_remap_index 148
-#define Uniform3iARB_remap_index 149
-#define Uniform3ivARB_remap_index 150
-#define Uniform4fARB_remap_index 151
-#define Uniform4fvARB_remap_index 152
-#define Uniform4iARB_remap_index 153
-#define Uniform4ivARB_remap_index 154
-#define UniformMatrix2fvARB_remap_index 155
-#define UniformMatrix3fvARB_remap_index 156
-#define UniformMatrix4fvARB_remap_index 157
-#define UseProgramObjectARB_remap_index 158
-#define ValidateProgramARB_remap_index 159
-#define BindAttribLocationARB_remap_index 160
-#define GetActiveAttribARB_remap_index 161
-#define GetAttribLocationARB_remap_index 162
-#define DrawBuffersARB_remap_index 163
-#define ClampColorARB_remap_index 164
-#define DrawArraysInstancedARB_remap_index 165
-#define DrawElementsInstancedARB_remap_index 166
-#define RenderbufferStorageMultisample_remap_index 167
-#define FramebufferTextureARB_remap_index 168
-#define FramebufferTextureFaceARB_remap_index 169
-#define ProgramParameteriARB_remap_index 170
-#define VertexAttribDivisorARB_remap_index 171
-#define FlushMappedBufferRange_remap_index 172
-#define MapBufferRange_remap_index 173
-#define TexBufferARB_remap_index 174
-#define BindVertexArray_remap_index 175
-#define GenVertexArrays_remap_index 176
-#define CopyBufferSubData_remap_index 177
-#define ClientWaitSync_remap_index 178
-#define DeleteSync_remap_index 179
-#define FenceSync_remap_index 180
-#define GetInteger64v_remap_index 181
-#define GetSynciv_remap_index 182
-#define IsSync_remap_index 183
-#define WaitSync_remap_index 184
-#define DrawElementsBaseVertex_remap_index 185
-#define DrawElementsInstancedBaseVertex_remap_index 186
-#define DrawRangeElementsBaseVertex_remap_index 187
-#define MultiDrawElementsBaseVertex_remap_index 188
-#define BlendEquationSeparateiARB_remap_index 189
-#define BlendEquationiARB_remap_index 190
-#define BlendFuncSeparateiARB_remap_index 191
-#define BlendFunciARB_remap_index 192
-#define BindSampler_remap_index 193
-#define DeleteSamplers_remap_index 194
-#define GenSamplers_remap_index 195
-#define GetSamplerParameterIiv_remap_index 196
-#define GetSamplerParameterIuiv_remap_index 197
-#define GetSamplerParameterfv_remap_index 198
-#define GetSamplerParameteriv_remap_index 199
-#define IsSampler_remap_index 200
-#define SamplerParameterIiv_remap_index 201
-#define SamplerParameterIuiv_remap_index 202
-#define SamplerParameterf_remap_index 203
-#define SamplerParameterfv_remap_index 204
-#define SamplerParameteri_remap_index 205
-#define SamplerParameteriv_remap_index 206
-#define ColorP3ui_remap_index 207
-#define ColorP3uiv_remap_index 208
-#define ColorP4ui_remap_index 209
-#define ColorP4uiv_remap_index 210
-#define MultiTexCoordP1ui_remap_index 211
-#define MultiTexCoordP1uiv_remap_index 212
-#define MultiTexCoordP2ui_remap_index 213
-#define MultiTexCoordP2uiv_remap_index 214
-#define MultiTexCoordP3ui_remap_index 215
-#define MultiTexCoordP3uiv_remap_index 216
-#define MultiTexCoordP4ui_remap_index 217
-#define MultiTexCoordP4uiv_remap_index 218
-#define NormalP3ui_remap_index 219
-#define NormalP3uiv_remap_index 220
-#define SecondaryColorP3ui_remap_index 221
-#define SecondaryColorP3uiv_remap_index 222
-#define TexCoordP1ui_remap_index 223
-#define TexCoordP1uiv_remap_index 224
-#define TexCoordP2ui_remap_index 225
-#define TexCoordP2uiv_remap_index 226
-#define TexCoordP3ui_remap_index 227
-#define TexCoordP3uiv_remap_index 228
-#define TexCoordP4ui_remap_index 229
-#define TexCoordP4uiv_remap_index 230
-#define VertexAttribP1ui_remap_index 231
-#define VertexAttribP1uiv_remap_index 232
-#define VertexAttribP2ui_remap_index 233
-#define VertexAttribP2uiv_remap_index 234
-#define VertexAttribP3ui_remap_index 235
-#define VertexAttribP3uiv_remap_index 236
-#define VertexAttribP4ui_remap_index 237
-#define VertexAttribP4uiv_remap_index 238
-#define VertexP2ui_remap_index 239
-#define VertexP2uiv_remap_index 240
-#define VertexP3ui_remap_index 241
-#define VertexP3uiv_remap_index 242
-#define VertexP4ui_remap_index 243
-#define VertexP4uiv_remap_index 244
-#define BindTransformFeedback_remap_index 245
-#define DeleteTransformFeedbacks_remap_index 246
-#define DrawTransformFeedback_remap_index 247
-#define GenTransformFeedbacks_remap_index 248
-#define IsTransformFeedback_remap_index 249
-#define PauseTransformFeedback_remap_index 250
-#define ResumeTransformFeedback_remap_index 251
-#define ClearDepthf_remap_index 252
-#define DepthRangef_remap_index 253
-#define GetShaderPrecisionFormat_remap_index 254
-#define ReleaseShaderCompiler_remap_index 255
-#define ShaderBinary_remap_index 256
-#define GetGraphicsResetStatusARB_remap_index 257
-#define GetnColorTableARB_remap_index 258
-#define GetnCompressedTexImageARB_remap_index 259
-#define GetnConvolutionFilterARB_remap_index 260
-#define GetnHistogramARB_remap_index 261
-#define GetnMapdvARB_remap_index 262
-#define GetnMapfvARB_remap_index 263
-#define GetnMapivARB_remap_index 264
-#define GetnMinmaxARB_remap_index 265
-#define GetnPixelMapfvARB_remap_index 266
-#define GetnPixelMapuivARB_remap_index 267
-#define GetnPixelMapusvARB_remap_index 268
-#define GetnPolygonStippleARB_remap_index 269
-#define GetnSeparableFilterARB_remap_index 270
-#define GetnTexImageARB_remap_index 271
-#define GetnUniformdvARB_remap_index 272
-#define GetnUniformfvARB_remap_index 273
-#define GetnUniformivARB_remap_index 274
-#define GetnUniformuivARB_remap_index 275
-#define ReadnPixelsARB_remap_index 276
-#define TexStorage1D_remap_index 277
-#define TexStorage2D_remap_index 278
-#define TexStorage3D_remap_index 279
-#define TextureStorage1DEXT_remap_index 280
-#define TextureStorage2DEXT_remap_index 281
-#define TextureStorage3DEXT_remap_index 282
-#define PolygonOffsetEXT_remap_index 283
-#define GetPixelTexGenParameterfvSGIS_remap_index 284
-#define GetPixelTexGenParameterivSGIS_remap_index 285
-#define PixelTexGenParameterfSGIS_remap_index 286
-#define PixelTexGenParameterfvSGIS_remap_index 287
-#define PixelTexGenParameteriSGIS_remap_index 288
-#define PixelTexGenParameterivSGIS_remap_index 289
-#define SampleMaskSGIS_remap_index 290
-#define SamplePatternSGIS_remap_index 291
-#define ColorPointerEXT_remap_index 292
-#define EdgeFlagPointerEXT_remap_index 293
-#define IndexPointerEXT_remap_index 294
-#define NormalPointerEXT_remap_index 295
-#define TexCoordPointerEXT_remap_index 296
-#define VertexPointerEXT_remap_index 297
-#define PointParameterfEXT_remap_index 298
-#define PointParameterfvEXT_remap_index 299
-#define LockArraysEXT_remap_index 300
-#define UnlockArraysEXT_remap_index 301
-#define SecondaryColor3bEXT_remap_index 302
-#define SecondaryColor3bvEXT_remap_index 303
-#define SecondaryColor3dEXT_remap_index 304
-#define SecondaryColor3dvEXT_remap_index 305
-#define SecondaryColor3fEXT_remap_index 306
-#define SecondaryColor3fvEXT_remap_index 307
-#define SecondaryColor3iEXT_remap_index 308
-#define SecondaryColor3ivEXT_remap_index 309
-#define SecondaryColor3sEXT_remap_index 310
-#define SecondaryColor3svEXT_remap_index 311
-#define SecondaryColor3ubEXT_remap_index 312
-#define SecondaryColor3ubvEXT_remap_index 313
-#define SecondaryColor3uiEXT_remap_index 314
-#define SecondaryColor3uivEXT_remap_index 315
-#define SecondaryColor3usEXT_remap_index 316
-#define SecondaryColor3usvEXT_remap_index 317
-#define SecondaryColorPointerEXT_remap_index 318
-#define MultiDrawArraysEXT_remap_index 319
-#define MultiDrawElementsEXT_remap_index 320
-#define FogCoordPointerEXT_remap_index 321
-#define FogCoorddEXT_remap_index 322
-#define FogCoorddvEXT_remap_index 323
-#define FogCoordfEXT_remap_index 324
-#define FogCoordfvEXT_remap_index 325
-#define PixelTexGenSGIX_remap_index 326
-#define BlendFuncSeparateEXT_remap_index 327
-#define FlushVertexArrayRangeNV_remap_index 328
-#define VertexArrayRangeNV_remap_index 329
-#define CombinerInputNV_remap_index 330
-#define CombinerOutputNV_remap_index 331
-#define CombinerParameterfNV_remap_index 332
-#define CombinerParameterfvNV_remap_index 333
-#define CombinerParameteriNV_remap_index 334
-#define CombinerParameterivNV_remap_index 335
-#define FinalCombinerInputNV_remap_index 336
-#define GetCombinerInputParameterfvNV_remap_index 337
-#define GetCombinerInputParameterivNV_remap_index 338
-#define GetCombinerOutputParameterfvNV_remap_index 339
-#define GetCombinerOutputParameterivNV_remap_index 340
-#define GetFinalCombinerInputParameterfvNV_remap_index 341
-#define GetFinalCombinerInputParameterivNV_remap_index 342
-#define ResizeBuffersMESA_remap_index 343
-#define WindowPos2dMESA_remap_index 344
-#define WindowPos2dvMESA_remap_index 345
-#define WindowPos2fMESA_remap_index 346
-#define WindowPos2fvMESA_remap_index 347
-#define WindowPos2iMESA_remap_index 348
-#define WindowPos2ivMESA_remap_index 349
-#define WindowPos2sMESA_remap_index 350
-#define WindowPos2svMESA_remap_index 351
-#define WindowPos3dMESA_remap_index 352
-#define WindowPos3dvMESA_remap_index 353
-#define WindowPos3fMESA_remap_index 354
-#define WindowPos3fvMESA_remap_index 355
-#define WindowPos3iMESA_remap_index 356
-#define WindowPos3ivMESA_remap_index 357
-#define WindowPos3sMESA_remap_index 358
-#define WindowPos3svMESA_remap_index 359
-#define WindowPos4dMESA_remap_index 360
-#define WindowPos4dvMESA_remap_index 361
-#define WindowPos4fMESA_remap_index 362
-#define WindowPos4fvMESA_remap_index 363
-#define WindowPos4iMESA_remap_index 364
-#define WindowPos4ivMESA_remap_index 365
-#define WindowPos4sMESA_remap_index 366
-#define WindowPos4svMESA_remap_index 367
-#define MultiModeDrawArraysIBM_remap_index 368
-#define MultiModeDrawElementsIBM_remap_index 369
-#define DeleteFencesNV_remap_index 370
-#define FinishFenceNV_remap_index 371
-#define GenFencesNV_remap_index 372
-#define GetFenceivNV_remap_index 373
-#define IsFenceNV_remap_index 374
-#define SetFenceNV_remap_index 375
-#define TestFenceNV_remap_index 376
-#define AreProgramsResidentNV_remap_index 377
-#define BindProgramNV_remap_index 378
-#define DeleteProgramsNV_remap_index 379
-#define ExecuteProgramNV_remap_index 380
-#define GenProgramsNV_remap_index 381
-#define GetProgramParameterdvNV_remap_index 382
-#define GetProgramParameterfvNV_remap_index 383
-#define GetProgramStringNV_remap_index 384
-#define GetProgramivNV_remap_index 385
-#define GetTrackMatrixivNV_remap_index 386
-#define GetVertexAttribPointervNV_remap_index 387
-#define GetVertexAttribdvNV_remap_index 388
-#define GetVertexAttribfvNV_remap_index 389
-#define GetVertexAttribivNV_remap_index 390
-#define IsProgramNV_remap_index 391
-#define LoadProgramNV_remap_index 392
-#define ProgramParameters4dvNV_remap_index 393
-#define ProgramParameters4fvNV_remap_index 394
-#define RequestResidentProgramsNV_remap_index 395
-#define TrackMatrixNV_remap_index 396
-#define VertexAttrib1dNV_remap_index 397
-#define VertexAttrib1dvNV_remap_index 398
-#define VertexAttrib1fNV_remap_index 399
-#define VertexAttrib1fvNV_remap_index 400
-#define VertexAttrib1sNV_remap_index 401
-#define VertexAttrib1svNV_remap_index 402
-#define VertexAttrib2dNV_remap_index 403
-#define VertexAttrib2dvNV_remap_index 404
-#define VertexAttrib2fNV_remap_index 405
-#define VertexAttrib2fvNV_remap_index 406
-#define VertexAttrib2sNV_remap_index 407
-#define VertexAttrib2svNV_remap_index 408
-#define VertexAttrib3dNV_remap_index 409
-#define VertexAttrib3dvNV_remap_index 410
-#define VertexAttrib3fNV_remap_index 411
-#define VertexAttrib3fvNV_remap_index 412
-#define VertexAttrib3sNV_remap_index 413
-#define VertexAttrib3svNV_remap_index 414
-#define VertexAttrib4dNV_remap_index 415
-#define VertexAttrib4dvNV_remap_index 416
-#define VertexAttrib4fNV_remap_index 417
-#define VertexAttrib4fvNV_remap_index 418
-#define VertexAttrib4sNV_remap_index 419
-#define VertexAttrib4svNV_remap_index 420
-#define VertexAttrib4ubNV_remap_index 421
-#define VertexAttrib4ubvNV_remap_index 422
-#define VertexAttribPointerNV_remap_index 423
-#define VertexAttribs1dvNV_remap_index 424
-#define VertexAttribs1fvNV_remap_index 425
-#define VertexAttribs1svNV_remap_index 426
-#define VertexAttribs2dvNV_remap_index 427
-#define VertexAttribs2fvNV_remap_index 428
-#define VertexAttribs2svNV_remap_index 429
-#define VertexAttribs3dvNV_remap_index 430
-#define VertexAttribs3fvNV_remap_index 431
-#define VertexAttribs3svNV_remap_index 432
-#define VertexAttribs4dvNV_remap_index 433
-#define VertexAttribs4fvNV_remap_index 434
-#define VertexAttribs4svNV_remap_index 435
-#define VertexAttribs4ubvNV_remap_index 436
-#define GetTexBumpParameterfvATI_remap_index 437
-#define GetTexBumpParameterivATI_remap_index 438
-#define TexBumpParameterfvATI_remap_index 439
-#define TexBumpParameterivATI_remap_index 440
-#define AlphaFragmentOp1ATI_remap_index 441
-#define AlphaFragmentOp2ATI_remap_index 442
-#define AlphaFragmentOp3ATI_remap_index 443
-#define BeginFragmentShaderATI_remap_index 444
-#define BindFragmentShaderATI_remap_index 445
-#define ColorFragmentOp1ATI_remap_index 446
-#define ColorFragmentOp2ATI_remap_index 447
-#define ColorFragmentOp3ATI_remap_index 448
-#define DeleteFragmentShaderATI_remap_index 449
-#define EndFragmentShaderATI_remap_index 450
-#define GenFragmentShadersATI_remap_index 451
-#define PassTexCoordATI_remap_index 452
-#define SampleMapATI_remap_index 453
-#define SetFragmentShaderConstantATI_remap_index 454
-#define PointParameteriNV_remap_index 455
-#define PointParameterivNV_remap_index 456
-#define ActiveStencilFaceEXT_remap_index 457
-#define BindVertexArrayAPPLE_remap_index 458
-#define DeleteVertexArraysAPPLE_remap_index 459
-#define GenVertexArraysAPPLE_remap_index 460
-#define IsVertexArrayAPPLE_remap_index 461
-#define GetProgramNamedParameterdvNV_remap_index 462
-#define GetProgramNamedParameterfvNV_remap_index 463
-#define ProgramNamedParameter4dNV_remap_index 464
-#define ProgramNamedParameter4dvNV_remap_index 465
-#define ProgramNamedParameter4fNV_remap_index 466
-#define ProgramNamedParameter4fvNV_remap_index 467
-#define PrimitiveRestartIndexNV_remap_index 468
-#define PrimitiveRestartNV_remap_index 469
-#define DepthBoundsEXT_remap_index 470
-#define BlendEquationSeparateEXT_remap_index 471
-#define BindFramebufferEXT_remap_index 472
-#define BindRenderbufferEXT_remap_index 473
-#define CheckFramebufferStatusEXT_remap_index 474
-#define DeleteFramebuffersEXT_remap_index 475
-#define DeleteRenderbuffersEXT_remap_index 476
-#define FramebufferRenderbufferEXT_remap_index 477
-#define FramebufferTexture1DEXT_remap_index 478
-#define FramebufferTexture2DEXT_remap_index 479
-#define FramebufferTexture3DEXT_remap_index 480
-#define GenFramebuffersEXT_remap_index 481
-#define GenRenderbuffersEXT_remap_index 482
-#define GenerateMipmapEXT_remap_index 483
-#define GetFramebufferAttachmentParameterivEXT_remap_index 484
-#define GetRenderbufferParameterivEXT_remap_index 485
-#define IsFramebufferEXT_remap_index 486
-#define IsRenderbufferEXT_remap_index 487
-#define RenderbufferStorageEXT_remap_index 488
-#define BlitFramebufferEXT_remap_index 489
-#define BufferParameteriAPPLE_remap_index 490
-#define FlushMappedBufferRangeAPPLE_remap_index 491
-#define BindFragDataLocationEXT_remap_index 492
-#define GetFragDataLocationEXT_remap_index 493
-#define GetUniformuivEXT_remap_index 494
-#define GetVertexAttribIivEXT_remap_index 495
-#define GetVertexAttribIuivEXT_remap_index 496
-#define Uniform1uiEXT_remap_index 497
-#define Uniform1uivEXT_remap_index 498
-#define Uniform2uiEXT_remap_index 499
-#define Uniform2uivEXT_remap_index 500
-#define Uniform3uiEXT_remap_index 501
-#define Uniform3uivEXT_remap_index 502
-#define Uniform4uiEXT_remap_index 503
-#define Uniform4uivEXT_remap_index 504
-#define VertexAttribI1iEXT_remap_index 505
-#define VertexAttribI1ivEXT_remap_index 506
-#define VertexAttribI1uiEXT_remap_index 507
-#define VertexAttribI1uivEXT_remap_index 508
-#define VertexAttribI2iEXT_remap_index 509
-#define VertexAttribI2ivEXT_remap_index 510
-#define VertexAttribI2uiEXT_remap_index 511
-#define VertexAttribI2uivEXT_remap_index 512
-#define VertexAttribI3iEXT_remap_index 513
-#define VertexAttribI3ivEXT_remap_index 514
-#define VertexAttribI3uiEXT_remap_index 515
-#define VertexAttribI3uivEXT_remap_index 516
-#define VertexAttribI4bvEXT_remap_index 517
-#define VertexAttribI4iEXT_remap_index 518
-#define VertexAttribI4ivEXT_remap_index 519
-#define VertexAttribI4svEXT_remap_index 520
-#define VertexAttribI4ubvEXT_remap_index 521
-#define VertexAttribI4uiEXT_remap_index 522
-#define VertexAttribI4uivEXT_remap_index 523
-#define VertexAttribI4usvEXT_remap_index 524
-#define VertexAttribIPointerEXT_remap_index 525
-#define FramebufferTextureLayerEXT_remap_index 526
-#define ColorMaskIndexedEXT_remap_index 527
-#define DisableIndexedEXT_remap_index 528
-#define EnableIndexedEXT_remap_index 529
-#define GetBooleanIndexedvEXT_remap_index 530
-#define GetIntegerIndexedvEXT_remap_index 531
-#define IsEnabledIndexedEXT_remap_index 532
-#define ClearColorIiEXT_remap_index 533
-#define ClearColorIuiEXT_remap_index 534
-#define GetTexParameterIivEXT_remap_index 535
-#define GetTexParameterIuivEXT_remap_index 536
-#define TexParameterIivEXT_remap_index 537
-#define TexParameterIuivEXT_remap_index 538
-#define BeginConditionalRenderNV_remap_index 539
-#define EndConditionalRenderNV_remap_index 540
-#define BeginTransformFeedbackEXT_remap_index 541
-#define BindBufferBaseEXT_remap_index 542
-#define BindBufferOffsetEXT_remap_index 543
-#define BindBufferRangeEXT_remap_index 544
-#define EndTransformFeedbackEXT_remap_index 545
-#define GetTransformFeedbackVaryingEXT_remap_index 546
-#define TransformFeedbackVaryingsEXT_remap_index 547
-#define ProvokingVertexEXT_remap_index 548
-#define GetTexParameterPointervAPPLE_remap_index 549
-#define TextureRangeAPPLE_remap_index 550
-#define GetObjectParameterivAPPLE_remap_index 551
-#define ObjectPurgeableAPPLE_remap_index 552
-#define ObjectUnpurgeableAPPLE_remap_index 553
-#define ActiveProgramEXT_remap_index 554
-#define CreateShaderProgramEXT_remap_index 555
-#define UseShaderProgramEXT_remap_index 556
-#define TextureBarrierNV_remap_index 557
-#define StencilFuncSeparateATI_remap_index 558
-#define ProgramEnvParameters4fvEXT_remap_index 559
-#define ProgramLocalParameters4fvEXT_remap_index 560
-#define GetQueryObjecti64vEXT_remap_index 561
-#define GetQueryObjectui64vEXT_remap_index 562
-#define EGLImageTargetRenderbufferStorageOES_remap_index 563
-#define EGLImageTargetTexture2DOES_remap_index 564
-
+#define _gloffset_CompressedTexImage1D 408
+#define _gloffset_CompressedTexImage2D 409
+#define _gloffset_CompressedTexImage3D 410
+#define _gloffset_CompressedTexSubImage1D 411
+#define _gloffset_CompressedTexSubImage2D 412
+#define _gloffset_CompressedTexSubImage3D 413
+#define _gloffset_GetCompressedTexImage 414
+#define _gloffset_LoadTransposeMatrixd 415
+#define _gloffset_LoadTransposeMatrixf 416
+#define _gloffset_MultTransposeMatrixd 417
+#define _gloffset_MultTransposeMatrixf 418
+#define _gloffset_SampleCoverage 419
+#define _gloffset_BlendFuncSeparate 420
+#define _gloffset_FogCoordPointer 421
+#define _gloffset_FogCoordd 422
+#define _gloffset_FogCoorddv 423
+#define _gloffset_MultiDrawArrays 424
+#define _gloffset_PointParameterf 425
+#define _gloffset_PointParameterfv 426
+#define _gloffset_PointParameteri 427
+#define _gloffset_PointParameteriv 428
+#define _gloffset_SecondaryColor3b 429
+#define _gloffset_SecondaryColor3bv 430
+#define _gloffset_SecondaryColor3d 431
+#define _gloffset_SecondaryColor3dv 432
+#define _gloffset_SecondaryColor3i 433
+#define _gloffset_SecondaryColor3iv 434
+#define _gloffset_SecondaryColor3s 435
+#define _gloffset_SecondaryColor3sv 436
+#define _gloffset_SecondaryColor3ub 437
+#define _gloffset_SecondaryColor3ubv 438
+#define _gloffset_SecondaryColor3ui 439
+#define _gloffset_SecondaryColor3uiv 440
+#define _gloffset_SecondaryColor3us 441
+#define _gloffset_SecondaryColor3usv 442
+#define _gloffset_SecondaryColorPointer 443
+#define _gloffset_WindowPos2d 444
+#define _gloffset_WindowPos2dv 445
+#define _gloffset_WindowPos2f 446
+#define _gloffset_WindowPos2fv 447
+#define _gloffset_WindowPos2i 448
+#define _gloffset_WindowPos2iv 449
+#define _gloffset_WindowPos2s 450
+#define _gloffset_WindowPos2sv 451
+#define _gloffset_WindowPos3d 452
+#define _gloffset_WindowPos3dv 453
+#define _gloffset_WindowPos3f 454
+#define _gloffset_WindowPos3fv 455
+#define _gloffset_WindowPos3i 456
+#define _gloffset_WindowPos3iv 457
+#define _gloffset_WindowPos3s 458
+#define _gloffset_WindowPos3sv 459
+#define _gloffset_BeginQuery 460
+#define _gloffset_BindBuffer 461
+#define _gloffset_BufferData 462
+#define _gloffset_BufferSubData 463
+#define _gloffset_DeleteBuffers 464
+#define _gloffset_DeleteQueries 465
+#define _gloffset_EndQuery 466
+#define _gloffset_GenBuffers 467
+#define _gloffset_GenQueries 468
+#define _gloffset_GetBufferParameteriv 469
+#define _gloffset_GetBufferPointerv 470
+#define _gloffset_GetBufferSubData 471
+#define _gloffset_GetQueryObjectiv 472
+#define _gloffset_GetQueryObjectuiv 473
+#define _gloffset_GetQueryiv 474
+#define _gloffset_IsBuffer 475
+#define _gloffset_IsQuery 476
+#define _gloffset_MapBuffer 477
+#define _gloffset_UnmapBuffer 478
+#define _gloffset_AttachShader 479
+#define _gloffset_BindAttribLocation 480
+#define _gloffset_BlendEquationSeparate 481
+#define _gloffset_CompileShader 482
+#define _gloffset_CreateProgram 483
+#define _gloffset_CreateShader 484
+#define _gloffset_DeleteProgram 485
+#define _gloffset_DeleteShader 486
+#define _gloffset_DetachShader 487
+#define _gloffset_DisableVertexAttribArray 488
+#define _gloffset_DrawBuffers 489
+#define _gloffset_EnableVertexAttribArray 490
+#define _gloffset_GetActiveAttrib 491
+#define _gloffset_GetActiveUniform 492
+#define _gloffset_GetAttachedShaders 493
+#define _gloffset_GetAttribLocation 494
+#define _gloffset_GetProgramInfoLog 495
+#define _gloffset_GetProgramiv 496
+#define _gloffset_GetShaderInfoLog 497
+#define _gloffset_GetShaderSource 498
+#define _gloffset_GetShaderiv 499
+#define _gloffset_GetUniformLocation 500
+#define _gloffset_GetUniformfv 501
+#define _gloffset_GetUniformiv 502
+#define _gloffset_GetVertexAttribPointerv 503
+#define _gloffset_GetVertexAttribdv 504
+#define _gloffset_GetVertexAttribfv 505
+#define _gloffset_GetVertexAttribiv 506
+#define _gloffset_IsProgram 507
+#define _gloffset_IsShader 508
+#define _gloffset_LinkProgram 509
+#define _gloffset_ShaderSource 510
+#define _gloffset_StencilFuncSeparate 511
+#define _gloffset_StencilMaskSeparate 512
+#define _gloffset_StencilOpSeparate 513
+#define _gloffset_Uniform1f 514
+#define _gloffset_Uniform1fv 515
+#define _gloffset_Uniform1i 516
+#define _gloffset_Uniform1iv 517
+#define _gloffset_Uniform2f 518
+#define _gloffset_Uniform2fv 519
+#define _gloffset_Uniform2i 520
+#define _gloffset_Uniform2iv 521
+#define _gloffset_Uniform3f 522
+#define _gloffset_Uniform3fv 523
+#define _gloffset_Uniform3i 524
+#define _gloffset_Uniform3iv 525
+#define _gloffset_Uniform4f 526
+#define _gloffset_Uniform4fv 527
+#define _gloffset_Uniform4i 528
+#define _gloffset_Uniform4iv 529
+#define _gloffset_UniformMatrix2fv 530
+#define _gloffset_UniformMatrix3fv 531
+#define _gloffset_UniformMatrix4fv 532
+#define _gloffset_UseProgram 533
+#define _gloffset_ValidateProgram 534
+#define _gloffset_VertexAttrib1d 535
+#define _gloffset_VertexAttrib1dv 536
+#define _gloffset_VertexAttrib1s 537
+#define _gloffset_VertexAttrib1sv 538
+#define _gloffset_VertexAttrib2d 539
+#define _gloffset_VertexAttrib2dv 540
+#define _gloffset_VertexAttrib2s 541
+#define _gloffset_VertexAttrib2sv 542
+#define _gloffset_VertexAttrib3d 543
+#define _gloffset_VertexAttrib3dv 544
+#define _gloffset_VertexAttrib3s 545
+#define _gloffset_VertexAttrib3sv 546
+#define _gloffset_VertexAttrib4Nbv 547
+#define _gloffset_VertexAttrib4Niv 548
+#define _gloffset_VertexAttrib4Nsv 549
+#define _gloffset_VertexAttrib4Nub 550
+#define _gloffset_VertexAttrib4Nubv 551
+#define _gloffset_VertexAttrib4Nuiv 552
+#define _gloffset_VertexAttrib4Nusv 553
+#define _gloffset_VertexAttrib4bv 554
+#define _gloffset_VertexAttrib4d 555
+#define _gloffset_VertexAttrib4dv 556
+#define _gloffset_VertexAttrib4iv 557
+#define _gloffset_VertexAttrib4s 558
+#define _gloffset_VertexAttrib4sv 559
+#define _gloffset_VertexAttrib4ubv 560
+#define _gloffset_VertexAttrib4uiv 561
+#define _gloffset_VertexAttrib4usv 562
+#define _gloffset_VertexAttribPointer 563
+#define _gloffset_UniformMatrix2x3fv 564
+#define _gloffset_UniformMatrix2x4fv 565
+#define _gloffset_UniformMatrix3x2fv 566
+#define _gloffset_UniformMatrix3x4fv 567
+#define _gloffset_UniformMatrix4x2fv 568
+#define _gloffset_UniformMatrix4x3fv 569
+#define _gloffset_BeginConditionalRender 570
+#define _gloffset_BeginTransformFeedback 571
+#define _gloffset_BindBufferBase 572
+#define _gloffset_BindBufferRange 573
+#define _gloffset_BindFragDataLocation 574
+#define _gloffset_ClampColor 575
+#define _gloffset_ClearBufferfi 576
+#define _gloffset_ClearBufferfv 577
+#define _gloffset_ClearBufferiv 578
+#define _gloffset_ClearBufferuiv 579
+#define _gloffset_ColorMaski 580
+#define _gloffset_Disablei 581
+#define _gloffset_Enablei 582
+#define _gloffset_EndConditionalRender 583
+#define _gloffset_EndTransformFeedback 584
+#define _gloffset_GetBooleani_v 585
+#define _gloffset_GetFragDataLocation 586
+#define _gloffset_GetIntegeri_v 587
+#define _gloffset_GetStringi 588
+#define _gloffset_GetTexParameterIiv 589
+#define _gloffset_GetTexParameterIuiv 590
+#define _gloffset_GetTransformFeedbackVarying 591
+#define _gloffset_GetUniformuiv 592
+#define _gloffset_GetVertexAttribIiv 593
+#define _gloffset_GetVertexAttribIuiv 594
+#define _gloffset_IsEnabledi 595
+#define _gloffset_TexParameterIiv 596
+#define _gloffset_TexParameterIuiv 597
+#define _gloffset_TransformFeedbackVaryings 598
+#define _gloffset_Uniform1ui 599
+#define _gloffset_Uniform1uiv 600
+#define _gloffset_Uniform2ui 601
+#define _gloffset_Uniform2uiv 602
+#define _gloffset_Uniform3ui 603
+#define _gloffset_Uniform3uiv 604
+#define _gloffset_Uniform4ui 605
+#define _gloffset_Uniform4uiv 606
+#define _gloffset_VertexAttribI1iv 607
+#define _gloffset_VertexAttribI1uiv 608
+#define _gloffset_VertexAttribI4bv 609
+#define _gloffset_VertexAttribI4sv 610
+#define _gloffset_VertexAttribI4ubv 611
+#define _gloffset_VertexAttribI4usv 612
+#define _gloffset_VertexAttribIPointer 613
+#define _gloffset_PrimitiveRestartIndex 614
+#define _gloffset_TexBuffer 615
+#define _gloffset_FramebufferTexture 616
+#define _gloffset_GetBufferParameteri64v 617
+#define _gloffset_GetInteger64i_v 618
+#define _gloffset_VertexAttribDivisor 619
+#define _gloffset_BindProgramARB 620
+#define _gloffset_DeleteProgramsARB 621
+#define _gloffset_GenProgramsARB 622
+#define _gloffset_GetProgramEnvParameterdvARB 623
+#define _gloffset_GetProgramEnvParameterfvARB 624
+#define _gloffset_GetProgramLocalParameterdvARB 625
+#define _gloffset_GetProgramLocalParameterfvARB 626
+#define _gloffset_GetProgramStringARB 627
+#define _gloffset_GetProgramivARB 628
+#define _gloffset_IsProgramARB 629
+#define _gloffset_ProgramEnvParameter4dARB 630
+#define _gloffset_ProgramEnvParameter4dvARB 631
+#define _gloffset_ProgramEnvParameter4fARB 632
+#define _gloffset_ProgramEnvParameter4fvARB 633
+#define _gloffset_ProgramLocalParameter4dARB 634
+#define _gloffset_ProgramLocalParameter4dvARB 635
+#define _gloffset_ProgramLocalParameter4fARB 636
+#define _gloffset_ProgramLocalParameter4fvARB 637
+#define _gloffset_ProgramStringARB 638
+#define _gloffset_VertexAttrib1fARB 639
+#define _gloffset_VertexAttrib1fvARB 640
+#define _gloffset_VertexAttrib2fARB 641
+#define _gloffset_VertexAttrib2fvARB 642
+#define _gloffset_VertexAttrib3fARB 643
+#define _gloffset_VertexAttrib3fvARB 644
+#define _gloffset_VertexAttrib4fARB 645
+#define _gloffset_VertexAttrib4fvARB 646
+#define _gloffset_AttachObjectARB 647
+#define _gloffset_CreateProgramObjectARB 648
+#define _gloffset_CreateShaderObjectARB 649
+#define _gloffset_DeleteObjectARB 650
+#define _gloffset_DetachObjectARB 651
+#define _gloffset_GetAttachedObjectsARB 652
+#define _gloffset_GetHandleARB 653
+#define _gloffset_GetInfoLogARB 654
+#define _gloffset_GetObjectParameterfvARB 655
+#define _gloffset_GetObjectParameterivARB 656
+#define _gloffset_DrawArraysInstancedARB 657
+#define _gloffset_DrawElementsInstancedARB 658
+#define _gloffset_BindFramebuffer 659
+#define _gloffset_BindRenderbuffer 660
+#define _gloffset_BlitFramebuffer 661
+#define _gloffset_CheckFramebufferStatus 662
+#define _gloffset_DeleteFramebuffers 663
+#define _gloffset_DeleteRenderbuffers 664
+#define _gloffset_FramebufferRenderbuffer 665
+#define _gloffset_FramebufferTexture1D 666
+#define _gloffset_FramebufferTexture2D 667
+#define _gloffset_FramebufferTexture3D 668
+#define _gloffset_FramebufferTextureLayer 669
+#define _gloffset_GenFramebuffers 670
+#define _gloffset_GenRenderbuffers 671
+#define _gloffset_GenerateMipmap 672
+#define _gloffset_GetFramebufferAttachmentParameteriv 673
+#define _gloffset_GetRenderbufferParameteriv 674
+#define _gloffset_IsFramebuffer 675
+#define _gloffset_IsRenderbuffer 676
+#define _gloffset_RenderbufferStorage 677
+#define _gloffset_RenderbufferStorageMultisample 678
+#define _gloffset_FramebufferTextureFaceARB 679
+#define _gloffset_FlushMappedBufferRange 680
+#define _gloffset_MapBufferRange 681
+#define _gloffset_BindVertexArray 682
+#define _gloffset_DeleteVertexArrays 683
+#define _gloffset_GenVertexArrays 684
+#define _gloffset_IsVertexArray 685
+#define _gloffset_GetActiveUniformBlockName 686
+#define _gloffset_GetActiveUniformBlockiv 687
+#define _gloffset_GetActiveUniformName 688
+#define _gloffset_GetActiveUniformsiv 689
+#define _gloffset_GetUniformBlockIndex 690
+#define _gloffset_GetUniformIndices 691
+#define _gloffset_UniformBlockBinding 692
+#define _gloffset_CopyBufferSubData 693
+#define _gloffset_ClientWaitSync 694
+#define _gloffset_DeleteSync 695
+#define _gloffset_FenceSync 696
+#define _gloffset_GetInteger64v 697
+#define _gloffset_GetSynciv 698
+#define _gloffset_IsSync 699
+#define _gloffset_WaitSync 700
+#define _gloffset_DrawElementsBaseVertex 701
+#define _gloffset_DrawElementsInstancedBaseVertex 702
+#define _gloffset_DrawRangeElementsBaseVertex 703
+#define _gloffset_MultiDrawElementsBaseVertex 704
+#define _gloffset_ProvokingVertex 705
+#define _gloffset_BlendEquationSeparateiARB 706
+#define _gloffset_BlendEquationiARB 707
+#define _gloffset_BlendFuncSeparateiARB 708
+#define _gloffset_BlendFunciARB 709
+#define _gloffset_BindFragDataLocationIndexed 710
+#define _gloffset_GetFragDataIndex 711
+#define _gloffset_BindSampler 712
+#define _gloffset_DeleteSamplers 713
+#define _gloffset_GenSamplers 714
+#define _gloffset_GetSamplerParameterIiv 715
+#define _gloffset_GetSamplerParameterIuiv 716
+#define _gloffset_GetSamplerParameterfv 717
+#define _gloffset_GetSamplerParameteriv 718
+#define _gloffset_IsSampler 719
+#define _gloffset_SamplerParameterIiv 720
+#define _gloffset_SamplerParameterIuiv 721
+#define _gloffset_SamplerParameterf 722
+#define _gloffset_SamplerParameterfv 723
+#define _gloffset_SamplerParameteri 724
+#define _gloffset_SamplerParameteriv 725
+#define _gloffset_GetQueryObjecti64v 726
+#define _gloffset_GetQueryObjectui64v 727
+#define _gloffset_QueryCounter 728
+#define _gloffset_ColorP3ui 729
+#define _gloffset_ColorP3uiv 730
+#define _gloffset_ColorP4ui 731
+#define _gloffset_ColorP4uiv 732
+#define _gloffset_MultiTexCoordP1ui 733
+#define _gloffset_MultiTexCoordP1uiv 734
+#define _gloffset_MultiTexCoordP2ui 735
+#define _gloffset_MultiTexCoordP2uiv 736
+#define _gloffset_MultiTexCoordP3ui 737
+#define _gloffset_MultiTexCoordP3uiv 738
+#define _gloffset_MultiTexCoordP4ui 739
+#define _gloffset_MultiTexCoordP4uiv 740
+#define _gloffset_NormalP3ui 741
+#define _gloffset_NormalP3uiv 742
+#define _gloffset_SecondaryColorP3ui 743
+#define _gloffset_SecondaryColorP3uiv 744
+#define _gloffset_TexCoordP1ui 745
+#define _gloffset_TexCoordP1uiv 746
+#define _gloffset_TexCoordP2ui 747
+#define _gloffset_TexCoordP2uiv 748
+#define _gloffset_TexCoordP3ui 749
+#define _gloffset_TexCoordP3uiv 750
+#define _gloffset_TexCoordP4ui 751
+#define _gloffset_TexCoordP4uiv 752
+#define _gloffset_VertexAttribP1ui 753
+#define _gloffset_VertexAttribP1uiv 754
+#define _gloffset_VertexAttribP2ui 755
+#define _gloffset_VertexAttribP2uiv 756
+#define _gloffset_VertexAttribP3ui 757
+#define _gloffset_VertexAttribP3uiv 758
+#define _gloffset_VertexAttribP4ui 759
+#define _gloffset_VertexAttribP4uiv 760
+#define _gloffset_VertexP2ui 761
+#define _gloffset_VertexP2uiv 762
+#define _gloffset_VertexP3ui 763
+#define _gloffset_VertexP3uiv 764
+#define _gloffset_VertexP4ui 765
+#define _gloffset_VertexP4uiv 766
+#define _gloffset_BindTransformFeedback 767
+#define _gloffset_DeleteTransformFeedbacks 768
+#define _gloffset_DrawTransformFeedback 769
+#define _gloffset_GenTransformFeedbacks 770
+#define _gloffset_IsTransformFeedback 771
+#define _gloffset_PauseTransformFeedback 772
+#define _gloffset_ResumeTransformFeedback 773
+#define _gloffset_BeginQueryIndexed 774
+#define _gloffset_DrawTransformFeedbackStream 775
+#define _gloffset_EndQueryIndexed 776
+#define _gloffset_GetQueryIndexediv 777
+#define _gloffset_ClearDepthf 778
+#define _gloffset_DepthRangef 779
+#define _gloffset_GetShaderPrecisionFormat 780
+#define _gloffset_ReleaseShaderCompiler 781
+#define _gloffset_ShaderBinary 782
+#define _gloffset_GetProgramBinary 783
+#define _gloffset_ProgramBinary 784
+#define _gloffset_ProgramParameteri 785
+#define _gloffset_DebugMessageCallbackARB 786
+#define _gloffset_DebugMessageControlARB 787
+#define _gloffset_DebugMessageInsertARB 788
+#define _gloffset_GetDebugMessageLogARB 789
+#define _gloffset_GetGraphicsResetStatusARB 790
+#define _gloffset_GetnColorTableARB 791
+#define _gloffset_GetnCompressedTexImageARB 792
+#define _gloffset_GetnConvolutionFilterARB 793
+#define _gloffset_GetnHistogramARB 794
+#define _gloffset_GetnMapdvARB 795
+#define _gloffset_GetnMapfvARB 796
+#define _gloffset_GetnMapivARB 797
+#define _gloffset_GetnMinmaxARB 798
+#define _gloffset_GetnPixelMapfvARB 799
+#define _gloffset_GetnPixelMapuivARB 800
+#define _gloffset_GetnPixelMapusvARB 801
+#define _gloffset_GetnPolygonStippleARB 802
+#define _gloffset_GetnSeparableFilterARB 803
+#define _gloffset_GetnTexImageARB 804
+#define _gloffset_GetnUniformdvARB 805
+#define _gloffset_GetnUniformfvARB 806
+#define _gloffset_GetnUniformivARB 807
+#define _gloffset_GetnUniformuivARB 808
+#define _gloffset_ReadnPixelsARB 809
+#define _gloffset_DrawArraysInstancedBaseInstance 810
+#define _gloffset_DrawElementsInstancedBaseInstance 811
+#define _gloffset_DrawElementsInstancedBaseVertexBaseInstance 812
+#define _gloffset_DrawTransformFeedbackInstanced 813
+#define _gloffset_DrawTransformFeedbackStreamInstanced 814
+#define _gloffset_GetInternalformativ 815
+#define _gloffset_TexStorage1D 816
+#define _gloffset_TexStorage2D 817
+#define _gloffset_TexStorage3D 818
+#define _gloffset_TextureStorage1DEXT 819
+#define _gloffset_TextureStorage2DEXT 820
+#define _gloffset_TextureStorage3DEXT 821
+#define _gloffset_TexBufferRange 822
+#define _gloffset_InvalidateBufferData 823
+#define _gloffset_InvalidateBufferSubData 824
+#define _gloffset_InvalidateFramebuffer 825
+#define _gloffset_InvalidateSubFramebuffer 826
+#define _gloffset_InvalidateTexImage 827
+#define _gloffset_InvalidateTexSubImage 828
+#define _gloffset_PolygonOffsetEXT 829
+#define _gloffset_DrawTexfOES 830
+#define _gloffset_DrawTexfvOES 831
+#define _gloffset_DrawTexiOES 832
+#define _gloffset_DrawTexivOES 833
+#define _gloffset_DrawTexsOES 834
+#define _gloffset_DrawTexsvOES 835
+#define _gloffset_DrawTexxOES 836
+#define _gloffset_DrawTexxvOES 837
+#define _gloffset_PointSizePointerOES 838
+#define _gloffset_QueryMatrixxOES 839
+#define _gloffset_SampleMaskSGIS 840
+#define _gloffset_SamplePatternSGIS 841
+#define _gloffset_ColorPointerEXT 842
+#define _gloffset_EdgeFlagPointerEXT 843
+#define _gloffset_IndexPointerEXT 844
+#define _gloffset_NormalPointerEXT 845
+#define _gloffset_TexCoordPointerEXT 846
+#define _gloffset_VertexPointerEXT 847
+#define _gloffset_LockArraysEXT 848
+#define _gloffset_UnlockArraysEXT 849
+#define _gloffset_SecondaryColor3fEXT 850
+#define _gloffset_SecondaryColor3fvEXT 851
+#define _gloffset_MultiDrawElementsEXT 852
+#define _gloffset_FogCoordfEXT 853
+#define _gloffset_FogCoordfvEXT 854
+#define _gloffset_ResizeBuffersMESA 855
+#define _gloffset_WindowPos4dMESA 856
+#define _gloffset_WindowPos4dvMESA 857
+#define _gloffset_WindowPos4fMESA 858
+#define _gloffset_WindowPos4fvMESA 859
+#define _gloffset_WindowPos4iMESA 860
+#define _gloffset_WindowPos4ivMESA 861
+#define _gloffset_WindowPos4sMESA 862
+#define _gloffset_WindowPos4svMESA 863
+#define _gloffset_MultiModeDrawArraysIBM 864
+#define _gloffset_MultiModeDrawElementsIBM 865
+#define _gloffset_AreProgramsResidentNV 866
+#define _gloffset_ExecuteProgramNV 867
+#define _gloffset_GetProgramParameterdvNV 868
+#define _gloffset_GetProgramParameterfvNV 869
+#define _gloffset_GetProgramStringNV 870
+#define _gloffset_GetProgramivNV 871
+#define _gloffset_GetTrackMatrixivNV 872
+#define _gloffset_GetVertexAttribdvNV 873
+#define _gloffset_GetVertexAttribfvNV 874
+#define _gloffset_GetVertexAttribivNV 875
+#define _gloffset_LoadProgramNV 876
+#define _gloffset_ProgramParameters4dvNV 877
+#define _gloffset_ProgramParameters4fvNV 878
+#define _gloffset_RequestResidentProgramsNV 879
+#define _gloffset_TrackMatrixNV 880
+#define _gloffset_VertexAttrib1dNV 881
+#define _gloffset_VertexAttrib1dvNV 882
+#define _gloffset_VertexAttrib1fNV 883
+#define _gloffset_VertexAttrib1fvNV 884
+#define _gloffset_VertexAttrib1sNV 885
+#define _gloffset_VertexAttrib1svNV 886
+#define _gloffset_VertexAttrib2dNV 887
+#define _gloffset_VertexAttrib2dvNV 888
+#define _gloffset_VertexAttrib2fNV 889
+#define _gloffset_VertexAttrib2fvNV 890
+#define _gloffset_VertexAttrib2sNV 891
+#define _gloffset_VertexAttrib2svNV 892
+#define _gloffset_VertexAttrib3dNV 893
+#define _gloffset_VertexAttrib3dvNV 894
+#define _gloffset_VertexAttrib3fNV 895
+#define _gloffset_VertexAttrib3fvNV 896
+#define _gloffset_VertexAttrib3sNV 897
+#define _gloffset_VertexAttrib3svNV 898
+#define _gloffset_VertexAttrib4dNV 899
+#define _gloffset_VertexAttrib4dvNV 900
+#define _gloffset_VertexAttrib4fNV 901
+#define _gloffset_VertexAttrib4fvNV 902
+#define _gloffset_VertexAttrib4sNV 903
+#define _gloffset_VertexAttrib4svNV 904
+#define _gloffset_VertexAttrib4ubNV 905
+#define _gloffset_VertexAttrib4ubvNV 906
+#define _gloffset_VertexAttribPointerNV 907
+#define _gloffset_VertexAttribs1dvNV 908
+#define _gloffset_VertexAttribs1fvNV 909
+#define _gloffset_VertexAttribs1svNV 910
+#define _gloffset_VertexAttribs2dvNV 911
+#define _gloffset_VertexAttribs2fvNV 912
+#define _gloffset_VertexAttribs2svNV 913
+#define _gloffset_VertexAttribs3dvNV 914
+#define _gloffset_VertexAttribs3fvNV 915
+#define _gloffset_VertexAttribs3svNV 916
+#define _gloffset_VertexAttribs4dvNV 917
+#define _gloffset_VertexAttribs4fvNV 918
+#define _gloffset_VertexAttribs4svNV 919
+#define _gloffset_VertexAttribs4ubvNV 920
+#define _gloffset_GetTexBumpParameterfvATI 921
+#define _gloffset_GetTexBumpParameterivATI 922
+#define _gloffset_TexBumpParameterfvATI 923
+#define _gloffset_TexBumpParameterivATI 924
+#define _gloffset_AlphaFragmentOp1ATI 925
+#define _gloffset_AlphaFragmentOp2ATI 926
+#define _gloffset_AlphaFragmentOp3ATI 927
+#define _gloffset_BeginFragmentShaderATI 928
+#define _gloffset_BindFragmentShaderATI 929
+#define _gloffset_ColorFragmentOp1ATI 930
+#define _gloffset_ColorFragmentOp2ATI 931
+#define _gloffset_ColorFragmentOp3ATI 932
+#define _gloffset_DeleteFragmentShaderATI 933
+#define _gloffset_EndFragmentShaderATI 934
+#define _gloffset_GenFragmentShadersATI 935
+#define _gloffset_PassTexCoordATI 936
+#define _gloffset_SampleMapATI 937
+#define _gloffset_SetFragmentShaderConstantATI 938
+#define _gloffset_ActiveStencilFaceEXT 939
+#define _gloffset_BindVertexArrayAPPLE 940
+#define _gloffset_GenVertexArraysAPPLE 941
+#define _gloffset_GetProgramNamedParameterdvNV 942
+#define _gloffset_GetProgramNamedParameterfvNV 943
+#define _gloffset_ProgramNamedParameter4dNV 944
+#define _gloffset_ProgramNamedParameter4dvNV 945
+#define _gloffset_ProgramNamedParameter4fNV 946
+#define _gloffset_ProgramNamedParameter4fvNV 947
+#define _gloffset_PrimitiveRestartNV 948
+#define _gloffset_GetTexGenxvOES 949
+#define _gloffset_TexGenxOES 950
+#define _gloffset_TexGenxvOES 951
+#define _gloffset_DepthBoundsEXT 952
+#define _gloffset_BufferParameteriAPPLE 953
+#define _gloffset_FlushMappedBufferRangeAPPLE 954
+#define _gloffset_VertexAttribI1iEXT 955
+#define _gloffset_VertexAttribI1uiEXT 956
+#define _gloffset_VertexAttribI2iEXT 957
+#define _gloffset_VertexAttribI2ivEXT 958
+#define _gloffset_VertexAttribI2uiEXT 959
+#define _gloffset_VertexAttribI2uivEXT 960
+#define _gloffset_VertexAttribI3iEXT 961
+#define _gloffset_VertexAttribI3ivEXT 962
+#define _gloffset_VertexAttribI3uiEXT 963
+#define _gloffset_VertexAttribI3uivEXT 964
+#define _gloffset_VertexAttribI4iEXT 965
+#define _gloffset_VertexAttribI4ivEXT 966
+#define _gloffset_VertexAttribI4uiEXT 967
+#define _gloffset_VertexAttribI4uivEXT 968
+#define _gloffset_ClearColorIiEXT 969
+#define _gloffset_ClearColorIuiEXT 970
+#define _gloffset_BindBufferOffsetEXT 971
+#define _gloffset_GetObjectParameterivAPPLE 972
+#define _gloffset_ObjectPurgeableAPPLE 973
+#define _gloffset_ObjectUnpurgeableAPPLE 974
+#define _gloffset_ActiveProgramEXT 975
+#define _gloffset_CreateShaderProgramEXT 976
+#define _gloffset_UseShaderProgramEXT 977
+#define _gloffset_TextureBarrierNV 978
+#define _gloffset_StencilFuncSeparateATI 979
+#define _gloffset_ProgramEnvParameters4fvEXT 980
+#define _gloffset_ProgramLocalParameters4fvEXT 981
+#define _gloffset_EGLImageTargetRenderbufferStorageOES 982
+#define _gloffset_EGLImageTargetTexture2DOES 983
+#define _gloffset_AlphaFuncx 984
+#define _gloffset_ClearColorx 985
+#define _gloffset_ClearDepthx 986
+#define _gloffset_Color4x 987
+#define _gloffset_DepthRangex 988
+#define _gloffset_Fogx 989
+#define _gloffset_Fogxv 990
+#define _gloffset_Frustumf 991
+#define _gloffset_Frustumx 992
+#define _gloffset_LightModelx 993
+#define _gloffset_LightModelxv 994
+#define _gloffset_Lightx 995
+#define _gloffset_Lightxv 996
+#define _gloffset_LineWidthx 997
+#define _gloffset_LoadMatrixx 998
+#define _gloffset_Materialx 999
+#define _gloffset_Materialxv 1000
+#define _gloffset_MultMatrixx 1001
+#define _gloffset_MultiTexCoord4x 1002
+#define _gloffset_Normal3x 1003
+#define _gloffset_Orthof 1004
+#define _gloffset_Orthox 1005
+#define _gloffset_PointSizex 1006
+#define _gloffset_PolygonOffsetx 1007
+#define _gloffset_Rotatex 1008
+#define _gloffset_SampleCoveragex 1009
+#define _gloffset_Scalex 1010
+#define _gloffset_TexEnvx 1011
+#define _gloffset_TexEnvxv 1012
+#define _gloffset_TexParameterx 1013
+#define _gloffset_Translatex 1014
+#define _gloffset_ClipPlanef 1015
+#define _gloffset_ClipPlanex 1016
+#define _gloffset_GetClipPlanef 1017
+#define _gloffset_GetClipPlanex 1018
+#define _gloffset_GetFixedv 1019
+#define _gloffset_GetLightxv 1020
+#define _gloffset_GetMaterialxv 1021
+#define _gloffset_GetTexEnvxv 1022
+#define _gloffset_GetTexParameterxv 1023
+#define _gloffset_PointParameterx 1024
+#define _gloffset_PointParameterxv 1025
+#define _gloffset_TexParameterxv 1026
+
+#else /* !FEATURE_remap_table */
+
+#define driDispatchRemapTable_size 619
+extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
+
+#define CompressedTexImage1D_remap_index 0
+#define CompressedTexImage2D_remap_index 1
+#define CompressedTexImage3D_remap_index 2
+#define CompressedTexSubImage1D_remap_index 3
+#define CompressedTexSubImage2D_remap_index 4
+#define CompressedTexSubImage3D_remap_index 5
+#define GetCompressedTexImage_remap_index 6
+#define LoadTransposeMatrixd_remap_index 7
+#define LoadTransposeMatrixf_remap_index 8
+#define MultTransposeMatrixd_remap_index 9
+#define MultTransposeMatrixf_remap_index 10
+#define SampleCoverage_remap_index 11
+#define BlendFuncSeparate_remap_index 12
+#define FogCoordPointer_remap_index 13
+#define FogCoordd_remap_index 14
+#define FogCoorddv_remap_index 15
+#define MultiDrawArrays_remap_index 16
+#define PointParameterf_remap_index 17
+#define PointParameterfv_remap_index 18
+#define PointParameteri_remap_index 19
+#define PointParameteriv_remap_index 20
+#define SecondaryColor3b_remap_index 21
+#define SecondaryColor3bv_remap_index 22
+#define SecondaryColor3d_remap_index 23
+#define SecondaryColor3dv_remap_index 24
+#define SecondaryColor3i_remap_index 25
+#define SecondaryColor3iv_remap_index 26
+#define SecondaryColor3s_remap_index 27
+#define SecondaryColor3sv_remap_index 28
+#define SecondaryColor3ub_remap_index 29
+#define SecondaryColor3ubv_remap_index 30
+#define SecondaryColor3ui_remap_index 31
+#define SecondaryColor3uiv_remap_index 32
+#define SecondaryColor3us_remap_index 33
+#define SecondaryColor3usv_remap_index 34
+#define SecondaryColorPointer_remap_index 35
+#define WindowPos2d_remap_index 36
+#define WindowPos2dv_remap_index 37
+#define WindowPos2f_remap_index 38
+#define WindowPos2fv_remap_index 39
+#define WindowPos2i_remap_index 40
+#define WindowPos2iv_remap_index 41
+#define WindowPos2s_remap_index 42
+#define WindowPos2sv_remap_index 43
+#define WindowPos3d_remap_index 44
+#define WindowPos3dv_remap_index 45
+#define WindowPos3f_remap_index 46
+#define WindowPos3fv_remap_index 47
+#define WindowPos3i_remap_index 48
+#define WindowPos3iv_remap_index 49
+#define WindowPos3s_remap_index 50
+#define WindowPos3sv_remap_index 51
+#define BeginQuery_remap_index 52
+#define BindBuffer_remap_index 53
+#define BufferData_remap_index 54
+#define BufferSubData_remap_index 55
+#define DeleteBuffers_remap_index 56
+#define DeleteQueries_remap_index 57
+#define EndQuery_remap_index 58
+#define GenBuffers_remap_index 59
+#define GenQueries_remap_index 60
+#define GetBufferParameteriv_remap_index 61
+#define GetBufferPointerv_remap_index 62
+#define GetBufferSubData_remap_index 63
+#define GetQueryObjectiv_remap_index 64
+#define GetQueryObjectuiv_remap_index 65
+#define GetQueryiv_remap_index 66
+#define IsBuffer_remap_index 67
+#define IsQuery_remap_index 68
+#define MapBuffer_remap_index 69
+#define UnmapBuffer_remap_index 70
+#define AttachShader_remap_index 71
+#define BindAttribLocation_remap_index 72
+#define BlendEquationSeparate_remap_index 73
+#define CompileShader_remap_index 74
+#define CreateProgram_remap_index 75
+#define CreateShader_remap_index 76
+#define DeleteProgram_remap_index 77
+#define DeleteShader_remap_index 78
+#define DetachShader_remap_index 79
+#define DisableVertexAttribArray_remap_index 80
+#define DrawBuffers_remap_index 81
+#define EnableVertexAttribArray_remap_index 82
+#define GetActiveAttrib_remap_index 83
+#define GetActiveUniform_remap_index 84
+#define GetAttachedShaders_remap_index 85
+#define GetAttribLocation_remap_index 86
+#define GetProgramInfoLog_remap_index 87
+#define GetProgramiv_remap_index 88
+#define GetShaderInfoLog_remap_index 89
+#define GetShaderSource_remap_index 90
+#define GetShaderiv_remap_index 91
+#define GetUniformLocation_remap_index 92
+#define GetUniformfv_remap_index 93
+#define GetUniformiv_remap_index 94
+#define GetVertexAttribPointerv_remap_index 95
+#define GetVertexAttribdv_remap_index 96
+#define GetVertexAttribfv_remap_index 97
+#define GetVertexAttribiv_remap_index 98
+#define IsProgram_remap_index 99
+#define IsShader_remap_index 100
+#define LinkProgram_remap_index 101
+#define ShaderSource_remap_index 102
+#define StencilFuncSeparate_remap_index 103
+#define StencilMaskSeparate_remap_index 104
+#define StencilOpSeparate_remap_index 105
+#define Uniform1f_remap_index 106
+#define Uniform1fv_remap_index 107
+#define Uniform1i_remap_index 108
+#define Uniform1iv_remap_index 109
+#define Uniform2f_remap_index 110
+#define Uniform2fv_remap_index 111
+#define Uniform2i_remap_index 112
+#define Uniform2iv_remap_index 113
+#define Uniform3f_remap_index 114
+#define Uniform3fv_remap_index 115
+#define Uniform3i_remap_index 116
+#define Uniform3iv_remap_index 117
+#define Uniform4f_remap_index 118
+#define Uniform4fv_remap_index 119
+#define Uniform4i_remap_index 120
+#define Uniform4iv_remap_index 121
+#define UniformMatrix2fv_remap_index 122
+#define UniformMatrix3fv_remap_index 123
+#define UniformMatrix4fv_remap_index 124
+#define UseProgram_remap_index 125
+#define ValidateProgram_remap_index 126
+#define VertexAttrib1d_remap_index 127
+#define VertexAttrib1dv_remap_index 128
+#define VertexAttrib1s_remap_index 129
+#define VertexAttrib1sv_remap_index 130
+#define VertexAttrib2d_remap_index 131
+#define VertexAttrib2dv_remap_index 132
+#define VertexAttrib2s_remap_index 133
+#define VertexAttrib2sv_remap_index 134
+#define VertexAttrib3d_remap_index 135
+#define VertexAttrib3dv_remap_index 136
+#define VertexAttrib3s_remap_index 137
+#define VertexAttrib3sv_remap_index 138
+#define VertexAttrib4Nbv_remap_index 139
+#define VertexAttrib4Niv_remap_index 140
+#define VertexAttrib4Nsv_remap_index 141
+#define VertexAttrib4Nub_remap_index 142
+#define VertexAttrib4Nubv_remap_index 143
+#define VertexAttrib4Nuiv_remap_index 144
+#define VertexAttrib4Nusv_remap_index 145
+#define VertexAttrib4bv_remap_index 146
+#define VertexAttrib4d_remap_index 147
+#define VertexAttrib4dv_remap_index 148
+#define VertexAttrib4iv_remap_index 149
+#define VertexAttrib4s_remap_index 150
+#define VertexAttrib4sv_remap_index 151
+#define VertexAttrib4ubv_remap_index 152
+#define VertexAttrib4uiv_remap_index 153
+#define VertexAttrib4usv_remap_index 154
+#define VertexAttribPointer_remap_index 155
+#define UniformMatrix2x3fv_remap_index 156
+#define UniformMatrix2x4fv_remap_index 157
+#define UniformMatrix3x2fv_remap_index 158
+#define UniformMatrix3x4fv_remap_index 159
+#define UniformMatrix4x2fv_remap_index 160
+#define UniformMatrix4x3fv_remap_index 161
+#define BeginConditionalRender_remap_index 162
+#define BeginTransformFeedback_remap_index 163
+#define BindBufferBase_remap_index 164
+#define BindBufferRange_remap_index 165
+#define BindFragDataLocation_remap_index 166
+#define ClampColor_remap_index 167
+#define ClearBufferfi_remap_index 168
+#define ClearBufferfv_remap_index 169
+#define ClearBufferiv_remap_index 170
+#define ClearBufferuiv_remap_index 171
+#define ColorMaski_remap_index 172
+#define Disablei_remap_index 173
+#define Enablei_remap_index 174
+#define EndConditionalRender_remap_index 175
+#define EndTransformFeedback_remap_index 176
+#define GetBooleani_v_remap_index 177
+#define GetFragDataLocation_remap_index 178
+#define GetIntegeri_v_remap_index 179
+#define GetStringi_remap_index 180
+#define GetTexParameterIiv_remap_index 181
+#define GetTexParameterIuiv_remap_index 182
+#define GetTransformFeedbackVarying_remap_index 183
+#define GetUniformuiv_remap_index 184
+#define GetVertexAttribIiv_remap_index 185
+#define GetVertexAttribIuiv_remap_index 186
+#define IsEnabledi_remap_index 187
+#define TexParameterIiv_remap_index 188
+#define TexParameterIuiv_remap_index 189
+#define TransformFeedbackVaryings_remap_index 190
+#define Uniform1ui_remap_index 191
+#define Uniform1uiv_remap_index 192
+#define Uniform2ui_remap_index 193
+#define Uniform2uiv_remap_index 194
+#define Uniform3ui_remap_index 195
+#define Uniform3uiv_remap_index 196
+#define Uniform4ui_remap_index 197
+#define Uniform4uiv_remap_index 198
+#define VertexAttribI1iv_remap_index 199
+#define VertexAttribI1uiv_remap_index 200
+#define VertexAttribI4bv_remap_index 201
+#define VertexAttribI4sv_remap_index 202
+#define VertexAttribI4ubv_remap_index 203
+#define VertexAttribI4usv_remap_index 204
+#define VertexAttribIPointer_remap_index 205
+#define PrimitiveRestartIndex_remap_index 206
+#define TexBuffer_remap_index 207
+#define FramebufferTexture_remap_index 208
+#define GetBufferParameteri64v_remap_index 209
+#define GetInteger64i_v_remap_index 210
+#define VertexAttribDivisor_remap_index 211
+#define BindProgramARB_remap_index 212
+#define DeleteProgramsARB_remap_index 213
+#define GenProgramsARB_remap_index 214
+#define GetProgramEnvParameterdvARB_remap_index 215
+#define GetProgramEnvParameterfvARB_remap_index 216
+#define GetProgramLocalParameterdvARB_remap_index 217
+#define GetProgramLocalParameterfvARB_remap_index 218
+#define GetProgramStringARB_remap_index 219
+#define GetProgramivARB_remap_index 220
+#define IsProgramARB_remap_index 221
+#define ProgramEnvParameter4dARB_remap_index 222
+#define ProgramEnvParameter4dvARB_remap_index 223
+#define ProgramEnvParameter4fARB_remap_index 224
+#define ProgramEnvParameter4fvARB_remap_index 225
+#define ProgramLocalParameter4dARB_remap_index 226
+#define ProgramLocalParameter4dvARB_remap_index 227
+#define ProgramLocalParameter4fARB_remap_index 228
+#define ProgramLocalParameter4fvARB_remap_index 229
+#define ProgramStringARB_remap_index 230
+#define VertexAttrib1fARB_remap_index 231
+#define VertexAttrib1fvARB_remap_index 232
+#define VertexAttrib2fARB_remap_index 233
+#define VertexAttrib2fvARB_remap_index 234
+#define VertexAttrib3fARB_remap_index 235
+#define VertexAttrib3fvARB_remap_index 236
+#define VertexAttrib4fARB_remap_index 237
+#define VertexAttrib4fvARB_remap_index 238
+#define AttachObjectARB_remap_index 239
+#define CreateProgramObjectARB_remap_index 240
+#define CreateShaderObjectARB_remap_index 241
+#define DeleteObjectARB_remap_index 242
+#define DetachObjectARB_remap_index 243
+#define GetAttachedObjectsARB_remap_index 244
+#define GetHandleARB_remap_index 245
+#define GetInfoLogARB_remap_index 246
+#define GetObjectParameterfvARB_remap_index 247
+#define GetObjectParameterivARB_remap_index 248
+#define DrawArraysInstancedARB_remap_index 249
+#define DrawElementsInstancedARB_remap_index 250
+#define BindFramebuffer_remap_index 251
+#define BindRenderbuffer_remap_index 252
+#define BlitFramebuffer_remap_index 253
+#define CheckFramebufferStatus_remap_index 254
+#define DeleteFramebuffers_remap_index 255
+#define DeleteRenderbuffers_remap_index 256
+#define FramebufferRenderbuffer_remap_index 257
+#define FramebufferTexture1D_remap_index 258
+#define FramebufferTexture2D_remap_index 259
+#define FramebufferTexture3D_remap_index 260
+#define FramebufferTextureLayer_remap_index 261
+#define GenFramebuffers_remap_index 262
+#define GenRenderbuffers_remap_index 263
+#define GenerateMipmap_remap_index 264
+#define GetFramebufferAttachmentParameteriv_remap_index 265
+#define GetRenderbufferParameteriv_remap_index 266
+#define IsFramebuffer_remap_index 267
+#define IsRenderbuffer_remap_index 268
+#define RenderbufferStorage_remap_index 269
+#define RenderbufferStorageMultisample_remap_index 270
+#define FramebufferTextureFaceARB_remap_index 271
+#define FlushMappedBufferRange_remap_index 272
+#define MapBufferRange_remap_index 273
+#define BindVertexArray_remap_index 274
+#define DeleteVertexArrays_remap_index 275
+#define GenVertexArrays_remap_index 276
+#define IsVertexArray_remap_index 277
+#define GetActiveUniformBlockName_remap_index 278
+#define GetActiveUniformBlockiv_remap_index 279
+#define GetActiveUniformName_remap_index 280
+#define GetActiveUniformsiv_remap_index 281
+#define GetUniformBlockIndex_remap_index 282
+#define GetUniformIndices_remap_index 283
+#define UniformBlockBinding_remap_index 284
+#define CopyBufferSubData_remap_index 285
+#define ClientWaitSync_remap_index 286
+#define DeleteSync_remap_index 287
+#define FenceSync_remap_index 288
+#define GetInteger64v_remap_index 289
+#define GetSynciv_remap_index 290
+#define IsSync_remap_index 291
+#define WaitSync_remap_index 292
+#define DrawElementsBaseVertex_remap_index 293
+#define DrawElementsInstancedBaseVertex_remap_index 294
+#define DrawRangeElementsBaseVertex_remap_index 295
+#define MultiDrawElementsBaseVertex_remap_index 296
+#define ProvokingVertex_remap_index 297
+#define BlendEquationSeparateiARB_remap_index 298
+#define BlendEquationiARB_remap_index 299
+#define BlendFuncSeparateiARB_remap_index 300
+#define BlendFunciARB_remap_index 301
+#define BindFragDataLocationIndexed_remap_index 302
+#define GetFragDataIndex_remap_index 303
+#define BindSampler_remap_index 304
+#define DeleteSamplers_remap_index 305
+#define GenSamplers_remap_index 306
+#define GetSamplerParameterIiv_remap_index 307
+#define GetSamplerParameterIuiv_remap_index 308
+#define GetSamplerParameterfv_remap_index 309
+#define GetSamplerParameteriv_remap_index 310
+#define IsSampler_remap_index 311
+#define SamplerParameterIiv_remap_index 312
+#define SamplerParameterIuiv_remap_index 313
+#define SamplerParameterf_remap_index 314
+#define SamplerParameterfv_remap_index 315
+#define SamplerParameteri_remap_index 316
+#define SamplerParameteriv_remap_index 317
+#define GetQueryObjecti64v_remap_index 318
+#define GetQueryObjectui64v_remap_index 319
+#define QueryCounter_remap_index 320
+#define ColorP3ui_remap_index 321
+#define ColorP3uiv_remap_index 322
+#define ColorP4ui_remap_index 323
+#define ColorP4uiv_remap_index 324
+#define MultiTexCoordP1ui_remap_index 325
+#define MultiTexCoordP1uiv_remap_index 326
+#define MultiTexCoordP2ui_remap_index 327
+#define MultiTexCoordP2uiv_remap_index 328
+#define MultiTexCoordP3ui_remap_index 329
+#define MultiTexCoordP3uiv_remap_index 330
+#define MultiTexCoordP4ui_remap_index 331
+#define MultiTexCoordP4uiv_remap_index 332
+#define NormalP3ui_remap_index 333
+#define NormalP3uiv_remap_index 334
+#define SecondaryColorP3ui_remap_index 335
+#define SecondaryColorP3uiv_remap_index 336
+#define TexCoordP1ui_remap_index 337
+#define TexCoordP1uiv_remap_index 338
+#define TexCoordP2ui_remap_index 339
+#define TexCoordP2uiv_remap_index 340
+#define TexCoordP3ui_remap_index 341
+#define TexCoordP3uiv_remap_index 342
+#define TexCoordP4ui_remap_index 343
+#define TexCoordP4uiv_remap_index 344
+#define VertexAttribP1ui_remap_index 345
+#define VertexAttribP1uiv_remap_index 346
+#define VertexAttribP2ui_remap_index 347
+#define VertexAttribP2uiv_remap_index 348
+#define VertexAttribP3ui_remap_index 349
+#define VertexAttribP3uiv_remap_index 350
+#define VertexAttribP4ui_remap_index 351
+#define VertexAttribP4uiv_remap_index 352
+#define VertexP2ui_remap_index 353
+#define VertexP2uiv_remap_index 354
+#define VertexP3ui_remap_index 355
+#define VertexP3uiv_remap_index 356
+#define VertexP4ui_remap_index 357
+#define VertexP4uiv_remap_index 358
+#define BindTransformFeedback_remap_index 359
+#define DeleteTransformFeedbacks_remap_index 360
+#define DrawTransformFeedback_remap_index 361
+#define GenTransformFeedbacks_remap_index 362
+#define IsTransformFeedback_remap_index 363
+#define PauseTransformFeedback_remap_index 364
+#define ResumeTransformFeedback_remap_index 365
+#define BeginQueryIndexed_remap_index 366
+#define DrawTransformFeedbackStream_remap_index 367
+#define EndQueryIndexed_remap_index 368
+#define GetQueryIndexediv_remap_index 369
+#define ClearDepthf_remap_index 370
+#define DepthRangef_remap_index 371
+#define GetShaderPrecisionFormat_remap_index 372
+#define ReleaseShaderCompiler_remap_index 373
+#define ShaderBinary_remap_index 374
+#define GetProgramBinary_remap_index 375
+#define ProgramBinary_remap_index 376
+#define ProgramParameteri_remap_index 377
+#define DebugMessageCallbackARB_remap_index 378
+#define DebugMessageControlARB_remap_index 379
+#define DebugMessageInsertARB_remap_index 380
+#define GetDebugMessageLogARB_remap_index 381
+#define GetGraphicsResetStatusARB_remap_index 382
+#define GetnColorTableARB_remap_index 383
+#define GetnCompressedTexImageARB_remap_index 384
+#define GetnConvolutionFilterARB_remap_index 385
+#define GetnHistogramARB_remap_index 386
+#define GetnMapdvARB_remap_index 387
+#define GetnMapfvARB_remap_index 388
+#define GetnMapivARB_remap_index 389
+#define GetnMinmaxARB_remap_index 390
+#define GetnPixelMapfvARB_remap_index 391
+#define GetnPixelMapuivARB_remap_index 392
+#define GetnPixelMapusvARB_remap_index 393
+#define GetnPolygonStippleARB_remap_index 394
+#define GetnSeparableFilterARB_remap_index 395
+#define GetnTexImageARB_remap_index 396
+#define GetnUniformdvARB_remap_index 397
+#define GetnUniformfvARB_remap_index 398
+#define GetnUniformivARB_remap_index 399
+#define GetnUniformuivARB_remap_index 400
+#define ReadnPixelsARB_remap_index 401
+#define DrawArraysInstancedBaseInstance_remap_index 402
+#define DrawElementsInstancedBaseInstance_remap_index 403
+#define DrawElementsInstancedBaseVertexBaseInstance_remap_index 404
+#define DrawTransformFeedbackInstanced_remap_index 405
+#define DrawTransformFeedbackStreamInstanced_remap_index 406
+#define GetInternalformativ_remap_index 407
+#define TexStorage1D_remap_index 408
+#define TexStorage2D_remap_index 409
+#define TexStorage3D_remap_index 410
+#define TextureStorage1DEXT_remap_index 411
+#define TextureStorage2DEXT_remap_index 412
+#define TextureStorage3DEXT_remap_index 413
+#define TexBufferRange_remap_index 414
+#define InvalidateBufferData_remap_index 415
+#define InvalidateBufferSubData_remap_index 416
+#define InvalidateFramebuffer_remap_index 417
+#define InvalidateSubFramebuffer_remap_index 418
+#define InvalidateTexImage_remap_index 419
+#define InvalidateTexSubImage_remap_index 420
+#define PolygonOffsetEXT_remap_index 421
+#define DrawTexfOES_remap_index 422
+#define DrawTexfvOES_remap_index 423
+#define DrawTexiOES_remap_index 424
+#define DrawTexivOES_remap_index 425
+#define DrawTexsOES_remap_index 426
+#define DrawTexsvOES_remap_index 427
+#define DrawTexxOES_remap_index 428
+#define DrawTexxvOES_remap_index 429
+#define PointSizePointerOES_remap_index 430
+#define QueryMatrixxOES_remap_index 431
+#define SampleMaskSGIS_remap_index 432
+#define SamplePatternSGIS_remap_index 433
+#define ColorPointerEXT_remap_index 434
+#define EdgeFlagPointerEXT_remap_index 435
+#define IndexPointerEXT_remap_index 436
+#define NormalPointerEXT_remap_index 437
+#define TexCoordPointerEXT_remap_index 438
+#define VertexPointerEXT_remap_index 439
+#define LockArraysEXT_remap_index 440
+#define UnlockArraysEXT_remap_index 441
+#define SecondaryColor3fEXT_remap_index 442
+#define SecondaryColor3fvEXT_remap_index 443
+#define MultiDrawElementsEXT_remap_index 444
+#define FogCoordfEXT_remap_index 445
+#define FogCoordfvEXT_remap_index 446
+#define ResizeBuffersMESA_remap_index 447
+#define WindowPos4dMESA_remap_index 448
+#define WindowPos4dvMESA_remap_index 449
+#define WindowPos4fMESA_remap_index 450
+#define WindowPos4fvMESA_remap_index 451
+#define WindowPos4iMESA_remap_index 452
+#define WindowPos4ivMESA_remap_index 453
+#define WindowPos4sMESA_remap_index 454
+#define WindowPos4svMESA_remap_index 455
+#define MultiModeDrawArraysIBM_remap_index 456
+#define MultiModeDrawElementsIBM_remap_index 457
+#define AreProgramsResidentNV_remap_index 458
+#define ExecuteProgramNV_remap_index 459
+#define GetProgramParameterdvNV_remap_index 460
+#define GetProgramParameterfvNV_remap_index 461
+#define GetProgramStringNV_remap_index 462
+#define GetProgramivNV_remap_index 463
+#define GetTrackMatrixivNV_remap_index 464
+#define GetVertexAttribdvNV_remap_index 465
+#define GetVertexAttribfvNV_remap_index 466
+#define GetVertexAttribivNV_remap_index 467
+#define LoadProgramNV_remap_index 468
+#define ProgramParameters4dvNV_remap_index 469
+#define ProgramParameters4fvNV_remap_index 470
+#define RequestResidentProgramsNV_remap_index 471
+#define TrackMatrixNV_remap_index 472
+#define VertexAttrib1dNV_remap_index 473
+#define VertexAttrib1dvNV_remap_index 474
+#define VertexAttrib1fNV_remap_index 475
+#define VertexAttrib1fvNV_remap_index 476
+#define VertexAttrib1sNV_remap_index 477
+#define VertexAttrib1svNV_remap_index 478
+#define VertexAttrib2dNV_remap_index 479
+#define VertexAttrib2dvNV_remap_index 480
+#define VertexAttrib2fNV_remap_index 481
+#define VertexAttrib2fvNV_remap_index 482
+#define VertexAttrib2sNV_remap_index 483
+#define VertexAttrib2svNV_remap_index 484
+#define VertexAttrib3dNV_remap_index 485
+#define VertexAttrib3dvNV_remap_index 486
+#define VertexAttrib3fNV_remap_index 487
+#define VertexAttrib3fvNV_remap_index 488
+#define VertexAttrib3sNV_remap_index 489
+#define VertexAttrib3svNV_remap_index 490
+#define VertexAttrib4dNV_remap_index 491
+#define VertexAttrib4dvNV_remap_index 492
+#define VertexAttrib4fNV_remap_index 493
+#define VertexAttrib4fvNV_remap_index 494
+#define VertexAttrib4sNV_remap_index 495
+#define VertexAttrib4svNV_remap_index 496
+#define VertexAttrib4ubNV_remap_index 497
+#define VertexAttrib4ubvNV_remap_index 498
+#define VertexAttribPointerNV_remap_index 499
+#define VertexAttribs1dvNV_remap_index 500
+#define VertexAttribs1fvNV_remap_index 501
+#define VertexAttribs1svNV_remap_index 502
+#define VertexAttribs2dvNV_remap_index 503
+#define VertexAttribs2fvNV_remap_index 504
+#define VertexAttribs2svNV_remap_index 505
+#define VertexAttribs3dvNV_remap_index 506
+#define VertexAttribs3fvNV_remap_index 507
+#define VertexAttribs3svNV_remap_index 508
+#define VertexAttribs4dvNV_remap_index 509
+#define VertexAttribs4fvNV_remap_index 510
+#define VertexAttribs4svNV_remap_index 511
+#define VertexAttribs4ubvNV_remap_index 512
+#define GetTexBumpParameterfvATI_remap_index 513
+#define GetTexBumpParameterivATI_remap_index 514
+#define TexBumpParameterfvATI_remap_index 515
+#define TexBumpParameterivATI_remap_index 516
+#define AlphaFragmentOp1ATI_remap_index 517
+#define AlphaFragmentOp2ATI_remap_index 518
+#define AlphaFragmentOp3ATI_remap_index 519
+#define BeginFragmentShaderATI_remap_index 520
+#define BindFragmentShaderATI_remap_index 521
+#define ColorFragmentOp1ATI_remap_index 522
+#define ColorFragmentOp2ATI_remap_index 523
+#define ColorFragmentOp3ATI_remap_index 524
+#define DeleteFragmentShaderATI_remap_index 525
+#define EndFragmentShaderATI_remap_index 526
+#define GenFragmentShadersATI_remap_index 527
+#define PassTexCoordATI_remap_index 528
+#define SampleMapATI_remap_index 529
+#define SetFragmentShaderConstantATI_remap_index 530
+#define ActiveStencilFaceEXT_remap_index 531
+#define BindVertexArrayAPPLE_remap_index 532
+#define GenVertexArraysAPPLE_remap_index 533
+#define GetProgramNamedParameterdvNV_remap_index 534
+#define GetProgramNamedParameterfvNV_remap_index 535
+#define ProgramNamedParameter4dNV_remap_index 536
+#define ProgramNamedParameter4dvNV_remap_index 537
+#define ProgramNamedParameter4fNV_remap_index 538
+#define ProgramNamedParameter4fvNV_remap_index 539
+#define PrimitiveRestartNV_remap_index 540
+#define GetTexGenxvOES_remap_index 541
+#define TexGenxOES_remap_index 542
+#define TexGenxvOES_remap_index 543
+#define DepthBoundsEXT_remap_index 544
+#define BufferParameteriAPPLE_remap_index 545
+#define FlushMappedBufferRangeAPPLE_remap_index 546
+#define VertexAttribI1iEXT_remap_index 547
+#define VertexAttribI1uiEXT_remap_index 548
+#define VertexAttribI2iEXT_remap_index 549
+#define VertexAttribI2ivEXT_remap_index 550
+#define VertexAttribI2uiEXT_remap_index 551
+#define VertexAttribI2uivEXT_remap_index 552
+#define VertexAttribI3iEXT_remap_index 553
+#define VertexAttribI3ivEXT_remap_index 554
+#define VertexAttribI3uiEXT_remap_index 555
+#define VertexAttribI3uivEXT_remap_index 556
+#define VertexAttribI4iEXT_remap_index 557
+#define VertexAttribI4ivEXT_remap_index 558
+#define VertexAttribI4uiEXT_remap_index 559
+#define VertexAttribI4uivEXT_remap_index 560
+#define ClearColorIiEXT_remap_index 561
+#define ClearColorIuiEXT_remap_index 562
+#define BindBufferOffsetEXT_remap_index 563
+#define GetObjectParameterivAPPLE_remap_index 564
+#define ObjectPurgeableAPPLE_remap_index 565
+#define ObjectUnpurgeableAPPLE_remap_index 566
+#define ActiveProgramEXT_remap_index 567
+#define CreateShaderProgramEXT_remap_index 568
+#define UseShaderProgramEXT_remap_index 569
+#define TextureBarrierNV_remap_index 570
+#define StencilFuncSeparateATI_remap_index 571
+#define ProgramEnvParameters4fvEXT_remap_index 572
+#define ProgramLocalParameters4fvEXT_remap_index 573
+#define EGLImageTargetRenderbufferStorageOES_remap_index 574
+#define EGLImageTargetTexture2DOES_remap_index 575
+#define AlphaFuncx_remap_index 576
+#define ClearColorx_remap_index 577
+#define ClearDepthx_remap_index 578
+#define Color4x_remap_index 579
+#define DepthRangex_remap_index 580
+#define Fogx_remap_index 581
+#define Fogxv_remap_index 582
+#define Frustumf_remap_index 583
+#define Frustumx_remap_index 584
+#define LightModelx_remap_index 585
+#define LightModelxv_remap_index 586
+#define Lightx_remap_index 587
+#define Lightxv_remap_index 588
+#define LineWidthx_remap_index 589
+#define LoadMatrixx_remap_index 590
+#define Materialx_remap_index 591
+#define Materialxv_remap_index 592
+#define MultMatrixx_remap_index 593
+#define MultiTexCoord4x_remap_index 594
+#define Normal3x_remap_index 595
+#define Orthof_remap_index 596
+#define Orthox_remap_index 597
+#define PointSizex_remap_index 598
+#define PolygonOffsetx_remap_index 599
+#define Rotatex_remap_index 600
+#define SampleCoveragex_remap_index 601
+#define Scalex_remap_index 602
+#define TexEnvx_remap_index 603
+#define TexEnvxv_remap_index 604
+#define TexParameterx_remap_index 605
+#define Translatex_remap_index 606
+#define ClipPlanef_remap_index 607
+#define ClipPlanex_remap_index 608
+#define GetClipPlanef_remap_index 609
+#define GetClipPlanex_remap_index 610
+#define GetFixedv_remap_index 611
+#define GetLightxv_remap_index 612
+#define GetMaterialxv_remap_index 613
+#define GetTexEnvxv_remap_index 614
+#define GetTexParameterxv_remap_index 615
+#define PointParameterx_remap_index 616
+#define PointParameterxv_remap_index 617
+#define TexParameterxv_remap_index 618
+
+#define _gloffset_CompressedTexImage1D driDispatchRemapTable[CompressedTexImage1D_remap_index]
+#define _gloffset_CompressedTexImage2D driDispatchRemapTable[CompressedTexImage2D_remap_index]
+#define _gloffset_CompressedTexImage3D driDispatchRemapTable[CompressedTexImage3D_remap_index]
+#define _gloffset_CompressedTexSubImage1D driDispatchRemapTable[CompressedTexSubImage1D_remap_index]
+#define _gloffset_CompressedTexSubImage2D driDispatchRemapTable[CompressedTexSubImage2D_remap_index]
+#define _gloffset_CompressedTexSubImage3D driDispatchRemapTable[CompressedTexSubImage3D_remap_index]
+#define _gloffset_GetCompressedTexImage driDispatchRemapTable[GetCompressedTexImage_remap_index]
+#define _gloffset_LoadTransposeMatrixd driDispatchRemapTable[LoadTransposeMatrixd_remap_index]
+#define _gloffset_LoadTransposeMatrixf driDispatchRemapTable[LoadTransposeMatrixf_remap_index]
+#define _gloffset_MultTransposeMatrixd driDispatchRemapTable[MultTransposeMatrixd_remap_index]
+#define _gloffset_MultTransposeMatrixf driDispatchRemapTable[MultTransposeMatrixf_remap_index]
+#define _gloffset_SampleCoverage driDispatchRemapTable[SampleCoverage_remap_index]
+#define _gloffset_BlendFuncSeparate driDispatchRemapTable[BlendFuncSeparate_remap_index]
+#define _gloffset_FogCoordPointer driDispatchRemapTable[FogCoordPointer_remap_index]
+#define _gloffset_FogCoordd driDispatchRemapTable[FogCoordd_remap_index]
+#define _gloffset_FogCoorddv driDispatchRemapTable[FogCoorddv_remap_index]
+#define _gloffset_MultiDrawArrays driDispatchRemapTable[MultiDrawArrays_remap_index]
+#define _gloffset_PointParameterf driDispatchRemapTable[PointParameterf_remap_index]
+#define _gloffset_PointParameterfv driDispatchRemapTable[PointParameterfv_remap_index]
+#define _gloffset_PointParameteri driDispatchRemapTable[PointParameteri_remap_index]
+#define _gloffset_PointParameteriv driDispatchRemapTable[PointParameteriv_remap_index]
+#define _gloffset_SecondaryColor3b driDispatchRemapTable[SecondaryColor3b_remap_index]
+#define _gloffset_SecondaryColor3bv driDispatchRemapTable[SecondaryColor3bv_remap_index]
+#define _gloffset_SecondaryColor3d driDispatchRemapTable[SecondaryColor3d_remap_index]
+#define _gloffset_SecondaryColor3dv driDispatchRemapTable[SecondaryColor3dv_remap_index]
+#define _gloffset_SecondaryColor3i driDispatchRemapTable[SecondaryColor3i_remap_index]
+#define _gloffset_SecondaryColor3iv driDispatchRemapTable[SecondaryColor3iv_remap_index]
+#define _gloffset_SecondaryColor3s driDispatchRemapTable[SecondaryColor3s_remap_index]
+#define _gloffset_SecondaryColor3sv driDispatchRemapTable[SecondaryColor3sv_remap_index]
+#define _gloffset_SecondaryColor3ub driDispatchRemapTable[SecondaryColor3ub_remap_index]
+#define _gloffset_SecondaryColor3ubv driDispatchRemapTable[SecondaryColor3ubv_remap_index]
+#define _gloffset_SecondaryColor3ui driDispatchRemapTable[SecondaryColor3ui_remap_index]
+#define _gloffset_SecondaryColor3uiv driDispatchRemapTable[SecondaryColor3uiv_remap_index]
+#define _gloffset_SecondaryColor3us driDispatchRemapTable[SecondaryColor3us_remap_index]
+#define _gloffset_SecondaryColor3usv driDispatchRemapTable[SecondaryColor3usv_remap_index]
+#define _gloffset_SecondaryColorPointer driDispatchRemapTable[SecondaryColorPointer_remap_index]
+#define _gloffset_WindowPos2d driDispatchRemapTable[WindowPos2d_remap_index]
+#define _gloffset_WindowPos2dv driDispatchRemapTable[WindowPos2dv_remap_index]
+#define _gloffset_WindowPos2f driDispatchRemapTable[WindowPos2f_remap_index]
+#define _gloffset_WindowPos2fv driDispatchRemapTable[WindowPos2fv_remap_index]
+#define _gloffset_WindowPos2i driDispatchRemapTable[WindowPos2i_remap_index]
+#define _gloffset_WindowPos2iv driDispatchRemapTable[WindowPos2iv_remap_index]
+#define _gloffset_WindowPos2s driDispatchRemapTable[WindowPos2s_remap_index]
+#define _gloffset_WindowPos2sv driDispatchRemapTable[WindowPos2sv_remap_index]
+#define _gloffset_WindowPos3d driDispatchRemapTable[WindowPos3d_remap_index]
+#define _gloffset_WindowPos3dv driDispatchRemapTable[WindowPos3dv_remap_index]
+#define _gloffset_WindowPos3f driDispatchRemapTable[WindowPos3f_remap_index]
+#define _gloffset_WindowPos3fv driDispatchRemapTable[WindowPos3fv_remap_index]
+#define _gloffset_WindowPos3i driDispatchRemapTable[WindowPos3i_remap_index]
+#define _gloffset_WindowPos3iv driDispatchRemapTable[WindowPos3iv_remap_index]
+#define _gloffset_WindowPos3s driDispatchRemapTable[WindowPos3s_remap_index]
+#define _gloffset_WindowPos3sv driDispatchRemapTable[WindowPos3sv_remap_index]
+#define _gloffset_BeginQuery driDispatchRemapTable[BeginQuery_remap_index]
+#define _gloffset_BindBuffer driDispatchRemapTable[BindBuffer_remap_index]
+#define _gloffset_BufferData driDispatchRemapTable[BufferData_remap_index]
+#define _gloffset_BufferSubData driDispatchRemapTable[BufferSubData_remap_index]
+#define _gloffset_DeleteBuffers driDispatchRemapTable[DeleteBuffers_remap_index]
+#define _gloffset_DeleteQueries driDispatchRemapTable[DeleteQueries_remap_index]
+#define _gloffset_EndQuery driDispatchRemapTable[EndQuery_remap_index]
+#define _gloffset_GenBuffers driDispatchRemapTable[GenBuffers_remap_index]
+#define _gloffset_GenQueries driDispatchRemapTable[GenQueries_remap_index]
+#define _gloffset_GetBufferParameteriv driDispatchRemapTable[GetBufferParameteriv_remap_index]
+#define _gloffset_GetBufferPointerv driDispatchRemapTable[GetBufferPointerv_remap_index]
+#define _gloffset_GetBufferSubData driDispatchRemapTable[GetBufferSubData_remap_index]
+#define _gloffset_GetQueryObjectiv driDispatchRemapTable[GetQueryObjectiv_remap_index]
+#define _gloffset_GetQueryObjectuiv driDispatchRemapTable[GetQueryObjectuiv_remap_index]
+#define _gloffset_GetQueryiv driDispatchRemapTable[GetQueryiv_remap_index]
+#define _gloffset_IsBuffer driDispatchRemapTable[IsBuffer_remap_index]
+#define _gloffset_IsQuery driDispatchRemapTable[IsQuery_remap_index]
+#define _gloffset_MapBuffer driDispatchRemapTable[MapBuffer_remap_index]
+#define _gloffset_UnmapBuffer driDispatchRemapTable[UnmapBuffer_remap_index]
 #define _gloffset_AttachShader driDispatchRemapTable[AttachShader_remap_index]
+#define _gloffset_BindAttribLocation driDispatchRemapTable[BindAttribLocation_remap_index]
+#define _gloffset_BlendEquationSeparate driDispatchRemapTable[BlendEquationSeparate_remap_index]
+#define _gloffset_CompileShader driDispatchRemapTable[CompileShader_remap_index]
 #define _gloffset_CreateProgram driDispatchRemapTable[CreateProgram_remap_index]
 #define _gloffset_CreateShader driDispatchRemapTable[CreateShader_remap_index]
 #define _gloffset_DeleteProgram driDispatchRemapTable[DeleteProgram_remap_index]
 #define _gloffset_DeleteShader driDispatchRemapTable[DeleteShader_remap_index]
 #define _gloffset_DetachShader driDispatchRemapTable[DetachShader_remap_index]
+#define _gloffset_DisableVertexAttribArray driDispatchRemapTable[DisableVertexAttribArray_remap_index]
+#define _gloffset_DrawBuffers driDispatchRemapTable[DrawBuffers_remap_index]
+#define _gloffset_EnableVertexAttribArray driDispatchRemapTable[EnableVertexAttribArray_remap_index]
+#define _gloffset_GetActiveAttrib driDispatchRemapTable[GetActiveAttrib_remap_index]
+#define _gloffset_GetActiveUniform driDispatchRemapTable[GetActiveUniform_remap_index]
 #define _gloffset_GetAttachedShaders driDispatchRemapTable[GetAttachedShaders_remap_index]
+#define _gloffset_GetAttribLocation driDispatchRemapTable[GetAttribLocation_remap_index]
 #define _gloffset_GetProgramInfoLog driDispatchRemapTable[GetProgramInfoLog_remap_index]
 #define _gloffset_GetProgramiv driDispatchRemapTable[GetProgramiv_remap_index]
 #define _gloffset_GetShaderInfoLog driDispatchRemapTable[GetShaderInfoLog_remap_index]
+#define _gloffset_GetShaderSource driDispatchRemapTable[GetShaderSource_remap_index]
 #define _gloffset_GetShaderiv driDispatchRemapTable[GetShaderiv_remap_index]
+#define _gloffset_GetUniformLocation driDispatchRemapTable[GetUniformLocation_remap_index]
+#define _gloffset_GetUniformfv driDispatchRemapTable[GetUniformfv_remap_index]
+#define _gloffset_GetUniformiv driDispatchRemapTable[GetUniformiv_remap_index]
+#define _gloffset_GetVertexAttribPointerv driDispatchRemapTable[GetVertexAttribPointerv_remap_index]
+#define _gloffset_GetVertexAttribdv driDispatchRemapTable[GetVertexAttribdv_remap_index]
+#define _gloffset_GetVertexAttribfv driDispatchRemapTable[GetVertexAttribfv_remap_index]
+#define _gloffset_GetVertexAttribiv driDispatchRemapTable[GetVertexAttribiv_remap_index]
 #define _gloffset_IsProgram driDispatchRemapTable[IsProgram_remap_index]
 #define _gloffset_IsShader driDispatchRemapTable[IsShader_remap_index]
+#define _gloffset_LinkProgram driDispatchRemapTable[LinkProgram_remap_index]
+#define _gloffset_ShaderSource driDispatchRemapTable[ShaderSource_remap_index]
 #define _gloffset_StencilFuncSeparate driDispatchRemapTable[StencilFuncSeparate_remap_index]
 #define _gloffset_StencilMaskSeparate driDispatchRemapTable[StencilMaskSeparate_remap_index]
 #define _gloffset_StencilOpSeparate driDispatchRemapTable[StencilOpSeparate_remap_index]
+#define _gloffset_Uniform1f driDispatchRemapTable[Uniform1f_remap_index]
+#define _gloffset_Uniform1fv driDispatchRemapTable[Uniform1fv_remap_index]
+#define _gloffset_Uniform1i driDispatchRemapTable[Uniform1i_remap_index]
+#define _gloffset_Uniform1iv driDispatchRemapTable[Uniform1iv_remap_index]
+#define _gloffset_Uniform2f driDispatchRemapTable[Uniform2f_remap_index]
+#define _gloffset_Uniform2fv driDispatchRemapTable[Uniform2fv_remap_index]
+#define _gloffset_Uniform2i driDispatchRemapTable[Uniform2i_remap_index]
+#define _gloffset_Uniform2iv driDispatchRemapTable[Uniform2iv_remap_index]
+#define _gloffset_Uniform3f driDispatchRemapTable[Uniform3f_remap_index]
+#define _gloffset_Uniform3fv driDispatchRemapTable[Uniform3fv_remap_index]
+#define _gloffset_Uniform3i driDispatchRemapTable[Uniform3i_remap_index]
+#define _gloffset_Uniform3iv driDispatchRemapTable[Uniform3iv_remap_index]
+#define _gloffset_Uniform4f driDispatchRemapTable[Uniform4f_remap_index]
+#define _gloffset_Uniform4fv driDispatchRemapTable[Uniform4fv_remap_index]
+#define _gloffset_Uniform4i driDispatchRemapTable[Uniform4i_remap_index]
+#define _gloffset_Uniform4iv driDispatchRemapTable[Uniform4iv_remap_index]
+#define _gloffset_UniformMatrix2fv driDispatchRemapTable[UniformMatrix2fv_remap_index]
+#define _gloffset_UniformMatrix3fv driDispatchRemapTable[UniformMatrix3fv_remap_index]
+#define _gloffset_UniformMatrix4fv driDispatchRemapTable[UniformMatrix4fv_remap_index]
+#define _gloffset_UseProgram driDispatchRemapTable[UseProgram_remap_index]
+#define _gloffset_ValidateProgram driDispatchRemapTable[ValidateProgram_remap_index]
+#define _gloffset_VertexAttrib1d driDispatchRemapTable[VertexAttrib1d_remap_index]
+#define _gloffset_VertexAttrib1dv driDispatchRemapTable[VertexAttrib1dv_remap_index]
+#define _gloffset_VertexAttrib1s driDispatchRemapTable[VertexAttrib1s_remap_index]
+#define _gloffset_VertexAttrib1sv driDispatchRemapTable[VertexAttrib1sv_remap_index]
+#define _gloffset_VertexAttrib2d driDispatchRemapTable[VertexAttrib2d_remap_index]
+#define _gloffset_VertexAttrib2dv driDispatchRemapTable[VertexAttrib2dv_remap_index]
+#define _gloffset_VertexAttrib2s driDispatchRemapTable[VertexAttrib2s_remap_index]
+#define _gloffset_VertexAttrib2sv driDispatchRemapTable[VertexAttrib2sv_remap_index]
+#define _gloffset_VertexAttrib3d driDispatchRemapTable[VertexAttrib3d_remap_index]
+#define _gloffset_VertexAttrib3dv driDispatchRemapTable[VertexAttrib3dv_remap_index]
+#define _gloffset_VertexAttrib3s driDispatchRemapTable[VertexAttrib3s_remap_index]
+#define _gloffset_VertexAttrib3sv driDispatchRemapTable[VertexAttrib3sv_remap_index]
+#define _gloffset_VertexAttrib4Nbv driDispatchRemapTable[VertexAttrib4Nbv_remap_index]
+#define _gloffset_VertexAttrib4Niv driDispatchRemapTable[VertexAttrib4Niv_remap_index]
+#define _gloffset_VertexAttrib4Nsv driDispatchRemapTable[VertexAttrib4Nsv_remap_index]
+#define _gloffset_VertexAttrib4Nub driDispatchRemapTable[VertexAttrib4Nub_remap_index]
+#define _gloffset_VertexAttrib4Nubv driDispatchRemapTable[VertexAttrib4Nubv_remap_index]
+#define _gloffset_VertexAttrib4Nuiv driDispatchRemapTable[VertexAttrib4Nuiv_remap_index]
+#define _gloffset_VertexAttrib4Nusv driDispatchRemapTable[VertexAttrib4Nusv_remap_index]
+#define _gloffset_VertexAttrib4bv driDispatchRemapTable[VertexAttrib4bv_remap_index]
+#define _gloffset_VertexAttrib4d driDispatchRemapTable[VertexAttrib4d_remap_index]
+#define _gloffset_VertexAttrib4dv driDispatchRemapTable[VertexAttrib4dv_remap_index]
+#define _gloffset_VertexAttrib4iv driDispatchRemapTable[VertexAttrib4iv_remap_index]
+#define _gloffset_VertexAttrib4s driDispatchRemapTable[VertexAttrib4s_remap_index]
+#define _gloffset_VertexAttrib4sv driDispatchRemapTable[VertexAttrib4sv_remap_index]
+#define _gloffset_VertexAttrib4ubv driDispatchRemapTable[VertexAttrib4ubv_remap_index]
+#define _gloffset_VertexAttrib4uiv driDispatchRemapTable[VertexAttrib4uiv_remap_index]
+#define _gloffset_VertexAttrib4usv driDispatchRemapTable[VertexAttrib4usv_remap_index]
+#define _gloffset_VertexAttribPointer driDispatchRemapTable[VertexAttribPointer_remap_index]
 #define _gloffset_UniformMatrix2x3fv driDispatchRemapTable[UniformMatrix2x3fv_remap_index]
 #define _gloffset_UniformMatrix2x4fv driDispatchRemapTable[UniformMatrix2x4fv_remap_index]
 #define _gloffset_UniformMatrix3x2fv driDispatchRemapTable[UniformMatrix3x2fv_remap_index]
 #define _gloffset_UniformMatrix3x4fv driDispatchRemapTable[UniformMatrix3x4fv_remap_index]
 #define _gloffset_UniformMatrix4x2fv driDispatchRemapTable[UniformMatrix4x2fv_remap_index]
 #define _gloffset_UniformMatrix4x3fv driDispatchRemapTable[UniformMatrix4x3fv_remap_index]
+#define _gloffset_BeginConditionalRender driDispatchRemapTable[BeginConditionalRender_remap_index]
+#define _gloffset_BeginTransformFeedback driDispatchRemapTable[BeginTransformFeedback_remap_index]
+#define _gloffset_BindBufferBase driDispatchRemapTable[BindBufferBase_remap_index]
+#define _gloffset_BindBufferRange driDispatchRemapTable[BindBufferRange_remap_index]
+#define _gloffset_BindFragDataLocation driDispatchRemapTable[BindFragDataLocation_remap_index]
 #define _gloffset_ClampColor driDispatchRemapTable[ClampColor_remap_index]
 #define _gloffset_ClearBufferfi driDispatchRemapTable[ClearBufferfi_remap_index]
 #define _gloffset_ClearBufferfv driDispatchRemapTable[ClearBufferfv_remap_index]
 #define _gloffset_ClearBufferiv driDispatchRemapTable[ClearBufferiv_remap_index]
 #define _gloffset_ClearBufferuiv driDispatchRemapTable[ClearBufferuiv_remap_index]
+#define _gloffset_ColorMaski driDispatchRemapTable[ColorMaski_remap_index]
+#define _gloffset_Disablei driDispatchRemapTable[Disablei_remap_index]
+#define _gloffset_Enablei driDispatchRemapTable[Enablei_remap_index]
+#define _gloffset_EndConditionalRender driDispatchRemapTable[EndConditionalRender_remap_index]
+#define _gloffset_EndTransformFeedback driDispatchRemapTable[EndTransformFeedback_remap_index]
+#define _gloffset_GetBooleani_v driDispatchRemapTable[GetBooleani_v_remap_index]
+#define _gloffset_GetFragDataLocation driDispatchRemapTable[GetFragDataLocation_remap_index]
+#define _gloffset_GetIntegeri_v driDispatchRemapTable[GetIntegeri_v_remap_index]
 #define _gloffset_GetStringi driDispatchRemapTable[GetStringi_remap_index]
+#define _gloffset_GetTexParameterIiv driDispatchRemapTable[GetTexParameterIiv_remap_index]
+#define _gloffset_GetTexParameterIuiv driDispatchRemapTable[GetTexParameterIuiv_remap_index]
+#define _gloffset_GetTransformFeedbackVarying driDispatchRemapTable[GetTransformFeedbackVarying_remap_index]
+#define _gloffset_GetUniformuiv driDispatchRemapTable[GetUniformuiv_remap_index]
+#define _gloffset_GetVertexAttribIiv driDispatchRemapTable[GetVertexAttribIiv_remap_index]
+#define _gloffset_GetVertexAttribIuiv driDispatchRemapTable[GetVertexAttribIuiv_remap_index]
+#define _gloffset_IsEnabledi driDispatchRemapTable[IsEnabledi_remap_index]
+#define _gloffset_TexParameterIiv driDispatchRemapTable[TexParameterIiv_remap_index]
+#define _gloffset_TexParameterIuiv driDispatchRemapTable[TexParameterIuiv_remap_index]
+#define _gloffset_TransformFeedbackVaryings driDispatchRemapTable[TransformFeedbackVaryings_remap_index]
+#define _gloffset_Uniform1ui driDispatchRemapTable[Uniform1ui_remap_index]
+#define _gloffset_Uniform1uiv driDispatchRemapTable[Uniform1uiv_remap_index]
+#define _gloffset_Uniform2ui driDispatchRemapTable[Uniform2ui_remap_index]
+#define _gloffset_Uniform2uiv driDispatchRemapTable[Uniform2uiv_remap_index]
+#define _gloffset_Uniform3ui driDispatchRemapTable[Uniform3ui_remap_index]
+#define _gloffset_Uniform3uiv driDispatchRemapTable[Uniform3uiv_remap_index]
+#define _gloffset_Uniform4ui driDispatchRemapTable[Uniform4ui_remap_index]
+#define _gloffset_Uniform4uiv driDispatchRemapTable[Uniform4uiv_remap_index]
+#define _gloffset_VertexAttribI1iv driDispatchRemapTable[VertexAttribI1iv_remap_index]
+#define _gloffset_VertexAttribI1uiv driDispatchRemapTable[VertexAttribI1uiv_remap_index]
+#define _gloffset_VertexAttribI4bv driDispatchRemapTable[VertexAttribI4bv_remap_index]
+#define _gloffset_VertexAttribI4sv driDispatchRemapTable[VertexAttribI4sv_remap_index]
+#define _gloffset_VertexAttribI4ubv driDispatchRemapTable[VertexAttribI4ubv_remap_index]
+#define _gloffset_VertexAttribI4usv driDispatchRemapTable[VertexAttribI4usv_remap_index]
+#define _gloffset_VertexAttribIPointer driDispatchRemapTable[VertexAttribIPointer_remap_index]
+#define _gloffset_PrimitiveRestartIndex driDispatchRemapTable[PrimitiveRestartIndex_remap_index]
 #define _gloffset_TexBuffer driDispatchRemapTable[TexBuffer_remap_index]
 #define _gloffset_FramebufferTexture driDispatchRemapTable[FramebufferTexture_remap_index]
 #define _gloffset_GetBufferParameteri64v driDispatchRemapTable[GetBufferParameteri64v_remap_index]
 #define _gloffset_GetInteger64i_v driDispatchRemapTable[GetInteger64i_v_remap_index]
 #define _gloffset_VertexAttribDivisor driDispatchRemapTable[VertexAttribDivisor_remap_index]
-#define _gloffset_LoadTransposeMatrixdARB driDispatchRemapTable[LoadTransposeMatrixdARB_remap_index]
-#define _gloffset_LoadTransposeMatrixfARB driDispatchRemapTable[LoadTransposeMatrixfARB_remap_index]
-#define _gloffset_MultTransposeMatrixdARB driDispatchRemapTable[MultTransposeMatrixdARB_remap_index]
-#define _gloffset_MultTransposeMatrixfARB driDispatchRemapTable[MultTransposeMatrixfARB_remap_index]
-#define _gloffset_SampleCoverageARB driDispatchRemapTable[SampleCoverageARB_remap_index]
-#define _gloffset_CompressedTexImage1DARB driDispatchRemapTable[CompressedTexImage1DARB_remap_index]
-#define _gloffset_CompressedTexImage2DARB driDispatchRemapTable[CompressedTexImage2DARB_remap_index]
-#define _gloffset_CompressedTexImage3DARB driDispatchRemapTable[CompressedTexImage3DARB_remap_index]
-#define _gloffset_CompressedTexSubImage1DARB driDispatchRemapTable[CompressedTexSubImage1DARB_remap_index]
-#define _gloffset_CompressedTexSubImage2DARB driDispatchRemapTable[CompressedTexSubImage2DARB_remap_index]
-#define _gloffset_CompressedTexSubImage3DARB driDispatchRemapTable[CompressedTexSubImage3DARB_remap_index]
-#define _gloffset_GetCompressedTexImageARB driDispatchRemapTable[GetCompressedTexImageARB_remap_index]
-#define _gloffset_DisableVertexAttribArrayARB driDispatchRemapTable[DisableVertexAttribArrayARB_remap_index]
-#define _gloffset_EnableVertexAttribArrayARB driDispatchRemapTable[EnableVertexAttribArrayARB_remap_index]
+#define _gloffset_BindProgramARB driDispatchRemapTable[BindProgramARB_remap_index]
+#define _gloffset_DeleteProgramsARB driDispatchRemapTable[DeleteProgramsARB_remap_index]
+#define _gloffset_GenProgramsARB driDispatchRemapTable[GenProgramsARB_remap_index]
 #define _gloffset_GetProgramEnvParameterdvARB driDispatchRemapTable[GetProgramEnvParameterdvARB_remap_index]
 #define _gloffset_GetProgramEnvParameterfvARB driDispatchRemapTable[GetProgramEnvParameterfvARB_remap_index]
 #define _gloffset_GetProgramLocalParameterdvARB driDispatchRemapTable[GetProgramLocalParameterdvARB_remap_index]
 #define _gloffset_GetProgramLocalParameterfvARB driDispatchRemapTable[GetProgramLocalParameterfvARB_remap_index]
 #define _gloffset_GetProgramStringARB driDispatchRemapTable[GetProgramStringARB_remap_index]
 #define _gloffset_GetProgramivARB driDispatchRemapTable[GetProgramivARB_remap_index]
-#define _gloffset_GetVertexAttribdvARB driDispatchRemapTable[GetVertexAttribdvARB_remap_index]
-#define _gloffset_GetVertexAttribfvARB driDispatchRemapTable[GetVertexAttribfvARB_remap_index]
-#define _gloffset_GetVertexAttribivARB driDispatchRemapTable[GetVertexAttribivARB_remap_index]
+#define _gloffset_IsProgramARB driDispatchRemapTable[IsProgramARB_remap_index]
 #define _gloffset_ProgramEnvParameter4dARB driDispatchRemapTable[ProgramEnvParameter4dARB_remap_index]
 #define _gloffset_ProgramEnvParameter4dvARB driDispatchRemapTable[ProgramEnvParameter4dvARB_remap_index]
 #define _gloffset_ProgramEnvParameter4fARB driDispatchRemapTable[ProgramEnvParameter4fARB_remap_index]
@@ -1677,118 +1958,60 @@ extern int driDispatchRemapTable[driDispatchRemapTable_size];
 #define _gloffset_ProgramLocalParameter4fARB driDispatchRemapTable[ProgramLocalParameter4fARB_remap_index]
 #define _gloffset_ProgramLocalParameter4fvARB driDispatchRemapTable[ProgramLocalParameter4fvARB_remap_index]
 #define _gloffset_ProgramStringARB driDispatchRemapTable[ProgramStringARB_remap_index]
-#define _gloffset_VertexAttrib1dARB driDispatchRemapTable[VertexAttrib1dARB_remap_index]
-#define _gloffset_VertexAttrib1dvARB driDispatchRemapTable[VertexAttrib1dvARB_remap_index]
 #define _gloffset_VertexAttrib1fARB driDispatchRemapTable[VertexAttrib1fARB_remap_index]
 #define _gloffset_VertexAttrib1fvARB driDispatchRemapTable[VertexAttrib1fvARB_remap_index]
-#define _gloffset_VertexAttrib1sARB driDispatchRemapTable[VertexAttrib1sARB_remap_index]
-#define _gloffset_VertexAttrib1svARB driDispatchRemapTable[VertexAttrib1svARB_remap_index]
-#define _gloffset_VertexAttrib2dARB driDispatchRemapTable[VertexAttrib2dARB_remap_index]
-#define _gloffset_VertexAttrib2dvARB driDispatchRemapTable[VertexAttrib2dvARB_remap_index]
 #define _gloffset_VertexAttrib2fARB driDispatchRemapTable[VertexAttrib2fARB_remap_index]
 #define _gloffset_VertexAttrib2fvARB driDispatchRemapTable[VertexAttrib2fvARB_remap_index]
-#define _gloffset_VertexAttrib2sARB driDispatchRemapTable[VertexAttrib2sARB_remap_index]
-#define _gloffset_VertexAttrib2svARB driDispatchRemapTable[VertexAttrib2svARB_remap_index]
-#define _gloffset_VertexAttrib3dARB driDispatchRemapTable[VertexAttrib3dARB_remap_index]
-#define _gloffset_VertexAttrib3dvARB driDispatchRemapTable[VertexAttrib3dvARB_remap_index]
 #define _gloffset_VertexAttrib3fARB driDispatchRemapTable[VertexAttrib3fARB_remap_index]
 #define _gloffset_VertexAttrib3fvARB driDispatchRemapTable[VertexAttrib3fvARB_remap_index]
-#define _gloffset_VertexAttrib3sARB driDispatchRemapTable[VertexAttrib3sARB_remap_index]
-#define _gloffset_VertexAttrib3svARB driDispatchRemapTable[VertexAttrib3svARB_remap_index]
-#define _gloffset_VertexAttrib4NbvARB driDispatchRemapTable[VertexAttrib4NbvARB_remap_index]
-#define _gloffset_VertexAttrib4NivARB driDispatchRemapTable[VertexAttrib4NivARB_remap_index]
-#define _gloffset_VertexAttrib4NsvARB driDispatchRemapTable[VertexAttrib4NsvARB_remap_index]
-#define _gloffset_VertexAttrib4NubARB driDispatchRemapTable[VertexAttrib4NubARB_remap_index]
-#define _gloffset_VertexAttrib4NubvARB driDispatchRemapTable[VertexAttrib4NubvARB_remap_index]
-#define _gloffset_VertexAttrib4NuivARB driDispatchRemapTable[VertexAttrib4NuivARB_remap_index]
-#define _gloffset_VertexAttrib4NusvARB driDispatchRemapTable[VertexAttrib4NusvARB_remap_index]
-#define _gloffset_VertexAttrib4bvARB driDispatchRemapTable[VertexAttrib4bvARB_remap_index]
-#define _gloffset_VertexAttrib4dARB driDispatchRemapTable[VertexAttrib4dARB_remap_index]
-#define _gloffset_VertexAttrib4dvARB driDispatchRemapTable[VertexAttrib4dvARB_remap_index]
 #define _gloffset_VertexAttrib4fARB driDispatchRemapTable[VertexAttrib4fARB_remap_index]
 #define _gloffset_VertexAttrib4fvARB driDispatchRemapTable[VertexAttrib4fvARB_remap_index]
-#define _gloffset_VertexAttrib4ivARB driDispatchRemapTable[VertexAttrib4ivARB_remap_index]
-#define _gloffset_VertexAttrib4sARB driDispatchRemapTable[VertexAttrib4sARB_remap_index]
-#define _gloffset_VertexAttrib4svARB driDispatchRemapTable[VertexAttrib4svARB_remap_index]
-#define _gloffset_VertexAttrib4ubvARB driDispatchRemapTable[VertexAttrib4ubvARB_remap_index]
-#define _gloffset_VertexAttrib4uivARB driDispatchRemapTable[VertexAttrib4uivARB_remap_index]
-#define _gloffset_VertexAttrib4usvARB driDispatchRemapTable[VertexAttrib4usvARB_remap_index]
-#define _gloffset_VertexAttribPointerARB driDispatchRemapTable[VertexAttribPointerARB_remap_index]
-#define _gloffset_BindBufferARB driDispatchRemapTable[BindBufferARB_remap_index]
-#define _gloffset_BufferDataARB driDispatchRemapTable[BufferDataARB_remap_index]
-#define _gloffset_BufferSubDataARB driDispatchRemapTable[BufferSubDataARB_remap_index]
-#define _gloffset_DeleteBuffersARB driDispatchRemapTable[DeleteBuffersARB_remap_index]
-#define _gloffset_GenBuffersARB driDispatchRemapTable[GenBuffersARB_remap_index]
-#define _gloffset_GetBufferParameterivARB driDispatchRemapTable[GetBufferParameterivARB_remap_index]
-#define _gloffset_GetBufferPointervARB driDispatchRemapTable[GetBufferPointervARB_remap_index]
-#define _gloffset_GetBufferSubDataARB driDispatchRemapTable[GetBufferSubDataARB_remap_index]
-#define _gloffset_IsBufferARB driDispatchRemapTable[IsBufferARB_remap_index]
-#define _gloffset_MapBufferARB driDispatchRemapTable[MapBufferARB_remap_index]
-#define _gloffset_UnmapBufferARB driDispatchRemapTable[UnmapBufferARB_remap_index]
-#define _gloffset_BeginQueryARB driDispatchRemapTable[BeginQueryARB_remap_index]
-#define _gloffset_DeleteQueriesARB driDispatchRemapTable[DeleteQueriesARB_remap_index]
-#define _gloffset_EndQueryARB driDispatchRemapTable[EndQueryARB_remap_index]
-#define _gloffset_GenQueriesARB driDispatchRemapTable[GenQueriesARB_remap_index]
-#define _gloffset_GetQueryObjectivARB driDispatchRemapTable[GetQueryObjectivARB_remap_index]
-#define _gloffset_GetQueryObjectuivARB driDispatchRemapTable[GetQueryObjectuivARB_remap_index]
-#define _gloffset_GetQueryivARB driDispatchRemapTable[GetQueryivARB_remap_index]
-#define _gloffset_IsQueryARB driDispatchRemapTable[IsQueryARB_remap_index]
 #define _gloffset_AttachObjectARB driDispatchRemapTable[AttachObjectARB_remap_index]
-#define _gloffset_CompileShaderARB driDispatchRemapTable[CompileShaderARB_remap_index]
 #define _gloffset_CreateProgramObjectARB driDispatchRemapTable[CreateProgramObjectARB_remap_index]
 #define _gloffset_CreateShaderObjectARB driDispatchRemapTable[CreateShaderObjectARB_remap_index]
 #define _gloffset_DeleteObjectARB driDispatchRemapTable[DeleteObjectARB_remap_index]
 #define _gloffset_DetachObjectARB driDispatchRemapTable[DetachObjectARB_remap_index]
-#define _gloffset_GetActiveUniformARB driDispatchRemapTable[GetActiveUniformARB_remap_index]
 #define _gloffset_GetAttachedObjectsARB driDispatchRemapTable[GetAttachedObjectsARB_remap_index]
 #define _gloffset_GetHandleARB driDispatchRemapTable[GetHandleARB_remap_index]
 #define _gloffset_GetInfoLogARB driDispatchRemapTable[GetInfoLogARB_remap_index]
 #define _gloffset_GetObjectParameterfvARB driDispatchRemapTable[GetObjectParameterfvARB_remap_index]
 #define _gloffset_GetObjectParameterivARB driDispatchRemapTable[GetObjectParameterivARB_remap_index]
-#define _gloffset_GetShaderSourceARB driDispatchRemapTable[GetShaderSourceARB_remap_index]
-#define _gloffset_GetUniformLocationARB driDispatchRemapTable[GetUniformLocationARB_remap_index]
-#define _gloffset_GetUniformfvARB driDispatchRemapTable[GetUniformfvARB_remap_index]
-#define _gloffset_GetUniformivARB driDispatchRemapTable[GetUniformivARB_remap_index]
-#define _gloffset_LinkProgramARB driDispatchRemapTable[LinkProgramARB_remap_index]
-#define _gloffset_ShaderSourceARB driDispatchRemapTable[ShaderSourceARB_remap_index]
-#define _gloffset_Uniform1fARB driDispatchRemapTable[Uniform1fARB_remap_index]
-#define _gloffset_Uniform1fvARB driDispatchRemapTable[Uniform1fvARB_remap_index]
-#define _gloffset_Uniform1iARB driDispatchRemapTable[Uniform1iARB_remap_index]
-#define _gloffset_Uniform1ivARB driDispatchRemapTable[Uniform1ivARB_remap_index]
-#define _gloffset_Uniform2fARB driDispatchRemapTable[Uniform2fARB_remap_index]
-#define _gloffset_Uniform2fvARB driDispatchRemapTable[Uniform2fvARB_remap_index]
-#define _gloffset_Uniform2iARB driDispatchRemapTable[Uniform2iARB_remap_index]
-#define _gloffset_Uniform2ivARB driDispatchRemapTable[Uniform2ivARB_remap_index]
-#define _gloffset_Uniform3fARB driDispatchRemapTable[Uniform3fARB_remap_index]
-#define _gloffset_Uniform3fvARB driDispatchRemapTable[Uniform3fvARB_remap_index]
-#define _gloffset_Uniform3iARB driDispatchRemapTable[Uniform3iARB_remap_index]
-#define _gloffset_Uniform3ivARB driDispatchRemapTable[Uniform3ivARB_remap_index]
-#define _gloffset_Uniform4fARB driDispatchRemapTable[Uniform4fARB_remap_index]
-#define _gloffset_Uniform4fvARB driDispatchRemapTable[Uniform4fvARB_remap_index]
-#define _gloffset_Uniform4iARB driDispatchRemapTable[Uniform4iARB_remap_index]
-#define _gloffset_Uniform4ivARB driDispatchRemapTable[Uniform4ivARB_remap_index]
-#define _gloffset_UniformMatrix2fvARB driDispatchRemapTable[UniformMatrix2fvARB_remap_index]
-#define _gloffset_UniformMatrix3fvARB driDispatchRemapTable[UniformMatrix3fvARB_remap_index]
-#define _gloffset_UniformMatrix4fvARB driDispatchRemapTable[UniformMatrix4fvARB_remap_index]
-#define _gloffset_UseProgramObjectARB driDispatchRemapTable[UseProgramObjectARB_remap_index]
-#define _gloffset_ValidateProgramARB driDispatchRemapTable[ValidateProgramARB_remap_index]
-#define _gloffset_BindAttribLocationARB driDispatchRemapTable[BindAttribLocationARB_remap_index]
-#define _gloffset_GetActiveAttribARB driDispatchRemapTable[GetActiveAttribARB_remap_index]
-#define _gloffset_GetAttribLocationARB driDispatchRemapTable[GetAttribLocationARB_remap_index]
-#define _gloffset_DrawBuffersARB driDispatchRemapTable[DrawBuffersARB_remap_index]
-#define _gloffset_ClampColorARB driDispatchRemapTable[ClampColorARB_remap_index]
 #define _gloffset_DrawArraysInstancedARB driDispatchRemapTable[DrawArraysInstancedARB_remap_index]
 #define _gloffset_DrawElementsInstancedARB driDispatchRemapTable[DrawElementsInstancedARB_remap_index]
+#define _gloffset_BindFramebuffer driDispatchRemapTable[BindFramebuffer_remap_index]
+#define _gloffset_BindRenderbuffer driDispatchRemapTable[BindRenderbuffer_remap_index]
+#define _gloffset_BlitFramebuffer driDispatchRemapTable[BlitFramebuffer_remap_index]
+#define _gloffset_CheckFramebufferStatus driDispatchRemapTable[CheckFramebufferStatus_remap_index]
+#define _gloffset_DeleteFramebuffers driDispatchRemapTable[DeleteFramebuffers_remap_index]
+#define _gloffset_DeleteRenderbuffers driDispatchRemapTable[DeleteRenderbuffers_remap_index]
+#define _gloffset_FramebufferRenderbuffer driDispatchRemapTable[FramebufferRenderbuffer_remap_index]
+#define _gloffset_FramebufferTexture1D driDispatchRemapTable[FramebufferTexture1D_remap_index]
+#define _gloffset_FramebufferTexture2D driDispatchRemapTable[FramebufferTexture2D_remap_index]
+#define _gloffset_FramebufferTexture3D driDispatchRemapTable[FramebufferTexture3D_remap_index]
+#define _gloffset_FramebufferTextureLayer driDispatchRemapTable[FramebufferTextureLayer_remap_index]
+#define _gloffset_GenFramebuffers driDispatchRemapTable[GenFramebuffers_remap_index]
+#define _gloffset_GenRenderbuffers driDispatchRemapTable[GenRenderbuffers_remap_index]
+#define _gloffset_GenerateMipmap driDispatchRemapTable[GenerateMipmap_remap_index]
+#define _gloffset_GetFramebufferAttachmentParameteriv driDispatchRemapTable[GetFramebufferAttachmentParameteriv_remap_index]
+#define _gloffset_GetRenderbufferParameteriv driDispatchRemapTable[GetRenderbufferParameteriv_remap_index]
+#define _gloffset_IsFramebuffer driDispatchRemapTable[IsFramebuffer_remap_index]
+#define _gloffset_IsRenderbuffer driDispatchRemapTable[IsRenderbuffer_remap_index]
+#define _gloffset_RenderbufferStorage driDispatchRemapTable[RenderbufferStorage_remap_index]
 #define _gloffset_RenderbufferStorageMultisample driDispatchRemapTable[RenderbufferStorageMultisample_remap_index]
-#define _gloffset_FramebufferTextureARB driDispatchRemapTable[FramebufferTextureARB_remap_index]
 #define _gloffset_FramebufferTextureFaceARB driDispatchRemapTable[FramebufferTextureFaceARB_remap_index]
-#define _gloffset_ProgramParameteriARB driDispatchRemapTable[ProgramParameteriARB_remap_index]
-#define _gloffset_VertexAttribDivisorARB driDispatchRemapTable[VertexAttribDivisorARB_remap_index]
 #define _gloffset_FlushMappedBufferRange driDispatchRemapTable[FlushMappedBufferRange_remap_index]
 #define _gloffset_MapBufferRange driDispatchRemapTable[MapBufferRange_remap_index]
-#define _gloffset_TexBufferARB driDispatchRemapTable[TexBufferARB_remap_index]
 #define _gloffset_BindVertexArray driDispatchRemapTable[BindVertexArray_remap_index]
+#define _gloffset_DeleteVertexArrays driDispatchRemapTable[DeleteVertexArrays_remap_index]
 #define _gloffset_GenVertexArrays driDispatchRemapTable[GenVertexArrays_remap_index]
+#define _gloffset_IsVertexArray driDispatchRemapTable[IsVertexArray_remap_index]
+#define _gloffset_GetActiveUniformBlockName driDispatchRemapTable[GetActiveUniformBlockName_remap_index]
+#define _gloffset_GetActiveUniformBlockiv driDispatchRemapTable[GetActiveUniformBlockiv_remap_index]
+#define _gloffset_GetActiveUniformName driDispatchRemapTable[GetActiveUniformName_remap_index]
+#define _gloffset_GetActiveUniformsiv driDispatchRemapTable[GetActiveUniformsiv_remap_index]
+#define _gloffset_GetUniformBlockIndex driDispatchRemapTable[GetUniformBlockIndex_remap_index]
+#define _gloffset_GetUniformIndices driDispatchRemapTable[GetUniformIndices_remap_index]
+#define _gloffset_UniformBlockBinding driDispatchRemapTable[UniformBlockBinding_remap_index]
 #define _gloffset_CopyBufferSubData driDispatchRemapTable[CopyBufferSubData_remap_index]
 #define _gloffset_ClientWaitSync driDispatchRemapTable[ClientWaitSync_remap_index]
 #define _gloffset_DeleteSync driDispatchRemapTable[DeleteSync_remap_index]
@@ -1801,10 +2024,13 @@ extern int driDispatchRemapTable[driDispatchRemapTable_size];
 #define _gloffset_DrawElementsInstancedBaseVertex driDispatchRemapTable[DrawElementsInstancedBaseVertex_remap_index]
 #define _gloffset_DrawRangeElementsBaseVertex driDispatchRemapTable[DrawRangeElementsBaseVertex_remap_index]
 #define _gloffset_MultiDrawElementsBaseVertex driDispatchRemapTable[MultiDrawElementsBaseVertex_remap_index]
+#define _gloffset_ProvokingVertex driDispatchRemapTable[ProvokingVertex_remap_index]
 #define _gloffset_BlendEquationSeparateiARB driDispatchRemapTable[BlendEquationSeparateiARB_remap_index]
 #define _gloffset_BlendEquationiARB driDispatchRemapTable[BlendEquationiARB_remap_index]
 #define _gloffset_BlendFuncSeparateiARB driDispatchRemapTable[BlendFuncSeparateiARB_remap_index]
 #define _gloffset_BlendFunciARB driDispatchRemapTable[BlendFunciARB_remap_index]
+#define _gloffset_BindFragDataLocationIndexed driDispatchRemapTable[BindFragDataLocationIndexed_remap_index]
+#define _gloffset_GetFragDataIndex driDispatchRemapTable[GetFragDataIndex_remap_index]
 #define _gloffset_BindSampler driDispatchRemapTable[BindSampler_remap_index]
 #define _gloffset_DeleteSamplers driDispatchRemapTable[DeleteSamplers_remap_index]
 #define _gloffset_GenSamplers driDispatchRemapTable[GenSamplers_remap_index]
@@ -1819,6 +2045,9 @@ extern int driDispatchRemapTable[driDispatchRemapTable_size];
 #define _gloffset_SamplerParameterfv driDispatchRemapTable[SamplerParameterfv_remap_index]
 #define _gloffset_SamplerParameteri driDispatchRemapTable[SamplerParameteri_remap_index]
 #define _gloffset_SamplerParameteriv driDispatchRemapTable[SamplerParameteriv_remap_index]
+#define _gloffset_GetQueryObjecti64v driDispatchRemapTable[GetQueryObjecti64v_remap_index]
+#define _gloffset_GetQueryObjectui64v driDispatchRemapTable[GetQueryObjectui64v_remap_index]
+#define _gloffset_QueryCounter driDispatchRemapTable[QueryCounter_remap_index]
 #define _gloffset_ColorP3ui driDispatchRemapTable[ColorP3ui_remap_index]
 #define _gloffset_ColorP3uiv driDispatchRemapTable[ColorP3uiv_remap_index]
 #define _gloffset_ColorP4ui driDispatchRemapTable[ColorP4ui_remap_index]
@@ -1864,11 +2093,22 @@ extern int driDispatchRemapTable[driDispatchRemapTable_size];
 #define _gloffset_IsTransformFeedback driDispatchRemapTable[IsTransformFeedback_remap_index]
 #define _gloffset_PauseTransformFeedback driDispatchRemapTable[PauseTransformFeedback_remap_index]
 #define _gloffset_ResumeTransformFeedback driDispatchRemapTable[ResumeTransformFeedback_remap_index]
+#define _gloffset_BeginQueryIndexed driDispatchRemapTable[BeginQueryIndexed_remap_index]
+#define _gloffset_DrawTransformFeedbackStream driDispatchRemapTable[DrawTransformFeedbackStream_remap_index]
+#define _gloffset_EndQueryIndexed driDispatchRemapTable[EndQueryIndexed_remap_index]
+#define _gloffset_GetQueryIndexediv driDispatchRemapTable[GetQueryIndexediv_remap_index]
 #define _gloffset_ClearDepthf driDispatchRemapTable[ClearDepthf_remap_index]
 #define _gloffset_DepthRangef driDispatchRemapTable[DepthRangef_remap_index]
 #define _gloffset_GetShaderPrecisionFormat driDispatchRemapTable[GetShaderPrecisionFormat_remap_index]
 #define _gloffset_ReleaseShaderCompiler driDispatchRemapTable[ReleaseShaderCompiler_remap_index]
 #define _gloffset_ShaderBinary driDispatchRemapTable[ShaderBinary_remap_index]
+#define _gloffset_GetProgramBinary driDispatchRemapTable[GetProgramBinary_remap_index]
+#define _gloffset_ProgramBinary driDispatchRemapTable[ProgramBinary_remap_index]
+#define _gloffset_ProgramParameteri driDispatchRemapTable[ProgramParameteri_remap_index]
+#define _gloffset_DebugMessageCallbackARB driDispatchRemapTable[DebugMessageCallbackARB_remap_index]
+#define _gloffset_DebugMessageControlARB driDispatchRemapTable[DebugMessageControlARB_remap_index]
+#define _gloffset_DebugMessageInsertARB driDispatchRemapTable[DebugMessageInsertARB_remap_index]
+#define _gloffset_GetDebugMessageLogARB driDispatchRemapTable[GetDebugMessageLogARB_remap_index]
 #define _gloffset_GetGraphicsResetStatusARB driDispatchRemapTable[GetGraphicsResetStatusARB_remap_index]
 #define _gloffset_GetnColorTableARB driDispatchRemapTable[GetnColorTableARB_remap_index]
 #define _gloffset_GetnCompressedTexImageARB driDispatchRemapTable[GetnCompressedTexImageARB_remap_index]
@@ -1889,19 +2129,36 @@ extern int driDispatchRemapTable[driDispatchRemapTable_size];
 #define _gloffset_GetnUniformivARB driDispatchRemapTable[GetnUniformivARB_remap_index]
 #define _gloffset_GetnUniformuivARB driDispatchRemapTable[GetnUniformuivARB_remap_index]
 #define _gloffset_ReadnPixelsARB driDispatchRemapTable[ReadnPixelsARB_remap_index]
+#define _gloffset_DrawArraysInstancedBaseInstance driDispatchRemapTable[DrawArraysInstancedBaseInstance_remap_index]
+#define _gloffset_DrawElementsInstancedBaseInstance driDispatchRemapTable[DrawElementsInstancedBaseInstance_remap_index]
+#define _gloffset_DrawElementsInstancedBaseVertexBaseInstance driDispatchRemapTable[DrawElementsInstancedBaseVertexBaseInstance_remap_index]
+#define _gloffset_DrawTransformFeedbackInstanced driDispatchRemapTable[DrawTransformFeedbackInstanced_remap_index]
+#define _gloffset_DrawTransformFeedbackStreamInstanced driDispatchRemapTable[DrawTransformFeedbackStreamInstanced_remap_index]
+#define _gloffset_GetInternalformativ driDispatchRemapTable[GetInternalformativ_remap_index]
 #define _gloffset_TexStorage1D driDispatchRemapTable[TexStorage1D_remap_index]
 #define _gloffset_TexStorage2D driDispatchRemapTable[TexStorage2D_remap_index]
 #define _gloffset_TexStorage3D driDispatchRemapTable[TexStorage3D_remap_index]
 #define _gloffset_TextureStorage1DEXT driDispatchRemapTable[TextureStorage1DEXT_remap_index]
 #define _gloffset_TextureStorage2DEXT driDispatchRemapTable[TextureStorage2DEXT_remap_index]
 #define _gloffset_TextureStorage3DEXT driDispatchRemapTable[TextureStorage3DEXT_remap_index]
+#define _gloffset_TexBufferRange driDispatchRemapTable[TexBufferRange_remap_index]
+#define _gloffset_InvalidateBufferData driDispatchRemapTable[InvalidateBufferData_remap_index]
+#define _gloffset_InvalidateBufferSubData driDispatchRemapTable[InvalidateBufferSubData_remap_index]
+#define _gloffset_InvalidateFramebuffer driDispatchRemapTable[InvalidateFramebuffer_remap_index]
+#define _gloffset_InvalidateSubFramebuffer driDispatchRemapTable[InvalidateSubFramebuffer_remap_index]
+#define _gloffset_InvalidateTexImage driDispatchRemapTable[InvalidateTexImage_remap_index]
+#define _gloffset_InvalidateTexSubImage driDispatchRemapTable[InvalidateTexSubImage_remap_index]
 #define _gloffset_PolygonOffsetEXT driDispatchRemapTable[PolygonOffsetEXT_remap_index]
-#define _gloffset_GetPixelTexGenParameterfvSGIS driDispatchRemapTable[GetPixelTexGenParameterfvSGIS_remap_index]
-#define _gloffset_GetPixelTexGenParameterivSGIS driDispatchRemapTable[GetPixelTexGenParameterivSGIS_remap_index]
-#define _gloffset_PixelTexGenParameterfSGIS driDispatchRemapTable[PixelTexGenParameterfSGIS_remap_index]
-#define _gloffset_PixelTexGenParameterfvSGIS driDispatchRemapTable[PixelTexGenParameterfvSGIS_remap_index]
-#define _gloffset_PixelTexGenParameteriSGIS driDispatchRemapTable[PixelTexGenParameteriSGIS_remap_index]
-#define _gloffset_PixelTexGenParameterivSGIS driDispatchRemapTable[PixelTexGenParameterivSGIS_remap_index]
+#define _gloffset_DrawTexfOES driDispatchRemapTable[DrawTexfOES_remap_index]
+#define _gloffset_DrawTexfvOES driDispatchRemapTable[DrawTexfvOES_remap_index]
+#define _gloffset_DrawTexiOES driDispatchRemapTable[DrawTexiOES_remap_index]
+#define _gloffset_DrawTexivOES driDispatchRemapTable[DrawTexivOES_remap_index]
+#define _gloffset_DrawTexsOES driDispatchRemapTable[DrawTexsOES_remap_index]
+#define _gloffset_DrawTexsvOES driDispatchRemapTable[DrawTexsvOES_remap_index]
+#define _gloffset_DrawTexxOES driDispatchRemapTable[DrawTexxOES_remap_index]
+#define _gloffset_DrawTexxvOES driDispatchRemapTable[DrawTexxvOES_remap_index]
+#define _gloffset_PointSizePointerOES driDispatchRemapTable[PointSizePointerOES_remap_index]
+#define _gloffset_QueryMatrixxOES driDispatchRemapTable[QueryMatrixxOES_remap_index]
 #define _gloffset_SampleMaskSGIS driDispatchRemapTable[SampleMaskSGIS_remap_index]
 #define _gloffset_SamplePatternSGIS driDispatchRemapTable[SamplePatternSGIS_remap_index]
 #define _gloffset_ColorPointerEXT driDispatchRemapTable[ColorPointerEXT_remap_index]
@@ -1910,68 +2167,14 @@ extern int driDispatchRemapTable[driDispatchRemapTable_size];
 #define _gloffset_NormalPointerEXT driDispatchRemapTable[NormalPointerEXT_remap_index]
 #define _gloffset_TexCoordPointerEXT driDispatchRemapTable[TexCoordPointerEXT_remap_index]
 #define _gloffset_VertexPointerEXT driDispatchRemapTable[VertexPointerEXT_remap_index]
-#define _gloffset_PointParameterfEXT driDispatchRemapTable[PointParameterfEXT_remap_index]
-#define _gloffset_PointParameterfvEXT driDispatchRemapTable[PointParameterfvEXT_remap_index]
 #define _gloffset_LockArraysEXT driDispatchRemapTable[LockArraysEXT_remap_index]
 #define _gloffset_UnlockArraysEXT driDispatchRemapTable[UnlockArraysEXT_remap_index]
-#define _gloffset_SecondaryColor3bEXT driDispatchRemapTable[SecondaryColor3bEXT_remap_index]
-#define _gloffset_SecondaryColor3bvEXT driDispatchRemapTable[SecondaryColor3bvEXT_remap_index]
-#define _gloffset_SecondaryColor3dEXT driDispatchRemapTable[SecondaryColor3dEXT_remap_index]
-#define _gloffset_SecondaryColor3dvEXT driDispatchRemapTable[SecondaryColor3dvEXT_remap_index]
 #define _gloffset_SecondaryColor3fEXT driDispatchRemapTable[SecondaryColor3fEXT_remap_index]
 #define _gloffset_SecondaryColor3fvEXT driDispatchRemapTable[SecondaryColor3fvEXT_remap_index]
-#define _gloffset_SecondaryColor3iEXT driDispatchRemapTable[SecondaryColor3iEXT_remap_index]
-#define _gloffset_SecondaryColor3ivEXT driDispatchRemapTable[SecondaryColor3ivEXT_remap_index]
-#define _gloffset_SecondaryColor3sEXT driDispatchRemapTable[SecondaryColor3sEXT_remap_index]
-#define _gloffset_SecondaryColor3svEXT driDispatchRemapTable[SecondaryColor3svEXT_remap_index]
-#define _gloffset_SecondaryColor3ubEXT driDispatchRemapTable[SecondaryColor3ubEXT_remap_index]
-#define _gloffset_SecondaryColor3ubvEXT driDispatchRemapTable[SecondaryColor3ubvEXT_remap_index]
-#define _gloffset_SecondaryColor3uiEXT driDispatchRemapTable[SecondaryColor3uiEXT_remap_index]
-#define _gloffset_SecondaryColor3uivEXT driDispatchRemapTable[SecondaryColor3uivEXT_remap_index]
-#define _gloffset_SecondaryColor3usEXT driDispatchRemapTable[SecondaryColor3usEXT_remap_index]
-#define _gloffset_SecondaryColor3usvEXT driDispatchRemapTable[SecondaryColor3usvEXT_remap_index]
-#define _gloffset_SecondaryColorPointerEXT driDispatchRemapTable[SecondaryColorPointerEXT_remap_index]
-#define _gloffset_MultiDrawArraysEXT driDispatchRemapTable[MultiDrawArraysEXT_remap_index]
 #define _gloffset_MultiDrawElementsEXT driDispatchRemapTable[MultiDrawElementsEXT_remap_index]
-#define _gloffset_FogCoordPointerEXT driDispatchRemapTable[FogCoordPointerEXT_remap_index]
-#define _gloffset_FogCoorddEXT driDispatchRemapTable[FogCoorddEXT_remap_index]
-#define _gloffset_FogCoorddvEXT driDispatchRemapTable[FogCoorddvEXT_remap_index]
 #define _gloffset_FogCoordfEXT driDispatchRemapTable[FogCoordfEXT_remap_index]
 #define _gloffset_FogCoordfvEXT driDispatchRemapTable[FogCoordfvEXT_remap_index]
-#define _gloffset_PixelTexGenSGIX driDispatchRemapTable[PixelTexGenSGIX_remap_index]
-#define _gloffset_BlendFuncSeparateEXT driDispatchRemapTable[BlendFuncSeparateEXT_remap_index]
-#define _gloffset_FlushVertexArrayRangeNV driDispatchRemapTable[FlushVertexArrayRangeNV_remap_index]
-#define _gloffset_VertexArrayRangeNV driDispatchRemapTable[VertexArrayRangeNV_remap_index]
-#define _gloffset_CombinerInputNV driDispatchRemapTable[CombinerInputNV_remap_index]
-#define _gloffset_CombinerOutputNV driDispatchRemapTable[CombinerOutputNV_remap_index]
-#define _gloffset_CombinerParameterfNV driDispatchRemapTable[CombinerParameterfNV_remap_index]
-#define _gloffset_CombinerParameterfvNV driDispatchRemapTable[CombinerParameterfvNV_remap_index]
-#define _gloffset_CombinerParameteriNV driDispatchRemapTable[CombinerParameteriNV_remap_index]
-#define _gloffset_CombinerParameterivNV driDispatchRemapTable[CombinerParameterivNV_remap_index]
-#define _gloffset_FinalCombinerInputNV driDispatchRemapTable[FinalCombinerInputNV_remap_index]
-#define _gloffset_GetCombinerInputParameterfvNV driDispatchRemapTable[GetCombinerInputParameterfvNV_remap_index]
-#define _gloffset_GetCombinerInputParameterivNV driDispatchRemapTable[GetCombinerInputParameterivNV_remap_index]
-#define _gloffset_GetCombinerOutputParameterfvNV driDispatchRemapTable[GetCombinerOutputParameterfvNV_remap_index]
-#define _gloffset_GetCombinerOutputParameterivNV driDispatchRemapTable[GetCombinerOutputParameterivNV_remap_index]
-#define _gloffset_GetFinalCombinerInputParameterfvNV driDispatchRemapTable[GetFinalCombinerInputParameterfvNV_remap_index]
-#define _gloffset_GetFinalCombinerInputParameterivNV driDispatchRemapTable[GetFinalCombinerInputParameterivNV_remap_index]
 #define _gloffset_ResizeBuffersMESA driDispatchRemapTable[ResizeBuffersMESA_remap_index]
-#define _gloffset_WindowPos2dMESA driDispatchRemapTable[WindowPos2dMESA_remap_index]
-#define _gloffset_WindowPos2dvMESA driDispatchRemapTable[WindowPos2dvMESA_remap_index]
-#define _gloffset_WindowPos2fMESA driDispatchRemapTable[WindowPos2fMESA_remap_index]
-#define _gloffset_WindowPos2fvMESA driDispatchRemapTable[WindowPos2fvMESA_remap_index]
-#define _gloffset_WindowPos2iMESA driDispatchRemapTable[WindowPos2iMESA_remap_index]
-#define _gloffset_WindowPos2ivMESA driDispatchRemapTable[WindowPos2ivMESA_remap_index]
-#define _gloffset_WindowPos2sMESA driDispatchRemapTable[WindowPos2sMESA_remap_index]
-#define _gloffset_WindowPos2svMESA driDispatchRemapTable[WindowPos2svMESA_remap_index]
-#define _gloffset_WindowPos3dMESA driDispatchRemapTable[WindowPos3dMESA_remap_index]
-#define _gloffset_WindowPos3dvMESA driDispatchRemapTable[WindowPos3dvMESA_remap_index]
-#define _gloffset_WindowPos3fMESA driDispatchRemapTable[WindowPos3fMESA_remap_index]
-#define _gloffset_WindowPos3fvMESA driDispatchRemapTable[WindowPos3fvMESA_remap_index]
-#define _gloffset_WindowPos3iMESA driDispatchRemapTable[WindowPos3iMESA_remap_index]
-#define _gloffset_WindowPos3ivMESA driDispatchRemapTable[WindowPos3ivMESA_remap_index]
-#define _gloffset_WindowPos3sMESA driDispatchRemapTable[WindowPos3sMESA_remap_index]
-#define _gloffset_WindowPos3svMESA driDispatchRemapTable[WindowPos3svMESA_remap_index]
 #define _gloffset_WindowPos4dMESA driDispatchRemapTable[WindowPos4dMESA_remap_index]
 #define _gloffset_WindowPos4dvMESA driDispatchRemapTable[WindowPos4dvMESA_remap_index]
 #define _gloffset_WindowPos4fMESA driDispatchRemapTable[WindowPos4fMESA_remap_index]
@@ -1982,28 +2185,16 @@ extern int driDispatchRemapTable[driDispatchRemapTable_size];
 #define _gloffset_WindowPos4svMESA driDispatchRemapTable[WindowPos4svMESA_remap_index]
 #define _gloffset_MultiModeDrawArraysIBM driDispatchRemapTable[MultiModeDrawArraysIBM_remap_index]
 #define _gloffset_MultiModeDrawElementsIBM driDispatchRemapTable[MultiModeDrawElementsIBM_remap_index]
-#define _gloffset_DeleteFencesNV driDispatchRemapTable[DeleteFencesNV_remap_index]
-#define _gloffset_FinishFenceNV driDispatchRemapTable[FinishFenceNV_remap_index]
-#define _gloffset_GenFencesNV driDispatchRemapTable[GenFencesNV_remap_index]
-#define _gloffset_GetFenceivNV driDispatchRemapTable[GetFenceivNV_remap_index]
-#define _gloffset_IsFenceNV driDispatchRemapTable[IsFenceNV_remap_index]
-#define _gloffset_SetFenceNV driDispatchRemapTable[SetFenceNV_remap_index]
-#define _gloffset_TestFenceNV driDispatchRemapTable[TestFenceNV_remap_index]
 #define _gloffset_AreProgramsResidentNV driDispatchRemapTable[AreProgramsResidentNV_remap_index]
-#define _gloffset_BindProgramNV driDispatchRemapTable[BindProgramNV_remap_index]
-#define _gloffset_DeleteProgramsNV driDispatchRemapTable[DeleteProgramsNV_remap_index]
 #define _gloffset_ExecuteProgramNV driDispatchRemapTable[ExecuteProgramNV_remap_index]
-#define _gloffset_GenProgramsNV driDispatchRemapTable[GenProgramsNV_remap_index]
 #define _gloffset_GetProgramParameterdvNV driDispatchRemapTable[GetProgramParameterdvNV_remap_index]
 #define _gloffset_GetProgramParameterfvNV driDispatchRemapTable[GetProgramParameterfvNV_remap_index]
 #define _gloffset_GetProgramStringNV driDispatchRemapTable[GetProgramStringNV_remap_index]
 #define _gloffset_GetProgramivNV driDispatchRemapTable[GetProgramivNV_remap_index]
 #define _gloffset_GetTrackMatrixivNV driDispatchRemapTable[GetTrackMatrixivNV_remap_index]
-#define _gloffset_GetVertexAttribPointervNV driDispatchRemapTable[GetVertexAttribPointervNV_remap_index]
 #define _gloffset_GetVertexAttribdvNV driDispatchRemapTable[GetVertexAttribdvNV_remap_index]
 #define _gloffset_GetVertexAttribfvNV driDispatchRemapTable[GetVertexAttribfvNV_remap_index]
 #define _gloffset_GetVertexAttribivNV driDispatchRemapTable[GetVertexAttribivNV_remap_index]
-#define _gloffset_IsProgramNV driDispatchRemapTable[IsProgramNV_remap_index]
 #define _gloffset_LoadProgramNV driDispatchRemapTable[LoadProgramNV_remap_index]
 #define _gloffset_ProgramParameters4dvNV driDispatchRemapTable[ProgramParameters4dvNV_remap_index]
 #define _gloffset_ProgramParameters4fvNV driDispatchRemapTable[ProgramParameters4fvNV_remap_index]
@@ -2067,60 +2258,24 @@ extern int driDispatchRemapTable[driDispatchRemapTable_size];
 #define _gloffset_PassTexCoordATI driDispatchRemapTable[PassTexCoordATI_remap_index]
 #define _gloffset_SampleMapATI driDispatchRemapTable[SampleMapATI_remap_index]
 #define _gloffset_SetFragmentShaderConstantATI driDispatchRemapTable[SetFragmentShaderConstantATI_remap_index]
-#define _gloffset_PointParameteriNV driDispatchRemapTable[PointParameteriNV_remap_index]
-#define _gloffset_PointParameterivNV driDispatchRemapTable[PointParameterivNV_remap_index]
 #define _gloffset_ActiveStencilFaceEXT driDispatchRemapTable[ActiveStencilFaceEXT_remap_index]
 #define _gloffset_BindVertexArrayAPPLE driDispatchRemapTable[BindVertexArrayAPPLE_remap_index]
-#define _gloffset_DeleteVertexArraysAPPLE driDispatchRemapTable[DeleteVertexArraysAPPLE_remap_index]
 #define _gloffset_GenVertexArraysAPPLE driDispatchRemapTable[GenVertexArraysAPPLE_remap_index]
-#define _gloffset_IsVertexArrayAPPLE driDispatchRemapTable[IsVertexArrayAPPLE_remap_index]
 #define _gloffset_GetProgramNamedParameterdvNV driDispatchRemapTable[GetProgramNamedParameterdvNV_remap_index]
 #define _gloffset_GetProgramNamedParameterfvNV driDispatchRemapTable[GetProgramNamedParameterfvNV_remap_index]
 #define _gloffset_ProgramNamedParameter4dNV driDispatchRemapTable[ProgramNamedParameter4dNV_remap_index]
 #define _gloffset_ProgramNamedParameter4dvNV driDispatchRemapTable[ProgramNamedParameter4dvNV_remap_index]
 #define _gloffset_ProgramNamedParameter4fNV driDispatchRemapTable[ProgramNamedParameter4fNV_remap_index]
 #define _gloffset_ProgramNamedParameter4fvNV driDispatchRemapTable[ProgramNamedParameter4fvNV_remap_index]
-#define _gloffset_PrimitiveRestartIndexNV driDispatchRemapTable[PrimitiveRestartIndexNV_remap_index]
 #define _gloffset_PrimitiveRestartNV driDispatchRemapTable[PrimitiveRestartNV_remap_index]
+#define _gloffset_GetTexGenxvOES driDispatchRemapTable[GetTexGenxvOES_remap_index]
+#define _gloffset_TexGenxOES driDispatchRemapTable[TexGenxOES_remap_index]
+#define _gloffset_TexGenxvOES driDispatchRemapTable[TexGenxvOES_remap_index]
 #define _gloffset_DepthBoundsEXT driDispatchRemapTable[DepthBoundsEXT_remap_index]
-#define _gloffset_BlendEquationSeparateEXT driDispatchRemapTable[BlendEquationSeparateEXT_remap_index]
-#define _gloffset_BindFramebufferEXT driDispatchRemapTable[BindFramebufferEXT_remap_index]
-#define _gloffset_BindRenderbufferEXT driDispatchRemapTable[BindRenderbufferEXT_remap_index]
-#define _gloffset_CheckFramebufferStatusEXT driDispatchRemapTable[CheckFramebufferStatusEXT_remap_index]
-#define _gloffset_DeleteFramebuffersEXT driDispatchRemapTable[DeleteFramebuffersEXT_remap_index]
-#define _gloffset_DeleteRenderbuffersEXT driDispatchRemapTable[DeleteRenderbuffersEXT_remap_index]
-#define _gloffset_FramebufferRenderbufferEXT driDispatchRemapTable[FramebufferRenderbufferEXT_remap_index]
-#define _gloffset_FramebufferTexture1DEXT driDispatchRemapTable[FramebufferTexture1DEXT_remap_index]
-#define _gloffset_FramebufferTexture2DEXT driDispatchRemapTable[FramebufferTexture2DEXT_remap_index]
-#define _gloffset_FramebufferTexture3DEXT driDispatchRemapTable[FramebufferTexture3DEXT_remap_index]
-#define _gloffset_GenFramebuffersEXT driDispatchRemapTable[GenFramebuffersEXT_remap_index]
-#define _gloffset_GenRenderbuffersEXT driDispatchRemapTable[GenRenderbuffersEXT_remap_index]
-#define _gloffset_GenerateMipmapEXT driDispatchRemapTable[GenerateMipmapEXT_remap_index]
-#define _gloffset_GetFramebufferAttachmentParameterivEXT driDispatchRemapTable[GetFramebufferAttachmentParameterivEXT_remap_index]
-#define _gloffset_GetRenderbufferParameterivEXT driDispatchRemapTable[GetRenderbufferParameterivEXT_remap_index]
-#define _gloffset_IsFramebufferEXT driDispatchRemapTable[IsFramebufferEXT_remap_index]
-#define _gloffset_IsRenderbufferEXT driDispatchRemapTable[IsRenderbufferEXT_remap_index]
-#define _gloffset_RenderbufferStorageEXT driDispatchRemapTable[RenderbufferStorageEXT_remap_index]
-#define _gloffset_BlitFramebufferEXT driDispatchRemapTable[BlitFramebufferEXT_remap_index]
 #define _gloffset_BufferParameteriAPPLE driDispatchRemapTable[BufferParameteriAPPLE_remap_index]
 #define _gloffset_FlushMappedBufferRangeAPPLE driDispatchRemapTable[FlushMappedBufferRangeAPPLE_remap_index]
-#define _gloffset_BindFragDataLocationEXT driDispatchRemapTable[BindFragDataLocationEXT_remap_index]
-#define _gloffset_GetFragDataLocationEXT driDispatchRemapTable[GetFragDataLocationEXT_remap_index]
-#define _gloffset_GetUniformuivEXT driDispatchRemapTable[GetUniformuivEXT_remap_index]
-#define _gloffset_GetVertexAttribIivEXT driDispatchRemapTable[GetVertexAttribIivEXT_remap_index]
-#define _gloffset_GetVertexAttribIuivEXT driDispatchRemapTable[GetVertexAttribIuivEXT_remap_index]
-#define _gloffset_Uniform1uiEXT driDispatchRemapTable[Uniform1uiEXT_remap_index]
-#define _gloffset_Uniform1uivEXT driDispatchRemapTable[Uniform1uivEXT_remap_index]
-#define _gloffset_Uniform2uiEXT driDispatchRemapTable[Uniform2uiEXT_remap_index]
-#define _gloffset_Uniform2uivEXT driDispatchRemapTable[Uniform2uivEXT_remap_index]
-#define _gloffset_Uniform3uiEXT driDispatchRemapTable[Uniform3uiEXT_remap_index]
-#define _gloffset_Uniform3uivEXT driDispatchRemapTable[Uniform3uivEXT_remap_index]
-#define _gloffset_Uniform4uiEXT driDispatchRemapTable[Uniform4uiEXT_remap_index]
-#define _gloffset_Uniform4uivEXT driDispatchRemapTable[Uniform4uivEXT_remap_index]
 #define _gloffset_VertexAttribI1iEXT driDispatchRemapTable[VertexAttribI1iEXT_remap_index]
-#define _gloffset_VertexAttribI1ivEXT driDispatchRemapTable[VertexAttribI1ivEXT_remap_index]
 #define _gloffset_VertexAttribI1uiEXT driDispatchRemapTable[VertexAttribI1uiEXT_remap_index]
-#define _gloffset_VertexAttribI1uivEXT driDispatchRemapTable[VertexAttribI1uivEXT_remap_index]
 #define _gloffset_VertexAttribI2iEXT driDispatchRemapTable[VertexAttribI2iEXT_remap_index]
 #define _gloffset_VertexAttribI2ivEXT driDispatchRemapTable[VertexAttribI2ivEXT_remap_index]
 #define _gloffset_VertexAttribI2uiEXT driDispatchRemapTable[VertexAttribI2uiEXT_remap_index]
@@ -2129,40 +2284,13 @@ extern int driDispatchRemapTable[driDispatchRemapTable_size];
 #define _gloffset_VertexAttribI3ivEXT driDispatchRemapTable[VertexAttribI3ivEXT_remap_index]
 #define _gloffset_VertexAttribI3uiEXT driDispatchRemapTable[VertexAttribI3uiEXT_remap_index]
 #define _gloffset_VertexAttribI3uivEXT driDispatchRemapTable[VertexAttribI3uivEXT_remap_index]
-#define _gloffset_VertexAttribI4bvEXT driDispatchRemapTable[VertexAttribI4bvEXT_remap_index]
 #define _gloffset_VertexAttribI4iEXT driDispatchRemapTable[VertexAttribI4iEXT_remap_index]
 #define _gloffset_VertexAttribI4ivEXT driDispatchRemapTable[VertexAttribI4ivEXT_remap_index]
-#define _gloffset_VertexAttribI4svEXT driDispatchRemapTable[VertexAttribI4svEXT_remap_index]
-#define _gloffset_VertexAttribI4ubvEXT driDispatchRemapTable[VertexAttribI4ubvEXT_remap_index]
 #define _gloffset_VertexAttribI4uiEXT driDispatchRemapTable[VertexAttribI4uiEXT_remap_index]
 #define _gloffset_VertexAttribI4uivEXT driDispatchRemapTable[VertexAttribI4uivEXT_remap_index]
-#define _gloffset_VertexAttribI4usvEXT driDispatchRemapTable[VertexAttribI4usvEXT_remap_index]
-#define _gloffset_VertexAttribIPointerEXT driDispatchRemapTable[VertexAttribIPointerEXT_remap_index]
-#define _gloffset_FramebufferTextureLayerEXT driDispatchRemapTable[FramebufferTextureLayerEXT_remap_index]
-#define _gloffset_ColorMaskIndexedEXT driDispatchRemapTable[ColorMaskIndexedEXT_remap_index]
-#define _gloffset_DisableIndexedEXT driDispatchRemapTable[DisableIndexedEXT_remap_index]
-#define _gloffset_EnableIndexedEXT driDispatchRemapTable[EnableIndexedEXT_remap_index]
-#define _gloffset_GetBooleanIndexedvEXT driDispatchRemapTable[GetBooleanIndexedvEXT_remap_index]
-#define _gloffset_GetIntegerIndexedvEXT driDispatchRemapTable[GetIntegerIndexedvEXT_remap_index]
-#define _gloffset_IsEnabledIndexedEXT driDispatchRemapTable[IsEnabledIndexedEXT_remap_index]
 #define _gloffset_ClearColorIiEXT driDispatchRemapTable[ClearColorIiEXT_remap_index]
 #define _gloffset_ClearColorIuiEXT driDispatchRemapTable[ClearColorIuiEXT_remap_index]
-#define _gloffset_GetTexParameterIivEXT driDispatchRemapTable[GetTexParameterIivEXT_remap_index]
-#define _gloffset_GetTexParameterIuivEXT driDispatchRemapTable[GetTexParameterIuivEXT_remap_index]
-#define _gloffset_TexParameterIivEXT driDispatchRemapTable[TexParameterIivEXT_remap_index]
-#define _gloffset_TexParameterIuivEXT driDispatchRemapTable[TexParameterIuivEXT_remap_index]
-#define _gloffset_BeginConditionalRenderNV driDispatchRemapTable[BeginConditionalRenderNV_remap_index]
-#define _gloffset_EndConditionalRenderNV driDispatchRemapTable[EndConditionalRenderNV_remap_index]
-#define _gloffset_BeginTransformFeedbackEXT driDispatchRemapTable[BeginTransformFeedbackEXT_remap_index]
-#define _gloffset_BindBufferBaseEXT driDispatchRemapTable[BindBufferBaseEXT_remap_index]
 #define _gloffset_BindBufferOffsetEXT driDispatchRemapTable[BindBufferOffsetEXT_remap_index]
-#define _gloffset_BindBufferRangeEXT driDispatchRemapTable[BindBufferRangeEXT_remap_index]
-#define _gloffset_EndTransformFeedbackEXT driDispatchRemapTable[EndTransformFeedbackEXT_remap_index]
-#define _gloffset_GetTransformFeedbackVaryingEXT driDispatchRemapTable[GetTransformFeedbackVaryingEXT_remap_index]
-#define _gloffset_TransformFeedbackVaryingsEXT driDispatchRemapTable[TransformFeedbackVaryingsEXT_remap_index]
-#define _gloffset_ProvokingVertexEXT driDispatchRemapTable[ProvokingVertexEXT_remap_index]
-#define _gloffset_GetTexParameterPointervAPPLE driDispatchRemapTable[GetTexParameterPointervAPPLE_remap_index]
-#define _gloffset_TextureRangeAPPLE driDispatchRemapTable[TextureRangeAPPLE_remap_index]
 #define _gloffset_GetObjectParameterivAPPLE driDispatchRemapTable[GetObjectParameterivAPPLE_remap_index]
 #define _gloffset_ObjectPurgeableAPPLE driDispatchRemapTable[ObjectPurgeableAPPLE_remap_index]
 #define _gloffset_ObjectUnpurgeableAPPLE driDispatchRemapTable[ObjectUnpurgeableAPPLE_remap_index]
@@ -2173,17644 +2301,11350 @@ extern int driDispatchRemapTable[driDispatchRemapTable_size];
 #define _gloffset_StencilFuncSeparateATI driDispatchRemapTable[StencilFuncSeparateATI_remap_index]
 #define _gloffset_ProgramEnvParameters4fvEXT driDispatchRemapTable[ProgramEnvParameters4fvEXT_remap_index]
 #define _gloffset_ProgramLocalParameters4fvEXT driDispatchRemapTable[ProgramLocalParameters4fvEXT_remap_index]
-#define _gloffset_GetQueryObjecti64vEXT driDispatchRemapTable[GetQueryObjecti64vEXT_remap_index]
-#define _gloffset_GetQueryObjectui64vEXT driDispatchRemapTable[GetQueryObjectui64vEXT_remap_index]
 #define _gloffset_EGLImageTargetRenderbufferStorageOES driDispatchRemapTable[EGLImageTargetRenderbufferStorageOES_remap_index]
 #define _gloffset_EGLImageTargetTexture2DOES driDispatchRemapTable[EGLImageTargetTexture2DOES_remap_index]
-
-#endif                          /* !FEATURE_remap_table */
-
-typedef void (GLAPIENTRYP _glptr_NewList) (GLuint, GLenum);
-
+#define _gloffset_AlphaFuncx driDispatchRemapTable[AlphaFuncx_remap_index]
+#define _gloffset_ClearColorx driDispatchRemapTable[ClearColorx_remap_index]
+#define _gloffset_ClearDepthx driDispatchRemapTable[ClearDepthx_remap_index]
+#define _gloffset_Color4x driDispatchRemapTable[Color4x_remap_index]
+#define _gloffset_DepthRangex driDispatchRemapTable[DepthRangex_remap_index]
+#define _gloffset_Fogx driDispatchRemapTable[Fogx_remap_index]
+#define _gloffset_Fogxv driDispatchRemapTable[Fogxv_remap_index]
+#define _gloffset_Frustumf driDispatchRemapTable[Frustumf_remap_index]
+#define _gloffset_Frustumx driDispatchRemapTable[Frustumx_remap_index]
+#define _gloffset_LightModelx driDispatchRemapTable[LightModelx_remap_index]
+#define _gloffset_LightModelxv driDispatchRemapTable[LightModelxv_remap_index]
+#define _gloffset_Lightx driDispatchRemapTable[Lightx_remap_index]
+#define _gloffset_Lightxv driDispatchRemapTable[Lightxv_remap_index]
+#define _gloffset_LineWidthx driDispatchRemapTable[LineWidthx_remap_index]
+#define _gloffset_LoadMatrixx driDispatchRemapTable[LoadMatrixx_remap_index]
+#define _gloffset_Materialx driDispatchRemapTable[Materialx_remap_index]
+#define _gloffset_Materialxv driDispatchRemapTable[Materialxv_remap_index]
+#define _gloffset_MultMatrixx driDispatchRemapTable[MultMatrixx_remap_index]
+#define _gloffset_MultiTexCoord4x driDispatchRemapTable[MultiTexCoord4x_remap_index]
+#define _gloffset_Normal3x driDispatchRemapTable[Normal3x_remap_index]
+#define _gloffset_Orthof driDispatchRemapTable[Orthof_remap_index]
+#define _gloffset_Orthox driDispatchRemapTable[Orthox_remap_index]
+#define _gloffset_PointSizex driDispatchRemapTable[PointSizex_remap_index]
+#define _gloffset_PolygonOffsetx driDispatchRemapTable[PolygonOffsetx_remap_index]
+#define _gloffset_Rotatex driDispatchRemapTable[Rotatex_remap_index]
+#define _gloffset_SampleCoveragex driDispatchRemapTable[SampleCoveragex_remap_index]
+#define _gloffset_Scalex driDispatchRemapTable[Scalex_remap_index]
+#define _gloffset_TexEnvx driDispatchRemapTable[TexEnvx_remap_index]
+#define _gloffset_TexEnvxv driDispatchRemapTable[TexEnvxv_remap_index]
+#define _gloffset_TexParameterx driDispatchRemapTable[TexParameterx_remap_index]
+#define _gloffset_Translatex driDispatchRemapTable[Translatex_remap_index]
+#define _gloffset_ClipPlanef driDispatchRemapTable[ClipPlanef_remap_index]
+#define _gloffset_ClipPlanex driDispatchRemapTable[ClipPlanex_remap_index]
+#define _gloffset_GetClipPlanef driDispatchRemapTable[GetClipPlanef_remap_index]
+#define _gloffset_GetClipPlanex driDispatchRemapTable[GetClipPlanex_remap_index]
+#define _gloffset_GetFixedv driDispatchRemapTable[GetFixedv_remap_index]
+#define _gloffset_GetLightxv driDispatchRemapTable[GetLightxv_remap_index]
+#define _gloffset_GetMaterialxv driDispatchRemapTable[GetMaterialxv_remap_index]
+#define _gloffset_GetTexEnvxv driDispatchRemapTable[GetTexEnvxv_remap_index]
+#define _gloffset_GetTexParameterxv driDispatchRemapTable[GetTexParameterxv_remap_index]
+#define _gloffset_PointParameterx driDispatchRemapTable[PointParameterx_remap_index]
+#define _gloffset_PointParameterxv driDispatchRemapTable[PointParameterxv_remap_index]
+#define _gloffset_TexParameterxv driDispatchRemapTable[TexParameterxv_remap_index]
+
+#endif /* !FEATURE_remap_table */
+
+typedef void (GLAPIENTRYP _glptr_NewList)(GLuint, GLenum);
 #define CALL_NewList(disp, parameters) \
     (* GET_NewList(disp)) parameters
-static inline _glptr_NewList
-GET_NewList(struct _glapi_table *disp)
-{
-    return (_glptr_NewList) (GET_by_offset(disp, _gloffset_NewList));
+static INLINE _glptr_NewList GET_NewList(struct _glapi_table *disp) {
+   return (_glptr_NewList) (GET_by_offset(disp, _gloffset_NewList));
 }
 
-static inline void
-SET_NewList(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLuint, GLenum))
-{
-    SET_by_offset(disp, _gloffset_NewList, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_EndList)(void);
 #define CALL_EndList(disp, parameters) \
     (* GET_EndList(disp)) parameters
-static inline _glptr_EndList
-GET_EndList(struct _glapi_table *disp)
-{
-    return (_glptr_EndList) (GET_by_offset(disp, _gloffset_EndList));
+static INLINE _glptr_EndList GET_EndList(struct _glapi_table *disp) {
+   return (_glptr_EndList) (GET_by_offset(disp, _gloffset_EndList));
 }
 
-static inline void
-SET_EndList(struct _glapi_table *disp, void (GLAPIENTRYP fn) (void))
-{
-    SET_by_offset(disp, _gloffset_EndList, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_CallList)(GLuint);
 #define CALL_CallList(disp, parameters) \
     (* GET_CallList(disp)) parameters
-static inline _glptr_CallList
-GET_CallList(struct _glapi_table *disp)
-{
-    return (_glptr_CallList) (GET_by_offset(disp, _gloffset_CallList));
+static INLINE _glptr_CallList GET_CallList(struct _glapi_table *disp) {
+   return (_glptr_CallList) (GET_by_offset(disp, _gloffset_CallList));
 }
 
-static inline void
-SET_CallList(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_CallList, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_CallLists)(GLsizei, GLenum, const GLvoid *);
 #define CALL_CallLists(disp, parameters) \
     (* GET_CallLists(disp)) parameters
-static inline _glptr_CallLists
-GET_CallLists(struct _glapi_table *disp)
-{
-    return (_glptr_CallLists) (GET_by_offset(disp, _gloffset_CallLists));
+static INLINE _glptr_CallLists GET_CallLists(struct _glapi_table *disp) {
+   return (_glptr_CallLists) (GET_by_offset(disp, _gloffset_CallLists));
 }
 
-static inline void
-SET_CallLists(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (GLsizei, GLenum, const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_CallLists, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_DeleteLists)(GLuint, GLsizei);
 #define CALL_DeleteLists(disp, parameters) \
     (* GET_DeleteLists(disp)) parameters
-static inline _glptr_DeleteLists
-GET_DeleteLists(struct _glapi_table *disp)
-{
-    return (_glptr_DeleteLists) (GET_by_offset(disp, _gloffset_DeleteLists));
+static INLINE _glptr_DeleteLists GET_DeleteLists(struct _glapi_table *disp) {
+   return (_glptr_DeleteLists) (GET_by_offset(disp, _gloffset_DeleteLists));
 }
 
-static inline void
-SET_DeleteLists(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLuint, GLsizei))
-{
-    SET_by_offset(disp, _gloffset_DeleteLists, fn);
+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);
-
+typedef GLuint (GLAPIENTRYP _glptr_GenLists)(GLsizei);
 #define CALL_GenLists(disp, parameters) \
     (* GET_GenLists(disp)) parameters
-static inline _glptr_GenLists
-GET_GenLists(struct _glapi_table *disp)
-{
-    return (_glptr_GenLists) (GET_by_offset(disp, _gloffset_GenLists));
+static INLINE _glptr_GenLists GET_GenLists(struct _glapi_table *disp) {
+   return (_glptr_GenLists) (GET_by_offset(disp, _gloffset_GenLists));
 }
 
-static inline void
-SET_GenLists(struct _glapi_table *disp, GLuint(GLAPIENTRYP fn) (GLsizei))
-{
-    SET_by_offset(disp, _gloffset_GenLists, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_ListBase)(GLuint);
 #define CALL_ListBase(disp, parameters) \
     (* GET_ListBase(disp)) parameters
-static inline _glptr_ListBase
-GET_ListBase(struct _glapi_table *disp)
-{
-    return (_glptr_ListBase) (GET_by_offset(disp, _gloffset_ListBase));
+static INLINE _glptr_ListBase GET_ListBase(struct _glapi_table *disp) {
+   return (_glptr_ListBase) (GET_by_offset(disp, _gloffset_ListBase));
 }
 
-static inline void
-SET_ListBase(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_ListBase, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Begin)(GLenum);
 #define CALL_Begin(disp, parameters) \
     (* GET_Begin(disp)) parameters
-static inline _glptr_Begin
-GET_Begin(struct _glapi_table *disp)
-{
-    return (_glptr_Begin) (GET_by_offset(disp, _gloffset_Begin));
+static INLINE _glptr_Begin GET_Begin(struct _glapi_table *disp) {
+   return (_glptr_Begin) (GET_by_offset(disp, _gloffset_Begin));
 }
 
-static inline void
-SET_Begin(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_Begin, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_Bitmap)(GLsizei, GLsizei, GLfloat, GLfloat, GLfloat, GLfloat, const GLubyte *);
 #define CALL_Bitmap(disp, parameters) \
     (* GET_Bitmap(disp)) parameters
-static inline _glptr_Bitmap
-GET_Bitmap(struct _glapi_table *disp)
-{
-    return (_glptr_Bitmap) (GET_by_offset(disp, _gloffset_Bitmap));
+static INLINE _glptr_Bitmap GET_Bitmap(struct _glapi_table *disp) {
+   return (_glptr_Bitmap) (GET_by_offset(disp, _gloffset_Bitmap));
 }
 
-static inline void
-SET_Bitmap(struct _glapi_table *disp,
-           void (GLAPIENTRYP fn) (GLsizei, GLsizei, GLfloat, GLfloat, GLfloat,
-                                  GLfloat, const GLubyte *))
-{
-    SET_by_offset(disp, _gloffset_Bitmap, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Color3b)(GLbyte, GLbyte, GLbyte);
 #define CALL_Color3b(disp, parameters) \
     (* GET_Color3b(disp)) parameters
-static inline _glptr_Color3b
-GET_Color3b(struct _glapi_table *disp)
-{
-    return (_glptr_Color3b) (GET_by_offset(disp, _gloffset_Color3b));
+static INLINE _glptr_Color3b GET_Color3b(struct _glapi_table *disp) {
+   return (_glptr_Color3b) (GET_by_offset(disp, _gloffset_Color3b));
 }
 
-static inline void
-SET_Color3b(struct _glapi_table *disp,
-            void (GLAPIENTRYP fn) (GLbyte, GLbyte, GLbyte))
-{
-    SET_by_offset(disp, _gloffset_Color3b, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_Color3bv)(const GLbyte *);
 #define CALL_Color3bv(disp, parameters) \
     (* GET_Color3bv(disp)) parameters
-static inline _glptr_Color3bv
-GET_Color3bv(struct _glapi_table *disp)
-{
-    return (_glptr_Color3bv) (GET_by_offset(disp, _gloffset_Color3bv));
+static INLINE _glptr_Color3bv GET_Color3bv(struct _glapi_table *disp) {
+   return (_glptr_Color3bv) (GET_by_offset(disp, _gloffset_Color3bv));
 }
 
-static inline void
-SET_Color3bv(struct _glapi_table *disp, void (GLAPIENTRYP fn) (const GLbyte *))
-{
-    SET_by_offset(disp, _gloffset_Color3bv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Color3d)(GLdouble, GLdouble, GLdouble);
 #define CALL_Color3d(disp, parameters) \
     (* GET_Color3d(disp)) parameters
-static inline _glptr_Color3d
-GET_Color3d(struct _glapi_table *disp)
-{
-    return (_glptr_Color3d) (GET_by_offset(disp, _gloffset_Color3d));
+static INLINE _glptr_Color3d GET_Color3d(struct _glapi_table *disp) {
+   return (_glptr_Color3d) (GET_by_offset(disp, _gloffset_Color3d));
 }
 
-static inline void
-SET_Color3d(struct _glapi_table *disp,
-            void (GLAPIENTRYP fn) (GLdouble, GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_Color3d, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_Color3dv)(const GLdouble *);
 #define CALL_Color3dv(disp, parameters) \
     (* GET_Color3dv(disp)) parameters
-static inline _glptr_Color3dv
-GET_Color3dv(struct _glapi_table *disp)
-{
-    return (_glptr_Color3dv) (GET_by_offset(disp, _gloffset_Color3dv));
+static INLINE _glptr_Color3dv GET_Color3dv(struct _glapi_table *disp) {
+   return (_glptr_Color3dv) (GET_by_offset(disp, _gloffset_Color3dv));
 }
 
-static inline void
-SET_Color3dv(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_Color3dv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Color3f)(GLfloat, GLfloat, GLfloat);
 #define CALL_Color3f(disp, parameters) \
     (* GET_Color3f(disp)) parameters
-static inline _glptr_Color3f
-GET_Color3f(struct _glapi_table *disp)
-{
-    return (_glptr_Color3f) (GET_by_offset(disp, _gloffset_Color3f));
+static INLINE _glptr_Color3f GET_Color3f(struct _glapi_table *disp) {
+   return (_glptr_Color3f) (GET_by_offset(disp, _gloffset_Color3f));
 }
 
-static inline void
-SET_Color3f(struct _glapi_table *disp,
-            void (GLAPIENTRYP fn) (GLfloat, GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_Color3f, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_Color3fv)(const GLfloat *);
 #define CALL_Color3fv(disp, parameters) \
     (* GET_Color3fv(disp)) parameters
-static inline _glptr_Color3fv
-GET_Color3fv(struct _glapi_table *disp)
-{
-    return (_glptr_Color3fv) (GET_by_offset(disp, _gloffset_Color3fv));
+static INLINE _glptr_Color3fv GET_Color3fv(struct _glapi_table *disp) {
+   return (_glptr_Color3fv) (GET_by_offset(disp, _gloffset_Color3fv));
 }
 
-static inline void
-SET_Color3fv(struct _glapi_table *disp, void (GLAPIENTRYP fn) (const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_Color3fv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Color3i)(GLint, GLint, GLint);
 #define CALL_Color3i(disp, parameters) \
     (* GET_Color3i(disp)) parameters
-static inline _glptr_Color3i
-GET_Color3i(struct _glapi_table *disp)
-{
-    return (_glptr_Color3i) (GET_by_offset(disp, _gloffset_Color3i));
+static INLINE _glptr_Color3i GET_Color3i(struct _glapi_table *disp) {
+   return (_glptr_Color3i) (GET_by_offset(disp, _gloffset_Color3i));
 }
 
-static inline void
-SET_Color3i(struct _glapi_table *disp,
-            void (GLAPIENTRYP fn) (GLint, GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_Color3i, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_Color3iv)(const GLint *);
 #define CALL_Color3iv(disp, parameters) \
     (* GET_Color3iv(disp)) parameters
-static inline _glptr_Color3iv
-GET_Color3iv(struct _glapi_table *disp)
-{
-    return (_glptr_Color3iv) (GET_by_offset(disp, _gloffset_Color3iv));
+static INLINE _glptr_Color3iv GET_Color3iv(struct _glapi_table *disp) {
+   return (_glptr_Color3iv) (GET_by_offset(disp, _gloffset_Color3iv));
 }
 
-static inline void
-SET_Color3iv(struct _glapi_table *disp, void (GLAPIENTRYP fn) (const GLint *))
-{
-    SET_by_offset(disp, _gloffset_Color3iv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Color3s)(GLshort, GLshort, GLshort);
 #define CALL_Color3s(disp, parameters) \
     (* GET_Color3s(disp)) parameters
-static inline _glptr_Color3s
-GET_Color3s(struct _glapi_table *disp)
-{
-    return (_glptr_Color3s) (GET_by_offset(disp, _gloffset_Color3s));
+static INLINE _glptr_Color3s GET_Color3s(struct _glapi_table *disp) {
+   return (_glptr_Color3s) (GET_by_offset(disp, _gloffset_Color3s));
 }
 
-static inline void
-SET_Color3s(struct _glapi_table *disp,
-            void (GLAPIENTRYP fn) (GLshort, GLshort, GLshort))
-{
-    SET_by_offset(disp, _gloffset_Color3s, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_Color3sv)(const GLshort *);
 #define CALL_Color3sv(disp, parameters) \
     (* GET_Color3sv(disp)) parameters
-static inline _glptr_Color3sv
-GET_Color3sv(struct _glapi_table *disp)
-{
-    return (_glptr_Color3sv) (GET_by_offset(disp, _gloffset_Color3sv));
+static INLINE _glptr_Color3sv GET_Color3sv(struct _glapi_table *disp) {
+   return (_glptr_Color3sv) (GET_by_offset(disp, _gloffset_Color3sv));
 }
 
-static inline void
-SET_Color3sv(struct _glapi_table *disp, void (GLAPIENTRYP fn) (const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_Color3sv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Color3ub)(GLubyte, GLubyte, GLubyte);
 #define CALL_Color3ub(disp, parameters) \
     (* GET_Color3ub(disp)) parameters
-static inline _glptr_Color3ub
-GET_Color3ub(struct _glapi_table *disp)
-{
-    return (_glptr_Color3ub) (GET_by_offset(disp, _gloffset_Color3ub));
+static INLINE _glptr_Color3ub GET_Color3ub(struct _glapi_table *disp) {
+   return (_glptr_Color3ub) (GET_by_offset(disp, _gloffset_Color3ub));
 }
 
-static inline void
-SET_Color3ub(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLubyte, GLubyte, GLubyte))
-{
-    SET_by_offset(disp, _gloffset_Color3ub, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_Color3ubv)(const GLubyte *);
 #define CALL_Color3ubv(disp, parameters) \
     (* GET_Color3ubv(disp)) parameters
-static inline _glptr_Color3ubv
-GET_Color3ubv(struct _glapi_table *disp)
-{
-    return (_glptr_Color3ubv) (GET_by_offset(disp, _gloffset_Color3ubv));
+static INLINE _glptr_Color3ubv GET_Color3ubv(struct _glapi_table *disp) {
+   return (_glptr_Color3ubv) (GET_by_offset(disp, _gloffset_Color3ubv));
 }
 
-static inline void
-SET_Color3ubv(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (const GLubyte *))
-{
-    SET_by_offset(disp, _gloffset_Color3ubv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Color3ui)(GLuint, GLuint, GLuint);
 #define CALL_Color3ui(disp, parameters) \
     (* GET_Color3ui(disp)) parameters
-static inline _glptr_Color3ui
-GET_Color3ui(struct _glapi_table *disp)
-{
-    return (_glptr_Color3ui) (GET_by_offset(disp, _gloffset_Color3ui));
+static INLINE _glptr_Color3ui GET_Color3ui(struct _glapi_table *disp) {
+   return (_glptr_Color3ui) (GET_by_offset(disp, _gloffset_Color3ui));
 }
 
-static inline void
-SET_Color3ui(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLuint, GLuint, GLuint))
-{
-    SET_by_offset(disp, _gloffset_Color3ui, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_Color3uiv)(const GLuint *);
 #define CALL_Color3uiv(disp, parameters) \
     (* GET_Color3uiv(disp)) parameters
-static inline _glptr_Color3uiv
-GET_Color3uiv(struct _glapi_table *disp)
-{
-    return (_glptr_Color3uiv) (GET_by_offset(disp, _gloffset_Color3uiv));
+static INLINE _glptr_Color3uiv GET_Color3uiv(struct _glapi_table *disp) {
+   return (_glptr_Color3uiv) (GET_by_offset(disp, _gloffset_Color3uiv));
 }
 
-static inline void
-SET_Color3uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn) (const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_Color3uiv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Color3us)(GLushort, GLushort, GLushort);
 #define CALL_Color3us(disp, parameters) \
     (* GET_Color3us(disp)) parameters
-static inline _glptr_Color3us
-GET_Color3us(struct _glapi_table *disp)
-{
-    return (_glptr_Color3us) (GET_by_offset(disp, _gloffset_Color3us));
+static INLINE _glptr_Color3us GET_Color3us(struct _glapi_table *disp) {
+   return (_glptr_Color3us) (GET_by_offset(disp, _gloffset_Color3us));
 }
 
-static inline void
-SET_Color3us(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLushort, GLushort, GLushort))
-{
-    SET_by_offset(disp, _gloffset_Color3us, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_Color3usv)(const GLushort *);
 #define CALL_Color3usv(disp, parameters) \
     (* GET_Color3usv(disp)) parameters
-static inline _glptr_Color3usv
-GET_Color3usv(struct _glapi_table *disp)
-{
-    return (_glptr_Color3usv) (GET_by_offset(disp, _gloffset_Color3usv));
+static INLINE _glptr_Color3usv GET_Color3usv(struct _glapi_table *disp) {
+   return (_glptr_Color3usv) (GET_by_offset(disp, _gloffset_Color3usv));
 }
 
-static inline void
-SET_Color3usv(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (const GLushort *))
-{
-    SET_by_offset(disp, _gloffset_Color3usv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Color4b)(GLbyte, GLbyte, GLbyte, GLbyte);
 #define CALL_Color4b(disp, parameters) \
     (* GET_Color4b(disp)) parameters
-static inline _glptr_Color4b
-GET_Color4b(struct _glapi_table *disp)
-{
-    return (_glptr_Color4b) (GET_by_offset(disp, _gloffset_Color4b));
+static INLINE _glptr_Color4b GET_Color4b(struct _glapi_table *disp) {
+   return (_glptr_Color4b) (GET_by_offset(disp, _gloffset_Color4b));
 }
 
-static inline void
-SET_Color4b(struct _glapi_table *disp,
-            void (GLAPIENTRYP fn) (GLbyte, GLbyte, GLbyte, GLbyte))
-{
-    SET_by_offset(disp, _gloffset_Color4b, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_Color4bv)(const GLbyte *);
 #define CALL_Color4bv(disp, parameters) \
     (* GET_Color4bv(disp)) parameters
-static inline _glptr_Color4bv
-GET_Color4bv(struct _glapi_table *disp)
-{
-    return (_glptr_Color4bv) (GET_by_offset(disp, _gloffset_Color4bv));
+static INLINE _glptr_Color4bv GET_Color4bv(struct _glapi_table *disp) {
+   return (_glptr_Color4bv) (GET_by_offset(disp, _gloffset_Color4bv));
 }
 
-static inline void
-SET_Color4bv(struct _glapi_table *disp, void (GLAPIENTRYP fn) (const GLbyte *))
-{
-    SET_by_offset(disp, _gloffset_Color4bv, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_Color4d)(GLdouble, GLdouble, GLdouble, GLdouble);
 #define CALL_Color4d(disp, parameters) \
     (* GET_Color4d(disp)) parameters
-static inline _glptr_Color4d
-GET_Color4d(struct _glapi_table *disp)
-{
-    return (_glptr_Color4d) (GET_by_offset(disp, _gloffset_Color4d));
+static INLINE _glptr_Color4d GET_Color4d(struct _glapi_table *disp) {
+   return (_glptr_Color4d) (GET_by_offset(disp, _gloffset_Color4d));
 }
 
-static inline void
-SET_Color4d(struct _glapi_table *disp,
-            void (GLAPIENTRYP fn) (GLdouble, GLdouble, GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_Color4d, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_Color4dv)(const GLdouble *);
 #define CALL_Color4dv(disp, parameters) \
     (* GET_Color4dv(disp)) parameters
-static inline _glptr_Color4dv
-GET_Color4dv(struct _glapi_table *disp)
-{
-    return (_glptr_Color4dv) (GET_by_offset(disp, _gloffset_Color4dv));
+static INLINE _glptr_Color4dv GET_Color4dv(struct _glapi_table *disp) {
+   return (_glptr_Color4dv) (GET_by_offset(disp, _gloffset_Color4dv));
 }
 
-static inline void
-SET_Color4dv(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_Color4dv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Color4f)(GLfloat, GLfloat, GLfloat, GLfloat);
 #define CALL_Color4f(disp, parameters) \
     (* GET_Color4f(disp)) parameters
-static inline _glptr_Color4f
-GET_Color4f(struct _glapi_table *disp)
-{
-    return (_glptr_Color4f) (GET_by_offset(disp, _gloffset_Color4f));
+static INLINE _glptr_Color4f GET_Color4f(struct _glapi_table *disp) {
+   return (_glptr_Color4f) (GET_by_offset(disp, _gloffset_Color4f));
 }
 
-static inline void
-SET_Color4f(struct _glapi_table *disp,
-            void (GLAPIENTRYP fn) (GLfloat, GLfloat, GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_Color4f, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_Color4fv)(const GLfloat *);
 #define CALL_Color4fv(disp, parameters) \
     (* GET_Color4fv(disp)) parameters
-static inline _glptr_Color4fv
-GET_Color4fv(struct _glapi_table *disp)
-{
-    return (_glptr_Color4fv) (GET_by_offset(disp, _gloffset_Color4fv));
+static INLINE _glptr_Color4fv GET_Color4fv(struct _glapi_table *disp) {
+   return (_glptr_Color4fv) (GET_by_offset(disp, _gloffset_Color4fv));
 }
 
-static inline void
-SET_Color4fv(struct _glapi_table *disp, void (GLAPIENTRYP fn) (const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_Color4fv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Color4i)(GLint, GLint, GLint, GLint);
 #define CALL_Color4i(disp, parameters) \
     (* GET_Color4i(disp)) parameters
-static inline _glptr_Color4i
-GET_Color4i(struct _glapi_table *disp)
-{
-    return (_glptr_Color4i) (GET_by_offset(disp, _gloffset_Color4i));
+static INLINE _glptr_Color4i GET_Color4i(struct _glapi_table *disp) {
+   return (_glptr_Color4i) (GET_by_offset(disp, _gloffset_Color4i));
 }
 
-static inline void
-SET_Color4i(struct _glapi_table *disp,
-            void (GLAPIENTRYP fn) (GLint, GLint, GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_Color4i, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_Color4iv)(const GLint *);
 #define CALL_Color4iv(disp, parameters) \
     (* GET_Color4iv(disp)) parameters
-static inline _glptr_Color4iv
-GET_Color4iv(struct _glapi_table *disp)
-{
-    return (_glptr_Color4iv) (GET_by_offset(disp, _gloffset_Color4iv));
+static INLINE _glptr_Color4iv GET_Color4iv(struct _glapi_table *disp) {
+   return (_glptr_Color4iv) (GET_by_offset(disp, _gloffset_Color4iv));
 }
 
-static inline void
-SET_Color4iv(struct _glapi_table *disp, void (GLAPIENTRYP fn) (const GLint *))
-{
-    SET_by_offset(disp, _gloffset_Color4iv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Color4s)(GLshort, GLshort, GLshort, GLshort);
 #define CALL_Color4s(disp, parameters) \
     (* GET_Color4s(disp)) parameters
-static inline _glptr_Color4s
-GET_Color4s(struct _glapi_table *disp)
-{
-    return (_glptr_Color4s) (GET_by_offset(disp, _gloffset_Color4s));
+static INLINE _glptr_Color4s GET_Color4s(struct _glapi_table *disp) {
+   return (_glptr_Color4s) (GET_by_offset(disp, _gloffset_Color4s));
 }
 
-static inline void
-SET_Color4s(struct _glapi_table *disp,
-            void (GLAPIENTRYP fn) (GLshort, GLshort, GLshort, GLshort))
-{
-    SET_by_offset(disp, _gloffset_Color4s, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_Color4sv)(const GLshort *);
 #define CALL_Color4sv(disp, parameters) \
     (* GET_Color4sv(disp)) parameters
-static inline _glptr_Color4sv
-GET_Color4sv(struct _glapi_table *disp)
-{
-    return (_glptr_Color4sv) (GET_by_offset(disp, _gloffset_Color4sv));
+static INLINE _glptr_Color4sv GET_Color4sv(struct _glapi_table *disp) {
+   return (_glptr_Color4sv) (GET_by_offset(disp, _gloffset_Color4sv));
 }
 
-static inline void
-SET_Color4sv(struct _glapi_table *disp, void (GLAPIENTRYP fn) (const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_Color4sv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Color4ub)(GLubyte, GLubyte, GLubyte, GLubyte);
 #define CALL_Color4ub(disp, parameters) \
     (* GET_Color4ub(disp)) parameters
-static inline _glptr_Color4ub
-GET_Color4ub(struct _glapi_table *disp)
-{
-    return (_glptr_Color4ub) (GET_by_offset(disp, _gloffset_Color4ub));
+static INLINE _glptr_Color4ub GET_Color4ub(struct _glapi_table *disp) {
+   return (_glptr_Color4ub) (GET_by_offset(disp, _gloffset_Color4ub));
 }
 
-static inline void
-SET_Color4ub(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLubyte, GLubyte, GLubyte, GLubyte))
-{
-    SET_by_offset(disp, _gloffset_Color4ub, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_Color4ubv)(const GLubyte *);
 #define CALL_Color4ubv(disp, parameters) \
     (* GET_Color4ubv(disp)) parameters
-static inline _glptr_Color4ubv
-GET_Color4ubv(struct _glapi_table *disp)
-{
-    return (_glptr_Color4ubv) (GET_by_offset(disp, _gloffset_Color4ubv));
+static INLINE _glptr_Color4ubv GET_Color4ubv(struct _glapi_table *disp) {
+   return (_glptr_Color4ubv) (GET_by_offset(disp, _gloffset_Color4ubv));
 }
 
-static inline void
-SET_Color4ubv(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (const GLubyte *))
-{
-    SET_by_offset(disp, _gloffset_Color4ubv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Color4ui)(GLuint, GLuint, GLuint, GLuint);
 #define CALL_Color4ui(disp, parameters) \
     (* GET_Color4ui(disp)) parameters
-static inline _glptr_Color4ui
-GET_Color4ui(struct _glapi_table *disp)
-{
-    return (_glptr_Color4ui) (GET_by_offset(disp, _gloffset_Color4ui));
+static INLINE _glptr_Color4ui GET_Color4ui(struct _glapi_table *disp) {
+   return (_glptr_Color4ui) (GET_by_offset(disp, _gloffset_Color4ui));
 }
 
-static inline void
-SET_Color4ui(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLuint, GLuint, GLuint, GLuint))
-{
-    SET_by_offset(disp, _gloffset_Color4ui, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_Color4uiv)(const GLuint *);
 #define CALL_Color4uiv(disp, parameters) \
     (* GET_Color4uiv(disp)) parameters
-static inline _glptr_Color4uiv
-GET_Color4uiv(struct _glapi_table *disp)
-{
-    return (_glptr_Color4uiv) (GET_by_offset(disp, _gloffset_Color4uiv));
+static INLINE _glptr_Color4uiv GET_Color4uiv(struct _glapi_table *disp) {
+   return (_glptr_Color4uiv) (GET_by_offset(disp, _gloffset_Color4uiv));
 }
 
-static inline void
-SET_Color4uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn) (const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_Color4uiv, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_Color4us)(GLushort, GLushort, GLushort, GLushort);
 #define CALL_Color4us(disp, parameters) \
     (* GET_Color4us(disp)) parameters
-static inline _glptr_Color4us
-GET_Color4us(struct _glapi_table *disp)
-{
-    return (_glptr_Color4us) (GET_by_offset(disp, _gloffset_Color4us));
+static INLINE _glptr_Color4us GET_Color4us(struct _glapi_table *disp) {
+   return (_glptr_Color4us) (GET_by_offset(disp, _gloffset_Color4us));
 }
 
-static inline void
-SET_Color4us(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLushort, GLushort, GLushort, GLushort))
-{
-    SET_by_offset(disp, _gloffset_Color4us, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_Color4usv)(const GLushort *);
 #define CALL_Color4usv(disp, parameters) \
     (* GET_Color4usv(disp)) parameters
-static inline _glptr_Color4usv
-GET_Color4usv(struct _glapi_table *disp)
-{
-    return (_glptr_Color4usv) (GET_by_offset(disp, _gloffset_Color4usv));
+static INLINE _glptr_Color4usv GET_Color4usv(struct _glapi_table *disp) {
+   return (_glptr_Color4usv) (GET_by_offset(disp, _gloffset_Color4usv));
 }
 
-static inline void
-SET_Color4usv(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (const GLushort *))
-{
-    SET_by_offset(disp, _gloffset_Color4usv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_EdgeFlag)(GLboolean);
 #define CALL_EdgeFlag(disp, parameters) \
     (* GET_EdgeFlag(disp)) parameters
-static inline _glptr_EdgeFlag
-GET_EdgeFlag(struct _glapi_table *disp)
-{
-    return (_glptr_EdgeFlag) (GET_by_offset(disp, _gloffset_EdgeFlag));
+static INLINE _glptr_EdgeFlag GET_EdgeFlag(struct _glapi_table *disp) {
+   return (_glptr_EdgeFlag) (GET_by_offset(disp, _gloffset_EdgeFlag));
 }
 
-static inline void
-SET_EdgeFlag(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLboolean))
-{
-    SET_by_offset(disp, _gloffset_EdgeFlag, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_EdgeFlagv)(const GLboolean *);
 #define CALL_EdgeFlagv(disp, parameters) \
     (* GET_EdgeFlagv(disp)) parameters
-static inline _glptr_EdgeFlagv
-GET_EdgeFlagv(struct _glapi_table *disp)
-{
-    return (_glptr_EdgeFlagv) (GET_by_offset(disp, _gloffset_EdgeFlagv));
+static INLINE _glptr_EdgeFlagv GET_EdgeFlagv(struct _glapi_table *disp) {
+   return (_glptr_EdgeFlagv) (GET_by_offset(disp, _gloffset_EdgeFlagv));
 }
 
-static inline void
-SET_EdgeFlagv(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (const GLboolean *))
-{
-    SET_by_offset(disp, _gloffset_EdgeFlagv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_End)(void);
 #define CALL_End(disp, parameters) \
     (* GET_End(disp)) parameters
-static inline _glptr_End
-GET_End(struct _glapi_table *disp)
-{
-    return (_glptr_End) (GET_by_offset(disp, _gloffset_End));
+static INLINE _glptr_End GET_End(struct _glapi_table *disp) {
+   return (_glptr_End) (GET_by_offset(disp, _gloffset_End));
 }
 
-static inline void
-SET_End(struct _glapi_table *disp, void (GLAPIENTRYP fn) (void))
-{
-    SET_by_offset(disp, _gloffset_End, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Indexd)(GLdouble);
 #define CALL_Indexd(disp, parameters) \
     (* GET_Indexd(disp)) parameters
-static inline _glptr_Indexd
-GET_Indexd(struct _glapi_table *disp)
-{
-    return (_glptr_Indexd) (GET_by_offset(disp, _gloffset_Indexd));
+static INLINE _glptr_Indexd GET_Indexd(struct _glapi_table *disp) {
+   return (_glptr_Indexd) (GET_by_offset(disp, _gloffset_Indexd));
 }
 
-static inline void
-SET_Indexd(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLdouble))
-{
-    SET_by_offset(disp, _gloffset_Indexd, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_Indexdv)(const GLdouble *);
 #define CALL_Indexdv(disp, parameters) \
     (* GET_Indexdv(disp)) parameters
-static inline _glptr_Indexdv
-GET_Indexdv(struct _glapi_table *disp)
-{
-    return (_glptr_Indexdv) (GET_by_offset(disp, _gloffset_Indexdv));
+static INLINE _glptr_Indexdv GET_Indexdv(struct _glapi_table *disp) {
+   return (_glptr_Indexdv) (GET_by_offset(disp, _gloffset_Indexdv));
 }
 
-static inline void
-SET_Indexdv(struct _glapi_table *disp, void (GLAPIENTRYP fn) (const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_Indexdv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Indexf)(GLfloat);
 #define CALL_Indexf(disp, parameters) \
     (* GET_Indexf(disp)) parameters
-static inline _glptr_Indexf
-GET_Indexf(struct _glapi_table *disp)
-{
-    return (_glptr_Indexf) (GET_by_offset(disp, _gloffset_Indexf));
+static INLINE _glptr_Indexf GET_Indexf(struct _glapi_table *disp) {
+   return (_glptr_Indexf) (GET_by_offset(disp, _gloffset_Indexf));
 }
 
-static inline void
-SET_Indexf(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLfloat))
-{
-    SET_by_offset(disp, _gloffset_Indexf, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_Indexfv)(const GLfloat *);
 #define CALL_Indexfv(disp, parameters) \
     (* GET_Indexfv(disp)) parameters
-static inline _glptr_Indexfv
-GET_Indexfv(struct _glapi_table *disp)
-{
-    return (_glptr_Indexfv) (GET_by_offset(disp, _gloffset_Indexfv));
+static INLINE _glptr_Indexfv GET_Indexfv(struct _glapi_table *disp) {
+   return (_glptr_Indexfv) (GET_by_offset(disp, _gloffset_Indexfv));
 }
 
-static inline void
-SET_Indexfv(struct _glapi_table *disp, void (GLAPIENTRYP fn) (const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_Indexfv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Indexi)(GLint);
 #define CALL_Indexi(disp, parameters) \
     (* GET_Indexi(disp)) parameters
-static inline _glptr_Indexi
-GET_Indexi(struct _glapi_table *disp)
-{
-    return (_glptr_Indexi) (GET_by_offset(disp, _gloffset_Indexi));
+static INLINE _glptr_Indexi GET_Indexi(struct _glapi_table *disp) {
+   return (_glptr_Indexi) (GET_by_offset(disp, _gloffset_Indexi));
 }
 
-static inline void
-SET_Indexi(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLint))
-{
-    SET_by_offset(disp, _gloffset_Indexi, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_Indexiv)(const GLint *);
 #define CALL_Indexiv(disp, parameters) \
     (* GET_Indexiv(disp)) parameters
-static inline _glptr_Indexiv
-GET_Indexiv(struct _glapi_table *disp)
-{
-    return (_glptr_Indexiv) (GET_by_offset(disp, _gloffset_Indexiv));
+static INLINE _glptr_Indexiv GET_Indexiv(struct _glapi_table *disp) {
+   return (_glptr_Indexiv) (GET_by_offset(disp, _gloffset_Indexiv));
 }
 
-static inline void
-SET_Indexiv(struct _glapi_table *disp, void (GLAPIENTRYP fn) (const GLint *))
-{
-    SET_by_offset(disp, _gloffset_Indexiv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Indexs)(GLshort);
 #define CALL_Indexs(disp, parameters) \
     (* GET_Indexs(disp)) parameters
-static inline _glptr_Indexs
-GET_Indexs(struct _glapi_table *disp)
-{
-    return (_glptr_Indexs) (GET_by_offset(disp, _gloffset_Indexs));
+static INLINE _glptr_Indexs GET_Indexs(struct _glapi_table *disp) {
+   return (_glptr_Indexs) (GET_by_offset(disp, _gloffset_Indexs));
 }
 
-static inline void
-SET_Indexs(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLshort))
-{
-    SET_by_offset(disp, _gloffset_Indexs, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_Indexsv)(const GLshort *);
 #define CALL_Indexsv(disp, parameters) \
     (* GET_Indexsv(disp)) parameters
-static inline _glptr_Indexsv
-GET_Indexsv(struct _glapi_table *disp)
-{
-    return (_glptr_Indexsv) (GET_by_offset(disp, _gloffset_Indexsv));
+static INLINE _glptr_Indexsv GET_Indexsv(struct _glapi_table *disp) {
+   return (_glptr_Indexsv) (GET_by_offset(disp, _gloffset_Indexsv));
 }
 
-static inline void
-SET_Indexsv(struct _glapi_table *disp, void (GLAPIENTRYP fn) (const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_Indexsv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Normal3b)(GLbyte, GLbyte, GLbyte);
 #define CALL_Normal3b(disp, parameters) \
     (* GET_Normal3b(disp)) parameters
-static inline _glptr_Normal3b
-GET_Normal3b(struct _glapi_table *disp)
-{
-    return (_glptr_Normal3b) (GET_by_offset(disp, _gloffset_Normal3b));
+static INLINE _glptr_Normal3b GET_Normal3b(struct _glapi_table *disp) {
+   return (_glptr_Normal3b) (GET_by_offset(disp, _gloffset_Normal3b));
 }
 
-static inline void
-SET_Normal3b(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLbyte, GLbyte, GLbyte))
-{
-    SET_by_offset(disp, _gloffset_Normal3b, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_Normal3bv)(const GLbyte *);
 #define CALL_Normal3bv(disp, parameters) \
     (* GET_Normal3bv(disp)) parameters
-static inline _glptr_Normal3bv
-GET_Normal3bv(struct _glapi_table *disp)
-{
-    return (_glptr_Normal3bv) (GET_by_offset(disp, _gloffset_Normal3bv));
+static INLINE _glptr_Normal3bv GET_Normal3bv(struct _glapi_table *disp) {
+   return (_glptr_Normal3bv) (GET_by_offset(disp, _gloffset_Normal3bv));
 }
 
-static inline void
-SET_Normal3bv(struct _glapi_table *disp, void (GLAPIENTRYP fn) (const GLbyte *))
-{
-    SET_by_offset(disp, _gloffset_Normal3bv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Normal3d)(GLdouble, GLdouble, GLdouble);
 #define CALL_Normal3d(disp, parameters) \
     (* GET_Normal3d(disp)) parameters
-static inline _glptr_Normal3d
-GET_Normal3d(struct _glapi_table *disp)
-{
-    return (_glptr_Normal3d) (GET_by_offset(disp, _gloffset_Normal3d));
+static INLINE _glptr_Normal3d GET_Normal3d(struct _glapi_table *disp) {
+   return (_glptr_Normal3d) (GET_by_offset(disp, _gloffset_Normal3d));
 }
 
-static inline void
-SET_Normal3d(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLdouble, GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_Normal3d, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_Normal3dv)(const GLdouble *);
 #define CALL_Normal3dv(disp, parameters) \
     (* GET_Normal3dv(disp)) parameters
-static inline _glptr_Normal3dv
-GET_Normal3dv(struct _glapi_table *disp)
-{
-    return (_glptr_Normal3dv) (GET_by_offset(disp, _gloffset_Normal3dv));
+static INLINE _glptr_Normal3dv GET_Normal3dv(struct _glapi_table *disp) {
+   return (_glptr_Normal3dv) (GET_by_offset(disp, _gloffset_Normal3dv));
 }
 
-static inline void
-SET_Normal3dv(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_Normal3dv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Normal3f)(GLfloat, GLfloat, GLfloat);
 #define CALL_Normal3f(disp, parameters) \
     (* GET_Normal3f(disp)) parameters
-static inline _glptr_Normal3f
-GET_Normal3f(struct _glapi_table *disp)
-{
-    return (_glptr_Normal3f) (GET_by_offset(disp, _gloffset_Normal3f));
+static INLINE _glptr_Normal3f GET_Normal3f(struct _glapi_table *disp) {
+   return (_glptr_Normal3f) (GET_by_offset(disp, _gloffset_Normal3f));
 }
 
-static inline void
-SET_Normal3f(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLfloat, GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_Normal3f, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_Normal3fv)(const GLfloat *);
 #define CALL_Normal3fv(disp, parameters) \
     (* GET_Normal3fv(disp)) parameters
-static inline _glptr_Normal3fv
-GET_Normal3fv(struct _glapi_table *disp)
-{
-    return (_glptr_Normal3fv) (GET_by_offset(disp, _gloffset_Normal3fv));
+static INLINE _glptr_Normal3fv GET_Normal3fv(struct _glapi_table *disp) {
+   return (_glptr_Normal3fv) (GET_by_offset(disp, _gloffset_Normal3fv));
 }
 
-static inline void
-SET_Normal3fv(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_Normal3fv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Normal3i)(GLint, GLint, GLint);
 #define CALL_Normal3i(disp, parameters) \
     (* GET_Normal3i(disp)) parameters
-static inline _glptr_Normal3i
-GET_Normal3i(struct _glapi_table *disp)
-{
-    return (_glptr_Normal3i) (GET_by_offset(disp, _gloffset_Normal3i));
+static INLINE _glptr_Normal3i GET_Normal3i(struct _glapi_table *disp) {
+   return (_glptr_Normal3i) (GET_by_offset(disp, _gloffset_Normal3i));
 }
 
-static inline void
-SET_Normal3i(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLint, GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_Normal3i, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_Normal3iv)(const GLint *);
 #define CALL_Normal3iv(disp, parameters) \
     (* GET_Normal3iv(disp)) parameters
-static inline _glptr_Normal3iv
-GET_Normal3iv(struct _glapi_table *disp)
-{
-    return (_glptr_Normal3iv) (GET_by_offset(disp, _gloffset_Normal3iv));
+static INLINE _glptr_Normal3iv GET_Normal3iv(struct _glapi_table *disp) {
+   return (_glptr_Normal3iv) (GET_by_offset(disp, _gloffset_Normal3iv));
 }
 
-static inline void
-SET_Normal3iv(struct _glapi_table *disp, void (GLAPIENTRYP fn) (const GLint *))
-{
-    SET_by_offset(disp, _gloffset_Normal3iv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Normal3s)(GLshort, GLshort, GLshort);
 #define CALL_Normal3s(disp, parameters) \
     (* GET_Normal3s(disp)) parameters
-static inline _glptr_Normal3s
-GET_Normal3s(struct _glapi_table *disp)
-{
-    return (_glptr_Normal3s) (GET_by_offset(disp, _gloffset_Normal3s));
+static INLINE _glptr_Normal3s GET_Normal3s(struct _glapi_table *disp) {
+   return (_glptr_Normal3s) (GET_by_offset(disp, _gloffset_Normal3s));
 }
 
-static inline void
-SET_Normal3s(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLshort, GLshort, GLshort))
-{
-    SET_by_offset(disp, _gloffset_Normal3s, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_Normal3sv)(const GLshort *);
 #define CALL_Normal3sv(disp, parameters) \
     (* GET_Normal3sv(disp)) parameters
-static inline _glptr_Normal3sv
-GET_Normal3sv(struct _glapi_table *disp)
-{
-    return (_glptr_Normal3sv) (GET_by_offset(disp, _gloffset_Normal3sv));
+static INLINE _glptr_Normal3sv GET_Normal3sv(struct _glapi_table *disp) {
+   return (_glptr_Normal3sv) (GET_by_offset(disp, _gloffset_Normal3sv));
 }
 
-static inline void
-SET_Normal3sv(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_Normal3sv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_RasterPos2d)(GLdouble, GLdouble);
 #define CALL_RasterPos2d(disp, parameters) \
     (* GET_RasterPos2d(disp)) parameters
-static inline _glptr_RasterPos2d
-GET_RasterPos2d(struct _glapi_table *disp)
-{
-    return (_glptr_RasterPos2d) (GET_by_offset(disp, _gloffset_RasterPos2d));
+static INLINE _glptr_RasterPos2d GET_RasterPos2d(struct _glapi_table *disp) {
+   return (_glptr_RasterPos2d) (GET_by_offset(disp, _gloffset_RasterPos2d));
 }
 
-static inline void
-SET_RasterPos2d(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_RasterPos2d, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_RasterPos2dv)(const GLdouble *);
 #define CALL_RasterPos2dv(disp, parameters) \
     (* GET_RasterPos2dv(disp)) parameters
-static inline _glptr_RasterPos2dv
-GET_RasterPos2dv(struct _glapi_table *disp)
-{
-    return (_glptr_RasterPos2dv) (GET_by_offset(disp, _gloffset_RasterPos2dv));
+static INLINE _glptr_RasterPos2dv GET_RasterPos2dv(struct _glapi_table *disp) {
+   return (_glptr_RasterPos2dv) (GET_by_offset(disp, _gloffset_RasterPos2dv));
 }
 
-static inline void
-SET_RasterPos2dv(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_RasterPos2dv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_RasterPos2f)(GLfloat, GLfloat);
 #define CALL_RasterPos2f(disp, parameters) \
     (* GET_RasterPos2f(disp)) parameters
-static inline _glptr_RasterPos2f
-GET_RasterPos2f(struct _glapi_table *disp)
-{
-    return (_glptr_RasterPos2f) (GET_by_offset(disp, _gloffset_RasterPos2f));
+static INLINE _glptr_RasterPos2f GET_RasterPos2f(struct _glapi_table *disp) {
+   return (_glptr_RasterPos2f) (GET_by_offset(disp, _gloffset_RasterPos2f));
 }
 
-static inline void
-SET_RasterPos2f(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_RasterPos2f, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_RasterPos2fv)(const GLfloat *);
 #define CALL_RasterPos2fv(disp, parameters) \
     (* GET_RasterPos2fv(disp)) parameters
-static inline _glptr_RasterPos2fv
-GET_RasterPos2fv(struct _glapi_table *disp)
-{
-    return (_glptr_RasterPos2fv) (GET_by_offset(disp, _gloffset_RasterPos2fv));
+static INLINE _glptr_RasterPos2fv GET_RasterPos2fv(struct _glapi_table *disp) {
+   return (_glptr_RasterPos2fv) (GET_by_offset(disp, _gloffset_RasterPos2fv));
 }
 
-static inline void
-SET_RasterPos2fv(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_RasterPos2fv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_RasterPos2i)(GLint, GLint);
 #define CALL_RasterPos2i(disp, parameters) \
     (* GET_RasterPos2i(disp)) parameters
-static inline _glptr_RasterPos2i
-GET_RasterPos2i(struct _glapi_table *disp)
-{
-    return (_glptr_RasterPos2i) (GET_by_offset(disp, _gloffset_RasterPos2i));
+static INLINE _glptr_RasterPos2i GET_RasterPos2i(struct _glapi_table *disp) {
+   return (_glptr_RasterPos2i) (GET_by_offset(disp, _gloffset_RasterPos2i));
 }
 
-static inline void
-SET_RasterPos2i(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_RasterPos2i, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_RasterPos2iv)(const GLint *);
 #define CALL_RasterPos2iv(disp, parameters) \
     (* GET_RasterPos2iv(disp)) parameters
-static inline _glptr_RasterPos2iv
-GET_RasterPos2iv(struct _glapi_table *disp)
-{
-    return (_glptr_RasterPos2iv) (GET_by_offset(disp, _gloffset_RasterPos2iv));
+static INLINE _glptr_RasterPos2iv GET_RasterPos2iv(struct _glapi_table *disp) {
+   return (_glptr_RasterPos2iv) (GET_by_offset(disp, _gloffset_RasterPos2iv));
 }
 
-static inline void
-SET_RasterPos2iv(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (const GLint *))
-{
-    SET_by_offset(disp, _gloffset_RasterPos2iv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_RasterPos2s)(GLshort, GLshort);
 #define CALL_RasterPos2s(disp, parameters) \
     (* GET_RasterPos2s(disp)) parameters
-static inline _glptr_RasterPos2s
-GET_RasterPos2s(struct _glapi_table *disp)
-{
-    return (_glptr_RasterPos2s) (GET_by_offset(disp, _gloffset_RasterPos2s));
+static INLINE _glptr_RasterPos2s GET_RasterPos2s(struct _glapi_table *disp) {
+   return (_glptr_RasterPos2s) (GET_by_offset(disp, _gloffset_RasterPos2s));
 }
 
-static inline void
-SET_RasterPos2s(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLshort, GLshort))
-{
-    SET_by_offset(disp, _gloffset_RasterPos2s, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_RasterPos2sv)(const GLshort *);
 #define CALL_RasterPos2sv(disp, parameters) \
     (* GET_RasterPos2sv(disp)) parameters
-static inline _glptr_RasterPos2sv
-GET_RasterPos2sv(struct _glapi_table *disp)
-{
-    return (_glptr_RasterPos2sv) (GET_by_offset(disp, _gloffset_RasterPos2sv));
+static INLINE _glptr_RasterPos2sv GET_RasterPos2sv(struct _glapi_table *disp) {
+   return (_glptr_RasterPos2sv) (GET_by_offset(disp, _gloffset_RasterPos2sv));
 }
 
-static inline void
-SET_RasterPos2sv(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_RasterPos2sv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_RasterPos3d)(GLdouble, GLdouble, GLdouble);
 #define CALL_RasterPos3d(disp, parameters) \
     (* GET_RasterPos3d(disp)) parameters
-static inline _glptr_RasterPos3d
-GET_RasterPos3d(struct _glapi_table *disp)
-{
-    return (_glptr_RasterPos3d) (GET_by_offset(disp, _gloffset_RasterPos3d));
+static INLINE _glptr_RasterPos3d GET_RasterPos3d(struct _glapi_table *disp) {
+   return (_glptr_RasterPos3d) (GET_by_offset(disp, _gloffset_RasterPos3d));
 }
 
-static inline void
-SET_RasterPos3d(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLdouble, GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_RasterPos3d, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_RasterPos3dv)(const GLdouble *);
 #define CALL_RasterPos3dv(disp, parameters) \
     (* GET_RasterPos3dv(disp)) parameters
-static inline _glptr_RasterPos3dv
-GET_RasterPos3dv(struct _glapi_table *disp)
-{
-    return (_glptr_RasterPos3dv) (GET_by_offset(disp, _gloffset_RasterPos3dv));
+static INLINE _glptr_RasterPos3dv GET_RasterPos3dv(struct _glapi_table *disp) {
+   return (_glptr_RasterPos3dv) (GET_by_offset(disp, _gloffset_RasterPos3dv));
 }
 
-static inline void
-SET_RasterPos3dv(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_RasterPos3dv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_RasterPos3f)(GLfloat, GLfloat, GLfloat);
 #define CALL_RasterPos3f(disp, parameters) \
     (* GET_RasterPos3f(disp)) parameters
-static inline _glptr_RasterPos3f
-GET_RasterPos3f(struct _glapi_table *disp)
-{
-    return (_glptr_RasterPos3f) (GET_by_offset(disp, _gloffset_RasterPos3f));
+static INLINE _glptr_RasterPos3f GET_RasterPos3f(struct _glapi_table *disp) {
+   return (_glptr_RasterPos3f) (GET_by_offset(disp, _gloffset_RasterPos3f));
 }
 
-static inline void
-SET_RasterPos3f(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLfloat, GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_RasterPos3f, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_RasterPos3fv)(const GLfloat *);
 #define CALL_RasterPos3fv(disp, parameters) \
     (* GET_RasterPos3fv(disp)) parameters
-static inline _glptr_RasterPos3fv
-GET_RasterPos3fv(struct _glapi_table *disp)
-{
-    return (_glptr_RasterPos3fv) (GET_by_offset(disp, _gloffset_RasterPos3fv));
+static INLINE _glptr_RasterPos3fv GET_RasterPos3fv(struct _glapi_table *disp) {
+   return (_glptr_RasterPos3fv) (GET_by_offset(disp, _gloffset_RasterPos3fv));
 }
 
-static inline void
-SET_RasterPos3fv(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_RasterPos3fv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_RasterPos3i)(GLint, GLint, GLint);
 #define CALL_RasterPos3i(disp, parameters) \
     (* GET_RasterPos3i(disp)) parameters
-static inline _glptr_RasterPos3i
-GET_RasterPos3i(struct _glapi_table *disp)
-{
-    return (_glptr_RasterPos3i) (GET_by_offset(disp, _gloffset_RasterPos3i));
+static INLINE _glptr_RasterPos3i GET_RasterPos3i(struct _glapi_table *disp) {
+   return (_glptr_RasterPos3i) (GET_by_offset(disp, _gloffset_RasterPos3i));
 }
 
-static inline void
-SET_RasterPos3i(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLint, GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_RasterPos3i, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_RasterPos3iv)(const GLint *);
 #define CALL_RasterPos3iv(disp, parameters) \
     (* GET_RasterPos3iv(disp)) parameters
-static inline _glptr_RasterPos3iv
-GET_RasterPos3iv(struct _glapi_table *disp)
-{
-    return (_glptr_RasterPos3iv) (GET_by_offset(disp, _gloffset_RasterPos3iv));
+static INLINE _glptr_RasterPos3iv GET_RasterPos3iv(struct _glapi_table *disp) {
+   return (_glptr_RasterPos3iv) (GET_by_offset(disp, _gloffset_RasterPos3iv));
 }
 
-static inline void
-SET_RasterPos3iv(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (const GLint *))
-{
-    SET_by_offset(disp, _gloffset_RasterPos3iv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_RasterPos3s)(GLshort, GLshort, GLshort);
 #define CALL_RasterPos3s(disp, parameters) \
     (* GET_RasterPos3s(disp)) parameters
-static inline _glptr_RasterPos3s
-GET_RasterPos3s(struct _glapi_table *disp)
-{
-    return (_glptr_RasterPos3s) (GET_by_offset(disp, _gloffset_RasterPos3s));
+static INLINE _glptr_RasterPos3s GET_RasterPos3s(struct _glapi_table *disp) {
+   return (_glptr_RasterPos3s) (GET_by_offset(disp, _gloffset_RasterPos3s));
 }
 
-static inline void
-SET_RasterPos3s(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLshort, GLshort, GLshort))
-{
-    SET_by_offset(disp, _gloffset_RasterPos3s, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_RasterPos3sv)(const GLshort *);
 #define CALL_RasterPos3sv(disp, parameters) \
     (* GET_RasterPos3sv(disp)) parameters
-static inline _glptr_RasterPos3sv
-GET_RasterPos3sv(struct _glapi_table *disp)
-{
-    return (_glptr_RasterPos3sv) (GET_by_offset(disp, _gloffset_RasterPos3sv));
+static INLINE _glptr_RasterPos3sv GET_RasterPos3sv(struct _glapi_table *disp) {
+   return (_glptr_RasterPos3sv) (GET_by_offset(disp, _gloffset_RasterPos3sv));
 }
 
-static inline void
-SET_RasterPos3sv(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_RasterPos3sv, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_RasterPos4d)(GLdouble, GLdouble, GLdouble, GLdouble);
 #define CALL_RasterPos4d(disp, parameters) \
     (* GET_RasterPos4d(disp)) parameters
-static inline _glptr_RasterPos4d
-GET_RasterPos4d(struct _glapi_table *disp)
-{
-    return (_glptr_RasterPos4d) (GET_by_offset(disp, _gloffset_RasterPos4d));
+static INLINE _glptr_RasterPos4d GET_RasterPos4d(struct _glapi_table *disp) {
+   return (_glptr_RasterPos4d) (GET_by_offset(disp, _gloffset_RasterPos4d));
 }
 
-static inline void
-SET_RasterPos4d(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLdouble, GLdouble, GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_RasterPos4d, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_RasterPos4dv)(const GLdouble *);
 #define CALL_RasterPos4dv(disp, parameters) \
     (* GET_RasterPos4dv(disp)) parameters
-static inline _glptr_RasterPos4dv
-GET_RasterPos4dv(struct _glapi_table *disp)
-{
-    return (_glptr_RasterPos4dv) (GET_by_offset(disp, _gloffset_RasterPos4dv));
+static INLINE _glptr_RasterPos4dv GET_RasterPos4dv(struct _glapi_table *disp) {
+   return (_glptr_RasterPos4dv) (GET_by_offset(disp, _gloffset_RasterPos4dv));
 }
 
-static inline void
-SET_RasterPos4dv(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_RasterPos4dv, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_RasterPos4f)(GLfloat, GLfloat, GLfloat, GLfloat);
 #define CALL_RasterPos4f(disp, parameters) \
     (* GET_RasterPos4f(disp)) parameters
-static inline _glptr_RasterPos4f
-GET_RasterPos4f(struct _glapi_table *disp)
-{
-    return (_glptr_RasterPos4f) (GET_by_offset(disp, _gloffset_RasterPos4f));
+static INLINE _glptr_RasterPos4f GET_RasterPos4f(struct _glapi_table *disp) {
+   return (_glptr_RasterPos4f) (GET_by_offset(disp, _gloffset_RasterPos4f));
 }
 
-static inline void
-SET_RasterPos4f(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLfloat, GLfloat, GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_RasterPos4f, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_RasterPos4fv)(const GLfloat *);
 #define CALL_RasterPos4fv(disp, parameters) \
     (* GET_RasterPos4fv(disp)) parameters
-static inline _glptr_RasterPos4fv
-GET_RasterPos4fv(struct _glapi_table *disp)
-{
-    return (_glptr_RasterPos4fv) (GET_by_offset(disp, _gloffset_RasterPos4fv));
+static INLINE _glptr_RasterPos4fv GET_RasterPos4fv(struct _glapi_table *disp) {
+   return (_glptr_RasterPos4fv) (GET_by_offset(disp, _gloffset_RasterPos4fv));
 }
 
-static inline void
-SET_RasterPos4fv(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_RasterPos4fv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_RasterPos4i)(GLint, GLint, GLint, GLint);
 #define CALL_RasterPos4i(disp, parameters) \
     (* GET_RasterPos4i(disp)) parameters
-static inline _glptr_RasterPos4i
-GET_RasterPos4i(struct _glapi_table *disp)
-{
-    return (_glptr_RasterPos4i) (GET_by_offset(disp, _gloffset_RasterPos4i));
+static INLINE _glptr_RasterPos4i GET_RasterPos4i(struct _glapi_table *disp) {
+   return (_glptr_RasterPos4i) (GET_by_offset(disp, _gloffset_RasterPos4i));
 }
 
-static inline void
-SET_RasterPos4i(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLint, GLint, GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_RasterPos4i, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_RasterPos4iv)(const GLint *);
 #define CALL_RasterPos4iv(disp, parameters) \
     (* GET_RasterPos4iv(disp)) parameters
-static inline _glptr_RasterPos4iv
-GET_RasterPos4iv(struct _glapi_table *disp)
-{
-    return (_glptr_RasterPos4iv) (GET_by_offset(disp, _gloffset_RasterPos4iv));
+static INLINE _glptr_RasterPos4iv GET_RasterPos4iv(struct _glapi_table *disp) {
+   return (_glptr_RasterPos4iv) (GET_by_offset(disp, _gloffset_RasterPos4iv));
 }
 
-static inline void
-SET_RasterPos4iv(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (const GLint *))
-{
-    SET_by_offset(disp, _gloffset_RasterPos4iv, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_RasterPos4s)(GLshort, GLshort, GLshort, GLshort);
 #define CALL_RasterPos4s(disp, parameters) \
     (* GET_RasterPos4s(disp)) parameters
-static inline _glptr_RasterPos4s
-GET_RasterPos4s(struct _glapi_table *disp)
-{
-    return (_glptr_RasterPos4s) (GET_by_offset(disp, _gloffset_RasterPos4s));
+static INLINE _glptr_RasterPos4s GET_RasterPos4s(struct _glapi_table *disp) {
+   return (_glptr_RasterPos4s) (GET_by_offset(disp, _gloffset_RasterPos4s));
 }
 
-static inline void
-SET_RasterPos4s(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLshort, GLshort, GLshort, GLshort))
-{
-    SET_by_offset(disp, _gloffset_RasterPos4s, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_RasterPos4sv)(const GLshort *);
 #define CALL_RasterPos4sv(disp, parameters) \
     (* GET_RasterPos4sv(disp)) parameters
-static inline _glptr_RasterPos4sv
-GET_RasterPos4sv(struct _glapi_table *disp)
-{
-    return (_glptr_RasterPos4sv) (GET_by_offset(disp, _gloffset_RasterPos4sv));
+static INLINE _glptr_RasterPos4sv GET_RasterPos4sv(struct _glapi_table *disp) {
+   return (_glptr_RasterPos4sv) (GET_by_offset(disp, _gloffset_RasterPos4sv));
 }
 
-static inline void
-SET_RasterPos4sv(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_RasterPos4sv, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_Rectd)(GLdouble, GLdouble, GLdouble, GLdouble);
 #define CALL_Rectd(disp, parameters) \
     (* GET_Rectd(disp)) parameters
-static inline _glptr_Rectd
-GET_Rectd(struct _glapi_table *disp)
-{
-    return (_glptr_Rectd) (GET_by_offset(disp, _gloffset_Rectd));
+static INLINE _glptr_Rectd GET_Rectd(struct _glapi_table *disp) {
+   return (_glptr_Rectd) (GET_by_offset(disp, _gloffset_Rectd));
 }
 
-static inline void
-SET_Rectd(struct _glapi_table *disp,
-          void (GLAPIENTRYP fn) (GLdouble, GLdouble, GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_Rectd, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_Rectdv)(const GLdouble *, const GLdouble *);
 #define CALL_Rectdv(disp, parameters) \
     (* GET_Rectdv(disp)) parameters
-static inline _glptr_Rectdv
-GET_Rectdv(struct _glapi_table *disp)
-{
-    return (_glptr_Rectdv) (GET_by_offset(disp, _gloffset_Rectdv));
+static INLINE _glptr_Rectdv GET_Rectdv(struct _glapi_table *disp) {
+   return (_glptr_Rectdv) (GET_by_offset(disp, _gloffset_Rectdv));
 }
 
-static inline void
-SET_Rectdv(struct _glapi_table *disp,
-           void (GLAPIENTRYP fn) (const GLdouble *, const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_Rectdv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Rectf)(GLfloat, GLfloat, GLfloat, GLfloat);
 #define CALL_Rectf(disp, parameters) \
     (* GET_Rectf(disp)) parameters
-static inline _glptr_Rectf
-GET_Rectf(struct _glapi_table *disp)
-{
-    return (_glptr_Rectf) (GET_by_offset(disp, _gloffset_Rectf));
+static INLINE _glptr_Rectf GET_Rectf(struct _glapi_table *disp) {
+   return (_glptr_Rectf) (GET_by_offset(disp, _gloffset_Rectf));
 }
 
-static inline void
-SET_Rectf(struct _glapi_table *disp,
-          void (GLAPIENTRYP fn) (GLfloat, GLfloat, GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_Rectf, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_Rectfv)(const GLfloat *, const GLfloat *);
 #define CALL_Rectfv(disp, parameters) \
     (* GET_Rectfv(disp)) parameters
-static inline _glptr_Rectfv
-GET_Rectfv(struct _glapi_table *disp)
-{
-    return (_glptr_Rectfv) (GET_by_offset(disp, _gloffset_Rectfv));
+static INLINE _glptr_Rectfv GET_Rectfv(struct _glapi_table *disp) {
+   return (_glptr_Rectfv) (GET_by_offset(disp, _gloffset_Rectfv));
 }
 
-static inline void
-SET_Rectfv(struct _glapi_table *disp,
-           void (GLAPIENTRYP fn) (const GLfloat *, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_Rectfv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Recti)(GLint, GLint, GLint, GLint);
 #define CALL_Recti(disp, parameters) \
     (* GET_Recti(disp)) parameters
-static inline _glptr_Recti
-GET_Recti(struct _glapi_table *disp)
-{
-    return (_glptr_Recti) (GET_by_offset(disp, _gloffset_Recti));
+static INLINE _glptr_Recti GET_Recti(struct _glapi_table *disp) {
+   return (_glptr_Recti) (GET_by_offset(disp, _gloffset_Recti));
 }
 
-static inline void
-SET_Recti(struct _glapi_table *disp,
-          void (GLAPIENTRYP fn) (GLint, GLint, GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_Recti, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_Rectiv)(const GLint *, const GLint *);
 #define CALL_Rectiv(disp, parameters) \
     (* GET_Rectiv(disp)) parameters
-static inline _glptr_Rectiv
-GET_Rectiv(struct _glapi_table *disp)
-{
-    return (_glptr_Rectiv) (GET_by_offset(disp, _gloffset_Rectiv));
+static INLINE _glptr_Rectiv GET_Rectiv(struct _glapi_table *disp) {
+   return (_glptr_Rectiv) (GET_by_offset(disp, _gloffset_Rectiv));
 }
 
-static inline void
-SET_Rectiv(struct _glapi_table *disp,
-           void (GLAPIENTRYP fn) (const GLint *, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_Rectiv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Rects)(GLshort, GLshort, GLshort, GLshort);
 #define CALL_Rects(disp, parameters) \
     (* GET_Rects(disp)) parameters
-static inline _glptr_Rects
-GET_Rects(struct _glapi_table *disp)
-{
-    return (_glptr_Rects) (GET_by_offset(disp, _gloffset_Rects));
+static INLINE _glptr_Rects GET_Rects(struct _glapi_table *disp) {
+   return (_glptr_Rects) (GET_by_offset(disp, _gloffset_Rects));
 }
 
-static inline void
-SET_Rects(struct _glapi_table *disp,
-          void (GLAPIENTRYP fn) (GLshort, GLshort, GLshort, GLshort))
-{
-    SET_by_offset(disp, _gloffset_Rects, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_Rectsv)(const GLshort *, const GLshort *);
 #define CALL_Rectsv(disp, parameters) \
     (* GET_Rectsv(disp)) parameters
-static inline _glptr_Rectsv
-GET_Rectsv(struct _glapi_table *disp)
-{
-    return (_glptr_Rectsv) (GET_by_offset(disp, _gloffset_Rectsv));
+static INLINE _glptr_Rectsv GET_Rectsv(struct _glapi_table *disp) {
+   return (_glptr_Rectsv) (GET_by_offset(disp, _gloffset_Rectsv));
 }
 
-static inline void
-SET_Rectsv(struct _glapi_table *disp,
-           void (GLAPIENTRYP fn) (const GLshort *, const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_Rectsv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_TexCoord1d)(GLdouble);
 #define CALL_TexCoord1d(disp, parameters) \
     (* GET_TexCoord1d(disp)) parameters
-static inline _glptr_TexCoord1d
-GET_TexCoord1d(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord1d) (GET_by_offset(disp, _gloffset_TexCoord1d));
+static INLINE _glptr_TexCoord1d GET_TexCoord1d(struct _glapi_table *disp) {
+   return (_glptr_TexCoord1d) (GET_by_offset(disp, _gloffset_TexCoord1d));
 }
 
-static inline void
-SET_TexCoord1d(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLdouble))
-{
-    SET_by_offset(disp, _gloffset_TexCoord1d, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_TexCoord1dv)(const GLdouble *);
 #define CALL_TexCoord1dv(disp, parameters) \
     (* GET_TexCoord1dv(disp)) parameters
-static inline _glptr_TexCoord1dv
-GET_TexCoord1dv(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord1dv) (GET_by_offset(disp, _gloffset_TexCoord1dv));
+static INLINE _glptr_TexCoord1dv GET_TexCoord1dv(struct _glapi_table *disp) {
+   return (_glptr_TexCoord1dv) (GET_by_offset(disp, _gloffset_TexCoord1dv));
 }
 
-static inline void
-SET_TexCoord1dv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_TexCoord1dv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_TexCoord1f)(GLfloat);
 #define CALL_TexCoord1f(disp, parameters) \
     (* GET_TexCoord1f(disp)) parameters
-static inline _glptr_TexCoord1f
-GET_TexCoord1f(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord1f) (GET_by_offset(disp, _gloffset_TexCoord1f));
+static INLINE _glptr_TexCoord1f GET_TexCoord1f(struct _glapi_table *disp) {
+   return (_glptr_TexCoord1f) (GET_by_offset(disp, _gloffset_TexCoord1f));
 }
 
-static inline void
-SET_TexCoord1f(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLfloat))
-{
-    SET_by_offset(disp, _gloffset_TexCoord1f, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_TexCoord1fv)(const GLfloat *);
 #define CALL_TexCoord1fv(disp, parameters) \
     (* GET_TexCoord1fv(disp)) parameters
-static inline _glptr_TexCoord1fv
-GET_TexCoord1fv(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord1fv) (GET_by_offset(disp, _gloffset_TexCoord1fv));
+static INLINE _glptr_TexCoord1fv GET_TexCoord1fv(struct _glapi_table *disp) {
+   return (_glptr_TexCoord1fv) (GET_by_offset(disp, _gloffset_TexCoord1fv));
 }
 
-static inline void
-SET_TexCoord1fv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_TexCoord1fv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_TexCoord1i)(GLint);
 #define CALL_TexCoord1i(disp, parameters) \
     (* GET_TexCoord1i(disp)) parameters
-static inline _glptr_TexCoord1i
-GET_TexCoord1i(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord1i) (GET_by_offset(disp, _gloffset_TexCoord1i));
+static INLINE _glptr_TexCoord1i GET_TexCoord1i(struct _glapi_table *disp) {
+   return (_glptr_TexCoord1i) (GET_by_offset(disp, _gloffset_TexCoord1i));
 }
 
-static inline void
-SET_TexCoord1i(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLint))
-{
-    SET_by_offset(disp, _gloffset_TexCoord1i, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_TexCoord1iv)(const GLint *);
 #define CALL_TexCoord1iv(disp, parameters) \
     (* GET_TexCoord1iv(disp)) parameters
-static inline _glptr_TexCoord1iv
-GET_TexCoord1iv(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord1iv) (GET_by_offset(disp, _gloffset_TexCoord1iv));
+static INLINE _glptr_TexCoord1iv GET_TexCoord1iv(struct _glapi_table *disp) {
+   return (_glptr_TexCoord1iv) (GET_by_offset(disp, _gloffset_TexCoord1iv));
 }
 
-static inline void
-SET_TexCoord1iv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (const GLint *))
-{
-    SET_by_offset(disp, _gloffset_TexCoord1iv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_TexCoord1s)(GLshort);
 #define CALL_TexCoord1s(disp, parameters) \
     (* GET_TexCoord1s(disp)) parameters
-static inline _glptr_TexCoord1s
-GET_TexCoord1s(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord1s) (GET_by_offset(disp, _gloffset_TexCoord1s));
+static INLINE _glptr_TexCoord1s GET_TexCoord1s(struct _glapi_table *disp) {
+   return (_glptr_TexCoord1s) (GET_by_offset(disp, _gloffset_TexCoord1s));
 }
 
-static inline void
-SET_TexCoord1s(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLshort))
-{
-    SET_by_offset(disp, _gloffset_TexCoord1s, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_TexCoord1sv)(const GLshort *);
 #define CALL_TexCoord1sv(disp, parameters) \
     (* GET_TexCoord1sv(disp)) parameters
-static inline _glptr_TexCoord1sv
-GET_TexCoord1sv(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord1sv) (GET_by_offset(disp, _gloffset_TexCoord1sv));
+static INLINE _glptr_TexCoord1sv GET_TexCoord1sv(struct _glapi_table *disp) {
+   return (_glptr_TexCoord1sv) (GET_by_offset(disp, _gloffset_TexCoord1sv));
 }
 
-static inline void
-SET_TexCoord1sv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_TexCoord1sv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_TexCoord2d)(GLdouble, GLdouble);
 #define CALL_TexCoord2d(disp, parameters) \
     (* GET_TexCoord2d(disp)) parameters
-static inline _glptr_TexCoord2d
-GET_TexCoord2d(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord2d) (GET_by_offset(disp, _gloffset_TexCoord2d));
+static INLINE _glptr_TexCoord2d GET_TexCoord2d(struct _glapi_table *disp) {
+   return (_glptr_TexCoord2d) (GET_by_offset(disp, _gloffset_TexCoord2d));
 }
 
-static inline void
-SET_TexCoord2d(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_TexCoord2d, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_TexCoord2dv)(const GLdouble *);
 #define CALL_TexCoord2dv(disp, parameters) \
     (* GET_TexCoord2dv(disp)) parameters
-static inline _glptr_TexCoord2dv
-GET_TexCoord2dv(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord2dv) (GET_by_offset(disp, _gloffset_TexCoord2dv));
+static INLINE _glptr_TexCoord2dv GET_TexCoord2dv(struct _glapi_table *disp) {
+   return (_glptr_TexCoord2dv) (GET_by_offset(disp, _gloffset_TexCoord2dv));
 }
 
-static inline void
-SET_TexCoord2dv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_TexCoord2dv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_TexCoord2f)(GLfloat, GLfloat);
 #define CALL_TexCoord2f(disp, parameters) \
     (* GET_TexCoord2f(disp)) parameters
-static inline _glptr_TexCoord2f
-GET_TexCoord2f(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord2f) (GET_by_offset(disp, _gloffset_TexCoord2f));
+static INLINE _glptr_TexCoord2f GET_TexCoord2f(struct _glapi_table *disp) {
+   return (_glptr_TexCoord2f) (GET_by_offset(disp, _gloffset_TexCoord2f));
 }
 
-static inline void
-SET_TexCoord2f(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_TexCoord2f, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_TexCoord2fv)(const GLfloat *);
 #define CALL_TexCoord2fv(disp, parameters) \
     (* GET_TexCoord2fv(disp)) parameters
-static inline _glptr_TexCoord2fv
-GET_TexCoord2fv(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord2fv) (GET_by_offset(disp, _gloffset_TexCoord2fv));
+static INLINE _glptr_TexCoord2fv GET_TexCoord2fv(struct _glapi_table *disp) {
+   return (_glptr_TexCoord2fv) (GET_by_offset(disp, _gloffset_TexCoord2fv));
 }
 
-static inline void
-SET_TexCoord2fv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_TexCoord2fv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_TexCoord2i)(GLint, GLint);
 #define CALL_TexCoord2i(disp, parameters) \
     (* GET_TexCoord2i(disp)) parameters
-static inline _glptr_TexCoord2i
-GET_TexCoord2i(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord2i) (GET_by_offset(disp, _gloffset_TexCoord2i));
+static INLINE _glptr_TexCoord2i GET_TexCoord2i(struct _glapi_table *disp) {
+   return (_glptr_TexCoord2i) (GET_by_offset(disp, _gloffset_TexCoord2i));
 }
 
-static inline void
-SET_TexCoord2i(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_TexCoord2i, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_TexCoord2iv)(const GLint *);
 #define CALL_TexCoord2iv(disp, parameters) \
     (* GET_TexCoord2iv(disp)) parameters
-static inline _glptr_TexCoord2iv
-GET_TexCoord2iv(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord2iv) (GET_by_offset(disp, _gloffset_TexCoord2iv));
+static INLINE _glptr_TexCoord2iv GET_TexCoord2iv(struct _glapi_table *disp) {
+   return (_glptr_TexCoord2iv) (GET_by_offset(disp, _gloffset_TexCoord2iv));
 }
 
-static inline void
-SET_TexCoord2iv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (const GLint *))
-{
-    SET_by_offset(disp, _gloffset_TexCoord2iv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_TexCoord2s)(GLshort, GLshort);
 #define CALL_TexCoord2s(disp, parameters) \
     (* GET_TexCoord2s(disp)) parameters
-static inline _glptr_TexCoord2s
-GET_TexCoord2s(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord2s) (GET_by_offset(disp, _gloffset_TexCoord2s));
+static INLINE _glptr_TexCoord2s GET_TexCoord2s(struct _glapi_table *disp) {
+   return (_glptr_TexCoord2s) (GET_by_offset(disp, _gloffset_TexCoord2s));
 }
 
-static inline void
-SET_TexCoord2s(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLshort, GLshort))
-{
-    SET_by_offset(disp, _gloffset_TexCoord2s, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_TexCoord2sv)(const GLshort *);
 #define CALL_TexCoord2sv(disp, parameters) \
     (* GET_TexCoord2sv(disp)) parameters
-static inline _glptr_TexCoord2sv
-GET_TexCoord2sv(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord2sv) (GET_by_offset(disp, _gloffset_TexCoord2sv));
+static INLINE _glptr_TexCoord2sv GET_TexCoord2sv(struct _glapi_table *disp) {
+   return (_glptr_TexCoord2sv) (GET_by_offset(disp, _gloffset_TexCoord2sv));
 }
 
-static inline void
-SET_TexCoord2sv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_TexCoord2sv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_TexCoord3d)(GLdouble, GLdouble, GLdouble);
 #define CALL_TexCoord3d(disp, parameters) \
     (* GET_TexCoord3d(disp)) parameters
-static inline _glptr_TexCoord3d
-GET_TexCoord3d(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord3d) (GET_by_offset(disp, _gloffset_TexCoord3d));
+static INLINE _glptr_TexCoord3d GET_TexCoord3d(struct _glapi_table *disp) {
+   return (_glptr_TexCoord3d) (GET_by_offset(disp, _gloffset_TexCoord3d));
 }
 
-static inline void
-SET_TexCoord3d(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLdouble, GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_TexCoord3d, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_TexCoord3dv)(const GLdouble *);
 #define CALL_TexCoord3dv(disp, parameters) \
     (* GET_TexCoord3dv(disp)) parameters
-static inline _glptr_TexCoord3dv
-GET_TexCoord3dv(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord3dv) (GET_by_offset(disp, _gloffset_TexCoord3dv));
+static INLINE _glptr_TexCoord3dv GET_TexCoord3dv(struct _glapi_table *disp) {
+   return (_glptr_TexCoord3dv) (GET_by_offset(disp, _gloffset_TexCoord3dv));
 }
 
-static inline void
-SET_TexCoord3dv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_TexCoord3dv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_TexCoord3f)(GLfloat, GLfloat, GLfloat);
 #define CALL_TexCoord3f(disp, parameters) \
     (* GET_TexCoord3f(disp)) parameters
-static inline _glptr_TexCoord3f
-GET_TexCoord3f(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord3f) (GET_by_offset(disp, _gloffset_TexCoord3f));
+static INLINE _glptr_TexCoord3f GET_TexCoord3f(struct _glapi_table *disp) {
+   return (_glptr_TexCoord3f) (GET_by_offset(disp, _gloffset_TexCoord3f));
 }
 
-static inline void
-SET_TexCoord3f(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLfloat, GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_TexCoord3f, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_TexCoord3fv)(const GLfloat *);
 #define CALL_TexCoord3fv(disp, parameters) \
     (* GET_TexCoord3fv(disp)) parameters
-static inline _glptr_TexCoord3fv
-GET_TexCoord3fv(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord3fv) (GET_by_offset(disp, _gloffset_TexCoord3fv));
+static INLINE _glptr_TexCoord3fv GET_TexCoord3fv(struct _glapi_table *disp) {
+   return (_glptr_TexCoord3fv) (GET_by_offset(disp, _gloffset_TexCoord3fv));
 }
 
-static inline void
-SET_TexCoord3fv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_TexCoord3fv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_TexCoord3i)(GLint, GLint, GLint);
 #define CALL_TexCoord3i(disp, parameters) \
     (* GET_TexCoord3i(disp)) parameters
-static inline _glptr_TexCoord3i
-GET_TexCoord3i(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord3i) (GET_by_offset(disp, _gloffset_TexCoord3i));
+static INLINE _glptr_TexCoord3i GET_TexCoord3i(struct _glapi_table *disp) {
+   return (_glptr_TexCoord3i) (GET_by_offset(disp, _gloffset_TexCoord3i));
 }
 
-static inline void
-SET_TexCoord3i(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLint, GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_TexCoord3i, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_TexCoord3iv)(const GLint *);
 #define CALL_TexCoord3iv(disp, parameters) \
     (* GET_TexCoord3iv(disp)) parameters
-static inline _glptr_TexCoord3iv
-GET_TexCoord3iv(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord3iv) (GET_by_offset(disp, _gloffset_TexCoord3iv));
+static INLINE _glptr_TexCoord3iv GET_TexCoord3iv(struct _glapi_table *disp) {
+   return (_glptr_TexCoord3iv) (GET_by_offset(disp, _gloffset_TexCoord3iv));
 }
 
-static inline void
-SET_TexCoord3iv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (const GLint *))
-{
-    SET_by_offset(disp, _gloffset_TexCoord3iv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_TexCoord3s)(GLshort, GLshort, GLshort);
 #define CALL_TexCoord3s(disp, parameters) \
     (* GET_TexCoord3s(disp)) parameters
-static inline _glptr_TexCoord3s
-GET_TexCoord3s(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord3s) (GET_by_offset(disp, _gloffset_TexCoord3s));
+static INLINE _glptr_TexCoord3s GET_TexCoord3s(struct _glapi_table *disp) {
+   return (_glptr_TexCoord3s) (GET_by_offset(disp, _gloffset_TexCoord3s));
 }
 
-static inline void
-SET_TexCoord3s(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLshort, GLshort, GLshort))
-{
-    SET_by_offset(disp, _gloffset_TexCoord3s, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_TexCoord3sv)(const GLshort *);
 #define CALL_TexCoord3sv(disp, parameters) \
     (* GET_TexCoord3sv(disp)) parameters
-static inline _glptr_TexCoord3sv
-GET_TexCoord3sv(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord3sv) (GET_by_offset(disp, _gloffset_TexCoord3sv));
+static INLINE _glptr_TexCoord3sv GET_TexCoord3sv(struct _glapi_table *disp) {
+   return (_glptr_TexCoord3sv) (GET_by_offset(disp, _gloffset_TexCoord3sv));
 }
 
-static inline void
-SET_TexCoord3sv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_TexCoord3sv, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_TexCoord4d)(GLdouble, GLdouble, GLdouble, GLdouble);
 #define CALL_TexCoord4d(disp, parameters) \
     (* GET_TexCoord4d(disp)) parameters
-static inline _glptr_TexCoord4d
-GET_TexCoord4d(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord4d) (GET_by_offset(disp, _gloffset_TexCoord4d));
+static INLINE _glptr_TexCoord4d GET_TexCoord4d(struct _glapi_table *disp) {
+   return (_glptr_TexCoord4d) (GET_by_offset(disp, _gloffset_TexCoord4d));
 }
 
-static inline void
-SET_TexCoord4d(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLdouble, GLdouble, GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_TexCoord4d, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_TexCoord4dv)(const GLdouble *);
 #define CALL_TexCoord4dv(disp, parameters) \
     (* GET_TexCoord4dv(disp)) parameters
-static inline _glptr_TexCoord4dv
-GET_TexCoord4dv(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord4dv) (GET_by_offset(disp, _gloffset_TexCoord4dv));
+static INLINE _glptr_TexCoord4dv GET_TexCoord4dv(struct _glapi_table *disp) {
+   return (_glptr_TexCoord4dv) (GET_by_offset(disp, _gloffset_TexCoord4dv));
 }
 
-static inline void
-SET_TexCoord4dv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_TexCoord4dv, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_TexCoord4f)(GLfloat, GLfloat, GLfloat, GLfloat);
 #define CALL_TexCoord4f(disp, parameters) \
     (* GET_TexCoord4f(disp)) parameters
-static inline _glptr_TexCoord4f
-GET_TexCoord4f(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord4f) (GET_by_offset(disp, _gloffset_TexCoord4f));
+static INLINE _glptr_TexCoord4f GET_TexCoord4f(struct _glapi_table *disp) {
+   return (_glptr_TexCoord4f) (GET_by_offset(disp, _gloffset_TexCoord4f));
 }
 
-static inline void
-SET_TexCoord4f(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLfloat, GLfloat, GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_TexCoord4f, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_TexCoord4fv)(const GLfloat *);
 #define CALL_TexCoord4fv(disp, parameters) \
     (* GET_TexCoord4fv(disp)) parameters
-static inline _glptr_TexCoord4fv
-GET_TexCoord4fv(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord4fv) (GET_by_offset(disp, _gloffset_TexCoord4fv));
+static INLINE _glptr_TexCoord4fv GET_TexCoord4fv(struct _glapi_table *disp) {
+   return (_glptr_TexCoord4fv) (GET_by_offset(disp, _gloffset_TexCoord4fv));
 }
 
-static inline void
-SET_TexCoord4fv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_TexCoord4fv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_TexCoord4i)(GLint, GLint, GLint, GLint);
 #define CALL_TexCoord4i(disp, parameters) \
     (* GET_TexCoord4i(disp)) parameters
-static inline _glptr_TexCoord4i
-GET_TexCoord4i(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord4i) (GET_by_offset(disp, _gloffset_TexCoord4i));
+static INLINE _glptr_TexCoord4i GET_TexCoord4i(struct _glapi_table *disp) {
+   return (_glptr_TexCoord4i) (GET_by_offset(disp, _gloffset_TexCoord4i));
 }
 
-static inline void
-SET_TexCoord4i(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLint, GLint, GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_TexCoord4i, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_TexCoord4iv)(const GLint *);
 #define CALL_TexCoord4iv(disp, parameters) \
     (* GET_TexCoord4iv(disp)) parameters
-static inline _glptr_TexCoord4iv
-GET_TexCoord4iv(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord4iv) (GET_by_offset(disp, _gloffset_TexCoord4iv));
+static INLINE _glptr_TexCoord4iv GET_TexCoord4iv(struct _glapi_table *disp) {
+   return (_glptr_TexCoord4iv) (GET_by_offset(disp, _gloffset_TexCoord4iv));
 }
 
-static inline void
-SET_TexCoord4iv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (const GLint *))
-{
-    SET_by_offset(disp, _gloffset_TexCoord4iv, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_TexCoord4s)(GLshort, GLshort, GLshort, GLshort);
 #define CALL_TexCoord4s(disp, parameters) \
     (* GET_TexCoord4s(disp)) parameters
-static inline _glptr_TexCoord4s
-GET_TexCoord4s(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord4s) (GET_by_offset(disp, _gloffset_TexCoord4s));
+static INLINE _glptr_TexCoord4s GET_TexCoord4s(struct _glapi_table *disp) {
+   return (_glptr_TexCoord4s) (GET_by_offset(disp, _gloffset_TexCoord4s));
 }
 
-static inline void
-SET_TexCoord4s(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLshort, GLshort, GLshort, GLshort))
-{
-    SET_by_offset(disp, _gloffset_TexCoord4s, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_TexCoord4sv)(const GLshort *);
 #define CALL_TexCoord4sv(disp, parameters) \
     (* GET_TexCoord4sv(disp)) parameters
-static inline _glptr_TexCoord4sv
-GET_TexCoord4sv(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoord4sv) (GET_by_offset(disp, _gloffset_TexCoord4sv));
+static INLINE _glptr_TexCoord4sv GET_TexCoord4sv(struct _glapi_table *disp) {
+   return (_glptr_TexCoord4sv) (GET_by_offset(disp, _gloffset_TexCoord4sv));
 }
 
-static inline void
-SET_TexCoord4sv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_TexCoord4sv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Vertex2d)(GLdouble, GLdouble);
 #define CALL_Vertex2d(disp, parameters) \
     (* GET_Vertex2d(disp)) parameters
-static inline _glptr_Vertex2d
-GET_Vertex2d(struct _glapi_table *disp)
-{
-    return (_glptr_Vertex2d) (GET_by_offset(disp, _gloffset_Vertex2d));
+static INLINE _glptr_Vertex2d GET_Vertex2d(struct _glapi_table *disp) {
+   return (_glptr_Vertex2d) (GET_by_offset(disp, _gloffset_Vertex2d));
 }
 
-static inline void
-SET_Vertex2d(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_Vertex2d, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_Vertex2dv)(const GLdouble *);
 #define CALL_Vertex2dv(disp, parameters) \
     (* GET_Vertex2dv(disp)) parameters
-static inline _glptr_Vertex2dv
-GET_Vertex2dv(struct _glapi_table *disp)
-{
-    return (_glptr_Vertex2dv) (GET_by_offset(disp, _gloffset_Vertex2dv));
+static INLINE _glptr_Vertex2dv GET_Vertex2dv(struct _glapi_table *disp) {
+   return (_glptr_Vertex2dv) (GET_by_offset(disp, _gloffset_Vertex2dv));
 }
 
-static inline void
-SET_Vertex2dv(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_Vertex2dv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Vertex2f)(GLfloat, GLfloat);
 #define CALL_Vertex2f(disp, parameters) \
     (* GET_Vertex2f(disp)) parameters
-static inline _glptr_Vertex2f
-GET_Vertex2f(struct _glapi_table *disp)
-{
-    return (_glptr_Vertex2f) (GET_by_offset(disp, _gloffset_Vertex2f));
+static INLINE _glptr_Vertex2f GET_Vertex2f(struct _glapi_table *disp) {
+   return (_glptr_Vertex2f) (GET_by_offset(disp, _gloffset_Vertex2f));
 }
 
-static inline void
-SET_Vertex2f(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_Vertex2f, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_Vertex2fv)(const GLfloat *);
 #define CALL_Vertex2fv(disp, parameters) \
     (* GET_Vertex2fv(disp)) parameters
-static inline _glptr_Vertex2fv
-GET_Vertex2fv(struct _glapi_table *disp)
-{
-    return (_glptr_Vertex2fv) (GET_by_offset(disp, _gloffset_Vertex2fv));
+static INLINE _glptr_Vertex2fv GET_Vertex2fv(struct _glapi_table *disp) {
+   return (_glptr_Vertex2fv) (GET_by_offset(disp, _gloffset_Vertex2fv));
 }
 
-static inline void
-SET_Vertex2fv(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_Vertex2fv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Vertex2i)(GLint, GLint);
 #define CALL_Vertex2i(disp, parameters) \
     (* GET_Vertex2i(disp)) parameters
-static inline _glptr_Vertex2i
-GET_Vertex2i(struct _glapi_table *disp)
-{
-    return (_glptr_Vertex2i) (GET_by_offset(disp, _gloffset_Vertex2i));
+static INLINE _glptr_Vertex2i GET_Vertex2i(struct _glapi_table *disp) {
+   return (_glptr_Vertex2i) (GET_by_offset(disp, _gloffset_Vertex2i));
 }
 
-static inline void
-SET_Vertex2i(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_Vertex2i, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_Vertex2iv)(const GLint *);
 #define CALL_Vertex2iv(disp, parameters) \
     (* GET_Vertex2iv(disp)) parameters
-static inline _glptr_Vertex2iv
-GET_Vertex2iv(struct _glapi_table *disp)
-{
-    return (_glptr_Vertex2iv) (GET_by_offset(disp, _gloffset_Vertex2iv));
+static INLINE _glptr_Vertex2iv GET_Vertex2iv(struct _glapi_table *disp) {
+   return (_glptr_Vertex2iv) (GET_by_offset(disp, _gloffset_Vertex2iv));
 }
 
-static inline void
-SET_Vertex2iv(struct _glapi_table *disp, void (GLAPIENTRYP fn) (const GLint *))
-{
-    SET_by_offset(disp, _gloffset_Vertex2iv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Vertex2s)(GLshort, GLshort);
 #define CALL_Vertex2s(disp, parameters) \
     (* GET_Vertex2s(disp)) parameters
-static inline _glptr_Vertex2s
-GET_Vertex2s(struct _glapi_table *disp)
-{
-    return (_glptr_Vertex2s) (GET_by_offset(disp, _gloffset_Vertex2s));
+static INLINE _glptr_Vertex2s GET_Vertex2s(struct _glapi_table *disp) {
+   return (_glptr_Vertex2s) (GET_by_offset(disp, _gloffset_Vertex2s));
 }
 
-static inline void
-SET_Vertex2s(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLshort, GLshort))
-{
-    SET_by_offset(disp, _gloffset_Vertex2s, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_Vertex2sv)(const GLshort *);
 #define CALL_Vertex2sv(disp, parameters) \
     (* GET_Vertex2sv(disp)) parameters
-static inline _glptr_Vertex2sv
-GET_Vertex2sv(struct _glapi_table *disp)
-{
-    return (_glptr_Vertex2sv) (GET_by_offset(disp, _gloffset_Vertex2sv));
+static INLINE _glptr_Vertex2sv GET_Vertex2sv(struct _glapi_table *disp) {
+   return (_glptr_Vertex2sv) (GET_by_offset(disp, _gloffset_Vertex2sv));
 }
 
-static inline void
-SET_Vertex2sv(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_Vertex2sv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Vertex3d)(GLdouble, GLdouble, GLdouble);
 #define CALL_Vertex3d(disp, parameters) \
     (* GET_Vertex3d(disp)) parameters
-static inline _glptr_Vertex3d
-GET_Vertex3d(struct _glapi_table *disp)
-{
-    return (_glptr_Vertex3d) (GET_by_offset(disp, _gloffset_Vertex3d));
+static INLINE _glptr_Vertex3d GET_Vertex3d(struct _glapi_table *disp) {
+   return (_glptr_Vertex3d) (GET_by_offset(disp, _gloffset_Vertex3d));
 }
 
-static inline void
-SET_Vertex3d(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLdouble, GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_Vertex3d, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_Vertex3dv)(const GLdouble *);
 #define CALL_Vertex3dv(disp, parameters) \
     (* GET_Vertex3dv(disp)) parameters
-static inline _glptr_Vertex3dv
-GET_Vertex3dv(struct _glapi_table *disp)
-{
-    return (_glptr_Vertex3dv) (GET_by_offset(disp, _gloffset_Vertex3dv));
+static INLINE _glptr_Vertex3dv GET_Vertex3dv(struct _glapi_table *disp) {
+   return (_glptr_Vertex3dv) (GET_by_offset(disp, _gloffset_Vertex3dv));
 }
 
-static inline void
-SET_Vertex3dv(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_Vertex3dv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Vertex3f)(GLfloat, GLfloat, GLfloat);
 #define CALL_Vertex3f(disp, parameters) \
     (* GET_Vertex3f(disp)) parameters
-static inline _glptr_Vertex3f
-GET_Vertex3f(struct _glapi_table *disp)
-{
-    return (_glptr_Vertex3f) (GET_by_offset(disp, _gloffset_Vertex3f));
+static INLINE _glptr_Vertex3f GET_Vertex3f(struct _glapi_table *disp) {
+   return (_glptr_Vertex3f) (GET_by_offset(disp, _gloffset_Vertex3f));
 }
 
-static inline void
-SET_Vertex3f(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLfloat, GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_Vertex3f, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_Vertex3fv)(const GLfloat *);
 #define CALL_Vertex3fv(disp, parameters) \
     (* GET_Vertex3fv(disp)) parameters
-static inline _glptr_Vertex3fv
-GET_Vertex3fv(struct _glapi_table *disp)
-{
-    return (_glptr_Vertex3fv) (GET_by_offset(disp, _gloffset_Vertex3fv));
+static INLINE _glptr_Vertex3fv GET_Vertex3fv(struct _glapi_table *disp) {
+   return (_glptr_Vertex3fv) (GET_by_offset(disp, _gloffset_Vertex3fv));
 }
 
-static inline void
-SET_Vertex3fv(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_Vertex3fv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Vertex3i)(GLint, GLint, GLint);
 #define CALL_Vertex3i(disp, parameters) \
     (* GET_Vertex3i(disp)) parameters
-static inline _glptr_Vertex3i
-GET_Vertex3i(struct _glapi_table *disp)
-{
-    return (_glptr_Vertex3i) (GET_by_offset(disp, _gloffset_Vertex3i));
+static INLINE _glptr_Vertex3i GET_Vertex3i(struct _glapi_table *disp) {
+   return (_glptr_Vertex3i) (GET_by_offset(disp, _gloffset_Vertex3i));
 }
 
-static inline void
-SET_Vertex3i(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLint, GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_Vertex3i, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_Vertex3iv)(const GLint *);
 #define CALL_Vertex3iv(disp, parameters) \
     (* GET_Vertex3iv(disp)) parameters
-static inline _glptr_Vertex3iv
-GET_Vertex3iv(struct _glapi_table *disp)
-{
-    return (_glptr_Vertex3iv) (GET_by_offset(disp, _gloffset_Vertex3iv));
+static INLINE _glptr_Vertex3iv GET_Vertex3iv(struct _glapi_table *disp) {
+   return (_glptr_Vertex3iv) (GET_by_offset(disp, _gloffset_Vertex3iv));
 }
 
-static inline void
-SET_Vertex3iv(struct _glapi_table *disp, void (GLAPIENTRYP fn) (const GLint *))
-{
-    SET_by_offset(disp, _gloffset_Vertex3iv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Vertex3s)(GLshort, GLshort, GLshort);
 #define CALL_Vertex3s(disp, parameters) \
     (* GET_Vertex3s(disp)) parameters
-static inline _glptr_Vertex3s
-GET_Vertex3s(struct _glapi_table *disp)
-{
-    return (_glptr_Vertex3s) (GET_by_offset(disp, _gloffset_Vertex3s));
+static INLINE _glptr_Vertex3s GET_Vertex3s(struct _glapi_table *disp) {
+   return (_glptr_Vertex3s) (GET_by_offset(disp, _gloffset_Vertex3s));
 }
 
-static inline void
-SET_Vertex3s(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLshort, GLshort, GLshort))
-{
-    SET_by_offset(disp, _gloffset_Vertex3s, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_Vertex3sv)(const GLshort *);
 #define CALL_Vertex3sv(disp, parameters) \
     (* GET_Vertex3sv(disp)) parameters
-static inline _glptr_Vertex3sv
-GET_Vertex3sv(struct _glapi_table *disp)
-{
-    return (_glptr_Vertex3sv) (GET_by_offset(disp, _gloffset_Vertex3sv));
+static INLINE _glptr_Vertex3sv GET_Vertex3sv(struct _glapi_table *disp) {
+   return (_glptr_Vertex3sv) (GET_by_offset(disp, _gloffset_Vertex3sv));
 }
 
-static inline void
-SET_Vertex3sv(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_Vertex3sv, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_Vertex4d)(GLdouble, GLdouble, GLdouble, GLdouble);
 #define CALL_Vertex4d(disp, parameters) \
     (* GET_Vertex4d(disp)) parameters
-static inline _glptr_Vertex4d
-GET_Vertex4d(struct _glapi_table *disp)
-{
-    return (_glptr_Vertex4d) (GET_by_offset(disp, _gloffset_Vertex4d));
+static INLINE _glptr_Vertex4d GET_Vertex4d(struct _glapi_table *disp) {
+   return (_glptr_Vertex4d) (GET_by_offset(disp, _gloffset_Vertex4d));
 }
 
-static inline void
-SET_Vertex4d(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLdouble, GLdouble, GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_Vertex4d, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_Vertex4dv)(const GLdouble *);
 #define CALL_Vertex4dv(disp, parameters) \
     (* GET_Vertex4dv(disp)) parameters
-static inline _glptr_Vertex4dv
-GET_Vertex4dv(struct _glapi_table *disp)
-{
-    return (_glptr_Vertex4dv) (GET_by_offset(disp, _gloffset_Vertex4dv));
+static INLINE _glptr_Vertex4dv GET_Vertex4dv(struct _glapi_table *disp) {
+   return (_glptr_Vertex4dv) (GET_by_offset(disp, _gloffset_Vertex4dv));
 }
 
-static inline void
-SET_Vertex4dv(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_Vertex4dv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Vertex4f)(GLfloat, GLfloat, GLfloat, GLfloat);
 #define CALL_Vertex4f(disp, parameters) \
     (* GET_Vertex4f(disp)) parameters
-static inline _glptr_Vertex4f
-GET_Vertex4f(struct _glapi_table *disp)
-{
-    return (_glptr_Vertex4f) (GET_by_offset(disp, _gloffset_Vertex4f));
+static INLINE _glptr_Vertex4f GET_Vertex4f(struct _glapi_table *disp) {
+   return (_glptr_Vertex4f) (GET_by_offset(disp, _gloffset_Vertex4f));
 }
 
-static inline void
-SET_Vertex4f(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLfloat, GLfloat, GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_Vertex4f, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_Vertex4fv)(const GLfloat *);
 #define CALL_Vertex4fv(disp, parameters) \
     (* GET_Vertex4fv(disp)) parameters
-static inline _glptr_Vertex4fv
-GET_Vertex4fv(struct _glapi_table *disp)
-{
-    return (_glptr_Vertex4fv) (GET_by_offset(disp, _gloffset_Vertex4fv));
+static INLINE _glptr_Vertex4fv GET_Vertex4fv(struct _glapi_table *disp) {
+   return (_glptr_Vertex4fv) (GET_by_offset(disp, _gloffset_Vertex4fv));
 }
 
-static inline void
-SET_Vertex4fv(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_Vertex4fv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Vertex4i)(GLint, GLint, GLint, GLint);
 #define CALL_Vertex4i(disp, parameters) \
     (* GET_Vertex4i(disp)) parameters
-static inline _glptr_Vertex4i
-GET_Vertex4i(struct _glapi_table *disp)
-{
-    return (_glptr_Vertex4i) (GET_by_offset(disp, _gloffset_Vertex4i));
+static INLINE _glptr_Vertex4i GET_Vertex4i(struct _glapi_table *disp) {
+   return (_glptr_Vertex4i) (GET_by_offset(disp, _gloffset_Vertex4i));
 }
 
-static inline void
-SET_Vertex4i(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLint, GLint, GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_Vertex4i, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_Vertex4iv)(const GLint *);
 #define CALL_Vertex4iv(disp, parameters) \
     (* GET_Vertex4iv(disp)) parameters
-static inline _glptr_Vertex4iv
-GET_Vertex4iv(struct _glapi_table *disp)
-{
-    return (_glptr_Vertex4iv) (GET_by_offset(disp, _gloffset_Vertex4iv));
+static INLINE _glptr_Vertex4iv GET_Vertex4iv(struct _glapi_table *disp) {
+   return (_glptr_Vertex4iv) (GET_by_offset(disp, _gloffset_Vertex4iv));
 }
 
-static inline void
-SET_Vertex4iv(struct _glapi_table *disp, void (GLAPIENTRYP fn) (const GLint *))
-{
-    SET_by_offset(disp, _gloffset_Vertex4iv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Vertex4s)(GLshort, GLshort, GLshort, GLshort);
 #define CALL_Vertex4s(disp, parameters) \
     (* GET_Vertex4s(disp)) parameters
-static inline _glptr_Vertex4s
-GET_Vertex4s(struct _glapi_table *disp)
-{
-    return (_glptr_Vertex4s) (GET_by_offset(disp, _gloffset_Vertex4s));
+static INLINE _glptr_Vertex4s GET_Vertex4s(struct _glapi_table *disp) {
+   return (_glptr_Vertex4s) (GET_by_offset(disp, _gloffset_Vertex4s));
 }
 
-static inline void
-SET_Vertex4s(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLshort, GLshort, GLshort, GLshort))
-{
-    SET_by_offset(disp, _gloffset_Vertex4s, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_Vertex4sv)(const GLshort *);
 #define CALL_Vertex4sv(disp, parameters) \
     (* GET_Vertex4sv(disp)) parameters
-static inline _glptr_Vertex4sv
-GET_Vertex4sv(struct _glapi_table *disp)
-{
-    return (_glptr_Vertex4sv) (GET_by_offset(disp, _gloffset_Vertex4sv));
+static INLINE _glptr_Vertex4sv GET_Vertex4sv(struct _glapi_table *disp) {
+   return (_glptr_Vertex4sv) (GET_by_offset(disp, _gloffset_Vertex4sv));
 }
 
-static inline void
-SET_Vertex4sv(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_Vertex4sv, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_ClipPlane)(GLenum, const GLdouble *);
 #define CALL_ClipPlane(disp, parameters) \
     (* GET_ClipPlane(disp)) parameters
-static inline _glptr_ClipPlane
-GET_ClipPlane(struct _glapi_table *disp)
-{
-    return (_glptr_ClipPlane) (GET_by_offset(disp, _gloffset_ClipPlane));
+static INLINE _glptr_ClipPlane GET_ClipPlane(struct _glapi_table *disp) {
+   return (_glptr_ClipPlane) (GET_by_offset(disp, _gloffset_ClipPlane));
 }
 
-static inline void
-SET_ClipPlane(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (GLenum, const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_ClipPlane, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_ColorMaterial)(GLenum, GLenum);
 #define CALL_ColorMaterial(disp, parameters) \
     (* GET_ColorMaterial(disp)) parameters
-static inline _glptr_ColorMaterial
-GET_ColorMaterial(struct _glapi_table *disp)
-{
-    return (_glptr_ColorMaterial) (GET_by_offset
-                                   (disp, _gloffset_ColorMaterial));
+static INLINE _glptr_ColorMaterial GET_ColorMaterial(struct _glapi_table *disp) {
+   return (_glptr_ColorMaterial) (GET_by_offset(disp, _gloffset_ColorMaterial));
 }
 
-static inline void
-SET_ColorMaterial(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, GLenum))
-{
-    SET_by_offset(disp, _gloffset_ColorMaterial, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_CullFace)(GLenum);
 #define CALL_CullFace(disp, parameters) \
     (* GET_CullFace(disp)) parameters
-static inline _glptr_CullFace
-GET_CullFace(struct _glapi_table *disp)
-{
-    return (_glptr_CullFace) (GET_by_offset(disp, _gloffset_CullFace));
+static INLINE _glptr_CullFace GET_CullFace(struct _glapi_table *disp) {
+   return (_glptr_CullFace) (GET_by_offset(disp, _gloffset_CullFace));
 }
 
-static inline void
-SET_CullFace(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_CullFace, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Fogf)(GLenum, GLfloat);
 #define CALL_Fogf(disp, parameters) \
     (* GET_Fogf(disp)) parameters
-static inline _glptr_Fogf
-GET_Fogf(struct _glapi_table *disp)
-{
-    return (_glptr_Fogf) (GET_by_offset(disp, _gloffset_Fogf));
+static INLINE _glptr_Fogf GET_Fogf(struct _glapi_table *disp) {
+   return (_glptr_Fogf) (GET_by_offset(disp, _gloffset_Fogf));
 }
 
-static inline void
-SET_Fogf(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLenum, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_Fogf, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_Fogfv)(GLenum, const GLfloat *);
 #define CALL_Fogfv(disp, parameters) \
     (* GET_Fogfv(disp)) parameters
-static inline _glptr_Fogfv
-GET_Fogfv(struct _glapi_table *disp)
-{
-    return (_glptr_Fogfv) (GET_by_offset(disp, _gloffset_Fogfv));
+static INLINE _glptr_Fogfv GET_Fogfv(struct _glapi_table *disp) {
+   return (_glptr_Fogfv) (GET_by_offset(disp, _gloffset_Fogfv));
 }
 
-static inline void
-SET_Fogfv(struct _glapi_table *disp,
-          void (GLAPIENTRYP fn) (GLenum, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_Fogfv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Fogi)(GLenum, GLint);
 #define CALL_Fogi(disp, parameters) \
     (* GET_Fogi(disp)) parameters
-static inline _glptr_Fogi
-GET_Fogi(struct _glapi_table *disp)
-{
-    return (_glptr_Fogi) (GET_by_offset(disp, _gloffset_Fogi));
+static INLINE _glptr_Fogi GET_Fogi(struct _glapi_table *disp) {
+   return (_glptr_Fogi) (GET_by_offset(disp, _gloffset_Fogi));
 }
 
-static inline void
-SET_Fogi(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLenum, GLint))
-{
-    SET_by_offset(disp, _gloffset_Fogi, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_Fogiv)(GLenum, const GLint *);
 #define CALL_Fogiv(disp, parameters) \
     (* GET_Fogiv(disp)) parameters
-static inline _glptr_Fogiv
-GET_Fogiv(struct _glapi_table *disp)
-{
-    return (_glptr_Fogiv) (GET_by_offset(disp, _gloffset_Fogiv));
+static INLINE _glptr_Fogiv GET_Fogiv(struct _glapi_table *disp) {
+   return (_glptr_Fogiv) (GET_by_offset(disp, _gloffset_Fogiv));
 }
 
-static inline void
-SET_Fogiv(struct _glapi_table *disp,
-          void (GLAPIENTRYP fn) (GLenum, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_Fogiv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_FrontFace)(GLenum);
 #define CALL_FrontFace(disp, parameters) \
     (* GET_FrontFace(disp)) parameters
-static inline _glptr_FrontFace
-GET_FrontFace(struct _glapi_table *disp)
-{
-    return (_glptr_FrontFace) (GET_by_offset(disp, _gloffset_FrontFace));
+static INLINE _glptr_FrontFace GET_FrontFace(struct _glapi_table *disp) {
+   return (_glptr_FrontFace) (GET_by_offset(disp, _gloffset_FrontFace));
 }
 
-static inline void
-SET_FrontFace(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_FrontFace, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Hint)(GLenum, GLenum);
 #define CALL_Hint(disp, parameters) \
     (* GET_Hint(disp)) parameters
-static inline _glptr_Hint
-GET_Hint(struct _glapi_table *disp)
-{
-    return (_glptr_Hint) (GET_by_offset(disp, _gloffset_Hint));
+static INLINE _glptr_Hint GET_Hint(struct _glapi_table *disp) {
+   return (_glptr_Hint) (GET_by_offset(disp, _gloffset_Hint));
 }
 
-static inline void
-SET_Hint(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLenum, GLenum))
-{
-    SET_by_offset(disp, _gloffset_Hint, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Lightf)(GLenum, GLenum, GLfloat);
 #define CALL_Lightf(disp, parameters) \
     (* GET_Lightf(disp)) parameters
-static inline _glptr_Lightf
-GET_Lightf(struct _glapi_table *disp)
-{
-    return (_glptr_Lightf) (GET_by_offset(disp, _gloffset_Lightf));
+static INLINE _glptr_Lightf GET_Lightf(struct _glapi_table *disp) {
+   return (_glptr_Lightf) (GET_by_offset(disp, _gloffset_Lightf));
 }
 
-static inline void
-SET_Lightf(struct _glapi_table *disp,
-           void (GLAPIENTRYP fn) (GLenum, GLenum, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_Lightf, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_Lightfv)(GLenum, GLenum, const GLfloat *);
 #define CALL_Lightfv(disp, parameters) \
     (* GET_Lightfv(disp)) parameters
-static inline _glptr_Lightfv
-GET_Lightfv(struct _glapi_table *disp)
-{
-    return (_glptr_Lightfv) (GET_by_offset(disp, _gloffset_Lightfv));
+static INLINE _glptr_Lightfv GET_Lightfv(struct _glapi_table *disp) {
+   return (_glptr_Lightfv) (GET_by_offset(disp, _gloffset_Lightfv));
 }
 
-static inline void
-SET_Lightfv(struct _glapi_table *disp,
-            void (GLAPIENTRYP fn) (GLenum, GLenum, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_Lightfv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Lighti)(GLenum, GLenum, GLint);
 #define CALL_Lighti(disp, parameters) \
     (* GET_Lighti(disp)) parameters
-static inline _glptr_Lighti
-GET_Lighti(struct _glapi_table *disp)
-{
-    return (_glptr_Lighti) (GET_by_offset(disp, _gloffset_Lighti));
+static INLINE _glptr_Lighti GET_Lighti(struct _glapi_table *disp) {
+   return (_glptr_Lighti) (GET_by_offset(disp, _gloffset_Lighti));
 }
 
-static inline void
-SET_Lighti(struct _glapi_table *disp,
-           void (GLAPIENTRYP fn) (GLenum, GLenum, GLint))
-{
-    SET_by_offset(disp, _gloffset_Lighti, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_Lightiv)(GLenum, GLenum, const GLint *);
 #define CALL_Lightiv(disp, parameters) \
     (* GET_Lightiv(disp)) parameters
-static inline _glptr_Lightiv
-GET_Lightiv(struct _glapi_table *disp)
-{
-    return (_glptr_Lightiv) (GET_by_offset(disp, _gloffset_Lightiv));
+static INLINE _glptr_Lightiv GET_Lightiv(struct _glapi_table *disp) {
+   return (_glptr_Lightiv) (GET_by_offset(disp, _gloffset_Lightiv));
 }
 
-static inline void
-SET_Lightiv(struct _glapi_table *disp,
-            void (GLAPIENTRYP fn) (GLenum, GLenum, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_Lightiv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_LightModelf)(GLenum, GLfloat);
 #define CALL_LightModelf(disp, parameters) \
     (* GET_LightModelf(disp)) parameters
-static inline _glptr_LightModelf
-GET_LightModelf(struct _glapi_table *disp)
-{
-    return (_glptr_LightModelf) (GET_by_offset(disp, _gloffset_LightModelf));
+static INLINE _glptr_LightModelf GET_LightModelf(struct _glapi_table *disp) {
+   return (_glptr_LightModelf) (GET_by_offset(disp, _gloffset_LightModelf));
 }
 
-static inline void
-SET_LightModelf(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLenum, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_LightModelf, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_LightModelfv)(GLenum, const GLfloat *);
 #define CALL_LightModelfv(disp, parameters) \
     (* GET_LightModelfv(disp)) parameters
-static inline _glptr_LightModelfv
-GET_LightModelfv(struct _glapi_table *disp)
-{
-    return (_glptr_LightModelfv) (GET_by_offset(disp, _gloffset_LightModelfv));
+static INLINE _glptr_LightModelfv GET_LightModelfv(struct _glapi_table *disp) {
+   return (_glptr_LightModelfv) (GET_by_offset(disp, _gloffset_LightModelfv));
 }
 
-static inline void
-SET_LightModelfv(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLenum, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_LightModelfv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_LightModeli)(GLenum, GLint);
 #define CALL_LightModeli(disp, parameters) \
     (* GET_LightModeli(disp)) parameters
-static inline _glptr_LightModeli
-GET_LightModeli(struct _glapi_table *disp)
-{
-    return (_glptr_LightModeli) (GET_by_offset(disp, _gloffset_LightModeli));
+static INLINE _glptr_LightModeli GET_LightModeli(struct _glapi_table *disp) {
+   return (_glptr_LightModeli) (GET_by_offset(disp, _gloffset_LightModeli));
 }
 
-static inline void
-SET_LightModeli(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLenum, GLint))
-{
-    SET_by_offset(disp, _gloffset_LightModeli, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_LightModeliv)(GLenum, const GLint *);
 #define CALL_LightModeliv(disp, parameters) \
     (* GET_LightModeliv(disp)) parameters
-static inline _glptr_LightModeliv
-GET_LightModeliv(struct _glapi_table *disp)
-{
-    return (_glptr_LightModeliv) (GET_by_offset(disp, _gloffset_LightModeliv));
+static INLINE _glptr_LightModeliv GET_LightModeliv(struct _glapi_table *disp) {
+   return (_glptr_LightModeliv) (GET_by_offset(disp, _gloffset_LightModeliv));
 }
 
-static inline void
-SET_LightModeliv(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLenum, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_LightModeliv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_LineStipple)(GLint, GLushort);
 #define CALL_LineStipple(disp, parameters) \
     (* GET_LineStipple(disp)) parameters
-static inline _glptr_LineStipple
-GET_LineStipple(struct _glapi_table *disp)
-{
-    return (_glptr_LineStipple) (GET_by_offset(disp, _gloffset_LineStipple));
+static INLINE _glptr_LineStipple GET_LineStipple(struct _glapi_table *disp) {
+   return (_glptr_LineStipple) (GET_by_offset(disp, _gloffset_LineStipple));
 }
 
-static inline void
-SET_LineStipple(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLint, GLushort))
-{
-    SET_by_offset(disp, _gloffset_LineStipple, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_LineWidth)(GLfloat);
 #define CALL_LineWidth(disp, parameters) \
     (* GET_LineWidth(disp)) parameters
-static inline _glptr_LineWidth
-GET_LineWidth(struct _glapi_table *disp)
-{
-    return (_glptr_LineWidth) (GET_by_offset(disp, _gloffset_LineWidth));
+static INLINE _glptr_LineWidth GET_LineWidth(struct _glapi_table *disp) {
+   return (_glptr_LineWidth) (GET_by_offset(disp, _gloffset_LineWidth));
 }
 
-static inline void
-SET_LineWidth(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLfloat))
-{
-    SET_by_offset(disp, _gloffset_LineWidth, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Materialf)(GLenum, GLenum, GLfloat);
 #define CALL_Materialf(disp, parameters) \
     (* GET_Materialf(disp)) parameters
-static inline _glptr_Materialf
-GET_Materialf(struct _glapi_table *disp)
-{
-    return (_glptr_Materialf) (GET_by_offset(disp, _gloffset_Materialf));
+static INLINE _glptr_Materialf GET_Materialf(struct _glapi_table *disp) {
+   return (_glptr_Materialf) (GET_by_offset(disp, _gloffset_Materialf));
 }
 
-static inline void
-SET_Materialf(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (GLenum, GLenum, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_Materialf, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_Materialfv)(GLenum, GLenum, const GLfloat *);
 #define CALL_Materialfv(disp, parameters) \
     (* GET_Materialfv(disp)) parameters
-static inline _glptr_Materialfv
-GET_Materialfv(struct _glapi_table *disp)
-{
-    return (_glptr_Materialfv) (GET_by_offset(disp, _gloffset_Materialfv));
+static INLINE _glptr_Materialfv GET_Materialfv(struct _glapi_table *disp) {
+   return (_glptr_Materialfv) (GET_by_offset(disp, _gloffset_Materialfv));
 }
 
-static inline void
-SET_Materialfv(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLenum, GLenum, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_Materialfv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Materiali)(GLenum, GLenum, GLint);
 #define CALL_Materiali(disp, parameters) \
     (* GET_Materiali(disp)) parameters
-static inline _glptr_Materiali
-GET_Materiali(struct _glapi_table *disp)
-{
-    return (_glptr_Materiali) (GET_by_offset(disp, _gloffset_Materiali));
+static INLINE _glptr_Materiali GET_Materiali(struct _glapi_table *disp) {
+   return (_glptr_Materiali) (GET_by_offset(disp, _gloffset_Materiali));
 }
 
-static inline void
-SET_Materiali(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (GLenum, GLenum, GLint))
-{
-    SET_by_offset(disp, _gloffset_Materiali, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_Materialiv)(GLenum, GLenum, const GLint *);
 #define CALL_Materialiv(disp, parameters) \
     (* GET_Materialiv(disp)) parameters
-static inline _glptr_Materialiv
-GET_Materialiv(struct _glapi_table *disp)
-{
-    return (_glptr_Materialiv) (GET_by_offset(disp, _gloffset_Materialiv));
+static INLINE _glptr_Materialiv GET_Materialiv(struct _glapi_table *disp) {
+   return (_glptr_Materialiv) (GET_by_offset(disp, _gloffset_Materialiv));
 }
 
-static inline void
-SET_Materialiv(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLenum, GLenum, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_Materialiv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_PointSize)(GLfloat);
 #define CALL_PointSize(disp, parameters) \
     (* GET_PointSize(disp)) parameters
-static inline _glptr_PointSize
-GET_PointSize(struct _glapi_table *disp)
-{
-    return (_glptr_PointSize) (GET_by_offset(disp, _gloffset_PointSize));
+static INLINE _glptr_PointSize GET_PointSize(struct _glapi_table *disp) {
+   return (_glptr_PointSize) (GET_by_offset(disp, _gloffset_PointSize));
 }
 
-static inline void
-SET_PointSize(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLfloat))
-{
-    SET_by_offset(disp, _gloffset_PointSize, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_PolygonMode)(GLenum, GLenum);
 #define CALL_PolygonMode(disp, parameters) \
     (* GET_PolygonMode(disp)) parameters
-static inline _glptr_PolygonMode
-GET_PolygonMode(struct _glapi_table *disp)
-{
-    return (_glptr_PolygonMode) (GET_by_offset(disp, _gloffset_PolygonMode));
+static INLINE _glptr_PolygonMode GET_PolygonMode(struct _glapi_table *disp) {
+   return (_glptr_PolygonMode) (GET_by_offset(disp, _gloffset_PolygonMode));
 }
 
-static inline void
-SET_PolygonMode(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLenum, GLenum))
-{
-    SET_by_offset(disp, _gloffset_PolygonMode, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_PolygonStipple)(const GLubyte *);
 #define CALL_PolygonStipple(disp, parameters) \
     (* GET_PolygonStipple(disp)) parameters
-static inline _glptr_PolygonStipple
-GET_PolygonStipple(struct _glapi_table *disp)
-{
-    return (_glptr_PolygonStipple) (GET_by_offset
-                                    (disp, _gloffset_PolygonStipple));
+static INLINE _glptr_PolygonStipple GET_PolygonStipple(struct _glapi_table *disp) {
+   return (_glptr_PolygonStipple) (GET_by_offset(disp, _gloffset_PolygonStipple));
 }
 
-static inline void
-SET_PolygonStipple(struct _glapi_table *disp,
-                   void (GLAPIENTRYP fn) (const GLubyte *))
-{
-    SET_by_offset(disp, _gloffset_PolygonStipple, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Scissor)(GLint, GLint, GLsizei, GLsizei);
 #define CALL_Scissor(disp, parameters) \
     (* GET_Scissor(disp)) parameters
-static inline _glptr_Scissor
-GET_Scissor(struct _glapi_table *disp)
-{
-    return (_glptr_Scissor) (GET_by_offset(disp, _gloffset_Scissor));
+static INLINE _glptr_Scissor GET_Scissor(struct _glapi_table *disp) {
+   return (_glptr_Scissor) (GET_by_offset(disp, _gloffset_Scissor));
 }
 
-static inline void
-SET_Scissor(struct _glapi_table *disp,
-            void (GLAPIENTRYP fn) (GLint, GLint, GLsizei, GLsizei))
-{
-    SET_by_offset(disp, _gloffset_Scissor, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_ShadeModel)(GLenum);
 #define CALL_ShadeModel(disp, parameters) \
     (* GET_ShadeModel(disp)) parameters
-static inline _glptr_ShadeModel
-GET_ShadeModel(struct _glapi_table *disp)
-{
-    return (_glptr_ShadeModel) (GET_by_offset(disp, _gloffset_ShadeModel));
+static INLINE _glptr_ShadeModel GET_ShadeModel(struct _glapi_table *disp) {
+   return (_glptr_ShadeModel) (GET_by_offset(disp, _gloffset_ShadeModel));
 }
 
-static inline void
-SET_ShadeModel(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_ShadeModel, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_TexParameterf)(GLenum, GLenum, GLfloat);
 #define CALL_TexParameterf(disp, parameters) \
     (* GET_TexParameterf(disp)) parameters
-static inline _glptr_TexParameterf
-GET_TexParameterf(struct _glapi_table *disp)
-{
-    return (_glptr_TexParameterf) (GET_by_offset
-                                   (disp, _gloffset_TexParameterf));
+static INLINE _glptr_TexParameterf GET_TexParameterf(struct _glapi_table *disp) {
+   return (_glptr_TexParameterf) (GET_by_offset(disp, _gloffset_TexParameterf));
 }
 
-static inline void
-SET_TexParameterf(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, GLenum, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_TexParameterf, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_TexParameterfv)(GLenum, GLenum, const GLfloat *);
 #define CALL_TexParameterfv(disp, parameters) \
     (* GET_TexParameterfv(disp)) parameters
-static inline _glptr_TexParameterfv
-GET_TexParameterfv(struct _glapi_table *disp)
-{
-    return (_glptr_TexParameterfv) (GET_by_offset
-                                    (disp, _gloffset_TexParameterfv));
+static INLINE _glptr_TexParameterfv GET_TexParameterfv(struct _glapi_table *disp) {
+   return (_glptr_TexParameterfv) (GET_by_offset(disp, _gloffset_TexParameterfv));
 }
 
-static inline void
-SET_TexParameterfv(struct _glapi_table *disp,
-                   void (GLAPIENTRYP fn) (GLenum, GLenum, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_TexParameterfv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_TexParameteri)(GLenum, GLenum, GLint);
 #define CALL_TexParameteri(disp, parameters) \
     (* GET_TexParameteri(disp)) parameters
-static inline _glptr_TexParameteri
-GET_TexParameteri(struct _glapi_table *disp)
-{
-    return (_glptr_TexParameteri) (GET_by_offset
-                                   (disp, _gloffset_TexParameteri));
+static INLINE _glptr_TexParameteri GET_TexParameteri(struct _glapi_table *disp) {
+   return (_glptr_TexParameteri) (GET_by_offset(disp, _gloffset_TexParameteri));
 }
 
-static inline void
-SET_TexParameteri(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, GLenum, GLint))
-{
-    SET_by_offset(disp, _gloffset_TexParameteri, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_TexParameteriv)(GLenum, GLenum, const GLint *);
 #define CALL_TexParameteriv(disp, parameters) \
     (* GET_TexParameteriv(disp)) parameters
-static inline _glptr_TexParameteriv
-GET_TexParameteriv(struct _glapi_table *disp)
-{
-    return (_glptr_TexParameteriv) (GET_by_offset
-                                    (disp, _gloffset_TexParameteriv));
+static INLINE _glptr_TexParameteriv GET_TexParameteriv(struct _glapi_table *disp) {
+   return (_glptr_TexParameteriv) (GET_by_offset(disp, _gloffset_TexParameteriv));
 }
 
-static inline void
-SET_TexParameteriv(struct _glapi_table *disp,
-                   void (GLAPIENTRYP fn) (GLenum, GLenum, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_TexParameteriv, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_TexImage1D)(GLenum, GLint, GLint, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
 #define CALL_TexImage1D(disp, parameters) \
     (* GET_TexImage1D(disp)) parameters
-static inline _glptr_TexImage1D
-GET_TexImage1D(struct _glapi_table *disp)
-{
-    return (_glptr_TexImage1D) (GET_by_offset(disp, _gloffset_TexImage1D));
+static INLINE _glptr_TexImage1D GET_TexImage1D(struct _glapi_table *disp) {
+   return (_glptr_TexImage1D) (GET_by_offset(disp, _gloffset_TexImage1D));
 }
 
-static inline void
-SET_TexImage1D(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLenum, GLint, GLint, GLsizei, GLint,
-                                      GLenum, GLenum, const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_TexImage1D, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_TexImage2D)(GLenum, GLint, GLint, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
 #define CALL_TexImage2D(disp, parameters) \
     (* GET_TexImage2D(disp)) parameters
-static inline _glptr_TexImage2D
-GET_TexImage2D(struct _glapi_table *disp)
-{
-    return (_glptr_TexImage2D) (GET_by_offset(disp, _gloffset_TexImage2D));
+static INLINE _glptr_TexImage2D GET_TexImage2D(struct _glapi_table *disp) {
+   return (_glptr_TexImage2D) (GET_by_offset(disp, _gloffset_TexImage2D));
 }
 
-static inline void
-SET_TexImage2D(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLenum, GLint, GLint, GLsizei, GLsizei,
-                                      GLint, GLenum, GLenum, const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_TexImage2D, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_TexEnvf)(GLenum, GLenum, GLfloat);
 #define CALL_TexEnvf(disp, parameters) \
     (* GET_TexEnvf(disp)) parameters
-static inline _glptr_TexEnvf
-GET_TexEnvf(struct _glapi_table *disp)
-{
-    return (_glptr_TexEnvf) (GET_by_offset(disp, _gloffset_TexEnvf));
+static INLINE _glptr_TexEnvf GET_TexEnvf(struct _glapi_table *disp) {
+   return (_glptr_TexEnvf) (GET_by_offset(disp, _gloffset_TexEnvf));
 }
 
-static inline void
-SET_TexEnvf(struct _glapi_table *disp,
-            void (GLAPIENTRYP fn) (GLenum, GLenum, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_TexEnvf, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_TexEnvfv)(GLenum, GLenum, const GLfloat *);
 #define CALL_TexEnvfv(disp, parameters) \
     (* GET_TexEnvfv(disp)) parameters
-static inline _glptr_TexEnvfv
-GET_TexEnvfv(struct _glapi_table *disp)
-{
-    return (_glptr_TexEnvfv) (GET_by_offset(disp, _gloffset_TexEnvfv));
+static INLINE _glptr_TexEnvfv GET_TexEnvfv(struct _glapi_table *disp) {
+   return (_glptr_TexEnvfv) (GET_by_offset(disp, _gloffset_TexEnvfv));
 }
 
-static inline void
-SET_TexEnvfv(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLenum, GLenum, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_TexEnvfv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_TexEnvi)(GLenum, GLenum, GLint);
 #define CALL_TexEnvi(disp, parameters) \
     (* GET_TexEnvi(disp)) parameters
-static inline _glptr_TexEnvi
-GET_TexEnvi(struct _glapi_table *disp)
-{
-    return (_glptr_TexEnvi) (GET_by_offset(disp, _gloffset_TexEnvi));
+static INLINE _glptr_TexEnvi GET_TexEnvi(struct _glapi_table *disp) {
+   return (_glptr_TexEnvi) (GET_by_offset(disp, _gloffset_TexEnvi));
 }
 
-static inline void
-SET_TexEnvi(struct _glapi_table *disp,
-            void (GLAPIENTRYP fn) (GLenum, GLenum, GLint))
-{
-    SET_by_offset(disp, _gloffset_TexEnvi, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_TexEnviv)(GLenum, GLenum, const GLint *);
 #define CALL_TexEnviv(disp, parameters) \
     (* GET_TexEnviv(disp)) parameters
-static inline _glptr_TexEnviv
-GET_TexEnviv(struct _glapi_table *disp)
-{
-    return (_glptr_TexEnviv) (GET_by_offset(disp, _gloffset_TexEnviv));
+static INLINE _glptr_TexEnviv GET_TexEnviv(struct _glapi_table *disp) {
+   return (_glptr_TexEnviv) (GET_by_offset(disp, _gloffset_TexEnviv));
 }
 
-static inline void
-SET_TexEnviv(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLenum, GLenum, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_TexEnviv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_TexGend)(GLenum, GLenum, GLdouble);
 #define CALL_TexGend(disp, parameters) \
     (* GET_TexGend(disp)) parameters
-static inline _glptr_TexGend
-GET_TexGend(struct _glapi_table *disp)
-{
-    return (_glptr_TexGend) (GET_by_offset(disp, _gloffset_TexGend));
+static INLINE _glptr_TexGend GET_TexGend(struct _glapi_table *disp) {
+   return (_glptr_TexGend) (GET_by_offset(disp, _gloffset_TexGend));
 }
 
-static inline void
-SET_TexGend(struct _glapi_table *disp,
-            void (GLAPIENTRYP fn) (GLenum, GLenum, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_TexGend, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_TexGendv)(GLenum, GLenum, const GLdouble *);
 #define CALL_TexGendv(disp, parameters) \
     (* GET_TexGendv(disp)) parameters
-static inline _glptr_TexGendv
-GET_TexGendv(struct _glapi_table *disp)
-{
-    return (_glptr_TexGendv) (GET_by_offset(disp, _gloffset_TexGendv));
+static INLINE _glptr_TexGendv GET_TexGendv(struct _glapi_table *disp) {
+   return (_glptr_TexGendv) (GET_by_offset(disp, _gloffset_TexGendv));
 }
 
-static inline void
-SET_TexGendv(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLenum, GLenum, const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_TexGendv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_TexGenf)(GLenum, GLenum, GLfloat);
 #define CALL_TexGenf(disp, parameters) \
     (* GET_TexGenf(disp)) parameters
-static inline _glptr_TexGenf
-GET_TexGenf(struct _glapi_table *disp)
-{
-    return (_glptr_TexGenf) (GET_by_offset(disp, _gloffset_TexGenf));
+static INLINE _glptr_TexGenf GET_TexGenf(struct _glapi_table *disp) {
+   return (_glptr_TexGenf) (GET_by_offset(disp, _gloffset_TexGenf));
 }
 
-static inline void
-SET_TexGenf(struct _glapi_table *disp,
-            void (GLAPIENTRYP fn) (GLenum, GLenum, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_TexGenf, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_TexGenfv)(GLenum, GLenum, const GLfloat *);
 #define CALL_TexGenfv(disp, parameters) \
     (* GET_TexGenfv(disp)) parameters
-static inline _glptr_TexGenfv
-GET_TexGenfv(struct _glapi_table *disp)
-{
-    return (_glptr_TexGenfv) (GET_by_offset(disp, _gloffset_TexGenfv));
+static INLINE _glptr_TexGenfv GET_TexGenfv(struct _glapi_table *disp) {
+   return (_glptr_TexGenfv) (GET_by_offset(disp, _gloffset_TexGenfv));
 }
 
-static inline void
-SET_TexGenfv(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLenum, GLenum, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_TexGenfv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_TexGeni)(GLenum, GLenum, GLint);
 #define CALL_TexGeni(disp, parameters) \
     (* GET_TexGeni(disp)) parameters
-static inline _glptr_TexGeni
-GET_TexGeni(struct _glapi_table *disp)
-{
-    return (_glptr_TexGeni) (GET_by_offset(disp, _gloffset_TexGeni));
+static INLINE _glptr_TexGeni GET_TexGeni(struct _glapi_table *disp) {
+   return (_glptr_TexGeni) (GET_by_offset(disp, _gloffset_TexGeni));
 }
 
-static inline void
-SET_TexGeni(struct _glapi_table *disp,
-            void (GLAPIENTRYP fn) (GLenum, GLenum, GLint))
-{
-    SET_by_offset(disp, _gloffset_TexGeni, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_TexGeniv)(GLenum, GLenum, const GLint *);
 #define CALL_TexGeniv(disp, parameters) \
     (* GET_TexGeniv(disp)) parameters
-static inline _glptr_TexGeniv
-GET_TexGeniv(struct _glapi_table *disp)
-{
-    return (_glptr_TexGeniv) (GET_by_offset(disp, _gloffset_TexGeniv));
+static INLINE _glptr_TexGeniv GET_TexGeniv(struct _glapi_table *disp) {
+   return (_glptr_TexGeniv) (GET_by_offset(disp, _gloffset_TexGeniv));
 }
 
-static inline void
-SET_TexGeniv(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLenum, GLenum, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_TexGeniv, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_FeedbackBuffer)(GLsizei, GLenum, GLfloat *);
 #define CALL_FeedbackBuffer(disp, parameters) \
     (* GET_FeedbackBuffer(disp)) parameters
-static inline _glptr_FeedbackBuffer
-GET_FeedbackBuffer(struct _glapi_table *disp)
-{
-    return (_glptr_FeedbackBuffer) (GET_by_offset
-                                    (disp, _gloffset_FeedbackBuffer));
+static INLINE _glptr_FeedbackBuffer GET_FeedbackBuffer(struct _glapi_table *disp) {
+   return (_glptr_FeedbackBuffer) (GET_by_offset(disp, _gloffset_FeedbackBuffer));
 }
 
-static inline void
-SET_FeedbackBuffer(struct _glapi_table *disp,
-                   void (GLAPIENTRYP fn) (GLsizei, GLenum, GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_FeedbackBuffer, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_SelectBuffer)(GLsizei, GLuint *);
 #define CALL_SelectBuffer(disp, parameters) \
     (* GET_SelectBuffer(disp)) parameters
-static inline _glptr_SelectBuffer
-GET_SelectBuffer(struct _glapi_table *disp)
-{
-    return (_glptr_SelectBuffer) (GET_by_offset(disp, _gloffset_SelectBuffer));
+static INLINE _glptr_SelectBuffer GET_SelectBuffer(struct _glapi_table *disp) {
+   return (_glptr_SelectBuffer) (GET_by_offset(disp, _gloffset_SelectBuffer));
 }
 
-static inline void
-SET_SelectBuffer(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLsizei, GLuint *))
-{
-    SET_by_offset(disp, _gloffset_SelectBuffer, fn);
+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);
-
+typedef GLint (GLAPIENTRYP _glptr_RenderMode)(GLenum);
 #define CALL_RenderMode(disp, parameters) \
     (* GET_RenderMode(disp)) parameters
-static inline _glptr_RenderMode
-GET_RenderMode(struct _glapi_table *disp)
-{
-    return (_glptr_RenderMode) (GET_by_offset(disp, _gloffset_RenderMode));
+static INLINE _glptr_RenderMode GET_RenderMode(struct _glapi_table *disp) {
+   return (_glptr_RenderMode) (GET_by_offset(disp, _gloffset_RenderMode));
 }
 
-static inline void
-SET_RenderMode(struct _glapi_table *disp, GLint(GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_RenderMode, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_InitNames)(void);
 #define CALL_InitNames(disp, parameters) \
     (* GET_InitNames(disp)) parameters
-static inline _glptr_InitNames
-GET_InitNames(struct _glapi_table *disp)
-{
-    return (_glptr_InitNames) (GET_by_offset(disp, _gloffset_InitNames));
+static INLINE _glptr_InitNames GET_InitNames(struct _glapi_table *disp) {
+   return (_glptr_InitNames) (GET_by_offset(disp, _gloffset_InitNames));
 }
 
-static inline void
-SET_InitNames(struct _glapi_table *disp, void (GLAPIENTRYP fn) (void))
-{
-    SET_by_offset(disp, _gloffset_InitNames, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_LoadName)(GLuint);
 #define CALL_LoadName(disp, parameters) \
     (* GET_LoadName(disp)) parameters
-static inline _glptr_LoadName
-GET_LoadName(struct _glapi_table *disp)
-{
-    return (_glptr_LoadName) (GET_by_offset(disp, _gloffset_LoadName));
+static INLINE _glptr_LoadName GET_LoadName(struct _glapi_table *disp) {
+   return (_glptr_LoadName) (GET_by_offset(disp, _gloffset_LoadName));
 }
 
-static inline void
-SET_LoadName(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_LoadName, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_PassThrough)(GLfloat);
 #define CALL_PassThrough(disp, parameters) \
     (* GET_PassThrough(disp)) parameters
-static inline _glptr_PassThrough
-GET_PassThrough(struct _glapi_table *disp)
-{
-    return (_glptr_PassThrough) (GET_by_offset(disp, _gloffset_PassThrough));
+static INLINE _glptr_PassThrough GET_PassThrough(struct _glapi_table *disp) {
+   return (_glptr_PassThrough) (GET_by_offset(disp, _gloffset_PassThrough));
 }
 
-static inline void
-SET_PassThrough(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLfloat))
-{
-    SET_by_offset(disp, _gloffset_PassThrough, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_PopName)(void);
 #define CALL_PopName(disp, parameters) \
     (* GET_PopName(disp)) parameters
-static inline _glptr_PopName
-GET_PopName(struct _glapi_table *disp)
-{
-    return (_glptr_PopName) (GET_by_offset(disp, _gloffset_PopName));
+static INLINE _glptr_PopName GET_PopName(struct _glapi_table *disp) {
+   return (_glptr_PopName) (GET_by_offset(disp, _gloffset_PopName));
 }
 
-static inline void
-SET_PopName(struct _glapi_table *disp, void (GLAPIENTRYP fn) (void))
-{
-    SET_by_offset(disp, _gloffset_PopName, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_PushName)(GLuint);
 #define CALL_PushName(disp, parameters) \
     (* GET_PushName(disp)) parameters
-static inline _glptr_PushName
-GET_PushName(struct _glapi_table *disp)
-{
-    return (_glptr_PushName) (GET_by_offset(disp, _gloffset_PushName));
+static INLINE _glptr_PushName GET_PushName(struct _glapi_table *disp) {
+   return (_glptr_PushName) (GET_by_offset(disp, _gloffset_PushName));
 }
 
-static inline void
-SET_PushName(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_PushName, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_DrawBuffer)(GLenum);
 #define CALL_DrawBuffer(disp, parameters) \
     (* GET_DrawBuffer(disp)) parameters
-static inline _glptr_DrawBuffer
-GET_DrawBuffer(struct _glapi_table *disp)
-{
-    return (_glptr_DrawBuffer) (GET_by_offset(disp, _gloffset_DrawBuffer));
+static INLINE _glptr_DrawBuffer GET_DrawBuffer(struct _glapi_table *disp) {
+   return (_glptr_DrawBuffer) (GET_by_offset(disp, _gloffset_DrawBuffer));
 }
 
-static inline void
-SET_DrawBuffer(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_DrawBuffer, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Clear)(GLbitfield);
 #define CALL_Clear(disp, parameters) \
     (* GET_Clear(disp)) parameters
-static inline _glptr_Clear
-GET_Clear(struct _glapi_table *disp)
-{
-    return (_glptr_Clear) (GET_by_offset(disp, _gloffset_Clear));
+static INLINE _glptr_Clear GET_Clear(struct _glapi_table *disp) {
+   return (_glptr_Clear) (GET_by_offset(disp, _gloffset_Clear));
 }
 
-static inline void
-SET_Clear(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLbitfield))
-{
-    SET_by_offset(disp, _gloffset_Clear, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_ClearAccum)(GLfloat, GLfloat, GLfloat, GLfloat);
 #define CALL_ClearAccum(disp, parameters) \
     (* GET_ClearAccum(disp)) parameters
-static inline _glptr_ClearAccum
-GET_ClearAccum(struct _glapi_table *disp)
-{
-    return (_glptr_ClearAccum) (GET_by_offset(disp, _gloffset_ClearAccum));
+static INLINE _glptr_ClearAccum GET_ClearAccum(struct _glapi_table *disp) {
+   return (_glptr_ClearAccum) (GET_by_offset(disp, _gloffset_ClearAccum));
 }
 
-static inline void
-SET_ClearAccum(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLfloat, GLfloat, GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_ClearAccum, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_ClearIndex)(GLfloat);
 #define CALL_ClearIndex(disp, parameters) \
     (* GET_ClearIndex(disp)) parameters
-static inline _glptr_ClearIndex
-GET_ClearIndex(struct _glapi_table *disp)
-{
-    return (_glptr_ClearIndex) (GET_by_offset(disp, _gloffset_ClearIndex));
+static INLINE _glptr_ClearIndex GET_ClearIndex(struct _glapi_table *disp) {
+   return (_glptr_ClearIndex) (GET_by_offset(disp, _gloffset_ClearIndex));
 }
 
-static inline void
-SET_ClearIndex(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLfloat))
-{
-    SET_by_offset(disp, _gloffset_ClearIndex, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_ClearColor)(GLclampf, GLclampf, GLclampf, GLclampf);
 #define CALL_ClearColor(disp, parameters) \
     (* GET_ClearColor(disp)) parameters
-static inline _glptr_ClearColor
-GET_ClearColor(struct _glapi_table *disp)
-{
-    return (_glptr_ClearColor) (GET_by_offset(disp, _gloffset_ClearColor));
+static INLINE _glptr_ClearColor GET_ClearColor(struct _glapi_table *disp) {
+   return (_glptr_ClearColor) (GET_by_offset(disp, _gloffset_ClearColor));
 }
 
-static inline void
-SET_ClearColor(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLclampf, GLclampf, GLclampf, GLclampf))
-{
-    SET_by_offset(disp, _gloffset_ClearColor, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_ClearStencil)(GLint);
 #define CALL_ClearStencil(disp, parameters) \
     (* GET_ClearStencil(disp)) parameters
-static inline _glptr_ClearStencil
-GET_ClearStencil(struct _glapi_table *disp)
-{
-    return (_glptr_ClearStencil) (GET_by_offset(disp, _gloffset_ClearStencil));
+static INLINE _glptr_ClearStencil GET_ClearStencil(struct _glapi_table *disp) {
+   return (_glptr_ClearStencil) (GET_by_offset(disp, _gloffset_ClearStencil));
 }
 
-static inline void
-SET_ClearStencil(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLint))
-{
-    SET_by_offset(disp, _gloffset_ClearStencil, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_ClearDepth)(GLclampd);
 #define CALL_ClearDepth(disp, parameters) \
     (* GET_ClearDepth(disp)) parameters
-static inline _glptr_ClearDepth
-GET_ClearDepth(struct _glapi_table *disp)
-{
-    return (_glptr_ClearDepth) (GET_by_offset(disp, _gloffset_ClearDepth));
+static INLINE _glptr_ClearDepth GET_ClearDepth(struct _glapi_table *disp) {
+   return (_glptr_ClearDepth) (GET_by_offset(disp, _gloffset_ClearDepth));
 }
 
-static inline void
-SET_ClearDepth(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLclampd))
-{
-    SET_by_offset(disp, _gloffset_ClearDepth, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_StencilMask)(GLuint);
 #define CALL_StencilMask(disp, parameters) \
     (* GET_StencilMask(disp)) parameters
-static inline _glptr_StencilMask
-GET_StencilMask(struct _glapi_table *disp)
-{
-    return (_glptr_StencilMask) (GET_by_offset(disp, _gloffset_StencilMask));
+static INLINE _glptr_StencilMask GET_StencilMask(struct _glapi_table *disp) {
+   return (_glptr_StencilMask) (GET_by_offset(disp, _gloffset_StencilMask));
 }
 
-static inline void
-SET_StencilMask(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_StencilMask, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_ColorMask)(GLboolean, GLboolean, GLboolean, GLboolean);
 #define CALL_ColorMask(disp, parameters) \
     (* GET_ColorMask(disp)) parameters
-static inline _glptr_ColorMask
-GET_ColorMask(struct _glapi_table *disp)
-{
-    return (_glptr_ColorMask) (GET_by_offset(disp, _gloffset_ColorMask));
+static INLINE _glptr_ColorMask GET_ColorMask(struct _glapi_table *disp) {
+   return (_glptr_ColorMask) (GET_by_offset(disp, _gloffset_ColorMask));
 }
 
-static inline void
-SET_ColorMask(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (GLboolean, GLboolean, GLboolean,
-                                     GLboolean))
-{
-    SET_by_offset(disp, _gloffset_ColorMask, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_DepthMask)(GLboolean);
 #define CALL_DepthMask(disp, parameters) \
     (* GET_DepthMask(disp)) parameters
-static inline _glptr_DepthMask
-GET_DepthMask(struct _glapi_table *disp)
-{
-    return (_glptr_DepthMask) (GET_by_offset(disp, _gloffset_DepthMask));
+static INLINE _glptr_DepthMask GET_DepthMask(struct _glapi_table *disp) {
+   return (_glptr_DepthMask) (GET_by_offset(disp, _gloffset_DepthMask));
 }
 
-static inline void
-SET_DepthMask(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLboolean))
-{
-    SET_by_offset(disp, _gloffset_DepthMask, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_IndexMask)(GLuint);
 #define CALL_IndexMask(disp, parameters) \
     (* GET_IndexMask(disp)) parameters
-static inline _glptr_IndexMask
-GET_IndexMask(struct _glapi_table *disp)
-{
-    return (_glptr_IndexMask) (GET_by_offset(disp, _gloffset_IndexMask));
+static INLINE _glptr_IndexMask GET_IndexMask(struct _glapi_table *disp) {
+   return (_glptr_IndexMask) (GET_by_offset(disp, _gloffset_IndexMask));
 }
 
-static inline void
-SET_IndexMask(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_IndexMask, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Accum)(GLenum, GLfloat);
 #define CALL_Accum(disp, parameters) \
     (* GET_Accum(disp)) parameters
-static inline _glptr_Accum
-GET_Accum(struct _glapi_table *disp)
-{
-    return (_glptr_Accum) (GET_by_offset(disp, _gloffset_Accum));
+static INLINE _glptr_Accum GET_Accum(struct _glapi_table *disp) {
+   return (_glptr_Accum) (GET_by_offset(disp, _gloffset_Accum));
 }
 
-static inline void
-SET_Accum(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLenum, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_Accum, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Disable)(GLenum);
 #define CALL_Disable(disp, parameters) \
     (* GET_Disable(disp)) parameters
-static inline _glptr_Disable
-GET_Disable(struct _glapi_table *disp)
-{
-    return (_glptr_Disable) (GET_by_offset(disp, _gloffset_Disable));
+static INLINE _glptr_Disable GET_Disable(struct _glapi_table *disp) {
+   return (_glptr_Disable) (GET_by_offset(disp, _gloffset_Disable));
 }
 
-static inline void
-SET_Disable(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_Disable, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Enable)(GLenum);
 #define CALL_Enable(disp, parameters) \
     (* GET_Enable(disp)) parameters
-static inline _glptr_Enable
-GET_Enable(struct _glapi_table *disp)
-{
-    return (_glptr_Enable) (GET_by_offset(disp, _gloffset_Enable));
+static INLINE _glptr_Enable GET_Enable(struct _glapi_table *disp) {
+   return (_glptr_Enable) (GET_by_offset(disp, _gloffset_Enable));
 }
 
-static inline void
-SET_Enable(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_Enable, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Finish)(void);
 #define CALL_Finish(disp, parameters) \
     (* GET_Finish(disp)) parameters
-static inline _glptr_Finish
-GET_Finish(struct _glapi_table *disp)
-{
-    return (_glptr_Finish) (GET_by_offset(disp, _gloffset_Finish));
+static INLINE _glptr_Finish GET_Finish(struct _glapi_table *disp) {
+   return (_glptr_Finish) (GET_by_offset(disp, _gloffset_Finish));
 }
 
-static inline void
-SET_Finish(struct _glapi_table *disp, void (GLAPIENTRYP fn) (void))
-{
-    SET_by_offset(disp, _gloffset_Finish, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Flush)(void);
 #define CALL_Flush(disp, parameters) \
     (* GET_Flush(disp)) parameters
-static inline _glptr_Flush
-GET_Flush(struct _glapi_table *disp)
-{
-    return (_glptr_Flush) (GET_by_offset(disp, _gloffset_Flush));
+static INLINE _glptr_Flush GET_Flush(struct _glapi_table *disp) {
+   return (_glptr_Flush) (GET_by_offset(disp, _gloffset_Flush));
 }
 
-static inline void
-SET_Flush(struct _glapi_table *disp, void (GLAPIENTRYP fn) (void))
-{
-    SET_by_offset(disp, _gloffset_Flush, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_PopAttrib)(void);
 #define CALL_PopAttrib(disp, parameters) \
     (* GET_PopAttrib(disp)) parameters
-static inline _glptr_PopAttrib
-GET_PopAttrib(struct _glapi_table *disp)
-{
-    return (_glptr_PopAttrib) (GET_by_offset(disp, _gloffset_PopAttrib));
+static INLINE _glptr_PopAttrib GET_PopAttrib(struct _glapi_table *disp) {
+   return (_glptr_PopAttrib) (GET_by_offset(disp, _gloffset_PopAttrib));
 }
 
-static inline void
-SET_PopAttrib(struct _glapi_table *disp, void (GLAPIENTRYP fn) (void))
-{
-    SET_by_offset(disp, _gloffset_PopAttrib, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_PushAttrib)(GLbitfield);
 #define CALL_PushAttrib(disp, parameters) \
     (* GET_PushAttrib(disp)) parameters
-static inline _glptr_PushAttrib
-GET_PushAttrib(struct _glapi_table *disp)
-{
-    return (_glptr_PushAttrib) (GET_by_offset(disp, _gloffset_PushAttrib));
+static INLINE _glptr_PushAttrib GET_PushAttrib(struct _glapi_table *disp) {
+   return (_glptr_PushAttrib) (GET_by_offset(disp, _gloffset_PushAttrib));
 }
 
-static inline void
-SET_PushAttrib(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLbitfield))
-{
-    SET_by_offset(disp, _gloffset_PushAttrib, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_Map1d)(GLenum, GLdouble, GLdouble, GLint, GLint, const GLdouble *);
 #define CALL_Map1d(disp, parameters) \
     (* GET_Map1d(disp)) parameters
-static inline _glptr_Map1d
-GET_Map1d(struct _glapi_table *disp)
-{
-    return (_glptr_Map1d) (GET_by_offset(disp, _gloffset_Map1d));
+static INLINE _glptr_Map1d GET_Map1d(struct _glapi_table *disp) {
+   return (_glptr_Map1d) (GET_by_offset(disp, _gloffset_Map1d));
 }
 
-static inline void
-SET_Map1d(struct _glapi_table *disp,
-          void (GLAPIENTRYP fn) (GLenum, GLdouble, GLdouble, GLint, GLint,
-                                 const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_Map1d, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_Map1f)(GLenum, GLfloat, GLfloat, GLint, GLint, const GLfloat *);
 #define CALL_Map1f(disp, parameters) \
     (* GET_Map1f(disp)) parameters
-static inline _glptr_Map1f
-GET_Map1f(struct _glapi_table *disp)
-{
-    return (_glptr_Map1f) (GET_by_offset(disp, _gloffset_Map1f));
+static INLINE _glptr_Map1f GET_Map1f(struct _glapi_table *disp) {
+   return (_glptr_Map1f) (GET_by_offset(disp, _gloffset_Map1f));
 }
 
-static inline void
-SET_Map1f(struct _glapi_table *disp,
-          void (GLAPIENTRYP fn) (GLenum, GLfloat, GLfloat, GLint, GLint,
-                                 const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_Map1f, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_Map2d)(GLenum, GLdouble, GLdouble, GLint, GLint, GLdouble, GLdouble, GLint, GLint, const GLdouble *);
 #define CALL_Map2d(disp, parameters) \
     (* GET_Map2d(disp)) parameters
-static inline _glptr_Map2d
-GET_Map2d(struct _glapi_table *disp)
-{
-    return (_glptr_Map2d) (GET_by_offset(disp, _gloffset_Map2d));
+static INLINE _glptr_Map2d GET_Map2d(struct _glapi_table *disp) {
+   return (_glptr_Map2d) (GET_by_offset(disp, _gloffset_Map2d));
 }
 
-static inline void
-SET_Map2d(struct _glapi_table *disp,
-          void (GLAPIENTRYP fn) (GLenum, GLdouble, GLdouble, GLint, GLint,
-                                 GLdouble, GLdouble, GLint, GLint,
-                                 const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_Map2d, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_Map2f)(GLenum, GLfloat, GLfloat, GLint, GLint, GLfloat, GLfloat, GLint, GLint, const GLfloat *);
 #define CALL_Map2f(disp, parameters) \
     (* GET_Map2f(disp)) parameters
-static inline _glptr_Map2f
-GET_Map2f(struct _glapi_table *disp)
-{
-    return (_glptr_Map2f) (GET_by_offset(disp, _gloffset_Map2f));
+static INLINE _glptr_Map2f GET_Map2f(struct _glapi_table *disp) {
+   return (_glptr_Map2f) (GET_by_offset(disp, _gloffset_Map2f));
 }
 
-static inline void
-SET_Map2f(struct _glapi_table *disp,
-          void (GLAPIENTRYP fn) (GLenum, GLfloat, GLfloat, GLint, GLint,
-                                 GLfloat, GLfloat, GLint, GLint,
-                                 const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_Map2f, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_MapGrid1d)(GLint, GLdouble, GLdouble);
 #define CALL_MapGrid1d(disp, parameters) \
     (* GET_MapGrid1d(disp)) parameters
-static inline _glptr_MapGrid1d
-GET_MapGrid1d(struct _glapi_table *disp)
-{
-    return (_glptr_MapGrid1d) (GET_by_offset(disp, _gloffset_MapGrid1d));
+static INLINE _glptr_MapGrid1d GET_MapGrid1d(struct _glapi_table *disp) {
+   return (_glptr_MapGrid1d) (GET_by_offset(disp, _gloffset_MapGrid1d));
 }
 
-static inline void
-SET_MapGrid1d(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (GLint, GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_MapGrid1d, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_MapGrid1f)(GLint, GLfloat, GLfloat);
 #define CALL_MapGrid1f(disp, parameters) \
     (* GET_MapGrid1f(disp)) parameters
-static inline _glptr_MapGrid1f
-GET_MapGrid1f(struct _glapi_table *disp)
-{
-    return (_glptr_MapGrid1f) (GET_by_offset(disp, _gloffset_MapGrid1f));
+static INLINE _glptr_MapGrid1f GET_MapGrid1f(struct _glapi_table *disp) {
+   return (_glptr_MapGrid1f) (GET_by_offset(disp, _gloffset_MapGrid1f));
 }
 
-static inline void
-SET_MapGrid1f(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (GLint, GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_MapGrid1f, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_MapGrid2d)(GLint, GLdouble, GLdouble, GLint, GLdouble, GLdouble);
 #define CALL_MapGrid2d(disp, parameters) \
     (* GET_MapGrid2d(disp)) parameters
-static inline _glptr_MapGrid2d
-GET_MapGrid2d(struct _glapi_table *disp)
-{
-    return (_glptr_MapGrid2d) (GET_by_offset(disp, _gloffset_MapGrid2d));
+static INLINE _glptr_MapGrid2d GET_MapGrid2d(struct _glapi_table *disp) {
+   return (_glptr_MapGrid2d) (GET_by_offset(disp, _gloffset_MapGrid2d));
 }
 
-static inline void
-SET_MapGrid2d(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (GLint, GLdouble, GLdouble, GLint, GLdouble,
-                                     GLdouble))
-{
-    SET_by_offset(disp, _gloffset_MapGrid2d, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_MapGrid2f)(GLint, GLfloat, GLfloat, GLint, GLfloat, GLfloat);
 #define CALL_MapGrid2f(disp, parameters) \
     (* GET_MapGrid2f(disp)) parameters
-static inline _glptr_MapGrid2f
-GET_MapGrid2f(struct _glapi_table *disp)
-{
-    return (_glptr_MapGrid2f) (GET_by_offset(disp, _gloffset_MapGrid2f));
+static INLINE _glptr_MapGrid2f GET_MapGrid2f(struct _glapi_table *disp) {
+   return (_glptr_MapGrid2f) (GET_by_offset(disp, _gloffset_MapGrid2f));
 }
 
-static inline void
-SET_MapGrid2f(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (GLint, GLfloat, GLfloat, GLint, GLfloat,
-                                     GLfloat))
-{
-    SET_by_offset(disp, _gloffset_MapGrid2f, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_EvalCoord1d)(GLdouble);
 #define CALL_EvalCoord1d(disp, parameters) \
     (* GET_EvalCoord1d(disp)) parameters
-static inline _glptr_EvalCoord1d
-GET_EvalCoord1d(struct _glapi_table *disp)
-{
-    return (_glptr_EvalCoord1d) (GET_by_offset(disp, _gloffset_EvalCoord1d));
+static INLINE _glptr_EvalCoord1d GET_EvalCoord1d(struct _glapi_table *disp) {
+   return (_glptr_EvalCoord1d) (GET_by_offset(disp, _gloffset_EvalCoord1d));
 }
 
-static inline void
-SET_EvalCoord1d(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLdouble))
-{
-    SET_by_offset(disp, _gloffset_EvalCoord1d, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_EvalCoord1dv)(const GLdouble *);
 #define CALL_EvalCoord1dv(disp, parameters) \
     (* GET_EvalCoord1dv(disp)) parameters
-static inline _glptr_EvalCoord1dv
-GET_EvalCoord1dv(struct _glapi_table *disp)
-{
-    return (_glptr_EvalCoord1dv) (GET_by_offset(disp, _gloffset_EvalCoord1dv));
+static INLINE _glptr_EvalCoord1dv GET_EvalCoord1dv(struct _glapi_table *disp) {
+   return (_glptr_EvalCoord1dv) (GET_by_offset(disp, _gloffset_EvalCoord1dv));
 }
 
-static inline void
-SET_EvalCoord1dv(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_EvalCoord1dv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_EvalCoord1f)(GLfloat);
 #define CALL_EvalCoord1f(disp, parameters) \
     (* GET_EvalCoord1f(disp)) parameters
-static inline _glptr_EvalCoord1f
-GET_EvalCoord1f(struct _glapi_table *disp)
-{
-    return (_glptr_EvalCoord1f) (GET_by_offset(disp, _gloffset_EvalCoord1f));
+static INLINE _glptr_EvalCoord1f GET_EvalCoord1f(struct _glapi_table *disp) {
+   return (_glptr_EvalCoord1f) (GET_by_offset(disp, _gloffset_EvalCoord1f));
 }
 
-static inline void
-SET_EvalCoord1f(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLfloat))
-{
-    SET_by_offset(disp, _gloffset_EvalCoord1f, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_EvalCoord1fv)(const GLfloat *);
 #define CALL_EvalCoord1fv(disp, parameters) \
     (* GET_EvalCoord1fv(disp)) parameters
-static inline _glptr_EvalCoord1fv
-GET_EvalCoord1fv(struct _glapi_table *disp)
-{
-    return (_glptr_EvalCoord1fv) (GET_by_offset(disp, _gloffset_EvalCoord1fv));
+static INLINE _glptr_EvalCoord1fv GET_EvalCoord1fv(struct _glapi_table *disp) {
+   return (_glptr_EvalCoord1fv) (GET_by_offset(disp, _gloffset_EvalCoord1fv));
 }
 
-static inline void
-SET_EvalCoord1fv(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_EvalCoord1fv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_EvalCoord2d)(GLdouble, GLdouble);
 #define CALL_EvalCoord2d(disp, parameters) \
     (* GET_EvalCoord2d(disp)) parameters
-static inline _glptr_EvalCoord2d
-GET_EvalCoord2d(struct _glapi_table *disp)
-{
-    return (_glptr_EvalCoord2d) (GET_by_offset(disp, _gloffset_EvalCoord2d));
+static INLINE _glptr_EvalCoord2d GET_EvalCoord2d(struct _glapi_table *disp) {
+   return (_glptr_EvalCoord2d) (GET_by_offset(disp, _gloffset_EvalCoord2d));
 }
 
-static inline void
-SET_EvalCoord2d(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_EvalCoord2d, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_EvalCoord2dv)(const GLdouble *);
 #define CALL_EvalCoord2dv(disp, parameters) \
     (* GET_EvalCoord2dv(disp)) parameters
-static inline _glptr_EvalCoord2dv
-GET_EvalCoord2dv(struct _glapi_table *disp)
-{
-    return (_glptr_EvalCoord2dv) (GET_by_offset(disp, _gloffset_EvalCoord2dv));
+static INLINE _glptr_EvalCoord2dv GET_EvalCoord2dv(struct _glapi_table *disp) {
+   return (_glptr_EvalCoord2dv) (GET_by_offset(disp, _gloffset_EvalCoord2dv));
 }
 
-static inline void
-SET_EvalCoord2dv(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_EvalCoord2dv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_EvalCoord2f)(GLfloat, GLfloat);
 #define CALL_EvalCoord2f(disp, parameters) \
     (* GET_EvalCoord2f(disp)) parameters
-static inline _glptr_EvalCoord2f
-GET_EvalCoord2f(struct _glapi_table *disp)
-{
-    return (_glptr_EvalCoord2f) (GET_by_offset(disp, _gloffset_EvalCoord2f));
+static INLINE _glptr_EvalCoord2f GET_EvalCoord2f(struct _glapi_table *disp) {
+   return (_glptr_EvalCoord2f) (GET_by_offset(disp, _gloffset_EvalCoord2f));
 }
 
-static inline void
-SET_EvalCoord2f(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_EvalCoord2f, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_EvalCoord2fv)(const GLfloat *);
 #define CALL_EvalCoord2fv(disp, parameters) \
     (* GET_EvalCoord2fv(disp)) parameters
-static inline _glptr_EvalCoord2fv
-GET_EvalCoord2fv(struct _glapi_table *disp)
-{
-    return (_glptr_EvalCoord2fv) (GET_by_offset(disp, _gloffset_EvalCoord2fv));
+static INLINE _glptr_EvalCoord2fv GET_EvalCoord2fv(struct _glapi_table *disp) {
+   return (_glptr_EvalCoord2fv) (GET_by_offset(disp, _gloffset_EvalCoord2fv));
 }
 
-static inline void
-SET_EvalCoord2fv(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_EvalCoord2fv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_EvalMesh1)(GLenum, GLint, GLint);
 #define CALL_EvalMesh1(disp, parameters) \
     (* GET_EvalMesh1(disp)) parameters
-static inline _glptr_EvalMesh1
-GET_EvalMesh1(struct _glapi_table *disp)
-{
-    return (_glptr_EvalMesh1) (GET_by_offset(disp, _gloffset_EvalMesh1));
+static INLINE _glptr_EvalMesh1 GET_EvalMesh1(struct _glapi_table *disp) {
+   return (_glptr_EvalMesh1) (GET_by_offset(disp, _gloffset_EvalMesh1));
 }
 
-static inline void
-SET_EvalMesh1(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (GLenum, GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_EvalMesh1, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_EvalPoint1)(GLint);
 #define CALL_EvalPoint1(disp, parameters) \
     (* GET_EvalPoint1(disp)) parameters
-static inline _glptr_EvalPoint1
-GET_EvalPoint1(struct _glapi_table *disp)
-{
-    return (_glptr_EvalPoint1) (GET_by_offset(disp, _gloffset_EvalPoint1));
+static INLINE _glptr_EvalPoint1 GET_EvalPoint1(struct _glapi_table *disp) {
+   return (_glptr_EvalPoint1) (GET_by_offset(disp, _gloffset_EvalPoint1));
 }
 
-static inline void
-SET_EvalPoint1(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLint))
-{
-    SET_by_offset(disp, _gloffset_EvalPoint1, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_EvalMesh2)(GLenum, GLint, GLint, GLint, GLint);
 #define CALL_EvalMesh2(disp, parameters) \
     (* GET_EvalMesh2(disp)) parameters
-static inline _glptr_EvalMesh2
-GET_EvalMesh2(struct _glapi_table *disp)
-{
-    return (_glptr_EvalMesh2) (GET_by_offset(disp, _gloffset_EvalMesh2));
+static INLINE _glptr_EvalMesh2 GET_EvalMesh2(struct _glapi_table *disp) {
+   return (_glptr_EvalMesh2) (GET_by_offset(disp, _gloffset_EvalMesh2));
 }
 
-static inline void
-SET_EvalMesh2(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (GLenum, GLint, GLint, GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_EvalMesh2, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_EvalPoint2)(GLint, GLint);
 #define CALL_EvalPoint2(disp, parameters) \
     (* GET_EvalPoint2(disp)) parameters
-static inline _glptr_EvalPoint2
-GET_EvalPoint2(struct _glapi_table *disp)
-{
-    return (_glptr_EvalPoint2) (GET_by_offset(disp, _gloffset_EvalPoint2));
+static INLINE _glptr_EvalPoint2 GET_EvalPoint2(struct _glapi_table *disp) {
+   return (_glptr_EvalPoint2) (GET_by_offset(disp, _gloffset_EvalPoint2));
 }
 
-static inline void
-SET_EvalPoint2(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_EvalPoint2, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_AlphaFunc)(GLenum, GLclampf);
 #define CALL_AlphaFunc(disp, parameters) \
     (* GET_AlphaFunc(disp)) parameters
-static inline _glptr_AlphaFunc
-GET_AlphaFunc(struct _glapi_table *disp)
-{
-    return (_glptr_AlphaFunc) (GET_by_offset(disp, _gloffset_AlphaFunc));
+static INLINE _glptr_AlphaFunc GET_AlphaFunc(struct _glapi_table *disp) {
+   return (_glptr_AlphaFunc) (GET_by_offset(disp, _gloffset_AlphaFunc));
 }
 
-static inline void
-SET_AlphaFunc(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (GLenum, GLclampf))
-{
-    SET_by_offset(disp, _gloffset_AlphaFunc, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_BlendFunc)(GLenum, GLenum);
 #define CALL_BlendFunc(disp, parameters) \
     (* GET_BlendFunc(disp)) parameters
-static inline _glptr_BlendFunc
-GET_BlendFunc(struct _glapi_table *disp)
-{
-    return (_glptr_BlendFunc) (GET_by_offset(disp, _gloffset_BlendFunc));
+static INLINE _glptr_BlendFunc GET_BlendFunc(struct _glapi_table *disp) {
+   return (_glptr_BlendFunc) (GET_by_offset(disp, _gloffset_BlendFunc));
 }
 
-static inline void
-SET_BlendFunc(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLenum, GLenum))
-{
-    SET_by_offset(disp, _gloffset_BlendFunc, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_LogicOp)(GLenum);
 #define CALL_LogicOp(disp, parameters) \
     (* GET_LogicOp(disp)) parameters
-static inline _glptr_LogicOp
-GET_LogicOp(struct _glapi_table *disp)
-{
-    return (_glptr_LogicOp) (GET_by_offset(disp, _gloffset_LogicOp));
+static INLINE _glptr_LogicOp GET_LogicOp(struct _glapi_table *disp) {
+   return (_glptr_LogicOp) (GET_by_offset(disp, _gloffset_LogicOp));
 }
 
-static inline void
-SET_LogicOp(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_LogicOp, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_StencilFunc)(GLenum, GLint, GLuint);
 #define CALL_StencilFunc(disp, parameters) \
     (* GET_StencilFunc(disp)) parameters
-static inline _glptr_StencilFunc
-GET_StencilFunc(struct _glapi_table *disp)
-{
-    return (_glptr_StencilFunc) (GET_by_offset(disp, _gloffset_StencilFunc));
+static INLINE _glptr_StencilFunc GET_StencilFunc(struct _glapi_table *disp) {
+   return (_glptr_StencilFunc) (GET_by_offset(disp, _gloffset_StencilFunc));
 }
 
-static inline void
-SET_StencilFunc(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLenum, GLint, GLuint))
-{
-    SET_by_offset(disp, _gloffset_StencilFunc, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_StencilOp)(GLenum, GLenum, GLenum);
 #define CALL_StencilOp(disp, parameters) \
     (* GET_StencilOp(disp)) parameters
-static inline _glptr_StencilOp
-GET_StencilOp(struct _glapi_table *disp)
-{
-    return (_glptr_StencilOp) (GET_by_offset(disp, _gloffset_StencilOp));
+static INLINE _glptr_StencilOp GET_StencilOp(struct _glapi_table *disp) {
+   return (_glptr_StencilOp) (GET_by_offset(disp, _gloffset_StencilOp));
 }
 
-static inline void
-SET_StencilOp(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (GLenum, GLenum, GLenum))
-{
-    SET_by_offset(disp, _gloffset_StencilOp, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_DepthFunc)(GLenum);
 #define CALL_DepthFunc(disp, parameters) \
     (* GET_DepthFunc(disp)) parameters
-static inline _glptr_DepthFunc
-GET_DepthFunc(struct _glapi_table *disp)
-{
-    return (_glptr_DepthFunc) (GET_by_offset(disp, _gloffset_DepthFunc));
+static INLINE _glptr_DepthFunc GET_DepthFunc(struct _glapi_table *disp) {
+   return (_glptr_DepthFunc) (GET_by_offset(disp, _gloffset_DepthFunc));
 }
 
-static inline void
-SET_DepthFunc(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_DepthFunc, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_PixelZoom)(GLfloat, GLfloat);
 #define CALL_PixelZoom(disp, parameters) \
     (* GET_PixelZoom(disp)) parameters
-static inline _glptr_PixelZoom
-GET_PixelZoom(struct _glapi_table *disp)
-{
-    return (_glptr_PixelZoom) (GET_by_offset(disp, _gloffset_PixelZoom));
+static INLINE _glptr_PixelZoom GET_PixelZoom(struct _glapi_table *disp) {
+   return (_glptr_PixelZoom) (GET_by_offset(disp, _gloffset_PixelZoom));
 }
 
-static inline void
-SET_PixelZoom(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_PixelZoom, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_PixelTransferf)(GLenum, GLfloat);
 #define CALL_PixelTransferf(disp, parameters) \
     (* GET_PixelTransferf(disp)) parameters
-static inline _glptr_PixelTransferf
-GET_PixelTransferf(struct _glapi_table *disp)
-{
-    return (_glptr_PixelTransferf) (GET_by_offset
-                                    (disp, _gloffset_PixelTransferf));
+static INLINE _glptr_PixelTransferf GET_PixelTransferf(struct _glapi_table *disp) {
+   return (_glptr_PixelTransferf) (GET_by_offset(disp, _gloffset_PixelTransferf));
 }
 
-static inline void
-SET_PixelTransferf(struct _glapi_table *disp,
-                   void (GLAPIENTRYP fn) (GLenum, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_PixelTransferf, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_PixelTransferi)(GLenum, GLint);
 #define CALL_PixelTransferi(disp, parameters) \
     (* GET_PixelTransferi(disp)) parameters
-static inline _glptr_PixelTransferi
-GET_PixelTransferi(struct _glapi_table *disp)
-{
-    return (_glptr_PixelTransferi) (GET_by_offset
-                                    (disp, _gloffset_PixelTransferi));
+static INLINE _glptr_PixelTransferi GET_PixelTransferi(struct _glapi_table *disp) {
+   return (_glptr_PixelTransferi) (GET_by_offset(disp, _gloffset_PixelTransferi));
 }
 
-static inline void
-SET_PixelTransferi(struct _glapi_table *disp,
-                   void (GLAPIENTRYP fn) (GLenum, GLint))
-{
-    SET_by_offset(disp, _gloffset_PixelTransferi, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_PixelStoref)(GLenum, GLfloat);
 #define CALL_PixelStoref(disp, parameters) \
     (* GET_PixelStoref(disp)) parameters
-static inline _glptr_PixelStoref
-GET_PixelStoref(struct _glapi_table *disp)
-{
-    return (_glptr_PixelStoref) (GET_by_offset(disp, _gloffset_PixelStoref));
+static INLINE _glptr_PixelStoref GET_PixelStoref(struct _glapi_table *disp) {
+   return (_glptr_PixelStoref) (GET_by_offset(disp, _gloffset_PixelStoref));
 }
 
-static inline void
-SET_PixelStoref(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLenum, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_PixelStoref, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_PixelStorei)(GLenum, GLint);
 #define CALL_PixelStorei(disp, parameters) \
     (* GET_PixelStorei(disp)) parameters
-static inline _glptr_PixelStorei
-GET_PixelStorei(struct _glapi_table *disp)
-{
-    return (_glptr_PixelStorei) (GET_by_offset(disp, _gloffset_PixelStorei));
+static INLINE _glptr_PixelStorei GET_PixelStorei(struct _glapi_table *disp) {
+   return (_glptr_PixelStorei) (GET_by_offset(disp, _gloffset_PixelStorei));
 }
 
-static inline void
-SET_PixelStorei(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLenum, GLint))
-{
-    SET_by_offset(disp, _gloffset_PixelStorei, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_PixelMapfv)(GLenum, GLsizei, const GLfloat *);
 #define CALL_PixelMapfv(disp, parameters) \
     (* GET_PixelMapfv(disp)) parameters
-static inline _glptr_PixelMapfv
-GET_PixelMapfv(struct _glapi_table *disp)
-{
-    return (_glptr_PixelMapfv) (GET_by_offset(disp, _gloffset_PixelMapfv));
+static INLINE _glptr_PixelMapfv GET_PixelMapfv(struct _glapi_table *disp) {
+   return (_glptr_PixelMapfv) (GET_by_offset(disp, _gloffset_PixelMapfv));
 }
 
-static inline void
-SET_PixelMapfv(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLenum, GLsizei, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_PixelMapfv, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_PixelMapuiv)(GLenum, GLsizei, const GLuint *);
 #define CALL_PixelMapuiv(disp, parameters) \
     (* GET_PixelMapuiv(disp)) parameters
-static inline _glptr_PixelMapuiv
-GET_PixelMapuiv(struct _glapi_table *disp)
-{
-    return (_glptr_PixelMapuiv) (GET_by_offset(disp, _gloffset_PixelMapuiv));
+static INLINE _glptr_PixelMapuiv GET_PixelMapuiv(struct _glapi_table *disp) {
+   return (_glptr_PixelMapuiv) (GET_by_offset(disp, _gloffset_PixelMapuiv));
 }
 
-static inline void
-SET_PixelMapuiv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLenum, GLsizei, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_PixelMapuiv, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_PixelMapusv)(GLenum, GLsizei, const GLushort *);
 #define CALL_PixelMapusv(disp, parameters) \
     (* GET_PixelMapusv(disp)) parameters
-static inline _glptr_PixelMapusv
-GET_PixelMapusv(struct _glapi_table *disp)
-{
-    return (_glptr_PixelMapusv) (GET_by_offset(disp, _gloffset_PixelMapusv));
+static INLINE _glptr_PixelMapusv GET_PixelMapusv(struct _glapi_table *disp) {
+   return (_glptr_PixelMapusv) (GET_by_offset(disp, _gloffset_PixelMapusv));
 }
 
-static inline void
-SET_PixelMapusv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLenum, GLsizei, const GLushort *))
-{
-    SET_by_offset(disp, _gloffset_PixelMapusv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_ReadBuffer)(GLenum);
 #define CALL_ReadBuffer(disp, parameters) \
     (* GET_ReadBuffer(disp)) parameters
-static inline _glptr_ReadBuffer
-GET_ReadBuffer(struct _glapi_table *disp)
-{
-    return (_glptr_ReadBuffer) (GET_by_offset(disp, _gloffset_ReadBuffer));
+static INLINE _glptr_ReadBuffer GET_ReadBuffer(struct _glapi_table *disp) {
+   return (_glptr_ReadBuffer) (GET_by_offset(disp, _gloffset_ReadBuffer));
 }
 
-static inline void
-SET_ReadBuffer(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_ReadBuffer, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_CopyPixels)(GLint, GLint, GLsizei, GLsizei, GLenum);
 #define CALL_CopyPixels(disp, parameters) \
     (* GET_CopyPixels(disp)) parameters
-static inline _glptr_CopyPixels
-GET_CopyPixels(struct _glapi_table *disp)
-{
-    return (_glptr_CopyPixels) (GET_by_offset(disp, _gloffset_CopyPixels));
+static INLINE _glptr_CopyPixels GET_CopyPixels(struct _glapi_table *disp) {
+   return (_glptr_CopyPixels) (GET_by_offset(disp, _gloffset_CopyPixels));
 }
 
-static inline void
-SET_CopyPixels(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLint, GLint, GLsizei, GLsizei, GLenum))
-{
-    SET_by_offset(disp, _gloffset_CopyPixels, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_ReadPixels)(GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, GLvoid *);
 #define CALL_ReadPixels(disp, parameters) \
     (* GET_ReadPixels(disp)) parameters
-static inline _glptr_ReadPixels
-GET_ReadPixels(struct _glapi_table *disp)
-{
-    return (_glptr_ReadPixels) (GET_by_offset(disp, _gloffset_ReadPixels));
+static INLINE _glptr_ReadPixels GET_ReadPixels(struct _glapi_table *disp) {
+   return (_glptr_ReadPixels) (GET_by_offset(disp, _gloffset_ReadPixels));
 }
 
-static inline void
-SET_ReadPixels(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLint, GLint, GLsizei, GLsizei, GLenum,
-                                      GLenum, GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_ReadPixels, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_DrawPixels)(GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
 #define CALL_DrawPixels(disp, parameters) \
     (* GET_DrawPixels(disp)) parameters
-static inline _glptr_DrawPixels
-GET_DrawPixels(struct _glapi_table *disp)
-{
-    return (_glptr_DrawPixels) (GET_by_offset(disp, _gloffset_DrawPixels));
+static INLINE _glptr_DrawPixels GET_DrawPixels(struct _glapi_table *disp) {
+   return (_glptr_DrawPixels) (GET_by_offset(disp, _gloffset_DrawPixels));
 }
 
-static inline void
-SET_DrawPixels(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLsizei, GLsizei, GLenum, GLenum,
-                                      const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_DrawPixels, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_GetBooleanv)(GLenum, GLboolean *);
 #define CALL_GetBooleanv(disp, parameters) \
     (* GET_GetBooleanv(disp)) parameters
-static inline _glptr_GetBooleanv
-GET_GetBooleanv(struct _glapi_table *disp)
-{
-    return (_glptr_GetBooleanv) (GET_by_offset(disp, _gloffset_GetBooleanv));
+static INLINE _glptr_GetBooleanv GET_GetBooleanv(struct _glapi_table *disp) {
+   return (_glptr_GetBooleanv) (GET_by_offset(disp, _gloffset_GetBooleanv));
 }
 
-static inline void
-SET_GetBooleanv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLenum, GLboolean *))
-{
-    SET_by_offset(disp, _gloffset_GetBooleanv, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_GetClipPlane)(GLenum, GLdouble *);
 #define CALL_GetClipPlane(disp, parameters) \
     (* GET_GetClipPlane(disp)) parameters
-static inline _glptr_GetClipPlane
-GET_GetClipPlane(struct _glapi_table *disp)
-{
-    return (_glptr_GetClipPlane) (GET_by_offset(disp, _gloffset_GetClipPlane));
+static INLINE _glptr_GetClipPlane GET_GetClipPlane(struct _glapi_table *disp) {
+   return (_glptr_GetClipPlane) (GET_by_offset(disp, _gloffset_GetClipPlane));
 }
 
-static inline void
-SET_GetClipPlane(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLenum, GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_GetClipPlane, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_GetDoublev)(GLenum, GLdouble *);
 #define CALL_GetDoublev(disp, parameters) \
     (* GET_GetDoublev(disp)) parameters
-static inline _glptr_GetDoublev
-GET_GetDoublev(struct _glapi_table *disp)
-{
-    return (_glptr_GetDoublev) (GET_by_offset(disp, _gloffset_GetDoublev));
+static INLINE _glptr_GetDoublev GET_GetDoublev(struct _glapi_table *disp) {
+   return (_glptr_GetDoublev) (GET_by_offset(disp, _gloffset_GetDoublev));
 }
 
-static inline void
-SET_GetDoublev(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLenum, GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_GetDoublev, fn);
+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);
-
+typedef GLenum (GLAPIENTRYP _glptr_GetError)(void);
 #define CALL_GetError(disp, parameters) \
     (* GET_GetError(disp)) parameters
-static inline _glptr_GetError
-GET_GetError(struct _glapi_table *disp)
-{
-    return (_glptr_GetError) (GET_by_offset(disp, _gloffset_GetError));
+static INLINE _glptr_GetError GET_GetError(struct _glapi_table *disp) {
+   return (_glptr_GetError) (GET_by_offset(disp, _gloffset_GetError));
 }
 
-static inline void
-SET_GetError(struct _glapi_table *disp, GLenum(GLAPIENTRYP fn) (void))
-{
-    SET_by_offset(disp, _gloffset_GetError, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_GetFloatv)(GLenum, GLfloat *);
 #define CALL_GetFloatv(disp, parameters) \
     (* GET_GetFloatv(disp)) parameters
-static inline _glptr_GetFloatv
-GET_GetFloatv(struct _glapi_table *disp)
-{
-    return (_glptr_GetFloatv) (GET_by_offset(disp, _gloffset_GetFloatv));
+static INLINE _glptr_GetFloatv GET_GetFloatv(struct _glapi_table *disp) {
+   return (_glptr_GetFloatv) (GET_by_offset(disp, _gloffset_GetFloatv));
 }
 
-static inline void
-SET_GetFloatv(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (GLenum, GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetFloatv, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_GetIntegerv)(GLenum, GLint *);
 #define CALL_GetIntegerv(disp, parameters) \
     (* GET_GetIntegerv(disp)) parameters
-static inline _glptr_GetIntegerv
-GET_GetIntegerv(struct _glapi_table *disp)
-{
-    return (_glptr_GetIntegerv) (GET_by_offset(disp, _gloffset_GetIntegerv));
+static INLINE _glptr_GetIntegerv GET_GetIntegerv(struct _glapi_table *disp) {
+   return (_glptr_GetIntegerv) (GET_by_offset(disp, _gloffset_GetIntegerv));
 }
 
-static inline void
-SET_GetIntegerv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetIntegerv, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_GetLightfv)(GLenum, GLenum, GLfloat *);
 #define CALL_GetLightfv(disp, parameters) \
     (* GET_GetLightfv(disp)) parameters
-static inline _glptr_GetLightfv
-GET_GetLightfv(struct _glapi_table *disp)
-{
-    return (_glptr_GetLightfv) (GET_by_offset(disp, _gloffset_GetLightfv));
+static INLINE _glptr_GetLightfv GET_GetLightfv(struct _glapi_table *disp) {
+   return (_glptr_GetLightfv) (GET_by_offset(disp, _gloffset_GetLightfv));
 }
 
-static inline void
-SET_GetLightfv(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLenum, GLenum, GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetLightfv, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_GetLightiv)(GLenum, GLenum, GLint *);
 #define CALL_GetLightiv(disp, parameters) \
     (* GET_GetLightiv(disp)) parameters
-static inline _glptr_GetLightiv
-GET_GetLightiv(struct _glapi_table *disp)
-{
-    return (_glptr_GetLightiv) (GET_by_offset(disp, _gloffset_GetLightiv));
+static INLINE _glptr_GetLightiv GET_GetLightiv(struct _glapi_table *disp) {
+   return (_glptr_GetLightiv) (GET_by_offset(disp, _gloffset_GetLightiv));
 }
 
-static inline void
-SET_GetLightiv(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLenum, GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetLightiv, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_GetMapdv)(GLenum, GLenum, GLdouble *);
 #define CALL_GetMapdv(disp, parameters) \
     (* GET_GetMapdv(disp)) parameters
-static inline _glptr_GetMapdv
-GET_GetMapdv(struct _glapi_table *disp)
-{
-    return (_glptr_GetMapdv) (GET_by_offset(disp, _gloffset_GetMapdv));
+static INLINE _glptr_GetMapdv GET_GetMapdv(struct _glapi_table *disp) {
+   return (_glptr_GetMapdv) (GET_by_offset(disp, _gloffset_GetMapdv));
 }
 
-static inline void
-SET_GetMapdv(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLenum, GLenum, GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_GetMapdv, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_GetMapfv)(GLenum, GLenum, GLfloat *);
 #define CALL_GetMapfv(disp, parameters) \
     (* GET_GetMapfv(disp)) parameters
-static inline _glptr_GetMapfv
-GET_GetMapfv(struct _glapi_table *disp)
-{
-    return (_glptr_GetMapfv) (GET_by_offset(disp, _gloffset_GetMapfv));
+static INLINE _glptr_GetMapfv GET_GetMapfv(struct _glapi_table *disp) {
+   return (_glptr_GetMapfv) (GET_by_offset(disp, _gloffset_GetMapfv));
 }
 
-static inline void
-SET_GetMapfv(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLenum, GLenum, GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetMapfv, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_GetMapiv)(GLenum, GLenum, GLint *);
 #define CALL_GetMapiv(disp, parameters) \
     (* GET_GetMapiv(disp)) parameters
-static inline _glptr_GetMapiv
-GET_GetMapiv(struct _glapi_table *disp)
-{
-    return (_glptr_GetMapiv) (GET_by_offset(disp, _gloffset_GetMapiv));
+static INLINE _glptr_GetMapiv GET_GetMapiv(struct _glapi_table *disp) {
+   return (_glptr_GetMapiv) (GET_by_offset(disp, _gloffset_GetMapiv));
 }
 
-static inline void
-SET_GetMapiv(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLenum, GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetMapiv, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_GetMaterialfv)(GLenum, GLenum, GLfloat *);
 #define CALL_GetMaterialfv(disp, parameters) \
     (* GET_GetMaterialfv(disp)) parameters
-static inline _glptr_GetMaterialfv
-GET_GetMaterialfv(struct _glapi_table *disp)
-{
-    return (_glptr_GetMaterialfv) (GET_by_offset
-                                   (disp, _gloffset_GetMaterialfv));
+static INLINE _glptr_GetMaterialfv GET_GetMaterialfv(struct _glapi_table *disp) {
+   return (_glptr_GetMaterialfv) (GET_by_offset(disp, _gloffset_GetMaterialfv));
 }
 
-static inline void
-SET_GetMaterialfv(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, GLenum, GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetMaterialfv, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_GetMaterialiv)(GLenum, GLenum, GLint *);
 #define CALL_GetMaterialiv(disp, parameters) \
     (* GET_GetMaterialiv(disp)) parameters
-static inline _glptr_GetMaterialiv
-GET_GetMaterialiv(struct _glapi_table *disp)
-{
-    return (_glptr_GetMaterialiv) (GET_by_offset
-                                   (disp, _gloffset_GetMaterialiv));
+static INLINE _glptr_GetMaterialiv GET_GetMaterialiv(struct _glapi_table *disp) {
+   return (_glptr_GetMaterialiv) (GET_by_offset(disp, _gloffset_GetMaterialiv));
 }
 
-static inline void
-SET_GetMaterialiv(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetMaterialiv, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_GetPixelMapfv)(GLenum, GLfloat *);
 #define CALL_GetPixelMapfv(disp, parameters) \
     (* GET_GetPixelMapfv(disp)) parameters
-static inline _glptr_GetPixelMapfv
-GET_GetPixelMapfv(struct _glapi_table *disp)
-{
-    return (_glptr_GetPixelMapfv) (GET_by_offset
-                                   (disp, _gloffset_GetPixelMapfv));
+static INLINE _glptr_GetPixelMapfv GET_GetPixelMapfv(struct _glapi_table *disp) {
+   return (_glptr_GetPixelMapfv) (GET_by_offset(disp, _gloffset_GetPixelMapfv));
 }
 
-static inline void
-SET_GetPixelMapfv(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetPixelMapfv, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_GetPixelMapuiv)(GLenum, GLuint *);
 #define CALL_GetPixelMapuiv(disp, parameters) \
     (* GET_GetPixelMapuiv(disp)) parameters
-static inline _glptr_GetPixelMapuiv
-GET_GetPixelMapuiv(struct _glapi_table *disp)
-{
-    return (_glptr_GetPixelMapuiv) (GET_by_offset
-                                    (disp, _gloffset_GetPixelMapuiv));
+static INLINE _glptr_GetPixelMapuiv GET_GetPixelMapuiv(struct _glapi_table *disp) {
+   return (_glptr_GetPixelMapuiv) (GET_by_offset(disp, _gloffset_GetPixelMapuiv));
 }
 
-static inline void
-SET_GetPixelMapuiv(struct _glapi_table *disp,
-                   void (GLAPIENTRYP fn) (GLenum, GLuint *))
-{
-    SET_by_offset(disp, _gloffset_GetPixelMapuiv, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_GetPixelMapusv)(GLenum, GLushort *);
 #define CALL_GetPixelMapusv(disp, parameters) \
     (* GET_GetPixelMapusv(disp)) parameters
-static inline _glptr_GetPixelMapusv
-GET_GetPixelMapusv(struct _glapi_table *disp)
-{
-    return (_glptr_GetPixelMapusv) (GET_by_offset
-                                    (disp, _gloffset_GetPixelMapusv));
+static INLINE _glptr_GetPixelMapusv GET_GetPixelMapusv(struct _glapi_table *disp) {
+   return (_glptr_GetPixelMapusv) (GET_by_offset(disp, _gloffset_GetPixelMapusv));
 }
 
-static inline void
-SET_GetPixelMapusv(struct _glapi_table *disp,
-                   void (GLAPIENTRYP fn) (GLenum, GLushort *))
-{
-    SET_by_offset(disp, _gloffset_GetPixelMapusv, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_GetPolygonStipple)(GLubyte *);
 #define CALL_GetPolygonStipple(disp, parameters) \
     (* GET_GetPolygonStipple(disp)) parameters
-static inline _glptr_GetPolygonStipple
-GET_GetPolygonStipple(struct _glapi_table *disp)
-{
-    return (_glptr_GetPolygonStipple) (GET_by_offset
-                                       (disp, _gloffset_GetPolygonStipple));
+static INLINE _glptr_GetPolygonStipple GET_GetPolygonStipple(struct _glapi_table *disp) {
+   return (_glptr_GetPolygonStipple) (GET_by_offset(disp, _gloffset_GetPolygonStipple));
 }
 
-static inline void
-SET_GetPolygonStipple(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLubyte *))
-{
-    SET_by_offset(disp, _gloffset_GetPolygonStipple, fn);
+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);
-
+typedef const GLubyte * (GLAPIENTRYP _glptr_GetString)(GLenum);
 #define CALL_GetString(disp, parameters) \
     (* GET_GetString(disp)) parameters
-static inline _glptr_GetString
-GET_GetString(struct _glapi_table *disp)
-{
-    return (_glptr_GetString) (GET_by_offset(disp, _gloffset_GetString));
+static INLINE _glptr_GetString GET_GetString(struct _glapi_table *disp) {
+   return (_glptr_GetString) (GET_by_offset(disp, _gloffset_GetString));
 }
 
-static inline void
-SET_GetString(struct _glapi_table *disp,
-              const GLubyte * (GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_GetString, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_GetTexEnvfv)(GLenum, GLenum, GLfloat *);
 #define CALL_GetTexEnvfv(disp, parameters) \
     (* GET_GetTexEnvfv(disp)) parameters
-static inline _glptr_GetTexEnvfv
-GET_GetTexEnvfv(struct _glapi_table *disp)
-{
-    return (_glptr_GetTexEnvfv) (GET_by_offset(disp, _gloffset_GetTexEnvfv));
+static INLINE _glptr_GetTexEnvfv GET_GetTexEnvfv(struct _glapi_table *disp) {
+   return (_glptr_GetTexEnvfv) (GET_by_offset(disp, _gloffset_GetTexEnvfv));
 }
 
-static inline void
-SET_GetTexEnvfv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLenum, GLenum, GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetTexEnvfv, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_GetTexEnviv)(GLenum, GLenum, GLint *);
 #define CALL_GetTexEnviv(disp, parameters) \
     (* GET_GetTexEnviv(disp)) parameters
-static inline _glptr_GetTexEnviv
-GET_GetTexEnviv(struct _glapi_table *disp)
-{
-    return (_glptr_GetTexEnviv) (GET_by_offset(disp, _gloffset_GetTexEnviv));
+static INLINE _glptr_GetTexEnviv GET_GetTexEnviv(struct _glapi_table *disp) {
+   return (_glptr_GetTexEnviv) (GET_by_offset(disp, _gloffset_GetTexEnviv));
 }
 
-static inline void
-SET_GetTexEnviv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLenum, GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetTexEnviv, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_GetTexGendv)(GLenum, GLenum, GLdouble *);
 #define CALL_GetTexGendv(disp, parameters) \
     (* GET_GetTexGendv(disp)) parameters
-static inline _glptr_GetTexGendv
-GET_GetTexGendv(struct _glapi_table *disp)
-{
-    return (_glptr_GetTexGendv) (GET_by_offset(disp, _gloffset_GetTexGendv));
+static INLINE _glptr_GetTexGendv GET_GetTexGendv(struct _glapi_table *disp) {
+   return (_glptr_GetTexGendv) (GET_by_offset(disp, _gloffset_GetTexGendv));
 }
 
-static inline void
-SET_GetTexGendv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLenum, GLenum, GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_GetTexGendv, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_GetTexGenfv)(GLenum, GLenum, GLfloat *);
 #define CALL_GetTexGenfv(disp, parameters) \
     (* GET_GetTexGenfv(disp)) parameters
-static inline _glptr_GetTexGenfv
-GET_GetTexGenfv(struct _glapi_table *disp)
-{
-    return (_glptr_GetTexGenfv) (GET_by_offset(disp, _gloffset_GetTexGenfv));
+static INLINE _glptr_GetTexGenfv GET_GetTexGenfv(struct _glapi_table *disp) {
+   return (_glptr_GetTexGenfv) (GET_by_offset(disp, _gloffset_GetTexGenfv));
 }
 
-static inline void
-SET_GetTexGenfv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLenum, GLenum, GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetTexGenfv, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_GetTexGeniv)(GLenum, GLenum, GLint *);
 #define CALL_GetTexGeniv(disp, parameters) \
     (* GET_GetTexGeniv(disp)) parameters
-static inline _glptr_GetTexGeniv
-GET_GetTexGeniv(struct _glapi_table *disp)
-{
-    return (_glptr_GetTexGeniv) (GET_by_offset(disp, _gloffset_GetTexGeniv));
+static INLINE _glptr_GetTexGeniv GET_GetTexGeniv(struct _glapi_table *disp) {
+   return (_glptr_GetTexGeniv) (GET_by_offset(disp, _gloffset_GetTexGeniv));
 }
 
-static inline void
-SET_GetTexGeniv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLenum, GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetTexGeniv, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_GetTexImage)(GLenum, GLint, GLenum, GLenum, GLvoid *);
 #define CALL_GetTexImage(disp, parameters) \
     (* GET_GetTexImage(disp)) parameters
-static inline _glptr_GetTexImage
-GET_GetTexImage(struct _glapi_table *disp)
-{
-    return (_glptr_GetTexImage) (GET_by_offset(disp, _gloffset_GetTexImage));
+static INLINE _glptr_GetTexImage GET_GetTexImage(struct _glapi_table *disp) {
+   return (_glptr_GetTexImage) (GET_by_offset(disp, _gloffset_GetTexImage));
 }
 
-static inline void
-SET_GetTexImage(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLenum, GLint, GLenum, GLenum, GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_GetTexImage, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_GetTexParameterfv)(GLenum, GLenum, GLfloat *);
 #define CALL_GetTexParameterfv(disp, parameters) \
     (* GET_GetTexParameterfv(disp)) parameters
-static inline _glptr_GetTexParameterfv
-GET_GetTexParameterfv(struct _glapi_table *disp)
-{
-    return (_glptr_GetTexParameterfv) (GET_by_offset
-                                       (disp, _gloffset_GetTexParameterfv));
+static INLINE _glptr_GetTexParameterfv GET_GetTexParameterfv(struct _glapi_table *disp) {
+   return (_glptr_GetTexParameterfv) (GET_by_offset(disp, _gloffset_GetTexParameterfv));
 }
 
-static inline void
-SET_GetTexParameterfv(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLenum, GLenum, GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetTexParameterfv, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_GetTexParameteriv)(GLenum, GLenum, GLint *);
 #define CALL_GetTexParameteriv(disp, parameters) \
     (* GET_GetTexParameteriv(disp)) parameters
-static inline _glptr_GetTexParameteriv
-GET_GetTexParameteriv(struct _glapi_table *disp)
-{
-    return (_glptr_GetTexParameteriv) (GET_by_offset
-                                       (disp, _gloffset_GetTexParameteriv));
+static INLINE _glptr_GetTexParameteriv GET_GetTexParameteriv(struct _glapi_table *disp) {
+   return (_glptr_GetTexParameteriv) (GET_by_offset(disp, _gloffset_GetTexParameteriv));
 }
 
-static inline void
-SET_GetTexParameteriv(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLenum, GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetTexParameteriv, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_GetTexLevelParameterfv)(GLenum, GLint, GLenum, GLfloat *);
 #define CALL_GetTexLevelParameterfv(disp, parameters) \
     (* GET_GetTexLevelParameterfv(disp)) parameters
-static inline _glptr_GetTexLevelParameterfv
-GET_GetTexLevelParameterfv(struct _glapi_table *disp)
-{
-    return (_glptr_GetTexLevelParameterfv) (GET_by_offset
-                                            (disp,
-                                             _gloffset_GetTexLevelParameterfv));
+static INLINE _glptr_GetTexLevelParameterfv GET_GetTexLevelParameterfv(struct _glapi_table *disp) {
+   return (_glptr_GetTexLevelParameterfv) (GET_by_offset(disp, _gloffset_GetTexLevelParameterfv));
 }
 
-static inline void
-SET_GetTexLevelParameterfv(struct _glapi_table *disp,
-                           void (GLAPIENTRYP fn) (GLenum, GLint, GLenum,
-                                                  GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetTexLevelParameterfv, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_GetTexLevelParameteriv)(GLenum, GLint, GLenum, GLint *);
 #define CALL_GetTexLevelParameteriv(disp, parameters) \
     (* GET_GetTexLevelParameteriv(disp)) parameters
-static inline _glptr_GetTexLevelParameteriv
-GET_GetTexLevelParameteriv(struct _glapi_table *disp)
-{
-    return (_glptr_GetTexLevelParameteriv) (GET_by_offset
-                                            (disp,
-                                             _gloffset_GetTexLevelParameteriv));
+static INLINE _glptr_GetTexLevelParameteriv GET_GetTexLevelParameteriv(struct _glapi_table *disp) {
+   return (_glptr_GetTexLevelParameteriv) (GET_by_offset(disp, _gloffset_GetTexLevelParameteriv));
 }
 
-static inline void
-SET_GetTexLevelParameteriv(struct _glapi_table *disp,
-                           void (GLAPIENTRYP fn) (GLenum, GLint, GLenum,
-                                                  GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetTexLevelParameteriv, fn);
+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);
-
+typedef GLboolean (GLAPIENTRYP _glptr_IsEnabled)(GLenum);
 #define CALL_IsEnabled(disp, parameters) \
     (* GET_IsEnabled(disp)) parameters
-static inline _glptr_IsEnabled
-GET_IsEnabled(struct _glapi_table *disp)
-{
-    return (_glptr_IsEnabled) (GET_by_offset(disp, _gloffset_IsEnabled));
+static INLINE _glptr_IsEnabled GET_IsEnabled(struct _glapi_table *disp) {
+   return (_glptr_IsEnabled) (GET_by_offset(disp, _gloffset_IsEnabled));
 }
 
-static inline void
-SET_IsEnabled(struct _glapi_table *disp, GLboolean(GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_IsEnabled, fn);
+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);
-
+typedef GLboolean (GLAPIENTRYP _glptr_IsList)(GLuint);
 #define CALL_IsList(disp, parameters) \
     (* GET_IsList(disp)) parameters
-static inline _glptr_IsList
-GET_IsList(struct _glapi_table *disp)
-{
-    return (_glptr_IsList) (GET_by_offset(disp, _gloffset_IsList));
+static INLINE _glptr_IsList GET_IsList(struct _glapi_table *disp) {
+   return (_glptr_IsList) (GET_by_offset(disp, _gloffset_IsList));
 }
 
-static inline void
-SET_IsList(struct _glapi_table *disp, GLboolean(GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_IsList, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_DepthRange)(GLclampd, GLclampd);
 #define CALL_DepthRange(disp, parameters) \
     (* GET_DepthRange(disp)) parameters
-static inline _glptr_DepthRange
-GET_DepthRange(struct _glapi_table *disp)
-{
-    return (_glptr_DepthRange) (GET_by_offset(disp, _gloffset_DepthRange));
+static INLINE _glptr_DepthRange GET_DepthRange(struct _glapi_table *disp) {
+   return (_glptr_DepthRange) (GET_by_offset(disp, _gloffset_DepthRange));
 }
 
-static inline void
-SET_DepthRange(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLclampd, GLclampd))
-{
-    SET_by_offset(disp, _gloffset_DepthRange, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_Frustum)(GLdouble, GLdouble, GLdouble, GLdouble, GLdouble, GLdouble);
 #define CALL_Frustum(disp, parameters) \
     (* GET_Frustum(disp)) parameters
-static inline _glptr_Frustum
-GET_Frustum(struct _glapi_table *disp)
-{
-    return (_glptr_Frustum) (GET_by_offset(disp, _gloffset_Frustum));
+static INLINE _glptr_Frustum GET_Frustum(struct _glapi_table *disp) {
+   return (_glptr_Frustum) (GET_by_offset(disp, _gloffset_Frustum));
 }
 
-static inline void
-SET_Frustum(struct _glapi_table *disp,
-            void (GLAPIENTRYP fn) (GLdouble, GLdouble, GLdouble, GLdouble,
-                                   GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_Frustum, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_LoadIdentity)(void);
 #define CALL_LoadIdentity(disp, parameters) \
     (* GET_LoadIdentity(disp)) parameters
-static inline _glptr_LoadIdentity
-GET_LoadIdentity(struct _glapi_table *disp)
-{
-    return (_glptr_LoadIdentity) (GET_by_offset(disp, _gloffset_LoadIdentity));
+static INLINE _glptr_LoadIdentity GET_LoadIdentity(struct _glapi_table *disp) {
+   return (_glptr_LoadIdentity) (GET_by_offset(disp, _gloffset_LoadIdentity));
 }
 
-static inline void
-SET_LoadIdentity(struct _glapi_table *disp, void (GLAPIENTRYP fn) (void))
-{
-    SET_by_offset(disp, _gloffset_LoadIdentity, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_LoadMatrixf)(const GLfloat *);
 #define CALL_LoadMatrixf(disp, parameters) \
     (* GET_LoadMatrixf(disp)) parameters
-static inline _glptr_LoadMatrixf
-GET_LoadMatrixf(struct _glapi_table *disp)
-{
-    return (_glptr_LoadMatrixf) (GET_by_offset(disp, _gloffset_LoadMatrixf));
+static INLINE _glptr_LoadMatrixf GET_LoadMatrixf(struct _glapi_table *disp) {
+   return (_glptr_LoadMatrixf) (GET_by_offset(disp, _gloffset_LoadMatrixf));
 }
 
-static inline void
-SET_LoadMatrixf(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_LoadMatrixf, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_LoadMatrixd)(const GLdouble *);
 #define CALL_LoadMatrixd(disp, parameters) \
     (* GET_LoadMatrixd(disp)) parameters
-static inline _glptr_LoadMatrixd
-GET_LoadMatrixd(struct _glapi_table *disp)
-{
-    return (_glptr_LoadMatrixd) (GET_by_offset(disp, _gloffset_LoadMatrixd));
+static INLINE _glptr_LoadMatrixd GET_LoadMatrixd(struct _glapi_table *disp) {
+   return (_glptr_LoadMatrixd) (GET_by_offset(disp, _gloffset_LoadMatrixd));
 }
 
-static inline void
-SET_LoadMatrixd(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_LoadMatrixd, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_MatrixMode)(GLenum);
 #define CALL_MatrixMode(disp, parameters) \
     (* GET_MatrixMode(disp)) parameters
-static inline _glptr_MatrixMode
-GET_MatrixMode(struct _glapi_table *disp)
-{
-    return (_glptr_MatrixMode) (GET_by_offset(disp, _gloffset_MatrixMode));
+static INLINE _glptr_MatrixMode GET_MatrixMode(struct _glapi_table *disp) {
+   return (_glptr_MatrixMode) (GET_by_offset(disp, _gloffset_MatrixMode));
 }
 
-static inline void
-SET_MatrixMode(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_MatrixMode, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_MultMatrixf)(const GLfloat *);
 #define CALL_MultMatrixf(disp, parameters) \
     (* GET_MultMatrixf(disp)) parameters
-static inline _glptr_MultMatrixf
-GET_MultMatrixf(struct _glapi_table *disp)
-{
-    return (_glptr_MultMatrixf) (GET_by_offset(disp, _gloffset_MultMatrixf));
+static INLINE _glptr_MultMatrixf GET_MultMatrixf(struct _glapi_table *disp) {
+   return (_glptr_MultMatrixf) (GET_by_offset(disp, _gloffset_MultMatrixf));
 }
 
-static inline void
-SET_MultMatrixf(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_MultMatrixf, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_MultMatrixd)(const GLdouble *);
 #define CALL_MultMatrixd(disp, parameters) \
     (* GET_MultMatrixd(disp)) parameters
-static inline _glptr_MultMatrixd
-GET_MultMatrixd(struct _glapi_table *disp)
-{
-    return (_glptr_MultMatrixd) (GET_by_offset(disp, _gloffset_MultMatrixd));
+static INLINE _glptr_MultMatrixd GET_MultMatrixd(struct _glapi_table *disp) {
+   return (_glptr_MultMatrixd) (GET_by_offset(disp, _gloffset_MultMatrixd));
 }
 
-static inline void
-SET_MultMatrixd(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_MultMatrixd, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_Ortho)(GLdouble, GLdouble, GLdouble, GLdouble, GLdouble, GLdouble);
 #define CALL_Ortho(disp, parameters) \
     (* GET_Ortho(disp)) parameters
-static inline _glptr_Ortho
-GET_Ortho(struct _glapi_table *disp)
-{
-    return (_glptr_Ortho) (GET_by_offset(disp, _gloffset_Ortho));
+static INLINE _glptr_Ortho GET_Ortho(struct _glapi_table *disp) {
+   return (_glptr_Ortho) (GET_by_offset(disp, _gloffset_Ortho));
 }
 
-static inline void
-SET_Ortho(struct _glapi_table *disp,
-          void (GLAPIENTRYP fn) (GLdouble, GLdouble, GLdouble, GLdouble,
-                                 GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_Ortho, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_PopMatrix)(void);
 #define CALL_PopMatrix(disp, parameters) \
     (* GET_PopMatrix(disp)) parameters
-static inline _glptr_PopMatrix
-GET_PopMatrix(struct _glapi_table *disp)
-{
-    return (_glptr_PopMatrix) (GET_by_offset(disp, _gloffset_PopMatrix));
+static INLINE _glptr_PopMatrix GET_PopMatrix(struct _glapi_table *disp) {
+   return (_glptr_PopMatrix) (GET_by_offset(disp, _gloffset_PopMatrix));
 }
 
-static inline void
-SET_PopMatrix(struct _glapi_table *disp, void (GLAPIENTRYP fn) (void))
-{
-    SET_by_offset(disp, _gloffset_PopMatrix, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_PushMatrix)(void);
 #define CALL_PushMatrix(disp, parameters) \
     (* GET_PushMatrix(disp)) parameters
-static inline _glptr_PushMatrix
-GET_PushMatrix(struct _glapi_table *disp)
-{
-    return (_glptr_PushMatrix) (GET_by_offset(disp, _gloffset_PushMatrix));
+static INLINE _glptr_PushMatrix GET_PushMatrix(struct _glapi_table *disp) {
+   return (_glptr_PushMatrix) (GET_by_offset(disp, _gloffset_PushMatrix));
 }
 
-static inline void
-SET_PushMatrix(struct _glapi_table *disp, void (GLAPIENTRYP fn) (void))
-{
-    SET_by_offset(disp, _gloffset_PushMatrix, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_Rotated)(GLdouble, GLdouble, GLdouble, GLdouble);
 #define CALL_Rotated(disp, parameters) \
     (* GET_Rotated(disp)) parameters
-static inline _glptr_Rotated
-GET_Rotated(struct _glapi_table *disp)
-{
-    return (_glptr_Rotated) (GET_by_offset(disp, _gloffset_Rotated));
+static INLINE _glptr_Rotated GET_Rotated(struct _glapi_table *disp) {
+   return (_glptr_Rotated) (GET_by_offset(disp, _gloffset_Rotated));
 }
 
-static inline void
-SET_Rotated(struct _glapi_table *disp,
-            void (GLAPIENTRYP fn) (GLdouble, GLdouble, GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_Rotated, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Rotatef)(GLfloat, GLfloat, GLfloat, GLfloat);
 #define CALL_Rotatef(disp, parameters) \
     (* GET_Rotatef(disp)) parameters
-static inline _glptr_Rotatef
-GET_Rotatef(struct _glapi_table *disp)
-{
-    return (_glptr_Rotatef) (GET_by_offset(disp, _gloffset_Rotatef));
+static INLINE _glptr_Rotatef GET_Rotatef(struct _glapi_table *disp) {
+   return (_glptr_Rotatef) (GET_by_offset(disp, _gloffset_Rotatef));
 }
 
-static inline void
-SET_Rotatef(struct _glapi_table *disp,
-            void (GLAPIENTRYP fn) (GLfloat, GLfloat, GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_Rotatef, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Scaled)(GLdouble, GLdouble, GLdouble);
 #define CALL_Scaled(disp, parameters) \
     (* GET_Scaled(disp)) parameters
-static inline _glptr_Scaled
-GET_Scaled(struct _glapi_table *disp)
-{
-    return (_glptr_Scaled) (GET_by_offset(disp, _gloffset_Scaled));
+static INLINE _glptr_Scaled GET_Scaled(struct _glapi_table *disp) {
+   return (_glptr_Scaled) (GET_by_offset(disp, _gloffset_Scaled));
 }
 
-static inline void
-SET_Scaled(struct _glapi_table *disp,
-           void (GLAPIENTRYP fn) (GLdouble, GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_Scaled, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Scalef)(GLfloat, GLfloat, GLfloat);
 #define CALL_Scalef(disp, parameters) \
     (* GET_Scalef(disp)) parameters
-static inline _glptr_Scalef
-GET_Scalef(struct _glapi_table *disp)
-{
-    return (_glptr_Scalef) (GET_by_offset(disp, _gloffset_Scalef));
+static INLINE _glptr_Scalef GET_Scalef(struct _glapi_table *disp) {
+   return (_glptr_Scalef) (GET_by_offset(disp, _gloffset_Scalef));
 }
 
-static inline void
-SET_Scalef(struct _glapi_table *disp,
-           void (GLAPIENTRYP fn) (GLfloat, GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_Scalef, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Translated)(GLdouble, GLdouble, GLdouble);
 #define CALL_Translated(disp, parameters) \
     (* GET_Translated(disp)) parameters
-static inline _glptr_Translated
-GET_Translated(struct _glapi_table *disp)
-{
-    return (_glptr_Translated) (GET_by_offset(disp, _gloffset_Translated));
+static INLINE _glptr_Translated GET_Translated(struct _glapi_table *disp) {
+   return (_glptr_Translated) (GET_by_offset(disp, _gloffset_Translated));
 }
 
-static inline void
-SET_Translated(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLdouble, GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_Translated, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Translatef)(GLfloat, GLfloat, GLfloat);
 #define CALL_Translatef(disp, parameters) \
     (* GET_Translatef(disp)) parameters
-static inline _glptr_Translatef
-GET_Translatef(struct _glapi_table *disp)
-{
-    return (_glptr_Translatef) (GET_by_offset(disp, _gloffset_Translatef));
+static INLINE _glptr_Translatef GET_Translatef(struct _glapi_table *disp) {
+   return (_glptr_Translatef) (GET_by_offset(disp, _gloffset_Translatef));
 }
 
-static inline void
-SET_Translatef(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLfloat, GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_Translatef, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Viewport)(GLint, GLint, GLsizei, GLsizei);
 #define CALL_Viewport(disp, parameters) \
     (* GET_Viewport(disp)) parameters
-static inline _glptr_Viewport
-GET_Viewport(struct _glapi_table *disp)
-{
-    return (_glptr_Viewport) (GET_by_offset(disp, _gloffset_Viewport));
+static INLINE _glptr_Viewport GET_Viewport(struct _glapi_table *disp) {
+   return (_glptr_Viewport) (GET_by_offset(disp, _gloffset_Viewport));
 }
 
-static inline void
-SET_Viewport(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLint, GLint, GLsizei, GLsizei))
-{
-    SET_by_offset(disp, _gloffset_Viewport, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_ArrayElement)(GLint);
 #define CALL_ArrayElement(disp, parameters) \
     (* GET_ArrayElement(disp)) parameters
-static inline _glptr_ArrayElement
-GET_ArrayElement(struct _glapi_table *disp)
-{
-    return (_glptr_ArrayElement) (GET_by_offset(disp, _gloffset_ArrayElement));
+static INLINE _glptr_ArrayElement GET_ArrayElement(struct _glapi_table *disp) {
+   return (_glptr_ArrayElement) (GET_by_offset(disp, _gloffset_ArrayElement));
 }
 
-static inline void
-SET_ArrayElement(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLint))
-{
-    SET_by_offset(disp, _gloffset_ArrayElement, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_BindTexture)(GLenum, GLuint);
 #define CALL_BindTexture(disp, parameters) \
     (* GET_BindTexture(disp)) parameters
-static inline _glptr_BindTexture
-GET_BindTexture(struct _glapi_table *disp)
-{
-    return (_glptr_BindTexture) (GET_by_offset(disp, _gloffset_BindTexture));
+static INLINE _glptr_BindTexture GET_BindTexture(struct _glapi_table *disp) {
+   return (_glptr_BindTexture) (GET_by_offset(disp, _gloffset_BindTexture));
 }
 
-static inline void
-SET_BindTexture(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_BindTexture, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_ColorPointer)(GLint, GLenum, GLsizei, const GLvoid *);
 #define CALL_ColorPointer(disp, parameters) \
     (* GET_ColorPointer(disp)) parameters
-static inline _glptr_ColorPointer
-GET_ColorPointer(struct _glapi_table *disp)
-{
-    return (_glptr_ColorPointer) (GET_by_offset(disp, _gloffset_ColorPointer));
+static INLINE _glptr_ColorPointer GET_ColorPointer(struct _glapi_table *disp) {
+   return (_glptr_ColorPointer) (GET_by_offset(disp, _gloffset_ColorPointer));
 }
 
-static inline void
-SET_ColorPointer(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLint, GLenum, GLsizei, const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_ColorPointer, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_DisableClientState)(GLenum);
 #define CALL_DisableClientState(disp, parameters) \
     (* GET_DisableClientState(disp)) parameters
-static inline _glptr_DisableClientState
-GET_DisableClientState(struct _glapi_table *disp)
-{
-    return (_glptr_DisableClientState) (GET_by_offset
-                                        (disp, _gloffset_DisableClientState));
+static INLINE _glptr_DisableClientState GET_DisableClientState(struct _glapi_table *disp) {
+   return (_glptr_DisableClientState) (GET_by_offset(disp, _gloffset_DisableClientState));
 }
 
-static inline void
-SET_DisableClientState(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_DisableClientState, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_DrawArrays)(GLenum, GLint, GLsizei);
 #define CALL_DrawArrays(disp, parameters) \
     (* GET_DrawArrays(disp)) parameters
-static inline _glptr_DrawArrays
-GET_DrawArrays(struct _glapi_table *disp)
-{
-    return (_glptr_DrawArrays) (GET_by_offset(disp, _gloffset_DrawArrays));
+static INLINE _glptr_DrawArrays GET_DrawArrays(struct _glapi_table *disp) {
+   return (_glptr_DrawArrays) (GET_by_offset(disp, _gloffset_DrawArrays));
 }
 
-static inline void
-SET_DrawArrays(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLenum, GLint, GLsizei))
-{
-    SET_by_offset(disp, _gloffset_DrawArrays, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_DrawElements)(GLenum, GLsizei, GLenum, const GLvoid *);
 #define CALL_DrawElements(disp, parameters) \
     (* GET_DrawElements(disp)) parameters
-static inline _glptr_DrawElements
-GET_DrawElements(struct _glapi_table *disp)
-{
-    return (_glptr_DrawElements) (GET_by_offset(disp, _gloffset_DrawElements));
+static INLINE _glptr_DrawElements GET_DrawElements(struct _glapi_table *disp) {
+   return (_glptr_DrawElements) (GET_by_offset(disp, _gloffset_DrawElements));
 }
 
-static inline void
-SET_DrawElements(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLenum, GLsizei, GLenum,
-                                        const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_DrawElements, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_EdgeFlagPointer)(GLsizei, const GLvoid *);
 #define CALL_EdgeFlagPointer(disp, parameters) \
     (* GET_EdgeFlagPointer(disp)) parameters
-static inline _glptr_EdgeFlagPointer
-GET_EdgeFlagPointer(struct _glapi_table *disp)
-{
-    return (_glptr_EdgeFlagPointer) (GET_by_offset
-                                     (disp, _gloffset_EdgeFlagPointer));
+static INLINE _glptr_EdgeFlagPointer GET_EdgeFlagPointer(struct _glapi_table *disp) {
+   return (_glptr_EdgeFlagPointer) (GET_by_offset(disp, _gloffset_EdgeFlagPointer));
 }
 
-static inline void
-SET_EdgeFlagPointer(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLsizei, const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_EdgeFlagPointer, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_EnableClientState)(GLenum);
 #define CALL_EnableClientState(disp, parameters) \
     (* GET_EnableClientState(disp)) parameters
-static inline _glptr_EnableClientState
-GET_EnableClientState(struct _glapi_table *disp)
-{
-    return (_glptr_EnableClientState) (GET_by_offset
-                                       (disp, _gloffset_EnableClientState));
+static INLINE _glptr_EnableClientState GET_EnableClientState(struct _glapi_table *disp) {
+   return (_glptr_EnableClientState) (GET_by_offset(disp, _gloffset_EnableClientState));
 }
 
-static inline void
-SET_EnableClientState(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_EnableClientState, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_IndexPointer)(GLenum, GLsizei, const GLvoid *);
 #define CALL_IndexPointer(disp, parameters) \
     (* GET_IndexPointer(disp)) parameters
-static inline _glptr_IndexPointer
-GET_IndexPointer(struct _glapi_table *disp)
-{
-    return (_glptr_IndexPointer) (GET_by_offset(disp, _gloffset_IndexPointer));
+static INLINE _glptr_IndexPointer GET_IndexPointer(struct _glapi_table *disp) {
+   return (_glptr_IndexPointer) (GET_by_offset(disp, _gloffset_IndexPointer));
 }
 
-static inline void
-SET_IndexPointer(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLenum, GLsizei, const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_IndexPointer, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Indexub)(GLubyte);
 #define CALL_Indexub(disp, parameters) \
     (* GET_Indexub(disp)) parameters
-static inline _glptr_Indexub
-GET_Indexub(struct _glapi_table *disp)
-{
-    return (_glptr_Indexub) (GET_by_offset(disp, _gloffset_Indexub));
+static INLINE _glptr_Indexub GET_Indexub(struct _glapi_table *disp) {
+   return (_glptr_Indexub) (GET_by_offset(disp, _gloffset_Indexub));
 }
 
-static inline void
-SET_Indexub(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLubyte))
-{
-    SET_by_offset(disp, _gloffset_Indexub, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_Indexubv)(const GLubyte *);
 #define CALL_Indexubv(disp, parameters) \
     (* GET_Indexubv(disp)) parameters
-static inline _glptr_Indexubv
-GET_Indexubv(struct _glapi_table *disp)
-{
-    return (_glptr_Indexubv) (GET_by_offset(disp, _gloffset_Indexubv));
+static INLINE _glptr_Indexubv GET_Indexubv(struct _glapi_table *disp) {
+   return (_glptr_Indexubv) (GET_by_offset(disp, _gloffset_Indexubv));
 }
 
-static inline void
-SET_Indexubv(struct _glapi_table *disp, void (GLAPIENTRYP fn) (const GLubyte *))
-{
-    SET_by_offset(disp, _gloffset_Indexubv, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_InterleavedArrays)(GLenum, GLsizei, const GLvoid *);
 #define CALL_InterleavedArrays(disp, parameters) \
     (* GET_InterleavedArrays(disp)) parameters
-static inline _glptr_InterleavedArrays
-GET_InterleavedArrays(struct _glapi_table *disp)
-{
-    return (_glptr_InterleavedArrays) (GET_by_offset
-                                       (disp, _gloffset_InterleavedArrays));
+static INLINE _glptr_InterleavedArrays GET_InterleavedArrays(struct _glapi_table *disp) {
+   return (_glptr_InterleavedArrays) (GET_by_offset(disp, _gloffset_InterleavedArrays));
 }
 
-static inline void
-SET_InterleavedArrays(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLenum, GLsizei, const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_InterleavedArrays, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_NormalPointer)(GLenum, GLsizei, const GLvoid *);
 #define CALL_NormalPointer(disp, parameters) \
     (* GET_NormalPointer(disp)) parameters
-static inline _glptr_NormalPointer
-GET_NormalPointer(struct _glapi_table *disp)
-{
-    return (_glptr_NormalPointer) (GET_by_offset
-                                   (disp, _gloffset_NormalPointer));
+static INLINE _glptr_NormalPointer GET_NormalPointer(struct _glapi_table *disp) {
+   return (_glptr_NormalPointer) (GET_by_offset(disp, _gloffset_NormalPointer));
 }
 
-static inline void
-SET_NormalPointer(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, GLsizei, const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_NormalPointer, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_PolygonOffset)(GLfloat, GLfloat);
 #define CALL_PolygonOffset(disp, parameters) \
     (* GET_PolygonOffset(disp)) parameters
-static inline _glptr_PolygonOffset
-GET_PolygonOffset(struct _glapi_table *disp)
-{
-    return (_glptr_PolygonOffset) (GET_by_offset
-                                   (disp, _gloffset_PolygonOffset));
+static INLINE _glptr_PolygonOffset GET_PolygonOffset(struct _glapi_table *disp) {
+   return (_glptr_PolygonOffset) (GET_by_offset(disp, _gloffset_PolygonOffset));
 }
 
-static inline void
-SET_PolygonOffset(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_PolygonOffset, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_TexCoordPointer)(GLint, GLenum, GLsizei, const GLvoid *);
 #define CALL_TexCoordPointer(disp, parameters) \
     (* GET_TexCoordPointer(disp)) parameters
-static inline _glptr_TexCoordPointer
-GET_TexCoordPointer(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoordPointer) (GET_by_offset
-                                     (disp, _gloffset_TexCoordPointer));
+static INLINE _glptr_TexCoordPointer GET_TexCoordPointer(struct _glapi_table *disp) {
+   return (_glptr_TexCoordPointer) (GET_by_offset(disp, _gloffset_TexCoordPointer));
 }
 
-static inline void
-SET_TexCoordPointer(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLint, GLenum, GLsizei,
-                                           const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_TexCoordPointer, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_VertexPointer)(GLint, GLenum, GLsizei, const GLvoid *);
 #define CALL_VertexPointer(disp, parameters) \
     (* GET_VertexPointer(disp)) parameters
-static inline _glptr_VertexPointer
-GET_VertexPointer(struct _glapi_table *disp)
-{
-    return (_glptr_VertexPointer) (GET_by_offset
-                                   (disp, _gloffset_VertexPointer));
+static INLINE _glptr_VertexPointer GET_VertexPointer(struct _glapi_table *disp) {
+   return (_glptr_VertexPointer) (GET_by_offset(disp, _gloffset_VertexPointer));
 }
 
-static inline void
-SET_VertexPointer(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLint, GLenum, GLsizei,
-                                         const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_VertexPointer, fn);
+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 *);
+typedef GLboolean (GLAPIENTRYP _glptr_AreTexturesResident)(GLsizei, const GLuint *, GLboolean *);
 #define CALL_AreTexturesResident(disp, parameters) \
     (* GET_AreTexturesResident(disp)) parameters
-static inline _glptr_AreTexturesResident
-GET_AreTexturesResident(struct _glapi_table *disp)
-{
-    return (_glptr_AreTexturesResident) (GET_by_offset
-                                         (disp, _gloffset_AreTexturesResident));
+static INLINE _glptr_AreTexturesResident GET_AreTexturesResident(struct _glapi_table *disp) {
+   return (_glptr_AreTexturesResident) (GET_by_offset(disp, _gloffset_AreTexturesResident));
 }
 
-static inline void
-SET_AreTexturesResident(struct _glapi_table *disp,
-                        GLboolean(GLAPIENTRYP fn) (GLsizei, const GLuint *,
-                                                   GLboolean *))
-{
-    SET_by_offset(disp, _gloffset_AreTexturesResident, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_CopyTexImage1D)(GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLint);
 #define CALL_CopyTexImage1D(disp, parameters) \
     (* GET_CopyTexImage1D(disp)) parameters
-static inline _glptr_CopyTexImage1D
-GET_CopyTexImage1D(struct _glapi_table *disp)
-{
-    return (_glptr_CopyTexImage1D) (GET_by_offset
-                                    (disp, _gloffset_CopyTexImage1D));
+static INLINE _glptr_CopyTexImage1D GET_CopyTexImage1D(struct _glapi_table *disp) {
+   return (_glptr_CopyTexImage1D) (GET_by_offset(disp, _gloffset_CopyTexImage1D));
 }
 
-static inline void
-SET_CopyTexImage1D(struct _glapi_table *disp,
-                   void (GLAPIENTRYP fn) (GLenum, GLint, GLenum, GLint, GLint,
-                                          GLsizei, GLint))
-{
-    SET_by_offset(disp, _gloffset_CopyTexImage1D, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_CopyTexImage2D)(GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLsizei, GLint);
 #define CALL_CopyTexImage2D(disp, parameters) \
     (* GET_CopyTexImage2D(disp)) parameters
-static inline _glptr_CopyTexImage2D
-GET_CopyTexImage2D(struct _glapi_table *disp)
-{
-    return (_glptr_CopyTexImage2D) (GET_by_offset
-                                    (disp, _gloffset_CopyTexImage2D));
+static INLINE _glptr_CopyTexImage2D GET_CopyTexImage2D(struct _glapi_table *disp) {
+   return (_glptr_CopyTexImage2D) (GET_by_offset(disp, _gloffset_CopyTexImage2D));
 }
 
-static inline void
-SET_CopyTexImage2D(struct _glapi_table *disp,
-                   void (GLAPIENTRYP fn) (GLenum, GLint, GLenum, GLint, GLint,
-                                          GLsizei, GLsizei, GLint))
-{
-    SET_by_offset(disp, _gloffset_CopyTexImage2D, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_CopyTexSubImage1D)(GLenum, GLint, GLint, GLint, GLint, GLsizei);
 #define CALL_CopyTexSubImage1D(disp, parameters) \
     (* GET_CopyTexSubImage1D(disp)) parameters
-static inline _glptr_CopyTexSubImage1D
-GET_CopyTexSubImage1D(struct _glapi_table *disp)
-{
-    return (_glptr_CopyTexSubImage1D) (GET_by_offset
-                                       (disp, _gloffset_CopyTexSubImage1D));
+static INLINE _glptr_CopyTexSubImage1D GET_CopyTexSubImage1D(struct _glapi_table *disp) {
+   return (_glptr_CopyTexSubImage1D) (GET_by_offset(disp, _gloffset_CopyTexSubImage1D));
 }
 
-static inline void
-SET_CopyTexSubImage1D(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLenum, GLint, GLint, GLint, GLint,
-                                             GLsizei))
-{
-    SET_by_offset(disp, _gloffset_CopyTexSubImage1D, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_CopyTexSubImage2D)(GLenum, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
 #define CALL_CopyTexSubImage2D(disp, parameters) \
     (* GET_CopyTexSubImage2D(disp)) parameters
-static inline _glptr_CopyTexSubImage2D
-GET_CopyTexSubImage2D(struct _glapi_table *disp)
-{
-    return (_glptr_CopyTexSubImage2D) (GET_by_offset
-                                       (disp, _gloffset_CopyTexSubImage2D));
+static INLINE _glptr_CopyTexSubImage2D GET_CopyTexSubImage2D(struct _glapi_table *disp) {
+   return (_glptr_CopyTexSubImage2D) (GET_by_offset(disp, _gloffset_CopyTexSubImage2D));
 }
 
-static inline void
-SET_CopyTexSubImage2D(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLenum, GLint, GLint, GLint, GLint,
-                                             GLint, GLsizei, GLsizei))
-{
-    SET_by_offset(disp, _gloffset_CopyTexSubImage2D, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_DeleteTextures)(GLsizei, const GLuint *);
 #define CALL_DeleteTextures(disp, parameters) \
     (* GET_DeleteTextures(disp)) parameters
-static inline _glptr_DeleteTextures
-GET_DeleteTextures(struct _glapi_table *disp)
-{
-    return (_glptr_DeleteTextures) (GET_by_offset
-                                    (disp, _gloffset_DeleteTextures));
+static INLINE _glptr_DeleteTextures GET_DeleteTextures(struct _glapi_table *disp) {
+   return (_glptr_DeleteTextures) (GET_by_offset(disp, _gloffset_DeleteTextures));
 }
 
-static inline void
-SET_DeleteTextures(struct _glapi_table *disp,
-                   void (GLAPIENTRYP fn) (GLsizei, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_DeleteTextures, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_GenTextures)(GLsizei, GLuint *);
 #define CALL_GenTextures(disp, parameters) \
     (* GET_GenTextures(disp)) parameters
-static inline _glptr_GenTextures
-GET_GenTextures(struct _glapi_table *disp)
-{
-    return (_glptr_GenTextures) (GET_by_offset(disp, _gloffset_GenTextures));
+static INLINE _glptr_GenTextures GET_GenTextures(struct _glapi_table *disp) {
+   return (_glptr_GenTextures) (GET_by_offset(disp, _gloffset_GenTextures));
 }
 
-static inline void
-SET_GenTextures(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLsizei, GLuint *))
-{
-    SET_by_offset(disp, _gloffset_GenTextures, fn);
+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 **);
-
+typedef void (GLAPIENTRYP _glptr_GetPointerv)(GLenum, GLvoid **);
 #define CALL_GetPointerv(disp, parameters) \
     (* GET_GetPointerv(disp)) parameters
-static inline _glptr_GetPointerv
-GET_GetPointerv(struct _glapi_table *disp)
-{
-    return (_glptr_GetPointerv) (GET_by_offset(disp, _gloffset_GetPointerv));
+static INLINE _glptr_GetPointerv GET_GetPointerv(struct _glapi_table *disp) {
+   return (_glptr_GetPointerv) (GET_by_offset(disp, _gloffset_GetPointerv));
 }
 
-static inline void
-SET_GetPointerv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLenum, GLvoid **))
-{
-    SET_by_offset(disp, _gloffset_GetPointerv, fn);
+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);
-
+typedef GLboolean (GLAPIENTRYP _glptr_IsTexture)(GLuint);
 #define CALL_IsTexture(disp, parameters) \
     (* GET_IsTexture(disp)) parameters
-static inline _glptr_IsTexture
-GET_IsTexture(struct _glapi_table *disp)
-{
-    return (_glptr_IsTexture) (GET_by_offset(disp, _gloffset_IsTexture));
+static INLINE _glptr_IsTexture GET_IsTexture(struct _glapi_table *disp) {
+   return (_glptr_IsTexture) (GET_by_offset(disp, _gloffset_IsTexture));
 }
 
-static inline void
-SET_IsTexture(struct _glapi_table *disp, GLboolean(GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_IsTexture, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_PrioritizeTextures)(GLsizei, const GLuint *, const GLclampf *);
 #define CALL_PrioritizeTextures(disp, parameters) \
     (* GET_PrioritizeTextures(disp)) parameters
-static inline _glptr_PrioritizeTextures
-GET_PrioritizeTextures(struct _glapi_table *disp)
-{
-    return (_glptr_PrioritizeTextures) (GET_by_offset
-                                        (disp, _gloffset_PrioritizeTextures));
+static INLINE _glptr_PrioritizeTextures GET_PrioritizeTextures(struct _glapi_table *disp) {
+   return (_glptr_PrioritizeTextures) (GET_by_offset(disp, _gloffset_PrioritizeTextures));
 }
 
-static inline void
-SET_PrioritizeTextures(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLsizei, const GLuint *,
-                                              const GLclampf *))
-{
-    SET_by_offset(disp, _gloffset_PrioritizeTextures, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_TexSubImage1D)(GLenum, GLint, GLint, GLsizei, GLenum, GLenum, const GLvoid *);
 #define CALL_TexSubImage1D(disp, parameters) \
     (* GET_TexSubImage1D(disp)) parameters
-static inline _glptr_TexSubImage1D
-GET_TexSubImage1D(struct _glapi_table *disp)
-{
-    return (_glptr_TexSubImage1D) (GET_by_offset
-                                   (disp, _gloffset_TexSubImage1D));
+static INLINE _glptr_TexSubImage1D GET_TexSubImage1D(struct _glapi_table *disp) {
+   return (_glptr_TexSubImage1D) (GET_by_offset(disp, _gloffset_TexSubImage1D));
 }
 
-static inline void
-SET_TexSubImage1D(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, GLint, GLint, GLsizei, GLenum,
-                                         GLenum, const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_TexSubImage1D, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_TexSubImage2D)(GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
 #define CALL_TexSubImage2D(disp, parameters) \
     (* GET_TexSubImage2D(disp)) parameters
-static inline _glptr_TexSubImage2D
-GET_TexSubImage2D(struct _glapi_table *disp)
-{
-    return (_glptr_TexSubImage2D) (GET_by_offset
-                                   (disp, _gloffset_TexSubImage2D));
+static INLINE _glptr_TexSubImage2D GET_TexSubImage2D(struct _glapi_table *disp) {
+   return (_glptr_TexSubImage2D) (GET_by_offset(disp, _gloffset_TexSubImage2D));
 }
 
-static inline void
-SET_TexSubImage2D(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, GLint, GLint, GLint, GLsizei,
-                                         GLsizei, GLenum, GLenum,
-                                         const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_TexSubImage2D, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_PopClientAttrib)(void);
 #define CALL_PopClientAttrib(disp, parameters) \
     (* GET_PopClientAttrib(disp)) parameters
-static inline _glptr_PopClientAttrib
-GET_PopClientAttrib(struct _glapi_table *disp)
-{
-    return (_glptr_PopClientAttrib) (GET_by_offset
-                                     (disp, _gloffset_PopClientAttrib));
+static INLINE _glptr_PopClientAttrib GET_PopClientAttrib(struct _glapi_table *disp) {
+   return (_glptr_PopClientAttrib) (GET_by_offset(disp, _gloffset_PopClientAttrib));
 }
 
-static inline void
-SET_PopClientAttrib(struct _glapi_table *disp, void (GLAPIENTRYP fn) (void))
-{
-    SET_by_offset(disp, _gloffset_PopClientAttrib, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_PushClientAttrib)(GLbitfield);
 #define CALL_PushClientAttrib(disp, parameters) \
     (* GET_PushClientAttrib(disp)) parameters
-static inline _glptr_PushClientAttrib
-GET_PushClientAttrib(struct _glapi_table *disp)
-{
-    return (_glptr_PushClientAttrib) (GET_by_offset
-                                      (disp, _gloffset_PushClientAttrib));
+static INLINE _glptr_PushClientAttrib GET_PushClientAttrib(struct _glapi_table *disp) {
+   return (_glptr_PushClientAttrib) (GET_by_offset(disp, _gloffset_PushClientAttrib));
 }
 
-static inline void
-SET_PushClientAttrib(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLbitfield))
-{
-    SET_by_offset(disp, _gloffset_PushClientAttrib, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_BlendColor)(GLclampf, GLclampf, GLclampf, GLclampf);
 #define CALL_BlendColor(disp, parameters) \
     (* GET_BlendColor(disp)) parameters
-static inline _glptr_BlendColor
-GET_BlendColor(struct _glapi_table *disp)
-{
-    return (_glptr_BlendColor) (GET_by_offset(disp, _gloffset_BlendColor));
+static INLINE _glptr_BlendColor GET_BlendColor(struct _glapi_table *disp) {
+   return (_glptr_BlendColor) (GET_by_offset(disp, _gloffset_BlendColor));
 }
 
-static inline void
-SET_BlendColor(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLclampf, GLclampf, GLclampf, GLclampf))
-{
-    SET_by_offset(disp, _gloffset_BlendColor, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_BlendEquation)(GLenum);
 #define CALL_BlendEquation(disp, parameters) \
     (* GET_BlendEquation(disp)) parameters
-static inline _glptr_BlendEquation
-GET_BlendEquation(struct _glapi_table *disp)
-{
-    return (_glptr_BlendEquation) (GET_by_offset
-                                   (disp, _gloffset_BlendEquation));
+static INLINE _glptr_BlendEquation GET_BlendEquation(struct _glapi_table *disp) {
+   return (_glptr_BlendEquation) (GET_by_offset(disp, _gloffset_BlendEquation));
 }
 
-static inline void
-SET_BlendEquation(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_BlendEquation, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_DrawRangeElements)(GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *);
 #define CALL_DrawRangeElements(disp, parameters) \
     (* GET_DrawRangeElements(disp)) parameters
-static inline _glptr_DrawRangeElements
-GET_DrawRangeElements(struct _glapi_table *disp)
-{
-    return (_glptr_DrawRangeElements) (GET_by_offset
-                                       (disp, _gloffset_DrawRangeElements));
+static INLINE _glptr_DrawRangeElements GET_DrawRangeElements(struct _glapi_table *disp) {
+   return (_glptr_DrawRangeElements) (GET_by_offset(disp, _gloffset_DrawRangeElements));
 }
 
-static inline void
-SET_DrawRangeElements(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLenum, GLuint, GLuint, GLsizei,
-                                             GLenum, const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_DrawRangeElements, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_ColorTable)(GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
 #define CALL_ColorTable(disp, parameters) \
     (* GET_ColorTable(disp)) parameters
-static inline _glptr_ColorTable
-GET_ColorTable(struct _glapi_table *disp)
-{
-    return (_glptr_ColorTable) (GET_by_offset(disp, _gloffset_ColorTable));
+static INLINE _glptr_ColorTable GET_ColorTable(struct _glapi_table *disp) {
+   return (_glptr_ColorTable) (GET_by_offset(disp, _gloffset_ColorTable));
 }
 
-static inline void
-SET_ColorTable(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLenum, GLenum, GLsizei, GLenum, GLenum,
-                                      const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_ColorTable, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_ColorTableParameterfv)(GLenum, GLenum, const GLfloat *);
 #define CALL_ColorTableParameterfv(disp, parameters) \
     (* GET_ColorTableParameterfv(disp)) parameters
-static inline _glptr_ColorTableParameterfv
-GET_ColorTableParameterfv(struct _glapi_table *disp)
-{
-    return (_glptr_ColorTableParameterfv) (GET_by_offset
-                                           (disp,
-                                            _gloffset_ColorTableParameterfv));
+static INLINE _glptr_ColorTableParameterfv GET_ColorTableParameterfv(struct _glapi_table *disp) {
+   return (_glptr_ColorTableParameterfv) (GET_by_offset(disp, _gloffset_ColorTableParameterfv));
 }
 
-static inline void
-SET_ColorTableParameterfv(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (GLenum, GLenum,
-                                                 const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_ColorTableParameterfv, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_ColorTableParameteriv)(GLenum, GLenum, const GLint *);
 #define CALL_ColorTableParameteriv(disp, parameters) \
     (* GET_ColorTableParameteriv(disp)) parameters
-static inline _glptr_ColorTableParameteriv
-GET_ColorTableParameteriv(struct _glapi_table *disp)
-{
-    return (_glptr_ColorTableParameteriv) (GET_by_offset
-                                           (disp,
-                                            _gloffset_ColorTableParameteriv));
+static INLINE _glptr_ColorTableParameteriv GET_ColorTableParameteriv(struct _glapi_table *disp) {
+   return (_glptr_ColorTableParameteriv) (GET_by_offset(disp, _gloffset_ColorTableParameteriv));
 }
 
-static inline void
-SET_ColorTableParameteriv(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (GLenum, GLenum, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_ColorTableParameteriv, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_CopyColorTable)(GLenum, GLenum, GLint, GLint, GLsizei);
 #define CALL_CopyColorTable(disp, parameters) \
     (* GET_CopyColorTable(disp)) parameters
-static inline _glptr_CopyColorTable
-GET_CopyColorTable(struct _glapi_table *disp)
-{
-    return (_glptr_CopyColorTable) (GET_by_offset
-                                    (disp, _gloffset_CopyColorTable));
+static INLINE _glptr_CopyColorTable GET_CopyColorTable(struct _glapi_table *disp) {
+   return (_glptr_CopyColorTable) (GET_by_offset(disp, _gloffset_CopyColorTable));
 }
 
-static inline void
-SET_CopyColorTable(struct _glapi_table *disp,
-                   void (GLAPIENTRYP fn) (GLenum, GLenum, GLint, GLint,
-                                          GLsizei))
-{
-    SET_by_offset(disp, _gloffset_CopyColorTable, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_GetColorTable)(GLenum, GLenum, GLenum, GLvoid *);
 #define CALL_GetColorTable(disp, parameters) \
     (* GET_GetColorTable(disp)) parameters
-static inline _glptr_GetColorTable
-GET_GetColorTable(struct _glapi_table *disp)
-{
-    return (_glptr_GetColorTable) (GET_by_offset
-                                   (disp, _gloffset_GetColorTable));
+static INLINE _glptr_GetColorTable GET_GetColorTable(struct _glapi_table *disp) {
+   return (_glptr_GetColorTable) (GET_by_offset(disp, _gloffset_GetColorTable));
 }
 
-static inline void
-SET_GetColorTable(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, GLenum, GLenum, GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_GetColorTable, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_GetColorTableParameterfv)(GLenum, GLenum, GLfloat *);
 #define CALL_GetColorTableParameterfv(disp, parameters) \
     (* GET_GetColorTableParameterfv(disp)) parameters
-static inline _glptr_GetColorTableParameterfv
-GET_GetColorTableParameterfv(struct _glapi_table *disp)
-{
-    return (_glptr_GetColorTableParameterfv) (GET_by_offset
-                                              (disp,
-                                               _gloffset_GetColorTableParameterfv));
+static INLINE _glptr_GetColorTableParameterfv GET_GetColorTableParameterfv(struct _glapi_table *disp) {
+   return (_glptr_GetColorTableParameterfv) (GET_by_offset(disp, _gloffset_GetColorTableParameterfv));
 }
 
-static inline void
-SET_GetColorTableParameterfv(struct _glapi_table *disp,
-                             void (GLAPIENTRYP fn) (GLenum, GLenum, GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetColorTableParameterfv, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_GetColorTableParameteriv)(GLenum, GLenum, GLint *);
 #define CALL_GetColorTableParameteriv(disp, parameters) \
     (* GET_GetColorTableParameteriv(disp)) parameters
-static inline _glptr_GetColorTableParameteriv
-GET_GetColorTableParameteriv(struct _glapi_table *disp)
-{
-    return (_glptr_GetColorTableParameteriv) (GET_by_offset
-                                              (disp,
-                                               _gloffset_GetColorTableParameteriv));
+static INLINE _glptr_GetColorTableParameteriv GET_GetColorTableParameteriv(struct _glapi_table *disp) {
+   return (_glptr_GetColorTableParameteriv) (GET_by_offset(disp, _gloffset_GetColorTableParameteriv));
 }
 
-static inline void
-SET_GetColorTableParameteriv(struct _glapi_table *disp,
-                             void (GLAPIENTRYP fn) (GLenum, GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetColorTableParameteriv, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_ColorSubTable)(GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
 #define CALL_ColorSubTable(disp, parameters) \
     (* GET_ColorSubTable(disp)) parameters
-static inline _glptr_ColorSubTable
-GET_ColorSubTable(struct _glapi_table *disp)
-{
-    return (_glptr_ColorSubTable) (GET_by_offset
-                                   (disp, _gloffset_ColorSubTable));
+static INLINE _glptr_ColorSubTable GET_ColorSubTable(struct _glapi_table *disp) {
+   return (_glptr_ColorSubTable) (GET_by_offset(disp, _gloffset_ColorSubTable));
 }
 
-static inline void
-SET_ColorSubTable(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, GLsizei, GLsizei, GLenum,
-                                         GLenum, const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_ColorSubTable, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_CopyColorSubTable)(GLenum, GLsizei, GLint, GLint, GLsizei);
 #define CALL_CopyColorSubTable(disp, parameters) \
     (* GET_CopyColorSubTable(disp)) parameters
-static inline _glptr_CopyColorSubTable
-GET_CopyColorSubTable(struct _glapi_table *disp)
-{
-    return (_glptr_CopyColorSubTable) (GET_by_offset
-                                       (disp, _gloffset_CopyColorSubTable));
+static INLINE _glptr_CopyColorSubTable GET_CopyColorSubTable(struct _glapi_table *disp) {
+   return (_glptr_CopyColorSubTable) (GET_by_offset(disp, _gloffset_CopyColorSubTable));
 }
 
-static inline void
-SET_CopyColorSubTable(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLenum, GLsizei, GLint, GLint,
-                                             GLsizei))
-{
-    SET_by_offset(disp, _gloffset_CopyColorSubTable, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_ConvolutionFilter1D)(GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
 #define CALL_ConvolutionFilter1D(disp, parameters) \
     (* GET_ConvolutionFilter1D(disp)) parameters
-static inline _glptr_ConvolutionFilter1D
-GET_ConvolutionFilter1D(struct _glapi_table *disp)
-{
-    return (_glptr_ConvolutionFilter1D) (GET_by_offset
-                                         (disp, _gloffset_ConvolutionFilter1D));
+static INLINE _glptr_ConvolutionFilter1D GET_ConvolutionFilter1D(struct _glapi_table *disp) {
+   return (_glptr_ConvolutionFilter1D) (GET_by_offset(disp, _gloffset_ConvolutionFilter1D));
 }
 
-static inline void
-SET_ConvolutionFilter1D(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, GLenum, GLsizei, GLenum,
-                                               GLenum, const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_ConvolutionFilter1D, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_ConvolutionFilter2D)(GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
 #define CALL_ConvolutionFilter2D(disp, parameters) \
     (* GET_ConvolutionFilter2D(disp)) parameters
-static inline _glptr_ConvolutionFilter2D
-GET_ConvolutionFilter2D(struct _glapi_table *disp)
-{
-    return (_glptr_ConvolutionFilter2D) (GET_by_offset
-                                         (disp, _gloffset_ConvolutionFilter2D));
+static INLINE _glptr_ConvolutionFilter2D GET_ConvolutionFilter2D(struct _glapi_table *disp) {
+   return (_glptr_ConvolutionFilter2D) (GET_by_offset(disp, _gloffset_ConvolutionFilter2D));
 }
 
-static inline void
-SET_ConvolutionFilter2D(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, GLenum, GLsizei, GLsizei,
-                                               GLenum, GLenum, const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_ConvolutionFilter2D, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_ConvolutionParameterf)(GLenum, GLenum, GLfloat);
 #define CALL_ConvolutionParameterf(disp, parameters) \
     (* GET_ConvolutionParameterf(disp)) parameters
-static inline _glptr_ConvolutionParameterf
-GET_ConvolutionParameterf(struct _glapi_table *disp)
-{
-    return (_glptr_ConvolutionParameterf) (GET_by_offset
-                                           (disp,
-                                            _gloffset_ConvolutionParameterf));
+static INLINE _glptr_ConvolutionParameterf GET_ConvolutionParameterf(struct _glapi_table *disp) {
+   return (_glptr_ConvolutionParameterf) (GET_by_offset(disp, _gloffset_ConvolutionParameterf));
 }
 
-static inline void
-SET_ConvolutionParameterf(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (GLenum, GLenum, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_ConvolutionParameterf, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_ConvolutionParameterfv)(GLenum, GLenum, const GLfloat *);
 #define CALL_ConvolutionParameterfv(disp, parameters) \
     (* GET_ConvolutionParameterfv(disp)) parameters
-static inline _glptr_ConvolutionParameterfv
-GET_ConvolutionParameterfv(struct _glapi_table *disp)
-{
-    return (_glptr_ConvolutionParameterfv) (GET_by_offset
-                                            (disp,
-                                             _gloffset_ConvolutionParameterfv));
+static INLINE _glptr_ConvolutionParameterfv GET_ConvolutionParameterfv(struct _glapi_table *disp) {
+   return (_glptr_ConvolutionParameterfv) (GET_by_offset(disp, _gloffset_ConvolutionParameterfv));
 }
 
-static inline void
-SET_ConvolutionParameterfv(struct _glapi_table *disp,
-                           void (GLAPIENTRYP fn) (GLenum, GLenum,
-                                                  const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_ConvolutionParameterfv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_ConvolutionParameteri)(GLenum, GLenum, GLint);
 #define CALL_ConvolutionParameteri(disp, parameters) \
     (* GET_ConvolutionParameteri(disp)) parameters
-static inline _glptr_ConvolutionParameteri
-GET_ConvolutionParameteri(struct _glapi_table *disp)
-{
-    return (_glptr_ConvolutionParameteri) (GET_by_offset
-                                           (disp,
-                                            _gloffset_ConvolutionParameteri));
+static INLINE _glptr_ConvolutionParameteri GET_ConvolutionParameteri(struct _glapi_table *disp) {
+   return (_glptr_ConvolutionParameteri) (GET_by_offset(disp, _gloffset_ConvolutionParameteri));
 }
 
-static inline void
-SET_ConvolutionParameteri(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (GLenum, GLenum, GLint))
-{
-    SET_by_offset(disp, _gloffset_ConvolutionParameteri, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_ConvolutionParameteriv)(GLenum, GLenum, const GLint *);
 #define CALL_ConvolutionParameteriv(disp, parameters) \
     (* GET_ConvolutionParameteriv(disp)) parameters
-static inline _glptr_ConvolutionParameteriv
-GET_ConvolutionParameteriv(struct _glapi_table *disp)
-{
-    return (_glptr_ConvolutionParameteriv) (GET_by_offset
-                                            (disp,
-                                             _gloffset_ConvolutionParameteriv));
+static INLINE _glptr_ConvolutionParameteriv GET_ConvolutionParameteriv(struct _glapi_table *disp) {
+   return (_glptr_ConvolutionParameteriv) (GET_by_offset(disp, _gloffset_ConvolutionParameteriv));
 }
 
-static inline void
-SET_ConvolutionParameteriv(struct _glapi_table *disp,
-                           void (GLAPIENTRYP fn) (GLenum, GLenum,
-                                                  const GLint *))
-{
-    SET_by_offset(disp, _gloffset_ConvolutionParameteriv, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_CopyConvolutionFilter1D)(GLenum, GLenum, GLint, GLint, GLsizei);
 #define CALL_CopyConvolutionFilter1D(disp, parameters) \
     (* GET_CopyConvolutionFilter1D(disp)) parameters
-static inline _glptr_CopyConvolutionFilter1D
-GET_CopyConvolutionFilter1D(struct _glapi_table *disp)
-{
-    return (_glptr_CopyConvolutionFilter1D) (GET_by_offset
-                                             (disp,
-                                              _gloffset_CopyConvolutionFilter1D));
+static INLINE _glptr_CopyConvolutionFilter1D GET_CopyConvolutionFilter1D(struct _glapi_table *disp) {
+   return (_glptr_CopyConvolutionFilter1D) (GET_by_offset(disp, _gloffset_CopyConvolutionFilter1D));
 }
 
-static inline void
-SET_CopyConvolutionFilter1D(struct _glapi_table *disp,
-                            void (GLAPIENTRYP fn) (GLenum, GLenum, GLint, GLint,
-                                                   GLsizei))
-{
-    SET_by_offset(disp, _gloffset_CopyConvolutionFilter1D, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_CopyConvolutionFilter2D)(GLenum, GLenum, GLint, GLint, GLsizei, GLsizei);
 #define CALL_CopyConvolutionFilter2D(disp, parameters) \
     (* GET_CopyConvolutionFilter2D(disp)) parameters
-static inline _glptr_CopyConvolutionFilter2D
-GET_CopyConvolutionFilter2D(struct _glapi_table *disp)
-{
-    return (_glptr_CopyConvolutionFilter2D) (GET_by_offset
-                                             (disp,
-                                              _gloffset_CopyConvolutionFilter2D));
+static INLINE _glptr_CopyConvolutionFilter2D GET_CopyConvolutionFilter2D(struct _glapi_table *disp) {
+   return (_glptr_CopyConvolutionFilter2D) (GET_by_offset(disp, _gloffset_CopyConvolutionFilter2D));
 }
 
-static inline void
-SET_CopyConvolutionFilter2D(struct _glapi_table *disp,
-                            void (GLAPIENTRYP fn) (GLenum, GLenum, GLint, GLint,
-                                                   GLsizei, GLsizei))
-{
-    SET_by_offset(disp, _gloffset_CopyConvolutionFilter2D, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_GetConvolutionFilter)(GLenum, GLenum, GLenum, GLvoid *);
 #define CALL_GetConvolutionFilter(disp, parameters) \
     (* GET_GetConvolutionFilter(disp)) parameters
-static inline _glptr_GetConvolutionFilter
-GET_GetConvolutionFilter(struct _glapi_table *disp)
-{
-    return (_glptr_GetConvolutionFilter) (GET_by_offset
-                                          (disp,
-                                           _gloffset_GetConvolutionFilter));
+static INLINE _glptr_GetConvolutionFilter GET_GetConvolutionFilter(struct _glapi_table *disp) {
+   return (_glptr_GetConvolutionFilter) (GET_by_offset(disp, _gloffset_GetConvolutionFilter));
 }
 
-static inline void
-SET_GetConvolutionFilter(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (GLenum, GLenum, GLenum,
-                                                GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_GetConvolutionFilter, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_GetConvolutionParameterfv)(GLenum, GLenum, GLfloat *);
 #define CALL_GetConvolutionParameterfv(disp, parameters) \
     (* GET_GetConvolutionParameterfv(disp)) parameters
-static inline _glptr_GetConvolutionParameterfv
-GET_GetConvolutionParameterfv(struct _glapi_table *disp)
-{
-    return (_glptr_GetConvolutionParameterfv) (GET_by_offset
-                                               (disp,
-                                                _gloffset_GetConvolutionParameterfv));
+static INLINE _glptr_GetConvolutionParameterfv GET_GetConvolutionParameterfv(struct _glapi_table *disp) {
+   return (_glptr_GetConvolutionParameterfv) (GET_by_offset(disp, _gloffset_GetConvolutionParameterfv));
 }
 
-static inline void
-SET_GetConvolutionParameterfv(struct _glapi_table *disp,
-                              void (GLAPIENTRYP fn) (GLenum, GLenum, GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetConvolutionParameterfv, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_GetConvolutionParameteriv)(GLenum, GLenum, GLint *);
 #define CALL_GetConvolutionParameteriv(disp, parameters) \
     (* GET_GetConvolutionParameteriv(disp)) parameters
-static inline _glptr_GetConvolutionParameteriv
-GET_GetConvolutionParameteriv(struct _glapi_table *disp)
-{
-    return (_glptr_GetConvolutionParameteriv) (GET_by_offset
-                                               (disp,
-                                                _gloffset_GetConvolutionParameteriv));
+static INLINE _glptr_GetConvolutionParameteriv GET_GetConvolutionParameteriv(struct _glapi_table *disp) {
+   return (_glptr_GetConvolutionParameteriv) (GET_by_offset(disp, _gloffset_GetConvolutionParameteriv));
 }
 
-static inline void
-SET_GetConvolutionParameteriv(struct _glapi_table *disp,
-                              void (GLAPIENTRYP fn) (GLenum, GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetConvolutionParameteriv, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_GetSeparableFilter)(GLenum, GLenum, GLenum, GLvoid *, GLvoid *, GLvoid *);
 #define CALL_GetSeparableFilter(disp, parameters) \
     (* GET_GetSeparableFilter(disp)) parameters
-static inline _glptr_GetSeparableFilter
-GET_GetSeparableFilter(struct _glapi_table *disp)
-{
-    return (_glptr_GetSeparableFilter) (GET_by_offset
-                                        (disp, _gloffset_GetSeparableFilter));
+static INLINE _glptr_GetSeparableFilter GET_GetSeparableFilter(struct _glapi_table *disp) {
+   return (_glptr_GetSeparableFilter) (GET_by_offset(disp, _gloffset_GetSeparableFilter));
 }
 
-static inline void
-SET_GetSeparableFilter(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, GLenum, GLenum, GLvoid *,
-                                              GLvoid *, GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_GetSeparableFilter, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_SeparableFilter2D)(GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *, const GLvoid *);
 #define CALL_SeparableFilter2D(disp, parameters) \
     (* GET_SeparableFilter2D(disp)) parameters
-static inline _glptr_SeparableFilter2D
-GET_SeparableFilter2D(struct _glapi_table *disp)
-{
-    return (_glptr_SeparableFilter2D) (GET_by_offset
-                                       (disp, _gloffset_SeparableFilter2D));
+static INLINE _glptr_SeparableFilter2D GET_SeparableFilter2D(struct _glapi_table *disp) {
+   return (_glptr_SeparableFilter2D) (GET_by_offset(disp, _gloffset_SeparableFilter2D));
 }
 
-static inline void
-SET_SeparableFilter2D(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLenum, GLenum, GLsizei, GLsizei,
-                                             GLenum, GLenum, const GLvoid *,
-                                             const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_SeparableFilter2D, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_GetHistogram)(GLenum, GLboolean, GLenum, GLenum, GLvoid *);
 #define CALL_GetHistogram(disp, parameters) \
     (* GET_GetHistogram(disp)) parameters
-static inline _glptr_GetHistogram
-GET_GetHistogram(struct _glapi_table *disp)
-{
-    return (_glptr_GetHistogram) (GET_by_offset(disp, _gloffset_GetHistogram));
+static INLINE _glptr_GetHistogram GET_GetHistogram(struct _glapi_table *disp) {
+   return (_glptr_GetHistogram) (GET_by_offset(disp, _gloffset_GetHistogram));
 }
 
-static inline void
-SET_GetHistogram(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLenum, GLboolean, GLenum, GLenum,
-                                        GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_GetHistogram, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_GetHistogramParameterfv)(GLenum, GLenum, GLfloat *);
 #define CALL_GetHistogramParameterfv(disp, parameters) \
     (* GET_GetHistogramParameterfv(disp)) parameters
-static inline _glptr_GetHistogramParameterfv
-GET_GetHistogramParameterfv(struct _glapi_table *disp)
-{
-    return (_glptr_GetHistogramParameterfv) (GET_by_offset
-                                             (disp,
-                                              _gloffset_GetHistogramParameterfv));
+static INLINE _glptr_GetHistogramParameterfv GET_GetHistogramParameterfv(struct _glapi_table *disp) {
+   return (_glptr_GetHistogramParameterfv) (GET_by_offset(disp, _gloffset_GetHistogramParameterfv));
 }
 
-static inline void
-SET_GetHistogramParameterfv(struct _glapi_table *disp,
-                            void (GLAPIENTRYP fn) (GLenum, GLenum, GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetHistogramParameterfv, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_GetHistogramParameteriv)(GLenum, GLenum, GLint *);
 #define CALL_GetHistogramParameteriv(disp, parameters) \
     (* GET_GetHistogramParameteriv(disp)) parameters
-static inline _glptr_GetHistogramParameteriv
-GET_GetHistogramParameteriv(struct _glapi_table *disp)
-{
-    return (_glptr_GetHistogramParameteriv) (GET_by_offset
-                                             (disp,
-                                              _gloffset_GetHistogramParameteriv));
+static INLINE _glptr_GetHistogramParameteriv GET_GetHistogramParameteriv(struct _glapi_table *disp) {
+   return (_glptr_GetHistogramParameteriv) (GET_by_offset(disp, _gloffset_GetHistogramParameteriv));
 }
 
-static inline void
-SET_GetHistogramParameteriv(struct _glapi_table *disp,
-                            void (GLAPIENTRYP fn) (GLenum, GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetHistogramParameteriv, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_GetMinmax)(GLenum, GLboolean, GLenum, GLenum, GLvoid *);
 #define CALL_GetMinmax(disp, parameters) \
     (* GET_GetMinmax(disp)) parameters
-static inline _glptr_GetMinmax
-GET_GetMinmax(struct _glapi_table *disp)
-{
-    return (_glptr_GetMinmax) (GET_by_offset(disp, _gloffset_GetMinmax));
+static INLINE _glptr_GetMinmax GET_GetMinmax(struct _glapi_table *disp) {
+   return (_glptr_GetMinmax) (GET_by_offset(disp, _gloffset_GetMinmax));
 }
 
-static inline void
-SET_GetMinmax(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (GLenum, GLboolean, GLenum, GLenum,
-                                     GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_GetMinmax, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_GetMinmaxParameterfv)(GLenum, GLenum, GLfloat *);
 #define CALL_GetMinmaxParameterfv(disp, parameters) \
     (* GET_GetMinmaxParameterfv(disp)) parameters
-static inline _glptr_GetMinmaxParameterfv
-GET_GetMinmaxParameterfv(struct _glapi_table *disp)
-{
-    return (_glptr_GetMinmaxParameterfv) (GET_by_offset
-                                          (disp,
-                                           _gloffset_GetMinmaxParameterfv));
+static INLINE _glptr_GetMinmaxParameterfv GET_GetMinmaxParameterfv(struct _glapi_table *disp) {
+   return (_glptr_GetMinmaxParameterfv) (GET_by_offset(disp, _gloffset_GetMinmaxParameterfv));
 }
 
-static inline void
-SET_GetMinmaxParameterfv(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (GLenum, GLenum, GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetMinmaxParameterfv, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_GetMinmaxParameteriv)(GLenum, GLenum, GLint *);
 #define CALL_GetMinmaxParameteriv(disp, parameters) \
     (* GET_GetMinmaxParameteriv(disp)) parameters
-static inline _glptr_GetMinmaxParameteriv
-GET_GetMinmaxParameteriv(struct _glapi_table *disp)
-{
-    return (_glptr_GetMinmaxParameteriv) (GET_by_offset
-                                          (disp,
-                                           _gloffset_GetMinmaxParameteriv));
+static INLINE _glptr_GetMinmaxParameteriv GET_GetMinmaxParameteriv(struct _glapi_table *disp) {
+   return (_glptr_GetMinmaxParameteriv) (GET_by_offset(disp, _gloffset_GetMinmaxParameteriv));
 }
 
-static inline void
-SET_GetMinmaxParameteriv(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (GLenum, GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetMinmaxParameteriv, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_Histogram)(GLenum, GLsizei, GLenum, GLboolean);
 #define CALL_Histogram(disp, parameters) \
     (* GET_Histogram(disp)) parameters
-static inline _glptr_Histogram
-GET_Histogram(struct _glapi_table *disp)
-{
-    return (_glptr_Histogram) (GET_by_offset(disp, _gloffset_Histogram));
+static INLINE _glptr_Histogram GET_Histogram(struct _glapi_table *disp) {
+   return (_glptr_Histogram) (GET_by_offset(disp, _gloffset_Histogram));
 }
 
-static inline void
-SET_Histogram(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (GLenum, GLsizei, GLenum, GLboolean))
-{
-    SET_by_offset(disp, _gloffset_Histogram, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_Minmax)(GLenum, GLenum, GLboolean);
 #define CALL_Minmax(disp, parameters) \
     (* GET_Minmax(disp)) parameters
-static inline _glptr_Minmax
-GET_Minmax(struct _glapi_table *disp)
-{
-    return (_glptr_Minmax) (GET_by_offset(disp, _gloffset_Minmax));
+static INLINE _glptr_Minmax GET_Minmax(struct _glapi_table *disp) {
+   return (_glptr_Minmax) (GET_by_offset(disp, _gloffset_Minmax));
 }
 
-static inline void
-SET_Minmax(struct _glapi_table *disp,
-           void (GLAPIENTRYP fn) (GLenum, GLenum, GLboolean))
-{
-    SET_by_offset(disp, _gloffset_Minmax, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_ResetHistogram)(GLenum);
 #define CALL_ResetHistogram(disp, parameters) \
     (* GET_ResetHistogram(disp)) parameters
-static inline _glptr_ResetHistogram
-GET_ResetHistogram(struct _glapi_table *disp)
-{
-    return (_glptr_ResetHistogram) (GET_by_offset
-                                    (disp, _gloffset_ResetHistogram));
+static INLINE _glptr_ResetHistogram GET_ResetHistogram(struct _glapi_table *disp) {
+   return (_glptr_ResetHistogram) (GET_by_offset(disp, _gloffset_ResetHistogram));
 }
 
-static inline void
-SET_ResetHistogram(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_ResetHistogram, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_ResetMinmax)(GLenum);
 #define CALL_ResetMinmax(disp, parameters) \
     (* GET_ResetMinmax(disp)) parameters
-static inline _glptr_ResetMinmax
-GET_ResetMinmax(struct _glapi_table *disp)
-{
-    return (_glptr_ResetMinmax) (GET_by_offset(disp, _gloffset_ResetMinmax));
+static INLINE _glptr_ResetMinmax GET_ResetMinmax(struct _glapi_table *disp) {
+   return (_glptr_ResetMinmax) (GET_by_offset(disp, _gloffset_ResetMinmax));
 }
 
-static inline void
-SET_ResetMinmax(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_ResetMinmax, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_TexImage3D)(GLenum, GLint, GLint, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
 #define CALL_TexImage3D(disp, parameters) \
     (* GET_TexImage3D(disp)) parameters
-static inline _glptr_TexImage3D
-GET_TexImage3D(struct _glapi_table *disp)
-{
-    return (_glptr_TexImage3D) (GET_by_offset(disp, _gloffset_TexImage3D));
+static INLINE _glptr_TexImage3D GET_TexImage3D(struct _glapi_table *disp) {
+   return (_glptr_TexImage3D) (GET_by_offset(disp, _gloffset_TexImage3D));
 }
 
-static inline void
-SET_TexImage3D(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLenum, GLint, GLint, GLsizei, GLsizei,
-                                      GLsizei, GLint, GLenum, GLenum,
-                                      const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_TexImage3D, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_TexSubImage3D)(GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
 #define CALL_TexSubImage3D(disp, parameters) \
     (* GET_TexSubImage3D(disp)) parameters
-static inline _glptr_TexSubImage3D
-GET_TexSubImage3D(struct _glapi_table *disp)
-{
-    return (_glptr_TexSubImage3D) (GET_by_offset
-                                   (disp, _gloffset_TexSubImage3D));
+static INLINE _glptr_TexSubImage3D GET_TexSubImage3D(struct _glapi_table *disp) {
+   return (_glptr_TexSubImage3D) (GET_by_offset(disp, _gloffset_TexSubImage3D));
 }
 
-static inline void
-SET_TexSubImage3D(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, GLint, GLint, GLint, GLint,
-                                         GLsizei, GLsizei, GLsizei, GLenum,
-                                         GLenum, const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_TexSubImage3D, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_CopyTexSubImage3D)(GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
 #define CALL_CopyTexSubImage3D(disp, parameters) \
     (* GET_CopyTexSubImage3D(disp)) parameters
-static inline _glptr_CopyTexSubImage3D
-GET_CopyTexSubImage3D(struct _glapi_table *disp)
-{
-    return (_glptr_CopyTexSubImage3D) (GET_by_offset
-                                       (disp, _gloffset_CopyTexSubImage3D));
+static INLINE _glptr_CopyTexSubImage3D GET_CopyTexSubImage3D(struct _glapi_table *disp) {
+   return (_glptr_CopyTexSubImage3D) (GET_by_offset(disp, _gloffset_CopyTexSubImage3D));
 }
 
-static inline void
-SET_CopyTexSubImage3D(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLenum, GLint, GLint, GLint, GLint,
-                                             GLint, GLint, GLsizei, GLsizei))
-{
-    SET_by_offset(disp, _gloffset_CopyTexSubImage3D, fn);
+static INLINE void SET_CopyTexSubImage3D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei)) {
+   SET_by_offset(disp, _gloffset_CopyTexSubImage3D, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_ActiveTextureARB) (GLenum);
-
-#define CALL_ActiveTextureARB(disp, parameters) \
-    (* GET_ActiveTextureARB(disp)) parameters
-static inline _glptr_ActiveTextureARB
-GET_ActiveTextureARB(struct _glapi_table *disp)
-{
-    return (_glptr_ActiveTextureARB) (GET_by_offset
-                                      (disp, _gloffset_ActiveTextureARB));
+typedef void (GLAPIENTRYP _glptr_ActiveTexture)(GLenum);
+#define CALL_ActiveTexture(disp, parameters) \
+    (* GET_ActiveTexture(disp)) parameters
+static INLINE _glptr_ActiveTexture GET_ActiveTexture(struct _glapi_table *disp) {
+   return (_glptr_ActiveTexture) (GET_by_offset(disp, _gloffset_ActiveTexture));
 }
 
-static inline void
-SET_ActiveTextureARB(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_ActiveTextureARB, fn);
+static INLINE void SET_ActiveTexture(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
+   SET_by_offset(disp, _gloffset_ActiveTexture, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_ClientActiveTextureARB) (GLenum);
-
-#define CALL_ClientActiveTextureARB(disp, parameters) \
-    (* GET_ClientActiveTextureARB(disp)) parameters
-static inline _glptr_ClientActiveTextureARB
-GET_ClientActiveTextureARB(struct _glapi_table *disp)
-{
-    return (_glptr_ClientActiveTextureARB) (GET_by_offset
-                                            (disp,
-                                             _gloffset_ClientActiveTextureARB));
+typedef void (GLAPIENTRYP _glptr_ClientActiveTexture)(GLenum);
+#define CALL_ClientActiveTexture(disp, parameters) \
+    (* GET_ClientActiveTexture(disp)) parameters
+static INLINE _glptr_ClientActiveTexture GET_ClientActiveTexture(struct _glapi_table *disp) {
+   return (_glptr_ClientActiveTexture) (GET_by_offset(disp, _gloffset_ClientActiveTexture));
 }
 
-static inline void
-SET_ClientActiveTextureARB(struct _glapi_table *disp,
-                           void (GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_ClientActiveTextureARB, fn);
+static INLINE void SET_ClientActiveTexture(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
+   SET_by_offset(disp, _gloffset_ClientActiveTexture, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord1dARB) (GLenum, GLdouble);
-
-#define CALL_MultiTexCoord1dARB(disp, parameters) \
-    (* GET_MultiTexCoord1dARB(disp)) parameters
-static inline _glptr_MultiTexCoord1dARB
-GET_MultiTexCoord1dARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord1dARB) (GET_by_offset
-                                        (disp, _gloffset_MultiTexCoord1dARB));
+typedef void (GLAPIENTRYP _glptr_MultiTexCoord1d)(GLenum, GLdouble);
+#define CALL_MultiTexCoord1d(disp, parameters) \
+    (* GET_MultiTexCoord1d(disp)) parameters
+static INLINE _glptr_MultiTexCoord1d GET_MultiTexCoord1d(struct _glapi_table *disp) {
+   return (_glptr_MultiTexCoord1d) (GET_by_offset(disp, _gloffset_MultiTexCoord1d));
 }
 
-static inline void
-SET_MultiTexCoord1dARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord1dARB, fn);
+static INLINE void SET_MultiTexCoord1d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLdouble)) {
+   SET_by_offset(disp, _gloffset_MultiTexCoord1d, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord1dvARB) (GLenum,
-                                                       const GLdouble *);
-#define CALL_MultiTexCoord1dvARB(disp, parameters) \
-    (* GET_MultiTexCoord1dvARB(disp)) parameters
-static inline _glptr_MultiTexCoord1dvARB
-GET_MultiTexCoord1dvARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord1dvARB) (GET_by_offset
-                                         (disp, _gloffset_MultiTexCoord1dvARB));
+typedef void (GLAPIENTRYP _glptr_MultiTexCoord1dv)(GLenum, const GLdouble *);
+#define CALL_MultiTexCoord1dv(disp, parameters) \
+    (* GET_MultiTexCoord1dv(disp)) parameters
+static INLINE _glptr_MultiTexCoord1dv GET_MultiTexCoord1dv(struct _glapi_table *disp) {
+   return (_glptr_MultiTexCoord1dv) (GET_by_offset(disp, _gloffset_MultiTexCoord1dv));
 }
 
-static inline void
-SET_MultiTexCoord1dvARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord1dvARB, fn);
+static INLINE void SET_MultiTexCoord1dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLdouble *)) {
+   SET_by_offset(disp, _gloffset_MultiTexCoord1dv, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord1fARB) (GLenum, GLfloat);
-
+typedef void (GLAPIENTRYP _glptr_MultiTexCoord1fARB)(GLenum, GLfloat);
 #define CALL_MultiTexCoord1fARB(disp, parameters) \
     (* GET_MultiTexCoord1fARB(disp)) parameters
-static inline _glptr_MultiTexCoord1fARB
-GET_MultiTexCoord1fARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord1fARB) (GET_by_offset
-                                        (disp, _gloffset_MultiTexCoord1fARB));
+static INLINE _glptr_MultiTexCoord1fARB GET_MultiTexCoord1fARB(struct _glapi_table *disp) {
+   return (_glptr_MultiTexCoord1fARB) (GET_by_offset(disp, _gloffset_MultiTexCoord1fARB));
 }
 
-static inline void
-SET_MultiTexCoord1fARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord1fARB, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_MultiTexCoord1fvARB)(GLenum, const GLfloat *);
 #define CALL_MultiTexCoord1fvARB(disp, parameters) \
     (* GET_MultiTexCoord1fvARB(disp)) parameters
-static inline _glptr_MultiTexCoord1fvARB
-GET_MultiTexCoord1fvARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord1fvARB) (GET_by_offset
-                                         (disp, _gloffset_MultiTexCoord1fvARB));
+static INLINE _glptr_MultiTexCoord1fvARB GET_MultiTexCoord1fvARB(struct _glapi_table *disp) {
+   return (_glptr_MultiTexCoord1fvARB) (GET_by_offset(disp, _gloffset_MultiTexCoord1fvARB));
 }
 
-static inline void
-SET_MultiTexCoord1fvARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord1fvARB, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_MultiTexCoord1i)(GLenum, GLint);
+#define CALL_MultiTexCoord1i(disp, parameters) \
+    (* GET_MultiTexCoord1i(disp)) parameters
+static INLINE _glptr_MultiTexCoord1i GET_MultiTexCoord1i(struct _glapi_table *disp) {
+   return (_glptr_MultiTexCoord1i) (GET_by_offset(disp, _gloffset_MultiTexCoord1i));
+}
 
-#define CALL_MultiTexCoord1iARB(disp, parameters) \
-    (* GET_MultiTexCoord1iARB(disp)) parameters
-static inline _glptr_MultiTexCoord1iARB
-GET_MultiTexCoord1iARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord1iARB) (GET_by_offset
-                                        (disp, _gloffset_MultiTexCoord1iARB));
+static INLINE void SET_MultiTexCoord1i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint)) {
+   SET_by_offset(disp, _gloffset_MultiTexCoord1i, fn);
 }
 
-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_MultiTexCoord1iv)(GLenum, const GLint *);
+#define CALL_MultiTexCoord1iv(disp, parameters) \
+    (* GET_MultiTexCoord1iv(disp)) parameters
+static INLINE _glptr_MultiTexCoord1iv GET_MultiTexCoord1iv(struct _glapi_table *disp) {
+   return (_glptr_MultiTexCoord1iv) (GET_by_offset(disp, _gloffset_MultiTexCoord1iv));
 }
 
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord1ivARB) (GLenum, const GLint *);
+static INLINE void SET_MultiTexCoord1iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLint *)) {
+   SET_by_offset(disp, _gloffset_MultiTexCoord1iv, fn);
+}
 
-#define CALL_MultiTexCoord1ivARB(disp, parameters) \
-    (* GET_MultiTexCoord1ivARB(disp)) parameters
-static inline _glptr_MultiTexCoord1ivARB
-GET_MultiTexCoord1ivARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord1ivARB) (GET_by_offset
-                                         (disp, _gloffset_MultiTexCoord1ivARB));
+typedef void (GLAPIENTRYP _glptr_MultiTexCoord1s)(GLenum, GLshort);
+#define CALL_MultiTexCoord1s(disp, parameters) \
+    (* GET_MultiTexCoord1s(disp)) parameters
+static INLINE _glptr_MultiTexCoord1s GET_MultiTexCoord1s(struct _glapi_table *disp) {
+   return (_glptr_MultiTexCoord1s) (GET_by_offset(disp, _gloffset_MultiTexCoord1s));
 }
 
-static inline void
-SET_MultiTexCoord1ivARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord1ivARB, fn);
+static INLINE void SET_MultiTexCoord1s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLshort)) {
+   SET_by_offset(disp, _gloffset_MultiTexCoord1s, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord1sARB) (GLenum, GLshort);
+typedef void (GLAPIENTRYP _glptr_MultiTexCoord1sv)(GLenum, const GLshort *);
+#define CALL_MultiTexCoord1sv(disp, parameters) \
+    (* GET_MultiTexCoord1sv(disp)) parameters
+static INLINE _glptr_MultiTexCoord1sv GET_MultiTexCoord1sv(struct _glapi_table *disp) {
+   return (_glptr_MultiTexCoord1sv) (GET_by_offset(disp, _gloffset_MultiTexCoord1sv));
+}
 
-#define CALL_MultiTexCoord1sARB(disp, parameters) \
-    (* GET_MultiTexCoord1sARB(disp)) parameters
-static inline _glptr_MultiTexCoord1sARB
-GET_MultiTexCoord1sARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord1sARB) (GET_by_offset
-                                        (disp, _gloffset_MultiTexCoord1sARB));
+static INLINE void SET_MultiTexCoord1sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLshort *)) {
+   SET_by_offset(disp, _gloffset_MultiTexCoord1sv, fn);
 }
 
-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_MultiTexCoord2d)(GLenum, GLdouble, GLdouble);
+#define CALL_MultiTexCoord2d(disp, parameters) \
+    (* GET_MultiTexCoord2d(disp)) parameters
+static INLINE _glptr_MultiTexCoord2d GET_MultiTexCoord2d(struct _glapi_table *disp) {
+   return (_glptr_MultiTexCoord2d) (GET_by_offset(disp, _gloffset_MultiTexCoord2d));
 }
 
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord1svARB) (GLenum, const GLshort *);
+static INLINE void SET_MultiTexCoord2d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLdouble, GLdouble)) {
+   SET_by_offset(disp, _gloffset_MultiTexCoord2d, fn);
+}
 
-#define CALL_MultiTexCoord1svARB(disp, parameters) \
-    (* GET_MultiTexCoord1svARB(disp)) parameters
-static inline _glptr_MultiTexCoord1svARB
-GET_MultiTexCoord1svARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord1svARB) (GET_by_offset
-                                         (disp, _gloffset_MultiTexCoord1svARB));
+typedef void (GLAPIENTRYP _glptr_MultiTexCoord2dv)(GLenum, const GLdouble *);
+#define CALL_MultiTexCoord2dv(disp, parameters) \
+    (* GET_MultiTexCoord2dv(disp)) parameters
+static INLINE _glptr_MultiTexCoord2dv GET_MultiTexCoord2dv(struct _glapi_table *disp) {
+   return (_glptr_MultiTexCoord2dv) (GET_by_offset(disp, _gloffset_MultiTexCoord2dv));
 }
 
-static inline void
-SET_MultiTexCoord1svARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord1svARB, fn);
+static INLINE void SET_MultiTexCoord2dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLdouble *)) {
+   SET_by_offset(disp, _gloffset_MultiTexCoord2dv, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord2dARB) (GLenum, GLdouble,
-                                                      GLdouble);
-#define CALL_MultiTexCoord2dARB(disp, parameters) \
-    (* GET_MultiTexCoord2dARB(disp)) parameters
-static inline _glptr_MultiTexCoord2dARB
-GET_MultiTexCoord2dARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord2dARB) (GET_by_offset
-                                        (disp, _gloffset_MultiTexCoord2dARB));
+typedef void (GLAPIENTRYP _glptr_MultiTexCoord2fARB)(GLenum, GLfloat, GLfloat);
+#define CALL_MultiTexCoord2fARB(disp, parameters) \
+    (* GET_MultiTexCoord2fARB(disp)) parameters
+static INLINE _glptr_MultiTexCoord2fARB GET_MultiTexCoord2fARB(struct _glapi_table *disp) {
+   return (_glptr_MultiTexCoord2fARB) (GET_by_offset(disp, _gloffset_MultiTexCoord2fARB));
 }
 
-static inline void
-SET_MultiTexCoord2dARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord2dARB, fn);
+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_MultiTexCoord2dvARB) (GLenum,
-                                                       const GLdouble *);
-#define CALL_MultiTexCoord2dvARB(disp, parameters) \
-    (* GET_MultiTexCoord2dvARB(disp)) parameters
-static inline _glptr_MultiTexCoord2dvARB
-GET_MultiTexCoord2dvARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord2dvARB) (GET_by_offset
-                                         (disp, _gloffset_MultiTexCoord2dvARB));
+typedef void (GLAPIENTRYP _glptr_MultiTexCoord2fvARB)(GLenum, const GLfloat *);
+#define CALL_MultiTexCoord2fvARB(disp, parameters) \
+    (* GET_MultiTexCoord2fvARB(disp)) parameters
+static INLINE _glptr_MultiTexCoord2fvARB GET_MultiTexCoord2fvARB(struct _glapi_table *disp) {
+   return (_glptr_MultiTexCoord2fvARB) (GET_by_offset(disp, _gloffset_MultiTexCoord2fvARB));
 }
 
-static inline void
-SET_MultiTexCoord2dvARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord2dvARB, fn);
+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_MultiTexCoord2fARB) (GLenum, GLfloat, GLfloat);
+typedef void (GLAPIENTRYP _glptr_MultiTexCoord2i)(GLenum, GLint, GLint);
+#define CALL_MultiTexCoord2i(disp, parameters) \
+    (* GET_MultiTexCoord2i(disp)) parameters
+static INLINE _glptr_MultiTexCoord2i GET_MultiTexCoord2i(struct _glapi_table *disp) {
+   return (_glptr_MultiTexCoord2i) (GET_by_offset(disp, _gloffset_MultiTexCoord2i));
+}
 
-#define CALL_MultiTexCoord2fARB(disp, parameters) \
-    (* GET_MultiTexCoord2fARB(disp)) parameters
-static inline _glptr_MultiTexCoord2fARB
-GET_MultiTexCoord2fARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord2fARB) (GET_by_offset
-                                        (disp, _gloffset_MultiTexCoord2fARB));
+static INLINE void SET_MultiTexCoord2i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint)) {
+   SET_by_offset(disp, _gloffset_MultiTexCoord2i, fn);
 }
 
-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_MultiTexCoord2iv)(GLenum, const GLint *);
+#define CALL_MultiTexCoord2iv(disp, parameters) \
+    (* GET_MultiTexCoord2iv(disp)) parameters
+static INLINE _glptr_MultiTexCoord2iv GET_MultiTexCoord2iv(struct _glapi_table *disp) {
+   return (_glptr_MultiTexCoord2iv) (GET_by_offset(disp, _gloffset_MultiTexCoord2iv));
 }
 
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord2fvARB) (GLenum, const GLfloat *);
+static INLINE void SET_MultiTexCoord2iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLint *)) {
+   SET_by_offset(disp, _gloffset_MultiTexCoord2iv, fn);
+}
 
-#define CALL_MultiTexCoord2fvARB(disp, parameters) \
-    (* GET_MultiTexCoord2fvARB(disp)) parameters
-static inline _glptr_MultiTexCoord2fvARB
-GET_MultiTexCoord2fvARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord2fvARB) (GET_by_offset
-                                         (disp, _gloffset_MultiTexCoord2fvARB));
+typedef void (GLAPIENTRYP _glptr_MultiTexCoord2s)(GLenum, GLshort, GLshort);
+#define CALL_MultiTexCoord2s(disp, parameters) \
+    (* GET_MultiTexCoord2s(disp)) parameters
+static INLINE _glptr_MultiTexCoord2s GET_MultiTexCoord2s(struct _glapi_table *disp) {
+   return (_glptr_MultiTexCoord2s) (GET_by_offset(disp, _gloffset_MultiTexCoord2s));
 }
 
-static inline void
-SET_MultiTexCoord2fvARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord2fvARB, fn);
+static INLINE void SET_MultiTexCoord2s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLshort, GLshort)) {
+   SET_by_offset(disp, _gloffset_MultiTexCoord2s, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord2iARB) (GLenum, GLint, GLint);
+typedef void (GLAPIENTRYP _glptr_MultiTexCoord2sv)(GLenum, const GLshort *);
+#define CALL_MultiTexCoord2sv(disp, parameters) \
+    (* GET_MultiTexCoord2sv(disp)) parameters
+static INLINE _glptr_MultiTexCoord2sv GET_MultiTexCoord2sv(struct _glapi_table *disp) {
+   return (_glptr_MultiTexCoord2sv) (GET_by_offset(disp, _gloffset_MultiTexCoord2sv));
+}
 
-#define CALL_MultiTexCoord2iARB(disp, parameters) \
-    (* GET_MultiTexCoord2iARB(disp)) parameters
-static inline _glptr_MultiTexCoord2iARB
-GET_MultiTexCoord2iARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord2iARB) (GET_by_offset
-                                        (disp, _gloffset_MultiTexCoord2iARB));
+static INLINE void SET_MultiTexCoord2sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLshort *)) {
+   SET_by_offset(disp, _gloffset_MultiTexCoord2sv, fn);
 }
 
-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_MultiTexCoord3d)(GLenum, GLdouble, GLdouble, GLdouble);
+#define CALL_MultiTexCoord3d(disp, parameters) \
+    (* GET_MultiTexCoord3d(disp)) parameters
+static INLINE _glptr_MultiTexCoord3d GET_MultiTexCoord3d(struct _glapi_table *disp) {
+   return (_glptr_MultiTexCoord3d) (GET_by_offset(disp, _gloffset_MultiTexCoord3d));
 }
 
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord2ivARB) (GLenum, const GLint *);
+static INLINE void SET_MultiTexCoord3d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLdouble, GLdouble, GLdouble)) {
+   SET_by_offset(disp, _gloffset_MultiTexCoord3d, fn);
+}
 
-#define CALL_MultiTexCoord2ivARB(disp, parameters) \
-    (* GET_MultiTexCoord2ivARB(disp)) parameters
-static inline _glptr_MultiTexCoord2ivARB
-GET_MultiTexCoord2ivARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord2ivARB) (GET_by_offset
-                                         (disp, _gloffset_MultiTexCoord2ivARB));
+typedef void (GLAPIENTRYP _glptr_MultiTexCoord3dv)(GLenum, const GLdouble *);
+#define CALL_MultiTexCoord3dv(disp, parameters) \
+    (* GET_MultiTexCoord3dv(disp)) parameters
+static INLINE _glptr_MultiTexCoord3dv GET_MultiTexCoord3dv(struct _glapi_table *disp) {
+   return (_glptr_MultiTexCoord3dv) (GET_by_offset(disp, _gloffset_MultiTexCoord3dv));
 }
 
-static inline void
-SET_MultiTexCoord2ivARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord2ivARB, fn);
+static INLINE void SET_MultiTexCoord3dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLdouble *)) {
+   SET_by_offset(disp, _gloffset_MultiTexCoord3dv, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord2sARB) (GLenum, GLshort, GLshort);
+typedef void (GLAPIENTRYP _glptr_MultiTexCoord3fARB)(GLenum, GLfloat, GLfloat, GLfloat);
+#define CALL_MultiTexCoord3fARB(disp, parameters) \
+    (* GET_MultiTexCoord3fARB(disp)) parameters
+static INLINE _glptr_MultiTexCoord3fARB GET_MultiTexCoord3fARB(struct _glapi_table *disp) {
+   return (_glptr_MultiTexCoord3fARB) (GET_by_offset(disp, _gloffset_MultiTexCoord3fARB));
+}
 
-#define CALL_MultiTexCoord2sARB(disp, parameters) \
-    (* GET_MultiTexCoord2sARB(disp)) parameters
-static inline _glptr_MultiTexCoord2sARB
-GET_MultiTexCoord2sARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord2sARB) (GET_by_offset
-                                        (disp, _gloffset_MultiTexCoord2sARB));
+static INLINE void SET_MultiTexCoord3fARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat, GLfloat, GLfloat)) {
+   SET_by_offset(disp, _gloffset_MultiTexCoord3fARB, fn);
 }
 
-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_MultiTexCoord3fvARB)(GLenum, const GLfloat *);
+#define CALL_MultiTexCoord3fvARB(disp, parameters) \
+    (* GET_MultiTexCoord3fvARB(disp)) parameters
+static INLINE _glptr_MultiTexCoord3fvARB GET_MultiTexCoord3fvARB(struct _glapi_table *disp) {
+   return (_glptr_MultiTexCoord3fvARB) (GET_by_offset(disp, _gloffset_MultiTexCoord3fvARB));
 }
 
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord2svARB) (GLenum, const GLshort *);
+static INLINE void SET_MultiTexCoord3fvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLfloat *)) {
+   SET_by_offset(disp, _gloffset_MultiTexCoord3fvARB, fn);
+}
 
-#define CALL_MultiTexCoord2svARB(disp, parameters) \
-    (* GET_MultiTexCoord2svARB(disp)) parameters
-static inline _glptr_MultiTexCoord2svARB
-GET_MultiTexCoord2svARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord2svARB) (GET_by_offset
-                                         (disp, _gloffset_MultiTexCoord2svARB));
+typedef void (GLAPIENTRYP _glptr_MultiTexCoord3i)(GLenum, GLint, GLint, GLint);
+#define CALL_MultiTexCoord3i(disp, parameters) \
+    (* GET_MultiTexCoord3i(disp)) parameters
+static INLINE _glptr_MultiTexCoord3i GET_MultiTexCoord3i(struct _glapi_table *disp) {
+   return (_glptr_MultiTexCoord3i) (GET_by_offset(disp, _gloffset_MultiTexCoord3i));
 }
 
-static inline void
-SET_MultiTexCoord2svARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord2svARB, fn);
+static INLINE void SET_MultiTexCoord3i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint, GLint)) {
+   SET_by_offset(disp, _gloffset_MultiTexCoord3i, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord3dARB) (GLenum, GLdouble,
-                                                      GLdouble, GLdouble);
-#define CALL_MultiTexCoord3dARB(disp, parameters) \
-    (* GET_MultiTexCoord3dARB(disp)) parameters
-static inline _glptr_MultiTexCoord3dARB
-GET_MultiTexCoord3dARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord3dARB) (GET_by_offset
-                                        (disp, _gloffset_MultiTexCoord3dARB));
+typedef void (GLAPIENTRYP _glptr_MultiTexCoord3iv)(GLenum, const GLint *);
+#define CALL_MultiTexCoord3iv(disp, parameters) \
+    (* GET_MultiTexCoord3iv(disp)) parameters
+static INLINE _glptr_MultiTexCoord3iv GET_MultiTexCoord3iv(struct _glapi_table *disp) {
+   return (_glptr_MultiTexCoord3iv) (GET_by_offset(disp, _gloffset_MultiTexCoord3iv));
 }
 
-static inline void
-SET_MultiTexCoord3dARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, GLdouble, GLdouble,
-                                              GLdouble))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord3dARB, fn);
+static INLINE void SET_MultiTexCoord3iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLint *)) {
+   SET_by_offset(disp, _gloffset_MultiTexCoord3iv, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord3dvARB) (GLenum,
-                                                       const GLdouble *);
-#define CALL_MultiTexCoord3dvARB(disp, parameters) \
-    (* GET_MultiTexCoord3dvARB(disp)) parameters
-static inline _glptr_MultiTexCoord3dvARB
-GET_MultiTexCoord3dvARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord3dvARB) (GET_by_offset
-                                         (disp, _gloffset_MultiTexCoord3dvARB));
+typedef void (GLAPIENTRYP _glptr_MultiTexCoord3s)(GLenum, GLshort, GLshort, GLshort);
+#define CALL_MultiTexCoord3s(disp, parameters) \
+    (* GET_MultiTexCoord3s(disp)) parameters
+static INLINE _glptr_MultiTexCoord3s GET_MultiTexCoord3s(struct _glapi_table *disp) {
+   return (_glptr_MultiTexCoord3s) (GET_by_offset(disp, _gloffset_MultiTexCoord3s));
 }
 
-static inline void
-SET_MultiTexCoord3dvARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord3dvARB, fn);
+static INLINE void SET_MultiTexCoord3s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLshort, GLshort, GLshort)) {
+   SET_by_offset(disp, _gloffset_MultiTexCoord3s, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord3fARB) (GLenum, GLfloat, GLfloat,
-                                                      GLfloat);
-#define CALL_MultiTexCoord3fARB(disp, parameters) \
-    (* GET_MultiTexCoord3fARB(disp)) parameters
-static inline _glptr_MultiTexCoord3fARB
-GET_MultiTexCoord3fARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord3fARB) (GET_by_offset
-                                        (disp, _gloffset_MultiTexCoord3fARB));
+typedef void (GLAPIENTRYP _glptr_MultiTexCoord3sv)(GLenum, const GLshort *);
+#define CALL_MultiTexCoord3sv(disp, parameters) \
+    (* GET_MultiTexCoord3sv(disp)) parameters
+static INLINE _glptr_MultiTexCoord3sv GET_MultiTexCoord3sv(struct _glapi_table *disp) {
+   return (_glptr_MultiTexCoord3sv) (GET_by_offset(disp, _gloffset_MultiTexCoord3sv));
 }
 
-static inline void
-SET_MultiTexCoord3fARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, GLfloat, GLfloat,
-                                              GLfloat))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord3fARB, fn);
+static INLINE void SET_MultiTexCoord3sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLshort *)) {
+   SET_by_offset(disp, _gloffset_MultiTexCoord3sv, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord3fvARB) (GLenum, const GLfloat *);
+typedef void (GLAPIENTRYP _glptr_MultiTexCoord4d)(GLenum, GLdouble, GLdouble, GLdouble, GLdouble);
+#define CALL_MultiTexCoord4d(disp, parameters) \
+    (* GET_MultiTexCoord4d(disp)) parameters
+static INLINE _glptr_MultiTexCoord4d GET_MultiTexCoord4d(struct _glapi_table *disp) {
+   return (_glptr_MultiTexCoord4d) (GET_by_offset(disp, _gloffset_MultiTexCoord4d));
+}
 
-#define CALL_MultiTexCoord3fvARB(disp, parameters) \
-    (* GET_MultiTexCoord3fvARB(disp)) parameters
-static inline _glptr_MultiTexCoord3fvARB
-GET_MultiTexCoord3fvARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord3fvARB) (GET_by_offset
-                                         (disp, _gloffset_MultiTexCoord3fvARB));
-}
+static INLINE void SET_MultiTexCoord4d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLdouble, GLdouble, GLdouble, GLdouble)) {
+   SET_by_offset(disp, _gloffset_MultiTexCoord4d, fn);
+}
 
-static inline void
-SET_MultiTexCoord3fvARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord3fvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord3iARB) (GLenum, GLint, GLint,
-                                                      GLint);
-#define CALL_MultiTexCoord3iARB(disp, parameters) \
-    (* GET_MultiTexCoord3iARB(disp)) parameters
-static inline _glptr_MultiTexCoord3iARB
-GET_MultiTexCoord3iARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord3iARB) (GET_by_offset
-                                        (disp, _gloffset_MultiTexCoord3iARB));
-}
-
-static inline void
-SET_MultiTexCoord3iARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, GLint, GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord3iARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord3ivARB) (GLenum, const GLint *);
-
-#define CALL_MultiTexCoord3ivARB(disp, parameters) \
-    (* GET_MultiTexCoord3ivARB(disp)) parameters
-static inline _glptr_MultiTexCoord3ivARB
-GET_MultiTexCoord3ivARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord3ivARB) (GET_by_offset
-                                         (disp, _gloffset_MultiTexCoord3ivARB));
-}
-
-static inline void
-SET_MultiTexCoord3ivARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord3ivARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord3sARB) (GLenum, GLshort, GLshort,
-                                                      GLshort);
-#define CALL_MultiTexCoord3sARB(disp, parameters) \
-    (* GET_MultiTexCoord3sARB(disp)) parameters
-static inline _glptr_MultiTexCoord3sARB
-GET_MultiTexCoord3sARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord3sARB) (GET_by_offset
-                                        (disp, _gloffset_MultiTexCoord3sARB));
-}
-
-static inline void
-SET_MultiTexCoord3sARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, GLshort, GLshort,
-                                              GLshort))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord3sARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord3svARB) (GLenum, const GLshort *);
-
-#define CALL_MultiTexCoord3svARB(disp, parameters) \
-    (* GET_MultiTexCoord3svARB(disp)) parameters
-static inline _glptr_MultiTexCoord3svARB
-GET_MultiTexCoord3svARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord3svARB) (GET_by_offset
-                                         (disp, _gloffset_MultiTexCoord3svARB));
-}
-
-static inline void
-SET_MultiTexCoord3svARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord3svARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord4dARB) (GLenum, GLdouble,
-                                                      GLdouble, GLdouble,
-                                                      GLdouble);
-#define CALL_MultiTexCoord4dARB(disp, parameters) \
-    (* GET_MultiTexCoord4dARB(disp)) parameters
-static inline _glptr_MultiTexCoord4dARB
-GET_MultiTexCoord4dARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord4dARB) (GET_by_offset
-                                        (disp, _gloffset_MultiTexCoord4dARB));
-}
-
-static inline void
-SET_MultiTexCoord4dARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, GLdouble, GLdouble,
-                                              GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord4dARB, fn);
+typedef void (GLAPIENTRYP _glptr_MultiTexCoord4dv)(GLenum, const GLdouble *);
+#define CALL_MultiTexCoord4dv(disp, parameters) \
+    (* GET_MultiTexCoord4dv(disp)) parameters
+static INLINE _glptr_MultiTexCoord4dv GET_MultiTexCoord4dv(struct _glapi_table *disp) {
+   return (_glptr_MultiTexCoord4dv) (GET_by_offset(disp, _gloffset_MultiTexCoord4dv));
 }
-
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord4dvARB) (GLenum,
-                                                       const GLdouble *);
-#define CALL_MultiTexCoord4dvARB(disp, parameters) \
-    (* GET_MultiTexCoord4dvARB(disp)) parameters
-static inline _glptr_MultiTexCoord4dvARB
-GET_MultiTexCoord4dvARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord4dvARB) (GET_by_offset
-                                         (disp, _gloffset_MultiTexCoord4dvARB));
-}
-
-static inline void
-SET_MultiTexCoord4dvARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord4dvARB, fn);
+
+static INLINE void SET_MultiTexCoord4dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLdouble *)) {
+   SET_by_offset(disp, _gloffset_MultiTexCoord4dv, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord4fARB) (GLenum, GLfloat, GLfloat,
-                                                      GLfloat, GLfloat);
+typedef void (GLAPIENTRYP _glptr_MultiTexCoord4fARB)(GLenum, GLfloat, GLfloat, GLfloat, GLfloat);
 #define CALL_MultiTexCoord4fARB(disp, parameters) \
     (* GET_MultiTexCoord4fARB(disp)) parameters
-static inline _glptr_MultiTexCoord4fARB
-GET_MultiTexCoord4fARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord4fARB) (GET_by_offset
-                                        (disp, _gloffset_MultiTexCoord4fARB));
+static INLINE _glptr_MultiTexCoord4fARB GET_MultiTexCoord4fARB(struct _glapi_table *disp) {
+   return (_glptr_MultiTexCoord4fARB) (GET_by_offset(disp, _gloffset_MultiTexCoord4fARB));
 }
 
-static inline void
-SET_MultiTexCoord4fARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, GLfloat, GLfloat, GLfloat,
-                                              GLfloat))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord4fARB, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_MultiTexCoord4fvARB)(GLenum, const GLfloat *);
 #define CALL_MultiTexCoord4fvARB(disp, parameters) \
     (* GET_MultiTexCoord4fvARB(disp)) parameters
-static inline _glptr_MultiTexCoord4fvARB
-GET_MultiTexCoord4fvARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord4fvARB) (GET_by_offset
-                                         (disp, _gloffset_MultiTexCoord4fvARB));
+static INLINE _glptr_MultiTexCoord4fvARB GET_MultiTexCoord4fvARB(struct _glapi_table *disp) {
+   return (_glptr_MultiTexCoord4fvARB) (GET_by_offset(disp, _gloffset_MultiTexCoord4fvARB));
+}
+
+static INLINE void SET_MultiTexCoord4fvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLfloat *)) {
+   SET_by_offset(disp, _gloffset_MultiTexCoord4fvARB, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_MultiTexCoord4i)(GLenum, GLint, GLint, GLint, GLint);
+#define CALL_MultiTexCoord4i(disp, parameters) \
+    (* GET_MultiTexCoord4i(disp)) parameters
+static INLINE _glptr_MultiTexCoord4i GET_MultiTexCoord4i(struct _glapi_table *disp) {
+   return (_glptr_MultiTexCoord4i) (GET_by_offset(disp, _gloffset_MultiTexCoord4i));
+}
+
+static INLINE void SET_MultiTexCoord4i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint, GLint, GLint)) {
+   SET_by_offset(disp, _gloffset_MultiTexCoord4i, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_MultiTexCoord4iv)(GLenum, const GLint *);
+#define CALL_MultiTexCoord4iv(disp, parameters) \
+    (* GET_MultiTexCoord4iv(disp)) parameters
+static INLINE _glptr_MultiTexCoord4iv GET_MultiTexCoord4iv(struct _glapi_table *disp) {
+   return (_glptr_MultiTexCoord4iv) (GET_by_offset(disp, _gloffset_MultiTexCoord4iv));
+}
+
+static INLINE void SET_MultiTexCoord4iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLint *)) {
+   SET_by_offset(disp, _gloffset_MultiTexCoord4iv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_MultiTexCoord4s)(GLenum, GLshort, GLshort, GLshort, GLshort);
+#define CALL_MultiTexCoord4s(disp, parameters) \
+    (* GET_MultiTexCoord4s(disp)) parameters
+static INLINE _glptr_MultiTexCoord4s GET_MultiTexCoord4s(struct _glapi_table *disp) {
+   return (_glptr_MultiTexCoord4s) (GET_by_offset(disp, _gloffset_MultiTexCoord4s));
+}
+
+static INLINE void SET_MultiTexCoord4s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLshort, GLshort, GLshort, GLshort)) {
+   SET_by_offset(disp, _gloffset_MultiTexCoord4s, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_MultiTexCoord4sv)(GLenum, const GLshort *);
+#define CALL_MultiTexCoord4sv(disp, parameters) \
+    (* GET_MultiTexCoord4sv(disp)) parameters
+static INLINE _glptr_MultiTexCoord4sv GET_MultiTexCoord4sv(struct _glapi_table *disp) {
+   return (_glptr_MultiTexCoord4sv) (GET_by_offset(disp, _gloffset_MultiTexCoord4sv));
+}
+
+static INLINE void SET_MultiTexCoord4sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLshort *)) {
+   SET_by_offset(disp, _gloffset_MultiTexCoord4sv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_CompressedTexImage1D)(GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid *);
+#define CALL_CompressedTexImage1D(disp, parameters) \
+    (* GET_CompressedTexImage1D(disp)) parameters
+static INLINE _glptr_CompressedTexImage1D GET_CompressedTexImage1D(struct _glapi_table *disp) {
+   return (_glptr_CompressedTexImage1D) (GET_by_offset(disp, _gloffset_CompressedTexImage1D));
+}
+
+static INLINE void SET_CompressedTexImage1D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid *)) {
+   SET_by_offset(disp, _gloffset_CompressedTexImage1D, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_CompressedTexImage2D)(GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
+#define CALL_CompressedTexImage2D(disp, parameters) \
+    (* GET_CompressedTexImage2D(disp)) parameters
+static INLINE _glptr_CompressedTexImage2D GET_CompressedTexImage2D(struct _glapi_table *disp) {
+   return (_glptr_CompressedTexImage2D) (GET_by_offset(disp, _gloffset_CompressedTexImage2D));
+}
+
+static INLINE void SET_CompressedTexImage2D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *)) {
+   SET_by_offset(disp, _gloffset_CompressedTexImage2D, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_CompressedTexImage3D)(GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
+#define CALL_CompressedTexImage3D(disp, parameters) \
+    (* GET_CompressedTexImage3D(disp)) parameters
+static INLINE _glptr_CompressedTexImage3D GET_CompressedTexImage3D(struct _glapi_table *disp) {
+   return (_glptr_CompressedTexImage3D) (GET_by_offset(disp, _gloffset_CompressedTexImage3D));
+}
+
+static INLINE void SET_CompressedTexImage3D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *)) {
+   SET_by_offset(disp, _gloffset_CompressedTexImage3D, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_CompressedTexSubImage1D)(GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *);
+#define CALL_CompressedTexSubImage1D(disp, parameters) \
+    (* GET_CompressedTexSubImage1D(disp)) parameters
+static INLINE _glptr_CompressedTexSubImage1D GET_CompressedTexSubImage1D(struct _glapi_table *disp) {
+   return (_glptr_CompressedTexSubImage1D) (GET_by_offset(disp, _gloffset_CompressedTexSubImage1D));
+}
+
+static INLINE void SET_CompressedTexSubImage1D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *)) {
+   SET_by_offset(disp, _gloffset_CompressedTexSubImage1D, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_CompressedTexSubImage2D)(GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
+#define CALL_CompressedTexSubImage2D(disp, parameters) \
+    (* GET_CompressedTexSubImage2D(disp)) parameters
+static INLINE _glptr_CompressedTexSubImage2D GET_CompressedTexSubImage2D(struct _glapi_table *disp) {
+   return (_glptr_CompressedTexSubImage2D) (GET_by_offset(disp, _gloffset_CompressedTexSubImage2D));
+}
+
+static INLINE void SET_CompressedTexSubImage2D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *)) {
+   SET_by_offset(disp, _gloffset_CompressedTexSubImage2D, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_CompressedTexSubImage3D)(GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
+#define CALL_CompressedTexSubImage3D(disp, parameters) \
+    (* GET_CompressedTexSubImage3D(disp)) parameters
+static INLINE _glptr_CompressedTexSubImage3D GET_CompressedTexSubImage3D(struct _glapi_table *disp) {
+   return (_glptr_CompressedTexSubImage3D) (GET_by_offset(disp, _gloffset_CompressedTexSubImage3D));
+}
+
+static INLINE void SET_CompressedTexSubImage3D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *)) {
+   SET_by_offset(disp, _gloffset_CompressedTexSubImage3D, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetCompressedTexImage)(GLenum, GLint, GLvoid *);
+#define CALL_GetCompressedTexImage(disp, parameters) \
+    (* GET_GetCompressedTexImage(disp)) parameters
+static INLINE _glptr_GetCompressedTexImage GET_GetCompressedTexImage(struct _glapi_table *disp) {
+   return (_glptr_GetCompressedTexImage) (GET_by_offset(disp, _gloffset_GetCompressedTexImage));
+}
+
+static INLINE void SET_GetCompressedTexImage(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLvoid *)) {
+   SET_by_offset(disp, _gloffset_GetCompressedTexImage, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_LoadTransposeMatrixd)(const GLdouble *);
+#define CALL_LoadTransposeMatrixd(disp, parameters) \
+    (* GET_LoadTransposeMatrixd(disp)) parameters
+static INLINE _glptr_LoadTransposeMatrixd GET_LoadTransposeMatrixd(struct _glapi_table *disp) {
+   return (_glptr_LoadTransposeMatrixd) (GET_by_offset(disp, _gloffset_LoadTransposeMatrixd));
+}
+
+static INLINE void SET_LoadTransposeMatrixd(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
+   SET_by_offset(disp, _gloffset_LoadTransposeMatrixd, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_LoadTransposeMatrixf)(const GLfloat *);
+#define CALL_LoadTransposeMatrixf(disp, parameters) \
+    (* GET_LoadTransposeMatrixf(disp)) parameters
+static INLINE _glptr_LoadTransposeMatrixf GET_LoadTransposeMatrixf(struct _glapi_table *disp) {
+   return (_glptr_LoadTransposeMatrixf) (GET_by_offset(disp, _gloffset_LoadTransposeMatrixf));
+}
+
+static INLINE void SET_LoadTransposeMatrixf(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
+   SET_by_offset(disp, _gloffset_LoadTransposeMatrixf, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_MultTransposeMatrixd)(const GLdouble *);
+#define CALL_MultTransposeMatrixd(disp, parameters) \
+    (* GET_MultTransposeMatrixd(disp)) parameters
+static INLINE _glptr_MultTransposeMatrixd GET_MultTransposeMatrixd(struct _glapi_table *disp) {
+   return (_glptr_MultTransposeMatrixd) (GET_by_offset(disp, _gloffset_MultTransposeMatrixd));
+}
+
+static INLINE void SET_MultTransposeMatrixd(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
+   SET_by_offset(disp, _gloffset_MultTransposeMatrixd, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_MultTransposeMatrixf)(const GLfloat *);
+#define CALL_MultTransposeMatrixf(disp, parameters) \
+    (* GET_MultTransposeMatrixf(disp)) parameters
+static INLINE _glptr_MultTransposeMatrixf GET_MultTransposeMatrixf(struct _glapi_table *disp) {
+   return (_glptr_MultTransposeMatrixf) (GET_by_offset(disp, _gloffset_MultTransposeMatrixf));
+}
+
+static INLINE void SET_MultTransposeMatrixf(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
+   SET_by_offset(disp, _gloffset_MultTransposeMatrixf, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_SampleCoverage)(GLclampf, GLboolean);
+#define CALL_SampleCoverage(disp, parameters) \
+    (* GET_SampleCoverage(disp)) parameters
+static INLINE _glptr_SampleCoverage GET_SampleCoverage(struct _glapi_table *disp) {
+   return (_glptr_SampleCoverage) (GET_by_offset(disp, _gloffset_SampleCoverage));
+}
+
+static INLINE void SET_SampleCoverage(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLclampf, GLboolean)) {
+   SET_by_offset(disp, _gloffset_SampleCoverage, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_BlendFuncSeparate)(GLenum, GLenum, GLenum, GLenum);
+#define CALL_BlendFuncSeparate(disp, parameters) \
+    (* GET_BlendFuncSeparate(disp)) parameters
+static INLINE _glptr_BlendFuncSeparate GET_BlendFuncSeparate(struct _glapi_table *disp) {
+   return (_glptr_BlendFuncSeparate) (GET_by_offset(disp, _gloffset_BlendFuncSeparate));
+}
+
+static INLINE void SET_BlendFuncSeparate(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLenum)) {
+   SET_by_offset(disp, _gloffset_BlendFuncSeparate, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_FogCoordPointer)(GLenum, GLsizei, const GLvoid *);
+#define CALL_FogCoordPointer(disp, parameters) \
+    (* GET_FogCoordPointer(disp)) parameters
+static INLINE _glptr_FogCoordPointer GET_FogCoordPointer(struct _glapi_table *disp) {
+   return (_glptr_FogCoordPointer) (GET_by_offset(disp, _gloffset_FogCoordPointer));
+}
+
+static INLINE void SET_FogCoordPointer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, const GLvoid *)) {
+   SET_by_offset(disp, _gloffset_FogCoordPointer, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_FogCoordd)(GLdouble);
+#define CALL_FogCoordd(disp, parameters) \
+    (* GET_FogCoordd(disp)) parameters
+static INLINE _glptr_FogCoordd GET_FogCoordd(struct _glapi_table *disp) {
+   return (_glptr_FogCoordd) (GET_by_offset(disp, _gloffset_FogCoordd));
+}
+
+static INLINE void SET_FogCoordd(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble)) {
+   SET_by_offset(disp, _gloffset_FogCoordd, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_FogCoorddv)(const GLdouble *);
+#define CALL_FogCoorddv(disp, parameters) \
+    (* GET_FogCoorddv(disp)) parameters
+static INLINE _glptr_FogCoorddv GET_FogCoorddv(struct _glapi_table *disp) {
+   return (_glptr_FogCoorddv) (GET_by_offset(disp, _gloffset_FogCoorddv));
+}
+
+static INLINE void SET_FogCoorddv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
+   SET_by_offset(disp, _gloffset_FogCoorddv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_MultiDrawArrays)(GLenum, const GLint *, const GLsizei *, GLsizei);
+#define CALL_MultiDrawArrays(disp, parameters) \
+    (* GET_MultiDrawArrays(disp)) parameters
+static INLINE _glptr_MultiDrawArrays GET_MultiDrawArrays(struct _glapi_table *disp) {
+   return (_glptr_MultiDrawArrays) (GET_by_offset(disp, _gloffset_MultiDrawArrays));
+}
+
+static INLINE void SET_MultiDrawArrays(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLint *, const GLsizei *, GLsizei)) {
+   SET_by_offset(disp, _gloffset_MultiDrawArrays, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_PointParameterf)(GLenum, GLfloat);
+#define CALL_PointParameterf(disp, parameters) \
+    (* GET_PointParameterf(disp)) parameters
+static INLINE _glptr_PointParameterf GET_PointParameterf(struct _glapi_table *disp) {
+   return (_glptr_PointParameterf) (GET_by_offset(disp, _gloffset_PointParameterf));
+}
+
+static INLINE void SET_PointParameterf(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat)) {
+   SET_by_offset(disp, _gloffset_PointParameterf, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_PointParameterfv)(GLenum, const GLfloat *);
+#define CALL_PointParameterfv(disp, parameters) \
+    (* GET_PointParameterfv(disp)) parameters
+static INLINE _glptr_PointParameterfv GET_PointParameterfv(struct _glapi_table *disp) {
+   return (_glptr_PointParameterfv) (GET_by_offset(disp, _gloffset_PointParameterfv));
+}
+
+static INLINE void SET_PointParameterfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLfloat *)) {
+   SET_by_offset(disp, _gloffset_PointParameterfv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_PointParameteri)(GLenum, GLint);
+#define CALL_PointParameteri(disp, parameters) \
+    (* GET_PointParameteri(disp)) parameters
+static INLINE _glptr_PointParameteri GET_PointParameteri(struct _glapi_table *disp) {
+   return (_glptr_PointParameteri) (GET_by_offset(disp, _gloffset_PointParameteri));
+}
+
+static INLINE void SET_PointParameteri(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint)) {
+   SET_by_offset(disp, _gloffset_PointParameteri, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_PointParameteriv)(GLenum, const GLint *);
+#define CALL_PointParameteriv(disp, parameters) \
+    (* GET_PointParameteriv(disp)) parameters
+static INLINE _glptr_PointParameteriv GET_PointParameteriv(struct _glapi_table *disp) {
+   return (_glptr_PointParameteriv) (GET_by_offset(disp, _gloffset_PointParameteriv));
+}
+
+static INLINE void SET_PointParameteriv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLint *)) {
+   SET_by_offset(disp, _gloffset_PointParameteriv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_SecondaryColor3b)(GLbyte, GLbyte, GLbyte);
+#define CALL_SecondaryColor3b(disp, parameters) \
+    (* GET_SecondaryColor3b(disp)) parameters
+static INLINE _glptr_SecondaryColor3b GET_SecondaryColor3b(struct _glapi_table *disp) {
+   return (_glptr_SecondaryColor3b) (GET_by_offset(disp, _gloffset_SecondaryColor3b));
+}
+
+static INLINE void SET_SecondaryColor3b(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLbyte, GLbyte, GLbyte)) {
+   SET_by_offset(disp, _gloffset_SecondaryColor3b, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_SecondaryColor3bv)(const GLbyte *);
+#define CALL_SecondaryColor3bv(disp, parameters) \
+    (* GET_SecondaryColor3bv(disp)) parameters
+static INLINE _glptr_SecondaryColor3bv GET_SecondaryColor3bv(struct _glapi_table *disp) {
+   return (_glptr_SecondaryColor3bv) (GET_by_offset(disp, _gloffset_SecondaryColor3bv));
+}
+
+static INLINE void SET_SecondaryColor3bv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLbyte *)) {
+   SET_by_offset(disp, _gloffset_SecondaryColor3bv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_SecondaryColor3d)(GLdouble, GLdouble, GLdouble);
+#define CALL_SecondaryColor3d(disp, parameters) \
+    (* GET_SecondaryColor3d(disp)) parameters
+static INLINE _glptr_SecondaryColor3d GET_SecondaryColor3d(struct _glapi_table *disp) {
+   return (_glptr_SecondaryColor3d) (GET_by_offset(disp, _gloffset_SecondaryColor3d));
+}
+
+static INLINE void SET_SecondaryColor3d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble)) {
+   SET_by_offset(disp, _gloffset_SecondaryColor3d, fn);
 }
 
-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_SecondaryColor3dv)(const GLdouble *);
+#define CALL_SecondaryColor3dv(disp, parameters) \
+    (* GET_SecondaryColor3dv(disp)) parameters
+static INLINE _glptr_SecondaryColor3dv GET_SecondaryColor3dv(struct _glapi_table *disp) {
+   return (_glptr_SecondaryColor3dv) (GET_by_offset(disp, _gloffset_SecondaryColor3dv));
 }
 
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord4iARB) (GLenum, GLint, GLint,
-                                                      GLint, GLint);
-#define CALL_MultiTexCoord4iARB(disp, parameters) \
-    (* GET_MultiTexCoord4iARB(disp)) parameters
-static inline _glptr_MultiTexCoord4iARB
-GET_MultiTexCoord4iARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord4iARB) (GET_by_offset
-                                        (disp, _gloffset_MultiTexCoord4iARB));
+static INLINE void SET_SecondaryColor3dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
+   SET_by_offset(disp, _gloffset_SecondaryColor3dv, fn);
 }
 
-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_SecondaryColor3i)(GLint, GLint, GLint);
+#define CALL_SecondaryColor3i(disp, parameters) \
+    (* GET_SecondaryColor3i(disp)) parameters
+static INLINE _glptr_SecondaryColor3i GET_SecondaryColor3i(struct _glapi_table *disp) {
+   return (_glptr_SecondaryColor3i) (GET_by_offset(disp, _gloffset_SecondaryColor3i));
 }
 
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord4ivARB) (GLenum, const GLint *);
+static INLINE void SET_SecondaryColor3i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint)) {
+   SET_by_offset(disp, _gloffset_SecondaryColor3i, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_SecondaryColor3iv)(const GLint *);
+#define CALL_SecondaryColor3iv(disp, parameters) \
+    (* GET_SecondaryColor3iv(disp)) parameters
+static INLINE _glptr_SecondaryColor3iv GET_SecondaryColor3iv(struct _glapi_table *disp) {
+   return (_glptr_SecondaryColor3iv) (GET_by_offset(disp, _gloffset_SecondaryColor3iv));
+}
+
+static INLINE void SET_SecondaryColor3iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) {
+   SET_by_offset(disp, _gloffset_SecondaryColor3iv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_SecondaryColor3s)(GLshort, GLshort, GLshort);
+#define CALL_SecondaryColor3s(disp, parameters) \
+    (* GET_SecondaryColor3s(disp)) parameters
+static INLINE _glptr_SecondaryColor3s GET_SecondaryColor3s(struct _glapi_table *disp) {
+   return (_glptr_SecondaryColor3s) (GET_by_offset(disp, _gloffset_SecondaryColor3s));
+}
+
+static INLINE void SET_SecondaryColor3s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort, GLshort)) {
+   SET_by_offset(disp, _gloffset_SecondaryColor3s, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_SecondaryColor3sv)(const GLshort *);
+#define CALL_SecondaryColor3sv(disp, parameters) \
+    (* GET_SecondaryColor3sv(disp)) parameters
+static INLINE _glptr_SecondaryColor3sv GET_SecondaryColor3sv(struct _glapi_table *disp) {
+   return (_glptr_SecondaryColor3sv) (GET_by_offset(disp, _gloffset_SecondaryColor3sv));
+}
+
+static INLINE void SET_SecondaryColor3sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) {
+   SET_by_offset(disp, _gloffset_SecondaryColor3sv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_SecondaryColor3ub)(GLubyte, GLubyte, GLubyte);
+#define CALL_SecondaryColor3ub(disp, parameters) \
+    (* GET_SecondaryColor3ub(disp)) parameters
+static INLINE _glptr_SecondaryColor3ub GET_SecondaryColor3ub(struct _glapi_table *disp) {
+   return (_glptr_SecondaryColor3ub) (GET_by_offset(disp, _gloffset_SecondaryColor3ub));
+}
+
+static INLINE void SET_SecondaryColor3ub(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLubyte, GLubyte, GLubyte)) {
+   SET_by_offset(disp, _gloffset_SecondaryColor3ub, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_SecondaryColor3ubv)(const GLubyte *);
+#define CALL_SecondaryColor3ubv(disp, parameters) \
+    (* GET_SecondaryColor3ubv(disp)) parameters
+static INLINE _glptr_SecondaryColor3ubv GET_SecondaryColor3ubv(struct _glapi_table *disp) {
+   return (_glptr_SecondaryColor3ubv) (GET_by_offset(disp, _gloffset_SecondaryColor3ubv));
+}
+
+static INLINE void SET_SecondaryColor3ubv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLubyte *)) {
+   SET_by_offset(disp, _gloffset_SecondaryColor3ubv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_SecondaryColor3ui)(GLuint, GLuint, GLuint);
+#define CALL_SecondaryColor3ui(disp, parameters) \
+    (* GET_SecondaryColor3ui(disp)) parameters
+static INLINE _glptr_SecondaryColor3ui GET_SecondaryColor3ui(struct _glapi_table *disp) {
+   return (_glptr_SecondaryColor3ui) (GET_by_offset(disp, _gloffset_SecondaryColor3ui));
+}
+
+static INLINE void SET_SecondaryColor3ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLuint)) {
+   SET_by_offset(disp, _gloffset_SecondaryColor3ui, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_SecondaryColor3uiv)(const GLuint *);
+#define CALL_SecondaryColor3uiv(disp, parameters) \
+    (* GET_SecondaryColor3uiv(disp)) parameters
+static INLINE _glptr_SecondaryColor3uiv GET_SecondaryColor3uiv(struct _glapi_table *disp) {
+   return (_glptr_SecondaryColor3uiv) (GET_by_offset(disp, _gloffset_SecondaryColor3uiv));
+}
+
+static INLINE void SET_SecondaryColor3uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLuint *)) {
+   SET_by_offset(disp, _gloffset_SecondaryColor3uiv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_SecondaryColor3us)(GLushort, GLushort, GLushort);
+#define CALL_SecondaryColor3us(disp, parameters) \
+    (* GET_SecondaryColor3us(disp)) parameters
+static INLINE _glptr_SecondaryColor3us GET_SecondaryColor3us(struct _glapi_table *disp) {
+   return (_glptr_SecondaryColor3us) (GET_by_offset(disp, _gloffset_SecondaryColor3us));
+}
+
+static INLINE void SET_SecondaryColor3us(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLushort, GLushort, GLushort)) {
+   SET_by_offset(disp, _gloffset_SecondaryColor3us, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_SecondaryColor3usv)(const GLushort *);
+#define CALL_SecondaryColor3usv(disp, parameters) \
+    (* GET_SecondaryColor3usv(disp)) parameters
+static INLINE _glptr_SecondaryColor3usv GET_SecondaryColor3usv(struct _glapi_table *disp) {
+   return (_glptr_SecondaryColor3usv) (GET_by_offset(disp, _gloffset_SecondaryColor3usv));
+}
+
+static INLINE void SET_SecondaryColor3usv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLushort *)) {
+   SET_by_offset(disp, _gloffset_SecondaryColor3usv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_SecondaryColorPointer)(GLint, GLenum, GLsizei, const GLvoid *);
+#define CALL_SecondaryColorPointer(disp, parameters) \
+    (* GET_SecondaryColorPointer(disp)) parameters
+static INLINE _glptr_SecondaryColorPointer GET_SecondaryColorPointer(struct _glapi_table *disp) {
+   return (_glptr_SecondaryColorPointer) (GET_by_offset(disp, _gloffset_SecondaryColorPointer));
+}
+
+static INLINE void SET_SecondaryColorPointer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLenum, GLsizei, const GLvoid *)) {
+   SET_by_offset(disp, _gloffset_SecondaryColorPointer, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_WindowPos2d)(GLdouble, GLdouble);
+#define CALL_WindowPos2d(disp, parameters) \
+    (* GET_WindowPos2d(disp)) parameters
+static INLINE _glptr_WindowPos2d GET_WindowPos2d(struct _glapi_table *disp) {
+   return (_glptr_WindowPos2d) (GET_by_offset(disp, _gloffset_WindowPos2d));
+}
+
+static INLINE void SET_WindowPos2d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble)) {
+   SET_by_offset(disp, _gloffset_WindowPos2d, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_WindowPos2dv)(const GLdouble *);
+#define CALL_WindowPos2dv(disp, parameters) \
+    (* GET_WindowPos2dv(disp)) parameters
+static INLINE _glptr_WindowPos2dv GET_WindowPos2dv(struct _glapi_table *disp) {
+   return (_glptr_WindowPos2dv) (GET_by_offset(disp, _gloffset_WindowPos2dv));
+}
+
+static INLINE void SET_WindowPos2dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
+   SET_by_offset(disp, _gloffset_WindowPos2dv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_WindowPos2f)(GLfloat, GLfloat);
+#define CALL_WindowPos2f(disp, parameters) \
+    (* GET_WindowPos2f(disp)) parameters
+static INLINE _glptr_WindowPos2f GET_WindowPos2f(struct _glapi_table *disp) {
+   return (_glptr_WindowPos2f) (GET_by_offset(disp, _gloffset_WindowPos2f));
+}
+
+static INLINE void SET_WindowPos2f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat)) {
+   SET_by_offset(disp, _gloffset_WindowPos2f, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_WindowPos2fv)(const GLfloat *);
+#define CALL_WindowPos2fv(disp, parameters) \
+    (* GET_WindowPos2fv(disp)) parameters
+static INLINE _glptr_WindowPos2fv GET_WindowPos2fv(struct _glapi_table *disp) {
+   return (_glptr_WindowPos2fv) (GET_by_offset(disp, _gloffset_WindowPos2fv));
+}
+
+static INLINE void SET_WindowPos2fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
+   SET_by_offset(disp, _gloffset_WindowPos2fv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_WindowPos2i)(GLint, GLint);
+#define CALL_WindowPos2i(disp, parameters) \
+    (* GET_WindowPos2i(disp)) parameters
+static INLINE _glptr_WindowPos2i GET_WindowPos2i(struct _glapi_table *disp) {
+   return (_glptr_WindowPos2i) (GET_by_offset(disp, _gloffset_WindowPos2i));
+}
+
+static INLINE void SET_WindowPos2i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint)) {
+   SET_by_offset(disp, _gloffset_WindowPos2i, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_WindowPos2iv)(const GLint *);
+#define CALL_WindowPos2iv(disp, parameters) \
+    (* GET_WindowPos2iv(disp)) parameters
+static INLINE _glptr_WindowPos2iv GET_WindowPos2iv(struct _glapi_table *disp) {
+   return (_glptr_WindowPos2iv) (GET_by_offset(disp, _gloffset_WindowPos2iv));
+}
+
+static INLINE void SET_WindowPos2iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) {
+   SET_by_offset(disp, _gloffset_WindowPos2iv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_WindowPos2s)(GLshort, GLshort);
+#define CALL_WindowPos2s(disp, parameters) \
+    (* GET_WindowPos2s(disp)) parameters
+static INLINE _glptr_WindowPos2s GET_WindowPos2s(struct _glapi_table *disp) {
+   return (_glptr_WindowPos2s) (GET_by_offset(disp, _gloffset_WindowPos2s));
+}
+
+static INLINE void SET_WindowPos2s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort)) {
+   SET_by_offset(disp, _gloffset_WindowPos2s, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_WindowPos2sv)(const GLshort *);
+#define CALL_WindowPos2sv(disp, parameters) \
+    (* GET_WindowPos2sv(disp)) parameters
+static INLINE _glptr_WindowPos2sv GET_WindowPos2sv(struct _glapi_table *disp) {
+   return (_glptr_WindowPos2sv) (GET_by_offset(disp, _gloffset_WindowPos2sv));
+}
+
+static INLINE void SET_WindowPos2sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) {
+   SET_by_offset(disp, _gloffset_WindowPos2sv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_WindowPos3d)(GLdouble, GLdouble, GLdouble);
+#define CALL_WindowPos3d(disp, parameters) \
+    (* GET_WindowPos3d(disp)) parameters
+static INLINE _glptr_WindowPos3d GET_WindowPos3d(struct _glapi_table *disp) {
+   return (_glptr_WindowPos3d) (GET_by_offset(disp, _gloffset_WindowPos3d));
+}
+
+static INLINE void SET_WindowPos3d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble)) {
+   SET_by_offset(disp, _gloffset_WindowPos3d, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_WindowPos3dv)(const GLdouble *);
+#define CALL_WindowPos3dv(disp, parameters) \
+    (* GET_WindowPos3dv(disp)) parameters
+static INLINE _glptr_WindowPos3dv GET_WindowPos3dv(struct _glapi_table *disp) {
+   return (_glptr_WindowPos3dv) (GET_by_offset(disp, _gloffset_WindowPos3dv));
+}
+
+static INLINE void SET_WindowPos3dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) {
+   SET_by_offset(disp, _gloffset_WindowPos3dv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_WindowPos3f)(GLfloat, GLfloat, GLfloat);
+#define CALL_WindowPos3f(disp, parameters) \
+    (* GET_WindowPos3f(disp)) parameters
+static INLINE _glptr_WindowPos3f GET_WindowPos3f(struct _glapi_table *disp) {
+   return (_glptr_WindowPos3f) (GET_by_offset(disp, _gloffset_WindowPos3f));
+}
+
+static INLINE void SET_WindowPos3f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat)) {
+   SET_by_offset(disp, _gloffset_WindowPos3f, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_WindowPos3fv)(const GLfloat *);
+#define CALL_WindowPos3fv(disp, parameters) \
+    (* GET_WindowPos3fv(disp)) parameters
+static INLINE _glptr_WindowPos3fv GET_WindowPos3fv(struct _glapi_table *disp) {
+   return (_glptr_WindowPos3fv) (GET_by_offset(disp, _gloffset_WindowPos3fv));
+}
+
+static INLINE void SET_WindowPos3fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
+   SET_by_offset(disp, _gloffset_WindowPos3fv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_WindowPos3i)(GLint, GLint, GLint);
+#define CALL_WindowPos3i(disp, parameters) \
+    (* GET_WindowPos3i(disp)) parameters
+static INLINE _glptr_WindowPos3i GET_WindowPos3i(struct _glapi_table *disp) {
+   return (_glptr_WindowPos3i) (GET_by_offset(disp, _gloffset_WindowPos3i));
+}
+
+static INLINE void SET_WindowPos3i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint)) {
+   SET_by_offset(disp, _gloffset_WindowPos3i, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_WindowPos3iv)(const GLint *);
+#define CALL_WindowPos3iv(disp, parameters) \
+    (* GET_WindowPos3iv(disp)) parameters
+static INLINE _glptr_WindowPos3iv GET_WindowPos3iv(struct _glapi_table *disp) {
+   return (_glptr_WindowPos3iv) (GET_by_offset(disp, _gloffset_WindowPos3iv));
+}
+
+static INLINE void SET_WindowPos3iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) {
+   SET_by_offset(disp, _gloffset_WindowPos3iv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_WindowPos3s)(GLshort, GLshort, GLshort);
+#define CALL_WindowPos3s(disp, parameters) \
+    (* GET_WindowPos3s(disp)) parameters
+static INLINE _glptr_WindowPos3s GET_WindowPos3s(struct _glapi_table *disp) {
+   return (_glptr_WindowPos3s) (GET_by_offset(disp, _gloffset_WindowPos3s));
+}
+
+static INLINE void SET_WindowPos3s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort, GLshort)) {
+   SET_by_offset(disp, _gloffset_WindowPos3s, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_WindowPos3sv)(const GLshort *);
+#define CALL_WindowPos3sv(disp, parameters) \
+    (* GET_WindowPos3sv(disp)) parameters
+static INLINE _glptr_WindowPos3sv GET_WindowPos3sv(struct _glapi_table *disp) {
+   return (_glptr_WindowPos3sv) (GET_by_offset(disp, _gloffset_WindowPos3sv));
+}
+
+static INLINE void SET_WindowPos3sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) {
+   SET_by_offset(disp, _gloffset_WindowPos3sv, fn);
+}
 
-#define CALL_MultiTexCoord4ivARB(disp, parameters) \
-    (* GET_MultiTexCoord4ivARB(disp)) parameters
-static inline _glptr_MultiTexCoord4ivARB
-GET_MultiTexCoord4ivARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord4ivARB) (GET_by_offset
-                                         (disp, _gloffset_MultiTexCoord4ivARB));
+typedef void (GLAPIENTRYP _glptr_BeginQuery)(GLenum, GLuint);
+#define CALL_BeginQuery(disp, parameters) \
+    (* GET_BeginQuery(disp)) parameters
+static INLINE _glptr_BeginQuery GET_BeginQuery(struct _glapi_table *disp) {
+   return (_glptr_BeginQuery) (GET_by_offset(disp, _gloffset_BeginQuery));
 }
 
-static inline void
-SET_MultiTexCoord4ivARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord4ivARB, fn);
+static INLINE void SET_BeginQuery(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
+   SET_by_offset(disp, _gloffset_BeginQuery, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord4sARB) (GLenum, GLshort, GLshort,
-                                                      GLshort, GLshort);
-#define CALL_MultiTexCoord4sARB(disp, parameters) \
-    (* GET_MultiTexCoord4sARB(disp)) parameters
-static inline _glptr_MultiTexCoord4sARB
-GET_MultiTexCoord4sARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord4sARB) (GET_by_offset
-                                        (disp, _gloffset_MultiTexCoord4sARB));
+typedef void (GLAPIENTRYP _glptr_BindBuffer)(GLenum, GLuint);
+#define CALL_BindBuffer(disp, parameters) \
+    (* GET_BindBuffer(disp)) parameters
+static INLINE _glptr_BindBuffer GET_BindBuffer(struct _glapi_table *disp) {
+   return (_glptr_BindBuffer) (GET_by_offset(disp, _gloffset_BindBuffer));
 }
 
-static inline void
-SET_MultiTexCoord4sARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, GLshort, GLshort, GLshort,
-                                              GLshort))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord4sARB, fn);
+static INLINE void SET_BindBuffer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
+   SET_by_offset(disp, _gloffset_BindBuffer, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_MultiTexCoord4svARB) (GLenum, const GLshort *);
+typedef void (GLAPIENTRYP _glptr_BufferData)(GLenum, GLsizeiptr, const GLvoid *, GLenum);
+#define CALL_BufferData(disp, parameters) \
+    (* GET_BufferData(disp)) parameters
+static INLINE _glptr_BufferData GET_BufferData(struct _glapi_table *disp) {
+   return (_glptr_BufferData) (GET_by_offset(disp, _gloffset_BufferData));
+}
+
+static INLINE void SET_BufferData(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizeiptr, const GLvoid *, GLenum)) {
+   SET_by_offset(disp, _gloffset_BufferData, fn);
+}
 
-#define CALL_MultiTexCoord4svARB(disp, parameters) \
-    (* GET_MultiTexCoord4svARB(disp)) parameters
-static inline _glptr_MultiTexCoord4svARB
-GET_MultiTexCoord4svARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoord4svARB) (GET_by_offset
-                                         (disp, _gloffset_MultiTexCoord4svARB));
+typedef void (GLAPIENTRYP _glptr_BufferSubData)(GLenum, GLintptr, GLsizeiptr, const GLvoid *);
+#define CALL_BufferSubData(disp, parameters) \
+    (* GET_BufferSubData(disp)) parameters
+static INLINE _glptr_BufferSubData GET_BufferSubData(struct _glapi_table *disp) {
+   return (_glptr_BufferSubData) (GET_by_offset(disp, _gloffset_BufferSubData));
 }
 
-static inline void
-SET_MultiTexCoord4svARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoord4svARB, fn);
+static INLINE void SET_BufferSubData(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLintptr, GLsizeiptr, const GLvoid *)) {
+   SET_by_offset(disp, _gloffset_BufferSubData, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_AttachShader) (GLuint, GLuint);
+typedef void (GLAPIENTRYP _glptr_DeleteBuffers)(GLsizei, const GLuint *);
+#define CALL_DeleteBuffers(disp, parameters) \
+    (* GET_DeleteBuffers(disp)) parameters
+static INLINE _glptr_DeleteBuffers GET_DeleteBuffers(struct _glapi_table *disp) {
+   return (_glptr_DeleteBuffers) (GET_by_offset(disp, _gloffset_DeleteBuffers));
+}
 
+static INLINE void SET_DeleteBuffers(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLuint *)) {
+   SET_by_offset(disp, _gloffset_DeleteBuffers, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_DeleteQueries)(GLsizei, const GLuint *);
+#define CALL_DeleteQueries(disp, parameters) \
+    (* GET_DeleteQueries(disp)) parameters
+static INLINE _glptr_DeleteQueries GET_DeleteQueries(struct _glapi_table *disp) {
+   return (_glptr_DeleteQueries) (GET_by_offset(disp, _gloffset_DeleteQueries));
+}
+
+static INLINE void SET_DeleteQueries(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLuint *)) {
+   SET_by_offset(disp, _gloffset_DeleteQueries, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_EndQuery)(GLenum);
+#define CALL_EndQuery(disp, parameters) \
+    (* GET_EndQuery(disp)) parameters
+static INLINE _glptr_EndQuery GET_EndQuery(struct _glapi_table *disp) {
+   return (_glptr_EndQuery) (GET_by_offset(disp, _gloffset_EndQuery));
+}
+
+static INLINE void SET_EndQuery(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
+   SET_by_offset(disp, _gloffset_EndQuery, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GenBuffers)(GLsizei, GLuint *);
+#define CALL_GenBuffers(disp, parameters) \
+    (* GET_GenBuffers(disp)) parameters
+static INLINE _glptr_GenBuffers GET_GenBuffers(struct _glapi_table *disp) {
+   return (_glptr_GenBuffers) (GET_by_offset(disp, _gloffset_GenBuffers));
+}
+
+static INLINE void SET_GenBuffers(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLuint *)) {
+   SET_by_offset(disp, _gloffset_GenBuffers, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GenQueries)(GLsizei, GLuint *);
+#define CALL_GenQueries(disp, parameters) \
+    (* GET_GenQueries(disp)) parameters
+static INLINE _glptr_GenQueries GET_GenQueries(struct _glapi_table *disp) {
+   return (_glptr_GenQueries) (GET_by_offset(disp, _gloffset_GenQueries));
+}
+
+static INLINE void SET_GenQueries(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLuint *)) {
+   SET_by_offset(disp, _gloffset_GenQueries, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetBufferParameteriv)(GLenum, GLenum, GLint *);
+#define CALL_GetBufferParameteriv(disp, parameters) \
+    (* GET_GetBufferParameteriv(disp)) parameters
+static INLINE _glptr_GetBufferParameteriv GET_GetBufferParameteriv(struct _glapi_table *disp) {
+   return (_glptr_GetBufferParameteriv) (GET_by_offset(disp, _gloffset_GetBufferParameteriv));
+}
+
+static INLINE void SET_GetBufferParameteriv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint *)) {
+   SET_by_offset(disp, _gloffset_GetBufferParameteriv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetBufferPointerv)(GLenum, GLenum, GLvoid **);
+#define CALL_GetBufferPointerv(disp, parameters) \
+    (* GET_GetBufferPointerv(disp)) parameters
+static INLINE _glptr_GetBufferPointerv GET_GetBufferPointerv(struct _glapi_table *disp) {
+   return (_glptr_GetBufferPointerv) (GET_by_offset(disp, _gloffset_GetBufferPointerv));
+}
+
+static INLINE void SET_GetBufferPointerv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLvoid **)) {
+   SET_by_offset(disp, _gloffset_GetBufferPointerv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetBufferSubData)(GLenum, GLintptr, GLsizeiptr, GLvoid *);
+#define CALL_GetBufferSubData(disp, parameters) \
+    (* GET_GetBufferSubData(disp)) parameters
+static INLINE _glptr_GetBufferSubData GET_GetBufferSubData(struct _glapi_table *disp) {
+   return (_glptr_GetBufferSubData) (GET_by_offset(disp, _gloffset_GetBufferSubData));
+}
+
+static INLINE void SET_GetBufferSubData(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLintptr, GLsizeiptr, GLvoid *)) {
+   SET_by_offset(disp, _gloffset_GetBufferSubData, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetQueryObjectiv)(GLuint, GLenum, GLint *);
+#define CALL_GetQueryObjectiv(disp, parameters) \
+    (* GET_GetQueryObjectiv(disp)) parameters
+static INLINE _glptr_GetQueryObjectiv GET_GetQueryObjectiv(struct _glapi_table *disp) {
+   return (_glptr_GetQueryObjectiv) (GET_by_offset(disp, _gloffset_GetQueryObjectiv));
+}
+
+static INLINE void SET_GetQueryObjectiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint *)) {
+   SET_by_offset(disp, _gloffset_GetQueryObjectiv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetQueryObjectuiv)(GLuint, GLenum, GLuint *);
+#define CALL_GetQueryObjectuiv(disp, parameters) \
+    (* GET_GetQueryObjectuiv(disp)) parameters
+static INLINE _glptr_GetQueryObjectuiv GET_GetQueryObjectuiv(struct _glapi_table *disp) {
+   return (_glptr_GetQueryObjectuiv) (GET_by_offset(disp, _gloffset_GetQueryObjectuiv));
+}
+
+static INLINE void SET_GetQueryObjectuiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLuint *)) {
+   SET_by_offset(disp, _gloffset_GetQueryObjectuiv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetQueryiv)(GLenum, GLenum, GLint *);
+#define CALL_GetQueryiv(disp, parameters) \
+    (* GET_GetQueryiv(disp)) parameters
+static INLINE _glptr_GetQueryiv GET_GetQueryiv(struct _glapi_table *disp) {
+   return (_glptr_GetQueryiv) (GET_by_offset(disp, _gloffset_GetQueryiv));
+}
+
+static INLINE void SET_GetQueryiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint *)) {
+   SET_by_offset(disp, _gloffset_GetQueryiv, fn);
+}
+
+typedef GLboolean (GLAPIENTRYP _glptr_IsBuffer)(GLuint);
+#define CALL_IsBuffer(disp, parameters) \
+    (* GET_IsBuffer(disp)) parameters
+static INLINE _glptr_IsBuffer GET_IsBuffer(struct _glapi_table *disp) {
+   return (_glptr_IsBuffer) (GET_by_offset(disp, _gloffset_IsBuffer));
+}
+
+static INLINE void SET_IsBuffer(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLuint)) {
+   SET_by_offset(disp, _gloffset_IsBuffer, fn);
+}
+
+typedef GLboolean (GLAPIENTRYP _glptr_IsQuery)(GLuint);
+#define CALL_IsQuery(disp, parameters) \
+    (* GET_IsQuery(disp)) parameters
+static INLINE _glptr_IsQuery GET_IsQuery(struct _glapi_table *disp) {
+   return (_glptr_IsQuery) (GET_by_offset(disp, _gloffset_IsQuery));
+}
+
+static INLINE void SET_IsQuery(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLuint)) {
+   SET_by_offset(disp, _gloffset_IsQuery, fn);
+}
+
+typedef GLvoid * (GLAPIENTRYP _glptr_MapBuffer)(GLenum, GLenum);
+#define CALL_MapBuffer(disp, parameters) \
+    (* GET_MapBuffer(disp)) parameters
+static INLINE _glptr_MapBuffer GET_MapBuffer(struct _glapi_table *disp) {
+   return (_glptr_MapBuffer) (GET_by_offset(disp, _gloffset_MapBuffer));
+}
+
+static INLINE void SET_MapBuffer(struct _glapi_table *disp, GLvoid * (GLAPIENTRYP fn)(GLenum, GLenum)) {
+   SET_by_offset(disp, _gloffset_MapBuffer, fn);
+}
+
+typedef GLboolean (GLAPIENTRYP _glptr_UnmapBuffer)(GLenum);
+#define CALL_UnmapBuffer(disp, parameters) \
+    (* GET_UnmapBuffer(disp)) parameters
+static INLINE _glptr_UnmapBuffer GET_UnmapBuffer(struct _glapi_table *disp) {
+   return (_glptr_UnmapBuffer) (GET_by_offset(disp, _gloffset_UnmapBuffer));
+}
+
+static INLINE void SET_UnmapBuffer(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLenum)) {
+   SET_by_offset(disp, _gloffset_UnmapBuffer, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_AttachShader)(GLuint, GLuint);
 #define CALL_AttachShader(disp, parameters) \
     (* GET_AttachShader(disp)) parameters
-static inline _glptr_AttachShader
-GET_AttachShader(struct _glapi_table *disp)
-{
-    return (_glptr_AttachShader) (GET_by_offset(disp, _gloffset_AttachShader));
+static INLINE _glptr_AttachShader GET_AttachShader(struct _glapi_table *disp) {
+   return (_glptr_AttachShader) (GET_by_offset(disp, _gloffset_AttachShader));
 }
 
-static inline void
-SET_AttachShader(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLuint, GLuint))
-{
-    SET_by_offset(disp, _gloffset_AttachShader, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_BindAttribLocation)(GLuint, GLuint, const GLchar *);
+#define CALL_BindAttribLocation(disp, parameters) \
+    (* GET_BindAttribLocation(disp)) parameters
+static INLINE _glptr_BindAttribLocation GET_BindAttribLocation(struct _glapi_table *disp) {
+   return (_glptr_BindAttribLocation) (GET_by_offset(disp, _gloffset_BindAttribLocation));
+}
 
+static INLINE void SET_BindAttribLocation(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, const GLchar *)) {
+   SET_by_offset(disp, _gloffset_BindAttribLocation, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_BlendEquationSeparate)(GLenum, GLenum);
+#define CALL_BlendEquationSeparate(disp, parameters) \
+    (* GET_BlendEquationSeparate(disp)) parameters
+static INLINE _glptr_BlendEquationSeparate GET_BlendEquationSeparate(struct _glapi_table *disp) {
+   return (_glptr_BlendEquationSeparate) (GET_by_offset(disp, _gloffset_BlendEquationSeparate));
+}
+
+static INLINE void SET_BlendEquationSeparate(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum)) {
+   SET_by_offset(disp, _gloffset_BlendEquationSeparate, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_CompileShader)(GLuint);
+#define CALL_CompileShader(disp, parameters) \
+    (* GET_CompileShader(disp)) parameters
+static INLINE _glptr_CompileShader GET_CompileShader(struct _glapi_table *disp) {
+   return (_glptr_CompileShader) (GET_by_offset(disp, _gloffset_CompileShader));
+}
+
+static INLINE void SET_CompileShader(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) {
+   SET_by_offset(disp, _gloffset_CompileShader, fn);
+}
+
+typedef GLuint (GLAPIENTRYP _glptr_CreateProgram)(void);
 #define CALL_CreateProgram(disp, parameters) \
     (* GET_CreateProgram(disp)) parameters
-static inline _glptr_CreateProgram
-GET_CreateProgram(struct _glapi_table *disp)
-{
-    return (_glptr_CreateProgram) (GET_by_offset
-                                   (disp, _gloffset_CreateProgram));
+static INLINE _glptr_CreateProgram GET_CreateProgram(struct _glapi_table *disp) {
+   return (_glptr_CreateProgram) (GET_by_offset(disp, _gloffset_CreateProgram));
 }
 
-static inline void
-SET_CreateProgram(struct _glapi_table *disp, GLuint(GLAPIENTRYP fn) (void))
-{
-    SET_by_offset(disp, _gloffset_CreateProgram, fn);
+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);
-
+typedef GLuint (GLAPIENTRYP _glptr_CreateShader)(GLenum);
 #define CALL_CreateShader(disp, parameters) \
     (* GET_CreateShader(disp)) parameters
-static inline _glptr_CreateShader
-GET_CreateShader(struct _glapi_table *disp)
-{
-    return (_glptr_CreateShader) (GET_by_offset(disp, _gloffset_CreateShader));
+static INLINE _glptr_CreateShader GET_CreateShader(struct _glapi_table *disp) {
+   return (_glptr_CreateShader) (GET_by_offset(disp, _gloffset_CreateShader));
 }
 
-static inline void
-SET_CreateShader(struct _glapi_table *disp, GLuint(GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_CreateShader, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_DeleteProgram)(GLuint);
 #define CALL_DeleteProgram(disp, parameters) \
     (* GET_DeleteProgram(disp)) parameters
-static inline _glptr_DeleteProgram
-GET_DeleteProgram(struct _glapi_table *disp)
-{
-    return (_glptr_DeleteProgram) (GET_by_offset
-                                   (disp, _gloffset_DeleteProgram));
+static INLINE _glptr_DeleteProgram GET_DeleteProgram(struct _glapi_table *disp) {
+   return (_glptr_DeleteProgram) (GET_by_offset(disp, _gloffset_DeleteProgram));
 }
 
-static inline void
-SET_DeleteProgram(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_DeleteProgram, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_DeleteShader)(GLuint);
 #define CALL_DeleteShader(disp, parameters) \
     (* GET_DeleteShader(disp)) parameters
-static inline _glptr_DeleteShader
-GET_DeleteShader(struct _glapi_table *disp)
-{
-    return (_glptr_DeleteShader) (GET_by_offset(disp, _gloffset_DeleteShader));
+static INLINE _glptr_DeleteShader GET_DeleteShader(struct _glapi_table *disp) {
+   return (_glptr_DeleteShader) (GET_by_offset(disp, _gloffset_DeleteShader));
 }
 
-static inline void
-SET_DeleteShader(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_DeleteShader, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_DetachShader)(GLuint, GLuint);
 #define CALL_DetachShader(disp, parameters) \
     (* GET_DetachShader(disp)) parameters
-static inline _glptr_DetachShader
-GET_DetachShader(struct _glapi_table *disp)
-{
-    return (_glptr_DetachShader) (GET_by_offset(disp, _gloffset_DetachShader));
+static INLINE _glptr_DetachShader GET_DetachShader(struct _glapi_table *disp) {
+   return (_glptr_DetachShader) (GET_by_offset(disp, _gloffset_DetachShader));
+}
+
+static INLINE void SET_DetachShader(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint)) {
+   SET_by_offset(disp, _gloffset_DetachShader, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_DisableVertexAttribArray)(GLuint);
+#define CALL_DisableVertexAttribArray(disp, parameters) \
+    (* GET_DisableVertexAttribArray(disp)) parameters
+static INLINE _glptr_DisableVertexAttribArray GET_DisableVertexAttribArray(struct _glapi_table *disp) {
+   return (_glptr_DisableVertexAttribArray) (GET_by_offset(disp, _gloffset_DisableVertexAttribArray));
+}
+
+static INLINE void SET_DisableVertexAttribArray(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) {
+   SET_by_offset(disp, _gloffset_DisableVertexAttribArray, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_DrawBuffers)(GLsizei, const GLenum *);
+#define CALL_DrawBuffers(disp, parameters) \
+    (* GET_DrawBuffers(disp)) parameters
+static INLINE _glptr_DrawBuffers GET_DrawBuffers(struct _glapi_table *disp) {
+   return (_glptr_DrawBuffers) (GET_by_offset(disp, _gloffset_DrawBuffers));
+}
+
+static INLINE void SET_DrawBuffers(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLenum *)) {
+   SET_by_offset(disp, _gloffset_DrawBuffers, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_EnableVertexAttribArray)(GLuint);
+#define CALL_EnableVertexAttribArray(disp, parameters) \
+    (* GET_EnableVertexAttribArray(disp)) parameters
+static INLINE _glptr_EnableVertexAttribArray GET_EnableVertexAttribArray(struct _glapi_table *disp) {
+   return (_glptr_EnableVertexAttribArray) (GET_by_offset(disp, _gloffset_EnableVertexAttribArray));
+}
+
+static INLINE void SET_EnableVertexAttribArray(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) {
+   SET_by_offset(disp, _gloffset_EnableVertexAttribArray, fn);
 }
 
-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_GetActiveAttrib)(GLuint, GLuint, GLsizei , GLsizei *, GLint *, GLenum *, GLchar *);
+#define CALL_GetActiveAttrib(disp, parameters) \
+    (* GET_GetActiveAttrib(disp)) parameters
+static INLINE _glptr_GetActiveAttrib GET_GetActiveAttrib(struct _glapi_table *disp) {
+   return (_glptr_GetActiveAttrib) (GET_by_offset(disp, _gloffset_GetActiveAttrib));
 }
 
-typedef void (GLAPIENTRYP _glptr_GetAttachedShaders) (GLuint, GLsizei,
-                                                      GLsizei *, GLuint *);
+static INLINE void SET_GetActiveAttrib(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLsizei , GLsizei *, GLint *, GLenum *, GLchar *)) {
+   SET_by_offset(disp, _gloffset_GetActiveAttrib, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetActiveUniform)(GLuint, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLchar *);
+#define CALL_GetActiveUniform(disp, parameters) \
+    (* GET_GetActiveUniform(disp)) parameters
+static INLINE _glptr_GetActiveUniform GET_GetActiveUniform(struct _glapi_table *disp) {
+   return (_glptr_GetActiveUniform) (GET_by_offset(disp, _gloffset_GetActiveUniform));
+}
+
+static INLINE void SET_GetActiveUniform(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLchar *)) {
+   SET_by_offset(disp, _gloffset_GetActiveUniform, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetAttachedShaders)(GLuint, GLsizei, GLsizei *, GLuint *);
 #define CALL_GetAttachedShaders(disp, parameters) \
     (* GET_GetAttachedShaders(disp)) parameters
-static inline _glptr_GetAttachedShaders
-GET_GetAttachedShaders(struct _glapi_table *disp)
-{
-    return (_glptr_GetAttachedShaders) (GET_by_offset
-                                        (disp, _gloffset_GetAttachedShaders));
+static INLINE _glptr_GetAttachedShaders GET_GetAttachedShaders(struct _glapi_table *disp) {
+   return (_glptr_GetAttachedShaders) (GET_by_offset(disp, _gloffset_GetAttachedShaders));
+}
+
+static INLINE void SET_GetAttachedShaders(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, GLsizei *, GLuint *)) {
+   SET_by_offset(disp, _gloffset_GetAttachedShaders, fn);
+}
+
+typedef GLint (GLAPIENTRYP _glptr_GetAttribLocation)(GLuint, const GLchar *);
+#define CALL_GetAttribLocation(disp, parameters) \
+    (* GET_GetAttribLocation(disp)) parameters
+static INLINE _glptr_GetAttribLocation GET_GetAttribLocation(struct _glapi_table *disp) {
+   return (_glptr_GetAttribLocation) (GET_by_offset(disp, _gloffset_GetAttribLocation));
 }
 
-static inline void
-SET_GetAttachedShaders(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, GLsizei, GLsizei *,
-                                              GLuint *))
-{
-    SET_by_offset(disp, _gloffset_GetAttachedShaders, fn);
+static INLINE void SET_GetAttribLocation(struct _glapi_table *disp, GLint (GLAPIENTRYP fn)(GLuint, const GLchar *)) {
+   SET_by_offset(disp, _gloffset_GetAttribLocation, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_GetProgramInfoLog) (GLuint, GLsizei, GLsizei *,
-                                                     GLchar *);
+typedef void (GLAPIENTRYP _glptr_GetProgramInfoLog)(GLuint, GLsizei, GLsizei *, GLchar *);
 #define CALL_GetProgramInfoLog(disp, parameters) \
     (* GET_GetProgramInfoLog(disp)) parameters
-static inline _glptr_GetProgramInfoLog
-GET_GetProgramInfoLog(struct _glapi_table *disp)
-{
-    return (_glptr_GetProgramInfoLog) (GET_by_offset
-                                       (disp, _gloffset_GetProgramInfoLog));
+static INLINE _glptr_GetProgramInfoLog GET_GetProgramInfoLog(struct _glapi_table *disp) {
+   return (_glptr_GetProgramInfoLog) (GET_by_offset(disp, _gloffset_GetProgramInfoLog));
 }
 
-static inline void
-SET_GetProgramInfoLog(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, GLsizei, GLsizei *,
-                                             GLchar *))
-{
-    SET_by_offset(disp, _gloffset_GetProgramInfoLog, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_GetProgramiv)(GLuint, GLenum, GLint *);
 #define CALL_GetProgramiv(disp, parameters) \
     (* GET_GetProgramiv(disp)) parameters
-static inline _glptr_GetProgramiv
-GET_GetProgramiv(struct _glapi_table *disp)
-{
-    return (_glptr_GetProgramiv) (GET_by_offset(disp, _gloffset_GetProgramiv));
+static INLINE _glptr_GetProgramiv GET_GetProgramiv(struct _glapi_table *disp) {
+   return (_glptr_GetProgramiv) (GET_by_offset(disp, _gloffset_GetProgramiv));
 }
 
-static inline void
-SET_GetProgramiv(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLuint, GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetProgramiv, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_GetShaderInfoLog)(GLuint, GLsizei, GLsizei *, GLchar *);
 #define CALL_GetShaderInfoLog(disp, parameters) \
     (* GET_GetShaderInfoLog(disp)) parameters
-static inline _glptr_GetShaderInfoLog
-GET_GetShaderInfoLog(struct _glapi_table *disp)
-{
-    return (_glptr_GetShaderInfoLog) (GET_by_offset
-                                      (disp, _gloffset_GetShaderInfoLog));
+static INLINE _glptr_GetShaderInfoLog GET_GetShaderInfoLog(struct _glapi_table *disp) {
+   return (_glptr_GetShaderInfoLog) (GET_by_offset(disp, _gloffset_GetShaderInfoLog));
 }
 
-static inline void
-SET_GetShaderInfoLog(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLuint, GLsizei, GLsizei *,
-                                            GLchar *))
-{
-    SET_by_offset(disp, _gloffset_GetShaderInfoLog, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_GetShaderSource)(GLuint, GLsizei, GLsizei *, GLchar *);
+#define CALL_GetShaderSource(disp, parameters) \
+    (* GET_GetShaderSource(disp)) parameters
+static INLINE _glptr_GetShaderSource GET_GetShaderSource(struct _glapi_table *disp) {
+   return (_glptr_GetShaderSource) (GET_by_offset(disp, _gloffset_GetShaderSource));
+}
+
+static INLINE void SET_GetShaderSource(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, GLsizei *, GLchar *)) {
+   SET_by_offset(disp, _gloffset_GetShaderSource, fn);
+}
 
+typedef void (GLAPIENTRYP _glptr_GetShaderiv)(GLuint, GLenum, GLint *);
 #define CALL_GetShaderiv(disp, parameters) \
     (* GET_GetShaderiv(disp)) parameters
-static inline _glptr_GetShaderiv
-GET_GetShaderiv(struct _glapi_table *disp)
-{
-    return (_glptr_GetShaderiv) (GET_by_offset(disp, _gloffset_GetShaderiv));
+static INLINE _glptr_GetShaderiv GET_GetShaderiv(struct _glapi_table *disp) {
+   return (_glptr_GetShaderiv) (GET_by_offset(disp, _gloffset_GetShaderiv));
+}
+
+static INLINE void SET_GetShaderiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint *)) {
+   SET_by_offset(disp, _gloffset_GetShaderiv, fn);
+}
+
+typedef GLint (GLAPIENTRYP _glptr_GetUniformLocation)(GLuint, const GLchar *);
+#define CALL_GetUniformLocation(disp, parameters) \
+    (* GET_GetUniformLocation(disp)) parameters
+static INLINE _glptr_GetUniformLocation GET_GetUniformLocation(struct _glapi_table *disp) {
+   return (_glptr_GetUniformLocation) (GET_by_offset(disp, _gloffset_GetUniformLocation));
+}
+
+static INLINE void SET_GetUniformLocation(struct _glapi_table *disp, GLint (GLAPIENTRYP fn)(GLuint, const GLchar *)) {
+   SET_by_offset(disp, _gloffset_GetUniformLocation, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetUniformfv)(GLuint, GLint, GLfloat *);
+#define CALL_GetUniformfv(disp, parameters) \
+    (* GET_GetUniformfv(disp)) parameters
+static INLINE _glptr_GetUniformfv GET_GetUniformfv(struct _glapi_table *disp) {
+   return (_glptr_GetUniformfv) (GET_by_offset(disp, _gloffset_GetUniformfv));
+}
+
+static INLINE void SET_GetUniformfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLfloat *)) {
+   SET_by_offset(disp, _gloffset_GetUniformfv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetUniformiv)(GLuint, GLint, GLint *);
+#define CALL_GetUniformiv(disp, parameters) \
+    (* GET_GetUniformiv(disp)) parameters
+static INLINE _glptr_GetUniformiv GET_GetUniformiv(struct _glapi_table *disp) {
+   return (_glptr_GetUniformiv) (GET_by_offset(disp, _gloffset_GetUniformiv));
+}
+
+static INLINE void SET_GetUniformiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLint *)) {
+   SET_by_offset(disp, _gloffset_GetUniformiv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetVertexAttribPointerv)(GLuint, GLenum, GLvoid **);
+#define CALL_GetVertexAttribPointerv(disp, parameters) \
+    (* GET_GetVertexAttribPointerv(disp)) parameters
+static INLINE _glptr_GetVertexAttribPointerv GET_GetVertexAttribPointerv(struct _glapi_table *disp) {
+   return (_glptr_GetVertexAttribPointerv) (GET_by_offset(disp, _gloffset_GetVertexAttribPointerv));
+}
+
+static INLINE void SET_GetVertexAttribPointerv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLvoid **)) {
+   SET_by_offset(disp, _gloffset_GetVertexAttribPointerv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetVertexAttribdv)(GLuint, GLenum, GLdouble *);
+#define CALL_GetVertexAttribdv(disp, parameters) \
+    (* GET_GetVertexAttribdv(disp)) parameters
+static INLINE _glptr_GetVertexAttribdv GET_GetVertexAttribdv(struct _glapi_table *disp) {
+   return (_glptr_GetVertexAttribdv) (GET_by_offset(disp, _gloffset_GetVertexAttribdv));
 }
 
-static inline void
-SET_GetShaderiv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLuint, GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetShaderiv, fn);
+static INLINE void SET_GetVertexAttribdv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLdouble *)) {
+   SET_by_offset(disp, _gloffset_GetVertexAttribdv, fn);
 }
 
-typedef GLboolean(GLAPIENTRYP _glptr_IsProgram) (GLuint);
+typedef void (GLAPIENTRYP _glptr_GetVertexAttribfv)(GLuint, GLenum, GLfloat *);
+#define CALL_GetVertexAttribfv(disp, parameters) \
+    (* GET_GetVertexAttribfv(disp)) parameters
+static INLINE _glptr_GetVertexAttribfv GET_GetVertexAttribfv(struct _glapi_table *disp) {
+   return (_glptr_GetVertexAttribfv) (GET_by_offset(disp, _gloffset_GetVertexAttribfv));
+}
+
+static INLINE void SET_GetVertexAttribfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLfloat *)) {
+   SET_by_offset(disp, _gloffset_GetVertexAttribfv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetVertexAttribiv)(GLuint, GLenum, GLint *);
+#define CALL_GetVertexAttribiv(disp, parameters) \
+    (* GET_GetVertexAttribiv(disp)) parameters
+static INLINE _glptr_GetVertexAttribiv GET_GetVertexAttribiv(struct _glapi_table *disp) {
+   return (_glptr_GetVertexAttribiv) (GET_by_offset(disp, _gloffset_GetVertexAttribiv));
+}
+
+static INLINE void SET_GetVertexAttribiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint *)) {
+   SET_by_offset(disp, _gloffset_GetVertexAttribiv, fn);
+}
 
+typedef GLboolean (GLAPIENTRYP _glptr_IsProgram)(GLuint);
 #define CALL_IsProgram(disp, parameters) \
     (* GET_IsProgram(disp)) parameters
-static inline _glptr_IsProgram
-GET_IsProgram(struct _glapi_table *disp)
-{
-    return (_glptr_IsProgram) (GET_by_offset(disp, _gloffset_IsProgram));
+static INLINE _glptr_IsProgram GET_IsProgram(struct _glapi_table *disp) {
+   return (_glptr_IsProgram) (GET_by_offset(disp, _gloffset_IsProgram));
 }
 
-static inline void
-SET_IsProgram(struct _glapi_table *disp, GLboolean(GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_IsProgram, fn);
+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);
-
+typedef GLboolean (GLAPIENTRYP _glptr_IsShader)(GLuint);
 #define CALL_IsShader(disp, parameters) \
     (* GET_IsShader(disp)) parameters
-static inline _glptr_IsShader
-GET_IsShader(struct _glapi_table *disp)
-{
-    return (_glptr_IsShader) (GET_by_offset(disp, _gloffset_IsShader));
+static INLINE _glptr_IsShader GET_IsShader(struct _glapi_table *disp) {
+   return (_glptr_IsShader) (GET_by_offset(disp, _gloffset_IsShader));
+}
+
+static INLINE void SET_IsShader(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLuint)) {
+   SET_by_offset(disp, _gloffset_IsShader, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_LinkProgram)(GLuint);
+#define CALL_LinkProgram(disp, parameters) \
+    (* GET_LinkProgram(disp)) parameters
+static INLINE _glptr_LinkProgram GET_LinkProgram(struct _glapi_table *disp) {
+   return (_glptr_LinkProgram) (GET_by_offset(disp, _gloffset_LinkProgram));
+}
+
+static INLINE void SET_LinkProgram(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) {
+   SET_by_offset(disp, _gloffset_LinkProgram, fn);
 }
 
-static inline void
-SET_IsShader(struct _glapi_table *disp, GLboolean(GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_IsShader, fn);
+typedef void (GLAPIENTRYP _glptr_ShaderSource)(GLuint, GLsizei, const GLchar * const *, const GLint *);
+#define CALL_ShaderSource(disp, parameters) \
+    (* GET_ShaderSource(disp)) parameters
+static INLINE _glptr_ShaderSource GET_ShaderSource(struct _glapi_table *disp) {
+   return (_glptr_ShaderSource) (GET_by_offset(disp, _gloffset_ShaderSource));
 }
 
-typedef void (GLAPIENTRYP _glptr_StencilFuncSeparate) (GLenum, GLenum, GLint,
-                                                       GLuint);
+static INLINE void SET_ShaderSource(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLchar * const *, const GLint *)) {
+   SET_by_offset(disp, _gloffset_ShaderSource, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_StencilFuncSeparate)(GLenum, GLenum, GLint, GLuint);
 #define CALL_StencilFuncSeparate(disp, parameters) \
     (* GET_StencilFuncSeparate(disp)) parameters
-static inline _glptr_StencilFuncSeparate
-GET_StencilFuncSeparate(struct _glapi_table *disp)
-{
-    return (_glptr_StencilFuncSeparate) (GET_by_offset
-                                         (disp, _gloffset_StencilFuncSeparate));
+static INLINE _glptr_StencilFuncSeparate GET_StencilFuncSeparate(struct _glapi_table *disp) {
+   return (_glptr_StencilFuncSeparate) (GET_by_offset(disp, _gloffset_StencilFuncSeparate));
 }
 
-static inline void
-SET_StencilFuncSeparate(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, GLenum, GLint, GLuint))
-{
-    SET_by_offset(disp, _gloffset_StencilFuncSeparate, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_StencilMaskSeparate)(GLenum, GLuint);
 #define CALL_StencilMaskSeparate(disp, parameters) \
     (* GET_StencilMaskSeparate(disp)) parameters
-static inline _glptr_StencilMaskSeparate
-GET_StencilMaskSeparate(struct _glapi_table *disp)
-{
-    return (_glptr_StencilMaskSeparate) (GET_by_offset
-                                         (disp, _gloffset_StencilMaskSeparate));
+static INLINE _glptr_StencilMaskSeparate GET_StencilMaskSeparate(struct _glapi_table *disp) {
+   return (_glptr_StencilMaskSeparate) (GET_by_offset(disp, _gloffset_StencilMaskSeparate));
 }
 
-static inline void
-SET_StencilMaskSeparate(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_StencilMaskSeparate, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_StencilOpSeparate)(GLenum, GLenum, GLenum, GLenum);
 #define CALL_StencilOpSeparate(disp, parameters) \
     (* GET_StencilOpSeparate(disp)) parameters
-static inline _glptr_StencilOpSeparate
-GET_StencilOpSeparate(struct _glapi_table *disp)
-{
-    return (_glptr_StencilOpSeparate) (GET_by_offset
-                                       (disp, _gloffset_StencilOpSeparate));
+static INLINE _glptr_StencilOpSeparate GET_StencilOpSeparate(struct _glapi_table *disp) {
+   return (_glptr_StencilOpSeparate) (GET_by_offset(disp, _gloffset_StencilOpSeparate));
 }
 
-static inline void
-SET_StencilOpSeparate(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLenum, GLenum, GLenum, GLenum))
-{
-    SET_by_offset(disp, _gloffset_StencilOpSeparate, fn);
+static INLINE void SET_StencilOpSeparate(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLenum)) {
+   SET_by_offset(disp, _gloffset_StencilOpSeparate, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_UniformMatrix2x3fv) (GLint, GLsizei, GLboolean,
-                                                      const GLfloat *);
-#define CALL_UniformMatrix2x3fv(disp, parameters) \
-    (* GET_UniformMatrix2x3fv(disp)) parameters
-static inline _glptr_UniformMatrix2x3fv
-GET_UniformMatrix2x3fv(struct _glapi_table *disp)
-{
-    return (_glptr_UniformMatrix2x3fv) (GET_by_offset
-                                        (disp, _gloffset_UniformMatrix2x3fv));
+typedef void (GLAPIENTRYP _glptr_Uniform1f)(GLint, GLfloat);
+#define CALL_Uniform1f(disp, parameters) \
+    (* GET_Uniform1f(disp)) parameters
+static INLINE _glptr_Uniform1f GET_Uniform1f(struct _glapi_table *disp) {
+   return (_glptr_Uniform1f) (GET_by_offset(disp, _gloffset_Uniform1f));
 }
 
-static inline void
-SET_UniformMatrix2x3fv(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLint, GLsizei, GLboolean,
-                                              const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_UniformMatrix2x3fv, fn);
+static INLINE void SET_Uniform1f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLfloat)) {
+   SET_by_offset(disp, _gloffset_Uniform1f, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_UniformMatrix2x4fv) (GLint, GLsizei, GLboolean,
-                                                      const GLfloat *);
-#define CALL_UniformMatrix2x4fv(disp, parameters) \
-    (* GET_UniformMatrix2x4fv(disp)) parameters
-static inline _glptr_UniformMatrix2x4fv
-GET_UniformMatrix2x4fv(struct _glapi_table *disp)
-{
-    return (_glptr_UniformMatrix2x4fv) (GET_by_offset
-                                        (disp, _gloffset_UniformMatrix2x4fv));
+typedef void (GLAPIENTRYP _glptr_Uniform1fv)(GLint, GLsizei, const GLfloat *);
+#define CALL_Uniform1fv(disp, parameters) \
+    (* GET_Uniform1fv(disp)) parameters
+static INLINE _glptr_Uniform1fv GET_Uniform1fv(struct _glapi_table *disp) {
+   return (_glptr_Uniform1fv) (GET_by_offset(disp, _gloffset_Uniform1fv));
 }
 
-static inline void
-SET_UniformMatrix2x4fv(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLint, GLsizei, GLboolean,
-                                              const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_UniformMatrix2x4fv, fn);
+static INLINE void SET_Uniform1fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, const GLfloat *)) {
+   SET_by_offset(disp, _gloffset_Uniform1fv, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_UniformMatrix3x2fv) (GLint, GLsizei, GLboolean,
-                                                      const GLfloat *);
-#define CALL_UniformMatrix3x2fv(disp, parameters) \
-    (* GET_UniformMatrix3x2fv(disp)) parameters
-static inline _glptr_UniformMatrix3x2fv
-GET_UniformMatrix3x2fv(struct _glapi_table *disp)
-{
-    return (_glptr_UniformMatrix3x2fv) (GET_by_offset
-                                        (disp, _gloffset_UniformMatrix3x2fv));
+typedef void (GLAPIENTRYP _glptr_Uniform1i)(GLint, GLint);
+#define CALL_Uniform1i(disp, parameters) \
+    (* GET_Uniform1i(disp)) parameters
+static INLINE _glptr_Uniform1i GET_Uniform1i(struct _glapi_table *disp) {
+   return (_glptr_Uniform1i) (GET_by_offset(disp, _gloffset_Uniform1i));
 }
 
-static inline void
-SET_UniformMatrix3x2fv(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLint, GLsizei, GLboolean,
-                                              const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_UniformMatrix3x2fv, fn);
+static INLINE void SET_Uniform1i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint)) {
+   SET_by_offset(disp, _gloffset_Uniform1i, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_UniformMatrix3x4fv) (GLint, GLsizei, GLboolean,
-                                                      const GLfloat *);
-#define CALL_UniformMatrix3x4fv(disp, parameters) \
-    (* GET_UniformMatrix3x4fv(disp)) parameters
-static inline _glptr_UniformMatrix3x4fv
-GET_UniformMatrix3x4fv(struct _glapi_table *disp)
-{
-    return (_glptr_UniformMatrix3x4fv) (GET_by_offset
-                                        (disp, _gloffset_UniformMatrix3x4fv));
+typedef void (GLAPIENTRYP _glptr_Uniform1iv)(GLint, GLsizei, const GLint *);
+#define CALL_Uniform1iv(disp, parameters) \
+    (* GET_Uniform1iv(disp)) parameters
+static INLINE _glptr_Uniform1iv GET_Uniform1iv(struct _glapi_table *disp) {
+   return (_glptr_Uniform1iv) (GET_by_offset(disp, _gloffset_Uniform1iv));
 }
 
-static inline void
-SET_UniformMatrix3x4fv(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLint, GLsizei, GLboolean,
-                                              const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_UniformMatrix3x4fv, fn);
+static INLINE void SET_Uniform1iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, const GLint *)) {
+   SET_by_offset(disp, _gloffset_Uniform1iv, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_UniformMatrix4x2fv) (GLint, GLsizei, GLboolean,
-                                                      const GLfloat *);
-#define CALL_UniformMatrix4x2fv(disp, parameters) \
-    (* GET_UniformMatrix4x2fv(disp)) parameters
-static inline _glptr_UniformMatrix4x2fv
-GET_UniformMatrix4x2fv(struct _glapi_table *disp)
-{
-    return (_glptr_UniformMatrix4x2fv) (GET_by_offset
-                                        (disp, _gloffset_UniformMatrix4x2fv));
+typedef void (GLAPIENTRYP _glptr_Uniform2f)(GLint, GLfloat, GLfloat);
+#define CALL_Uniform2f(disp, parameters) \
+    (* GET_Uniform2f(disp)) parameters
+static INLINE _glptr_Uniform2f GET_Uniform2f(struct _glapi_table *disp) {
+   return (_glptr_Uniform2f) (GET_by_offset(disp, _gloffset_Uniform2f));
 }
 
-static inline void
-SET_UniformMatrix4x2fv(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLint, GLsizei, GLboolean,
-                                              const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_UniformMatrix4x2fv, fn);
+static INLINE void SET_Uniform2f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLfloat, GLfloat)) {
+   SET_by_offset(disp, _gloffset_Uniform2f, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_UniformMatrix4x3fv) (GLint, GLsizei, GLboolean,
-                                                      const GLfloat *);
-#define CALL_UniformMatrix4x3fv(disp, parameters) \
-    (* GET_UniformMatrix4x3fv(disp)) parameters
-static inline _glptr_UniformMatrix4x3fv
-GET_UniformMatrix4x3fv(struct _glapi_table *disp)
-{
-    return (_glptr_UniformMatrix4x3fv) (GET_by_offset
-                                        (disp, _gloffset_UniformMatrix4x3fv));
+typedef void (GLAPIENTRYP _glptr_Uniform2fv)(GLint, GLsizei, const GLfloat *);
+#define CALL_Uniform2fv(disp, parameters) \
+    (* GET_Uniform2fv(disp)) parameters
+static INLINE _glptr_Uniform2fv GET_Uniform2fv(struct _glapi_table *disp) {
+   return (_glptr_Uniform2fv) (GET_by_offset(disp, _gloffset_Uniform2fv));
 }
 
-static inline void
-SET_UniformMatrix4x3fv(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLint, GLsizei, GLboolean,
-                                              const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_UniformMatrix4x3fv, fn);
+static INLINE void SET_Uniform2fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, const GLfloat *)) {
+   SET_by_offset(disp, _gloffset_Uniform2fv, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_ClampColor) (GLenum, GLenum);
+typedef void (GLAPIENTRYP _glptr_Uniform2i)(GLint, GLint, GLint);
+#define CALL_Uniform2i(disp, parameters) \
+    (* GET_Uniform2i(disp)) parameters
+static INLINE _glptr_Uniform2i GET_Uniform2i(struct _glapi_table *disp) {
+   return (_glptr_Uniform2i) (GET_by_offset(disp, _gloffset_Uniform2i));
+}
 
-#define CALL_ClampColor(disp, parameters) \
-    (* GET_ClampColor(disp)) parameters
-static inline _glptr_ClampColor
-GET_ClampColor(struct _glapi_table *disp)
-{
-    return (_glptr_ClampColor) (GET_by_offset(disp, _gloffset_ClampColor));
+static INLINE void SET_Uniform2i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint)) {
+   SET_by_offset(disp, _gloffset_Uniform2i, fn);
 }
 
-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_Uniform2iv)(GLint, GLsizei, const GLint *);
+#define CALL_Uniform2iv(disp, parameters) \
+    (* GET_Uniform2iv(disp)) parameters
+static INLINE _glptr_Uniform2iv GET_Uniform2iv(struct _glapi_table *disp) {
+   return (_glptr_Uniform2iv) (GET_by_offset(disp, _gloffset_Uniform2iv));
 }
 
-typedef void (GLAPIENTRYP _glptr_ClearBufferfi) (GLenum, GLint, GLfloat, GLint);
+static INLINE void SET_Uniform2iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, const GLint *)) {
+   SET_by_offset(disp, _gloffset_Uniform2iv, fn);
+}
 
-#define CALL_ClearBufferfi(disp, parameters) \
-    (* GET_ClearBufferfi(disp)) parameters
-static inline _glptr_ClearBufferfi
-GET_ClearBufferfi(struct _glapi_table *disp)
-{
-    return (_glptr_ClearBufferfi) (GET_by_offset
-                                   (disp, _gloffset_ClearBufferfi));
+typedef void (GLAPIENTRYP _glptr_Uniform3f)(GLint, GLfloat, GLfloat, GLfloat);
+#define CALL_Uniform3f(disp, parameters) \
+    (* GET_Uniform3f(disp)) parameters
+static INLINE _glptr_Uniform3f GET_Uniform3f(struct _glapi_table *disp) {
+   return (_glptr_Uniform3f) (GET_by_offset(disp, _gloffset_Uniform3f));
 }
 
-static inline void
-SET_ClearBufferfi(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, GLint, GLfloat, GLint))
-{
-    SET_by_offset(disp, _gloffset_ClearBufferfi, fn);
+static INLINE void SET_Uniform3f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLfloat, GLfloat, GLfloat)) {
+   SET_by_offset(disp, _gloffset_Uniform3f, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_ClearBufferfv) (GLenum, GLint,
-                                                 const GLfloat *);
-#define CALL_ClearBufferfv(disp, parameters) \
-    (* GET_ClearBufferfv(disp)) parameters
-static inline _glptr_ClearBufferfv
-GET_ClearBufferfv(struct _glapi_table *disp)
-{
-    return (_glptr_ClearBufferfv) (GET_by_offset
-                                   (disp, _gloffset_ClearBufferfv));
+typedef void (GLAPIENTRYP _glptr_Uniform3fv)(GLint, GLsizei, const GLfloat *);
+#define CALL_Uniform3fv(disp, parameters) \
+    (* GET_Uniform3fv(disp)) parameters
+static INLINE _glptr_Uniform3fv GET_Uniform3fv(struct _glapi_table *disp) {
+   return (_glptr_Uniform3fv) (GET_by_offset(disp, _gloffset_Uniform3fv));
 }
 
-static inline void
-SET_ClearBufferfv(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, GLint, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_ClearBufferfv, fn);
+static INLINE void SET_Uniform3fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, const GLfloat *)) {
+   SET_by_offset(disp, _gloffset_Uniform3fv, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_ClearBufferiv) (GLenum, GLint, const GLint *);
+typedef void (GLAPIENTRYP _glptr_Uniform3i)(GLint, GLint, GLint, GLint);
+#define CALL_Uniform3i(disp, parameters) \
+    (* GET_Uniform3i(disp)) parameters
+static INLINE _glptr_Uniform3i GET_Uniform3i(struct _glapi_table *disp) {
+   return (_glptr_Uniform3i) (GET_by_offset(disp, _gloffset_Uniform3i));
+}
 
-#define CALL_ClearBufferiv(disp, parameters) \
-    (* GET_ClearBufferiv(disp)) parameters
-static inline _glptr_ClearBufferiv
-GET_ClearBufferiv(struct _glapi_table *disp)
-{
-    return (_glptr_ClearBufferiv) (GET_by_offset
-                                   (disp, _gloffset_ClearBufferiv));
+static INLINE void SET_Uniform3i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint, GLint)) {
+   SET_by_offset(disp, _gloffset_Uniform3i, fn);
 }
 
-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_Uniform3iv)(GLint, GLsizei, const GLint *);
+#define CALL_Uniform3iv(disp, parameters) \
+    (* GET_Uniform3iv(disp)) parameters
+static INLINE _glptr_Uniform3iv GET_Uniform3iv(struct _glapi_table *disp) {
+   return (_glptr_Uniform3iv) (GET_by_offset(disp, _gloffset_Uniform3iv));
 }
 
-typedef void (GLAPIENTRYP _glptr_ClearBufferuiv) (GLenum, GLint,
-                                                  const GLuint *);
-#define CALL_ClearBufferuiv(disp, parameters) \
-    (* GET_ClearBufferuiv(disp)) parameters
-static inline _glptr_ClearBufferuiv
-GET_ClearBufferuiv(struct _glapi_table *disp)
-{
-    return (_glptr_ClearBufferuiv) (GET_by_offset
-                                    (disp, _gloffset_ClearBufferuiv));
+static INLINE void SET_Uniform3iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, const GLint *)) {
+   SET_by_offset(disp, _gloffset_Uniform3iv, fn);
 }
 
-static inline void
-SET_ClearBufferuiv(struct _glapi_table *disp,
-                   void (GLAPIENTRYP fn) (GLenum, GLint, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_ClearBufferuiv, fn);
+typedef void (GLAPIENTRYP _glptr_Uniform4f)(GLint, GLfloat, GLfloat, GLfloat, GLfloat);
+#define CALL_Uniform4f(disp, parameters) \
+    (* GET_Uniform4f(disp)) parameters
+static INLINE _glptr_Uniform4f GET_Uniform4f(struct _glapi_table *disp) {
+   return (_glptr_Uniform4f) (GET_by_offset(disp, _gloffset_Uniform4f));
 }
 
-typedef const GLubyte *(GLAPIENTRYP _glptr_GetStringi) (GLenum, GLuint);
+static INLINE void SET_Uniform4f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLfloat, GLfloat, GLfloat, GLfloat)) {
+   SET_by_offset(disp, _gloffset_Uniform4f, fn);
+}
 
-#define CALL_GetStringi(disp, parameters) \
-    (* GET_GetStringi(disp)) parameters
-static inline _glptr_GetStringi
-GET_GetStringi(struct _glapi_table *disp)
-{
-    return (_glptr_GetStringi) (GET_by_offset(disp, _gloffset_GetStringi));
+typedef void (GLAPIENTRYP _glptr_Uniform4fv)(GLint, GLsizei, const GLfloat *);
+#define CALL_Uniform4fv(disp, parameters) \
+    (* GET_Uniform4fv(disp)) parameters
+static INLINE _glptr_Uniform4fv GET_Uniform4fv(struct _glapi_table *disp) {
+   return (_glptr_Uniform4fv) (GET_by_offset(disp, _gloffset_Uniform4fv));
 }
 
-static inline void
-SET_GetStringi(struct _glapi_table *disp,
-               const GLubyte * (GLAPIENTRYP fn) (GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_GetStringi, fn);
+static INLINE void SET_Uniform4fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, const GLfloat *)) {
+   SET_by_offset(disp, _gloffset_Uniform4fv, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_TexBuffer) (GLenum, GLenum, GLuint);
+typedef void (GLAPIENTRYP _glptr_Uniform4i)(GLint, GLint, GLint, GLint, GLint);
+#define CALL_Uniform4i(disp, parameters) \
+    (* GET_Uniform4i(disp)) parameters
+static INLINE _glptr_Uniform4i GET_Uniform4i(struct _glapi_table *disp) {
+   return (_glptr_Uniform4i) (GET_by_offset(disp, _gloffset_Uniform4i));
+}
 
-#define CALL_TexBuffer(disp, parameters) \
-    (* GET_TexBuffer(disp)) parameters
-static inline _glptr_TexBuffer
-GET_TexBuffer(struct _glapi_table *disp)
-{
-    return (_glptr_TexBuffer) (GET_by_offset(disp, _gloffset_TexBuffer));
+static INLINE void SET_Uniform4i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint, GLint, GLint)) {
+   SET_by_offset(disp, _gloffset_Uniform4i, fn);
 }
 
-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_Uniform4iv)(GLint, GLsizei, const GLint *);
+#define CALL_Uniform4iv(disp, parameters) \
+    (* GET_Uniform4iv(disp)) parameters
+static INLINE _glptr_Uniform4iv GET_Uniform4iv(struct _glapi_table *disp) {
+   return (_glptr_Uniform4iv) (GET_by_offset(disp, _gloffset_Uniform4iv));
 }
 
-typedef void (GLAPIENTRYP _glptr_FramebufferTexture) (GLenum, GLenum, GLuint,
-                                                      GLint);
-#define CALL_FramebufferTexture(disp, parameters) \
-    (* GET_FramebufferTexture(disp)) parameters
-static inline _glptr_FramebufferTexture
-GET_FramebufferTexture(struct _glapi_table *disp)
-{
-    return (_glptr_FramebufferTexture) (GET_by_offset
-                                        (disp, _gloffset_FramebufferTexture));
+static INLINE void SET_Uniform4iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, const GLint *)) {
+   SET_by_offset(disp, _gloffset_Uniform4iv, fn);
 }
 
-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_UniformMatrix2fv)(GLint, GLsizei, GLboolean, const GLfloat *);
+#define CALL_UniformMatrix2fv(disp, parameters) \
+    (* GET_UniformMatrix2fv(disp)) parameters
+static INLINE _glptr_UniformMatrix2fv GET_UniformMatrix2fv(struct _glapi_table *disp) {
+   return (_glptr_UniformMatrix2fv) (GET_by_offset(disp, _gloffset_UniformMatrix2fv));
 }
 
-typedef void (GLAPIENTRYP _glptr_GetBufferParameteri64v) (GLenum, GLenum,
-                                                          GLint64 *);
-#define CALL_GetBufferParameteri64v(disp, parameters) \
-    (* GET_GetBufferParameteri64v(disp)) parameters
-static inline _glptr_GetBufferParameteri64v
-GET_GetBufferParameteri64v(struct _glapi_table *disp)
-{
-    return (_glptr_GetBufferParameteri64v) (GET_by_offset
-                                            (disp,
-                                             _gloffset_GetBufferParameteri64v));
+static INLINE void SET_UniformMatrix2fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, GLboolean, const GLfloat *)) {
+   SET_by_offset(disp, _gloffset_UniformMatrix2fv, fn);
 }
 
-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_UniformMatrix3fv)(GLint, GLsizei, GLboolean, const GLfloat *);
+#define CALL_UniformMatrix3fv(disp, parameters) \
+    (* GET_UniformMatrix3fv(disp)) parameters
+static INLINE _glptr_UniformMatrix3fv GET_UniformMatrix3fv(struct _glapi_table *disp) {
+   return (_glptr_UniformMatrix3fv) (GET_by_offset(disp, _gloffset_UniformMatrix3fv));
 }
 
-typedef void (GLAPIENTRYP _glptr_GetInteger64i_v) (GLenum, GLuint, GLint64 *);
+static INLINE void SET_UniformMatrix3fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, GLboolean, const GLfloat *)) {
+   SET_by_offset(disp, _gloffset_UniformMatrix3fv, fn);
+}
 
-#define CALL_GetInteger64i_v(disp, parameters) \
-    (* GET_GetInteger64i_v(disp)) parameters
-static inline _glptr_GetInteger64i_v
-GET_GetInteger64i_v(struct _glapi_table *disp)
-{
-    return (_glptr_GetInteger64i_v) (GET_by_offset
-                                     (disp, _gloffset_GetInteger64i_v));
+typedef void (GLAPIENTRYP _glptr_UniformMatrix4fv)(GLint, GLsizei, GLboolean, const GLfloat *);
+#define CALL_UniformMatrix4fv(disp, parameters) \
+    (* GET_UniformMatrix4fv(disp)) parameters
+static INLINE _glptr_UniformMatrix4fv GET_UniformMatrix4fv(struct _glapi_table *disp) {
+   return (_glptr_UniformMatrix4fv) (GET_by_offset(disp, _gloffset_UniformMatrix4fv));
 }
 
-static inline void
-SET_GetInteger64i_v(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLenum, GLuint, GLint64 *))
-{
-    SET_by_offset(disp, _gloffset_GetInteger64i_v, fn);
+static INLINE void SET_UniformMatrix4fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, GLboolean, const GLfloat *)) {
+   SET_by_offset(disp, _gloffset_UniformMatrix4fv, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_VertexAttribDivisor) (GLuint, GLuint);
+typedef void (GLAPIENTRYP _glptr_UseProgram)(GLuint);
+#define CALL_UseProgram(disp, parameters) \
+    (* GET_UseProgram(disp)) parameters
+static INLINE _glptr_UseProgram GET_UseProgram(struct _glapi_table *disp) {
+   return (_glptr_UseProgram) (GET_by_offset(disp, _gloffset_UseProgram));
+}
 
-#define CALL_VertexAttribDivisor(disp, parameters) \
-    (* GET_VertexAttribDivisor(disp)) parameters
-static inline _glptr_VertexAttribDivisor
-GET_VertexAttribDivisor(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribDivisor) (GET_by_offset
-                                         (disp, _gloffset_VertexAttribDivisor));
+static INLINE void SET_UseProgram(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) {
+   SET_by_offset(disp, _gloffset_UseProgram, fn);
 }
 
-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_ValidateProgram)(GLuint);
+#define CALL_ValidateProgram(disp, parameters) \
+    (* GET_ValidateProgram(disp)) parameters
+static INLINE _glptr_ValidateProgram GET_ValidateProgram(struct _glapi_table *disp) {
+   return (_glptr_ValidateProgram) (GET_by_offset(disp, _gloffset_ValidateProgram));
 }
 
-typedef void (GLAPIENTRYP _glptr_LoadTransposeMatrixdARB) (const GLdouble *);
+static INLINE void SET_ValidateProgram(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) {
+   SET_by_offset(disp, _gloffset_ValidateProgram, fn);
+}
 
-#define CALL_LoadTransposeMatrixdARB(disp, parameters) \
-    (* GET_LoadTransposeMatrixdARB(disp)) parameters
-static inline _glptr_LoadTransposeMatrixdARB
-GET_LoadTransposeMatrixdARB(struct _glapi_table *disp)
-{
-    return (_glptr_LoadTransposeMatrixdARB) (GET_by_offset
-                                             (disp,
-                                              _gloffset_LoadTransposeMatrixdARB));
+typedef void (GLAPIENTRYP _glptr_VertexAttrib1d)(GLuint, GLdouble);
+#define CALL_VertexAttrib1d(disp, parameters) \
+    (* GET_VertexAttrib1d(disp)) parameters
+static INLINE _glptr_VertexAttrib1d GET_VertexAttrib1d(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib1d) (GET_by_offset(disp, _gloffset_VertexAttrib1d));
 }
 
-static inline void
-SET_LoadTransposeMatrixdARB(struct _glapi_table *disp,
-                            void (GLAPIENTRYP fn) (const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_LoadTransposeMatrixdARB, fn);
+static INLINE void SET_VertexAttrib1d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLdouble)) {
+   SET_by_offset(disp, _gloffset_VertexAttrib1d, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_LoadTransposeMatrixfARB) (const GLfloat *);
+typedef void (GLAPIENTRYP _glptr_VertexAttrib1dv)(GLuint, const GLdouble *);
+#define CALL_VertexAttrib1dv(disp, parameters) \
+    (* GET_VertexAttrib1dv(disp)) parameters
+static INLINE _glptr_VertexAttrib1dv GET_VertexAttrib1dv(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib1dv) (GET_by_offset(disp, _gloffset_VertexAttrib1dv));
+}
 
-#define CALL_LoadTransposeMatrixfARB(disp, parameters) \
-    (* GET_LoadTransposeMatrixfARB(disp)) parameters
-static inline _glptr_LoadTransposeMatrixfARB
-GET_LoadTransposeMatrixfARB(struct _glapi_table *disp)
-{
-    return (_glptr_LoadTransposeMatrixfARB) (GET_by_offset
-                                             (disp,
-                                              _gloffset_LoadTransposeMatrixfARB));
-}
-
-static inline void
-SET_LoadTransposeMatrixfARB(struct _glapi_table *disp,
-                            void (GLAPIENTRYP fn) (const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_LoadTransposeMatrixfARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultTransposeMatrixdARB) (const GLdouble *);
-
-#define CALL_MultTransposeMatrixdARB(disp, parameters) \
-    (* GET_MultTransposeMatrixdARB(disp)) parameters
-static inline _glptr_MultTransposeMatrixdARB
-GET_MultTransposeMatrixdARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultTransposeMatrixdARB) (GET_by_offset
-                                             (disp,
-                                              _gloffset_MultTransposeMatrixdARB));
-}
-
-static inline void
-SET_MultTransposeMatrixdARB(struct _glapi_table *disp,
-                            void (GLAPIENTRYP fn) (const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_MultTransposeMatrixdARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultTransposeMatrixfARB) (const GLfloat *);
-
-#define CALL_MultTransposeMatrixfARB(disp, parameters) \
-    (* GET_MultTransposeMatrixfARB(disp)) parameters
-static inline _glptr_MultTransposeMatrixfARB
-GET_MultTransposeMatrixfARB(struct _glapi_table *disp)
-{
-    return (_glptr_MultTransposeMatrixfARB) (GET_by_offset
-                                             (disp,
-                                              _gloffset_MultTransposeMatrixfARB));
-}
-
-static inline void
-SET_MultTransposeMatrixfARB(struct _glapi_table *disp,
-                            void (GLAPIENTRYP fn) (const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_MultTransposeMatrixfARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_SampleCoverageARB) (GLclampf, GLboolean);
-
-#define CALL_SampleCoverageARB(disp, parameters) \
-    (* GET_SampleCoverageARB(disp)) parameters
-static inline _glptr_SampleCoverageARB
-GET_SampleCoverageARB(struct _glapi_table *disp)
-{
-    return (_glptr_SampleCoverageARB) (GET_by_offset
-                                       (disp, _gloffset_SampleCoverageARB));
-}
-
-static inline void
-SET_SampleCoverageARB(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLclampf, GLboolean))
-{
-    SET_by_offset(disp, _gloffset_SampleCoverageARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_CompressedTexImage1DARB) (GLenum, GLint,
-                                                           GLenum, GLsizei,
-                                                           GLint, GLsizei,
-                                                           const GLvoid *);
-#define CALL_CompressedTexImage1DARB(disp, parameters) \
-    (* GET_CompressedTexImage1DARB(disp)) parameters
-static inline _glptr_CompressedTexImage1DARB
-GET_CompressedTexImage1DARB(struct _glapi_table *disp)
-{
-    return (_glptr_CompressedTexImage1DARB) (GET_by_offset
-                                             (disp,
-                                              _gloffset_CompressedTexImage1DARB));
-}
-
-static inline void
-SET_CompressedTexImage1DARB(struct _glapi_table *disp,
-                            void (GLAPIENTRYP fn) (GLenum, GLint, GLenum,
-                                                   GLsizei, GLint, GLsizei,
-                                                   const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_CompressedTexImage1DARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_CompressedTexImage2DARB) (GLenum, GLint,
-                                                           GLenum, GLsizei,
-                                                           GLsizei, GLint,
-                                                           GLsizei,
-                                                           const GLvoid *);
-#define CALL_CompressedTexImage2DARB(disp, parameters) \
-    (* GET_CompressedTexImage2DARB(disp)) parameters
-static inline _glptr_CompressedTexImage2DARB
-GET_CompressedTexImage2DARB(struct _glapi_table *disp)
-{
-    return (_glptr_CompressedTexImage2DARB) (GET_by_offset
-                                             (disp,
-                                              _gloffset_CompressedTexImage2DARB));
-}
-
-static inline void
-SET_CompressedTexImage2DARB(struct _glapi_table *disp,
-                            void (GLAPIENTRYP fn) (GLenum, GLint, GLenum,
-                                                   GLsizei, GLsizei, GLint,
-                                                   GLsizei, const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_CompressedTexImage2DARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_CompressedTexImage3DARB) (GLenum, GLint,
-                                                           GLenum, GLsizei,
-                                                           GLsizei, GLsizei,
-                                                           GLint, GLsizei,
-                                                           const GLvoid *);
-#define CALL_CompressedTexImage3DARB(disp, parameters) \
-    (* GET_CompressedTexImage3DARB(disp)) parameters
-static inline _glptr_CompressedTexImage3DARB
-GET_CompressedTexImage3DARB(struct _glapi_table *disp)
-{
-    return (_glptr_CompressedTexImage3DARB) (GET_by_offset
-                                             (disp,
-                                              _gloffset_CompressedTexImage3DARB));
-}
-
-static inline void
-SET_CompressedTexImage3DARB(struct _glapi_table *disp,
-                            void (GLAPIENTRYP fn) (GLenum, GLint, GLenum,
-                                                   GLsizei, GLsizei, GLsizei,
-                                                   GLint, GLsizei,
-                                                   const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_CompressedTexImage3DARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_CompressedTexSubImage1DARB) (GLenum, GLint,
-                                                              GLint, GLsizei,
-                                                              GLenum, GLsizei,
-                                                              const GLvoid *);
-#define CALL_CompressedTexSubImage1DARB(disp, parameters) \
-    (* GET_CompressedTexSubImage1DARB(disp)) parameters
-static inline _glptr_CompressedTexSubImage1DARB
-GET_CompressedTexSubImage1DARB(struct _glapi_table *disp)
-{
-    return (_glptr_CompressedTexSubImage1DARB) (GET_by_offset
-                                                (disp,
-                                                 _gloffset_CompressedTexSubImage1DARB));
-}
-
-static inline void
-SET_CompressedTexSubImage1DARB(struct _glapi_table *disp,
-                               void (GLAPIENTRYP fn) (GLenum, GLint, GLint,
-                                                      GLsizei, GLenum, GLsizei,
-                                                      const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_CompressedTexSubImage1DARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_CompressedTexSubImage2DARB) (GLenum, GLint,
-                                                              GLint, GLint,
-                                                              GLsizei, GLsizei,
-                                                              GLenum, GLsizei,
-                                                              const GLvoid *);
-#define CALL_CompressedTexSubImage2DARB(disp, parameters) \
-    (* GET_CompressedTexSubImage2DARB(disp)) parameters
-static inline _glptr_CompressedTexSubImage2DARB
-GET_CompressedTexSubImage2DARB(struct _glapi_table *disp)
-{
-    return (_glptr_CompressedTexSubImage2DARB) (GET_by_offset
-                                                (disp,
-                                                 _gloffset_CompressedTexSubImage2DARB));
-}
-
-static inline void
-SET_CompressedTexSubImage2DARB(struct _glapi_table *disp,
-                               void (GLAPIENTRYP fn) (GLenum, GLint, GLint,
-                                                      GLint, GLsizei, GLsizei,
-                                                      GLenum, GLsizei,
-                                                      const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_CompressedTexSubImage2DARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_CompressedTexSubImage3DARB) (GLenum, GLint,
-                                                              GLint, GLint,
-                                                              GLint, GLsizei,
-                                                              GLsizei, GLsizei,
-                                                              GLenum, GLsizei,
-                                                              const GLvoid *);
-#define CALL_CompressedTexSubImage3DARB(disp, parameters) \
-    (* GET_CompressedTexSubImage3DARB(disp)) parameters
-static inline _glptr_CompressedTexSubImage3DARB
-GET_CompressedTexSubImage3DARB(struct _glapi_table *disp)
-{
-    return (_glptr_CompressedTexSubImage3DARB) (GET_by_offset
-                                                (disp,
-                                                 _gloffset_CompressedTexSubImage3DARB));
-}
-
-static inline void
-SET_CompressedTexSubImage3DARB(struct _glapi_table *disp,
-                               void (GLAPIENTRYP fn) (GLenum, GLint, GLint,
-                                                      GLint, GLint, GLsizei,
-                                                      GLsizei, GLsizei, GLenum,
-                                                      GLsizei, const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_CompressedTexSubImage3DARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetCompressedTexImageARB) (GLenum, GLint,
-                                                            GLvoid *);
-#define CALL_GetCompressedTexImageARB(disp, parameters) \
-    (* GET_GetCompressedTexImageARB(disp)) parameters
-static inline _glptr_GetCompressedTexImageARB
-GET_GetCompressedTexImageARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetCompressedTexImageARB) (GET_by_offset
-                                              (disp,
-                                               _gloffset_GetCompressedTexImageARB));
-}
-
-static inline void
-SET_GetCompressedTexImageARB(struct _glapi_table *disp,
-                             void (GLAPIENTRYP fn) (GLenum, GLint, GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_GetCompressedTexImageARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_DisableVertexAttribArrayARB) (GLuint);
-
-#define CALL_DisableVertexAttribArrayARB(disp, parameters) \
-    (* GET_DisableVertexAttribArrayARB(disp)) parameters
-static inline _glptr_DisableVertexAttribArrayARB
-GET_DisableVertexAttribArrayARB(struct _glapi_table *disp)
-{
-    return (_glptr_DisableVertexAttribArrayARB) (GET_by_offset
-                                                 (disp,
-                                                  _gloffset_DisableVertexAttribArrayARB));
-}
-
-static inline void
-SET_DisableVertexAttribArrayARB(struct _glapi_table *disp,
-                                void (GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_DisableVertexAttribArrayARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_EnableVertexAttribArrayARB) (GLuint);
-
-#define CALL_EnableVertexAttribArrayARB(disp, parameters) \
-    (* GET_EnableVertexAttribArrayARB(disp)) parameters
-static inline _glptr_EnableVertexAttribArrayARB
-GET_EnableVertexAttribArrayARB(struct _glapi_table *disp)
-{
-    return (_glptr_EnableVertexAttribArrayARB) (GET_by_offset
-                                                (disp,
-                                                 _gloffset_EnableVertexAttribArrayARB));
-}
-
-static inline void
-SET_EnableVertexAttribArrayARB(struct _glapi_table *disp,
-                               void (GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_EnableVertexAttribArrayARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetProgramEnvParameterdvARB) (GLenum, GLuint,
-                                                               GLdouble *);
-#define CALL_GetProgramEnvParameterdvARB(disp, parameters) \
-    (* GET_GetProgramEnvParameterdvARB(disp)) parameters
-static inline _glptr_GetProgramEnvParameterdvARB
-GET_GetProgramEnvParameterdvARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetProgramEnvParameterdvARB) (GET_by_offset
-                                                 (disp,
-                                                  _gloffset_GetProgramEnvParameterdvARB));
+static INLINE void SET_VertexAttrib1dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLdouble *)) {
+   SET_by_offset(disp, _gloffset_VertexAttrib1dv, fn);
 }
 
-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_VertexAttrib1s)(GLuint, GLshort);
+#define CALL_VertexAttrib1s(disp, parameters) \
+    (* GET_VertexAttrib1s(disp)) parameters
+static INLINE _glptr_VertexAttrib1s GET_VertexAttrib1s(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib1s) (GET_by_offset(disp, _gloffset_VertexAttrib1s));
 }
 
-typedef void (GLAPIENTRYP _glptr_GetProgramEnvParameterfvARB) (GLenum, GLuint,
-                                                               GLfloat *);
-#define CALL_GetProgramEnvParameterfvARB(disp, parameters) \
-    (* GET_GetProgramEnvParameterfvARB(disp)) parameters
-static inline _glptr_GetProgramEnvParameterfvARB
-GET_GetProgramEnvParameterfvARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetProgramEnvParameterfvARB) (GET_by_offset
-                                                 (disp,
-                                                  _gloffset_GetProgramEnvParameterfvARB));
+static INLINE void SET_VertexAttrib1s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLshort)) {
+   SET_by_offset(disp, _gloffset_VertexAttrib1s, fn);
 }
 
-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_VertexAttrib1sv)(GLuint, const GLshort *);
+#define CALL_VertexAttrib1sv(disp, parameters) \
+    (* GET_VertexAttrib1sv(disp)) parameters
+static INLINE _glptr_VertexAttrib1sv GET_VertexAttrib1sv(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib1sv) (GET_by_offset(disp, _gloffset_VertexAttrib1sv));
 }
 
-typedef void (GLAPIENTRYP _glptr_GetProgramLocalParameterdvARB) (GLenum, GLuint,
-                                                                 GLdouble *);
-#define CALL_GetProgramLocalParameterdvARB(disp, parameters) \
-    (* GET_GetProgramLocalParameterdvARB(disp)) parameters
-static inline _glptr_GetProgramLocalParameterdvARB
-GET_GetProgramLocalParameterdvARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetProgramLocalParameterdvARB) (GET_by_offset
-                                                   (disp,
-                                                    _gloffset_GetProgramLocalParameterdvARB));
+static INLINE void SET_VertexAttrib1sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLshort *)) {
+   SET_by_offset(disp, _gloffset_VertexAttrib1sv, fn);
 }
 
-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_VertexAttrib2d)(GLuint, GLdouble, GLdouble);
+#define CALL_VertexAttrib2d(disp, parameters) \
+    (* GET_VertexAttrib2d(disp)) parameters
+static INLINE _glptr_VertexAttrib2d GET_VertexAttrib2d(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib2d) (GET_by_offset(disp, _gloffset_VertexAttrib2d));
 }
 
-typedef void (GLAPIENTRYP _glptr_GetProgramLocalParameterfvARB) (GLenum, GLuint,
-                                                                 GLfloat *);
-#define CALL_GetProgramLocalParameterfvARB(disp, parameters) \
-    (* GET_GetProgramLocalParameterfvARB(disp)) parameters
-static inline _glptr_GetProgramLocalParameterfvARB
-GET_GetProgramLocalParameterfvARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetProgramLocalParameterfvARB) (GET_by_offset
-                                                   (disp,
-                                                    _gloffset_GetProgramLocalParameterfvARB));
+static INLINE void SET_VertexAttrib2d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLdouble, GLdouble)) {
+   SET_by_offset(disp, _gloffset_VertexAttrib2d, fn);
 }
 
-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_VertexAttrib2dv)(GLuint, const GLdouble *);
+#define CALL_VertexAttrib2dv(disp, parameters) \
+    (* GET_VertexAttrib2dv(disp)) parameters
+static INLINE _glptr_VertexAttrib2dv GET_VertexAttrib2dv(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib2dv) (GET_by_offset(disp, _gloffset_VertexAttrib2dv));
 }
 
-typedef void (GLAPIENTRYP _glptr_GetProgramStringARB) (GLenum, GLenum,
-                                                       GLvoid *);
-#define CALL_GetProgramStringARB(disp, parameters) \
-    (* GET_GetProgramStringARB(disp)) parameters
-static inline _glptr_GetProgramStringARB
-GET_GetProgramStringARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetProgramStringARB) (GET_by_offset
-                                         (disp, _gloffset_GetProgramStringARB));
+static INLINE void SET_VertexAttrib2dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLdouble *)) {
+   SET_by_offset(disp, _gloffset_VertexAttrib2dv, fn);
 }
 
-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_VertexAttrib2s)(GLuint, GLshort, GLshort);
+#define CALL_VertexAttrib2s(disp, parameters) \
+    (* GET_VertexAttrib2s(disp)) parameters
+static INLINE _glptr_VertexAttrib2s GET_VertexAttrib2s(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib2s) (GET_by_offset(disp, _gloffset_VertexAttrib2s));
 }
 
-typedef void (GLAPIENTRYP _glptr_GetProgramivARB) (GLenum, GLenum, GLint *);
+static INLINE void SET_VertexAttrib2s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLshort, GLshort)) {
+   SET_by_offset(disp, _gloffset_VertexAttrib2s, fn);
+}
 
-#define CALL_GetProgramivARB(disp, parameters) \
-    (* GET_GetProgramivARB(disp)) parameters
-static inline _glptr_GetProgramivARB
-GET_GetProgramivARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetProgramivARB) (GET_by_offset
-                                     (disp, _gloffset_GetProgramivARB));
-}
-
-static inline void
-SET_GetProgramivARB(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLenum, GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetProgramivARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetVertexAttribdvARB) (GLuint, GLenum,
-                                                        GLdouble *);
-#define CALL_GetVertexAttribdvARB(disp, parameters) \
-    (* GET_GetVertexAttribdvARB(disp)) parameters
-static inline _glptr_GetVertexAttribdvARB
-GET_GetVertexAttribdvARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetVertexAttribdvARB) (GET_by_offset
-                                          (disp,
-                                           _gloffset_GetVertexAttribdvARB));
-}
-
-static inline void
-SET_GetVertexAttribdvARB(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (GLuint, GLenum, GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_GetVertexAttribdvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetVertexAttribfvARB) (GLuint, GLenum,
-                                                        GLfloat *);
-#define CALL_GetVertexAttribfvARB(disp, parameters) \
-    (* GET_GetVertexAttribfvARB(disp)) parameters
-static inline _glptr_GetVertexAttribfvARB
-GET_GetVertexAttribfvARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetVertexAttribfvARB) (GET_by_offset
-                                          (disp,
-                                           _gloffset_GetVertexAttribfvARB));
-}
-
-static inline void
-SET_GetVertexAttribfvARB(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (GLuint, GLenum, GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetVertexAttribfvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetVertexAttribivARB) (GLuint, GLenum,
-                                                        GLint *);
-#define CALL_GetVertexAttribivARB(disp, parameters) \
-    (* GET_GetVertexAttribivARB(disp)) parameters
-static inline _glptr_GetVertexAttribivARB
-GET_GetVertexAttribivARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetVertexAttribivARB) (GET_by_offset
-                                          (disp,
-                                           _gloffset_GetVertexAttribivARB));
-}
-
-static inline void
-SET_GetVertexAttribivARB(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (GLuint, GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetVertexAttribivARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ProgramEnvParameter4dARB) (GLenum, GLuint,
-                                                            GLdouble, GLdouble,
-                                                            GLdouble, GLdouble);
-#define CALL_ProgramEnvParameter4dARB(disp, parameters) \
-    (* GET_ProgramEnvParameter4dARB(disp)) parameters
-static inline _glptr_ProgramEnvParameter4dARB
-GET_ProgramEnvParameter4dARB(struct _glapi_table *disp)
-{
-    return (_glptr_ProgramEnvParameter4dARB) (GET_by_offset
-                                              (disp,
-                                               _gloffset_ProgramEnvParameter4dARB));
+typedef void (GLAPIENTRYP _glptr_VertexAttrib2sv)(GLuint, const GLshort *);
+#define CALL_VertexAttrib2sv(disp, parameters) \
+    (* GET_VertexAttrib2sv(disp)) parameters
+static INLINE _glptr_VertexAttrib2sv GET_VertexAttrib2sv(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib2sv) (GET_by_offset(disp, _gloffset_VertexAttrib2sv));
 }
 
-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);
+static INLINE void SET_VertexAttrib2sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLshort *)) {
+   SET_by_offset(disp, _gloffset_VertexAttrib2sv, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_ProgramEnvParameter4dvARB) (GLenum, GLuint,
-                                                             const GLdouble *);
-#define CALL_ProgramEnvParameter4dvARB(disp, parameters) \
-    (* GET_ProgramEnvParameter4dvARB(disp)) parameters
-static inline _glptr_ProgramEnvParameter4dvARB
-GET_ProgramEnvParameter4dvARB(struct _glapi_table *disp)
-{
-    return (_glptr_ProgramEnvParameter4dvARB) (GET_by_offset
-                                               (disp,
-                                                _gloffset_ProgramEnvParameter4dvARB));
+typedef void (GLAPIENTRYP _glptr_VertexAttrib3d)(GLuint, GLdouble, GLdouble, GLdouble);
+#define CALL_VertexAttrib3d(disp, parameters) \
+    (* GET_VertexAttrib3d(disp)) parameters
+static INLINE _glptr_VertexAttrib3d GET_VertexAttrib3d(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib3d) (GET_by_offset(disp, _gloffset_VertexAttrib3d));
 }
 
-static inline void
-SET_ProgramEnvParameter4dvARB(struct _glapi_table *disp,
-                              void (GLAPIENTRYP fn) (GLenum, GLuint,
-                                                     const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_ProgramEnvParameter4dvARB, fn);
+static INLINE void SET_VertexAttrib3d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLdouble, GLdouble, GLdouble)) {
+   SET_by_offset(disp, _gloffset_VertexAttrib3d, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_ProgramEnvParameter4fARB) (GLenum, GLuint,
-                                                            GLfloat, GLfloat,
-                                                            GLfloat, GLfloat);
-#define CALL_ProgramEnvParameter4fARB(disp, parameters) \
-    (* GET_ProgramEnvParameter4fARB(disp)) parameters
-static inline _glptr_ProgramEnvParameter4fARB
-GET_ProgramEnvParameter4fARB(struct _glapi_table *disp)
-{
-    return (_glptr_ProgramEnvParameter4fARB) (GET_by_offset
-                                              (disp,
-                                               _gloffset_ProgramEnvParameter4fARB));
+typedef void (GLAPIENTRYP _glptr_VertexAttrib3dv)(GLuint, const GLdouble *);
+#define CALL_VertexAttrib3dv(disp, parameters) \
+    (* GET_VertexAttrib3dv(disp)) parameters
+static INLINE _glptr_VertexAttrib3dv GET_VertexAttrib3dv(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib3dv) (GET_by_offset(disp, _gloffset_VertexAttrib3dv));
 }
 
-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);
+static INLINE void SET_VertexAttrib3dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLdouble *)) {
+   SET_by_offset(disp, _gloffset_VertexAttrib3dv, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_ProgramEnvParameter4fvARB) (GLenum, GLuint,
-                                                             const GLfloat *);
-#define CALL_ProgramEnvParameter4fvARB(disp, parameters) \
-    (* GET_ProgramEnvParameter4fvARB(disp)) parameters
-static inline _glptr_ProgramEnvParameter4fvARB
-GET_ProgramEnvParameter4fvARB(struct _glapi_table *disp)
-{
-    return (_glptr_ProgramEnvParameter4fvARB) (GET_by_offset
-                                               (disp,
-                                                _gloffset_ProgramEnvParameter4fvARB));
-}
-
-static inline void
-SET_ProgramEnvParameter4fvARB(struct _glapi_table *disp,
-                              void (GLAPIENTRYP fn) (GLenum, GLuint,
-                                                     const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_ProgramEnvParameter4fvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ProgramLocalParameter4dARB) (GLenum, GLuint,
-                                                              GLdouble,
-                                                              GLdouble,
-                                                              GLdouble,
-                                                              GLdouble);
-#define CALL_ProgramLocalParameter4dARB(disp, parameters) \
-    (* GET_ProgramLocalParameter4dARB(disp)) parameters
-static inline _glptr_ProgramLocalParameter4dARB
-GET_ProgramLocalParameter4dARB(struct _glapi_table *disp)
-{
-    return (_glptr_ProgramLocalParameter4dARB) (GET_by_offset
-                                                (disp,
-                                                 _gloffset_ProgramLocalParameter4dARB));
-}
-
-static inline void
-SET_ProgramLocalParameter4dARB(struct _glapi_table *disp,
-                               void (GLAPIENTRYP fn) (GLenum, GLuint, GLdouble,
-                                                      GLdouble, GLdouble,
-                                                      GLdouble))
-{
-    SET_by_offset(disp, _gloffset_ProgramLocalParameter4dARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ProgramLocalParameter4dvARB) (GLenum, GLuint,
-                                                               const GLdouble
-                                                               *);
-#define CALL_ProgramLocalParameter4dvARB(disp, parameters) \
-    (* GET_ProgramLocalParameter4dvARB(disp)) parameters
-static inline _glptr_ProgramLocalParameter4dvARB
-GET_ProgramLocalParameter4dvARB(struct _glapi_table *disp)
-{
-    return (_glptr_ProgramLocalParameter4dvARB) (GET_by_offset
-                                                 (disp,
-                                                  _gloffset_ProgramLocalParameter4dvARB));
+typedef void (GLAPIENTRYP _glptr_VertexAttrib3s)(GLuint, GLshort, GLshort, GLshort);
+#define CALL_VertexAttrib3s(disp, parameters) \
+    (* GET_VertexAttrib3s(disp)) parameters
+static INLINE _glptr_VertexAttrib3s GET_VertexAttrib3s(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib3s) (GET_by_offset(disp, _gloffset_VertexAttrib3s));
 }
 
-static inline void
-SET_ProgramLocalParameter4dvARB(struct _glapi_table *disp,
-                                void (GLAPIENTRYP fn) (GLenum, GLuint,
-                                                       const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_ProgramLocalParameter4dvARB, fn);
+static INLINE void SET_VertexAttrib3s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLshort, GLshort, GLshort)) {
+   SET_by_offset(disp, _gloffset_VertexAttrib3s, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_ProgramLocalParameter4fARB) (GLenum, GLuint,
-                                                              GLfloat, GLfloat,
-                                                              GLfloat, GLfloat);
-#define CALL_ProgramLocalParameter4fARB(disp, parameters) \
-    (* GET_ProgramLocalParameter4fARB(disp)) parameters
-static inline _glptr_ProgramLocalParameter4fARB
-GET_ProgramLocalParameter4fARB(struct _glapi_table *disp)
-{
-    return (_glptr_ProgramLocalParameter4fARB) (GET_by_offset
-                                                (disp,
-                                                 _gloffset_ProgramLocalParameter4fARB));
+typedef void (GLAPIENTRYP _glptr_VertexAttrib3sv)(GLuint, const GLshort *);
+#define CALL_VertexAttrib3sv(disp, parameters) \
+    (* GET_VertexAttrib3sv(disp)) parameters
+static INLINE _glptr_VertexAttrib3sv GET_VertexAttrib3sv(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib3sv) (GET_by_offset(disp, _gloffset_VertexAttrib3sv));
 }
 
-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);
+static INLINE void SET_VertexAttrib3sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLshort *)) {
+   SET_by_offset(disp, _gloffset_VertexAttrib3sv, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_ProgramLocalParameter4fvARB) (GLenum, GLuint,
-                                                               const GLfloat *);
-#define CALL_ProgramLocalParameter4fvARB(disp, parameters) \
-    (* GET_ProgramLocalParameter4fvARB(disp)) parameters
-static inline _glptr_ProgramLocalParameter4fvARB
-GET_ProgramLocalParameter4fvARB(struct _glapi_table *disp)
-{
-    return (_glptr_ProgramLocalParameter4fvARB) (GET_by_offset
-                                                 (disp,
-                                                  _gloffset_ProgramLocalParameter4fvARB));
+typedef void (GLAPIENTRYP _glptr_VertexAttrib4Nbv)(GLuint, const GLbyte *);
+#define CALL_VertexAttrib4Nbv(disp, parameters) \
+    (* GET_VertexAttrib4Nbv(disp)) parameters
+static INLINE _glptr_VertexAttrib4Nbv GET_VertexAttrib4Nbv(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib4Nbv) (GET_by_offset(disp, _gloffset_VertexAttrib4Nbv));
 }
 
-static inline void
-SET_ProgramLocalParameter4fvARB(struct _glapi_table *disp,
-                                void (GLAPIENTRYP fn) (GLenum, GLuint,
-                                                       const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_ProgramLocalParameter4fvARB, fn);
+static INLINE void SET_VertexAttrib4Nbv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLbyte *)) {
+   SET_by_offset(disp, _gloffset_VertexAttrib4Nbv, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_ProgramStringARB) (GLenum, GLenum, GLsizei,
-                                                    const GLvoid *);
-#define CALL_ProgramStringARB(disp, parameters) \
-    (* GET_ProgramStringARB(disp)) parameters
-static inline _glptr_ProgramStringARB
-GET_ProgramStringARB(struct _glapi_table *disp)
-{
-    return (_glptr_ProgramStringARB) (GET_by_offset
-                                      (disp, _gloffset_ProgramStringARB));
+typedef void (GLAPIENTRYP _glptr_VertexAttrib4Niv)(GLuint, const GLint *);
+#define CALL_VertexAttrib4Niv(disp, parameters) \
+    (* GET_VertexAttrib4Niv(disp)) parameters
+static INLINE _glptr_VertexAttrib4Niv GET_VertexAttrib4Niv(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib4Niv) (GET_by_offset(disp, _gloffset_VertexAttrib4Niv));
 }
 
-static inline void
-SET_ProgramStringARB(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLenum, GLenum, GLsizei,
-                                            const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_ProgramStringARB, fn);
+static INLINE void SET_VertexAttrib4Niv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLint *)) {
+   SET_by_offset(disp, _gloffset_VertexAttrib4Niv, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_VertexAttrib1dARB) (GLuint, GLdouble);
+typedef void (GLAPIENTRYP _glptr_VertexAttrib4Nsv)(GLuint, const GLshort *);
+#define CALL_VertexAttrib4Nsv(disp, parameters) \
+    (* GET_VertexAttrib4Nsv(disp)) parameters
+static INLINE _glptr_VertexAttrib4Nsv GET_VertexAttrib4Nsv(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib4Nsv) (GET_by_offset(disp, _gloffset_VertexAttrib4Nsv));
+}
 
-#define CALL_VertexAttrib1dARB(disp, parameters) \
-    (* GET_VertexAttrib1dARB(disp)) parameters
-static inline _glptr_VertexAttrib1dARB
-GET_VertexAttrib1dARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib1dARB) (GET_by_offset
-                                       (disp, _gloffset_VertexAttrib1dARB));
+static INLINE void SET_VertexAttrib4Nsv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLshort *)) {
+   SET_by_offset(disp, _gloffset_VertexAttrib4Nsv, fn);
 }
 
-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_VertexAttrib4Nub)(GLuint, GLubyte, GLubyte, GLubyte, GLubyte);
+#define CALL_VertexAttrib4Nub(disp, parameters) \
+    (* GET_VertexAttrib4Nub(disp)) parameters
+static INLINE _glptr_VertexAttrib4Nub GET_VertexAttrib4Nub(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib4Nub) (GET_by_offset(disp, _gloffset_VertexAttrib4Nub));
 }
 
-typedef void (GLAPIENTRYP _glptr_VertexAttrib1dvARB) (GLuint, const GLdouble *);
+static INLINE void SET_VertexAttrib4Nub(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLubyte, GLubyte, GLubyte, GLubyte)) {
+   SET_by_offset(disp, _gloffset_VertexAttrib4Nub, fn);
+}
 
-#define CALL_VertexAttrib1dvARB(disp, parameters) \
-    (* GET_VertexAttrib1dvARB(disp)) parameters
-static inline _glptr_VertexAttrib1dvARB
-GET_VertexAttrib1dvARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib1dvARB) (GET_by_offset
-                                        (disp, _gloffset_VertexAttrib1dvARB));
+typedef void (GLAPIENTRYP _glptr_VertexAttrib4Nubv)(GLuint, const GLubyte *);
+#define CALL_VertexAttrib4Nubv(disp, parameters) \
+    (* GET_VertexAttrib4Nubv(disp)) parameters
+static INLINE _glptr_VertexAttrib4Nubv GET_VertexAttrib4Nubv(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib4Nubv) (GET_by_offset(disp, _gloffset_VertexAttrib4Nubv));
 }
 
-static inline void
-SET_VertexAttrib1dvARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib1dvARB, fn);
+static INLINE void SET_VertexAttrib4Nubv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLubyte *)) {
+   SET_by_offset(disp, _gloffset_VertexAttrib4Nubv, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_VertexAttrib1fARB) (GLuint, GLfloat);
+typedef void (GLAPIENTRYP _glptr_VertexAttrib4Nuiv)(GLuint, const GLuint *);
+#define CALL_VertexAttrib4Nuiv(disp, parameters) \
+    (* GET_VertexAttrib4Nuiv(disp)) parameters
+static INLINE _glptr_VertexAttrib4Nuiv GET_VertexAttrib4Nuiv(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib4Nuiv) (GET_by_offset(disp, _gloffset_VertexAttrib4Nuiv));
+}
 
-#define CALL_VertexAttrib1fARB(disp, parameters) \
-    (* GET_VertexAttrib1fARB(disp)) parameters
-static inline _glptr_VertexAttrib1fARB
-GET_VertexAttrib1fARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib1fARB) (GET_by_offset
-                                       (disp, _gloffset_VertexAttrib1fARB));
+static INLINE void SET_VertexAttrib4Nuiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLuint *)) {
+   SET_by_offset(disp, _gloffset_VertexAttrib4Nuiv, fn);
 }
 
-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_VertexAttrib4Nusv)(GLuint, const GLushort *);
+#define CALL_VertexAttrib4Nusv(disp, parameters) \
+    (* GET_VertexAttrib4Nusv(disp)) parameters
+static INLINE _glptr_VertexAttrib4Nusv GET_VertexAttrib4Nusv(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib4Nusv) (GET_by_offset(disp, _gloffset_VertexAttrib4Nusv));
 }
 
-typedef void (GLAPIENTRYP _glptr_VertexAttrib1fvARB) (GLuint, const GLfloat *);
+static INLINE void SET_VertexAttrib4Nusv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLushort *)) {
+   SET_by_offset(disp, _gloffset_VertexAttrib4Nusv, fn);
+}
 
-#define CALL_VertexAttrib1fvARB(disp, parameters) \
-    (* GET_VertexAttrib1fvARB(disp)) parameters
-static inline _glptr_VertexAttrib1fvARB
-GET_VertexAttrib1fvARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib1fvARB) (GET_by_offset
-                                        (disp, _gloffset_VertexAttrib1fvARB));
+typedef void (GLAPIENTRYP _glptr_VertexAttrib4bv)(GLuint, const GLbyte *);
+#define CALL_VertexAttrib4bv(disp, parameters) \
+    (* GET_VertexAttrib4bv(disp)) parameters
+static INLINE _glptr_VertexAttrib4bv GET_VertexAttrib4bv(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib4bv) (GET_by_offset(disp, _gloffset_VertexAttrib4bv));
 }
 
-static inline void
-SET_VertexAttrib1fvARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib1fvARB, fn);
+static INLINE void SET_VertexAttrib4bv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLbyte *)) {
+   SET_by_offset(disp, _gloffset_VertexAttrib4bv, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_VertexAttrib1sARB) (GLuint, GLshort);
+typedef void (GLAPIENTRYP _glptr_VertexAttrib4d)(GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
+#define CALL_VertexAttrib4d(disp, parameters) \
+    (* GET_VertexAttrib4d(disp)) parameters
+static INLINE _glptr_VertexAttrib4d GET_VertexAttrib4d(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib4d) (GET_by_offset(disp, _gloffset_VertexAttrib4d));
+}
 
-#define CALL_VertexAttrib1sARB(disp, parameters) \
-    (* GET_VertexAttrib1sARB(disp)) parameters
-static inline _glptr_VertexAttrib1sARB
-GET_VertexAttrib1sARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib1sARB) (GET_by_offset
-                                       (disp, _gloffset_VertexAttrib1sARB));
+static INLINE void SET_VertexAttrib4d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLdouble, GLdouble, GLdouble, GLdouble)) {
+   SET_by_offset(disp, _gloffset_VertexAttrib4d, fn);
 }
 
-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_VertexAttrib4dv)(GLuint, const GLdouble *);
+#define CALL_VertexAttrib4dv(disp, parameters) \
+    (* GET_VertexAttrib4dv(disp)) parameters
+static INLINE _glptr_VertexAttrib4dv GET_VertexAttrib4dv(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib4dv) (GET_by_offset(disp, _gloffset_VertexAttrib4dv));
 }
 
-typedef void (GLAPIENTRYP _glptr_VertexAttrib1svARB) (GLuint, const GLshort *);
+static INLINE void SET_VertexAttrib4dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLdouble *)) {
+   SET_by_offset(disp, _gloffset_VertexAttrib4dv, fn);
+}
 
-#define CALL_VertexAttrib1svARB(disp, parameters) \
-    (* GET_VertexAttrib1svARB(disp)) parameters
-static inline _glptr_VertexAttrib1svARB
-GET_VertexAttrib1svARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib1svARB) (GET_by_offset
-                                        (disp, _gloffset_VertexAttrib1svARB));
+typedef void (GLAPIENTRYP _glptr_VertexAttrib4iv)(GLuint, const GLint *);
+#define CALL_VertexAttrib4iv(disp, parameters) \
+    (* GET_VertexAttrib4iv(disp)) parameters
+static INLINE _glptr_VertexAttrib4iv GET_VertexAttrib4iv(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib4iv) (GET_by_offset(disp, _gloffset_VertexAttrib4iv));
 }
 
-static inline void
-SET_VertexAttrib1svARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib1svARB, fn);
+static INLINE void SET_VertexAttrib4iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLint *)) {
+   SET_by_offset(disp, _gloffset_VertexAttrib4iv, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_VertexAttrib2dARB) (GLuint, GLdouble,
-                                                     GLdouble);
-#define CALL_VertexAttrib2dARB(disp, parameters) \
-    (* GET_VertexAttrib2dARB(disp)) parameters
-static inline _glptr_VertexAttrib2dARB
-GET_VertexAttrib2dARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib2dARB) (GET_by_offset
-                                       (disp, _gloffset_VertexAttrib2dARB));
+typedef void (GLAPIENTRYP _glptr_VertexAttrib4s)(GLuint, GLshort, GLshort, GLshort, GLshort);
+#define CALL_VertexAttrib4s(disp, parameters) \
+    (* GET_VertexAttrib4s(disp)) parameters
+static INLINE _glptr_VertexAttrib4s GET_VertexAttrib4s(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib4s) (GET_by_offset(disp, _gloffset_VertexAttrib4s));
 }
 
-static inline void
-SET_VertexAttrib2dARB(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib2dARB, fn);
+static INLINE void SET_VertexAttrib4s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLshort, GLshort, GLshort, GLshort)) {
+   SET_by_offset(disp, _gloffset_VertexAttrib4s, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_VertexAttrib2dvARB) (GLuint, const GLdouble *);
+typedef void (GLAPIENTRYP _glptr_VertexAttrib4sv)(GLuint, const GLshort *);
+#define CALL_VertexAttrib4sv(disp, parameters) \
+    (* GET_VertexAttrib4sv(disp)) parameters
+static INLINE _glptr_VertexAttrib4sv GET_VertexAttrib4sv(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib4sv) (GET_by_offset(disp, _gloffset_VertexAttrib4sv));
+}
 
-#define CALL_VertexAttrib2dvARB(disp, parameters) \
-    (* GET_VertexAttrib2dvARB(disp)) parameters
-static inline _glptr_VertexAttrib2dvARB
-GET_VertexAttrib2dvARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib2dvARB) (GET_by_offset
-                                        (disp, _gloffset_VertexAttrib2dvARB));
+static INLINE void SET_VertexAttrib4sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLshort *)) {
+   SET_by_offset(disp, _gloffset_VertexAttrib4sv, fn);
 }
 
-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_VertexAttrib4ubv)(GLuint, const GLubyte *);
+#define CALL_VertexAttrib4ubv(disp, parameters) \
+    (* GET_VertexAttrib4ubv(disp)) parameters
+static INLINE _glptr_VertexAttrib4ubv GET_VertexAttrib4ubv(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib4ubv) (GET_by_offset(disp, _gloffset_VertexAttrib4ubv));
 }
 
-typedef void (GLAPIENTRYP _glptr_VertexAttrib2fARB) (GLuint, GLfloat, GLfloat);
+static INLINE void SET_VertexAttrib4ubv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLubyte *)) {
+   SET_by_offset(disp, _gloffset_VertexAttrib4ubv, fn);
+}
 
-#define CALL_VertexAttrib2fARB(disp, parameters) \
-    (* GET_VertexAttrib2fARB(disp)) parameters
-static inline _glptr_VertexAttrib2fARB
-GET_VertexAttrib2fARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib2fARB) (GET_by_offset
-                                       (disp, _gloffset_VertexAttrib2fARB));
+typedef void (GLAPIENTRYP _glptr_VertexAttrib4uiv)(GLuint, const GLuint *);
+#define CALL_VertexAttrib4uiv(disp, parameters) \
+    (* GET_VertexAttrib4uiv(disp)) parameters
+static INLINE _glptr_VertexAttrib4uiv GET_VertexAttrib4uiv(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib4uiv) (GET_by_offset(disp, _gloffset_VertexAttrib4uiv));
 }
 
-static inline void
-SET_VertexAttrib2fARB(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib2fARB, fn);
+static INLINE void SET_VertexAttrib4uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLuint *)) {
+   SET_by_offset(disp, _gloffset_VertexAttrib4uiv, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_VertexAttrib2fvARB) (GLuint, const GLfloat *);
+typedef void (GLAPIENTRYP _glptr_VertexAttrib4usv)(GLuint, const GLushort *);
+#define CALL_VertexAttrib4usv(disp, parameters) \
+    (* GET_VertexAttrib4usv(disp)) parameters
+static INLINE _glptr_VertexAttrib4usv GET_VertexAttrib4usv(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib4usv) (GET_by_offset(disp, _gloffset_VertexAttrib4usv));
+}
 
-#define CALL_VertexAttrib2fvARB(disp, parameters) \
-    (* GET_VertexAttrib2fvARB(disp)) parameters
-static inline _glptr_VertexAttrib2fvARB
-GET_VertexAttrib2fvARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib2fvARB) (GET_by_offset
-                                        (disp, _gloffset_VertexAttrib2fvARB));
+static INLINE void SET_VertexAttrib4usv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLushort *)) {
+   SET_by_offset(disp, _gloffset_VertexAttrib4usv, fn);
 }
 
-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_VertexAttribPointer)(GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid *);
+#define CALL_VertexAttribPointer(disp, parameters) \
+    (* GET_VertexAttribPointer(disp)) parameters
+static INLINE _glptr_VertexAttribPointer GET_VertexAttribPointer(struct _glapi_table *disp) {
+   return (_glptr_VertexAttribPointer) (GET_by_offset(disp, _gloffset_VertexAttribPointer));
 }
 
-typedef void (GLAPIENTRYP _glptr_VertexAttrib2sARB) (GLuint, GLshort, GLshort);
+static INLINE void SET_VertexAttribPointer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid *)) {
+   SET_by_offset(disp, _gloffset_VertexAttribPointer, fn);
+}
 
-#define CALL_VertexAttrib2sARB(disp, parameters) \
-    (* GET_VertexAttrib2sARB(disp)) parameters
-static inline _glptr_VertexAttrib2sARB
-GET_VertexAttrib2sARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib2sARB) (GET_by_offset
-                                       (disp, _gloffset_VertexAttrib2sARB));
+typedef void (GLAPIENTRYP _glptr_UniformMatrix2x3fv)(GLint, GLsizei, GLboolean, const GLfloat *);
+#define CALL_UniformMatrix2x3fv(disp, parameters) \
+    (* GET_UniformMatrix2x3fv(disp)) parameters
+static INLINE _glptr_UniformMatrix2x3fv GET_UniformMatrix2x3fv(struct _glapi_table *disp) {
+   return (_glptr_UniformMatrix2x3fv) (GET_by_offset(disp, _gloffset_UniformMatrix2x3fv));
 }
 
-static inline void
-SET_VertexAttrib2sARB(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, GLshort, GLshort))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib2sARB, fn);
+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_VertexAttrib2svARB) (GLuint, const GLshort *);
+typedef void (GLAPIENTRYP _glptr_UniformMatrix2x4fv)(GLint, GLsizei, GLboolean, const GLfloat *);
+#define CALL_UniformMatrix2x4fv(disp, parameters) \
+    (* GET_UniformMatrix2x4fv(disp)) parameters
+static INLINE _glptr_UniformMatrix2x4fv GET_UniformMatrix2x4fv(struct _glapi_table *disp) {
+   return (_glptr_UniformMatrix2x4fv) (GET_by_offset(disp, _gloffset_UniformMatrix2x4fv));
+}
 
-#define CALL_VertexAttrib2svARB(disp, parameters) \
-    (* GET_VertexAttrib2svARB(disp)) parameters
-static inline _glptr_VertexAttrib2svARB
-GET_VertexAttrib2svARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib2svARB) (GET_by_offset
-                                        (disp, _gloffset_VertexAttrib2svARB));
+static INLINE void SET_UniformMatrix2x4fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, GLboolean, const GLfloat *)) {
+   SET_by_offset(disp, _gloffset_UniformMatrix2x4fv, fn);
 }
 
-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_UniformMatrix3x2fv)(GLint, GLsizei, GLboolean, const GLfloat *);
+#define CALL_UniformMatrix3x2fv(disp, parameters) \
+    (* GET_UniformMatrix3x2fv(disp)) parameters
+static INLINE _glptr_UniformMatrix3x2fv GET_UniformMatrix3x2fv(struct _glapi_table *disp) {
+   return (_glptr_UniformMatrix3x2fv) (GET_by_offset(disp, _gloffset_UniformMatrix3x2fv));
 }
 
-typedef void (GLAPIENTRYP _glptr_VertexAttrib3dARB) (GLuint, GLdouble, GLdouble,
-                                                     GLdouble);
-#define CALL_VertexAttrib3dARB(disp, parameters) \
-    (* GET_VertexAttrib3dARB(disp)) parameters
-static inline _glptr_VertexAttrib3dARB
-GET_VertexAttrib3dARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib3dARB) (GET_by_offset
-                                       (disp, _gloffset_VertexAttrib3dARB));
+static INLINE void SET_UniformMatrix3x2fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, GLboolean, const GLfloat *)) {
+   SET_by_offset(disp, _gloffset_UniformMatrix3x2fv, fn);
 }
 
-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_UniformMatrix3x4fv)(GLint, GLsizei, GLboolean, const GLfloat *);
+#define CALL_UniformMatrix3x4fv(disp, parameters) \
+    (* GET_UniformMatrix3x4fv(disp)) parameters
+static INLINE _glptr_UniformMatrix3x4fv GET_UniformMatrix3x4fv(struct _glapi_table *disp) {
+   return (_glptr_UniformMatrix3x4fv) (GET_by_offset(disp, _gloffset_UniformMatrix3x4fv));
 }
 
-typedef void (GLAPIENTRYP _glptr_VertexAttrib3dvARB) (GLuint, const GLdouble *);
+static INLINE void SET_UniformMatrix3x4fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, GLboolean, const GLfloat *)) {
+   SET_by_offset(disp, _gloffset_UniformMatrix3x4fv, fn);
+}
 
-#define CALL_VertexAttrib3dvARB(disp, parameters) \
-    (* GET_VertexAttrib3dvARB(disp)) parameters
-static inline _glptr_VertexAttrib3dvARB
-GET_VertexAttrib3dvARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib3dvARB) (GET_by_offset
-                                        (disp, _gloffset_VertexAttrib3dvARB));
+typedef void (GLAPIENTRYP _glptr_UniformMatrix4x2fv)(GLint, GLsizei, GLboolean, const GLfloat *);
+#define CALL_UniformMatrix4x2fv(disp, parameters) \
+    (* GET_UniformMatrix4x2fv(disp)) parameters
+static INLINE _glptr_UniformMatrix4x2fv GET_UniformMatrix4x2fv(struct _glapi_table *disp) {
+   return (_glptr_UniformMatrix4x2fv) (GET_by_offset(disp, _gloffset_UniformMatrix4x2fv));
 }
 
-static inline void
-SET_VertexAttrib3dvARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib3dvARB, fn);
+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_VertexAttrib3fARB) (GLuint, GLfloat, GLfloat,
-                                                     GLfloat);
-#define CALL_VertexAttrib3fARB(disp, parameters) \
-    (* GET_VertexAttrib3fARB(disp)) parameters
-static inline _glptr_VertexAttrib3fARB
-GET_VertexAttrib3fARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib3fARB) (GET_by_offset
-                                       (disp, _gloffset_VertexAttrib3fARB));
+typedef void (GLAPIENTRYP _glptr_UniformMatrix4x3fv)(GLint, GLsizei, GLboolean, const GLfloat *);
+#define CALL_UniformMatrix4x3fv(disp, parameters) \
+    (* GET_UniformMatrix4x3fv(disp)) parameters
+static INLINE _glptr_UniformMatrix4x3fv GET_UniformMatrix4x3fv(struct _glapi_table *disp) {
+   return (_glptr_UniformMatrix4x3fv) (GET_by_offset(disp, _gloffset_UniformMatrix4x3fv));
 }
 
-static inline void
-SET_VertexAttrib3fARB(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, GLfloat, GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib3fARB, fn);
+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_VertexAttrib3fvARB) (GLuint, const GLfloat *);
+typedef void (GLAPIENTRYP _glptr_BeginConditionalRender)(GLuint, GLenum);
+#define CALL_BeginConditionalRender(disp, parameters) \
+    (* GET_BeginConditionalRender(disp)) parameters
+static INLINE _glptr_BeginConditionalRender GET_BeginConditionalRender(struct _glapi_table *disp) {
+   return (_glptr_BeginConditionalRender) (GET_by_offset(disp, _gloffset_BeginConditionalRender));
+}
 
-#define CALL_VertexAttrib3fvARB(disp, parameters) \
-    (* GET_VertexAttrib3fvARB(disp)) parameters
-static inline _glptr_VertexAttrib3fvARB
-GET_VertexAttrib3fvARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib3fvARB) (GET_by_offset
-                                        (disp, _gloffset_VertexAttrib3fvARB));
+static INLINE void SET_BeginConditionalRender(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum)) {
+   SET_by_offset(disp, _gloffset_BeginConditionalRender, fn);
 }
 
-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_BeginTransformFeedback)(GLenum);
+#define CALL_BeginTransformFeedback(disp, parameters) \
+    (* GET_BeginTransformFeedback(disp)) parameters
+static INLINE _glptr_BeginTransformFeedback GET_BeginTransformFeedback(struct _glapi_table *disp) {
+   return (_glptr_BeginTransformFeedback) (GET_by_offset(disp, _gloffset_BeginTransformFeedback));
 }
 
-typedef void (GLAPIENTRYP _glptr_VertexAttrib3sARB) (GLuint, GLshort, GLshort,
-                                                     GLshort);
-#define CALL_VertexAttrib3sARB(disp, parameters) \
-    (* GET_VertexAttrib3sARB(disp)) parameters
-static inline _glptr_VertexAttrib3sARB
-GET_VertexAttrib3sARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib3sARB) (GET_by_offset
-                                       (disp, _gloffset_VertexAttrib3sARB));
+static INLINE void SET_BeginTransformFeedback(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
+   SET_by_offset(disp, _gloffset_BeginTransformFeedback, fn);
 }
 
-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_BindBufferBase)(GLenum, GLuint, GLuint);
+#define CALL_BindBufferBase(disp, parameters) \
+    (* GET_BindBufferBase(disp)) parameters
+static INLINE _glptr_BindBufferBase GET_BindBufferBase(struct _glapi_table *disp) {
+   return (_glptr_BindBufferBase) (GET_by_offset(disp, _gloffset_BindBufferBase));
 }
 
-typedef void (GLAPIENTRYP _glptr_VertexAttrib3svARB) (GLuint, const GLshort *);
-
-#define CALL_VertexAttrib3svARB(disp, parameters) \
-    (* GET_VertexAttrib3svARB(disp)) parameters
-static inline _glptr_VertexAttrib3svARB
-GET_VertexAttrib3svARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib3svARB) (GET_by_offset
-                                        (disp, _gloffset_VertexAttrib3svARB));
+static INLINE void SET_BindBufferBase(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLuint)) {
+   SET_by_offset(disp, _gloffset_BindBufferBase, fn);
 }
 
-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_BindBufferRange)(GLenum, GLuint, GLuint, GLintptr, GLsizeiptr);
+#define CALL_BindBufferRange(disp, parameters) \
+    (* GET_BindBufferRange(disp)) parameters
+static INLINE _glptr_BindBufferRange GET_BindBufferRange(struct _glapi_table *disp) {
+   return (_glptr_BindBufferRange) (GET_by_offset(disp, _gloffset_BindBufferRange));
 }
 
-typedef void (GLAPIENTRYP _glptr_VertexAttrib4NbvARB) (GLuint, const GLbyte *);
-
-#define CALL_VertexAttrib4NbvARB(disp, parameters) \
-    (* GET_VertexAttrib4NbvARB(disp)) parameters
-static inline _glptr_VertexAttrib4NbvARB
-GET_VertexAttrib4NbvARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib4NbvARB) (GET_by_offset
-                                         (disp, _gloffset_VertexAttrib4NbvARB));
+static INLINE void SET_BindBufferRange(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLuint, GLintptr, GLsizeiptr)) {
+   SET_by_offset(disp, _gloffset_BindBufferRange, fn);
 }
 
-static inline void
-SET_VertexAttrib4NbvARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLuint, const GLbyte *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib4NbvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib4NivARB) (GLuint, const GLint *);
-
-#define CALL_VertexAttrib4NivARB(disp, parameters) \
-    (* GET_VertexAttrib4NivARB(disp)) parameters
-static inline _glptr_VertexAttrib4NivARB
-GET_VertexAttrib4NivARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib4NivARB) (GET_by_offset
-                                         (disp, _gloffset_VertexAttrib4NivARB));
+typedef void (GLAPIENTRYP _glptr_BindFragDataLocation)(GLuint, GLuint, const GLchar *);
+#define CALL_BindFragDataLocation(disp, parameters) \
+    (* GET_BindFragDataLocation(disp)) parameters
+static INLINE _glptr_BindFragDataLocation GET_BindFragDataLocation(struct _glapi_table *disp) {
+   return (_glptr_BindFragDataLocation) (GET_by_offset(disp, _gloffset_BindFragDataLocation));
 }
 
-static inline void
-SET_VertexAttrib4NivARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLuint, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib4NivARB, fn);
+static INLINE void SET_BindFragDataLocation(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, const GLchar *)) {
+   SET_by_offset(disp, _gloffset_BindFragDataLocation, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_VertexAttrib4NsvARB) (GLuint, const GLshort *);
-
-#define CALL_VertexAttrib4NsvARB(disp, parameters) \
-    (* GET_VertexAttrib4NsvARB(disp)) parameters
-static inline _glptr_VertexAttrib4NsvARB
-GET_VertexAttrib4NsvARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib4NsvARB) (GET_by_offset
-                                         (disp, _gloffset_VertexAttrib4NsvARB));
-}
+typedef void (GLAPIENTRYP _glptr_ClampColor)(GLenum, GLenum);
+#define CALL_ClampColor(disp, parameters) \
+    (* GET_ClampColor(disp)) parameters
+static INLINE _glptr_ClampColor GET_ClampColor(struct _glapi_table *disp) {
+   return (_glptr_ClampColor) (GET_by_offset(disp, _gloffset_ClampColor));
+}
 
-static inline void
-SET_VertexAttrib4NsvARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLuint, const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib4NsvARB, fn);
+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_VertexAttrib4NubARB) (GLuint, GLubyte, GLubyte,
-                                                       GLubyte, GLubyte);
-#define CALL_VertexAttrib4NubARB(disp, parameters) \
-    (* GET_VertexAttrib4NubARB(disp)) parameters
-static inline _glptr_VertexAttrib4NubARB
-GET_VertexAttrib4NubARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib4NubARB) (GET_by_offset
-                                         (disp, _gloffset_VertexAttrib4NubARB));
-}
-
-static inline void
-SET_VertexAttrib4NubARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLuint, GLubyte, GLubyte,
-                                               GLubyte, GLubyte))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib4NubARB, fn);
+typedef void (GLAPIENTRYP _glptr_ClearBufferfi)(GLenum, GLint, GLfloat, GLint);
+#define CALL_ClearBufferfi(disp, parameters) \
+    (* GET_ClearBufferfi(disp)) parameters
+static INLINE _glptr_ClearBufferfi GET_ClearBufferfi(struct _glapi_table *disp) {
+   return (_glptr_ClearBufferfi) (GET_by_offset(disp, _gloffset_ClearBufferfi));
 }
 
-typedef void (GLAPIENTRYP _glptr_VertexAttrib4NubvARB) (GLuint,
-                                                        const GLubyte *);
-#define CALL_VertexAttrib4NubvARB(disp, parameters) \
-    (* GET_VertexAttrib4NubvARB(disp)) parameters
-static inline _glptr_VertexAttrib4NubvARB
-GET_VertexAttrib4NubvARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib4NubvARB) (GET_by_offset
-                                          (disp,
-                                           _gloffset_VertexAttrib4NubvARB));
+static INLINE void SET_ClearBufferfi(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLfloat, GLint)) {
+   SET_by_offset(disp, _gloffset_ClearBufferfi, fn);
 }
 
-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_ClearBufferfv)(GLenum, GLint, const GLfloat *);
+#define CALL_ClearBufferfv(disp, parameters) \
+    (* GET_ClearBufferfv(disp)) parameters
+static INLINE _glptr_ClearBufferfv GET_ClearBufferfv(struct _glapi_table *disp) {
+   return (_glptr_ClearBufferfv) (GET_by_offset(disp, _gloffset_ClearBufferfv));
 }
 
-typedef void (GLAPIENTRYP _glptr_VertexAttrib4NuivARB) (GLuint, const GLuint *);
+static INLINE void SET_ClearBufferfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, const GLfloat *)) {
+   SET_by_offset(disp, _gloffset_ClearBufferfv, fn);
+}
 
-#define CALL_VertexAttrib4NuivARB(disp, parameters) \
-    (* GET_VertexAttrib4NuivARB(disp)) parameters
-static inline _glptr_VertexAttrib4NuivARB
-GET_VertexAttrib4NuivARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib4NuivARB) (GET_by_offset
-                                          (disp,
-                                           _gloffset_VertexAttrib4NuivARB));
-}
-
-static inline void
-SET_VertexAttrib4NuivARB(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (GLuint, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib4NuivARB, fn);
+typedef void (GLAPIENTRYP _glptr_ClearBufferiv)(GLenum, GLint, const GLint *);
+#define CALL_ClearBufferiv(disp, parameters) \
+    (* GET_ClearBufferiv(disp)) parameters
+static INLINE _glptr_ClearBufferiv GET_ClearBufferiv(struct _glapi_table *disp) {
+   return (_glptr_ClearBufferiv) (GET_by_offset(disp, _gloffset_ClearBufferiv));
 }
 
-typedef void (GLAPIENTRYP _glptr_VertexAttrib4NusvARB) (GLuint,
-                                                        const GLushort *);
-#define CALL_VertexAttrib4NusvARB(disp, parameters) \
-    (* GET_VertexAttrib4NusvARB(disp)) parameters
-static inline _glptr_VertexAttrib4NusvARB
-GET_VertexAttrib4NusvARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib4NusvARB) (GET_by_offset
-                                          (disp,
-                                           _gloffset_VertexAttrib4NusvARB));
-}
-
-static inline void
-SET_VertexAttrib4NusvARB(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (GLuint, const GLushort *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib4NusvARB, fn);
+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_VertexAttrib4bvARB) (GLuint, const GLbyte *);
-
-#define CALL_VertexAttrib4bvARB(disp, parameters) \
-    (* GET_VertexAttrib4bvARB(disp)) parameters
-static inline _glptr_VertexAttrib4bvARB
-GET_VertexAttrib4bvARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib4bvARB) (GET_by_offset
-                                        (disp, _gloffset_VertexAttrib4bvARB));
-}
-
-static inline void
-SET_VertexAttrib4bvARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, const GLbyte *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib4bvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib4dARB) (GLuint, GLdouble, GLdouble,
-                                                     GLdouble, GLdouble);
-#define CALL_VertexAttrib4dARB(disp, parameters) \
-    (* GET_VertexAttrib4dARB(disp)) parameters
-static inline _glptr_VertexAttrib4dARB
-GET_VertexAttrib4dARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib4dARB) (GET_by_offset
-                                       (disp, _gloffset_VertexAttrib4dARB));
-}
-
-static inline void
-SET_VertexAttrib4dARB(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, GLdouble, GLdouble,
-                                             GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib4dARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib4dvARB) (GLuint, const GLdouble *);
-
-#define CALL_VertexAttrib4dvARB(disp, parameters) \
-    (* GET_VertexAttrib4dvARB(disp)) parameters
-static inline _glptr_VertexAttrib4dvARB
-GET_VertexAttrib4dvARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib4dvARB) (GET_by_offset
-                                        (disp, _gloffset_VertexAttrib4dvARB));
+typedef void (GLAPIENTRYP _glptr_ClearBufferuiv)(GLenum, GLint, const GLuint *);
+#define CALL_ClearBufferuiv(disp, parameters) \
+    (* GET_ClearBufferuiv(disp)) parameters
+static INLINE _glptr_ClearBufferuiv GET_ClearBufferuiv(struct _glapi_table *disp) {
+   return (_glptr_ClearBufferuiv) (GET_by_offset(disp, _gloffset_ClearBufferuiv));
 }
 
-static inline void
-SET_VertexAttrib4dvARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib4dvARB, fn);
+static INLINE void SET_ClearBufferuiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, const GLuint *)) {
+   SET_by_offset(disp, _gloffset_ClearBufferuiv, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_VertexAttrib4fARB) (GLuint, GLfloat, GLfloat,
-                                                     GLfloat, GLfloat);
-#define CALL_VertexAttrib4fARB(disp, parameters) \
-    (* GET_VertexAttrib4fARB(disp)) parameters
-static inline _glptr_VertexAttrib4fARB
-GET_VertexAttrib4fARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib4fARB) (GET_by_offset
-                                       (disp, _gloffset_VertexAttrib4fARB));
+typedef void (GLAPIENTRYP _glptr_ColorMaski)(GLuint, GLboolean, GLboolean, GLboolean, GLboolean);
+#define CALL_ColorMaski(disp, parameters) \
+    (* GET_ColorMaski(disp)) parameters
+static INLINE _glptr_ColorMaski GET_ColorMaski(struct _glapi_table *disp) {
+   return (_glptr_ColorMaski) (GET_by_offset(disp, _gloffset_ColorMaski));
 }
 
-static inline void
-SET_VertexAttrib4fARB(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, GLfloat, GLfloat, GLfloat,
-                                             GLfloat))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib4fARB, fn);
+static INLINE void SET_ColorMaski(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLboolean, GLboolean, GLboolean, GLboolean)) {
+   SET_by_offset(disp, _gloffset_ColorMaski, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_VertexAttrib4fvARB) (GLuint, const GLfloat *);
+typedef void (GLAPIENTRYP _glptr_Disablei)(GLenum, GLuint);
+#define CALL_Disablei(disp, parameters) \
+    (* GET_Disablei(disp)) parameters
+static INLINE _glptr_Disablei GET_Disablei(struct _glapi_table *disp) {
+   return (_glptr_Disablei) (GET_by_offset(disp, _gloffset_Disablei));
+}
 
-#define CALL_VertexAttrib4fvARB(disp, parameters) \
-    (* GET_VertexAttrib4fvARB(disp)) parameters
-static inline _glptr_VertexAttrib4fvARB
-GET_VertexAttrib4fvARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib4fvARB) (GET_by_offset
-                                        (disp, _gloffset_VertexAttrib4fvARB));
+static INLINE void SET_Disablei(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
+   SET_by_offset(disp, _gloffset_Disablei, fn);
 }
 
-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_Enablei)(GLenum, GLuint);
+#define CALL_Enablei(disp, parameters) \
+    (* GET_Enablei(disp)) parameters
+static INLINE _glptr_Enablei GET_Enablei(struct _glapi_table *disp) {
+   return (_glptr_Enablei) (GET_by_offset(disp, _gloffset_Enablei));
 }
 
-typedef void (GLAPIENTRYP _glptr_VertexAttrib4ivARB) (GLuint, const GLint *);
+static INLINE void SET_Enablei(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
+   SET_by_offset(disp, _gloffset_Enablei, fn);
+}
 
-#define CALL_VertexAttrib4ivARB(disp, parameters) \
-    (* GET_VertexAttrib4ivARB(disp)) parameters
-static inline _glptr_VertexAttrib4ivARB
-GET_VertexAttrib4ivARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib4ivARB) (GET_by_offset
-                                        (disp, _gloffset_VertexAttrib4ivARB));
+typedef void (GLAPIENTRYP _glptr_EndConditionalRender)(void);
+#define CALL_EndConditionalRender(disp, parameters) \
+    (* GET_EndConditionalRender(disp)) parameters
+static INLINE _glptr_EndConditionalRender GET_EndConditionalRender(struct _glapi_table *disp) {
+   return (_glptr_EndConditionalRender) (GET_by_offset(disp, _gloffset_EndConditionalRender));
 }
 
-static inline void
-SET_VertexAttrib4ivARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib4ivARB, fn);
+static INLINE void SET_EndConditionalRender(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) {
+   SET_by_offset(disp, _gloffset_EndConditionalRender, fn);
 }
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib4sARB) (GLuint, GLshort, GLshort,
-                                                     GLshort, GLshort);
-#define CALL_VertexAttrib4sARB(disp, parameters) \
-    (* GET_VertexAttrib4sARB(disp)) parameters
-static inline _glptr_VertexAttrib4sARB
-GET_VertexAttrib4sARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib4sARB) (GET_by_offset
-                                       (disp, _gloffset_VertexAttrib4sARB));
-}
-
-static inline void
-SET_VertexAttrib4sARB(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, GLshort, GLshort, GLshort,
-                                             GLshort))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib4sARB, fn);
+
+typedef void (GLAPIENTRYP _glptr_EndTransformFeedback)(void);
+#define CALL_EndTransformFeedback(disp, parameters) \
+    (* GET_EndTransformFeedback(disp)) parameters
+static INLINE _glptr_EndTransformFeedback GET_EndTransformFeedback(struct _glapi_table *disp) {
+   return (_glptr_EndTransformFeedback) (GET_by_offset(disp, _gloffset_EndTransformFeedback));
 }
 
-typedef void (GLAPIENTRYP _glptr_VertexAttrib4svARB) (GLuint, const GLshort *);
-
-#define CALL_VertexAttrib4svARB(disp, parameters) \
-    (* GET_VertexAttrib4svARB(disp)) parameters
-static inline _glptr_VertexAttrib4svARB
-GET_VertexAttrib4svARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib4svARB) (GET_by_offset
-                                        (disp, _gloffset_VertexAttrib4svARB));
-}
+static INLINE void SET_EndTransformFeedback(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) {
+   SET_by_offset(disp, _gloffset_EndTransformFeedback, fn);
+}
 
-static inline void
-SET_VertexAttrib4svARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib4svARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib4ubvARB) (GLuint, const GLubyte *);
-
-#define CALL_VertexAttrib4ubvARB(disp, parameters) \
-    (* GET_VertexAttrib4ubvARB(disp)) parameters
-static inline _glptr_VertexAttrib4ubvARB
-GET_VertexAttrib4ubvARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib4ubvARB) (GET_by_offset
-                                         (disp, _gloffset_VertexAttrib4ubvARB));
-}
-
-static inline void
-SET_VertexAttrib4ubvARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLuint, const GLubyte *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib4ubvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttrib4uivARB) (GLuint, const GLuint *);
-
-#define CALL_VertexAttrib4uivARB(disp, parameters) \
-    (* GET_VertexAttrib4uivARB(disp)) parameters
-static inline _glptr_VertexAttrib4uivARB
-GET_VertexAttrib4uivARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib4uivARB) (GET_by_offset
-                                         (disp, _gloffset_VertexAttrib4uivARB));
-}
-
-static inline void
-SET_VertexAttrib4uivARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLuint, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib4uivARB, fn);
+typedef void (GLAPIENTRYP _glptr_GetBooleani_v)(GLenum, GLuint, GLboolean *);
+#define CALL_GetBooleani_v(disp, parameters) \
+    (* GET_GetBooleani_v(disp)) parameters
+static INLINE _glptr_GetBooleani_v GET_GetBooleani_v(struct _glapi_table *disp) {
+   return (_glptr_GetBooleani_v) (GET_by_offset(disp, _gloffset_GetBooleani_v));
 }
 
-typedef void (GLAPIENTRYP _glptr_VertexAttrib4usvARB) (GLuint,
-                                                       const GLushort *);
-#define CALL_VertexAttrib4usvARB(disp, parameters) \
-    (* GET_VertexAttrib4usvARB(disp)) parameters
-static inline _glptr_VertexAttrib4usvARB
-GET_VertexAttrib4usvARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib4usvARB) (GET_by_offset
-                                         (disp, _gloffset_VertexAttrib4usvARB));
-}
-
-static inline void
-SET_VertexAttrib4usvARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLuint, const GLushort *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib4usvARB, fn);
+static INLINE void SET_GetBooleani_v(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLboolean *)) {
+   SET_by_offset(disp, _gloffset_GetBooleani_v, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_VertexAttribPointerARB) (GLuint, GLint, GLenum,
-                                                          GLboolean, GLsizei,
-                                                          const GLvoid *);
-#define CALL_VertexAttribPointerARB(disp, parameters) \
-    (* GET_VertexAttribPointerARB(disp)) parameters
-static inline _glptr_VertexAttribPointerARB
-GET_VertexAttribPointerARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribPointerARB) (GET_by_offset
-                                            (disp,
-                                             _gloffset_VertexAttribPointerARB));
-}
-
-static inline void
-SET_VertexAttribPointerARB(struct _glapi_table *disp,
-                           void (GLAPIENTRYP fn) (GLuint, GLint, GLenum,
-                                                  GLboolean, GLsizei,
-                                                  const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribPointerARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_BindBufferARB) (GLenum, GLuint);
-
-#define CALL_BindBufferARB(disp, parameters) \
-    (* GET_BindBufferARB(disp)) parameters
-static inline _glptr_BindBufferARB
-GET_BindBufferARB(struct _glapi_table *disp)
-{
-    return (_glptr_BindBufferARB) (GET_by_offset
-                                   (disp, _gloffset_BindBufferARB));
-}
-
-static inline void
-SET_BindBufferARB(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_BindBufferARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_BufferDataARB) (GLenum, GLsizeiptrARB,
-                                                 const GLvoid *, GLenum);
-#define CALL_BufferDataARB(disp, parameters) \
-    (* GET_BufferDataARB(disp)) parameters
-static inline _glptr_BufferDataARB
-GET_BufferDataARB(struct _glapi_table *disp)
-{
-    return (_glptr_BufferDataARB) (GET_by_offset
-                                   (disp, _gloffset_BufferDataARB));
-}
-
-static inline void
-SET_BufferDataARB(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, GLsizeiptrARB, const GLvoid *,
-                                         GLenum))
-{
-    SET_by_offset(disp, _gloffset_BufferDataARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_BufferSubDataARB) (GLenum, GLintptrARB,
-                                                    GLsizeiptrARB,
-                                                    const GLvoid *);
-#define CALL_BufferSubDataARB(disp, parameters) \
-    (* GET_BufferSubDataARB(disp)) parameters
-static inline _glptr_BufferSubDataARB
-GET_BufferSubDataARB(struct _glapi_table *disp)
-{
-    return (_glptr_BufferSubDataARB) (GET_by_offset
-                                      (disp, _gloffset_BufferSubDataARB));
-}
-
-static inline void
-SET_BufferSubDataARB(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLenum, GLintptrARB, GLsizeiptrARB,
-                                            const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_BufferSubDataARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_DeleteBuffersARB) (GLsizei, const GLuint *);
-
-#define CALL_DeleteBuffersARB(disp, parameters) \
-    (* GET_DeleteBuffersARB(disp)) parameters
-static inline _glptr_DeleteBuffersARB
-GET_DeleteBuffersARB(struct _glapi_table *disp)
-{
-    return (_glptr_DeleteBuffersARB) (GET_by_offset
-                                      (disp, _gloffset_DeleteBuffersARB));
-}
-
-static inline void
-SET_DeleteBuffersARB(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLsizei, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_DeleteBuffersARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GenBuffersARB) (GLsizei, GLuint *);
-
-#define CALL_GenBuffersARB(disp, parameters) \
-    (* GET_GenBuffersARB(disp)) parameters
-static inline _glptr_GenBuffersARB
-GET_GenBuffersARB(struct _glapi_table *disp)
-{
-    return (_glptr_GenBuffersARB) (GET_by_offset
-                                   (disp, _gloffset_GenBuffersARB));
+typedef GLint (GLAPIENTRYP _glptr_GetFragDataLocation)(GLuint, const GLchar *);
+#define CALL_GetFragDataLocation(disp, parameters) \
+    (* GET_GetFragDataLocation(disp)) parameters
+static INLINE _glptr_GetFragDataLocation GET_GetFragDataLocation(struct _glapi_table *disp) {
+   return (_glptr_GetFragDataLocation) (GET_by_offset(disp, _gloffset_GetFragDataLocation));
 }
 
-static inline void
-SET_GenBuffersARB(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLsizei, GLuint *))
-{
-    SET_by_offset(disp, _gloffset_GenBuffersARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetBufferParameterivARB) (GLenum, GLenum,
-                                                           GLint *);
-#define CALL_GetBufferParameterivARB(disp, parameters) \
-    (* GET_GetBufferParameterivARB(disp)) parameters
-static inline _glptr_GetBufferParameterivARB
-GET_GetBufferParameterivARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetBufferParameterivARB) (GET_by_offset
-                                             (disp,
-                                              _gloffset_GetBufferParameterivARB));
+static INLINE void SET_GetFragDataLocation(struct _glapi_table *disp, GLint (GLAPIENTRYP fn)(GLuint, const GLchar *)) {
+   SET_by_offset(disp, _gloffset_GetFragDataLocation, fn);
 }
 
-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_GetIntegeri_v)(GLenum, GLuint, GLint *);
+#define CALL_GetIntegeri_v(disp, parameters) \
+    (* GET_GetIntegeri_v(disp)) parameters
+static INLINE _glptr_GetIntegeri_v GET_GetIntegeri_v(struct _glapi_table *disp) {
+   return (_glptr_GetIntegeri_v) (GET_by_offset(disp, _gloffset_GetIntegeri_v));
 }
 
-typedef void (GLAPIENTRYP _glptr_GetBufferPointervARB) (GLenum, GLenum,
-                                                        GLvoid **);
-#define CALL_GetBufferPointervARB(disp, parameters) \
-    (* GET_GetBufferPointervARB(disp)) parameters
-static inline _glptr_GetBufferPointervARB
-GET_GetBufferPointervARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetBufferPointervARB) (GET_by_offset
-                                          (disp,
-                                           _gloffset_GetBufferPointervARB));
+static INLINE void SET_GetIntegeri_v(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLint *)) {
+   SET_by_offset(disp, _gloffset_GetIntegeri_v, fn);
 }
 
-static inline void
-SET_GetBufferPointervARB(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (GLenum, GLenum, GLvoid **))
-{
-    SET_by_offset(disp, _gloffset_GetBufferPointervARB, fn);
+typedef const GLubyte * (GLAPIENTRYP _glptr_GetStringi)(GLenum, GLuint);
+#define CALL_GetStringi(disp, parameters) \
+    (* GET_GetStringi(disp)) parameters
+static INLINE _glptr_GetStringi GET_GetStringi(struct _glapi_table *disp) {
+   return (_glptr_GetStringi) (GET_by_offset(disp, _gloffset_GetStringi));
 }
 
-typedef void (GLAPIENTRYP _glptr_GetBufferSubDataARB) (GLenum, GLintptrARB,
-                                                       GLsizeiptrARB, GLvoid *);
-#define CALL_GetBufferSubDataARB(disp, parameters) \
-    (* GET_GetBufferSubDataARB(disp)) parameters
-static inline _glptr_GetBufferSubDataARB
-GET_GetBufferSubDataARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetBufferSubDataARB) (GET_by_offset
-                                         (disp, _gloffset_GetBufferSubDataARB));
+static INLINE void SET_GetStringi(struct _glapi_table *disp, const GLubyte * (GLAPIENTRYP fn)(GLenum, GLuint)) {
+   SET_by_offset(disp, _gloffset_GetStringi, fn);
 }
 
-static inline void
-SET_GetBufferSubDataARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, GLintptrARB,
-                                               GLsizeiptrARB, GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_GetBufferSubDataARB, fn);
+typedef void (GLAPIENTRYP _glptr_GetTexParameterIiv)(GLenum, GLenum, GLint *);
+#define CALL_GetTexParameterIiv(disp, parameters) \
+    (* GET_GetTexParameterIiv(disp)) parameters
+static INLINE _glptr_GetTexParameterIiv GET_GetTexParameterIiv(struct _glapi_table *disp) {
+   return (_glptr_GetTexParameterIiv) (GET_by_offset(disp, _gloffset_GetTexParameterIiv));
 }
 
-typedef GLboolean(GLAPIENTRYP _glptr_IsBufferARB) (GLuint);
+static INLINE void SET_GetTexParameterIiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint *)) {
+   SET_by_offset(disp, _gloffset_GetTexParameterIiv, fn);
+}
 
-#define CALL_IsBufferARB(disp, parameters) \
-    (* GET_IsBufferARB(disp)) parameters
-static inline _glptr_IsBufferARB
-GET_IsBufferARB(struct _glapi_table *disp)
-{
-    return (_glptr_IsBufferARB) (GET_by_offset(disp, _gloffset_IsBufferARB));
+typedef void (GLAPIENTRYP _glptr_GetTexParameterIuiv)(GLenum, GLenum, GLuint *);
+#define CALL_GetTexParameterIuiv(disp, parameters) \
+    (* GET_GetTexParameterIuiv(disp)) parameters
+static INLINE _glptr_GetTexParameterIuiv GET_GetTexParameterIuiv(struct _glapi_table *disp) {
+   return (_glptr_GetTexParameterIuiv) (GET_by_offset(disp, _gloffset_GetTexParameterIuiv));
 }
 
-static inline void
-SET_IsBufferARB(struct _glapi_table *disp, GLboolean(GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_IsBufferARB, fn);
+static INLINE void SET_GetTexParameterIuiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLuint *)) {
+   SET_by_offset(disp, _gloffset_GetTexParameterIuiv, fn);
 }
 
-typedef GLvoid *(GLAPIENTRYP _glptr_MapBufferARB) (GLenum, GLenum);
+typedef void (GLAPIENTRYP _glptr_GetTransformFeedbackVarying)(GLuint, GLuint, GLsizei, GLsizei *, GLsizei *, GLenum *, GLchar *);
+#define CALL_GetTransformFeedbackVarying(disp, parameters) \
+    (* GET_GetTransformFeedbackVarying(disp)) parameters
+static INLINE _glptr_GetTransformFeedbackVarying GET_GetTransformFeedbackVarying(struct _glapi_table *disp) {
+   return (_glptr_GetTransformFeedbackVarying) (GET_by_offset(disp, _gloffset_GetTransformFeedbackVarying));
+}
 
-#define CALL_MapBufferARB(disp, parameters) \
-    (* GET_MapBufferARB(disp)) parameters
-static inline _glptr_MapBufferARB
-GET_MapBufferARB(struct _glapi_table *disp)
-{
-    return (_glptr_MapBufferARB) (GET_by_offset(disp, _gloffset_MapBufferARB));
+static INLINE void SET_GetTransformFeedbackVarying(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLsizei, GLsizei *, GLsizei *, GLenum *, GLchar *)) {
+   SET_by_offset(disp, _gloffset_GetTransformFeedbackVarying, fn);
 }
 
-static inline void
-SET_MapBufferARB(struct _glapi_table *disp,
-                 GLvoid * (GLAPIENTRYP fn) (GLenum, GLenum))
-{
-    SET_by_offset(disp, _gloffset_MapBufferARB, fn);
+typedef void (GLAPIENTRYP _glptr_GetUniformuiv)(GLuint, GLint, GLuint *);
+#define CALL_GetUniformuiv(disp, parameters) \
+    (* GET_GetUniformuiv(disp)) parameters
+static INLINE _glptr_GetUniformuiv GET_GetUniformuiv(struct _glapi_table *disp) {
+   return (_glptr_GetUniformuiv) (GET_by_offset(disp, _gloffset_GetUniformuiv));
 }
 
-typedef GLboolean(GLAPIENTRYP _glptr_UnmapBufferARB) (GLenum);
+static INLINE void SET_GetUniformuiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLuint *)) {
+   SET_by_offset(disp, _gloffset_GetUniformuiv, fn);
+}
 
-#define CALL_UnmapBufferARB(disp, parameters) \
-    (* GET_UnmapBufferARB(disp)) parameters
-static inline _glptr_UnmapBufferARB
-GET_UnmapBufferARB(struct _glapi_table *disp)
-{
-    return (_glptr_UnmapBufferARB) (GET_by_offset
-                                    (disp, _gloffset_UnmapBufferARB));
+typedef void (GLAPIENTRYP _glptr_GetVertexAttribIiv)(GLuint, GLenum, GLint *);
+#define CALL_GetVertexAttribIiv(disp, parameters) \
+    (* GET_GetVertexAttribIiv(disp)) parameters
+static INLINE _glptr_GetVertexAttribIiv GET_GetVertexAttribIiv(struct _glapi_table *disp) {
+   return (_glptr_GetVertexAttribIiv) (GET_by_offset(disp, _gloffset_GetVertexAttribIiv));
 }
 
-static inline void
-SET_UnmapBufferARB(struct _glapi_table *disp,
-                   GLboolean(GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_UnmapBufferARB, fn);
+static INLINE void SET_GetVertexAttribIiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint *)) {
+   SET_by_offset(disp, _gloffset_GetVertexAttribIiv, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_BeginQueryARB) (GLenum, GLuint);
+typedef void (GLAPIENTRYP _glptr_GetVertexAttribIuiv)(GLuint, GLenum, GLuint *);
+#define CALL_GetVertexAttribIuiv(disp, parameters) \
+    (* GET_GetVertexAttribIuiv(disp)) parameters
+static INLINE _glptr_GetVertexAttribIuiv GET_GetVertexAttribIuiv(struct _glapi_table *disp) {
+   return (_glptr_GetVertexAttribIuiv) (GET_by_offset(disp, _gloffset_GetVertexAttribIuiv));
+}
 
-#define CALL_BeginQueryARB(disp, parameters) \
-    (* GET_BeginQueryARB(disp)) parameters
-static inline _glptr_BeginQueryARB
-GET_BeginQueryARB(struct _glapi_table *disp)
-{
-    return (_glptr_BeginQueryARB) (GET_by_offset
-                                   (disp, _gloffset_BeginQueryARB));
+static INLINE void SET_GetVertexAttribIuiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLuint *)) {
+   SET_by_offset(disp, _gloffset_GetVertexAttribIuiv, fn);
 }
 
-static inline void
-SET_BeginQueryARB(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_BeginQueryARB, fn);
+typedef GLboolean (GLAPIENTRYP _glptr_IsEnabledi)(GLenum, GLuint);
+#define CALL_IsEnabledi(disp, parameters) \
+    (* GET_IsEnabledi(disp)) parameters
+static INLINE _glptr_IsEnabledi GET_IsEnabledi(struct _glapi_table *disp) {
+   return (_glptr_IsEnabledi) (GET_by_offset(disp, _gloffset_IsEnabledi));
 }
 
-typedef void (GLAPIENTRYP _glptr_DeleteQueriesARB) (GLsizei, const GLuint *);
+static INLINE void SET_IsEnabledi(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLenum, GLuint)) {
+   SET_by_offset(disp, _gloffset_IsEnabledi, fn);
+}
 
-#define CALL_DeleteQueriesARB(disp, parameters) \
-    (* GET_DeleteQueriesARB(disp)) parameters
-static inline _glptr_DeleteQueriesARB
-GET_DeleteQueriesARB(struct _glapi_table *disp)
-{
-    return (_glptr_DeleteQueriesARB) (GET_by_offset
-                                      (disp, _gloffset_DeleteQueriesARB));
+typedef void (GLAPIENTRYP _glptr_TexParameterIiv)(GLenum, GLenum, const GLint *);
+#define CALL_TexParameterIiv(disp, parameters) \
+    (* GET_TexParameterIiv(disp)) parameters
+static INLINE _glptr_TexParameterIiv GET_TexParameterIiv(struct _glapi_table *disp) {
+   return (_glptr_TexParameterIiv) (GET_by_offset(disp, _gloffset_TexParameterIiv));
 }
 
-static inline void
-SET_DeleteQueriesARB(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLsizei, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_DeleteQueriesARB, fn);
+static INLINE void SET_TexParameterIiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLint *)) {
+   SET_by_offset(disp, _gloffset_TexParameterIiv, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_EndQueryARB) (GLenum);
+typedef void (GLAPIENTRYP _glptr_TexParameterIuiv)(GLenum, GLenum, const GLuint *);
+#define CALL_TexParameterIuiv(disp, parameters) \
+    (* GET_TexParameterIuiv(disp)) parameters
+static INLINE _glptr_TexParameterIuiv GET_TexParameterIuiv(struct _glapi_table *disp) {
+   return (_glptr_TexParameterIuiv) (GET_by_offset(disp, _gloffset_TexParameterIuiv));
+}
 
-#define CALL_EndQueryARB(disp, parameters) \
-    (* GET_EndQueryARB(disp)) parameters
-static inline _glptr_EndQueryARB
-GET_EndQueryARB(struct _glapi_table *disp)
-{
-    return (_glptr_EndQueryARB) (GET_by_offset(disp, _gloffset_EndQueryARB));
+static INLINE void SET_TexParameterIuiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLuint *)) {
+   SET_by_offset(disp, _gloffset_TexParameterIuiv, fn);
 }
 
-static inline void
-SET_EndQueryARB(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_EndQueryARB, fn);
+typedef void (GLAPIENTRYP _glptr_TransformFeedbackVaryings)(GLuint, GLsizei, const GLchar * const *, GLenum);
+#define CALL_TransformFeedbackVaryings(disp, parameters) \
+    (* GET_TransformFeedbackVaryings(disp)) parameters
+static INLINE _glptr_TransformFeedbackVaryings GET_TransformFeedbackVaryings(struct _glapi_table *disp) {
+   return (_glptr_TransformFeedbackVaryings) (GET_by_offset(disp, _gloffset_TransformFeedbackVaryings));
 }
 
-typedef void (GLAPIENTRYP _glptr_GenQueriesARB) (GLsizei, GLuint *);
+static INLINE void SET_TransformFeedbackVaryings(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLchar * const *, GLenum)) {
+   SET_by_offset(disp, _gloffset_TransformFeedbackVaryings, fn);
+}
 
-#define CALL_GenQueriesARB(disp, parameters) \
-    (* GET_GenQueriesARB(disp)) parameters
-static inline _glptr_GenQueriesARB
-GET_GenQueriesARB(struct _glapi_table *disp)
-{
-    return (_glptr_GenQueriesARB) (GET_by_offset
-                                   (disp, _gloffset_GenQueriesARB));
+typedef void (GLAPIENTRYP _glptr_Uniform1ui)(GLint, GLuint);
+#define CALL_Uniform1ui(disp, parameters) \
+    (* GET_Uniform1ui(disp)) parameters
+static INLINE _glptr_Uniform1ui GET_Uniform1ui(struct _glapi_table *disp) {
+   return (_glptr_Uniform1ui) (GET_by_offset(disp, _gloffset_Uniform1ui));
 }
 
-static inline void
-SET_GenQueriesARB(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLsizei, GLuint *))
-{
-    SET_by_offset(disp, _gloffset_GenQueriesARB, fn);
+static INLINE void SET_Uniform1ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLuint)) {
+   SET_by_offset(disp, _gloffset_Uniform1ui, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_GetQueryObjectivARB) (GLuint, GLenum, GLint *);
+typedef void (GLAPIENTRYP _glptr_Uniform1uiv)(GLint, GLsizei, const GLuint *);
+#define CALL_Uniform1uiv(disp, parameters) \
+    (* GET_Uniform1uiv(disp)) parameters
+static INLINE _glptr_Uniform1uiv GET_Uniform1uiv(struct _glapi_table *disp) {
+   return (_glptr_Uniform1uiv) (GET_by_offset(disp, _gloffset_Uniform1uiv));
+}
 
-#define CALL_GetQueryObjectivARB(disp, parameters) \
-    (* GET_GetQueryObjectivARB(disp)) parameters
-static inline _glptr_GetQueryObjectivARB
-GET_GetQueryObjectivARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetQueryObjectivARB) (GET_by_offset
-                                         (disp, _gloffset_GetQueryObjectivARB));
+static INLINE void SET_Uniform1uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, const GLuint *)) {
+   SET_by_offset(disp, _gloffset_Uniform1uiv, fn);
 }
 
-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_Uniform2ui)(GLint, GLuint, GLuint);
+#define CALL_Uniform2ui(disp, parameters) \
+    (* GET_Uniform2ui(disp)) parameters
+static INLINE _glptr_Uniform2ui GET_Uniform2ui(struct _glapi_table *disp) {
+   return (_glptr_Uniform2ui) (GET_by_offset(disp, _gloffset_Uniform2ui));
 }
 
-typedef void (GLAPIENTRYP _glptr_GetQueryObjectuivARB) (GLuint, GLenum,
-                                                        GLuint *);
-#define CALL_GetQueryObjectuivARB(disp, parameters) \
-    (* GET_GetQueryObjectuivARB(disp)) parameters
-static inline _glptr_GetQueryObjectuivARB
-GET_GetQueryObjectuivARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetQueryObjectuivARB) (GET_by_offset
-                                          (disp,
-                                           _gloffset_GetQueryObjectuivARB));
+static INLINE void SET_Uniform2ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLuint, GLuint)) {
+   SET_by_offset(disp, _gloffset_Uniform2ui, fn);
 }
 
-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_Uniform2uiv)(GLint, GLsizei, const GLuint *);
+#define CALL_Uniform2uiv(disp, parameters) \
+    (* GET_Uniform2uiv(disp)) parameters
+static INLINE _glptr_Uniform2uiv GET_Uniform2uiv(struct _glapi_table *disp) {
+   return (_glptr_Uniform2uiv) (GET_by_offset(disp, _gloffset_Uniform2uiv));
 }
 
-typedef void (GLAPIENTRYP _glptr_GetQueryivARB) (GLenum, GLenum, GLint *);
+static INLINE void SET_Uniform2uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, const GLuint *)) {
+   SET_by_offset(disp, _gloffset_Uniform2uiv, fn);
+}
 
-#define CALL_GetQueryivARB(disp, parameters) \
-    (* GET_GetQueryivARB(disp)) parameters
-static inline _glptr_GetQueryivARB
-GET_GetQueryivARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetQueryivARB) (GET_by_offset
-                                   (disp, _gloffset_GetQueryivARB));
+typedef void (GLAPIENTRYP _glptr_Uniform3ui)(GLint, GLuint, GLuint, GLuint);
+#define CALL_Uniform3ui(disp, parameters) \
+    (* GET_Uniform3ui(disp)) parameters
+static INLINE _glptr_Uniform3ui GET_Uniform3ui(struct _glapi_table *disp) {
+   return (_glptr_Uniform3ui) (GET_by_offset(disp, _gloffset_Uniform3ui));
 }
 
-static inline void
-SET_GetQueryivARB(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetQueryivARB, fn);
+static INLINE void SET_Uniform3ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLuint, GLuint, GLuint)) {
+   SET_by_offset(disp, _gloffset_Uniform3ui, fn);
 }
 
-typedef GLboolean(GLAPIENTRYP _glptr_IsQueryARB) (GLuint);
+typedef void (GLAPIENTRYP _glptr_Uniform3uiv)(GLint, GLsizei, const GLuint *);
+#define CALL_Uniform3uiv(disp, parameters) \
+    (* GET_Uniform3uiv(disp)) parameters
+static INLINE _glptr_Uniform3uiv GET_Uniform3uiv(struct _glapi_table *disp) {
+   return (_glptr_Uniform3uiv) (GET_by_offset(disp, _gloffset_Uniform3uiv));
+}
 
-#define CALL_IsQueryARB(disp, parameters) \
-    (* GET_IsQueryARB(disp)) parameters
-static inline _glptr_IsQueryARB
-GET_IsQueryARB(struct _glapi_table *disp)
-{
-    return (_glptr_IsQueryARB) (GET_by_offset(disp, _gloffset_IsQueryARB));
+static INLINE void SET_Uniform3uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, const GLuint *)) {
+   SET_by_offset(disp, _gloffset_Uniform3uiv, fn);
 }
 
-static inline void
-SET_IsQueryARB(struct _glapi_table *disp, GLboolean(GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_IsQueryARB, fn);
+typedef void (GLAPIENTRYP _glptr_Uniform4ui)(GLint, GLuint, GLuint, GLuint, GLuint);
+#define CALL_Uniform4ui(disp, parameters) \
+    (* GET_Uniform4ui(disp)) parameters
+static INLINE _glptr_Uniform4ui GET_Uniform4ui(struct _glapi_table *disp) {
+   return (_glptr_Uniform4ui) (GET_by_offset(disp, _gloffset_Uniform4ui));
 }
 
-typedef void (GLAPIENTRYP _glptr_AttachObjectARB) (GLhandleARB, GLhandleARB);
+static INLINE void SET_Uniform4ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLuint, GLuint, GLuint, GLuint)) {
+   SET_by_offset(disp, _gloffset_Uniform4ui, fn);
+}
 
-#define CALL_AttachObjectARB(disp, parameters) \
-    (* GET_AttachObjectARB(disp)) parameters
-static inline _glptr_AttachObjectARB
-GET_AttachObjectARB(struct _glapi_table *disp)
-{
-    return (_glptr_AttachObjectARB) (GET_by_offset
-                                     (disp, _gloffset_AttachObjectARB));
+typedef void (GLAPIENTRYP _glptr_Uniform4uiv)(GLint, GLsizei, const GLuint *);
+#define CALL_Uniform4uiv(disp, parameters) \
+    (* GET_Uniform4uiv(disp)) parameters
+static INLINE _glptr_Uniform4uiv GET_Uniform4uiv(struct _glapi_table *disp) {
+   return (_glptr_Uniform4uiv) (GET_by_offset(disp, _gloffset_Uniform4uiv));
+}
+
+static INLINE void SET_Uniform4uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, const GLuint *)) {
+   SET_by_offset(disp, _gloffset_Uniform4uiv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_VertexAttribI1iv)(GLuint, const GLint *);
+#define CALL_VertexAttribI1iv(disp, parameters) \
+    (* GET_VertexAttribI1iv(disp)) parameters
+static INLINE _glptr_VertexAttribI1iv GET_VertexAttribI1iv(struct _glapi_table *disp) {
+   return (_glptr_VertexAttribI1iv) (GET_by_offset(disp, _gloffset_VertexAttribI1iv));
+}
+
+static INLINE void SET_VertexAttribI1iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLint *)) {
+   SET_by_offset(disp, _gloffset_VertexAttribI1iv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_VertexAttribI1uiv)(GLuint, const GLuint *);
+#define CALL_VertexAttribI1uiv(disp, parameters) \
+    (* GET_VertexAttribI1uiv(disp)) parameters
+static INLINE _glptr_VertexAttribI1uiv GET_VertexAttribI1uiv(struct _glapi_table *disp) {
+   return (_glptr_VertexAttribI1uiv) (GET_by_offset(disp, _gloffset_VertexAttribI1uiv));
+}
+
+static INLINE void SET_VertexAttribI1uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLuint *)) {
+   SET_by_offset(disp, _gloffset_VertexAttribI1uiv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_VertexAttribI4bv)(GLuint, const GLbyte *);
+#define CALL_VertexAttribI4bv(disp, parameters) \
+    (* GET_VertexAttribI4bv(disp)) parameters
+static INLINE _glptr_VertexAttribI4bv GET_VertexAttribI4bv(struct _glapi_table *disp) {
+   return (_glptr_VertexAttribI4bv) (GET_by_offset(disp, _gloffset_VertexAttribI4bv));
+}
+
+static INLINE void SET_VertexAttribI4bv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLbyte *)) {
+   SET_by_offset(disp, _gloffset_VertexAttribI4bv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_VertexAttribI4sv)(GLuint, const GLshort *);
+#define CALL_VertexAttribI4sv(disp, parameters) \
+    (* GET_VertexAttribI4sv(disp)) parameters
+static INLINE _glptr_VertexAttribI4sv GET_VertexAttribI4sv(struct _glapi_table *disp) {
+   return (_glptr_VertexAttribI4sv) (GET_by_offset(disp, _gloffset_VertexAttribI4sv));
+}
+
+static INLINE void SET_VertexAttribI4sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLshort *)) {
+   SET_by_offset(disp, _gloffset_VertexAttribI4sv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_VertexAttribI4ubv)(GLuint, const GLubyte *);
+#define CALL_VertexAttribI4ubv(disp, parameters) \
+    (* GET_VertexAttribI4ubv(disp)) parameters
+static INLINE _glptr_VertexAttribI4ubv GET_VertexAttribI4ubv(struct _glapi_table *disp) {
+   return (_glptr_VertexAttribI4ubv) (GET_by_offset(disp, _gloffset_VertexAttribI4ubv));
+}
+
+static INLINE void SET_VertexAttribI4ubv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLubyte *)) {
+   SET_by_offset(disp, _gloffset_VertexAttribI4ubv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_VertexAttribI4usv)(GLuint, const GLushort *);
+#define CALL_VertexAttribI4usv(disp, parameters) \
+    (* GET_VertexAttribI4usv(disp)) parameters
+static INLINE _glptr_VertexAttribI4usv GET_VertexAttribI4usv(struct _glapi_table *disp) {
+   return (_glptr_VertexAttribI4usv) (GET_by_offset(disp, _gloffset_VertexAttribI4usv));
+}
+
+static INLINE void SET_VertexAttribI4usv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLushort *)) {
+   SET_by_offset(disp, _gloffset_VertexAttribI4usv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_VertexAttribIPointer)(GLuint, GLint, GLenum, GLsizei, const GLvoid *);
+#define CALL_VertexAttribIPointer(disp, parameters) \
+    (* GET_VertexAttribIPointer(disp)) parameters
+static INLINE _glptr_VertexAttribIPointer GET_VertexAttribIPointer(struct _glapi_table *disp) {
+   return (_glptr_VertexAttribIPointer) (GET_by_offset(disp, _gloffset_VertexAttribIPointer));
+}
+
+static INLINE void SET_VertexAttribIPointer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLenum, GLsizei, const GLvoid *)) {
+   SET_by_offset(disp, _gloffset_VertexAttribIPointer, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_PrimitiveRestartIndex)(GLuint);
+#define CALL_PrimitiveRestartIndex(disp, parameters) \
+    (* GET_PrimitiveRestartIndex(disp)) parameters
+static INLINE _glptr_PrimitiveRestartIndex GET_PrimitiveRestartIndex(struct _glapi_table *disp) {
+   return (_glptr_PrimitiveRestartIndex) (GET_by_offset(disp, _gloffset_PrimitiveRestartIndex));
+}
+
+static INLINE void SET_PrimitiveRestartIndex(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) {
+   SET_by_offset(disp, _gloffset_PrimitiveRestartIndex, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_TexBuffer)(GLenum, GLenum, GLuint);
+#define CALL_TexBuffer(disp, parameters) \
+    (* GET_TexBuffer(disp)) parameters
+static INLINE _glptr_TexBuffer GET_TexBuffer(struct _glapi_table *disp) {
+   return (_glptr_TexBuffer) (GET_by_offset(disp, _gloffset_TexBuffer));
+}
+
+static INLINE void SET_TexBuffer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLuint)) {
+   SET_by_offset(disp, _gloffset_TexBuffer, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_FramebufferTexture)(GLenum, GLenum, GLuint, GLint);
+#define CALL_FramebufferTexture(disp, parameters) \
+    (* GET_FramebufferTexture(disp)) parameters
+static INLINE _glptr_FramebufferTexture GET_FramebufferTexture(struct _glapi_table *disp) {
+   return (_glptr_FramebufferTexture) (GET_by_offset(disp, _gloffset_FramebufferTexture));
+}
+
+static INLINE void SET_FramebufferTexture(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLuint, GLint)) {
+   SET_by_offset(disp, _gloffset_FramebufferTexture, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetBufferParameteri64v)(GLenum, GLenum, GLint64 *);
+#define CALL_GetBufferParameteri64v(disp, parameters) \
+    (* GET_GetBufferParameteri64v(disp)) parameters
+static INLINE _glptr_GetBufferParameteri64v GET_GetBufferParameteri64v(struct _glapi_table *disp) {
+   return (_glptr_GetBufferParameteri64v) (GET_by_offset(disp, _gloffset_GetBufferParameteri64v));
+}
+
+static INLINE void SET_GetBufferParameteri64v(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint64 *)) {
+   SET_by_offset(disp, _gloffset_GetBufferParameteri64v, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetInteger64i_v)(GLenum, GLuint, GLint64 *);
+#define CALL_GetInteger64i_v(disp, parameters) \
+    (* GET_GetInteger64i_v(disp)) parameters
+static INLINE _glptr_GetInteger64i_v GET_GetInteger64i_v(struct _glapi_table *disp) {
+   return (_glptr_GetInteger64i_v) (GET_by_offset(disp, _gloffset_GetInteger64i_v));
+}
+
+static INLINE void SET_GetInteger64i_v(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLint64 *)) {
+   SET_by_offset(disp, _gloffset_GetInteger64i_v, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_VertexAttribDivisor)(GLuint, GLuint);
+#define CALL_VertexAttribDivisor(disp, parameters) \
+    (* GET_VertexAttribDivisor(disp)) parameters
+static INLINE _glptr_VertexAttribDivisor GET_VertexAttribDivisor(struct _glapi_table *disp) {
+   return (_glptr_VertexAttribDivisor) (GET_by_offset(disp, _gloffset_VertexAttribDivisor));
+}
+
+static INLINE void SET_VertexAttribDivisor(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint)) {
+   SET_by_offset(disp, _gloffset_VertexAttribDivisor, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_BindProgramARB)(GLenum, GLuint);
+#define CALL_BindProgramARB(disp, parameters) \
+    (* GET_BindProgramARB(disp)) parameters
+static INLINE _glptr_BindProgramARB GET_BindProgramARB(struct _glapi_table *disp) {
+   return (_glptr_BindProgramARB) (GET_by_offset(disp, _gloffset_BindProgramARB));
+}
+
+static INLINE void SET_BindProgramARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
+   SET_by_offset(disp, _gloffset_BindProgramARB, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_DeleteProgramsARB)(GLsizei, const GLuint *);
+#define CALL_DeleteProgramsARB(disp, parameters) \
+    (* GET_DeleteProgramsARB(disp)) parameters
+static INLINE _glptr_DeleteProgramsARB GET_DeleteProgramsARB(struct _glapi_table *disp) {
+   return (_glptr_DeleteProgramsARB) (GET_by_offset(disp, _gloffset_DeleteProgramsARB));
+}
+
+static INLINE void SET_DeleteProgramsARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLuint *)) {
+   SET_by_offset(disp, _gloffset_DeleteProgramsARB, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GenProgramsARB)(GLsizei, GLuint *);
+#define CALL_GenProgramsARB(disp, parameters) \
+    (* GET_GenProgramsARB(disp)) parameters
+static INLINE _glptr_GenProgramsARB GET_GenProgramsARB(struct _glapi_table *disp) {
+   return (_glptr_GenProgramsARB) (GET_by_offset(disp, _gloffset_GenProgramsARB));
+}
+
+static INLINE void SET_GenProgramsARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLuint *)) {
+   SET_by_offset(disp, _gloffset_GenProgramsARB, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetProgramEnvParameterdvARB)(GLenum, GLuint, GLdouble *);
+#define CALL_GetProgramEnvParameterdvARB(disp, parameters) \
+    (* GET_GetProgramEnvParameterdvARB(disp)) parameters
+static INLINE _glptr_GetProgramEnvParameterdvARB GET_GetProgramEnvParameterdvARB(struct _glapi_table *disp) {
+   return (_glptr_GetProgramEnvParameterdvARB) (GET_by_offset(disp, _gloffset_GetProgramEnvParameterdvARB));
+}
+
+static INLINE void SET_GetProgramEnvParameterdvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLdouble *)) {
+   SET_by_offset(disp, _gloffset_GetProgramEnvParameterdvARB, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetProgramEnvParameterfvARB)(GLenum, GLuint, GLfloat *);
+#define CALL_GetProgramEnvParameterfvARB(disp, parameters) \
+    (* GET_GetProgramEnvParameterfvARB(disp)) parameters
+static INLINE _glptr_GetProgramEnvParameterfvARB GET_GetProgramEnvParameterfvARB(struct _glapi_table *disp) {
+   return (_glptr_GetProgramEnvParameterfvARB) (GET_by_offset(disp, _gloffset_GetProgramEnvParameterfvARB));
+}
+
+static INLINE void SET_GetProgramEnvParameterfvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLfloat *)) {
+   SET_by_offset(disp, _gloffset_GetProgramEnvParameterfvARB, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetProgramLocalParameterdvARB)(GLenum, GLuint, GLdouble *);
+#define CALL_GetProgramLocalParameterdvARB(disp, parameters) \
+    (* GET_GetProgramLocalParameterdvARB(disp)) parameters
+static INLINE _glptr_GetProgramLocalParameterdvARB GET_GetProgramLocalParameterdvARB(struct _glapi_table *disp) {
+   return (_glptr_GetProgramLocalParameterdvARB) (GET_by_offset(disp, _gloffset_GetProgramLocalParameterdvARB));
+}
+
+static INLINE void SET_GetProgramLocalParameterdvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLdouble *)) {
+   SET_by_offset(disp, _gloffset_GetProgramLocalParameterdvARB, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetProgramLocalParameterfvARB)(GLenum, GLuint, GLfloat *);
+#define CALL_GetProgramLocalParameterfvARB(disp, parameters) \
+    (* GET_GetProgramLocalParameterfvARB(disp)) parameters
+static INLINE _glptr_GetProgramLocalParameterfvARB GET_GetProgramLocalParameterfvARB(struct _glapi_table *disp) {
+   return (_glptr_GetProgramLocalParameterfvARB) (GET_by_offset(disp, _gloffset_GetProgramLocalParameterfvARB));
+}
+
+static INLINE void SET_GetProgramLocalParameterfvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLfloat *)) {
+   SET_by_offset(disp, _gloffset_GetProgramLocalParameterfvARB, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetProgramStringARB)(GLenum, GLenum, GLvoid *);
+#define CALL_GetProgramStringARB(disp, parameters) \
+    (* GET_GetProgramStringARB(disp)) parameters
+static INLINE _glptr_GetProgramStringARB GET_GetProgramStringARB(struct _glapi_table *disp) {
+   return (_glptr_GetProgramStringARB) (GET_by_offset(disp, _gloffset_GetProgramStringARB));
+}
+
+static INLINE void SET_GetProgramStringARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLvoid *)) {
+   SET_by_offset(disp, _gloffset_GetProgramStringARB, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetProgramivARB)(GLenum, GLenum, GLint *);
+#define CALL_GetProgramivARB(disp, parameters) \
+    (* GET_GetProgramivARB(disp)) parameters
+static INLINE _glptr_GetProgramivARB GET_GetProgramivARB(struct _glapi_table *disp) {
+   return (_glptr_GetProgramivARB) (GET_by_offset(disp, _gloffset_GetProgramivARB));
+}
+
+static INLINE void SET_GetProgramivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint *)) {
+   SET_by_offset(disp, _gloffset_GetProgramivARB, fn);
+}
+
+typedef GLboolean (GLAPIENTRYP _glptr_IsProgramARB)(GLuint);
+#define CALL_IsProgramARB(disp, parameters) \
+    (* GET_IsProgramARB(disp)) parameters
+static INLINE _glptr_IsProgramARB GET_IsProgramARB(struct _glapi_table *disp) {
+   return (_glptr_IsProgramARB) (GET_by_offset(disp, _gloffset_IsProgramARB));
+}
+
+static INLINE void SET_IsProgramARB(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLuint)) {
+   SET_by_offset(disp, _gloffset_IsProgramARB, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_ProgramEnvParameter4dARB)(GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
+#define CALL_ProgramEnvParameter4dARB(disp, parameters) \
+    (* GET_ProgramEnvParameter4dARB(disp)) parameters
+static INLINE _glptr_ProgramEnvParameter4dARB GET_ProgramEnvParameter4dARB(struct _glapi_table *disp) {
+   return (_glptr_ProgramEnvParameter4dARB) (GET_by_offset(disp, _gloffset_ProgramEnvParameter4dARB));
+}
+
+static INLINE void SET_ProgramEnvParameter4dARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble)) {
+   SET_by_offset(disp, _gloffset_ProgramEnvParameter4dARB, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_ProgramEnvParameter4dvARB)(GLenum, GLuint, const GLdouble *);
+#define CALL_ProgramEnvParameter4dvARB(disp, parameters) \
+    (* GET_ProgramEnvParameter4dvARB(disp)) parameters
+static INLINE _glptr_ProgramEnvParameter4dvARB GET_ProgramEnvParameter4dvARB(struct _glapi_table *disp) {
+   return (_glptr_ProgramEnvParameter4dvARB) (GET_by_offset(disp, _gloffset_ProgramEnvParameter4dvARB));
+}
+
+static INLINE void SET_ProgramEnvParameter4dvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, const GLdouble *)) {
+   SET_by_offset(disp, _gloffset_ProgramEnvParameter4dvARB, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_ProgramEnvParameter4fARB)(GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
+#define CALL_ProgramEnvParameter4fARB(disp, parameters) \
+    (* GET_ProgramEnvParameter4fARB(disp)) parameters
+static INLINE _glptr_ProgramEnvParameter4fARB GET_ProgramEnvParameter4fARB(struct _glapi_table *disp) {
+   return (_glptr_ProgramEnvParameter4fARB) (GET_by_offset(disp, _gloffset_ProgramEnvParameter4fARB));
+}
+
+static INLINE void SET_ProgramEnvParameter4fARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat)) {
+   SET_by_offset(disp, _gloffset_ProgramEnvParameter4fARB, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_ProgramEnvParameter4fvARB)(GLenum, GLuint, const GLfloat *);
+#define CALL_ProgramEnvParameter4fvARB(disp, parameters) \
+    (* GET_ProgramEnvParameter4fvARB(disp)) parameters
+static INLINE _glptr_ProgramEnvParameter4fvARB GET_ProgramEnvParameter4fvARB(struct _glapi_table *disp) {
+   return (_glptr_ProgramEnvParameter4fvARB) (GET_by_offset(disp, _gloffset_ProgramEnvParameter4fvARB));
+}
+
+static INLINE void SET_ProgramEnvParameter4fvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, const GLfloat *)) {
+   SET_by_offset(disp, _gloffset_ProgramEnvParameter4fvARB, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_ProgramLocalParameter4dARB)(GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
+#define CALL_ProgramLocalParameter4dARB(disp, parameters) \
+    (* GET_ProgramLocalParameter4dARB(disp)) parameters
+static INLINE _glptr_ProgramLocalParameter4dARB GET_ProgramLocalParameter4dARB(struct _glapi_table *disp) {
+   return (_glptr_ProgramLocalParameter4dARB) (GET_by_offset(disp, _gloffset_ProgramLocalParameter4dARB));
+}
+
+static INLINE void SET_ProgramLocalParameter4dARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble)) {
+   SET_by_offset(disp, _gloffset_ProgramLocalParameter4dARB, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_ProgramLocalParameter4dvARB)(GLenum, GLuint, const GLdouble *);
+#define CALL_ProgramLocalParameter4dvARB(disp, parameters) \
+    (* GET_ProgramLocalParameter4dvARB(disp)) parameters
+static INLINE _glptr_ProgramLocalParameter4dvARB GET_ProgramLocalParameter4dvARB(struct _glapi_table *disp) {
+   return (_glptr_ProgramLocalParameter4dvARB) (GET_by_offset(disp, _gloffset_ProgramLocalParameter4dvARB));
+}
+
+static INLINE void SET_ProgramLocalParameter4dvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, const GLdouble *)) {
+   SET_by_offset(disp, _gloffset_ProgramLocalParameter4dvARB, fn);
 }
 
-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_ProgramLocalParameter4fARB)(GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
+#define CALL_ProgramLocalParameter4fARB(disp, parameters) \
+    (* GET_ProgramLocalParameter4fARB(disp)) parameters
+static INLINE _glptr_ProgramLocalParameter4fARB GET_ProgramLocalParameter4fARB(struct _glapi_table *disp) {
+   return (_glptr_ProgramLocalParameter4fARB) (GET_by_offset(disp, _gloffset_ProgramLocalParameter4fARB));
 }
 
-typedef void (GLAPIENTRYP _glptr_CompileShaderARB) (GLhandleARB);
+static INLINE void SET_ProgramLocalParameter4fARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat)) {
+   SET_by_offset(disp, _gloffset_ProgramLocalParameter4fARB, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_ProgramLocalParameter4fvARB)(GLenum, GLuint, const GLfloat *);
+#define CALL_ProgramLocalParameter4fvARB(disp, parameters) \
+    (* GET_ProgramLocalParameter4fvARB(disp)) parameters
+static INLINE _glptr_ProgramLocalParameter4fvARB GET_ProgramLocalParameter4fvARB(struct _glapi_table *disp) {
+   return (_glptr_ProgramLocalParameter4fvARB) (GET_by_offset(disp, _gloffset_ProgramLocalParameter4fvARB));
+}
 
-#define CALL_CompileShaderARB(disp, parameters) \
-    (* GET_CompileShaderARB(disp)) parameters
-static inline _glptr_CompileShaderARB
-GET_CompileShaderARB(struct _glapi_table *disp)
-{
-    return (_glptr_CompileShaderARB) (GET_by_offset
-                                      (disp, _gloffset_CompileShaderARB));
+static INLINE void SET_ProgramLocalParameter4fvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, const GLfloat *)) {
+   SET_by_offset(disp, _gloffset_ProgramLocalParameter4fvARB, fn);
 }
 
-static inline void
-SET_CompileShaderARB(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLhandleARB))
-{
-    SET_by_offset(disp, _gloffset_CompileShaderARB, fn);
+typedef void (GLAPIENTRYP _glptr_ProgramStringARB)(GLenum, GLenum, GLsizei, const GLvoid *);
+#define CALL_ProgramStringARB(disp, parameters) \
+    (* GET_ProgramStringARB(disp)) parameters
+static INLINE _glptr_ProgramStringARB GET_ProgramStringARB(struct _glapi_table *disp) {
+   return (_glptr_ProgramStringARB) (GET_by_offset(disp, _gloffset_ProgramStringARB));
 }
 
-typedef GLhandleARB(GLAPIENTRYP _glptr_CreateProgramObjectARB) (void);
+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_VertexAttrib1fARB)(GLuint, GLfloat);
+#define CALL_VertexAttrib1fARB(disp, parameters) \
+    (* GET_VertexAttrib1fARB(disp)) parameters
+static INLINE _glptr_VertexAttrib1fARB GET_VertexAttrib1fARB(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib1fARB) (GET_by_offset(disp, _gloffset_VertexAttrib1fARB));
+}
+
+static INLINE void SET_VertexAttrib1fARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLfloat)) {
+   SET_by_offset(disp, _gloffset_VertexAttrib1fARB, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_VertexAttrib1fvARB)(GLuint, const GLfloat *);
+#define CALL_VertexAttrib1fvARB(disp, parameters) \
+    (* GET_VertexAttrib1fvARB(disp)) parameters
+static INLINE _glptr_VertexAttrib1fvARB GET_VertexAttrib1fvARB(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib1fvARB) (GET_by_offset(disp, _gloffset_VertexAttrib1fvARB));
+}
+
+static INLINE void SET_VertexAttrib1fvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLfloat *)) {
+   SET_by_offset(disp, _gloffset_VertexAttrib1fvARB, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_VertexAttrib2fARB)(GLuint, GLfloat, GLfloat);
+#define CALL_VertexAttrib2fARB(disp, parameters) \
+    (* GET_VertexAttrib2fARB(disp)) parameters
+static INLINE _glptr_VertexAttrib2fARB GET_VertexAttrib2fARB(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib2fARB) (GET_by_offset(disp, _gloffset_VertexAttrib2fARB));
+}
+
+static INLINE void SET_VertexAttrib2fARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLfloat, GLfloat)) {
+   SET_by_offset(disp, _gloffset_VertexAttrib2fARB, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_VertexAttrib2fvARB)(GLuint, const GLfloat *);
+#define CALL_VertexAttrib2fvARB(disp, parameters) \
+    (* GET_VertexAttrib2fvARB(disp)) parameters
+static INLINE _glptr_VertexAttrib2fvARB GET_VertexAttrib2fvARB(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib2fvARB) (GET_by_offset(disp, _gloffset_VertexAttrib2fvARB));
+}
+
+static INLINE void SET_VertexAttrib2fvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLfloat *)) {
+   SET_by_offset(disp, _gloffset_VertexAttrib2fvARB, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_VertexAttrib3fARB)(GLuint, GLfloat, GLfloat, GLfloat);
+#define CALL_VertexAttrib3fARB(disp, parameters) \
+    (* GET_VertexAttrib3fARB(disp)) parameters
+static INLINE _glptr_VertexAttrib3fARB GET_VertexAttrib3fARB(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib3fARB) (GET_by_offset(disp, _gloffset_VertexAttrib3fARB));
+}
+
+static INLINE void SET_VertexAttrib3fARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLfloat, GLfloat, GLfloat)) {
+   SET_by_offset(disp, _gloffset_VertexAttrib3fARB, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_VertexAttrib3fvARB)(GLuint, const GLfloat *);
+#define CALL_VertexAttrib3fvARB(disp, parameters) \
+    (* GET_VertexAttrib3fvARB(disp)) parameters
+static INLINE _glptr_VertexAttrib3fvARB GET_VertexAttrib3fvARB(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib3fvARB) (GET_by_offset(disp, _gloffset_VertexAttrib3fvARB));
+}
+
+static INLINE void SET_VertexAttrib3fvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLfloat *)) {
+   SET_by_offset(disp, _gloffset_VertexAttrib3fvARB, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_VertexAttrib4fARB)(GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
+#define CALL_VertexAttrib4fARB(disp, parameters) \
+    (* GET_VertexAttrib4fARB(disp)) parameters
+static INLINE _glptr_VertexAttrib4fARB GET_VertexAttrib4fARB(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib4fARB) (GET_by_offset(disp, _gloffset_VertexAttrib4fARB));
+}
+
+static INLINE void SET_VertexAttrib4fARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLfloat, GLfloat, GLfloat, GLfloat)) {
+   SET_by_offset(disp, _gloffset_VertexAttrib4fARB, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_VertexAttrib4fvARB)(GLuint, const GLfloat *);
+#define CALL_VertexAttrib4fvARB(disp, parameters) \
+    (* GET_VertexAttrib4fvARB(disp)) parameters
+static INLINE _glptr_VertexAttrib4fvARB GET_VertexAttrib4fvARB(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib4fvARB) (GET_by_offset(disp, _gloffset_VertexAttrib4fvARB));
+}
+
+static INLINE void SET_VertexAttrib4fvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLfloat *)) {
+   SET_by_offset(disp, _gloffset_VertexAttrib4fvARB, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_AttachObjectARB)(GLhandleARB, GLhandleARB);
+#define CALL_AttachObjectARB(disp, parameters) \
+    (* GET_AttachObjectARB(disp)) parameters
+static INLINE _glptr_AttachObjectARB GET_AttachObjectARB(struct _glapi_table *disp) {
+   return (_glptr_AttachObjectARB) (GET_by_offset(disp, _gloffset_AttachObjectARB));
+}
+
+static INLINE void SET_AttachObjectARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLhandleARB, GLhandleARB)) {
+   SET_by_offset(disp, _gloffset_AttachObjectARB, fn);
+}
+
+typedef GLhandleARB (GLAPIENTRYP _glptr_CreateProgramObjectARB)(void);
 #define CALL_CreateProgramObjectARB(disp, parameters) \
     (* GET_CreateProgramObjectARB(disp)) parameters
-static inline _glptr_CreateProgramObjectARB
-GET_CreateProgramObjectARB(struct _glapi_table *disp)
-{
-    return (_glptr_CreateProgramObjectARB) (GET_by_offset
-                                            (disp,
-                                             _gloffset_CreateProgramObjectARB));
+static INLINE _glptr_CreateProgramObjectARB GET_CreateProgramObjectARB(struct _glapi_table *disp) {
+   return (_glptr_CreateProgramObjectARB) (GET_by_offset(disp, _gloffset_CreateProgramObjectARB));
 }
 
-static inline void
-SET_CreateProgramObjectARB(struct _glapi_table *disp,
-                           GLhandleARB(GLAPIENTRYP fn) (void))
-{
-    SET_by_offset(disp, _gloffset_CreateProgramObjectARB, fn);
+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);
-
+typedef GLhandleARB (GLAPIENTRYP _glptr_CreateShaderObjectARB)(GLenum);
 #define CALL_CreateShaderObjectARB(disp, parameters) \
     (* GET_CreateShaderObjectARB(disp)) parameters
-static inline _glptr_CreateShaderObjectARB
-GET_CreateShaderObjectARB(struct _glapi_table *disp)
-{
-    return (_glptr_CreateShaderObjectARB) (GET_by_offset
-                                           (disp,
-                                            _gloffset_CreateShaderObjectARB));
+static INLINE _glptr_CreateShaderObjectARB GET_CreateShaderObjectARB(struct _glapi_table *disp) {
+   return (_glptr_CreateShaderObjectARB) (GET_by_offset(disp, _gloffset_CreateShaderObjectARB));
 }
 
-static inline void
-SET_CreateShaderObjectARB(struct _glapi_table *disp,
-                          GLhandleARB(GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_CreateShaderObjectARB, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_DeleteObjectARB)(GLhandleARB);
 #define CALL_DeleteObjectARB(disp, parameters) \
     (* GET_DeleteObjectARB(disp)) parameters
-static inline _glptr_DeleteObjectARB
-GET_DeleteObjectARB(struct _glapi_table *disp)
-{
-    return (_glptr_DeleteObjectARB) (GET_by_offset
-                                     (disp, _gloffset_DeleteObjectARB));
+static INLINE _glptr_DeleteObjectARB GET_DeleteObjectARB(struct _glapi_table *disp) {
+   return (_glptr_DeleteObjectARB) (GET_by_offset(disp, _gloffset_DeleteObjectARB));
 }
 
-static inline void
-SET_DeleteObjectARB(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLhandleARB))
-{
-    SET_by_offset(disp, _gloffset_DeleteObjectARB, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_DetachObjectARB)(GLhandleARB, GLhandleARB);
 #define CALL_DetachObjectARB(disp, parameters) \
     (* GET_DetachObjectARB(disp)) parameters
-static inline _glptr_DetachObjectARB
-GET_DetachObjectARB(struct _glapi_table *disp)
-{
-    return (_glptr_DetachObjectARB) (GET_by_offset
-                                     (disp, _gloffset_DetachObjectARB));
-}
-
-static inline void
-SET_DetachObjectARB(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLhandleARB, GLhandleARB))
-{
-    SET_by_offset(disp, _gloffset_DetachObjectARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetActiveUniformARB) (GLhandleARB, GLuint,
-                                                       GLsizei, GLsizei *,
-                                                       GLint *, GLenum *,
-                                                       GLcharARB *);
-#define CALL_GetActiveUniformARB(disp, parameters) \
-    (* GET_GetActiveUniformARB(disp)) parameters
-static inline _glptr_GetActiveUniformARB
-GET_GetActiveUniformARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetActiveUniformARB) (GET_by_offset
-                                         (disp, _gloffset_GetActiveUniformARB));
-}
-
-static inline void
-SET_GetActiveUniformARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLhandleARB, GLuint, GLsizei,
-                                               GLsizei *, GLint *, GLenum *,
-                                               GLcharARB *))
-{
-    SET_by_offset(disp, _gloffset_GetActiveUniformARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetAttachedObjectsARB) (GLhandleARB, GLsizei,
-                                                         GLsizei *,
-                                                         GLhandleARB *);
+static INLINE _glptr_DetachObjectARB GET_DetachObjectARB(struct _glapi_table *disp) {
+   return (_glptr_DetachObjectARB) (GET_by_offset(disp, _gloffset_DetachObjectARB));
+}
+
+static INLINE void SET_DetachObjectARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLhandleARB, GLhandleARB)) {
+   SET_by_offset(disp, _gloffset_DetachObjectARB, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetAttachedObjectsARB)(GLhandleARB, GLsizei, GLsizei *, GLhandleARB *);
 #define CALL_GetAttachedObjectsARB(disp, parameters) \
     (* GET_GetAttachedObjectsARB(disp)) parameters
-static inline _glptr_GetAttachedObjectsARB
-GET_GetAttachedObjectsARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetAttachedObjectsARB) (GET_by_offset
-                                           (disp,
-                                            _gloffset_GetAttachedObjectsARB));
+static INLINE _glptr_GetAttachedObjectsARB GET_GetAttachedObjectsARB(struct _glapi_table *disp) {
+   return (_glptr_GetAttachedObjectsARB) (GET_by_offset(disp, _gloffset_GetAttachedObjectsARB));
 }
 
-static inline void
-SET_GetAttachedObjectsARB(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (GLhandleARB, GLsizei,
-                                                 GLsizei *, GLhandleARB *))
-{
-    SET_by_offset(disp, _gloffset_GetAttachedObjectsARB, fn);
+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);
-
+typedef GLhandleARB (GLAPIENTRYP _glptr_GetHandleARB)(GLenum);
 #define CALL_GetHandleARB(disp, parameters) \
     (* GET_GetHandleARB(disp)) parameters
-static inline _glptr_GetHandleARB
-GET_GetHandleARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetHandleARB) (GET_by_offset(disp, _gloffset_GetHandleARB));
+static INLINE _glptr_GetHandleARB GET_GetHandleARB(struct _glapi_table *disp) {
+   return (_glptr_GetHandleARB) (GET_by_offset(disp, _gloffset_GetHandleARB));
 }
 
-static inline void
-SET_GetHandleARB(struct _glapi_table *disp,
-                 GLhandleARB(GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_GetHandleARB, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_GetInfoLogARB)(GLhandleARB, GLsizei, GLsizei *, GLcharARB *);
 #define CALL_GetInfoLogARB(disp, parameters) \
     (* GET_GetInfoLogARB(disp)) parameters
-static inline _glptr_GetInfoLogARB
-GET_GetInfoLogARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetInfoLogARB) (GET_by_offset
-                                   (disp, _gloffset_GetInfoLogARB));
+static INLINE _glptr_GetInfoLogARB GET_GetInfoLogARB(struct _glapi_table *disp) {
+   return (_glptr_GetInfoLogARB) (GET_by_offset(disp, _gloffset_GetInfoLogARB));
 }
 
-static inline void
-SET_GetInfoLogARB(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLhandleARB, GLsizei, GLsizei *,
-                                         GLcharARB *))
-{
-    SET_by_offset(disp, _gloffset_GetInfoLogARB, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_GetObjectParameterfvARB)(GLhandleARB, GLenum, GLfloat *);
 #define CALL_GetObjectParameterfvARB(disp, parameters) \
     (* GET_GetObjectParameterfvARB(disp)) parameters
-static inline _glptr_GetObjectParameterfvARB
-GET_GetObjectParameterfvARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetObjectParameterfvARB) (GET_by_offset
-                                             (disp,
-                                              _gloffset_GetObjectParameterfvARB));
+static INLINE _glptr_GetObjectParameterfvARB GET_GetObjectParameterfvARB(struct _glapi_table *disp) {
+   return (_glptr_GetObjectParameterfvARB) (GET_by_offset(disp, _gloffset_GetObjectParameterfvARB));
 }
 
-static inline void
-SET_GetObjectParameterfvARB(struct _glapi_table *disp,
-                            void (GLAPIENTRYP fn) (GLhandleARB, GLenum,
-                                                   GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetObjectParameterfvARB, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_GetObjectParameterivARB)(GLhandleARB, GLenum, GLint *);
 #define CALL_GetObjectParameterivARB(disp, parameters) \
     (* GET_GetObjectParameterivARB(disp)) parameters
-static inline _glptr_GetObjectParameterivARB
-GET_GetObjectParameterivARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetObjectParameterivARB) (GET_by_offset
-                                             (disp,
-                                              _gloffset_GetObjectParameterivARB));
-}
-
-static inline void
-SET_GetObjectParameterivARB(struct _glapi_table *disp,
-                            void (GLAPIENTRYP fn) (GLhandleARB, GLenum,
-                                                   GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetObjectParameterivARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetShaderSourceARB) (GLhandleARB, GLsizei,
-                                                      GLsizei *, GLcharARB *);
-#define CALL_GetShaderSourceARB(disp, parameters) \
-    (* GET_GetShaderSourceARB(disp)) parameters
-static inline _glptr_GetShaderSourceARB
-GET_GetShaderSourceARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetShaderSourceARB) (GET_by_offset
-                                        (disp, _gloffset_GetShaderSourceARB));
-}
-
-static inline void
-SET_GetShaderSourceARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLhandleARB, GLsizei, GLsizei *,
-                                              GLcharARB *))
-{
-    SET_by_offset(disp, _gloffset_GetShaderSourceARB, fn);
-}
-
-typedef GLint(GLAPIENTRYP _glptr_GetUniformLocationARB) (GLhandleARB,
-                                                         const GLcharARB *);
-#define CALL_GetUniformLocationARB(disp, parameters) \
-    (* GET_GetUniformLocationARB(disp)) parameters
-static inline _glptr_GetUniformLocationARB
-GET_GetUniformLocationARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetUniformLocationARB) (GET_by_offset
-                                           (disp,
-                                            _gloffset_GetUniformLocationARB));
-}
-
-static inline void
-SET_GetUniformLocationARB(struct _glapi_table *disp,
-                          GLint(GLAPIENTRYP fn) (GLhandleARB,
-                                                 const GLcharARB *))
-{
-    SET_by_offset(disp, _gloffset_GetUniformLocationARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetUniformfvARB) (GLhandleARB, GLint,
-                                                   GLfloat *);
-#define CALL_GetUniformfvARB(disp, parameters) \
-    (* GET_GetUniformfvARB(disp)) parameters
-static inline _glptr_GetUniformfvARB
-GET_GetUniformfvARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetUniformfvARB) (GET_by_offset
-                                     (disp, _gloffset_GetUniformfvARB));
-}
-
-static inline void
-SET_GetUniformfvARB(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLhandleARB, GLint, GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetUniformfvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetUniformivARB) (GLhandleARB, GLint, GLint *);
-
-#define CALL_GetUniformivARB(disp, parameters) \
-    (* GET_GetUniformivARB(disp)) parameters
-static inline _glptr_GetUniformivARB
-GET_GetUniformivARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetUniformivARB) (GET_by_offset
-                                     (disp, _gloffset_GetUniformivARB));
+static INLINE _glptr_GetObjectParameterivARB GET_GetObjectParameterivARB(struct _glapi_table *disp) {
+   return (_glptr_GetObjectParameterivARB) (GET_by_offset(disp, _gloffset_GetObjectParameterivARB));
 }
-
-static inline void
-SET_GetUniformivARB(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLhandleARB, GLint, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetUniformivARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_LinkProgramARB) (GLhandleARB);
-
-#define CALL_LinkProgramARB(disp, parameters) \
-    (* GET_LinkProgramARB(disp)) parameters
-static inline _glptr_LinkProgramARB
-GET_LinkProgramARB(struct _glapi_table *disp)
-{
-    return (_glptr_LinkProgramARB) (GET_by_offset
-                                    (disp, _gloffset_LinkProgramARB));
+
+static INLINE void SET_GetObjectParameterivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLhandleARB, GLenum, GLint *)) {
+   SET_by_offset(disp, _gloffset_GetObjectParameterivARB, fn);
 }
 
-static inline void
-SET_LinkProgramARB(struct _glapi_table *disp,
-                   void (GLAPIENTRYP fn) (GLhandleARB))
-{
-    SET_by_offset(disp, _gloffset_LinkProgramARB, fn);
+typedef void (GLAPIENTRYP _glptr_DrawArraysInstancedARB)(GLenum, GLint, GLsizei, GLsizei);
+#define CALL_DrawArraysInstancedARB(disp, parameters) \
+    (* GET_DrawArraysInstancedARB(disp)) parameters
+static INLINE _glptr_DrawArraysInstancedARB GET_DrawArraysInstancedARB(struct _glapi_table *disp) {
+   return (_glptr_DrawArraysInstancedARB) (GET_by_offset(disp, _gloffset_DrawArraysInstancedARB));
 }
 
-typedef void (GLAPIENTRYP _glptr_ShaderSourceARB) (GLhandleARB, GLsizei,
-                                                   const GLcharARB **,
-                                                   const GLint *);
-#define CALL_ShaderSourceARB(disp, parameters) \
-    (* GET_ShaderSourceARB(disp)) parameters
-static inline _glptr_ShaderSourceARB
-GET_ShaderSourceARB(struct _glapi_table *disp)
-{
-    return (_glptr_ShaderSourceARB) (GET_by_offset
-                                     (disp, _gloffset_ShaderSourceARB));
+static INLINE void SET_DrawArraysInstancedARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLsizei, GLsizei)) {
+   SET_by_offset(disp, _gloffset_DrawArraysInstancedARB, fn);
 }
 
-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_DrawElementsInstancedARB)(GLenum, GLsizei, GLenum, const GLvoid *, GLsizei);
+#define CALL_DrawElementsInstancedARB(disp, parameters) \
+    (* GET_DrawElementsInstancedARB(disp)) parameters
+static INLINE _glptr_DrawElementsInstancedARB GET_DrawElementsInstancedARB(struct _glapi_table *disp) {
+   return (_glptr_DrawElementsInstancedARB) (GET_by_offset(disp, _gloffset_DrawElementsInstancedARB));
 }
 
-typedef void (GLAPIENTRYP _glptr_Uniform1fARB) (GLint, GLfloat);
+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);
+}
 
-#define CALL_Uniform1fARB(disp, parameters) \
-    (* GET_Uniform1fARB(disp)) parameters
-static inline _glptr_Uniform1fARB
-GET_Uniform1fARB(struct _glapi_table *disp)
-{
-    return (_glptr_Uniform1fARB) (GET_by_offset(disp, _gloffset_Uniform1fARB));
+typedef void (GLAPIENTRYP _glptr_BindFramebuffer)(GLenum, GLuint);
+#define CALL_BindFramebuffer(disp, parameters) \
+    (* GET_BindFramebuffer(disp)) parameters
+static INLINE _glptr_BindFramebuffer GET_BindFramebuffer(struct _glapi_table *disp) {
+   return (_glptr_BindFramebuffer) (GET_by_offset(disp, _gloffset_BindFramebuffer));
 }
 
-static inline void
-SET_Uniform1fARB(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLint, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_Uniform1fARB, fn);
+static INLINE void SET_BindFramebuffer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
+   SET_by_offset(disp, _gloffset_BindFramebuffer, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_Uniform1fvARB) (GLint, GLsizei,
-                                                 const GLfloat *);
-#define CALL_Uniform1fvARB(disp, parameters) \
-    (* GET_Uniform1fvARB(disp)) parameters
-static inline _glptr_Uniform1fvARB
-GET_Uniform1fvARB(struct _glapi_table *disp)
-{
-    return (_glptr_Uniform1fvARB) (GET_by_offset
-                                   (disp, _gloffset_Uniform1fvARB));
+typedef void (GLAPIENTRYP _glptr_BindRenderbuffer)(GLenum, GLuint);
+#define CALL_BindRenderbuffer(disp, parameters) \
+    (* GET_BindRenderbuffer(disp)) parameters
+static INLINE _glptr_BindRenderbuffer GET_BindRenderbuffer(struct _glapi_table *disp) {
+   return (_glptr_BindRenderbuffer) (GET_by_offset(disp, _gloffset_BindRenderbuffer));
 }
 
-static inline void
-SET_Uniform1fvARB(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLint, GLsizei, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_Uniform1fvARB, fn);
+static INLINE void SET_BindRenderbuffer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
+   SET_by_offset(disp, _gloffset_BindRenderbuffer, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_Uniform1iARB) (GLint, GLint);
+typedef void (GLAPIENTRYP _glptr_BlitFramebuffer)(GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLbitfield, GLenum);
+#define CALL_BlitFramebuffer(disp, parameters) \
+    (* GET_BlitFramebuffer(disp)) parameters
+static INLINE _glptr_BlitFramebuffer GET_BlitFramebuffer(struct _glapi_table *disp) {
+   return (_glptr_BlitFramebuffer) (GET_by_offset(disp, _gloffset_BlitFramebuffer));
+}
 
-#define CALL_Uniform1iARB(disp, parameters) \
-    (* GET_Uniform1iARB(disp)) parameters
-static inline _glptr_Uniform1iARB
-GET_Uniform1iARB(struct _glapi_table *disp)
-{
-    return (_glptr_Uniform1iARB) (GET_by_offset(disp, _gloffset_Uniform1iARB));
+static INLINE void SET_BlitFramebuffer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLbitfield, GLenum)) {
+   SET_by_offset(disp, _gloffset_BlitFramebuffer, fn);
 }
 
-static inline void
-SET_Uniform1iARB(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_Uniform1iARB, fn);
+typedef GLenum (GLAPIENTRYP _glptr_CheckFramebufferStatus)(GLenum);
+#define CALL_CheckFramebufferStatus(disp, parameters) \
+    (* GET_CheckFramebufferStatus(disp)) parameters
+static INLINE _glptr_CheckFramebufferStatus GET_CheckFramebufferStatus(struct _glapi_table *disp) {
+   return (_glptr_CheckFramebufferStatus) (GET_by_offset(disp, _gloffset_CheckFramebufferStatus));
 }
 
-typedef void (GLAPIENTRYP _glptr_Uniform1ivARB) (GLint, GLsizei, const GLint *);
+static INLINE void SET_CheckFramebufferStatus(struct _glapi_table *disp, GLenum (GLAPIENTRYP fn)(GLenum)) {
+   SET_by_offset(disp, _gloffset_CheckFramebufferStatus, fn);
+}
 
-#define CALL_Uniform1ivARB(disp, parameters) \
-    (* GET_Uniform1ivARB(disp)) parameters
-static inline _glptr_Uniform1ivARB
-GET_Uniform1ivARB(struct _glapi_table *disp)
-{
-    return (_glptr_Uniform1ivARB) (GET_by_offset
-                                   (disp, _gloffset_Uniform1ivARB));
+typedef void (GLAPIENTRYP _glptr_DeleteFramebuffers)(GLsizei, const GLuint *);
+#define CALL_DeleteFramebuffers(disp, parameters) \
+    (* GET_DeleteFramebuffers(disp)) parameters
+static INLINE _glptr_DeleteFramebuffers GET_DeleteFramebuffers(struct _glapi_table *disp) {
+   return (_glptr_DeleteFramebuffers) (GET_by_offset(disp, _gloffset_DeleteFramebuffers));
 }
 
-static inline void
-SET_Uniform1ivARB(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLint, GLsizei, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_Uniform1ivARB, fn);
+static INLINE void SET_DeleteFramebuffers(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLuint *)) {
+   SET_by_offset(disp, _gloffset_DeleteFramebuffers, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_Uniform2fARB) (GLint, GLfloat, GLfloat);
+typedef void (GLAPIENTRYP _glptr_DeleteRenderbuffers)(GLsizei, const GLuint *);
+#define CALL_DeleteRenderbuffers(disp, parameters) \
+    (* GET_DeleteRenderbuffers(disp)) parameters
+static INLINE _glptr_DeleteRenderbuffers GET_DeleteRenderbuffers(struct _glapi_table *disp) {
+   return (_glptr_DeleteRenderbuffers) (GET_by_offset(disp, _gloffset_DeleteRenderbuffers));
+}
 
-#define CALL_Uniform2fARB(disp, parameters) \
-    (* GET_Uniform2fARB(disp)) parameters
-static inline _glptr_Uniform2fARB
-GET_Uniform2fARB(struct _glapi_table *disp)
-{
-    return (_glptr_Uniform2fARB) (GET_by_offset(disp, _gloffset_Uniform2fARB));
+static INLINE void SET_DeleteRenderbuffers(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLuint *)) {
+   SET_by_offset(disp, _gloffset_DeleteRenderbuffers, fn);
 }
 
-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_FramebufferRenderbuffer)(GLenum, GLenum, GLenum, GLuint);
+#define CALL_FramebufferRenderbuffer(disp, parameters) \
+    (* GET_FramebufferRenderbuffer(disp)) parameters
+static INLINE _glptr_FramebufferRenderbuffer GET_FramebufferRenderbuffer(struct _glapi_table *disp) {
+   return (_glptr_FramebufferRenderbuffer) (GET_by_offset(disp, _gloffset_FramebufferRenderbuffer));
 }
 
-typedef void (GLAPIENTRYP _glptr_Uniform2fvARB) (GLint, GLsizei,
-                                                 const GLfloat *);
-#define CALL_Uniform2fvARB(disp, parameters) \
-    (* GET_Uniform2fvARB(disp)) parameters
-static inline _glptr_Uniform2fvARB
-GET_Uniform2fvARB(struct _glapi_table *disp)
-{
-    return (_glptr_Uniform2fvARB) (GET_by_offset
-                                   (disp, _gloffset_Uniform2fvARB));
+static INLINE void SET_FramebufferRenderbuffer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLuint)) {
+   SET_by_offset(disp, _gloffset_FramebufferRenderbuffer, fn);
 }
 
-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_FramebufferTexture1D)(GLenum, GLenum, GLenum, GLuint, GLint);
+#define CALL_FramebufferTexture1D(disp, parameters) \
+    (* GET_FramebufferTexture1D(disp)) parameters
+static INLINE _glptr_FramebufferTexture1D GET_FramebufferTexture1D(struct _glapi_table *disp) {
+   return (_glptr_FramebufferTexture1D) (GET_by_offset(disp, _gloffset_FramebufferTexture1D));
 }
 
-typedef void (GLAPIENTRYP _glptr_Uniform2iARB) (GLint, GLint, GLint);
+static INLINE void SET_FramebufferTexture1D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLuint, GLint)) {
+   SET_by_offset(disp, _gloffset_FramebufferTexture1D, fn);
+}
 
-#define CALL_Uniform2iARB(disp, parameters) \
-    (* GET_Uniform2iARB(disp)) parameters
-static inline _glptr_Uniform2iARB
-GET_Uniform2iARB(struct _glapi_table *disp)
-{
-    return (_glptr_Uniform2iARB) (GET_by_offset(disp, _gloffset_Uniform2iARB));
+typedef void (GLAPIENTRYP _glptr_FramebufferTexture2D)(GLenum, GLenum, GLenum, GLuint, GLint);
+#define CALL_FramebufferTexture2D(disp, parameters) \
+    (* GET_FramebufferTexture2D(disp)) parameters
+static INLINE _glptr_FramebufferTexture2D GET_FramebufferTexture2D(struct _glapi_table *disp) {
+   return (_glptr_FramebufferTexture2D) (GET_by_offset(disp, _gloffset_FramebufferTexture2D));
 }
 
-static inline void
-SET_Uniform2iARB(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLint, GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_Uniform2iARB, fn);
+static INLINE void SET_FramebufferTexture2D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLuint, GLint)) {
+   SET_by_offset(disp, _gloffset_FramebufferTexture2D, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_Uniform2ivARB) (GLint, GLsizei, const GLint *);
+typedef void (GLAPIENTRYP _glptr_FramebufferTexture3D)(GLenum, GLenum, GLenum, GLuint, GLint, GLint);
+#define CALL_FramebufferTexture3D(disp, parameters) \
+    (* GET_FramebufferTexture3D(disp)) parameters
+static INLINE _glptr_FramebufferTexture3D GET_FramebufferTexture3D(struct _glapi_table *disp) {
+   return (_glptr_FramebufferTexture3D) (GET_by_offset(disp, _gloffset_FramebufferTexture3D));
+}
 
-#define CALL_Uniform2ivARB(disp, parameters) \
-    (* GET_Uniform2ivARB(disp)) parameters
-static inline _glptr_Uniform2ivARB
-GET_Uniform2ivARB(struct _glapi_table *disp)
-{
-    return (_glptr_Uniform2ivARB) (GET_by_offset
-                                   (disp, _gloffset_Uniform2ivARB));
+static INLINE void SET_FramebufferTexture3D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLuint, GLint, GLint)) {
+   SET_by_offset(disp, _gloffset_FramebufferTexture3D, fn);
 }
 
-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_FramebufferTextureLayer)(GLenum, GLenum, GLuint, GLint, GLint);
+#define CALL_FramebufferTextureLayer(disp, parameters) \
+    (* GET_FramebufferTextureLayer(disp)) parameters
+static INLINE _glptr_FramebufferTextureLayer GET_FramebufferTextureLayer(struct _glapi_table *disp) {
+   return (_glptr_FramebufferTextureLayer) (GET_by_offset(disp, _gloffset_FramebufferTextureLayer));
 }
 
-typedef void (GLAPIENTRYP _glptr_Uniform3fARB) (GLint, GLfloat, GLfloat,
-                                                GLfloat);
-#define CALL_Uniform3fARB(disp, parameters) \
-    (* GET_Uniform3fARB(disp)) parameters
-static inline _glptr_Uniform3fARB
-GET_Uniform3fARB(struct _glapi_table *disp)
-{
-    return (_glptr_Uniform3fARB) (GET_by_offset(disp, _gloffset_Uniform3fARB));
+static INLINE void SET_FramebufferTextureLayer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLuint, GLint, GLint)) {
+   SET_by_offset(disp, _gloffset_FramebufferTextureLayer, fn);
 }
 
-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_GenFramebuffers)(GLsizei, GLuint *);
+#define CALL_GenFramebuffers(disp, parameters) \
+    (* GET_GenFramebuffers(disp)) parameters
+static INLINE _glptr_GenFramebuffers GET_GenFramebuffers(struct _glapi_table *disp) {
+   return (_glptr_GenFramebuffers) (GET_by_offset(disp, _gloffset_GenFramebuffers));
 }
 
-typedef void (GLAPIENTRYP _glptr_Uniform3fvARB) (GLint, GLsizei,
-                                                 const GLfloat *);
-#define CALL_Uniform3fvARB(disp, parameters) \
-    (* GET_Uniform3fvARB(disp)) parameters
-static inline _glptr_Uniform3fvARB
-GET_Uniform3fvARB(struct _glapi_table *disp)
-{
-    return (_glptr_Uniform3fvARB) (GET_by_offset
-                                   (disp, _gloffset_Uniform3fvARB));
+static INLINE void SET_GenFramebuffers(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLuint *)) {
+   SET_by_offset(disp, _gloffset_GenFramebuffers, fn);
 }
 
-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_GenRenderbuffers)(GLsizei, GLuint *);
+#define CALL_GenRenderbuffers(disp, parameters) \
+    (* GET_GenRenderbuffers(disp)) parameters
+static INLINE _glptr_GenRenderbuffers GET_GenRenderbuffers(struct _glapi_table *disp) {
+   return (_glptr_GenRenderbuffers) (GET_by_offset(disp, _gloffset_GenRenderbuffers));
 }
 
-typedef void (GLAPIENTRYP _glptr_Uniform3iARB) (GLint, GLint, GLint, GLint);
+static INLINE void SET_GenRenderbuffers(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLuint *)) {
+   SET_by_offset(disp, _gloffset_GenRenderbuffers, fn);
+}
 
-#define CALL_Uniform3iARB(disp, parameters) \
-    (* GET_Uniform3iARB(disp)) parameters
-static inline _glptr_Uniform3iARB
-GET_Uniform3iARB(struct _glapi_table *disp)
-{
-    return (_glptr_Uniform3iARB) (GET_by_offset(disp, _gloffset_Uniform3iARB));
+typedef void (GLAPIENTRYP _glptr_GenerateMipmap)(GLenum);
+#define CALL_GenerateMipmap(disp, parameters) \
+    (* GET_GenerateMipmap(disp)) parameters
+static INLINE _glptr_GenerateMipmap GET_GenerateMipmap(struct _glapi_table *disp) {
+   return (_glptr_GenerateMipmap) (GET_by_offset(disp, _gloffset_GenerateMipmap));
 }
 
-static inline void
-SET_Uniform3iARB(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLint, GLint, GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_Uniform3iARB, fn);
-}
+static INLINE void SET_GenerateMipmap(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
+   SET_by_offset(disp, _gloffset_GenerateMipmap, fn);
+}
 
-typedef void (GLAPIENTRYP _glptr_Uniform3ivARB) (GLint, GLsizei, const GLint *);
+typedef void (GLAPIENTRYP _glptr_GetFramebufferAttachmentParameteriv)(GLenum, GLenum, GLenum, GLint *);
+#define CALL_GetFramebufferAttachmentParameteriv(disp, parameters) \
+    (* GET_GetFramebufferAttachmentParameteriv(disp)) parameters
+static INLINE _glptr_GetFramebufferAttachmentParameteriv GET_GetFramebufferAttachmentParameteriv(struct _glapi_table *disp) {
+   return (_glptr_GetFramebufferAttachmentParameteriv) (GET_by_offset(disp, _gloffset_GetFramebufferAttachmentParameteriv));
+}
 
-#define CALL_Uniform3ivARB(disp, parameters) \
-    (* GET_Uniform3ivARB(disp)) parameters
-static inline _glptr_Uniform3ivARB
-GET_Uniform3ivARB(struct _glapi_table *disp)
-{
-    return (_glptr_Uniform3ivARB) (GET_by_offset
-                                   (disp, _gloffset_Uniform3ivARB));
+static INLINE void SET_GetFramebufferAttachmentParameteriv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLint *)) {
+   SET_by_offset(disp, _gloffset_GetFramebufferAttachmentParameteriv, fn);
 }
 
-static inline void
-SET_Uniform3ivARB(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLint, GLsizei, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_Uniform3ivARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Uniform4fARB) (GLint, GLfloat, GLfloat,
-                                                GLfloat, GLfloat);
-#define CALL_Uniform4fARB(disp, parameters) \
-    (* GET_Uniform4fARB(disp)) parameters
-static inline _glptr_Uniform4fARB
-GET_Uniform4fARB(struct _glapi_table *disp)
-{
-    return (_glptr_Uniform4fARB) (GET_by_offset(disp, _gloffset_Uniform4fARB));
-}
-
-static inline void
-SET_Uniform4fARB(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLint, GLfloat, GLfloat, GLfloat,
-                                        GLfloat))
-{
-    SET_by_offset(disp, _gloffset_Uniform4fARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Uniform4fvARB) (GLint, GLsizei,
-                                                 const GLfloat *);
-#define CALL_Uniform4fvARB(disp, parameters) \
-    (* GET_Uniform4fvARB(disp)) parameters
-static inline _glptr_Uniform4fvARB
-GET_Uniform4fvARB(struct _glapi_table *disp)
-{
-    return (_glptr_Uniform4fvARB) (GET_by_offset
-                                   (disp, _gloffset_Uniform4fvARB));
-}
-
-static inline void
-SET_Uniform4fvARB(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLint, GLsizei, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_Uniform4fvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Uniform4iARB) (GLint, GLint, GLint, GLint,
-                                                GLint);
-#define CALL_Uniform4iARB(disp, parameters) \
-    (* GET_Uniform4iARB(disp)) parameters
-static inline _glptr_Uniform4iARB
-GET_Uniform4iARB(struct _glapi_table *disp)
-{
-    return (_glptr_Uniform4iARB) (GET_by_offset(disp, _gloffset_Uniform4iARB));
-}
-
-static inline void
-SET_Uniform4iARB(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLint, GLint, GLint, GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_Uniform4iARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Uniform4ivARB) (GLint, GLsizei, const GLint *);
-
-#define CALL_Uniform4ivARB(disp, parameters) \
-    (* GET_Uniform4ivARB(disp)) parameters
-static inline _glptr_Uniform4ivARB
-GET_Uniform4ivARB(struct _glapi_table *disp)
-{
-    return (_glptr_Uniform4ivARB) (GET_by_offset
-                                   (disp, _gloffset_Uniform4ivARB));
-}
-
-static inline void
-SET_Uniform4ivARB(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLint, GLsizei, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_Uniform4ivARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_UniformMatrix2fvARB) (GLint, GLsizei,
-                                                       GLboolean,
-                                                       const GLfloat *);
-#define CALL_UniformMatrix2fvARB(disp, parameters) \
-    (* GET_UniformMatrix2fvARB(disp)) parameters
-static inline _glptr_UniformMatrix2fvARB
-GET_UniformMatrix2fvARB(struct _glapi_table *disp)
-{
-    return (_glptr_UniformMatrix2fvARB) (GET_by_offset
-                                         (disp, _gloffset_UniformMatrix2fvARB));
-}
-
-static inline void
-SET_UniformMatrix2fvARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLint, GLsizei, GLboolean,
-                                               const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_UniformMatrix2fvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_UniformMatrix3fvARB) (GLint, GLsizei,
-                                                       GLboolean,
-                                                       const GLfloat *);
-#define CALL_UniformMatrix3fvARB(disp, parameters) \
-    (* GET_UniformMatrix3fvARB(disp)) parameters
-static inline _glptr_UniformMatrix3fvARB
-GET_UniformMatrix3fvARB(struct _glapi_table *disp)
-{
-    return (_glptr_UniformMatrix3fvARB) (GET_by_offset
-                                         (disp, _gloffset_UniformMatrix3fvARB));
-}
-
-static inline void
-SET_UniformMatrix3fvARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLint, GLsizei, GLboolean,
-                                               const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_UniformMatrix3fvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_UniformMatrix4fvARB) (GLint, GLsizei,
-                                                       GLboolean,
-                                                       const GLfloat *);
-#define CALL_UniformMatrix4fvARB(disp, parameters) \
-    (* GET_UniformMatrix4fvARB(disp)) parameters
-static inline _glptr_UniformMatrix4fvARB
-GET_UniformMatrix4fvARB(struct _glapi_table *disp)
-{
-    return (_glptr_UniformMatrix4fvARB) (GET_by_offset
-                                         (disp, _gloffset_UniformMatrix4fvARB));
-}
-
-static inline void
-SET_UniformMatrix4fvARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLint, GLsizei, GLboolean,
-                                               const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_UniformMatrix4fvARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_UseProgramObjectARB) (GLhandleARB);
-
-#define CALL_UseProgramObjectARB(disp, parameters) \
-    (* GET_UseProgramObjectARB(disp)) parameters
-static inline _glptr_UseProgramObjectARB
-GET_UseProgramObjectARB(struct _glapi_table *disp)
-{
-    return (_glptr_UseProgramObjectARB) (GET_by_offset
-                                         (disp, _gloffset_UseProgramObjectARB));
-}
-
-static inline void
-SET_UseProgramObjectARB(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLhandleARB))
-{
-    SET_by_offset(disp, _gloffset_UseProgramObjectARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ValidateProgramARB) (GLhandleARB);
-
-#define CALL_ValidateProgramARB(disp, parameters) \
-    (* GET_ValidateProgramARB(disp)) parameters
-static inline _glptr_ValidateProgramARB
-GET_ValidateProgramARB(struct _glapi_table *disp)
-{
-    return (_glptr_ValidateProgramARB) (GET_by_offset
-                                        (disp, _gloffset_ValidateProgramARB));
-}
-
-static inline void
-SET_ValidateProgramARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLhandleARB))
-{
-    SET_by_offset(disp, _gloffset_ValidateProgramARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_BindAttribLocationARB) (GLhandleARB, GLuint,
-                                                         const GLcharARB *);
-#define CALL_BindAttribLocationARB(disp, parameters) \
-    (* GET_BindAttribLocationARB(disp)) parameters
-static inline _glptr_BindAttribLocationARB
-GET_BindAttribLocationARB(struct _glapi_table *disp)
-{
-    return (_glptr_BindAttribLocationARB) (GET_by_offset
-                                           (disp,
-                                            _gloffset_BindAttribLocationARB));
-}
-
-static inline void
-SET_BindAttribLocationARB(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (GLhandleARB, GLuint,
-                                                 const GLcharARB *))
-{
-    SET_by_offset(disp, _gloffset_BindAttribLocationARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetActiveAttribARB) (GLhandleARB, GLuint,
-                                                      GLsizei, GLsizei *,
-                                                      GLint *, GLenum *,
-                                                      GLcharARB *);
-#define CALL_GetActiveAttribARB(disp, parameters) \
-    (* GET_GetActiveAttribARB(disp)) parameters
-static inline _glptr_GetActiveAttribARB
-GET_GetActiveAttribARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetActiveAttribARB) (GET_by_offset
-                                        (disp, _gloffset_GetActiveAttribARB));
-}
-
-static inline void
-SET_GetActiveAttribARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLhandleARB, GLuint, GLsizei,
-                                              GLsizei *, GLint *, GLenum *,
-                                              GLcharARB *))
-{
-    SET_by_offset(disp, _gloffset_GetActiveAttribARB, fn);
-}
-
-typedef GLint(GLAPIENTRYP _glptr_GetAttribLocationARB) (GLhandleARB,
-                                                        const GLcharARB *);
-#define CALL_GetAttribLocationARB(disp, parameters) \
-    (* GET_GetAttribLocationARB(disp)) parameters
-static inline _glptr_GetAttribLocationARB
-GET_GetAttribLocationARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetAttribLocationARB) (GET_by_offset
-                                          (disp,
-                                           _gloffset_GetAttribLocationARB));
+typedef void (GLAPIENTRYP _glptr_GetRenderbufferParameteriv)(GLenum, GLenum, GLint *);
+#define CALL_GetRenderbufferParameteriv(disp, parameters) \
+    (* GET_GetRenderbufferParameteriv(disp)) parameters
+static INLINE _glptr_GetRenderbufferParameteriv GET_GetRenderbufferParameteriv(struct _glapi_table *disp) {
+   return (_glptr_GetRenderbufferParameteriv) (GET_by_offset(disp, _gloffset_GetRenderbufferParameteriv));
 }
 
-static inline void
-SET_GetAttribLocationARB(struct _glapi_table *disp,
-                         GLint(GLAPIENTRYP fn) (GLhandleARB, const GLcharARB *))
-{
-    SET_by_offset(disp, _gloffset_GetAttribLocationARB, fn);
-}
+static INLINE void SET_GetRenderbufferParameteriv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint *)) {
+   SET_by_offset(disp, _gloffset_GetRenderbufferParameteriv, fn);
+}
 
-typedef void (GLAPIENTRYP _glptr_DrawBuffersARB) (GLsizei, const GLenum *);
+typedef GLboolean (GLAPIENTRYP _glptr_IsFramebuffer)(GLuint);
+#define CALL_IsFramebuffer(disp, parameters) \
+    (* GET_IsFramebuffer(disp)) parameters
+static INLINE _glptr_IsFramebuffer GET_IsFramebuffer(struct _glapi_table *disp) {
+   return (_glptr_IsFramebuffer) (GET_by_offset(disp, _gloffset_IsFramebuffer));
+}
 
-#define CALL_DrawBuffersARB(disp, parameters) \
-    (* GET_DrawBuffersARB(disp)) parameters
-static inline _glptr_DrawBuffersARB
-GET_DrawBuffersARB(struct _glapi_table *disp)
-{
-    return (_glptr_DrawBuffersARB) (GET_by_offset
-                                    (disp, _gloffset_DrawBuffersARB));
-}
-
-static inline void
-SET_DrawBuffersARB(struct _glapi_table *disp,
-                   void (GLAPIENTRYP fn) (GLsizei, const GLenum *))
-{
-    SET_by_offset(disp, _gloffset_DrawBuffersARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ClampColorARB) (GLenum, GLenum);
+static INLINE void SET_IsFramebuffer(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLuint)) {
+   SET_by_offset(disp, _gloffset_IsFramebuffer, fn);
+}
 
-#define CALL_ClampColorARB(disp, parameters) \
-    (* GET_ClampColorARB(disp)) parameters
-static inline _glptr_ClampColorARB
-GET_ClampColorARB(struct _glapi_table *disp)
-{
-    return (_glptr_ClampColorARB) (GET_by_offset
-                                   (disp, _gloffset_ClampColorARB));
-}
-
-static inline void
-SET_ClampColorARB(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, GLenum))
-{
-    SET_by_offset(disp, _gloffset_ClampColorARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_DrawArraysInstancedARB) (GLenum, GLint,
-                                                          GLsizei, GLsizei);
-#define CALL_DrawArraysInstancedARB(disp, parameters) \
-    (* GET_DrawArraysInstancedARB(disp)) parameters
-static inline _glptr_DrawArraysInstancedARB
-GET_DrawArraysInstancedARB(struct _glapi_table *disp)
-{
-    return (_glptr_DrawArraysInstancedARB) (GET_by_offset
-                                            (disp,
-                                             _gloffset_DrawArraysInstancedARB));
-}
-
-static inline void
-SET_DrawArraysInstancedARB(struct _glapi_table *disp,
-                           void (GLAPIENTRYP fn) (GLenum, GLint, GLsizei,
-                                                  GLsizei))
-{
-    SET_by_offset(disp, _gloffset_DrawArraysInstancedARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_DrawElementsInstancedARB) (GLenum, GLsizei,
-                                                            GLenum,
-                                                            const GLvoid *,
-                                                            GLsizei);
-#define CALL_DrawElementsInstancedARB(disp, parameters) \
-    (* GET_DrawElementsInstancedARB(disp)) parameters
-static inline _glptr_DrawElementsInstancedARB
-GET_DrawElementsInstancedARB(struct _glapi_table *disp)
-{
-    return (_glptr_DrawElementsInstancedARB) (GET_by_offset
-                                              (disp,
-                                               _gloffset_DrawElementsInstancedARB));
-}
-
-static inline void
-SET_DrawElementsInstancedARB(struct _glapi_table *disp,
-                             void (GLAPIENTRYP fn) (GLenum, GLsizei, GLenum,
-                                                    const GLvoid *, GLsizei))
-{
-    SET_by_offset(disp, _gloffset_DrawElementsInstancedARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_RenderbufferStorageMultisample) (GLenum,
-                                                                  GLsizei,
-                                                                  GLenum,
-                                                                  GLsizei,
-                                                                  GLsizei);
-#define CALL_RenderbufferStorageMultisample(disp, parameters) \
-    (* GET_RenderbufferStorageMultisample(disp)) parameters
-static inline _glptr_RenderbufferStorageMultisample
-GET_RenderbufferStorageMultisample(struct _glapi_table *disp)
-{
-    return (_glptr_RenderbufferStorageMultisample) (GET_by_offset
-                                                    (disp,
-                                                     _gloffset_RenderbufferStorageMultisample));
-}
-
-static inline void
-SET_RenderbufferStorageMultisample(struct _glapi_table *disp,
-                                   void (GLAPIENTRYP fn) (GLenum, GLsizei,
-                                                          GLenum, GLsizei,
-                                                          GLsizei))
-{
-    SET_by_offset(disp, _gloffset_RenderbufferStorageMultisample, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_FramebufferTextureARB) (GLenum, GLenum, GLuint,
-                                                         GLint);
-#define CALL_FramebufferTextureARB(disp, parameters) \
-    (* GET_FramebufferTextureARB(disp)) parameters
-static inline _glptr_FramebufferTextureARB
-GET_FramebufferTextureARB(struct _glapi_table *disp)
-{
-    return (_glptr_FramebufferTextureARB) (GET_by_offset
-                                           (disp,
-                                            _gloffset_FramebufferTextureARB));
-}
-
-static inline void
-SET_FramebufferTextureARB(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (GLenum, GLenum, GLuint, GLint))
-{
-    SET_by_offset(disp, _gloffset_FramebufferTextureARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_FramebufferTextureFaceARB) (GLenum, GLenum,
-                                                             GLuint, GLint,
-                                                             GLenum);
-#define CALL_FramebufferTextureFaceARB(disp, parameters) \
-    (* GET_FramebufferTextureFaceARB(disp)) parameters
-static inline _glptr_FramebufferTextureFaceARB
-GET_FramebufferTextureFaceARB(struct _glapi_table *disp)
-{
-    return (_glptr_FramebufferTextureFaceARB) (GET_by_offset
-                                               (disp,
-                                                _gloffset_FramebufferTextureFaceARB));
+typedef GLboolean (GLAPIENTRYP _glptr_IsRenderbuffer)(GLuint);
+#define CALL_IsRenderbuffer(disp, parameters) \
+    (* GET_IsRenderbuffer(disp)) parameters
+static INLINE _glptr_IsRenderbuffer GET_IsRenderbuffer(struct _glapi_table *disp) {
+   return (_glptr_IsRenderbuffer) (GET_by_offset(disp, _gloffset_IsRenderbuffer));
 }
 
-static inline void
-SET_FramebufferTextureFaceARB(struct _glapi_table *disp,
-                              void (GLAPIENTRYP fn) (GLenum, GLenum, GLuint,
-                                                     GLint, GLenum))
-{
-    SET_by_offset(disp, _gloffset_FramebufferTextureFaceARB, fn);
+static INLINE void SET_IsRenderbuffer(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLuint)) {
+   SET_by_offset(disp, _gloffset_IsRenderbuffer, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_ProgramParameteriARB) (GLuint, GLenum, GLint);
+typedef void (GLAPIENTRYP _glptr_RenderbufferStorage)(GLenum, GLenum, GLsizei, GLsizei);
+#define CALL_RenderbufferStorage(disp, parameters) \
+    (* GET_RenderbufferStorage(disp)) parameters
+static INLINE _glptr_RenderbufferStorage GET_RenderbufferStorage(struct _glapi_table *disp) {
+   return (_glptr_RenderbufferStorage) (GET_by_offset(disp, _gloffset_RenderbufferStorage));
+}
 
-#define CALL_ProgramParameteriARB(disp, parameters) \
-    (* GET_ProgramParameteriARB(disp)) parameters
-static inline _glptr_ProgramParameteriARB
-GET_ProgramParameteriARB(struct _glapi_table *disp)
-{
-    return (_glptr_ProgramParameteriARB) (GET_by_offset
-                                          (disp,
-                                           _gloffset_ProgramParameteriARB));
+static INLINE void SET_RenderbufferStorage(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLsizei, GLsizei)) {
+   SET_by_offset(disp, _gloffset_RenderbufferStorage, fn);
 }
 
-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_RenderbufferStorageMultisample)(GLenum, GLsizei, GLenum, GLsizei, GLsizei);
+#define CALL_RenderbufferStorageMultisample(disp, parameters) \
+    (* GET_RenderbufferStorageMultisample(disp)) parameters
+static INLINE _glptr_RenderbufferStorageMultisample GET_RenderbufferStorageMultisample(struct _glapi_table *disp) {
+   return (_glptr_RenderbufferStorageMultisample) (GET_by_offset(disp, _gloffset_RenderbufferStorageMultisample));
 }
 
-typedef void (GLAPIENTRYP _glptr_VertexAttribDivisorARB) (GLuint, GLuint);
+static INLINE void SET_RenderbufferStorageMultisample(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLenum, GLsizei, GLsizei)) {
+   SET_by_offset(disp, _gloffset_RenderbufferStorageMultisample, fn);
+}
 
-#define CALL_VertexAttribDivisorARB(disp, parameters) \
-    (* GET_VertexAttribDivisorARB(disp)) parameters
-static inline _glptr_VertexAttribDivisorARB
-GET_VertexAttribDivisorARB(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribDivisorARB) (GET_by_offset
-                                            (disp,
-                                             _gloffset_VertexAttribDivisorARB));
+typedef void (GLAPIENTRYP _glptr_FramebufferTextureFaceARB)(GLenum, GLenum, GLuint, GLint, GLenum);
+#define CALL_FramebufferTextureFaceARB(disp, parameters) \
+    (* GET_FramebufferTextureFaceARB(disp)) parameters
+static INLINE _glptr_FramebufferTextureFaceARB GET_FramebufferTextureFaceARB(struct _glapi_table *disp) {
+   return (_glptr_FramebufferTextureFaceARB) (GET_by_offset(disp, _gloffset_FramebufferTextureFaceARB));
 }
 
-static inline void
-SET_VertexAttribDivisorARB(struct _glapi_table *disp,
-                           void (GLAPIENTRYP fn) (GLuint, GLuint))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribDivisorARB, fn);
+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_FlushMappedBufferRange) (GLenum, GLintptr,
-                                                          GLsizeiptr);
+typedef void (GLAPIENTRYP _glptr_FlushMappedBufferRange)(GLenum, GLintptr, GLsizeiptr);
 #define CALL_FlushMappedBufferRange(disp, parameters) \
     (* GET_FlushMappedBufferRange(disp)) parameters
-static inline _glptr_FlushMappedBufferRange
-GET_FlushMappedBufferRange(struct _glapi_table *disp)
-{
-    return (_glptr_FlushMappedBufferRange) (GET_by_offset
-                                            (disp,
-                                             _gloffset_FlushMappedBufferRange));
+static INLINE _glptr_FlushMappedBufferRange GET_FlushMappedBufferRange(struct _glapi_table *disp) {
+   return (_glptr_FlushMappedBufferRange) (GET_by_offset(disp, _gloffset_FlushMappedBufferRange));
 }
 
-static inline void
-SET_FlushMappedBufferRange(struct _glapi_table *disp,
-                           void (GLAPIENTRYP fn) (GLenum, GLintptr, GLsizeiptr))
-{
-    SET_by_offset(disp, _gloffset_FlushMappedBufferRange, fn);
+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);
+typedef GLvoid * (GLAPIENTRYP _glptr_MapBufferRange)(GLenum, GLintptr, GLsizeiptr, GLbitfield);
 #define CALL_MapBufferRange(disp, parameters) \
     (* GET_MapBufferRange(disp)) parameters
-static inline _glptr_MapBufferRange
-GET_MapBufferRange(struct _glapi_table *disp)
-{
-    return (_glptr_MapBufferRange) (GET_by_offset
-                                    (disp, _gloffset_MapBufferRange));
+static INLINE _glptr_MapBufferRange GET_MapBufferRange(struct _glapi_table *disp) {
+   return (_glptr_MapBufferRange) (GET_by_offset(disp, _gloffset_MapBufferRange));
 }
 
-static inline void
-SET_MapBufferRange(struct _glapi_table *disp,
-                   GLvoid * (GLAPIENTRYP fn) (GLenum, GLintptr, GLsizeiptr,
-                                              GLbitfield))
-{
-    SET_by_offset(disp, _gloffset_MapBufferRange, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_BindVertexArray)(GLuint);
+#define CALL_BindVertexArray(disp, parameters) \
+    (* GET_BindVertexArray(disp)) parameters
+static INLINE _glptr_BindVertexArray GET_BindVertexArray(struct _glapi_table *disp) {
+   return (_glptr_BindVertexArray) (GET_by_offset(disp, _gloffset_BindVertexArray));
+}
 
-#define CALL_TexBufferARB(disp, parameters) \
-    (* GET_TexBufferARB(disp)) parameters
-static inline _glptr_TexBufferARB
-GET_TexBufferARB(struct _glapi_table *disp)
-{
-    return (_glptr_TexBufferARB) (GET_by_offset(disp, _gloffset_TexBufferARB));
+static INLINE void SET_BindVertexArray(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) {
+   SET_by_offset(disp, _gloffset_BindVertexArray, fn);
 }
 
-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_DeleteVertexArrays)(GLsizei, const GLuint *);
+#define CALL_DeleteVertexArrays(disp, parameters) \
+    (* GET_DeleteVertexArrays(disp)) parameters
+static INLINE _glptr_DeleteVertexArrays GET_DeleteVertexArrays(struct _glapi_table *disp) {
+   return (_glptr_DeleteVertexArrays) (GET_by_offset(disp, _gloffset_DeleteVertexArrays));
 }
 
-typedef void (GLAPIENTRYP _glptr_BindVertexArray) (GLuint);
+static INLINE void SET_DeleteVertexArrays(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLuint *)) {
+   SET_by_offset(disp, _gloffset_DeleteVertexArrays, fn);
+}
 
-#define CALL_BindVertexArray(disp, parameters) \
-    (* GET_BindVertexArray(disp)) parameters
-static inline _glptr_BindVertexArray
-GET_BindVertexArray(struct _glapi_table *disp)
-{
-    return (_glptr_BindVertexArray) (GET_by_offset
-                                     (disp, _gloffset_BindVertexArray));
+typedef void (GLAPIENTRYP _glptr_GenVertexArrays)(GLsizei, GLuint *);
+#define CALL_GenVertexArrays(disp, parameters) \
+    (* GET_GenVertexArrays(disp)) parameters
+static INLINE _glptr_GenVertexArrays GET_GenVertexArrays(struct _glapi_table *disp) {
+   return (_glptr_GenVertexArrays) (GET_by_offset(disp, _gloffset_GenVertexArrays));
 }
 
-static inline void
-SET_BindVertexArray(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_BindVertexArray, fn);
+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_GenVertexArrays) (GLsizei, GLuint *);
+typedef GLboolean (GLAPIENTRYP _glptr_IsVertexArray)(GLuint);
+#define CALL_IsVertexArray(disp, parameters) \
+    (* GET_IsVertexArray(disp)) parameters
+static INLINE _glptr_IsVertexArray GET_IsVertexArray(struct _glapi_table *disp) {
+   return (_glptr_IsVertexArray) (GET_by_offset(disp, _gloffset_IsVertexArray));
+}
 
-#define CALL_GenVertexArrays(disp, parameters) \
-    (* GET_GenVertexArrays(disp)) parameters
-static inline _glptr_GenVertexArrays
-GET_GenVertexArrays(struct _glapi_table *disp)
-{
-    return (_glptr_GenVertexArrays) (GET_by_offset
-                                     (disp, _gloffset_GenVertexArrays));
+static INLINE void SET_IsVertexArray(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLuint)) {
+   SET_by_offset(disp, _gloffset_IsVertexArray, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetActiveUniformBlockName)(GLuint, GLuint, GLsizei, GLsizei *, GLchar *);
+#define CALL_GetActiveUniformBlockName(disp, parameters) \
+    (* GET_GetActiveUniformBlockName(disp)) parameters
+static INLINE _glptr_GetActiveUniformBlockName GET_GetActiveUniformBlockName(struct _glapi_table *disp) {
+   return (_glptr_GetActiveUniformBlockName) (GET_by_offset(disp, _gloffset_GetActiveUniformBlockName));
+}
+
+static INLINE void SET_GetActiveUniformBlockName(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLsizei, GLsizei *, GLchar *)) {
+   SET_by_offset(disp, _gloffset_GetActiveUniformBlockName, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetActiveUniformBlockiv)(GLuint, GLuint, GLenum, GLint *);
+#define CALL_GetActiveUniformBlockiv(disp, parameters) \
+    (* GET_GetActiveUniformBlockiv(disp)) parameters
+static INLINE _glptr_GetActiveUniformBlockiv GET_GetActiveUniformBlockiv(struct _glapi_table *disp) {
+   return (_glptr_GetActiveUniformBlockiv) (GET_by_offset(disp, _gloffset_GetActiveUniformBlockiv));
+}
+
+static INLINE void SET_GetActiveUniformBlockiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLenum, GLint *)) {
+   SET_by_offset(disp, _gloffset_GetActiveUniformBlockiv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetActiveUniformName)(GLuint, GLuint, GLsizei, GLsizei *, GLchar *);
+#define CALL_GetActiveUniformName(disp, parameters) \
+    (* GET_GetActiveUniformName(disp)) parameters
+static INLINE _glptr_GetActiveUniformName GET_GetActiveUniformName(struct _glapi_table *disp) {
+   return (_glptr_GetActiveUniformName) (GET_by_offset(disp, _gloffset_GetActiveUniformName));
 }
 
-static inline void
-SET_GenVertexArrays(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLsizei, GLuint *))
-{
-    SET_by_offset(disp, _gloffset_GenVertexArrays, fn);
+static INLINE void SET_GetActiveUniformName(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLsizei, GLsizei *, GLchar *)) {
+   SET_by_offset(disp, _gloffset_GetActiveUniformName, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_CopyBufferSubData) (GLenum, GLenum, GLintptr,
-                                                     GLintptr, GLsizeiptr);
+typedef void (GLAPIENTRYP _glptr_GetActiveUniformsiv)(GLuint, GLsizei, const GLuint *, GLenum, GLint *);
+#define CALL_GetActiveUniformsiv(disp, parameters) \
+    (* GET_GetActiveUniformsiv(disp)) parameters
+static INLINE _glptr_GetActiveUniformsiv GET_GetActiveUniformsiv(struct _glapi_table *disp) {
+   return (_glptr_GetActiveUniformsiv) (GET_by_offset(disp, _gloffset_GetActiveUniformsiv));
+}
+
+static INLINE void SET_GetActiveUniformsiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLuint *, GLenum, GLint *)) {
+   SET_by_offset(disp, _gloffset_GetActiveUniformsiv, fn);
+}
+
+typedef GLuint (GLAPIENTRYP _glptr_GetUniformBlockIndex)(GLuint, const GLchar *);
+#define CALL_GetUniformBlockIndex(disp, parameters) \
+    (* GET_GetUniformBlockIndex(disp)) parameters
+static INLINE _glptr_GetUniformBlockIndex GET_GetUniformBlockIndex(struct _glapi_table *disp) {
+   return (_glptr_GetUniformBlockIndex) (GET_by_offset(disp, _gloffset_GetUniformBlockIndex));
+}
+
+static INLINE void SET_GetUniformBlockIndex(struct _glapi_table *disp, GLuint (GLAPIENTRYP fn)(GLuint, const GLchar *)) {
+   SET_by_offset(disp, _gloffset_GetUniformBlockIndex, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetUniformIndices)(GLuint, GLsizei, const GLchar * const *, GLuint *);
+#define CALL_GetUniformIndices(disp, parameters) \
+    (* GET_GetUniformIndices(disp)) parameters
+static INLINE _glptr_GetUniformIndices GET_GetUniformIndices(struct _glapi_table *disp) {
+   return (_glptr_GetUniformIndices) (GET_by_offset(disp, _gloffset_GetUniformIndices));
+}
+
+static INLINE void SET_GetUniformIndices(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLchar * const *, GLuint *)) {
+   SET_by_offset(disp, _gloffset_GetUniformIndices, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_UniformBlockBinding)(GLuint, GLuint, GLuint);
+#define CALL_UniformBlockBinding(disp, parameters) \
+    (* GET_UniformBlockBinding(disp)) parameters
+static INLINE _glptr_UniformBlockBinding GET_UniformBlockBinding(struct _glapi_table *disp) {
+   return (_glptr_UniformBlockBinding) (GET_by_offset(disp, _gloffset_UniformBlockBinding));
+}
+
+static INLINE void SET_UniformBlockBinding(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLuint)) {
+   SET_by_offset(disp, _gloffset_UniformBlockBinding, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_CopyBufferSubData)(GLenum, GLenum, GLintptr, GLintptr, GLsizeiptr);
 #define CALL_CopyBufferSubData(disp, parameters) \
     (* GET_CopyBufferSubData(disp)) parameters
-static inline _glptr_CopyBufferSubData
-GET_CopyBufferSubData(struct _glapi_table *disp)
-{
-    return (_glptr_CopyBufferSubData) (GET_by_offset
-                                       (disp, _gloffset_CopyBufferSubData));
+static INLINE _glptr_CopyBufferSubData GET_CopyBufferSubData(struct _glapi_table *disp) {
+   return (_glptr_CopyBufferSubData) (GET_by_offset(disp, _gloffset_CopyBufferSubData));
 }
 
-static inline void
-SET_CopyBufferSubData(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLenum, GLenum, GLintptr, GLintptr,
-                                             GLsizeiptr))
-{
-    SET_by_offset(disp, _gloffset_CopyBufferSubData, fn);
+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);
+typedef GLenum (GLAPIENTRYP _glptr_ClientWaitSync)(GLsync, GLbitfield, GLuint64);
 #define CALL_ClientWaitSync(disp, parameters) \
     (* GET_ClientWaitSync(disp)) parameters
-static inline _glptr_ClientWaitSync
-GET_ClientWaitSync(struct _glapi_table *disp)
-{
-    return (_glptr_ClientWaitSync) (GET_by_offset
-                                    (disp, _gloffset_ClientWaitSync));
+static INLINE _glptr_ClientWaitSync GET_ClientWaitSync(struct _glapi_table *disp) {
+   return (_glptr_ClientWaitSync) (GET_by_offset(disp, _gloffset_ClientWaitSync));
 }
 
-static inline void
-SET_ClientWaitSync(struct _glapi_table *disp,
-                   GLenum(GLAPIENTRYP fn) (GLsync, GLbitfield, GLuint64))
-{
-    SET_by_offset(disp, _gloffset_ClientWaitSync, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_DeleteSync)(GLsync);
 #define CALL_DeleteSync(disp, parameters) \
     (* GET_DeleteSync(disp)) parameters
-static inline _glptr_DeleteSync
-GET_DeleteSync(struct _glapi_table *disp)
-{
-    return (_glptr_DeleteSync) (GET_by_offset(disp, _gloffset_DeleteSync));
+static INLINE _glptr_DeleteSync GET_DeleteSync(struct _glapi_table *disp) {
+   return (_glptr_DeleteSync) (GET_by_offset(disp, _gloffset_DeleteSync));
 }
 
-static inline void
-SET_DeleteSync(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLsync))
-{
-    SET_by_offset(disp, _gloffset_DeleteSync, fn);
+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);
-
+typedef GLsync (GLAPIENTRYP _glptr_FenceSync)(GLenum, GLbitfield);
 #define CALL_FenceSync(disp, parameters) \
     (* GET_FenceSync(disp)) parameters
-static inline _glptr_FenceSync
-GET_FenceSync(struct _glapi_table *disp)
-{
-    return (_glptr_FenceSync) (GET_by_offset(disp, _gloffset_FenceSync));
+static INLINE _glptr_FenceSync GET_FenceSync(struct _glapi_table *disp) {
+   return (_glptr_FenceSync) (GET_by_offset(disp, _gloffset_FenceSync));
 }
 
-static inline void
-SET_FenceSync(struct _glapi_table *disp,
-              GLsync(GLAPIENTRYP fn) (GLenum, GLbitfield))
-{
-    SET_by_offset(disp, _gloffset_FenceSync, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_GetInteger64v)(GLenum, GLint64 *);
 #define CALL_GetInteger64v(disp, parameters) \
     (* GET_GetInteger64v(disp)) parameters
-static inline _glptr_GetInteger64v
-GET_GetInteger64v(struct _glapi_table *disp)
-{
-    return (_glptr_GetInteger64v) (GET_by_offset
-                                   (disp, _gloffset_GetInteger64v));
+static INLINE _glptr_GetInteger64v GET_GetInteger64v(struct _glapi_table *disp) {
+   return (_glptr_GetInteger64v) (GET_by_offset(disp, _gloffset_GetInteger64v));
 }
 
-static inline void
-SET_GetInteger64v(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, GLint64 *))
-{
-    SET_by_offset(disp, _gloffset_GetInteger64v, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_GetSynciv)(GLsync, GLenum, GLsizei, GLsizei *, GLint *);
 #define CALL_GetSynciv(disp, parameters) \
     (* GET_GetSynciv(disp)) parameters
-static inline _glptr_GetSynciv
-GET_GetSynciv(struct _glapi_table *disp)
-{
-    return (_glptr_GetSynciv) (GET_by_offset(disp, _gloffset_GetSynciv));
+static INLINE _glptr_GetSynciv GET_GetSynciv(struct _glapi_table *disp) {
+   return (_glptr_GetSynciv) (GET_by_offset(disp, _gloffset_GetSynciv));
 }
 
-static inline void
-SET_GetSynciv(struct _glapi_table *disp,
-              void (GLAPIENTRYP fn) (GLsync, GLenum, GLsizei, GLsizei *,
-                                     GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetSynciv, fn);
+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);
-
+typedef GLboolean (GLAPIENTRYP _glptr_IsSync)(GLsync);
 #define CALL_IsSync(disp, parameters) \
     (* GET_IsSync(disp)) parameters
-static inline _glptr_IsSync
-GET_IsSync(struct _glapi_table *disp)
-{
-    return (_glptr_IsSync) (GET_by_offset(disp, _gloffset_IsSync));
+static INLINE _glptr_IsSync GET_IsSync(struct _glapi_table *disp) {
+   return (_glptr_IsSync) (GET_by_offset(disp, _gloffset_IsSync));
 }
 
-static inline void
-SET_IsSync(struct _glapi_table *disp, GLboolean(GLAPIENTRYP fn) (GLsync))
-{
-    SET_by_offset(disp, _gloffset_IsSync, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_WaitSync)(GLsync, GLbitfield, GLuint64);
 #define CALL_WaitSync(disp, parameters) \
     (* GET_WaitSync(disp)) parameters
-static inline _glptr_WaitSync
-GET_WaitSync(struct _glapi_table *disp)
-{
-    return (_glptr_WaitSync) (GET_by_offset(disp, _gloffset_WaitSync));
+static INLINE _glptr_WaitSync GET_WaitSync(struct _glapi_table *disp) {
+   return (_glptr_WaitSync) (GET_by_offset(disp, _gloffset_WaitSync));
 }
 
-static inline void
-SET_WaitSync(struct _glapi_table *disp,
-             void (GLAPIENTRYP fn) (GLsync, GLbitfield, GLuint64))
-{
-    SET_by_offset(disp, _gloffset_WaitSync, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_DrawElementsBaseVertex)(GLenum, GLsizei, GLenum, const GLvoid *, GLint);
 #define CALL_DrawElementsBaseVertex(disp, parameters) \
     (* GET_DrawElementsBaseVertex(disp)) parameters
-static inline _glptr_DrawElementsBaseVertex
-GET_DrawElementsBaseVertex(struct _glapi_table *disp)
-{
-    return (_glptr_DrawElementsBaseVertex) (GET_by_offset
-                                            (disp,
-                                             _gloffset_DrawElementsBaseVertex));
-}
-
-static inline void
-SET_DrawElementsBaseVertex(struct _glapi_table *disp,
-                           void (GLAPIENTRYP fn) (GLenum, GLsizei, GLenum,
-                                                  const GLvoid *, GLint))
-{
-    SET_by_offset(disp, _gloffset_DrawElementsBaseVertex, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_DrawElementsInstancedBaseVertex) (GLenum,
-                                                                   GLsizei,
-                                                                   GLenum,
-                                                                   const GLvoid
-                                                                   *, GLsizei,
-                                                                   GLint);
+static INLINE _glptr_DrawElementsBaseVertex GET_DrawElementsBaseVertex(struct _glapi_table *disp) {
+   return (_glptr_DrawElementsBaseVertex) (GET_by_offset(disp, _gloffset_DrawElementsBaseVertex));
+}
+
+static INLINE void SET_DrawElementsBaseVertex(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLenum, const GLvoid *, GLint)) {
+   SET_by_offset(disp, _gloffset_DrawElementsBaseVertex, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_DrawElementsInstancedBaseVertex)(GLenum, GLsizei, GLenum, const GLvoid *, GLsizei, GLint);
 #define CALL_DrawElementsInstancedBaseVertex(disp, parameters) \
     (* GET_DrawElementsInstancedBaseVertex(disp)) parameters
-static inline _glptr_DrawElementsInstancedBaseVertex
-GET_DrawElementsInstancedBaseVertex(struct _glapi_table *disp)
-{
-    return (_glptr_DrawElementsInstancedBaseVertex) (GET_by_offset
-                                                     (disp,
-                                                      _gloffset_DrawElementsInstancedBaseVertex));
-}
-
-static inline void
-SET_DrawElementsInstancedBaseVertex(struct _glapi_table *disp,
-                                    void (GLAPIENTRYP fn) (GLenum, GLsizei,
-                                                           GLenum,
-                                                           const GLvoid *,
-                                                           GLsizei, GLint))
-{
-    SET_by_offset(disp, _gloffset_DrawElementsInstancedBaseVertex, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_DrawRangeElementsBaseVertex) (GLenum, GLuint,
-                                                               GLuint, GLsizei,
-                                                               GLenum,
-                                                               const GLvoid *,
-                                                               GLint);
+static INLINE _glptr_DrawElementsInstancedBaseVertex GET_DrawElementsInstancedBaseVertex(struct _glapi_table *disp) {
+   return (_glptr_DrawElementsInstancedBaseVertex) (GET_by_offset(disp, _gloffset_DrawElementsInstancedBaseVertex));
+}
+
+static INLINE void SET_DrawElementsInstancedBaseVertex(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLenum, const GLvoid *, GLsizei, GLint)) {
+   SET_by_offset(disp, _gloffset_DrawElementsInstancedBaseVertex, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_DrawRangeElementsBaseVertex)(GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *, GLint);
 #define CALL_DrawRangeElementsBaseVertex(disp, parameters) \
     (* GET_DrawRangeElementsBaseVertex(disp)) parameters
-static inline _glptr_DrawRangeElementsBaseVertex
-GET_DrawRangeElementsBaseVertex(struct _glapi_table *disp)
-{
-    return (_glptr_DrawRangeElementsBaseVertex) (GET_by_offset
-                                                 (disp,
-                                                  _gloffset_DrawRangeElementsBaseVertex));
-}
-
-static inline void
-SET_DrawRangeElementsBaseVertex(struct _glapi_table *disp,
-                                void (GLAPIENTRYP fn) (GLenum, GLuint, GLuint,
-                                                       GLsizei, GLenum,
-                                                       const GLvoid *, GLint))
-{
-    SET_by_offset(disp, _gloffset_DrawRangeElementsBaseVertex, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultiDrawElementsBaseVertex) (GLenum,
-                                                               const GLsizei *,
-                                                               GLenum,
-                                                               const GLvoid **,
-                                                               GLsizei,
-                                                               const GLint *);
+static INLINE _glptr_DrawRangeElementsBaseVertex GET_DrawRangeElementsBaseVertex(struct _glapi_table *disp) {
+   return (_glptr_DrawRangeElementsBaseVertex) (GET_by_offset(disp, _gloffset_DrawRangeElementsBaseVertex));
+}
+
+static INLINE void SET_DrawRangeElementsBaseVertex(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *, GLint)) {
+   SET_by_offset(disp, _gloffset_DrawRangeElementsBaseVertex, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_MultiDrawElementsBaseVertex)(GLenum, const GLsizei *, GLenum, const GLvoid * const *, GLsizei, const GLint *);
 #define CALL_MultiDrawElementsBaseVertex(disp, parameters) \
     (* GET_MultiDrawElementsBaseVertex(disp)) parameters
-static inline _glptr_MultiDrawElementsBaseVertex
-GET_MultiDrawElementsBaseVertex(struct _glapi_table *disp)
-{
-    return (_glptr_MultiDrawElementsBaseVertex) (GET_by_offset
-                                                 (disp,
-                                                  _gloffset_MultiDrawElementsBaseVertex));
+static INLINE _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 * const *, GLsizei, const GLint *)) {
+   SET_by_offset(disp, _gloffset_MultiDrawElementsBaseVertex, fn);
 }
 
-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_ProvokingVertex)(GLenum);
+#define CALL_ProvokingVertex(disp, parameters) \
+    (* GET_ProvokingVertex(disp)) parameters
+static INLINE _glptr_ProvokingVertex GET_ProvokingVertex(struct _glapi_table *disp) {
+   return (_glptr_ProvokingVertex) (GET_by_offset(disp, _gloffset_ProvokingVertex));
 }
 
-typedef void (GLAPIENTRYP _glptr_BlendEquationSeparateiARB) (GLuint, GLenum,
-                                                             GLenum);
+static INLINE void SET_ProvokingVertex(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
+   SET_by_offset(disp, _gloffset_ProvokingVertex, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_BlendEquationSeparateiARB)(GLuint, GLenum, GLenum);
 #define CALL_BlendEquationSeparateiARB(disp, parameters) \
     (* GET_BlendEquationSeparateiARB(disp)) parameters
-static inline _glptr_BlendEquationSeparateiARB
-GET_BlendEquationSeparateiARB(struct _glapi_table *disp)
-{
-    return (_glptr_BlendEquationSeparateiARB) (GET_by_offset
-                                               (disp,
-                                                _gloffset_BlendEquationSeparateiARB));
+static INLINE _glptr_BlendEquationSeparateiARB GET_BlendEquationSeparateiARB(struct _glapi_table *disp) {
+   return (_glptr_BlendEquationSeparateiARB) (GET_by_offset(disp, _gloffset_BlendEquationSeparateiARB));
 }
 
-static inline void
-SET_BlendEquationSeparateiARB(struct _glapi_table *disp,
-                              void (GLAPIENTRYP fn) (GLuint, GLenum, GLenum))
-{
-    SET_by_offset(disp, _gloffset_BlendEquationSeparateiARB, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_BlendEquationiARB)(GLuint, GLenum);
 #define CALL_BlendEquationiARB(disp, parameters) \
     (* GET_BlendEquationiARB(disp)) parameters
-static inline _glptr_BlendEquationiARB
-GET_BlendEquationiARB(struct _glapi_table *disp)
-{
-    return (_glptr_BlendEquationiARB) (GET_by_offset
-                                       (disp, _gloffset_BlendEquationiARB));
+static INLINE _glptr_BlendEquationiARB GET_BlendEquationiARB(struct _glapi_table *disp) {
+   return (_glptr_BlendEquationiARB) (GET_by_offset(disp, _gloffset_BlendEquationiARB));
 }
 
-static inline void
-SET_BlendEquationiARB(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, GLenum))
-{
-    SET_by_offset(disp, _gloffset_BlendEquationiARB, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_BlendFuncSeparateiARB)(GLuint, GLenum, GLenum, GLenum, GLenum);
 #define CALL_BlendFuncSeparateiARB(disp, parameters) \
     (* GET_BlendFuncSeparateiARB(disp)) parameters
-static inline _glptr_BlendFuncSeparateiARB
-GET_BlendFuncSeparateiARB(struct _glapi_table *disp)
-{
-    return (_glptr_BlendFuncSeparateiARB) (GET_by_offset
-                                           (disp,
-                                            _gloffset_BlendFuncSeparateiARB));
+static INLINE _glptr_BlendFuncSeparateiARB GET_BlendFuncSeparateiARB(struct _glapi_table *disp) {
+   return (_glptr_BlendFuncSeparateiARB) (GET_by_offset(disp, _gloffset_BlendFuncSeparateiARB));
 }
 
-static inline void
-SET_BlendFuncSeparateiARB(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (GLuint, GLenum, GLenum, GLenum,
-                                                 GLenum))
-{
-    SET_by_offset(disp, _gloffset_BlendFuncSeparateiARB, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_BlendFunciARB)(GLuint, GLenum, GLenum);
 #define CALL_BlendFunciARB(disp, parameters) \
     (* GET_BlendFunciARB(disp)) parameters
-static inline _glptr_BlendFunciARB
-GET_BlendFunciARB(struct _glapi_table *disp)
-{
-    return (_glptr_BlendFunciARB) (GET_by_offset
-                                   (disp, _gloffset_BlendFunciARB));
+static INLINE _glptr_BlendFunciARB GET_BlendFunciARB(struct _glapi_table *disp) {
+   return (_glptr_BlendFunciARB) (GET_by_offset(disp, _gloffset_BlendFunciARB));
+}
+
+static INLINE void SET_BlendFunciARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLenum)) {
+   SET_by_offset(disp, _gloffset_BlendFunciARB, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_BindFragDataLocationIndexed)(GLuint, GLuint, GLuint, const GLchar *);
+#define CALL_BindFragDataLocationIndexed(disp, parameters) \
+    (* GET_BindFragDataLocationIndexed(disp)) parameters
+static INLINE _glptr_BindFragDataLocationIndexed GET_BindFragDataLocationIndexed(struct _glapi_table *disp) {
+   return (_glptr_BindFragDataLocationIndexed) (GET_by_offset(disp, _gloffset_BindFragDataLocationIndexed));
+}
+
+static INLINE void SET_BindFragDataLocationIndexed(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLuint, const GLchar *)) {
+   SET_by_offset(disp, _gloffset_BindFragDataLocationIndexed, fn);
 }
 
-static inline void
-SET_BlendFunciARB(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLuint, GLenum, GLenum))
-{
-    SET_by_offset(disp, _gloffset_BlendFunciARB, fn);
+typedef GLint (GLAPIENTRYP _glptr_GetFragDataIndex)(GLuint, const GLchar *);
+#define CALL_GetFragDataIndex(disp, parameters) \
+    (* GET_GetFragDataIndex(disp)) parameters
+static INLINE _glptr_GetFragDataIndex GET_GetFragDataIndex(struct _glapi_table *disp) {
+   return (_glptr_GetFragDataIndex) (GET_by_offset(disp, _gloffset_GetFragDataIndex));
 }
 
-typedef void (GLAPIENTRYP _glptr_BindSampler) (GLuint, GLuint);
+static INLINE void SET_GetFragDataIndex(struct _glapi_table *disp, GLint (GLAPIENTRYP fn)(GLuint, const GLchar *)) {
+   SET_by_offset(disp, _gloffset_GetFragDataIndex, fn);
+}
 
+typedef void (GLAPIENTRYP _glptr_BindSampler)(GLuint, GLuint);
 #define CALL_BindSampler(disp, parameters) \
     (* GET_BindSampler(disp)) parameters
-static inline _glptr_BindSampler
-GET_BindSampler(struct _glapi_table *disp)
-{
-    return (_glptr_BindSampler) (GET_by_offset(disp, _gloffset_BindSampler));
+static INLINE _glptr_BindSampler GET_BindSampler(struct _glapi_table *disp) {
+   return (_glptr_BindSampler) (GET_by_offset(disp, _gloffset_BindSampler));
 }
 
-static inline void
-SET_BindSampler(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLuint, GLuint))
-{
-    SET_by_offset(disp, _gloffset_BindSampler, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_DeleteSamplers)(GLsizei, const GLuint *);
 #define CALL_DeleteSamplers(disp, parameters) \
     (* GET_DeleteSamplers(disp)) parameters
-static inline _glptr_DeleteSamplers
-GET_DeleteSamplers(struct _glapi_table *disp)
-{
-    return (_glptr_DeleteSamplers) (GET_by_offset
-                                    (disp, _gloffset_DeleteSamplers));
+static INLINE _glptr_DeleteSamplers GET_DeleteSamplers(struct _glapi_table *disp) {
+   return (_glptr_DeleteSamplers) (GET_by_offset(disp, _gloffset_DeleteSamplers));
 }
 
-static inline void
-SET_DeleteSamplers(struct _glapi_table *disp,
-                   void (GLAPIENTRYP fn) (GLsizei, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_DeleteSamplers, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_GenSamplers)(GLsizei, GLuint *);
 #define CALL_GenSamplers(disp, parameters) \
     (* GET_GenSamplers(disp)) parameters
-static inline _glptr_GenSamplers
-GET_GenSamplers(struct _glapi_table *disp)
-{
-    return (_glptr_GenSamplers) (GET_by_offset(disp, _gloffset_GenSamplers));
+static INLINE _glptr_GenSamplers GET_GenSamplers(struct _glapi_table *disp) {
+   return (_glptr_GenSamplers) (GET_by_offset(disp, _gloffset_GenSamplers));
 }
 
-static inline void
-SET_GenSamplers(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLsizei, GLuint *))
-{
-    SET_by_offset(disp, _gloffset_GenSamplers, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_GetSamplerParameterIiv)(GLuint, GLenum, GLint *);
 #define CALL_GetSamplerParameterIiv(disp, parameters) \
     (* GET_GetSamplerParameterIiv(disp)) parameters
-static inline _glptr_GetSamplerParameterIiv
-GET_GetSamplerParameterIiv(struct _glapi_table *disp)
-{
-    return (_glptr_GetSamplerParameterIiv) (GET_by_offset
-                                            (disp,
-                                             _gloffset_GetSamplerParameterIiv));
+static INLINE _glptr_GetSamplerParameterIiv GET_GetSamplerParameterIiv(struct _glapi_table *disp) {
+   return (_glptr_GetSamplerParameterIiv) (GET_by_offset(disp, _gloffset_GetSamplerParameterIiv));
 }
 
-static inline void
-SET_GetSamplerParameterIiv(struct _glapi_table *disp,
-                           void (GLAPIENTRYP fn) (GLuint, GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetSamplerParameterIiv, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_GetSamplerParameterIuiv)(GLuint, GLenum, GLuint *);
 #define CALL_GetSamplerParameterIuiv(disp, parameters) \
     (* GET_GetSamplerParameterIuiv(disp)) parameters
-static inline _glptr_GetSamplerParameterIuiv
-GET_GetSamplerParameterIuiv(struct _glapi_table *disp)
-{
-    return (_glptr_GetSamplerParameterIuiv) (GET_by_offset
-                                             (disp,
-                                              _gloffset_GetSamplerParameterIuiv));
+static INLINE _glptr_GetSamplerParameterIuiv GET_GetSamplerParameterIuiv(struct _glapi_table *disp) {
+   return (_glptr_GetSamplerParameterIuiv) (GET_by_offset(disp, _gloffset_GetSamplerParameterIuiv));
 }
 
-static inline void
-SET_GetSamplerParameterIuiv(struct _glapi_table *disp,
-                            void (GLAPIENTRYP fn) (GLuint, GLenum, GLuint *))
-{
-    SET_by_offset(disp, _gloffset_GetSamplerParameterIuiv, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_GetSamplerParameterfv)(GLuint, GLenum, GLfloat *);
 #define CALL_GetSamplerParameterfv(disp, parameters) \
     (* GET_GetSamplerParameterfv(disp)) parameters
-static inline _glptr_GetSamplerParameterfv
-GET_GetSamplerParameterfv(struct _glapi_table *disp)
-{
-    return (_glptr_GetSamplerParameterfv) (GET_by_offset
-                                           (disp,
-                                            _gloffset_GetSamplerParameterfv));
+static INLINE _glptr_GetSamplerParameterfv GET_GetSamplerParameterfv(struct _glapi_table *disp) {
+   return (_glptr_GetSamplerParameterfv) (GET_by_offset(disp, _gloffset_GetSamplerParameterfv));
 }
 
-static inline void
-SET_GetSamplerParameterfv(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (GLuint, GLenum, GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetSamplerParameterfv, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_GetSamplerParameteriv)(GLuint, GLenum, GLint *);
 #define CALL_GetSamplerParameteriv(disp, parameters) \
     (* GET_GetSamplerParameteriv(disp)) parameters
-static inline _glptr_GetSamplerParameteriv
-GET_GetSamplerParameteriv(struct _glapi_table *disp)
-{
-    return (_glptr_GetSamplerParameteriv) (GET_by_offset
-                                           (disp,
-                                            _gloffset_GetSamplerParameteriv));
+static INLINE _glptr_GetSamplerParameteriv GET_GetSamplerParameteriv(struct _glapi_table *disp) {
+   return (_glptr_GetSamplerParameteriv) (GET_by_offset(disp, _gloffset_GetSamplerParameteriv));
 }
 
-static inline void
-SET_GetSamplerParameteriv(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (GLuint, GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetSamplerParameteriv, fn);
+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);
-
+typedef GLboolean (GLAPIENTRYP _glptr_IsSampler)(GLuint);
 #define CALL_IsSampler(disp, parameters) \
     (* GET_IsSampler(disp)) parameters
-static inline _glptr_IsSampler
-GET_IsSampler(struct _glapi_table *disp)
-{
-    return (_glptr_IsSampler) (GET_by_offset(disp, _gloffset_IsSampler));
+static INLINE _glptr_IsSampler GET_IsSampler(struct _glapi_table *disp) {
+   return (_glptr_IsSampler) (GET_by_offset(disp, _gloffset_IsSampler));
 }
 
-static inline void
-SET_IsSampler(struct _glapi_table *disp, GLboolean(GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_IsSampler, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_SamplerParameterIiv)(GLuint, GLenum, const GLint *);
 #define CALL_SamplerParameterIiv(disp, parameters) \
     (* GET_SamplerParameterIiv(disp)) parameters
-static inline _glptr_SamplerParameterIiv
-GET_SamplerParameterIiv(struct _glapi_table *disp)
-{
-    return (_glptr_SamplerParameterIiv) (GET_by_offset
-                                         (disp, _gloffset_SamplerParameterIiv));
+static INLINE _glptr_SamplerParameterIiv GET_SamplerParameterIiv(struct _glapi_table *disp) {
+   return (_glptr_SamplerParameterIiv) (GET_by_offset(disp, _gloffset_SamplerParameterIiv));
 }
 
-static inline void
-SET_SamplerParameterIiv(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLuint, GLenum, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_SamplerParameterIiv, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_SamplerParameterIuiv)(GLuint, GLenum, const GLuint *);
 #define CALL_SamplerParameterIuiv(disp, parameters) \
     (* GET_SamplerParameterIuiv(disp)) parameters
-static inline _glptr_SamplerParameterIuiv
-GET_SamplerParameterIuiv(struct _glapi_table *disp)
-{
-    return (_glptr_SamplerParameterIuiv) (GET_by_offset
-                                          (disp,
-                                           _gloffset_SamplerParameterIuiv));
+static INLINE _glptr_SamplerParameterIuiv GET_SamplerParameterIuiv(struct _glapi_table *disp) {
+   return (_glptr_SamplerParameterIuiv) (GET_by_offset(disp, _gloffset_SamplerParameterIuiv));
 }
 
-static inline void
-SET_SamplerParameterIuiv(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (GLuint, GLenum, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_SamplerParameterIuiv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_SamplerParameterf)(GLuint, GLenum, GLfloat);
 #define CALL_SamplerParameterf(disp, parameters) \
     (* GET_SamplerParameterf(disp)) parameters
-static inline _glptr_SamplerParameterf
-GET_SamplerParameterf(struct _glapi_table *disp)
-{
-    return (_glptr_SamplerParameterf) (GET_by_offset
-                                       (disp, _gloffset_SamplerParameterf));
+static INLINE _glptr_SamplerParameterf GET_SamplerParameterf(struct _glapi_table *disp) {
+   return (_glptr_SamplerParameterf) (GET_by_offset(disp, _gloffset_SamplerParameterf));
 }
 
-static inline void
-SET_SamplerParameterf(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, GLenum, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_SamplerParameterf, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_SamplerParameterfv)(GLuint, GLenum, const GLfloat *);
 #define CALL_SamplerParameterfv(disp, parameters) \
     (* GET_SamplerParameterfv(disp)) parameters
-static inline _glptr_SamplerParameterfv
-GET_SamplerParameterfv(struct _glapi_table *disp)
-{
-    return (_glptr_SamplerParameterfv) (GET_by_offset
-                                        (disp, _gloffset_SamplerParameterfv));
+static INLINE _glptr_SamplerParameterfv GET_SamplerParameterfv(struct _glapi_table *disp) {
+   return (_glptr_SamplerParameterfv) (GET_by_offset(disp, _gloffset_SamplerParameterfv));
 }
 
-static inline void
-SET_SamplerParameterfv(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, GLenum, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_SamplerParameterfv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_SamplerParameteri)(GLuint, GLenum, GLint);
 #define CALL_SamplerParameteri(disp, parameters) \
     (* GET_SamplerParameteri(disp)) parameters
-static inline _glptr_SamplerParameteri
-GET_SamplerParameteri(struct _glapi_table *disp)
-{
-    return (_glptr_SamplerParameteri) (GET_by_offset
-                                       (disp, _gloffset_SamplerParameteri));
+static INLINE _glptr_SamplerParameteri GET_SamplerParameteri(struct _glapi_table *disp) {
+   return (_glptr_SamplerParameteri) (GET_by_offset(disp, _gloffset_SamplerParameteri));
 }
 
-static inline void
-SET_SamplerParameteri(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, GLenum, GLint))
-{
-    SET_by_offset(disp, _gloffset_SamplerParameteri, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_SamplerParameteriv)(GLuint, GLenum, const GLint *);
 #define CALL_SamplerParameteriv(disp, parameters) \
     (* GET_SamplerParameteriv(disp)) parameters
-static inline _glptr_SamplerParameteriv
-GET_SamplerParameteriv(struct _glapi_table *disp)
-{
-    return (_glptr_SamplerParameteriv) (GET_by_offset
-                                        (disp, _gloffset_SamplerParameteriv));
+static INLINE _glptr_SamplerParameteriv GET_SamplerParameteriv(struct _glapi_table *disp) {
+   return (_glptr_SamplerParameteriv) (GET_by_offset(disp, _gloffset_SamplerParameteriv));
+}
+
+static INLINE void SET_SamplerParameteriv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, const GLint *)) {
+   SET_by_offset(disp, _gloffset_SamplerParameteriv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetQueryObjecti64v)(GLuint, GLenum, GLint64 *);
+#define CALL_GetQueryObjecti64v(disp, parameters) \
+    (* GET_GetQueryObjecti64v(disp)) parameters
+static INLINE _glptr_GetQueryObjecti64v GET_GetQueryObjecti64v(struct _glapi_table *disp) {
+   return (_glptr_GetQueryObjecti64v) (GET_by_offset(disp, _gloffset_GetQueryObjecti64v));
+}
+
+static INLINE void SET_GetQueryObjecti64v(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint64 *)) {
+   SET_by_offset(disp, _gloffset_GetQueryObjecti64v, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetQueryObjectui64v)(GLuint, GLenum, GLuint64 *);
+#define CALL_GetQueryObjectui64v(disp, parameters) \
+    (* GET_GetQueryObjectui64v(disp)) parameters
+static INLINE _glptr_GetQueryObjectui64v GET_GetQueryObjectui64v(struct _glapi_table *disp) {
+   return (_glptr_GetQueryObjectui64v) (GET_by_offset(disp, _gloffset_GetQueryObjectui64v));
 }
 
-static inline void
-SET_SamplerParameteriv(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, GLenum, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_SamplerParameteriv, fn);
+static INLINE void SET_GetQueryObjectui64v(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLuint64 *)) {
+   SET_by_offset(disp, _gloffset_GetQueryObjectui64v, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_ColorP3ui) (GLenum, GLuint);
+typedef void (GLAPIENTRYP _glptr_QueryCounter)(GLuint, GLenum);
+#define CALL_QueryCounter(disp, parameters) \
+    (* GET_QueryCounter(disp)) parameters
+static INLINE _glptr_QueryCounter GET_QueryCounter(struct _glapi_table *disp) {
+   return (_glptr_QueryCounter) (GET_by_offset(disp, _gloffset_QueryCounter));
+}
 
+static INLINE void SET_QueryCounter(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum)) {
+   SET_by_offset(disp, _gloffset_QueryCounter, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_ColorP3ui)(GLenum, GLuint);
 #define CALL_ColorP3ui(disp, parameters) \
     (* GET_ColorP3ui(disp)) parameters
-static inline _glptr_ColorP3ui
-GET_ColorP3ui(struct _glapi_table *disp)
-{
-    return (_glptr_ColorP3ui) (GET_by_offset(disp, _gloffset_ColorP3ui));
+static INLINE _glptr_ColorP3ui GET_ColorP3ui(struct _glapi_table *disp) {
+   return (_glptr_ColorP3ui) (GET_by_offset(disp, _gloffset_ColorP3ui));
 }
 
-static inline void
-SET_ColorP3ui(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_ColorP3ui, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_ColorP3uiv)(GLenum, const GLuint *);
 #define CALL_ColorP3uiv(disp, parameters) \
     (* GET_ColorP3uiv(disp)) parameters
-static inline _glptr_ColorP3uiv
-GET_ColorP3uiv(struct _glapi_table *disp)
-{
-    return (_glptr_ColorP3uiv) (GET_by_offset(disp, _gloffset_ColorP3uiv));
+static INLINE _glptr_ColorP3uiv GET_ColorP3uiv(struct _glapi_table *disp) {
+   return (_glptr_ColorP3uiv) (GET_by_offset(disp, _gloffset_ColorP3uiv));
 }
 
-static inline void
-SET_ColorP3uiv(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLenum, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_ColorP3uiv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_ColorP4ui)(GLenum, GLuint);
 #define CALL_ColorP4ui(disp, parameters) \
     (* GET_ColorP4ui(disp)) parameters
-static inline _glptr_ColorP4ui
-GET_ColorP4ui(struct _glapi_table *disp)
-{
-    return (_glptr_ColorP4ui) (GET_by_offset(disp, _gloffset_ColorP4ui));
+static INLINE _glptr_ColorP4ui GET_ColorP4ui(struct _glapi_table *disp) {
+   return (_glptr_ColorP4ui) (GET_by_offset(disp, _gloffset_ColorP4ui));
 }
 
-static inline void
-SET_ColorP4ui(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_ColorP4ui, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_ColorP4uiv)(GLenum, const GLuint *);
 #define CALL_ColorP4uiv(disp, parameters) \
     (* GET_ColorP4uiv(disp)) parameters
-static inline _glptr_ColorP4uiv
-GET_ColorP4uiv(struct _glapi_table *disp)
-{
-    return (_glptr_ColorP4uiv) (GET_by_offset(disp, _gloffset_ColorP4uiv));
+static INLINE _glptr_ColorP4uiv GET_ColorP4uiv(struct _glapi_table *disp) {
+   return (_glptr_ColorP4uiv) (GET_by_offset(disp, _gloffset_ColorP4uiv));
 }
 
-static inline void
-SET_ColorP4uiv(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLenum, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_ColorP4uiv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_MultiTexCoordP1ui)(GLenum, GLenum, GLuint);
 #define CALL_MultiTexCoordP1ui(disp, parameters) \
     (* GET_MultiTexCoordP1ui(disp)) parameters
-static inline _glptr_MultiTexCoordP1ui
-GET_MultiTexCoordP1ui(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoordP1ui) (GET_by_offset
-                                       (disp, _gloffset_MultiTexCoordP1ui));
+static INLINE _glptr_MultiTexCoordP1ui GET_MultiTexCoordP1ui(struct _glapi_table *disp) {
+   return (_glptr_MultiTexCoordP1ui) (GET_by_offset(disp, _gloffset_MultiTexCoordP1ui));
 }
 
-static inline void
-SET_MultiTexCoordP1ui(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLenum, GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoordP1ui, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_MultiTexCoordP1uiv)(GLenum, GLenum, const GLuint *);
 #define CALL_MultiTexCoordP1uiv(disp, parameters) \
     (* GET_MultiTexCoordP1uiv(disp)) parameters
-static inline _glptr_MultiTexCoordP1uiv
-GET_MultiTexCoordP1uiv(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoordP1uiv) (GET_by_offset
-                                        (disp, _gloffset_MultiTexCoordP1uiv));
+static INLINE _glptr_MultiTexCoordP1uiv GET_MultiTexCoordP1uiv(struct _glapi_table *disp) {
+   return (_glptr_MultiTexCoordP1uiv) (GET_by_offset(disp, _gloffset_MultiTexCoordP1uiv));
 }
 
-static inline void
-SET_MultiTexCoordP1uiv(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, GLenum, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoordP1uiv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_MultiTexCoordP2ui)(GLenum, GLenum, GLuint);
 #define CALL_MultiTexCoordP2ui(disp, parameters) \
     (* GET_MultiTexCoordP2ui(disp)) parameters
-static inline _glptr_MultiTexCoordP2ui
-GET_MultiTexCoordP2ui(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoordP2ui) (GET_by_offset
-                                       (disp, _gloffset_MultiTexCoordP2ui));
+static INLINE _glptr_MultiTexCoordP2ui GET_MultiTexCoordP2ui(struct _glapi_table *disp) {
+   return (_glptr_MultiTexCoordP2ui) (GET_by_offset(disp, _gloffset_MultiTexCoordP2ui));
 }
 
-static inline void
-SET_MultiTexCoordP2ui(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLenum, GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoordP2ui, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_MultiTexCoordP2uiv)(GLenum, GLenum, const GLuint *);
 #define CALL_MultiTexCoordP2uiv(disp, parameters) \
     (* GET_MultiTexCoordP2uiv(disp)) parameters
-static inline _glptr_MultiTexCoordP2uiv
-GET_MultiTexCoordP2uiv(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoordP2uiv) (GET_by_offset
-                                        (disp, _gloffset_MultiTexCoordP2uiv));
+static INLINE _glptr_MultiTexCoordP2uiv GET_MultiTexCoordP2uiv(struct _glapi_table *disp) {
+   return (_glptr_MultiTexCoordP2uiv) (GET_by_offset(disp, _gloffset_MultiTexCoordP2uiv));
 }
 
-static inline void
-SET_MultiTexCoordP2uiv(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, GLenum, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoordP2uiv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_MultiTexCoordP3ui)(GLenum, GLenum, GLuint);
 #define CALL_MultiTexCoordP3ui(disp, parameters) \
     (* GET_MultiTexCoordP3ui(disp)) parameters
-static inline _glptr_MultiTexCoordP3ui
-GET_MultiTexCoordP3ui(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoordP3ui) (GET_by_offset
-                                       (disp, _gloffset_MultiTexCoordP3ui));
+static INLINE _glptr_MultiTexCoordP3ui GET_MultiTexCoordP3ui(struct _glapi_table *disp) {
+   return (_glptr_MultiTexCoordP3ui) (GET_by_offset(disp, _gloffset_MultiTexCoordP3ui));
 }
 
-static inline void
-SET_MultiTexCoordP3ui(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLenum, GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoordP3ui, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_MultiTexCoordP3uiv)(GLenum, GLenum, const GLuint *);
 #define CALL_MultiTexCoordP3uiv(disp, parameters) \
     (* GET_MultiTexCoordP3uiv(disp)) parameters
-static inline _glptr_MultiTexCoordP3uiv
-GET_MultiTexCoordP3uiv(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoordP3uiv) (GET_by_offset
-                                        (disp, _gloffset_MultiTexCoordP3uiv));
+static INLINE _glptr_MultiTexCoordP3uiv GET_MultiTexCoordP3uiv(struct _glapi_table *disp) {
+   return (_glptr_MultiTexCoordP3uiv) (GET_by_offset(disp, _gloffset_MultiTexCoordP3uiv));
 }
 
-static inline void
-SET_MultiTexCoordP3uiv(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, GLenum, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoordP3uiv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_MultiTexCoordP4ui)(GLenum, GLenum, GLuint);
 #define CALL_MultiTexCoordP4ui(disp, parameters) \
     (* GET_MultiTexCoordP4ui(disp)) parameters
-static inline _glptr_MultiTexCoordP4ui
-GET_MultiTexCoordP4ui(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoordP4ui) (GET_by_offset
-                                       (disp, _gloffset_MultiTexCoordP4ui));
+static INLINE _glptr_MultiTexCoordP4ui GET_MultiTexCoordP4ui(struct _glapi_table *disp) {
+   return (_glptr_MultiTexCoordP4ui) (GET_by_offset(disp, _gloffset_MultiTexCoordP4ui));
 }
 
-static inline void
-SET_MultiTexCoordP4ui(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLenum, GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoordP4ui, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_MultiTexCoordP4uiv)(GLenum, GLenum, const GLuint *);
 #define CALL_MultiTexCoordP4uiv(disp, parameters) \
     (* GET_MultiTexCoordP4uiv(disp)) parameters
-static inline _glptr_MultiTexCoordP4uiv
-GET_MultiTexCoordP4uiv(struct _glapi_table *disp)
-{
-    return (_glptr_MultiTexCoordP4uiv) (GET_by_offset
-                                        (disp, _gloffset_MultiTexCoordP4uiv));
+static INLINE _glptr_MultiTexCoordP4uiv GET_MultiTexCoordP4uiv(struct _glapi_table *disp) {
+   return (_glptr_MultiTexCoordP4uiv) (GET_by_offset(disp, _gloffset_MultiTexCoordP4uiv));
 }
 
-static inline void
-SET_MultiTexCoordP4uiv(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, GLenum, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_MultiTexCoordP4uiv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_NormalP3ui)(GLenum, GLuint);
 #define CALL_NormalP3ui(disp, parameters) \
     (* GET_NormalP3ui(disp)) parameters
-static inline _glptr_NormalP3ui
-GET_NormalP3ui(struct _glapi_table *disp)
-{
-    return (_glptr_NormalP3ui) (GET_by_offset(disp, _gloffset_NormalP3ui));
+static INLINE _glptr_NormalP3ui GET_NormalP3ui(struct _glapi_table *disp) {
+   return (_glptr_NormalP3ui) (GET_by_offset(disp, _gloffset_NormalP3ui));
 }
 
-static inline void
-SET_NormalP3ui(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_NormalP3ui, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_NormalP3uiv)(GLenum, const GLuint *);
 #define CALL_NormalP3uiv(disp, parameters) \
     (* GET_NormalP3uiv(disp)) parameters
-static inline _glptr_NormalP3uiv
-GET_NormalP3uiv(struct _glapi_table *disp)
-{
-    return (_glptr_NormalP3uiv) (GET_by_offset(disp, _gloffset_NormalP3uiv));
+static INLINE _glptr_NormalP3uiv GET_NormalP3uiv(struct _glapi_table *disp) {
+   return (_glptr_NormalP3uiv) (GET_by_offset(disp, _gloffset_NormalP3uiv));
 }
 
-static inline void
-SET_NormalP3uiv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLenum, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_NormalP3uiv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_SecondaryColorP3ui)(GLenum, GLuint);
 #define CALL_SecondaryColorP3ui(disp, parameters) \
     (* GET_SecondaryColorP3ui(disp)) parameters
-static inline _glptr_SecondaryColorP3ui
-GET_SecondaryColorP3ui(struct _glapi_table *disp)
-{
-    return (_glptr_SecondaryColorP3ui) (GET_by_offset
-                                        (disp, _gloffset_SecondaryColorP3ui));
+static INLINE _glptr_SecondaryColorP3ui GET_SecondaryColorP3ui(struct _glapi_table *disp) {
+   return (_glptr_SecondaryColorP3ui) (GET_by_offset(disp, _gloffset_SecondaryColorP3ui));
 }
 
-static inline void
-SET_SecondaryColorP3ui(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_SecondaryColorP3ui, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_SecondaryColorP3uiv)(GLenum, const GLuint *);
 #define CALL_SecondaryColorP3uiv(disp, parameters) \
     (* GET_SecondaryColorP3uiv(disp)) parameters
-static inline _glptr_SecondaryColorP3uiv
-GET_SecondaryColorP3uiv(struct _glapi_table *disp)
-{
-    return (_glptr_SecondaryColorP3uiv) (GET_by_offset
-                                         (disp, _gloffset_SecondaryColorP3uiv));
+static INLINE _glptr_SecondaryColorP3uiv GET_SecondaryColorP3uiv(struct _glapi_table *disp) {
+   return (_glptr_SecondaryColorP3uiv) (GET_by_offset(disp, _gloffset_SecondaryColorP3uiv));
 }
 
-static inline void
-SET_SecondaryColorP3uiv(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_SecondaryColorP3uiv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_TexCoordP1ui)(GLenum, GLuint);
 #define CALL_TexCoordP1ui(disp, parameters) \
     (* GET_TexCoordP1ui(disp)) parameters
-static inline _glptr_TexCoordP1ui
-GET_TexCoordP1ui(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoordP1ui) (GET_by_offset(disp, _gloffset_TexCoordP1ui));
+static INLINE _glptr_TexCoordP1ui GET_TexCoordP1ui(struct _glapi_table *disp) {
+   return (_glptr_TexCoordP1ui) (GET_by_offset(disp, _gloffset_TexCoordP1ui));
 }
 
-static inline void
-SET_TexCoordP1ui(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_TexCoordP1ui, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_TexCoordP1uiv)(GLenum, const GLuint *);
 #define CALL_TexCoordP1uiv(disp, parameters) \
     (* GET_TexCoordP1uiv(disp)) parameters
-static inline _glptr_TexCoordP1uiv
-GET_TexCoordP1uiv(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoordP1uiv) (GET_by_offset
-                                   (disp, _gloffset_TexCoordP1uiv));
+static INLINE _glptr_TexCoordP1uiv GET_TexCoordP1uiv(struct _glapi_table *disp) {
+   return (_glptr_TexCoordP1uiv) (GET_by_offset(disp, _gloffset_TexCoordP1uiv));
 }
 
-static inline void
-SET_TexCoordP1uiv(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_TexCoordP1uiv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_TexCoordP2ui)(GLenum, GLuint);
 #define CALL_TexCoordP2ui(disp, parameters) \
     (* GET_TexCoordP2ui(disp)) parameters
-static inline _glptr_TexCoordP2ui
-GET_TexCoordP2ui(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoordP2ui) (GET_by_offset(disp, _gloffset_TexCoordP2ui));
+static INLINE _glptr_TexCoordP2ui GET_TexCoordP2ui(struct _glapi_table *disp) {
+   return (_glptr_TexCoordP2ui) (GET_by_offset(disp, _gloffset_TexCoordP2ui));
 }
 
-static inline void
-SET_TexCoordP2ui(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_TexCoordP2ui, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_TexCoordP2uiv)(GLenum, const GLuint *);
 #define CALL_TexCoordP2uiv(disp, parameters) \
     (* GET_TexCoordP2uiv(disp)) parameters
-static inline _glptr_TexCoordP2uiv
-GET_TexCoordP2uiv(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoordP2uiv) (GET_by_offset
-                                   (disp, _gloffset_TexCoordP2uiv));
+static INLINE _glptr_TexCoordP2uiv GET_TexCoordP2uiv(struct _glapi_table *disp) {
+   return (_glptr_TexCoordP2uiv) (GET_by_offset(disp, _gloffset_TexCoordP2uiv));
 }
 
-static inline void
-SET_TexCoordP2uiv(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_TexCoordP2uiv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_TexCoordP3ui)(GLenum, GLuint);
 #define CALL_TexCoordP3ui(disp, parameters) \
     (* GET_TexCoordP3ui(disp)) parameters
-static inline _glptr_TexCoordP3ui
-GET_TexCoordP3ui(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoordP3ui) (GET_by_offset(disp, _gloffset_TexCoordP3ui));
+static INLINE _glptr_TexCoordP3ui GET_TexCoordP3ui(struct _glapi_table *disp) {
+   return (_glptr_TexCoordP3ui) (GET_by_offset(disp, _gloffset_TexCoordP3ui));
 }
 
-static inline void
-SET_TexCoordP3ui(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_TexCoordP3ui, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_TexCoordP3uiv)(GLenum, const GLuint *);
 #define CALL_TexCoordP3uiv(disp, parameters) \
     (* GET_TexCoordP3uiv(disp)) parameters
-static inline _glptr_TexCoordP3uiv
-GET_TexCoordP3uiv(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoordP3uiv) (GET_by_offset
-                                   (disp, _gloffset_TexCoordP3uiv));
+static INLINE _glptr_TexCoordP3uiv GET_TexCoordP3uiv(struct _glapi_table *disp) {
+   return (_glptr_TexCoordP3uiv) (GET_by_offset(disp, _gloffset_TexCoordP3uiv));
 }
 
-static inline void
-SET_TexCoordP3uiv(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_TexCoordP3uiv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_TexCoordP4ui)(GLenum, GLuint);
 #define CALL_TexCoordP4ui(disp, parameters) \
     (* GET_TexCoordP4ui(disp)) parameters
-static inline _glptr_TexCoordP4ui
-GET_TexCoordP4ui(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoordP4ui) (GET_by_offset(disp, _gloffset_TexCoordP4ui));
+static INLINE _glptr_TexCoordP4ui GET_TexCoordP4ui(struct _glapi_table *disp) {
+   return (_glptr_TexCoordP4ui) (GET_by_offset(disp, _gloffset_TexCoordP4ui));
 }
 
-static inline void
-SET_TexCoordP4ui(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_TexCoordP4ui, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_TexCoordP4uiv)(GLenum, const GLuint *);
 #define CALL_TexCoordP4uiv(disp, parameters) \
     (* GET_TexCoordP4uiv(disp)) parameters
-static inline _glptr_TexCoordP4uiv
-GET_TexCoordP4uiv(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoordP4uiv) (GET_by_offset
-                                   (disp, _gloffset_TexCoordP4uiv));
+static INLINE _glptr_TexCoordP4uiv GET_TexCoordP4uiv(struct _glapi_table *disp) {
+   return (_glptr_TexCoordP4uiv) (GET_by_offset(disp, _gloffset_TexCoordP4uiv));
 }
 
-static inline void
-SET_TexCoordP4uiv(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_TexCoordP4uiv, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_VertexAttribP1ui)(GLuint, GLenum, GLboolean, GLuint);
 #define CALL_VertexAttribP1ui(disp, parameters) \
     (* GET_VertexAttribP1ui(disp)) parameters
-static inline _glptr_VertexAttribP1ui
-GET_VertexAttribP1ui(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribP1ui) (GET_by_offset
-                                      (disp, _gloffset_VertexAttribP1ui));
+static INLINE _glptr_VertexAttribP1ui GET_VertexAttribP1ui(struct _glapi_table *disp) {
+   return (_glptr_VertexAttribP1ui) (GET_by_offset(disp, _gloffset_VertexAttribP1ui));
 }
 
-static inline void
-SET_VertexAttribP1ui(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLuint, GLenum, GLboolean, GLuint))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribP1ui, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_VertexAttribP1uiv)(GLuint, GLenum, GLboolean, const GLuint *);
 #define CALL_VertexAttribP1uiv(disp, parameters) \
     (* GET_VertexAttribP1uiv(disp)) parameters
-static inline _glptr_VertexAttribP1uiv
-GET_VertexAttribP1uiv(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribP1uiv) (GET_by_offset
-                                       (disp, _gloffset_VertexAttribP1uiv));
+static INLINE _glptr_VertexAttribP1uiv GET_VertexAttribP1uiv(struct _glapi_table *disp) {
+   return (_glptr_VertexAttribP1uiv) (GET_by_offset(disp, _gloffset_VertexAttribP1uiv));
 }
 
-static inline void
-SET_VertexAttribP1uiv(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, GLenum, GLboolean,
-                                             const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribP1uiv, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_VertexAttribP2ui)(GLuint, GLenum, GLboolean, GLuint);
 #define CALL_VertexAttribP2ui(disp, parameters) \
     (* GET_VertexAttribP2ui(disp)) parameters
-static inline _glptr_VertexAttribP2ui
-GET_VertexAttribP2ui(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribP2ui) (GET_by_offset
-                                      (disp, _gloffset_VertexAttribP2ui));
+static INLINE _glptr_VertexAttribP2ui GET_VertexAttribP2ui(struct _glapi_table *disp) {
+   return (_glptr_VertexAttribP2ui) (GET_by_offset(disp, _gloffset_VertexAttribP2ui));
 }
 
-static inline void
-SET_VertexAttribP2ui(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLuint, GLenum, GLboolean, GLuint))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribP2ui, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_VertexAttribP2uiv)(GLuint, GLenum, GLboolean, const GLuint *);
 #define CALL_VertexAttribP2uiv(disp, parameters) \
     (* GET_VertexAttribP2uiv(disp)) parameters
-static inline _glptr_VertexAttribP2uiv
-GET_VertexAttribP2uiv(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribP2uiv) (GET_by_offset
-                                       (disp, _gloffset_VertexAttribP2uiv));
+static INLINE _glptr_VertexAttribP2uiv GET_VertexAttribP2uiv(struct _glapi_table *disp) {
+   return (_glptr_VertexAttribP2uiv) (GET_by_offset(disp, _gloffset_VertexAttribP2uiv));
 }
 
-static inline void
-SET_VertexAttribP2uiv(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, GLenum, GLboolean,
-                                             const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribP2uiv, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_VertexAttribP3ui)(GLuint, GLenum, GLboolean, GLuint);
 #define CALL_VertexAttribP3ui(disp, parameters) \
     (* GET_VertexAttribP3ui(disp)) parameters
-static inline _glptr_VertexAttribP3ui
-GET_VertexAttribP3ui(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribP3ui) (GET_by_offset
-                                      (disp, _gloffset_VertexAttribP3ui));
+static INLINE _glptr_VertexAttribP3ui GET_VertexAttribP3ui(struct _glapi_table *disp) {
+   return (_glptr_VertexAttribP3ui) (GET_by_offset(disp, _gloffset_VertexAttribP3ui));
 }
 
-static inline void
-SET_VertexAttribP3ui(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLuint, GLenum, GLboolean, GLuint))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribP3ui, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_VertexAttribP3uiv)(GLuint, GLenum, GLboolean, const GLuint *);
 #define CALL_VertexAttribP3uiv(disp, parameters) \
     (* GET_VertexAttribP3uiv(disp)) parameters
-static inline _glptr_VertexAttribP3uiv
-GET_VertexAttribP3uiv(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribP3uiv) (GET_by_offset
-                                       (disp, _gloffset_VertexAttribP3uiv));
+static INLINE _glptr_VertexAttribP3uiv GET_VertexAttribP3uiv(struct _glapi_table *disp) {
+   return (_glptr_VertexAttribP3uiv) (GET_by_offset(disp, _gloffset_VertexAttribP3uiv));
 }
 
-static inline void
-SET_VertexAttribP3uiv(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, GLenum, GLboolean,
-                                             const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribP3uiv, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_VertexAttribP4ui)(GLuint, GLenum, GLboolean, GLuint);
 #define CALL_VertexAttribP4ui(disp, parameters) \
     (* GET_VertexAttribP4ui(disp)) parameters
-static inline _glptr_VertexAttribP4ui
-GET_VertexAttribP4ui(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribP4ui) (GET_by_offset
-                                      (disp, _gloffset_VertexAttribP4ui));
+static INLINE _glptr_VertexAttribP4ui GET_VertexAttribP4ui(struct _glapi_table *disp) {
+   return (_glptr_VertexAttribP4ui) (GET_by_offset(disp, _gloffset_VertexAttribP4ui));
 }
 
-static inline void
-SET_VertexAttribP4ui(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLuint, GLenum, GLboolean, GLuint))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribP4ui, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_VertexAttribP4uiv)(GLuint, GLenum, GLboolean, const GLuint *);
 #define CALL_VertexAttribP4uiv(disp, parameters) \
     (* GET_VertexAttribP4uiv(disp)) parameters
-static inline _glptr_VertexAttribP4uiv
-GET_VertexAttribP4uiv(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribP4uiv) (GET_by_offset
-                                       (disp, _gloffset_VertexAttribP4uiv));
+static INLINE _glptr_VertexAttribP4uiv GET_VertexAttribP4uiv(struct _glapi_table *disp) {
+   return (_glptr_VertexAttribP4uiv) (GET_by_offset(disp, _gloffset_VertexAttribP4uiv));
 }
 
-static inline void
-SET_VertexAttribP4uiv(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, GLenum, GLboolean,
-                                             const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribP4uiv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_VertexP2ui)(GLenum, GLuint);
 #define CALL_VertexP2ui(disp, parameters) \
     (* GET_VertexP2ui(disp)) parameters
-static inline _glptr_VertexP2ui
-GET_VertexP2ui(struct _glapi_table *disp)
-{
-    return (_glptr_VertexP2ui) (GET_by_offset(disp, _gloffset_VertexP2ui));
+static INLINE _glptr_VertexP2ui GET_VertexP2ui(struct _glapi_table *disp) {
+   return (_glptr_VertexP2ui) (GET_by_offset(disp, _gloffset_VertexP2ui));
 }
 
-static inline void
-SET_VertexP2ui(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_VertexP2ui, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_VertexP2uiv)(GLenum, const GLuint *);
 #define CALL_VertexP2uiv(disp, parameters) \
     (* GET_VertexP2uiv(disp)) parameters
-static inline _glptr_VertexP2uiv
-GET_VertexP2uiv(struct _glapi_table *disp)
-{
-    return (_glptr_VertexP2uiv) (GET_by_offset(disp, _gloffset_VertexP2uiv));
+static INLINE _glptr_VertexP2uiv GET_VertexP2uiv(struct _glapi_table *disp) {
+   return (_glptr_VertexP2uiv) (GET_by_offset(disp, _gloffset_VertexP2uiv));
 }
 
-static inline void
-SET_VertexP2uiv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLenum, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_VertexP2uiv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_VertexP3ui)(GLenum, GLuint);
 #define CALL_VertexP3ui(disp, parameters) \
     (* GET_VertexP3ui(disp)) parameters
-static inline _glptr_VertexP3ui
-GET_VertexP3ui(struct _glapi_table *disp)
-{
-    return (_glptr_VertexP3ui) (GET_by_offset(disp, _gloffset_VertexP3ui));
+static INLINE _glptr_VertexP3ui GET_VertexP3ui(struct _glapi_table *disp) {
+   return (_glptr_VertexP3ui) (GET_by_offset(disp, _gloffset_VertexP3ui));
 }
 
-static inline void
-SET_VertexP3ui(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_VertexP3ui, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_VertexP3uiv)(GLenum, const GLuint *);
 #define CALL_VertexP3uiv(disp, parameters) \
     (* GET_VertexP3uiv(disp)) parameters
-static inline _glptr_VertexP3uiv
-GET_VertexP3uiv(struct _glapi_table *disp)
-{
-    return (_glptr_VertexP3uiv) (GET_by_offset(disp, _gloffset_VertexP3uiv));
+static INLINE _glptr_VertexP3uiv GET_VertexP3uiv(struct _glapi_table *disp) {
+   return (_glptr_VertexP3uiv) (GET_by_offset(disp, _gloffset_VertexP3uiv));
 }
 
-static inline void
-SET_VertexP3uiv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLenum, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_VertexP3uiv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_VertexP4ui)(GLenum, GLuint);
 #define CALL_VertexP4ui(disp, parameters) \
     (* GET_VertexP4ui(disp)) parameters
-static inline _glptr_VertexP4ui
-GET_VertexP4ui(struct _glapi_table *disp)
-{
-    return (_glptr_VertexP4ui) (GET_by_offset(disp, _gloffset_VertexP4ui));
+static INLINE _glptr_VertexP4ui GET_VertexP4ui(struct _glapi_table *disp) {
+   return (_glptr_VertexP4ui) (GET_by_offset(disp, _gloffset_VertexP4ui));
 }
 
-static inline void
-SET_VertexP4ui(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_VertexP4ui, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_VertexP4uiv)(GLenum, const GLuint *);
 #define CALL_VertexP4uiv(disp, parameters) \
     (* GET_VertexP4uiv(disp)) parameters
-static inline _glptr_VertexP4uiv
-GET_VertexP4uiv(struct _glapi_table *disp)
-{
-    return (_glptr_VertexP4uiv) (GET_by_offset(disp, _gloffset_VertexP4uiv));
+static INLINE _glptr_VertexP4uiv GET_VertexP4uiv(struct _glapi_table *disp) {
+   return (_glptr_VertexP4uiv) (GET_by_offset(disp, _gloffset_VertexP4uiv));
 }
 
-static inline void
-SET_VertexP4uiv(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLenum, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_VertexP4uiv, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_BindTransformFeedback)(GLenum, GLuint);
 #define CALL_BindTransformFeedback(disp, parameters) \
     (* GET_BindTransformFeedback(disp)) parameters
-static inline _glptr_BindTransformFeedback
-GET_BindTransformFeedback(struct _glapi_table *disp)
-{
-    return (_glptr_BindTransformFeedback) (GET_by_offset
-                                           (disp,
-                                            _gloffset_BindTransformFeedback));
+static INLINE _glptr_BindTransformFeedback GET_BindTransformFeedback(struct _glapi_table *disp) {
+   return (_glptr_BindTransformFeedback) (GET_by_offset(disp, _gloffset_BindTransformFeedback));
 }
 
-static inline void
-SET_BindTransformFeedback(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_BindTransformFeedback, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_DeleteTransformFeedbacks)(GLsizei, const GLuint *);
 #define CALL_DeleteTransformFeedbacks(disp, parameters) \
     (* GET_DeleteTransformFeedbacks(disp)) parameters
-static inline _glptr_DeleteTransformFeedbacks
-GET_DeleteTransformFeedbacks(struct _glapi_table *disp)
-{
-    return (_glptr_DeleteTransformFeedbacks) (GET_by_offset
-                                              (disp,
-                                               _gloffset_DeleteTransformFeedbacks));
+static INLINE _glptr_DeleteTransformFeedbacks GET_DeleteTransformFeedbacks(struct _glapi_table *disp) {
+   return (_glptr_DeleteTransformFeedbacks) (GET_by_offset(disp, _gloffset_DeleteTransformFeedbacks));
 }
 
-static inline void
-SET_DeleteTransformFeedbacks(struct _glapi_table *disp,
-                             void (GLAPIENTRYP fn) (GLsizei, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_DeleteTransformFeedbacks, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_DrawTransformFeedback)(GLenum, GLuint);
 #define CALL_DrawTransformFeedback(disp, parameters) \
     (* GET_DrawTransformFeedback(disp)) parameters
-static inline _glptr_DrawTransformFeedback
-GET_DrawTransformFeedback(struct _glapi_table *disp)
-{
-    return (_glptr_DrawTransformFeedback) (GET_by_offset
-                                           (disp,
-                                            _gloffset_DrawTransformFeedback));
+static INLINE _glptr_DrawTransformFeedback GET_DrawTransformFeedback(struct _glapi_table *disp) {
+   return (_glptr_DrawTransformFeedback) (GET_by_offset(disp, _gloffset_DrawTransformFeedback));
 }
 
-static inline void
-SET_DrawTransformFeedback(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_DrawTransformFeedback, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_GenTransformFeedbacks)(GLsizei, GLuint *);
 #define CALL_GenTransformFeedbacks(disp, parameters) \
     (* GET_GenTransformFeedbacks(disp)) parameters
-static inline _glptr_GenTransformFeedbacks
-GET_GenTransformFeedbacks(struct _glapi_table *disp)
-{
-    return (_glptr_GenTransformFeedbacks) (GET_by_offset
-                                           (disp,
-                                            _gloffset_GenTransformFeedbacks));
+static INLINE _glptr_GenTransformFeedbacks GET_GenTransformFeedbacks(struct _glapi_table *disp) {
+   return (_glptr_GenTransformFeedbacks) (GET_by_offset(disp, _gloffset_GenTransformFeedbacks));
 }
 
-static inline void
-SET_GenTransformFeedbacks(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (GLsizei, GLuint *))
-{
-    SET_by_offset(disp, _gloffset_GenTransformFeedbacks, fn);
+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);
-
+typedef GLboolean (GLAPIENTRYP _glptr_IsTransformFeedback)(GLuint);
 #define CALL_IsTransformFeedback(disp, parameters) \
     (* GET_IsTransformFeedback(disp)) parameters
-static inline _glptr_IsTransformFeedback
-GET_IsTransformFeedback(struct _glapi_table *disp)
-{
-    return (_glptr_IsTransformFeedback) (GET_by_offset
-                                         (disp, _gloffset_IsTransformFeedback));
+static INLINE _glptr_IsTransformFeedback GET_IsTransformFeedback(struct _glapi_table *disp) {
+   return (_glptr_IsTransformFeedback) (GET_by_offset(disp, _gloffset_IsTransformFeedback));
 }
 
-static inline void
-SET_IsTransformFeedback(struct _glapi_table *disp,
-                        GLboolean(GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_IsTransformFeedback, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_PauseTransformFeedback)(void);
 #define CALL_PauseTransformFeedback(disp, parameters) \
     (* GET_PauseTransformFeedback(disp)) parameters
-static inline _glptr_PauseTransformFeedback
-GET_PauseTransformFeedback(struct _glapi_table *disp)
-{
-    return (_glptr_PauseTransformFeedback) (GET_by_offset
-                                            (disp,
-                                             _gloffset_PauseTransformFeedback));
+static INLINE _glptr_PauseTransformFeedback GET_PauseTransformFeedback(struct _glapi_table *disp) {
+   return (_glptr_PauseTransformFeedback) (GET_by_offset(disp, _gloffset_PauseTransformFeedback));
 }
 
-static inline void
-SET_PauseTransformFeedback(struct _glapi_table *disp,
-                           void (GLAPIENTRYP fn) (void))
-{
-    SET_by_offset(disp, _gloffset_PauseTransformFeedback, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_ResumeTransformFeedback)(void);
 #define CALL_ResumeTransformFeedback(disp, parameters) \
     (* GET_ResumeTransformFeedback(disp)) parameters
-static inline _glptr_ResumeTransformFeedback
-GET_ResumeTransformFeedback(struct _glapi_table *disp)
-{
-    return (_glptr_ResumeTransformFeedback) (GET_by_offset
-                                             (disp,
-                                              _gloffset_ResumeTransformFeedback));
+static INLINE _glptr_ResumeTransformFeedback GET_ResumeTransformFeedback(struct _glapi_table *disp) {
+   return (_glptr_ResumeTransformFeedback) (GET_by_offset(disp, _gloffset_ResumeTransformFeedback));
+}
+
+static INLINE void SET_ResumeTransformFeedback(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) {
+   SET_by_offset(disp, _gloffset_ResumeTransformFeedback, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_BeginQueryIndexed)(GLenum, GLuint, GLuint);
+#define CALL_BeginQueryIndexed(disp, parameters) \
+    (* GET_BeginQueryIndexed(disp)) parameters
+static INLINE _glptr_BeginQueryIndexed GET_BeginQueryIndexed(struct _glapi_table *disp) {
+   return (_glptr_BeginQueryIndexed) (GET_by_offset(disp, _gloffset_BeginQueryIndexed));
+}
+
+static INLINE void SET_BeginQueryIndexed(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLuint)) {
+   SET_by_offset(disp, _gloffset_BeginQueryIndexed, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_DrawTransformFeedbackStream)(GLenum, GLuint, GLuint);
+#define CALL_DrawTransformFeedbackStream(disp, parameters) \
+    (* GET_DrawTransformFeedbackStream(disp)) parameters
+static INLINE _glptr_DrawTransformFeedbackStream GET_DrawTransformFeedbackStream(struct _glapi_table *disp) {
+   return (_glptr_DrawTransformFeedbackStream) (GET_by_offset(disp, _gloffset_DrawTransformFeedbackStream));
+}
+
+static INLINE void SET_DrawTransformFeedbackStream(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLuint)) {
+   SET_by_offset(disp, _gloffset_DrawTransformFeedbackStream, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_EndQueryIndexed)(GLenum, GLuint);
+#define CALL_EndQueryIndexed(disp, parameters) \
+    (* GET_EndQueryIndexed(disp)) parameters
+static INLINE _glptr_EndQueryIndexed GET_EndQueryIndexed(struct _glapi_table *disp) {
+   return (_glptr_EndQueryIndexed) (GET_by_offset(disp, _gloffset_EndQueryIndexed));
 }
 
-static inline void
-SET_ResumeTransformFeedback(struct _glapi_table *disp,
-                            void (GLAPIENTRYP fn) (void))
-{
-    SET_by_offset(disp, _gloffset_ResumeTransformFeedback, fn);
+static INLINE void SET_EndQueryIndexed(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
+   SET_by_offset(disp, _gloffset_EndQueryIndexed, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_ClearDepthf) (GLclampf);
+typedef void (GLAPIENTRYP _glptr_GetQueryIndexediv)(GLenum, GLuint, GLenum, GLint *);
+#define CALL_GetQueryIndexediv(disp, parameters) \
+    (* GET_GetQueryIndexediv(disp)) parameters
+static INLINE _glptr_GetQueryIndexediv GET_GetQueryIndexediv(struct _glapi_table *disp) {
+   return (_glptr_GetQueryIndexediv) (GET_by_offset(disp, _gloffset_GetQueryIndexediv));
+}
+
+static INLINE void SET_GetQueryIndexediv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLenum, GLint *)) {
+   SET_by_offset(disp, _gloffset_GetQueryIndexediv, fn);
+}
 
+typedef void (GLAPIENTRYP _glptr_ClearDepthf)(GLclampf);
 #define CALL_ClearDepthf(disp, parameters) \
     (* GET_ClearDepthf(disp)) parameters
-static inline _glptr_ClearDepthf
-GET_ClearDepthf(struct _glapi_table *disp)
-{
-    return (_glptr_ClearDepthf) (GET_by_offset(disp, _gloffset_ClearDepthf));
+static INLINE _glptr_ClearDepthf GET_ClearDepthf(struct _glapi_table *disp) {
+   return (_glptr_ClearDepthf) (GET_by_offset(disp, _gloffset_ClearDepthf));
 }
 
-static inline void
-SET_ClearDepthf(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLclampf))
-{
-    SET_by_offset(disp, _gloffset_ClearDepthf, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_DepthRangef)(GLclampf, GLclampf);
 #define CALL_DepthRangef(disp, parameters) \
     (* GET_DepthRangef(disp)) parameters
-static inline _glptr_DepthRangef
-GET_DepthRangef(struct _glapi_table *disp)
-{
-    return (_glptr_DepthRangef) (GET_by_offset(disp, _gloffset_DepthRangef));
+static INLINE _glptr_DepthRangef GET_DepthRangef(struct _glapi_table *disp) {
+   return (_glptr_DepthRangef) (GET_by_offset(disp, _gloffset_DepthRangef));
 }
 
-static inline void
-SET_DepthRangef(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLclampf, GLclampf))
-{
-    SET_by_offset(disp, _gloffset_DepthRangef, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_GetShaderPrecisionFormat)(GLenum, GLenum, GLint *, GLint *);
 #define CALL_GetShaderPrecisionFormat(disp, parameters) \
     (* GET_GetShaderPrecisionFormat(disp)) parameters
-static inline _glptr_GetShaderPrecisionFormat
-GET_GetShaderPrecisionFormat(struct _glapi_table *disp)
-{
-    return (_glptr_GetShaderPrecisionFormat) (GET_by_offset
-                                              (disp,
-                                               _gloffset_GetShaderPrecisionFormat));
+static INLINE _glptr_GetShaderPrecisionFormat GET_GetShaderPrecisionFormat(struct _glapi_table *disp) {
+   return (_glptr_GetShaderPrecisionFormat) (GET_by_offset(disp, _gloffset_GetShaderPrecisionFormat));
 }
 
-static inline void
-SET_GetShaderPrecisionFormat(struct _glapi_table *disp,
-                             void (GLAPIENTRYP fn) (GLenum, GLenum, GLint *,
-                                                    GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetShaderPrecisionFormat, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_ReleaseShaderCompiler)(void);
 #define CALL_ReleaseShaderCompiler(disp, parameters) \
     (* GET_ReleaseShaderCompiler(disp)) parameters
-static inline _glptr_ReleaseShaderCompiler
-GET_ReleaseShaderCompiler(struct _glapi_table *disp)
-{
-    return (_glptr_ReleaseShaderCompiler) (GET_by_offset
-                                           (disp,
-                                            _gloffset_ReleaseShaderCompiler));
+static INLINE _glptr_ReleaseShaderCompiler GET_ReleaseShaderCompiler(struct _glapi_table *disp) {
+   return (_glptr_ReleaseShaderCompiler) (GET_by_offset(disp, _gloffset_ReleaseShaderCompiler));
 }
 
-static inline void
-SET_ReleaseShaderCompiler(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (void))
-{
-    SET_by_offset(disp, _gloffset_ReleaseShaderCompiler, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_ShaderBinary)(GLsizei, const GLuint *, GLenum, const GLvoid *, GLsizei);
 #define CALL_ShaderBinary(disp, parameters) \
     (* GET_ShaderBinary(disp)) parameters
-static inline _glptr_ShaderBinary
-GET_ShaderBinary(struct _glapi_table *disp)
-{
-    return (_glptr_ShaderBinary) (GET_by_offset(disp, _gloffset_ShaderBinary));
+static INLINE _glptr_ShaderBinary GET_ShaderBinary(struct _glapi_table *disp) {
+   return (_glptr_ShaderBinary) (GET_by_offset(disp, _gloffset_ShaderBinary));
 }
 
-static inline void
-SET_ShaderBinary(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLsizei, const GLuint *, GLenum,
-                                        const GLvoid *, GLsizei))
-{
-    SET_by_offset(disp, _gloffset_ShaderBinary, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_GetProgramBinary)(GLuint, GLsizei, GLsizei *, GLenum *, GLvoid *);
+#define CALL_GetProgramBinary(disp, parameters) \
+    (* GET_GetProgramBinary(disp)) parameters
+static INLINE _glptr_GetProgramBinary GET_GetProgramBinary(struct _glapi_table *disp) {
+   return (_glptr_GetProgramBinary) (GET_by_offset(disp, _gloffset_GetProgramBinary));
+}
 
+static INLINE void SET_GetProgramBinary(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, GLsizei *, GLenum *, GLvoid *)) {
+   SET_by_offset(disp, _gloffset_GetProgramBinary, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_ProgramBinary)(GLuint, GLenum, const GLvoid *, GLsizei);
+#define CALL_ProgramBinary(disp, parameters) \
+    (* GET_ProgramBinary(disp)) parameters
+static INLINE _glptr_ProgramBinary GET_ProgramBinary(struct _glapi_table *disp) {
+   return (_glptr_ProgramBinary) (GET_by_offset(disp, _gloffset_ProgramBinary));
+}
+
+static INLINE void SET_ProgramBinary(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, const GLvoid *, GLsizei)) {
+   SET_by_offset(disp, _gloffset_ProgramBinary, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_ProgramParameteri)(GLuint, GLenum, GLint);
+#define CALL_ProgramParameteri(disp, parameters) \
+    (* GET_ProgramParameteri(disp)) parameters
+static INLINE _glptr_ProgramParameteri GET_ProgramParameteri(struct _glapi_table *disp) {
+   return (_glptr_ProgramParameteri) (GET_by_offset(disp, _gloffset_ProgramParameteri));
+}
+
+static INLINE void SET_ProgramParameteri(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint)) {
+   SET_by_offset(disp, _gloffset_ProgramParameteri, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_DebugMessageCallbackARB)(GLDEBUGPROCARB, const GLvoid *);
+#define CALL_DebugMessageCallbackARB(disp, parameters) \
+    (* GET_DebugMessageCallbackARB(disp)) parameters
+static INLINE _glptr_DebugMessageCallbackARB GET_DebugMessageCallbackARB(struct _glapi_table *disp) {
+   return (_glptr_DebugMessageCallbackARB) (GET_by_offset(disp, _gloffset_DebugMessageCallbackARB));
+}
+
+static INLINE void SET_DebugMessageCallbackARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLDEBUGPROCARB, const GLvoid *)) {
+   SET_by_offset(disp, _gloffset_DebugMessageCallbackARB, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_DebugMessageControlARB)(GLenum, GLenum, GLenum, GLsizei, const GLuint *, GLboolean);
+#define CALL_DebugMessageControlARB(disp, parameters) \
+    (* GET_DebugMessageControlARB(disp)) parameters
+static INLINE _glptr_DebugMessageControlARB GET_DebugMessageControlARB(struct _glapi_table *disp) {
+   return (_glptr_DebugMessageControlARB) (GET_by_offset(disp, _gloffset_DebugMessageControlARB));
+}
+
+static INLINE void SET_DebugMessageControlARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLsizei, const GLuint *, GLboolean)) {
+   SET_by_offset(disp, _gloffset_DebugMessageControlARB, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_DebugMessageInsertARB)(GLenum, GLenum, GLuint, GLenum, GLsizei, const GLcharARB *);
+#define CALL_DebugMessageInsertARB(disp, parameters) \
+    (* GET_DebugMessageInsertARB(disp)) parameters
+static INLINE _glptr_DebugMessageInsertARB GET_DebugMessageInsertARB(struct _glapi_table *disp) {
+   return (_glptr_DebugMessageInsertARB) (GET_by_offset(disp, _gloffset_DebugMessageInsertARB));
+}
+
+static INLINE void SET_DebugMessageInsertARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLuint, GLenum, GLsizei, const GLcharARB *)) {
+   SET_by_offset(disp, _gloffset_DebugMessageInsertARB, fn);
+}
+
+typedef GLuint (GLAPIENTRYP _glptr_GetDebugMessageLogARB)(GLuint, GLsizei, GLenum *, GLenum *, GLuint *, GLenum *, GLsizei *, GLcharARB *);
+#define CALL_GetDebugMessageLogARB(disp, parameters) \
+    (* GET_GetDebugMessageLogARB(disp)) parameters
+static INLINE _glptr_GetDebugMessageLogARB GET_GetDebugMessageLogARB(struct _glapi_table *disp) {
+   return (_glptr_GetDebugMessageLogARB) (GET_by_offset(disp, _gloffset_GetDebugMessageLogARB));
+}
+
+static INLINE void SET_GetDebugMessageLogARB(struct _glapi_table *disp, GLuint (GLAPIENTRYP fn)(GLuint, GLsizei, GLenum *, GLenum *, GLuint *, GLenum *, GLsizei *, GLcharARB *)) {
+   SET_by_offset(disp, _gloffset_GetDebugMessageLogARB, fn);
+}
+
+typedef GLenum (GLAPIENTRYP _glptr_GetGraphicsResetStatusARB)(void);
 #define CALL_GetGraphicsResetStatusARB(disp, parameters) \
     (* GET_GetGraphicsResetStatusARB(disp)) parameters
-static inline _glptr_GetGraphicsResetStatusARB
-GET_GetGraphicsResetStatusARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetGraphicsResetStatusARB) (GET_by_offset
-                                               (disp,
-                                                _gloffset_GetGraphicsResetStatusARB));
+static INLINE _glptr_GetGraphicsResetStatusARB GET_GetGraphicsResetStatusARB(struct _glapi_table *disp) {
+   return (_glptr_GetGraphicsResetStatusARB) (GET_by_offset(disp, _gloffset_GetGraphicsResetStatusARB));
 }
 
-static inline void
-SET_GetGraphicsResetStatusARB(struct _glapi_table *disp,
-                              GLenum(GLAPIENTRYP fn) (void))
-{
-    SET_by_offset(disp, _gloffset_GetGraphicsResetStatusARB, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_GetnColorTableARB)(GLenum, GLenum, GLenum, GLsizei, GLvoid *);
 #define CALL_GetnColorTableARB(disp, parameters) \
     (* GET_GetnColorTableARB(disp)) parameters
-static inline _glptr_GetnColorTableARB
-GET_GetnColorTableARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetnColorTableARB) (GET_by_offset
-                                       (disp, _gloffset_GetnColorTableARB));
+static INLINE _glptr_GetnColorTableARB GET_GetnColorTableARB(struct _glapi_table *disp) {
+   return (_glptr_GetnColorTableARB) (GET_by_offset(disp, _gloffset_GetnColorTableARB));
 }
 
-static inline void
-SET_GetnColorTableARB(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLenum, GLenum, GLenum, GLsizei,
-                                             GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_GetnColorTableARB, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_GetnCompressedTexImageARB)(GLenum, GLint, GLsizei, GLvoid *);
 #define CALL_GetnCompressedTexImageARB(disp, parameters) \
     (* GET_GetnCompressedTexImageARB(disp)) parameters
-static inline _glptr_GetnCompressedTexImageARB
-GET_GetnCompressedTexImageARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetnCompressedTexImageARB) (GET_by_offset
-                                               (disp,
-                                                _gloffset_GetnCompressedTexImageARB));
+static INLINE _glptr_GetnCompressedTexImageARB GET_GetnCompressedTexImageARB(struct _glapi_table *disp) {
+   return (_glptr_GetnCompressedTexImageARB) (GET_by_offset(disp, _gloffset_GetnCompressedTexImageARB));
 }
 
-static inline void
-SET_GetnCompressedTexImageARB(struct _glapi_table *disp,
-                              void (GLAPIENTRYP fn) (GLenum, GLint, GLsizei,
-                                                     GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_GetnCompressedTexImageARB, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_GetnConvolutionFilterARB)(GLenum, GLenum, GLenum, GLsizei, GLvoid *);
 #define CALL_GetnConvolutionFilterARB(disp, parameters) \
     (* GET_GetnConvolutionFilterARB(disp)) parameters
-static inline _glptr_GetnConvolutionFilterARB
-GET_GetnConvolutionFilterARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetnConvolutionFilterARB) (GET_by_offset
-                                              (disp,
-                                               _gloffset_GetnConvolutionFilterARB));
+static INLINE _glptr_GetnConvolutionFilterARB GET_GetnConvolutionFilterARB(struct _glapi_table *disp) {
+   return (_glptr_GetnConvolutionFilterARB) (GET_by_offset(disp, _gloffset_GetnConvolutionFilterARB));
 }
 
-static inline void
-SET_GetnConvolutionFilterARB(struct _glapi_table *disp,
-                             void (GLAPIENTRYP fn) (GLenum, GLenum, GLenum,
-                                                    GLsizei, GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_GetnConvolutionFilterARB, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_GetnHistogramARB)(GLenum, GLboolean, GLenum, GLenum, GLsizei, GLvoid *);
 #define CALL_GetnHistogramARB(disp, parameters) \
     (* GET_GetnHistogramARB(disp)) parameters
-static inline _glptr_GetnHistogramARB
-GET_GetnHistogramARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetnHistogramARB) (GET_by_offset
-                                      (disp, _gloffset_GetnHistogramARB));
+static INLINE _glptr_GetnHistogramARB GET_GetnHistogramARB(struct _glapi_table *disp) {
+   return (_glptr_GetnHistogramARB) (GET_by_offset(disp, _gloffset_GetnHistogramARB));
 }
 
-static inline void
-SET_GetnHistogramARB(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLenum, GLboolean, GLenum, GLenum,
-                                            GLsizei, GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_GetnHistogramARB, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_GetnMapdvARB)(GLenum, GLenum, GLsizei, GLdouble *);
 #define CALL_GetnMapdvARB(disp, parameters) \
     (* GET_GetnMapdvARB(disp)) parameters
-static inline _glptr_GetnMapdvARB
-GET_GetnMapdvARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetnMapdvARB) (GET_by_offset(disp, _gloffset_GetnMapdvARB));
+static INLINE _glptr_GetnMapdvARB GET_GetnMapdvARB(struct _glapi_table *disp) {
+   return (_glptr_GetnMapdvARB) (GET_by_offset(disp, _gloffset_GetnMapdvARB));
 }
 
-static inline void
-SET_GetnMapdvARB(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLenum, GLenum, GLsizei, GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_GetnMapdvARB, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_GetnMapfvARB)(GLenum, GLenum, GLsizei, GLfloat *);
 #define CALL_GetnMapfvARB(disp, parameters) \
     (* GET_GetnMapfvARB(disp)) parameters
-static inline _glptr_GetnMapfvARB
-GET_GetnMapfvARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetnMapfvARB) (GET_by_offset(disp, _gloffset_GetnMapfvARB));
+static INLINE _glptr_GetnMapfvARB GET_GetnMapfvARB(struct _glapi_table *disp) {
+   return (_glptr_GetnMapfvARB) (GET_by_offset(disp, _gloffset_GetnMapfvARB));
 }
 
-static inline void
-SET_GetnMapfvARB(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLenum, GLenum, GLsizei, GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetnMapfvARB, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_GetnMapivARB)(GLenum, GLenum, GLsizei, GLint *);
 #define CALL_GetnMapivARB(disp, parameters) \
     (* GET_GetnMapivARB(disp)) parameters
-static inline _glptr_GetnMapivARB
-GET_GetnMapivARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetnMapivARB) (GET_by_offset(disp, _gloffset_GetnMapivARB));
+static INLINE _glptr_GetnMapivARB GET_GetnMapivARB(struct _glapi_table *disp) {
+   return (_glptr_GetnMapivARB) (GET_by_offset(disp, _gloffset_GetnMapivARB));
 }
 
-static inline void
-SET_GetnMapivARB(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLenum, GLenum, GLsizei, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetnMapivARB, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_GetnMinmaxARB)(GLenum, GLboolean, GLenum, GLenum, GLsizei, GLvoid *);
 #define CALL_GetnMinmaxARB(disp, parameters) \
     (* GET_GetnMinmaxARB(disp)) parameters
-static inline _glptr_GetnMinmaxARB
-GET_GetnMinmaxARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetnMinmaxARB) (GET_by_offset
-                                   (disp, _gloffset_GetnMinmaxARB));
+static INLINE _glptr_GetnMinmaxARB GET_GetnMinmaxARB(struct _glapi_table *disp) {
+   return (_glptr_GetnMinmaxARB) (GET_by_offset(disp, _gloffset_GetnMinmaxARB));
 }
 
-static inline void
-SET_GetnMinmaxARB(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, GLboolean, GLenum, GLenum,
-                                         GLsizei, GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_GetnMinmaxARB, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_GetnPixelMapfvARB)(GLenum, GLsizei, GLfloat *);
 #define CALL_GetnPixelMapfvARB(disp, parameters) \
     (* GET_GetnPixelMapfvARB(disp)) parameters
-static inline _glptr_GetnPixelMapfvARB
-GET_GetnPixelMapfvARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetnPixelMapfvARB) (GET_by_offset
-                                       (disp, _gloffset_GetnPixelMapfvARB));
+static INLINE _glptr_GetnPixelMapfvARB GET_GetnPixelMapfvARB(struct _glapi_table *disp) {
+   return (_glptr_GetnPixelMapfvARB) (GET_by_offset(disp, _gloffset_GetnPixelMapfvARB));
 }
 
-static inline void
-SET_GetnPixelMapfvARB(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLenum, GLsizei, GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetnPixelMapfvARB, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_GetnPixelMapuivARB)(GLenum, GLsizei, GLuint *);
 #define CALL_GetnPixelMapuivARB(disp, parameters) \
     (* GET_GetnPixelMapuivARB(disp)) parameters
-static inline _glptr_GetnPixelMapuivARB
-GET_GetnPixelMapuivARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetnPixelMapuivARB) (GET_by_offset
-                                        (disp, _gloffset_GetnPixelMapuivARB));
+static INLINE _glptr_GetnPixelMapuivARB GET_GetnPixelMapuivARB(struct _glapi_table *disp) {
+   return (_glptr_GetnPixelMapuivARB) (GET_by_offset(disp, _gloffset_GetnPixelMapuivARB));
 }
 
-static inline void
-SET_GetnPixelMapuivARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, GLsizei, GLuint *))
-{
-    SET_by_offset(disp, _gloffset_GetnPixelMapuivARB, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_GetnPixelMapusvARB)(GLenum, GLsizei, GLushort *);
 #define CALL_GetnPixelMapusvARB(disp, parameters) \
     (* GET_GetnPixelMapusvARB(disp)) parameters
-static inline _glptr_GetnPixelMapusvARB
-GET_GetnPixelMapusvARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetnPixelMapusvARB) (GET_by_offset
-                                        (disp, _gloffset_GetnPixelMapusvARB));
+static INLINE _glptr_GetnPixelMapusvARB GET_GetnPixelMapusvARB(struct _glapi_table *disp) {
+   return (_glptr_GetnPixelMapusvARB) (GET_by_offset(disp, _gloffset_GetnPixelMapusvARB));
 }
 
-static inline void
-SET_GetnPixelMapusvARB(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, GLsizei, GLushort *))
-{
-    SET_by_offset(disp, _gloffset_GetnPixelMapusvARB, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_GetnPolygonStippleARB)(GLsizei, GLubyte *);
 #define CALL_GetnPolygonStippleARB(disp, parameters) \
     (* GET_GetnPolygonStippleARB(disp)) parameters
-static inline _glptr_GetnPolygonStippleARB
-GET_GetnPolygonStippleARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetnPolygonStippleARB) (GET_by_offset
-                                           (disp,
-                                            _gloffset_GetnPolygonStippleARB));
+static INLINE _glptr_GetnPolygonStippleARB GET_GetnPolygonStippleARB(struct _glapi_table *disp) {
+   return (_glptr_GetnPolygonStippleARB) (GET_by_offset(disp, _gloffset_GetnPolygonStippleARB));
 }
 
-static inline void
-SET_GetnPolygonStippleARB(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (GLsizei, GLubyte *))
-{
-    SET_by_offset(disp, _gloffset_GetnPolygonStippleARB, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_GetnSeparableFilterARB)(GLenum, GLenum, GLenum, GLsizei, GLvoid *, GLsizei, GLvoid *, GLvoid *);
 #define CALL_GetnSeparableFilterARB(disp, parameters) \
     (* GET_GetnSeparableFilterARB(disp)) parameters
-static inline _glptr_GetnSeparableFilterARB
-GET_GetnSeparableFilterARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetnSeparableFilterARB) (GET_by_offset
-                                            (disp,
-                                             _gloffset_GetnSeparableFilterARB));
+static INLINE _glptr_GetnSeparableFilterARB GET_GetnSeparableFilterARB(struct _glapi_table *disp) {
+   return (_glptr_GetnSeparableFilterARB) (GET_by_offset(disp, _gloffset_GetnSeparableFilterARB));
 }
 
-static inline void
-SET_GetnSeparableFilterARB(struct _glapi_table *disp,
-                           void (GLAPIENTRYP fn) (GLenum, GLenum, GLenum,
-                                                  GLsizei, GLvoid *, GLsizei,
-                                                  GLvoid *, GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_GetnSeparableFilterARB, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_GetnTexImageARB)(GLenum, GLint, GLenum, GLenum, GLsizei, GLvoid *);
 #define CALL_GetnTexImageARB(disp, parameters) \
     (* GET_GetnTexImageARB(disp)) parameters
-static inline _glptr_GetnTexImageARB
-GET_GetnTexImageARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetnTexImageARB) (GET_by_offset
-                                     (disp, _gloffset_GetnTexImageARB));
+static INLINE _glptr_GetnTexImageARB GET_GetnTexImageARB(struct _glapi_table *disp) {
+   return (_glptr_GetnTexImageARB) (GET_by_offset(disp, _gloffset_GetnTexImageARB));
 }
 
-static inline void
-SET_GetnTexImageARB(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLenum, GLint, GLenum, GLenum,
-                                           GLsizei, GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_GetnTexImageARB, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_GetnUniformdvARB)(GLhandleARB, GLint, GLsizei, GLdouble *);
 #define CALL_GetnUniformdvARB(disp, parameters) \
     (* GET_GetnUniformdvARB(disp)) parameters
-static inline _glptr_GetnUniformdvARB
-GET_GetnUniformdvARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetnUniformdvARB) (GET_by_offset
-                                      (disp, _gloffset_GetnUniformdvARB));
+static INLINE _glptr_GetnUniformdvARB GET_GetnUniformdvARB(struct _glapi_table *disp) {
+   return (_glptr_GetnUniformdvARB) (GET_by_offset(disp, _gloffset_GetnUniformdvARB));
 }
 
-static inline void
-SET_GetnUniformdvARB(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLhandleARB, GLint, GLsizei,
-                                            GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_GetnUniformdvARB, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_GetnUniformfvARB)(GLhandleARB, GLint, GLsizei, GLfloat *);
 #define CALL_GetnUniformfvARB(disp, parameters) \
     (* GET_GetnUniformfvARB(disp)) parameters
-static inline _glptr_GetnUniformfvARB
-GET_GetnUniformfvARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetnUniformfvARB) (GET_by_offset
-                                      (disp, _gloffset_GetnUniformfvARB));
+static INLINE _glptr_GetnUniformfvARB GET_GetnUniformfvARB(struct _glapi_table *disp) {
+   return (_glptr_GetnUniformfvARB) (GET_by_offset(disp, _gloffset_GetnUniformfvARB));
 }
 
-static inline void
-SET_GetnUniformfvARB(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLhandleARB, GLint, GLsizei,
-                                            GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetnUniformfvARB, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_GetnUniformivARB)(GLhandleARB, GLint, GLsizei, GLint *);
 #define CALL_GetnUniformivARB(disp, parameters) \
     (* GET_GetnUniformivARB(disp)) parameters
-static inline _glptr_GetnUniformivARB
-GET_GetnUniformivARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetnUniformivARB) (GET_by_offset
-                                      (disp, _gloffset_GetnUniformivARB));
+static INLINE _glptr_GetnUniformivARB GET_GetnUniformivARB(struct _glapi_table *disp) {
+   return (_glptr_GetnUniformivARB) (GET_by_offset(disp, _gloffset_GetnUniformivARB));
 }
 
-static inline void
-SET_GetnUniformivARB(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLhandleARB, GLint, GLsizei,
-                                            GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetnUniformivARB, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_GetnUniformuivARB)(GLhandleARB, GLint, GLsizei, GLuint *);
 #define CALL_GetnUniformuivARB(disp, parameters) \
     (* GET_GetnUniformuivARB(disp)) parameters
-static inline _glptr_GetnUniformuivARB
-GET_GetnUniformuivARB(struct _glapi_table *disp)
-{
-    return (_glptr_GetnUniformuivARB) (GET_by_offset
-                                       (disp, _gloffset_GetnUniformuivARB));
+static INLINE _glptr_GetnUniformuivARB GET_GetnUniformuivARB(struct _glapi_table *disp) {
+   return (_glptr_GetnUniformuivARB) (GET_by_offset(disp, _gloffset_GetnUniformuivARB));
 }
 
-static inline void
-SET_GetnUniformuivARB(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLhandleARB, GLint, GLsizei,
-                                             GLuint *))
-{
-    SET_by_offset(disp, _gloffset_GetnUniformuivARB, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_ReadnPixelsARB)(GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, GLsizei, GLvoid *);
 #define CALL_ReadnPixelsARB(disp, parameters) \
     (* GET_ReadnPixelsARB(disp)) parameters
-static inline _glptr_ReadnPixelsARB
-GET_ReadnPixelsARB(struct _glapi_table *disp)
-{
-    return (_glptr_ReadnPixelsARB) (GET_by_offset
-                                    (disp, _gloffset_ReadnPixelsARB));
-}
-
-static inline void
-SET_ReadnPixelsARB(struct _glapi_table *disp,
-                   void (GLAPIENTRYP fn) (GLint, GLint, GLsizei, GLsizei,
-                                          GLenum, GLenum, GLsizei, GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_ReadnPixelsARB, fn);
+static INLINE _glptr_ReadnPixelsARB GET_ReadnPixelsARB(struct _glapi_table *disp) {
+   return (_glptr_ReadnPixelsARB) (GET_by_offset(disp, _gloffset_ReadnPixelsARB));
 }
 
-typedef void (GLAPIENTRYP _glptr_TexStorage1D) (GLenum, GLsizei, GLenum,
-                                                GLsizei);
-#define CALL_TexStorage1D(disp, parameters) \
-    (* GET_TexStorage1D(disp)) parameters
-static inline _glptr_TexStorage1D
-GET_TexStorage1D(struct _glapi_table *disp)
-{
-    return (_glptr_TexStorage1D) (GET_by_offset(disp, _gloffset_TexStorage1D));
-}
-
-static inline void
-SET_TexStorage1D(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLenum, GLsizei, GLenum, GLsizei))
-{
-    SET_by_offset(disp, _gloffset_TexStorage1D, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexStorage2D) (GLenum, GLsizei, GLenum,
-                                                GLsizei, GLsizei);
-#define CALL_TexStorage2D(disp, parameters) \
-    (* GET_TexStorage2D(disp)) parameters
-static inline _glptr_TexStorage2D
-GET_TexStorage2D(struct _glapi_table *disp)
-{
-    return (_glptr_TexStorage2D) (GET_by_offset(disp, _gloffset_TexStorage2D));
+static INLINE void SET_ReadnPixelsARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, GLsizei, GLvoid *)) {
+   SET_by_offset(disp, _gloffset_ReadnPixelsARB, fn);
 }
 
-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_DrawArraysInstancedBaseInstance)(GLenum, GLint, GLsizei, GLsizei, GLuint);
+#define CALL_DrawArraysInstancedBaseInstance(disp, parameters) \
+    (* GET_DrawArraysInstancedBaseInstance(disp)) parameters
+static INLINE _glptr_DrawArraysInstancedBaseInstance GET_DrawArraysInstancedBaseInstance(struct _glapi_table *disp) {
+   return (_glptr_DrawArraysInstancedBaseInstance) (GET_by_offset(disp, _gloffset_DrawArraysInstancedBaseInstance));
 }
 
-typedef void (GLAPIENTRYP _glptr_TexStorage3D) (GLenum, GLsizei, GLenum,
-                                                GLsizei, GLsizei, GLsizei);
-#define CALL_TexStorage3D(disp, parameters) \
-    (* GET_TexStorage3D(disp)) parameters
-static inline _glptr_TexStorage3D
-GET_TexStorage3D(struct _glapi_table *disp)
-{
-    return (_glptr_TexStorage3D) (GET_by_offset(disp, _gloffset_TexStorage3D));
+static INLINE void SET_DrawArraysInstancedBaseInstance(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLsizei, GLsizei, GLuint)) {
+   SET_by_offset(disp, _gloffset_DrawArraysInstancedBaseInstance, fn);
 }
 
-static inline void
-SET_TexStorage3D(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLenum, GLsizei, GLenum, GLsizei,
-                                        GLsizei, GLsizei))
-{
-    SET_by_offset(disp, _gloffset_TexStorage3D, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TextureStorage1DEXT) (GLuint, GLenum, GLsizei,
-                                                       GLenum, GLsizei);
-#define CALL_TextureStorage1DEXT(disp, parameters) \
-    (* GET_TextureStorage1DEXT(disp)) parameters
-static inline _glptr_TextureStorage1DEXT
-GET_TextureStorage1DEXT(struct _glapi_table *disp)
-{
-    return (_glptr_TextureStorage1DEXT) (GET_by_offset
-                                         (disp, _gloffset_TextureStorage1DEXT));
+typedef void (GLAPIENTRYP _glptr_DrawElementsInstancedBaseInstance)(GLenum, GLsizei, GLenum, const GLvoid *, GLsizei, GLuint);
+#define CALL_DrawElementsInstancedBaseInstance(disp, parameters) \
+    (* GET_DrawElementsInstancedBaseInstance(disp)) parameters
+static INLINE _glptr_DrawElementsInstancedBaseInstance GET_DrawElementsInstancedBaseInstance(struct _glapi_table *disp) {
+   return (_glptr_DrawElementsInstancedBaseInstance) (GET_by_offset(disp, _gloffset_DrawElementsInstancedBaseInstance));
 }
 
-static inline void
-SET_TextureStorage1DEXT(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLuint, GLenum, GLsizei, GLenum,
-                                               GLsizei))
-{
-    SET_by_offset(disp, _gloffset_TextureStorage1DEXT, fn);
+static INLINE void SET_DrawElementsInstancedBaseInstance(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLenum, const GLvoid *, GLsizei, GLuint)) {
+   SET_by_offset(disp, _gloffset_DrawElementsInstancedBaseInstance, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_TextureStorage2DEXT) (GLuint, GLenum, GLsizei,
-                                                       GLenum, GLsizei,
-                                                       GLsizei);
-#define CALL_TextureStorage2DEXT(disp, parameters) \
-    (* GET_TextureStorage2DEXT(disp)) parameters
-static inline _glptr_TextureStorage2DEXT
-GET_TextureStorage2DEXT(struct _glapi_table *disp)
-{
-    return (_glptr_TextureStorage2DEXT) (GET_by_offset
-                                         (disp, _gloffset_TextureStorage2DEXT));
+typedef void (GLAPIENTRYP _glptr_DrawElementsInstancedBaseVertexBaseInstance)(GLenum, GLsizei, GLenum, const GLvoid *, GLsizei, GLint, GLuint);
+#define CALL_DrawElementsInstancedBaseVertexBaseInstance(disp, parameters) \
+    (* GET_DrawElementsInstancedBaseVertexBaseInstance(disp)) parameters
+static INLINE _glptr_DrawElementsInstancedBaseVertexBaseInstance GET_DrawElementsInstancedBaseVertexBaseInstance(struct _glapi_table *disp) {
+   return (_glptr_DrawElementsInstancedBaseVertexBaseInstance) (GET_by_offset(disp, _gloffset_DrawElementsInstancedBaseVertexBaseInstance));
 }
 
-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);
+static INLINE void SET_DrawElementsInstancedBaseVertexBaseInstance(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLenum, const GLvoid *, GLsizei, GLint, GLuint)) {
+   SET_by_offset(disp, _gloffset_DrawElementsInstancedBaseVertexBaseInstance, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_TextureStorage3DEXT) (GLuint, GLenum, GLsizei,
-                                                       GLenum, GLsizei, GLsizei,
-                                                       GLsizei);
-#define CALL_TextureStorage3DEXT(disp, parameters) \
-    (* GET_TextureStorage3DEXT(disp)) parameters
-static inline _glptr_TextureStorage3DEXT
-GET_TextureStorage3DEXT(struct _glapi_table *disp)
-{
-    return (_glptr_TextureStorage3DEXT) (GET_by_offset
-                                         (disp, _gloffset_TextureStorage3DEXT));
+typedef void (GLAPIENTRYP _glptr_DrawTransformFeedbackInstanced)(GLenum, GLuint, GLsizei);
+#define CALL_DrawTransformFeedbackInstanced(disp, parameters) \
+    (* GET_DrawTransformFeedbackInstanced(disp)) parameters
+static INLINE _glptr_DrawTransformFeedbackInstanced GET_DrawTransformFeedbackInstanced(struct _glapi_table *disp) {
+   return (_glptr_DrawTransformFeedbackInstanced) (GET_by_offset(disp, _gloffset_DrawTransformFeedbackInstanced));
 }
 
-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);
+static INLINE void SET_DrawTransformFeedbackInstanced(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLsizei)) {
+   SET_by_offset(disp, _gloffset_DrawTransformFeedbackInstanced, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_PolygonOffsetEXT) (GLfloat, GLfloat);
-
-#define CALL_PolygonOffsetEXT(disp, parameters) \
-    (* GET_PolygonOffsetEXT(disp)) parameters
-static inline _glptr_PolygonOffsetEXT
-GET_PolygonOffsetEXT(struct _glapi_table *disp)
-{
-    return (_glptr_PolygonOffsetEXT) (GET_by_offset
-                                      (disp, _gloffset_PolygonOffsetEXT));
-}
-
-static inline void
-SET_PolygonOffsetEXT(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_PolygonOffsetEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetPixelTexGenParameterfvSGIS) (GLenum,
-                                                                 GLfloat *);
-#define CALL_GetPixelTexGenParameterfvSGIS(disp, parameters) \
-    (* GET_GetPixelTexGenParameterfvSGIS(disp)) parameters
-static inline _glptr_GetPixelTexGenParameterfvSGIS
-GET_GetPixelTexGenParameterfvSGIS(struct _glapi_table *disp)
-{
-    return (_glptr_GetPixelTexGenParameterfvSGIS) (GET_by_offset
-                                                   (disp,
-                                                    _gloffset_GetPixelTexGenParameterfvSGIS));
-}
-
-static inline void
-SET_GetPixelTexGenParameterfvSGIS(struct _glapi_table *disp,
-                                  void (GLAPIENTRYP fn) (GLenum, GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetPixelTexGenParameterfvSGIS, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetPixelTexGenParameterivSGIS) (GLenum,
-                                                                 GLint *);
-#define CALL_GetPixelTexGenParameterivSGIS(disp, parameters) \
-    (* GET_GetPixelTexGenParameterivSGIS(disp)) parameters
-static inline _glptr_GetPixelTexGenParameterivSGIS
-GET_GetPixelTexGenParameterivSGIS(struct _glapi_table *disp)
-{
-    return (_glptr_GetPixelTexGenParameterivSGIS) (GET_by_offset
-                                                   (disp,
-                                                    _gloffset_GetPixelTexGenParameterivSGIS));
-}
-
-static inline void
-SET_GetPixelTexGenParameterivSGIS(struct _glapi_table *disp,
-                                  void (GLAPIENTRYP fn) (GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetPixelTexGenParameterivSGIS, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_PixelTexGenParameterfSGIS) (GLenum, GLfloat);
-
-#define CALL_PixelTexGenParameterfSGIS(disp, parameters) \
-    (* GET_PixelTexGenParameterfSGIS(disp)) parameters
-static inline _glptr_PixelTexGenParameterfSGIS
-GET_PixelTexGenParameterfSGIS(struct _glapi_table *disp)
-{
-    return (_glptr_PixelTexGenParameterfSGIS) (GET_by_offset
-                                               (disp,
-                                                _gloffset_PixelTexGenParameterfSGIS));
-}
-
-static inline void
-SET_PixelTexGenParameterfSGIS(struct _glapi_table *disp,
-                              void (GLAPIENTRYP fn) (GLenum, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_PixelTexGenParameterfSGIS, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_PixelTexGenParameterfvSGIS) (GLenum,
-                                                              const GLfloat *);
-#define CALL_PixelTexGenParameterfvSGIS(disp, parameters) \
-    (* GET_PixelTexGenParameterfvSGIS(disp)) parameters
-static inline _glptr_PixelTexGenParameterfvSGIS
-GET_PixelTexGenParameterfvSGIS(struct _glapi_table *disp)
-{
-    return (_glptr_PixelTexGenParameterfvSGIS) (GET_by_offset
-                                                (disp,
-                                                 _gloffset_PixelTexGenParameterfvSGIS));
-}
-
-static inline void
-SET_PixelTexGenParameterfvSGIS(struct _glapi_table *disp,
-                               void (GLAPIENTRYP fn) (GLenum, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_PixelTexGenParameterfvSGIS, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_PixelTexGenParameteriSGIS) (GLenum, GLint);
-
-#define CALL_PixelTexGenParameteriSGIS(disp, parameters) \
-    (* GET_PixelTexGenParameteriSGIS(disp)) parameters
-static inline _glptr_PixelTexGenParameteriSGIS
-GET_PixelTexGenParameteriSGIS(struct _glapi_table *disp)
-{
-    return (_glptr_PixelTexGenParameteriSGIS) (GET_by_offset
-                                               (disp,
-                                                _gloffset_PixelTexGenParameteriSGIS));
-}
-
-static inline void
-SET_PixelTexGenParameteriSGIS(struct _glapi_table *disp,
-                              void (GLAPIENTRYP fn) (GLenum, GLint))
-{
-    SET_by_offset(disp, _gloffset_PixelTexGenParameteriSGIS, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_PixelTexGenParameterivSGIS) (GLenum,
-                                                              const GLint *);
-#define CALL_PixelTexGenParameterivSGIS(disp, parameters) \
-    (* GET_PixelTexGenParameterivSGIS(disp)) parameters
-static inline _glptr_PixelTexGenParameterivSGIS
-GET_PixelTexGenParameterivSGIS(struct _glapi_table *disp)
-{
-    return (_glptr_PixelTexGenParameterivSGIS) (GET_by_offset
-                                                (disp,
-                                                 _gloffset_PixelTexGenParameterivSGIS));
+typedef void (GLAPIENTRYP _glptr_DrawTransformFeedbackStreamInstanced)(GLenum, GLuint, GLuint, GLsizei);
+#define CALL_DrawTransformFeedbackStreamInstanced(disp, parameters) \
+    (* GET_DrawTransformFeedbackStreamInstanced(disp)) parameters
+static INLINE _glptr_DrawTransformFeedbackStreamInstanced GET_DrawTransformFeedbackStreamInstanced(struct _glapi_table *disp) {
+   return (_glptr_DrawTransformFeedbackStreamInstanced) (GET_by_offset(disp, _gloffset_DrawTransformFeedbackStreamInstanced));
 }
 
-static inline void
-SET_PixelTexGenParameterivSGIS(struct _glapi_table *disp,
-                               void (GLAPIENTRYP fn) (GLenum, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_PixelTexGenParameterivSGIS, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_SampleMaskSGIS) (GLclampf, GLboolean);
-
-#define CALL_SampleMaskSGIS(disp, parameters) \
-    (* GET_SampleMaskSGIS(disp)) parameters
-static inline _glptr_SampleMaskSGIS
-GET_SampleMaskSGIS(struct _glapi_table *disp)
-{
-    return (_glptr_SampleMaskSGIS) (GET_by_offset
-                                    (disp, _gloffset_SampleMaskSGIS));
+static INLINE void SET_DrawTransformFeedbackStreamInstanced(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLuint, GLsizei)) {
+   SET_by_offset(disp, _gloffset_DrawTransformFeedbackStreamInstanced, fn);
 }
 
-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_GetInternalformativ)(GLenum, GLenum, GLenum, GLsizei, GLint *);
+#define CALL_GetInternalformativ(disp, parameters) \
+    (* GET_GetInternalformativ(disp)) parameters
+static INLINE _glptr_GetInternalformativ GET_GetInternalformativ(struct _glapi_table *disp) {
+   return (_glptr_GetInternalformativ) (GET_by_offset(disp, _gloffset_GetInternalformativ));
 }
 
-typedef void (GLAPIENTRYP _glptr_SamplePatternSGIS) (GLenum);
-
-#define CALL_SamplePatternSGIS(disp, parameters) \
-    (* GET_SamplePatternSGIS(disp)) parameters
-static inline _glptr_SamplePatternSGIS
-GET_SamplePatternSGIS(struct _glapi_table *disp)
-{
-    return (_glptr_SamplePatternSGIS) (GET_by_offset
-                                       (disp, _gloffset_SamplePatternSGIS));
+static INLINE void SET_GetInternalformativ(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLsizei, GLint *)) {
+   SET_by_offset(disp, _gloffset_GetInternalformativ, fn);
 }
 
-static inline void
-SET_SamplePatternSGIS(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_SamplePatternSGIS, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ColorPointerEXT) (GLint, GLenum, GLsizei,
-                                                   GLsizei, const GLvoid *);
-#define CALL_ColorPointerEXT(disp, parameters) \
-    (* GET_ColorPointerEXT(disp)) parameters
-static inline _glptr_ColorPointerEXT
-GET_ColorPointerEXT(struct _glapi_table *disp)
-{
-    return (_glptr_ColorPointerEXT) (GET_by_offset
-                                     (disp, _gloffset_ColorPointerEXT));
-}
-
-static inline void
-SET_ColorPointerEXT(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLint, GLenum, GLsizei, GLsizei,
-                                           const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_ColorPointerEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_EdgeFlagPointerEXT) (GLsizei, GLsizei,
-                                                      const GLboolean *);
-#define CALL_EdgeFlagPointerEXT(disp, parameters) \
-    (* GET_EdgeFlagPointerEXT(disp)) parameters
-static inline _glptr_EdgeFlagPointerEXT
-GET_EdgeFlagPointerEXT(struct _glapi_table *disp)
-{
-    return (_glptr_EdgeFlagPointerEXT) (GET_by_offset
-                                        (disp, _gloffset_EdgeFlagPointerEXT));
-}
-
-static inline void
-SET_EdgeFlagPointerEXT(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLsizei, GLsizei,
-                                              const GLboolean *))
-{
-    SET_by_offset(disp, _gloffset_EdgeFlagPointerEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_IndexPointerEXT) (GLenum, GLsizei, GLsizei,
-                                                   const GLvoid *);
-#define CALL_IndexPointerEXT(disp, parameters) \
-    (* GET_IndexPointerEXT(disp)) parameters
-static inline _glptr_IndexPointerEXT
-GET_IndexPointerEXT(struct _glapi_table *disp)
-{
-    return (_glptr_IndexPointerEXT) (GET_by_offset
-                                     (disp, _gloffset_IndexPointerEXT));
+typedef void (GLAPIENTRYP _glptr_TexStorage1D)(GLenum, GLsizei, GLenum, GLsizei);
+#define CALL_TexStorage1D(disp, parameters) \
+    (* GET_TexStorage1D(disp)) parameters
+static INLINE _glptr_TexStorage1D GET_TexStorage1D(struct _glapi_table *disp) {
+   return (_glptr_TexStorage1D) (GET_by_offset(disp, _gloffset_TexStorage1D));
 }
 
-static inline void
-SET_IndexPointerEXT(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLenum, GLsizei, GLsizei,
-                                           const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_IndexPointerEXT, fn);
+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_NormalPointerEXT) (GLenum, GLsizei, GLsizei,
-                                                    const GLvoid *);
-#define CALL_NormalPointerEXT(disp, parameters) \
-    (* GET_NormalPointerEXT(disp)) parameters
-static inline _glptr_NormalPointerEXT
-GET_NormalPointerEXT(struct _glapi_table *disp)
-{
-    return (_glptr_NormalPointerEXT) (GET_by_offset
-                                      (disp, _gloffset_NormalPointerEXT));
+typedef void (GLAPIENTRYP _glptr_TexStorage2D)(GLenum, GLsizei, GLenum, GLsizei, GLsizei);
+#define CALL_TexStorage2D(disp, parameters) \
+    (* GET_TexStorage2D(disp)) parameters
+static INLINE _glptr_TexStorage2D GET_TexStorage2D(struct _glapi_table *disp) {
+   return (_glptr_TexStorage2D) (GET_by_offset(disp, _gloffset_TexStorage2D));
 }
 
-static inline void
-SET_NormalPointerEXT(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLenum, GLsizei, GLsizei,
-                                            const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_NormalPointerEXT, fn);
+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_TexCoordPointerEXT) (GLint, GLenum, GLsizei,
-                                                      GLsizei, const GLvoid *);
-#define CALL_TexCoordPointerEXT(disp, parameters) \
-    (* GET_TexCoordPointerEXT(disp)) parameters
-static inline _glptr_TexCoordPointerEXT
-GET_TexCoordPointerEXT(struct _glapi_table *disp)
-{
-    return (_glptr_TexCoordPointerEXT) (GET_by_offset
-                                        (disp, _gloffset_TexCoordPointerEXT));
+typedef void (GLAPIENTRYP _glptr_TexStorage3D)(GLenum, GLsizei, GLenum, GLsizei, GLsizei, GLsizei);
+#define CALL_TexStorage3D(disp, parameters) \
+    (* GET_TexStorage3D(disp)) parameters
+static INLINE _glptr_TexStorage3D GET_TexStorage3D(struct _glapi_table *disp) {
+   return (_glptr_TexStorage3D) (GET_by_offset(disp, _gloffset_TexStorage3D));
 }
 
-static inline void
-SET_TexCoordPointerEXT(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLint, GLenum, GLsizei, GLsizei,
-                                              const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_TexCoordPointerEXT, fn);
+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_VertexPointerEXT) (GLint, GLenum, GLsizei,
-                                                    GLsizei, const GLvoid *);
-#define CALL_VertexPointerEXT(disp, parameters) \
-    (* GET_VertexPointerEXT(disp)) parameters
-static inline _glptr_VertexPointerEXT
-GET_VertexPointerEXT(struct _glapi_table *disp)
-{
-    return (_glptr_VertexPointerEXT) (GET_by_offset
-                                      (disp, _gloffset_VertexPointerEXT));
+typedef void (GLAPIENTRYP _glptr_TextureStorage1DEXT)(GLuint, GLenum, GLsizei, GLenum, GLsizei);
+#define CALL_TextureStorage1DEXT(disp, parameters) \
+    (* GET_TextureStorage1DEXT(disp)) parameters
+static INLINE _glptr_TextureStorage1DEXT GET_TextureStorage1DEXT(struct _glapi_table *disp) {
+   return (_glptr_TextureStorage1DEXT) (GET_by_offset(disp, _gloffset_TextureStorage1DEXT));
 }
 
-static inline void
-SET_VertexPointerEXT(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLint, GLenum, GLsizei, GLsizei,
-                                            const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_VertexPointerEXT, fn);
+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_PointParameterfEXT) (GLenum, GLfloat);
-
-#define CALL_PointParameterfEXT(disp, parameters) \
-    (* GET_PointParameterfEXT(disp)) parameters
-static inline _glptr_PointParameterfEXT
-GET_PointParameterfEXT(struct _glapi_table *disp)
-{
-    return (_glptr_PointParameterfEXT) (GET_by_offset
-                                        (disp, _gloffset_PointParameterfEXT));
+typedef void (GLAPIENTRYP _glptr_TextureStorage2DEXT)(GLuint, GLenum, GLsizei, GLenum, GLsizei, GLsizei);
+#define CALL_TextureStorage2DEXT(disp, parameters) \
+    (* GET_TextureStorage2DEXT(disp)) parameters
+static INLINE _glptr_TextureStorage2DEXT GET_TextureStorage2DEXT(struct _glapi_table *disp) {
+   return (_glptr_TextureStorage2DEXT) (GET_by_offset(disp, _gloffset_TextureStorage2DEXT));
 }
 
-static inline void
-SET_PointParameterfEXT(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_PointParameterfEXT, fn);
+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_PointParameterfvEXT) (GLenum, const GLfloat *);
-
-#define CALL_PointParameterfvEXT(disp, parameters) \
-    (* GET_PointParameterfvEXT(disp)) parameters
-static inline _glptr_PointParameterfvEXT
-GET_PointParameterfvEXT(struct _glapi_table *disp)
-{
-    return (_glptr_PointParameterfvEXT) (GET_by_offset
-                                         (disp, _gloffset_PointParameterfvEXT));
+typedef void (GLAPIENTRYP _glptr_TextureStorage3DEXT)(GLuint, GLenum, GLsizei, GLenum, GLsizei, GLsizei, GLsizei);
+#define CALL_TextureStorage3DEXT(disp, parameters) \
+    (* GET_TextureStorage3DEXT(disp)) parameters
+static INLINE _glptr_TextureStorage3DEXT GET_TextureStorage3DEXT(struct _glapi_table *disp) {
+   return (_glptr_TextureStorage3DEXT) (GET_by_offset(disp, _gloffset_TextureStorage3DEXT));
 }
 
-static inline void
-SET_PointParameterfvEXT(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_PointParameterfvEXT, fn);
+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_LockArraysEXT) (GLint, GLsizei);
-
-#define CALL_LockArraysEXT(disp, parameters) \
-    (* GET_LockArraysEXT(disp)) parameters
-static inline _glptr_LockArraysEXT
-GET_LockArraysEXT(struct _glapi_table *disp)
-{
-    return (_glptr_LockArraysEXT) (GET_by_offset
-                                   (disp, _gloffset_LockArraysEXT));
+typedef void (GLAPIENTRYP _glptr_TexBufferRange)(GLenum, GLenum, GLuint, GLintptr, GLsizeiptr);
+#define CALL_TexBufferRange(disp, parameters) \
+    (* GET_TexBufferRange(disp)) parameters
+static INLINE _glptr_TexBufferRange GET_TexBufferRange(struct _glapi_table *disp) {
+   return (_glptr_TexBufferRange) (GET_by_offset(disp, _gloffset_TexBufferRange));
 }
 
-static inline void
-SET_LockArraysEXT(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLint, GLsizei))
-{
-    SET_by_offset(disp, _gloffset_LockArraysEXT, fn);
+static INLINE void SET_TexBufferRange(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLuint, GLintptr, GLsizeiptr)) {
+   SET_by_offset(disp, _gloffset_TexBufferRange, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_UnlockArraysEXT) (void);
-
-#define CALL_UnlockArraysEXT(disp, parameters) \
-    (* GET_UnlockArraysEXT(disp)) parameters
-static inline _glptr_UnlockArraysEXT
-GET_UnlockArraysEXT(struct _glapi_table *disp)
-{
-    return (_glptr_UnlockArraysEXT) (GET_by_offset
-                                     (disp, _gloffset_UnlockArraysEXT));
+typedef void (GLAPIENTRYP _glptr_InvalidateBufferData)(GLuint);
+#define CALL_InvalidateBufferData(disp, parameters) \
+    (* GET_InvalidateBufferData(disp)) parameters
+static INLINE _glptr_InvalidateBufferData GET_InvalidateBufferData(struct _glapi_table *disp) {
+   return (_glptr_InvalidateBufferData) (GET_by_offset(disp, _gloffset_InvalidateBufferData));
 }
 
-static inline void
-SET_UnlockArraysEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn) (void))
-{
-    SET_by_offset(disp, _gloffset_UnlockArraysEXT, fn);
+static INLINE void SET_InvalidateBufferData(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) {
+   SET_by_offset(disp, _gloffset_InvalidateBufferData, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_SecondaryColor3bEXT) (GLbyte, GLbyte, GLbyte);
-
-#define CALL_SecondaryColor3bEXT(disp, parameters) \
-    (* GET_SecondaryColor3bEXT(disp)) parameters
-static inline _glptr_SecondaryColor3bEXT
-GET_SecondaryColor3bEXT(struct _glapi_table *disp)
-{
-    return (_glptr_SecondaryColor3bEXT) (GET_by_offset
-                                         (disp, _gloffset_SecondaryColor3bEXT));
+typedef void (GLAPIENTRYP _glptr_InvalidateBufferSubData)(GLuint, GLintptr, GLsizeiptr);
+#define CALL_InvalidateBufferSubData(disp, parameters) \
+    (* GET_InvalidateBufferSubData(disp)) parameters
+static INLINE _glptr_InvalidateBufferSubData GET_InvalidateBufferSubData(struct _glapi_table *disp) {
+   return (_glptr_InvalidateBufferSubData) (GET_by_offset(disp, _gloffset_InvalidateBufferSubData));
 }
 
-static inline void
-SET_SecondaryColor3bEXT(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLbyte, GLbyte, GLbyte))
-{
-    SET_by_offset(disp, _gloffset_SecondaryColor3bEXT, fn);
+static INLINE void SET_InvalidateBufferSubData(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLintptr, GLsizeiptr)) {
+   SET_by_offset(disp, _gloffset_InvalidateBufferSubData, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_SecondaryColor3bvEXT) (const GLbyte *);
-
-#define CALL_SecondaryColor3bvEXT(disp, parameters) \
-    (* GET_SecondaryColor3bvEXT(disp)) parameters
-static inline _glptr_SecondaryColor3bvEXT
-GET_SecondaryColor3bvEXT(struct _glapi_table *disp)
-{
-    return (_glptr_SecondaryColor3bvEXT) (GET_by_offset
-                                          (disp,
-                                           _gloffset_SecondaryColor3bvEXT));
+typedef void (GLAPIENTRYP _glptr_InvalidateFramebuffer)(GLenum, GLsizei, const GLenum *);
+#define CALL_InvalidateFramebuffer(disp, parameters) \
+    (* GET_InvalidateFramebuffer(disp)) parameters
+static INLINE _glptr_InvalidateFramebuffer GET_InvalidateFramebuffer(struct _glapi_table *disp) {
+   return (_glptr_InvalidateFramebuffer) (GET_by_offset(disp, _gloffset_InvalidateFramebuffer));
 }
 
-static inline void
-SET_SecondaryColor3bvEXT(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (const GLbyte *))
-{
-    SET_by_offset(disp, _gloffset_SecondaryColor3bvEXT, fn);
+static INLINE void SET_InvalidateFramebuffer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, const GLenum *)) {
+   SET_by_offset(disp, _gloffset_InvalidateFramebuffer, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_SecondaryColor3dEXT) (GLdouble, GLdouble,
-                                                       GLdouble);
-#define CALL_SecondaryColor3dEXT(disp, parameters) \
-    (* GET_SecondaryColor3dEXT(disp)) parameters
-static inline _glptr_SecondaryColor3dEXT
-GET_SecondaryColor3dEXT(struct _glapi_table *disp)
-{
-    return (_glptr_SecondaryColor3dEXT) (GET_by_offset
-                                         (disp, _gloffset_SecondaryColor3dEXT));
+typedef void (GLAPIENTRYP _glptr_InvalidateSubFramebuffer)(GLenum, GLsizei, const GLenum *, GLint, GLint, GLsizei, GLsizei);
+#define CALL_InvalidateSubFramebuffer(disp, parameters) \
+    (* GET_InvalidateSubFramebuffer(disp)) parameters
+static INLINE _glptr_InvalidateSubFramebuffer GET_InvalidateSubFramebuffer(struct _glapi_table *disp) {
+   return (_glptr_InvalidateSubFramebuffer) (GET_by_offset(disp, _gloffset_InvalidateSubFramebuffer));
 }
 
-static inline void
-SET_SecondaryColor3dEXT(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLdouble, GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_SecondaryColor3dEXT, fn);
+static INLINE void SET_InvalidateSubFramebuffer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, const GLenum *, GLint, GLint, GLsizei, GLsizei)) {
+   SET_by_offset(disp, _gloffset_InvalidateSubFramebuffer, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_SecondaryColor3dvEXT) (const GLdouble *);
-
-#define CALL_SecondaryColor3dvEXT(disp, parameters) \
-    (* GET_SecondaryColor3dvEXT(disp)) parameters
-static inline _glptr_SecondaryColor3dvEXT
-GET_SecondaryColor3dvEXT(struct _glapi_table *disp)
-{
-    return (_glptr_SecondaryColor3dvEXT) (GET_by_offset
-                                          (disp,
-                                           _gloffset_SecondaryColor3dvEXT));
+typedef void (GLAPIENTRYP _glptr_InvalidateTexImage)(GLuint, GLint);
+#define CALL_InvalidateTexImage(disp, parameters) \
+    (* GET_InvalidateTexImage(disp)) parameters
+static INLINE _glptr_InvalidateTexImage GET_InvalidateTexImage(struct _glapi_table *disp) {
+   return (_glptr_InvalidateTexImage) (GET_by_offset(disp, _gloffset_InvalidateTexImage));
 }
 
-static inline void
-SET_SecondaryColor3dvEXT(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_SecondaryColor3dvEXT, fn);
+static INLINE void SET_InvalidateTexImage(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint)) {
+   SET_by_offset(disp, _gloffset_InvalidateTexImage, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_SecondaryColor3fEXT) (GLfloat, GLfloat,
-                                                       GLfloat);
-#define CALL_SecondaryColor3fEXT(disp, parameters) \
-    (* GET_SecondaryColor3fEXT(disp)) parameters
-static inline _glptr_SecondaryColor3fEXT
-GET_SecondaryColor3fEXT(struct _glapi_table *disp)
-{
-    return (_glptr_SecondaryColor3fEXT) (GET_by_offset
-                                         (disp, _gloffset_SecondaryColor3fEXT));
+typedef void (GLAPIENTRYP _glptr_InvalidateTexSubImage)(GLuint, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei);
+#define CALL_InvalidateTexSubImage(disp, parameters) \
+    (* GET_InvalidateTexSubImage(disp)) parameters
+static INLINE _glptr_InvalidateTexSubImage GET_InvalidateTexSubImage(struct _glapi_table *disp) {
+   return (_glptr_InvalidateTexSubImage) (GET_by_offset(disp, _gloffset_InvalidateTexSubImage));
 }
 
-static inline void
-SET_SecondaryColor3fEXT(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLfloat, GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_SecondaryColor3fEXT, fn);
+static INLINE void SET_InvalidateTexSubImage(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei)) {
+   SET_by_offset(disp, _gloffset_InvalidateTexSubImage, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_SecondaryColor3fvEXT) (const GLfloat *);
-
-#define CALL_SecondaryColor3fvEXT(disp, parameters) \
-    (* GET_SecondaryColor3fvEXT(disp)) parameters
-static inline _glptr_SecondaryColor3fvEXT
-GET_SecondaryColor3fvEXT(struct _glapi_table *disp)
-{
-    return (_glptr_SecondaryColor3fvEXT) (GET_by_offset
-                                          (disp,
-                                           _gloffset_SecondaryColor3fvEXT));
-}
-
-static inline void
-SET_SecondaryColor3fvEXT(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_SecondaryColor3fvEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_SecondaryColor3iEXT) (GLint, GLint, GLint);
-
-#define CALL_SecondaryColor3iEXT(disp, parameters) \
-    (* GET_SecondaryColor3iEXT(disp)) parameters
-static inline _glptr_SecondaryColor3iEXT
-GET_SecondaryColor3iEXT(struct _glapi_table *disp)
-{
-    return (_glptr_SecondaryColor3iEXT) (GET_by_offset
-                                         (disp, _gloffset_SecondaryColor3iEXT));
+typedef void (GLAPIENTRYP _glptr_PolygonOffsetEXT)(GLfloat, GLfloat);
+#define CALL_PolygonOffsetEXT(disp, parameters) \
+    (* GET_PolygonOffsetEXT(disp)) parameters
+static INLINE _glptr_PolygonOffsetEXT GET_PolygonOffsetEXT(struct _glapi_table *disp) {
+   return (_glptr_PolygonOffsetEXT) (GET_by_offset(disp, _gloffset_PolygonOffsetEXT));
 }
 
-static inline void
-SET_SecondaryColor3iEXT(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLint, GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_SecondaryColor3iEXT, fn);
+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_SecondaryColor3ivEXT) (const GLint *);
-
-#define CALL_SecondaryColor3ivEXT(disp, parameters) \
-    (* GET_SecondaryColor3ivEXT(disp)) parameters
-static inline _glptr_SecondaryColor3ivEXT
-GET_SecondaryColor3ivEXT(struct _glapi_table *disp)
-{
-    return (_glptr_SecondaryColor3ivEXT) (GET_by_offset
-                                          (disp,
-                                           _gloffset_SecondaryColor3ivEXT));
-}
-
-static inline void
-SET_SecondaryColor3ivEXT(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (const GLint *))
-{
-    SET_by_offset(disp, _gloffset_SecondaryColor3ivEXT, fn);
+typedef void (GLAPIENTRYP _glptr_DrawTexfOES)(GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+#define CALL_DrawTexfOES(disp, parameters) \
+    (* GET_DrawTexfOES(disp)) parameters
+static INLINE _glptr_DrawTexfOES GET_DrawTexfOES(struct _glapi_table *disp) {
+   return (_glptr_DrawTexfOES) (GET_by_offset(disp, _gloffset_DrawTexfOES));
 }
 
-typedef void (GLAPIENTRYP _glptr_SecondaryColor3sEXT) (GLshort, GLshort,
-                                                       GLshort);
-#define CALL_SecondaryColor3sEXT(disp, parameters) \
-    (* GET_SecondaryColor3sEXT(disp)) parameters
-static inline _glptr_SecondaryColor3sEXT
-GET_SecondaryColor3sEXT(struct _glapi_table *disp)
-{
-    return (_glptr_SecondaryColor3sEXT) (GET_by_offset
-                                         (disp, _gloffset_SecondaryColor3sEXT));
+static INLINE void SET_DrawTexfOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat, GLfloat, GLfloat)) {
+   SET_by_offset(disp, _gloffset_DrawTexfOES, fn);
 }
 
-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_DrawTexfvOES)(const GLfloat *);
+#define CALL_DrawTexfvOES(disp, parameters) \
+    (* GET_DrawTexfvOES(disp)) parameters
+static INLINE _glptr_DrawTexfvOES GET_DrawTexfvOES(struct _glapi_table *disp) {
+   return (_glptr_DrawTexfvOES) (GET_by_offset(disp, _gloffset_DrawTexfvOES));
 }
 
-typedef void (GLAPIENTRYP _glptr_SecondaryColor3svEXT) (const GLshort *);
-
-#define CALL_SecondaryColor3svEXT(disp, parameters) \
-    (* GET_SecondaryColor3svEXT(disp)) parameters
-static inline _glptr_SecondaryColor3svEXT
-GET_SecondaryColor3svEXT(struct _glapi_table *disp)
-{
-    return (_glptr_SecondaryColor3svEXT) (GET_by_offset
-                                          (disp,
-                                           _gloffset_SecondaryColor3svEXT));
-}
-
-static inline void
-SET_SecondaryColor3svEXT(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_SecondaryColor3svEXT, fn);
+static INLINE void SET_DrawTexfvOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) {
+   SET_by_offset(disp, _gloffset_DrawTexfvOES, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_SecondaryColor3ubEXT) (GLubyte, GLubyte,
-                                                        GLubyte);
-#define CALL_SecondaryColor3ubEXT(disp, parameters) \
-    (* GET_SecondaryColor3ubEXT(disp)) parameters
-static inline _glptr_SecondaryColor3ubEXT
-GET_SecondaryColor3ubEXT(struct _glapi_table *disp)
-{
-    return (_glptr_SecondaryColor3ubEXT) (GET_by_offset
-                                          (disp,
-                                           _gloffset_SecondaryColor3ubEXT));
-}
-
-static inline void
-SET_SecondaryColor3ubEXT(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (GLubyte, GLubyte, GLubyte))
-{
-    SET_by_offset(disp, _gloffset_SecondaryColor3ubEXT, fn);
+typedef void (GLAPIENTRYP _glptr_DrawTexiOES)(GLint, GLint, GLint, GLint, GLint);
+#define CALL_DrawTexiOES(disp, parameters) \
+    (* GET_DrawTexiOES(disp)) parameters
+static INLINE _glptr_DrawTexiOES GET_DrawTexiOES(struct _glapi_table *disp) {
+   return (_glptr_DrawTexiOES) (GET_by_offset(disp, _gloffset_DrawTexiOES));
 }
 
-typedef void (GLAPIENTRYP _glptr_SecondaryColor3ubvEXT) (const GLubyte *);
-
-#define CALL_SecondaryColor3ubvEXT(disp, parameters) \
-    (* GET_SecondaryColor3ubvEXT(disp)) parameters
-static inline _glptr_SecondaryColor3ubvEXT
-GET_SecondaryColor3ubvEXT(struct _glapi_table *disp)
-{
-    return (_glptr_SecondaryColor3ubvEXT) (GET_by_offset
-                                           (disp,
-                                            _gloffset_SecondaryColor3ubvEXT));
-}
-
-static inline void
-SET_SecondaryColor3ubvEXT(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (const GLubyte *))
-{
-    SET_by_offset(disp, _gloffset_SecondaryColor3ubvEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_SecondaryColor3uiEXT) (GLuint, GLuint, GLuint);
-
-#define CALL_SecondaryColor3uiEXT(disp, parameters) \
-    (* GET_SecondaryColor3uiEXT(disp)) parameters
-static inline _glptr_SecondaryColor3uiEXT
-GET_SecondaryColor3uiEXT(struct _glapi_table *disp)
-{
-    return (_glptr_SecondaryColor3uiEXT) (GET_by_offset
-                                          (disp,
-                                           _gloffset_SecondaryColor3uiEXT));
-}
-
-static inline void
-SET_SecondaryColor3uiEXT(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (GLuint, GLuint, GLuint))
-{
-    SET_by_offset(disp, _gloffset_SecondaryColor3uiEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_SecondaryColor3uivEXT) (const GLuint *);
-
-#define CALL_SecondaryColor3uivEXT(disp, parameters) \
-    (* GET_SecondaryColor3uivEXT(disp)) parameters
-static inline _glptr_SecondaryColor3uivEXT
-GET_SecondaryColor3uivEXT(struct _glapi_table *disp)
-{
-    return (_glptr_SecondaryColor3uivEXT) (GET_by_offset
-                                           (disp,
-                                            _gloffset_SecondaryColor3uivEXT));
-}
-
-static inline void
-SET_SecondaryColor3uivEXT(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_SecondaryColor3uivEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_SecondaryColor3usEXT) (GLushort, GLushort,
-                                                        GLushort);
-#define CALL_SecondaryColor3usEXT(disp, parameters) \
-    (* GET_SecondaryColor3usEXT(disp)) parameters
-static inline _glptr_SecondaryColor3usEXT
-GET_SecondaryColor3usEXT(struct _glapi_table *disp)
-{
-    return (_glptr_SecondaryColor3usEXT) (GET_by_offset
-                                          (disp,
-                                           _gloffset_SecondaryColor3usEXT));
-}
-
-static inline void
-SET_SecondaryColor3usEXT(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (GLushort, GLushort, GLushort))
-{
-    SET_by_offset(disp, _gloffset_SecondaryColor3usEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_SecondaryColor3usvEXT) (const GLushort *);
-
-#define CALL_SecondaryColor3usvEXT(disp, parameters) \
-    (* GET_SecondaryColor3usvEXT(disp)) parameters
-static inline _glptr_SecondaryColor3usvEXT
-GET_SecondaryColor3usvEXT(struct _glapi_table *disp)
-{
-    return (_glptr_SecondaryColor3usvEXT) (GET_by_offset
-                                           (disp,
-                                            _gloffset_SecondaryColor3usvEXT));
-}
-
-static inline void
-SET_SecondaryColor3usvEXT(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (const GLushort *))
-{
-    SET_by_offset(disp, _gloffset_SecondaryColor3usvEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_SecondaryColorPointerEXT) (GLint, GLenum,
-                                                            GLsizei,
-                                                            const GLvoid *);
-#define CALL_SecondaryColorPointerEXT(disp, parameters) \
-    (* GET_SecondaryColorPointerEXT(disp)) parameters
-static inline _glptr_SecondaryColorPointerEXT
-GET_SecondaryColorPointerEXT(struct _glapi_table *disp)
-{
-    return (_glptr_SecondaryColorPointerEXT) (GET_by_offset
-                                              (disp,
-                                               _gloffset_SecondaryColorPointerEXT));
-}
-
-static inline void
-SET_SecondaryColorPointerEXT(struct _glapi_table *disp,
-                             void (GLAPIENTRYP fn) (GLint, GLenum, GLsizei,
-                                                    const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_SecondaryColorPointerEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultiDrawArraysEXT) (GLenum, const GLint *,
-                                                      const GLsizei *, GLsizei);
-#define CALL_MultiDrawArraysEXT(disp, parameters) \
-    (* GET_MultiDrawArraysEXT(disp)) parameters
-static inline _glptr_MultiDrawArraysEXT
-GET_MultiDrawArraysEXT(struct _glapi_table *disp)
-{
-    return (_glptr_MultiDrawArraysEXT) (GET_by_offset
-                                        (disp, _gloffset_MultiDrawArraysEXT));
-}
-
-static inline void
-SET_MultiDrawArraysEXT(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, const GLint *,
-                                              const GLsizei *, GLsizei))
-{
-    SET_by_offset(disp, _gloffset_MultiDrawArraysEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultiDrawElementsEXT) (GLenum, const GLsizei *,
-                                                        GLenum, const GLvoid **,
-                                                        GLsizei);
-#define CALL_MultiDrawElementsEXT(disp, parameters) \
-    (* GET_MultiDrawElementsEXT(disp)) parameters
-static inline _glptr_MultiDrawElementsEXT
-GET_MultiDrawElementsEXT(struct _glapi_table *disp)
-{
-    return (_glptr_MultiDrawElementsEXT) (GET_by_offset
-                                          (disp,
-                                           _gloffset_MultiDrawElementsEXT));
+static INLINE void SET_DrawTexiOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint, GLint, GLint)) {
+   SET_by_offset(disp, _gloffset_DrawTexiOES, fn);
 }
 
-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_DrawTexivOES)(const GLint *);
+#define CALL_DrawTexivOES(disp, parameters) \
+    (* GET_DrawTexivOES(disp)) parameters
+static INLINE _glptr_DrawTexivOES GET_DrawTexivOES(struct _glapi_table *disp) {
+   return (_glptr_DrawTexivOES) (GET_by_offset(disp, _gloffset_DrawTexivOES));
 }
 
-typedef void (GLAPIENTRYP _glptr_FogCoordPointerEXT) (GLenum, GLsizei,
-                                                      const GLvoid *);
-#define CALL_FogCoordPointerEXT(disp, parameters) \
-    (* GET_FogCoordPointerEXT(disp)) parameters
-static inline _glptr_FogCoordPointerEXT
-GET_FogCoordPointerEXT(struct _glapi_table *disp)
-{
-    return (_glptr_FogCoordPointerEXT) (GET_by_offset
-                                        (disp, _gloffset_FogCoordPointerEXT));
+static INLINE void SET_DrawTexivOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) {
+   SET_by_offset(disp, _gloffset_DrawTexivOES, fn);
 }
 
-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_DrawTexsOES)(GLshort, GLshort, GLshort, GLshort, GLshort);
+#define CALL_DrawTexsOES(disp, parameters) \
+    (* GET_DrawTexsOES(disp)) parameters
+static INLINE _glptr_DrawTexsOES GET_DrawTexsOES(struct _glapi_table *disp) {
+   return (_glptr_DrawTexsOES) (GET_by_offset(disp, _gloffset_DrawTexsOES));
 }
 
-typedef void (GLAPIENTRYP _glptr_FogCoorddEXT) (GLdouble);
-
-#define CALL_FogCoorddEXT(disp, parameters) \
-    (* GET_FogCoorddEXT(disp)) parameters
-static inline _glptr_FogCoorddEXT
-GET_FogCoorddEXT(struct _glapi_table *disp)
-{
-    return (_glptr_FogCoorddEXT) (GET_by_offset(disp, _gloffset_FogCoorddEXT));
+static INLINE void SET_DrawTexsOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort, GLshort, GLshort, GLshort)) {
+   SET_by_offset(disp, _gloffset_DrawTexsOES, fn);
 }
 
-static inline void
-SET_FogCoorddEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLdouble))
-{
-    SET_by_offset(disp, _gloffset_FogCoorddEXT, fn);
+typedef void (GLAPIENTRYP _glptr_DrawTexsvOES)(const GLshort *);
+#define CALL_DrawTexsvOES(disp, parameters) \
+    (* GET_DrawTexsvOES(disp)) parameters
+static INLINE _glptr_DrawTexsvOES GET_DrawTexsvOES(struct _glapi_table *disp) {
+   return (_glptr_DrawTexsvOES) (GET_by_offset(disp, _gloffset_DrawTexsvOES));
 }
 
-typedef void (GLAPIENTRYP _glptr_FogCoorddvEXT) (const GLdouble *);
-
-#define CALL_FogCoorddvEXT(disp, parameters) \
-    (* GET_FogCoorddvEXT(disp)) parameters
-static inline _glptr_FogCoorddvEXT
-GET_FogCoorddvEXT(struct _glapi_table *disp)
-{
-    return (_glptr_FogCoorddvEXT) (GET_by_offset
-                                   (disp, _gloffset_FogCoorddvEXT));
+static INLINE void SET_DrawTexsvOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) {
+   SET_by_offset(disp, _gloffset_DrawTexsvOES, fn);
 }
 
-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_DrawTexxOES)(GLfixed, GLfixed, GLfixed, GLfixed, GLfixed);
+#define CALL_DrawTexxOES(disp, parameters) \
+    (* GET_DrawTexxOES(disp)) parameters
+static INLINE _glptr_DrawTexxOES GET_DrawTexxOES(struct _glapi_table *disp) {
+   return (_glptr_DrawTexxOES) (GET_by_offset(disp, _gloffset_DrawTexxOES));
 }
 
-typedef void (GLAPIENTRYP _glptr_FogCoordfEXT) (GLfloat);
-
-#define CALL_FogCoordfEXT(disp, parameters) \
-    (* GET_FogCoordfEXT(disp)) parameters
-static inline _glptr_FogCoordfEXT
-GET_FogCoordfEXT(struct _glapi_table *disp)
-{
-    return (_glptr_FogCoordfEXT) (GET_by_offset(disp, _gloffset_FogCoordfEXT));
+static INLINE void SET_DrawTexxOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfixed, GLfixed, GLfixed, GLfixed, GLfixed)) {
+   SET_by_offset(disp, _gloffset_DrawTexxOES, fn);
 }
 
-static inline void
-SET_FogCoordfEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLfloat))
-{
-    SET_by_offset(disp, _gloffset_FogCoordfEXT, fn);
+typedef void (GLAPIENTRYP _glptr_DrawTexxvOES)(const GLfixed *);
+#define CALL_DrawTexxvOES(disp, parameters) \
+    (* GET_DrawTexxvOES(disp)) parameters
+static INLINE _glptr_DrawTexxvOES GET_DrawTexxvOES(struct _glapi_table *disp) {
+   return (_glptr_DrawTexxvOES) (GET_by_offset(disp, _gloffset_DrawTexxvOES));
 }
 
-typedef void (GLAPIENTRYP _glptr_FogCoordfvEXT) (const GLfloat *);
-
-#define CALL_FogCoordfvEXT(disp, parameters) \
-    (* GET_FogCoordfvEXT(disp)) parameters
-static inline _glptr_FogCoordfvEXT
-GET_FogCoordfvEXT(struct _glapi_table *disp)
-{
-    return (_glptr_FogCoordfvEXT) (GET_by_offset
-                                   (disp, _gloffset_FogCoordfvEXT));
+static INLINE void SET_DrawTexxvOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfixed *)) {
+   SET_by_offset(disp, _gloffset_DrawTexxvOES, fn);
 }
 
-static inline void
-SET_FogCoordfvEXT(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_FogCoordfvEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_PixelTexGenSGIX) (GLenum);
-
-#define CALL_PixelTexGenSGIX(disp, parameters) \
-    (* GET_PixelTexGenSGIX(disp)) parameters
-static inline _glptr_PixelTexGenSGIX
-GET_PixelTexGenSGIX(struct _glapi_table *disp)
-{
-    return (_glptr_PixelTexGenSGIX) (GET_by_offset
-                                     (disp, _gloffset_PixelTexGenSGIX));
-}
-
-static inline void
-SET_PixelTexGenSGIX(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_PixelTexGenSGIX, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_BlendFuncSeparateEXT) (GLenum, GLenum, GLenum,
-                                                        GLenum);
-#define CALL_BlendFuncSeparateEXT(disp, parameters) \
-    (* GET_BlendFuncSeparateEXT(disp)) parameters
-static inline _glptr_BlendFuncSeparateEXT
-GET_BlendFuncSeparateEXT(struct _glapi_table *disp)
-{
-    return (_glptr_BlendFuncSeparateEXT) (GET_by_offset
-                                          (disp,
-                                           _gloffset_BlendFuncSeparateEXT));
-}
-
-static inline void
-SET_BlendFuncSeparateEXT(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (GLenum, GLenum, GLenum, GLenum))
-{
-    SET_by_offset(disp, _gloffset_BlendFuncSeparateEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_FlushVertexArrayRangeNV) (void);
-
-#define CALL_FlushVertexArrayRangeNV(disp, parameters) \
-    (* GET_FlushVertexArrayRangeNV(disp)) parameters
-static inline _glptr_FlushVertexArrayRangeNV
-GET_FlushVertexArrayRangeNV(struct _glapi_table *disp)
-{
-    return (_glptr_FlushVertexArrayRangeNV) (GET_by_offset
-                                             (disp,
-                                              _gloffset_FlushVertexArrayRangeNV));
-}
-
-static inline void
-SET_FlushVertexArrayRangeNV(struct _glapi_table *disp,
-                            void (GLAPIENTRYP fn) (void))
-{
-    SET_by_offset(disp, _gloffset_FlushVertexArrayRangeNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexArrayRangeNV) (GLsizei, const GLvoid *);
-
-#define CALL_VertexArrayRangeNV(disp, parameters) \
-    (* GET_VertexArrayRangeNV(disp)) parameters
-static inline _glptr_VertexArrayRangeNV
-GET_VertexArrayRangeNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexArrayRangeNV) (GET_by_offset
-                                        (disp, _gloffset_VertexArrayRangeNV));
-}
-
-static inline void
-SET_VertexArrayRangeNV(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLsizei, const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_VertexArrayRangeNV, fn);
+typedef void (GLAPIENTRYP _glptr_PointSizePointerOES)(GLenum, GLsizei, const GLvoid *);
+#define CALL_PointSizePointerOES(disp, parameters) \
+    (* GET_PointSizePointerOES(disp)) parameters
+static INLINE _glptr_PointSizePointerOES GET_PointSizePointerOES(struct _glapi_table *disp) {
+   return (_glptr_PointSizePointerOES) (GET_by_offset(disp, _gloffset_PointSizePointerOES));
 }
 
-typedef void (GLAPIENTRYP _glptr_CombinerInputNV) (GLenum, GLenum, GLenum,
-                                                   GLenum, GLenum, GLenum);
-#define CALL_CombinerInputNV(disp, parameters) \
-    (* GET_CombinerInputNV(disp)) parameters
-static inline _glptr_CombinerInputNV
-GET_CombinerInputNV(struct _glapi_table *disp)
-{
-    return (_glptr_CombinerInputNV) (GET_by_offset
-                                     (disp, _gloffset_CombinerInputNV));
-}
-
-static inline void
-SET_CombinerInputNV(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLenum, GLenum, GLenum, GLenum,
-                                           GLenum, GLenum))
-{
-    SET_by_offset(disp, _gloffset_CombinerInputNV, fn);
+static INLINE void SET_PointSizePointerOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, const GLvoid *)) {
+   SET_by_offset(disp, _gloffset_PointSizePointerOES, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_CombinerOutputNV) (GLenum, GLenum, GLenum,
-                                                    GLenum, GLenum, GLenum,
-                                                    GLenum, GLboolean,
-                                                    GLboolean, GLboolean);
-#define CALL_CombinerOutputNV(disp, parameters) \
-    (* GET_CombinerOutputNV(disp)) parameters
-static inline _glptr_CombinerOutputNV
-GET_CombinerOutputNV(struct _glapi_table *disp)
-{
-    return (_glptr_CombinerOutputNV) (GET_by_offset
-                                      (disp, _gloffset_CombinerOutputNV));
-}
-
-static inline void
-SET_CombinerOutputNV(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLenum, GLenum, GLenum, GLenum,
-                                            GLenum, GLenum, GLenum, GLboolean,
-                                            GLboolean, GLboolean))
-{
-    SET_by_offset(disp, _gloffset_CombinerOutputNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_CombinerParameterfNV) (GLenum, GLfloat);
-
-#define CALL_CombinerParameterfNV(disp, parameters) \
-    (* GET_CombinerParameterfNV(disp)) parameters
-static inline _glptr_CombinerParameterfNV
-GET_CombinerParameterfNV(struct _glapi_table *disp)
-{
-    return (_glptr_CombinerParameterfNV) (GET_by_offset
-                                          (disp,
-                                           _gloffset_CombinerParameterfNV));
-}
-
-static inline void
-SET_CombinerParameterfNV(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (GLenum, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_CombinerParameterfNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_CombinerParameterfvNV) (GLenum,
-                                                         const GLfloat *);
-#define CALL_CombinerParameterfvNV(disp, parameters) \
-    (* GET_CombinerParameterfvNV(disp)) parameters
-static inline _glptr_CombinerParameterfvNV
-GET_CombinerParameterfvNV(struct _glapi_table *disp)
-{
-    return (_glptr_CombinerParameterfvNV) (GET_by_offset
-                                           (disp,
-                                            _gloffset_CombinerParameterfvNV));
-}
-
-static inline void
-SET_CombinerParameterfvNV(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (GLenum, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_CombinerParameterfvNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_CombinerParameteriNV) (GLenum, GLint);
-
-#define CALL_CombinerParameteriNV(disp, parameters) \
-    (* GET_CombinerParameteriNV(disp)) parameters
-static inline _glptr_CombinerParameteriNV
-GET_CombinerParameteriNV(struct _glapi_table *disp)
-{
-    return (_glptr_CombinerParameteriNV) (GET_by_offset
-                                          (disp,
-                                           _gloffset_CombinerParameteriNV));
-}
-
-static inline void
-SET_CombinerParameteriNV(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (GLenum, GLint))
-{
-    SET_by_offset(disp, _gloffset_CombinerParameteriNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_CombinerParameterivNV) (GLenum, const GLint *);
-
-#define CALL_CombinerParameterivNV(disp, parameters) \
-    (* GET_CombinerParameterivNV(disp)) parameters
-static inline _glptr_CombinerParameterivNV
-GET_CombinerParameterivNV(struct _glapi_table *disp)
-{
-    return (_glptr_CombinerParameterivNV) (GET_by_offset
-                                           (disp,
-                                            _gloffset_CombinerParameterivNV));
-}
-
-static inline void
-SET_CombinerParameterivNV(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (GLenum, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_CombinerParameterivNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_FinalCombinerInputNV) (GLenum, GLenum, GLenum,
-                                                        GLenum);
-#define CALL_FinalCombinerInputNV(disp, parameters) \
-    (* GET_FinalCombinerInputNV(disp)) parameters
-static inline _glptr_FinalCombinerInputNV
-GET_FinalCombinerInputNV(struct _glapi_table *disp)
-{
-    return (_glptr_FinalCombinerInputNV) (GET_by_offset
-                                          (disp,
-                                           _gloffset_FinalCombinerInputNV));
-}
-
-static inline void
-SET_FinalCombinerInputNV(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (GLenum, GLenum, GLenum, GLenum))
-{
-    SET_by_offset(disp, _gloffset_FinalCombinerInputNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetCombinerInputParameterfvNV) (GLenum, GLenum,
-                                                                 GLenum, GLenum,
-                                                                 GLfloat *);
-#define CALL_GetCombinerInputParameterfvNV(disp, parameters) \
-    (* GET_GetCombinerInputParameterfvNV(disp)) parameters
-static inline _glptr_GetCombinerInputParameterfvNV
-GET_GetCombinerInputParameterfvNV(struct _glapi_table *disp)
-{
-    return (_glptr_GetCombinerInputParameterfvNV) (GET_by_offset
-                                                   (disp,
-                                                    _gloffset_GetCombinerInputParameterfvNV));
-}
-
-static inline void
-SET_GetCombinerInputParameterfvNV(struct _glapi_table *disp,
-                                  void (GLAPIENTRYP fn) (GLenum, GLenum, GLenum,
-                                                         GLenum, GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetCombinerInputParameterfvNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetCombinerInputParameterivNV) (GLenum, GLenum,
-                                                                 GLenum, GLenum,
-                                                                 GLint *);
-#define CALL_GetCombinerInputParameterivNV(disp, parameters) \
-    (* GET_GetCombinerInputParameterivNV(disp)) parameters
-static inline _glptr_GetCombinerInputParameterivNV
-GET_GetCombinerInputParameterivNV(struct _glapi_table *disp)
-{
-    return (_glptr_GetCombinerInputParameterivNV) (GET_by_offset
-                                                   (disp,
-                                                    _gloffset_GetCombinerInputParameterivNV));
-}
-
-static inline void
-SET_GetCombinerInputParameterivNV(struct _glapi_table *disp,
-                                  void (GLAPIENTRYP fn) (GLenum, GLenum, GLenum,
-                                                         GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetCombinerInputParameterivNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetCombinerOutputParameterfvNV) (GLenum,
-                                                                  GLenum,
-                                                                  GLenum,
-                                                                  GLfloat *);
-#define CALL_GetCombinerOutputParameterfvNV(disp, parameters) \
-    (* GET_GetCombinerOutputParameterfvNV(disp)) parameters
-static inline _glptr_GetCombinerOutputParameterfvNV
-GET_GetCombinerOutputParameterfvNV(struct _glapi_table *disp)
-{
-    return (_glptr_GetCombinerOutputParameterfvNV) (GET_by_offset
-                                                    (disp,
-                                                     _gloffset_GetCombinerOutputParameterfvNV));
-}
-
-static inline void
-SET_GetCombinerOutputParameterfvNV(struct _glapi_table *disp,
-                                   void (GLAPIENTRYP fn) (GLenum, GLenum,
-                                                          GLenum, GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetCombinerOutputParameterfvNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetCombinerOutputParameterivNV) (GLenum,
-                                                                  GLenum,
-                                                                  GLenum,
-                                                                  GLint *);
-#define CALL_GetCombinerOutputParameterivNV(disp, parameters) \
-    (* GET_GetCombinerOutputParameterivNV(disp)) parameters
-static inline _glptr_GetCombinerOutputParameterivNV
-GET_GetCombinerOutputParameterivNV(struct _glapi_table *disp)
-{
-    return (_glptr_GetCombinerOutputParameterivNV) (GET_by_offset
-                                                    (disp,
-                                                     _gloffset_GetCombinerOutputParameterivNV));
-}
-
-static inline void
-SET_GetCombinerOutputParameterivNV(struct _glapi_table *disp,
-                                   void (GLAPIENTRYP fn) (GLenum, GLenum,
-                                                          GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetCombinerOutputParameterivNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetFinalCombinerInputParameterfvNV) (GLenum,
-                                                                      GLenum,
-                                                                      GLfloat
-                                                                      *);
-#define CALL_GetFinalCombinerInputParameterfvNV(disp, parameters) \
-    (* GET_GetFinalCombinerInputParameterfvNV(disp)) parameters
-static inline _glptr_GetFinalCombinerInputParameterfvNV
-GET_GetFinalCombinerInputParameterfvNV(struct _glapi_table *disp)
-{
-    return (_glptr_GetFinalCombinerInputParameterfvNV) (GET_by_offset
-                                                        (disp,
-                                                         _gloffset_GetFinalCombinerInputParameterfvNV));
-}
-
-static inline void
-SET_GetFinalCombinerInputParameterfvNV(struct _glapi_table *disp,
-                                       void (GLAPIENTRYP fn) (GLenum, GLenum,
-                                                              GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetFinalCombinerInputParameterfvNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetFinalCombinerInputParameterivNV) (GLenum,
-                                                                      GLenum,
-                                                                      GLint *);
-#define CALL_GetFinalCombinerInputParameterivNV(disp, parameters) \
-    (* GET_GetFinalCombinerInputParameterivNV(disp)) parameters
-static inline _glptr_GetFinalCombinerInputParameterivNV
-GET_GetFinalCombinerInputParameterivNV(struct _glapi_table *disp)
-{
-    return (_glptr_GetFinalCombinerInputParameterivNV) (GET_by_offset
-                                                        (disp,
-                                                         _gloffset_GetFinalCombinerInputParameterivNV));
-}
-
-static inline void
-SET_GetFinalCombinerInputParameterivNV(struct _glapi_table *disp,
-                                       void (GLAPIENTRYP fn) (GLenum, GLenum,
-                                                              GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetFinalCombinerInputParameterivNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ResizeBuffersMESA) (void);
-
-#define CALL_ResizeBuffersMESA(disp, parameters) \
-    (* GET_ResizeBuffersMESA(disp)) parameters
-static inline _glptr_ResizeBuffersMESA
-GET_ResizeBuffersMESA(struct _glapi_table *disp)
-{
-    return (_glptr_ResizeBuffersMESA) (GET_by_offset
-                                       (disp, _gloffset_ResizeBuffersMESA));
+typedef GLbitfield (GLAPIENTRYP _glptr_QueryMatrixxOES)(GLfixed *, GLint *);
+#define CALL_QueryMatrixxOES(disp, parameters) \
+    (* GET_QueryMatrixxOES(disp)) parameters
+static INLINE _glptr_QueryMatrixxOES GET_QueryMatrixxOES(struct _glapi_table *disp) {
+   return (_glptr_QueryMatrixxOES) (GET_by_offset(disp, _gloffset_QueryMatrixxOES));
 }
 
-static inline void
-SET_ResizeBuffersMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn) (void))
-{
-    SET_by_offset(disp, _gloffset_ResizeBuffersMESA, fn);
+static INLINE void SET_QueryMatrixxOES(struct _glapi_table *disp, GLbitfield (GLAPIENTRYP fn)(GLfixed *, GLint *)) {
+   SET_by_offset(disp, _gloffset_QueryMatrixxOES, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_WindowPos2dMESA) (GLdouble, GLdouble);
-
-#define CALL_WindowPos2dMESA(disp, parameters) \
-    (* GET_WindowPos2dMESA(disp)) parameters
-static inline _glptr_WindowPos2dMESA
-GET_WindowPos2dMESA(struct _glapi_table *disp)
-{
-    return (_glptr_WindowPos2dMESA) (GET_by_offset
-                                     (disp, _gloffset_WindowPos2dMESA));
+typedef void (GLAPIENTRYP _glptr_SampleMaskSGIS)(GLclampf, GLboolean);
+#define CALL_SampleMaskSGIS(disp, parameters) \
+    (* GET_SampleMaskSGIS(disp)) parameters
+static INLINE _glptr_SampleMaskSGIS GET_SampleMaskSGIS(struct _glapi_table *disp) {
+   return (_glptr_SampleMaskSGIS) (GET_by_offset(disp, _gloffset_SampleMaskSGIS));
 }
 
-static inline void
-SET_WindowPos2dMESA(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_WindowPos2dMESA, fn);
+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_WindowPos2dvMESA) (const GLdouble *);
-
-#define CALL_WindowPos2dvMESA(disp, parameters) \
-    (* GET_WindowPos2dvMESA(disp)) parameters
-static inline _glptr_WindowPos2dvMESA
-GET_WindowPos2dvMESA(struct _glapi_table *disp)
-{
-    return (_glptr_WindowPos2dvMESA) (GET_by_offset
-                                      (disp, _gloffset_WindowPos2dvMESA));
+typedef void (GLAPIENTRYP _glptr_SamplePatternSGIS)(GLenum);
+#define CALL_SamplePatternSGIS(disp, parameters) \
+    (* GET_SamplePatternSGIS(disp)) parameters
+static INLINE _glptr_SamplePatternSGIS GET_SamplePatternSGIS(struct _glapi_table *disp) {
+   return (_glptr_SamplePatternSGIS) (GET_by_offset(disp, _gloffset_SamplePatternSGIS));
 }
 
-static inline void
-SET_WindowPos2dvMESA(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_WindowPos2dvMESA, fn);
+static INLINE void SET_SamplePatternSGIS(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) {
+   SET_by_offset(disp, _gloffset_SamplePatternSGIS, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_WindowPos2fMESA) (GLfloat, GLfloat);
-
-#define CALL_WindowPos2fMESA(disp, parameters) \
-    (* GET_WindowPos2fMESA(disp)) parameters
-static inline _glptr_WindowPos2fMESA
-GET_WindowPos2fMESA(struct _glapi_table *disp)
-{
-    return (_glptr_WindowPos2fMESA) (GET_by_offset
-                                     (disp, _gloffset_WindowPos2fMESA));
+typedef void (GLAPIENTRYP _glptr_ColorPointerEXT)(GLint, GLenum, GLsizei, GLsizei, const GLvoid *);
+#define CALL_ColorPointerEXT(disp, parameters) \
+    (* GET_ColorPointerEXT(disp)) parameters
+static INLINE _glptr_ColorPointerEXT GET_ColorPointerEXT(struct _glapi_table *disp) {
+   return (_glptr_ColorPointerEXT) (GET_by_offset(disp, _gloffset_ColorPointerEXT));
 }
 
-static inline void
-SET_WindowPos2fMESA(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_WindowPos2fMESA, fn);
+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_WindowPos2fvMESA) (const GLfloat *);
-
-#define CALL_WindowPos2fvMESA(disp, parameters) \
-    (* GET_WindowPos2fvMESA(disp)) parameters
-static inline _glptr_WindowPos2fvMESA
-GET_WindowPos2fvMESA(struct _glapi_table *disp)
-{
-    return (_glptr_WindowPos2fvMESA) (GET_by_offset
-                                      (disp, _gloffset_WindowPos2fvMESA));
+typedef void (GLAPIENTRYP _glptr_EdgeFlagPointerEXT)(GLsizei, GLsizei, const GLboolean *);
+#define CALL_EdgeFlagPointerEXT(disp, parameters) \
+    (* GET_EdgeFlagPointerEXT(disp)) parameters
+static INLINE _glptr_EdgeFlagPointerEXT GET_EdgeFlagPointerEXT(struct _glapi_table *disp) {
+   return (_glptr_EdgeFlagPointerEXT) (GET_by_offset(disp, _gloffset_EdgeFlagPointerEXT));
 }
 
-static inline void
-SET_WindowPos2fvMESA(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_WindowPos2fvMESA, fn);
+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_WindowPos2iMESA) (GLint, GLint);
-
-#define CALL_WindowPos2iMESA(disp, parameters) \
-    (* GET_WindowPos2iMESA(disp)) parameters
-static inline _glptr_WindowPos2iMESA
-GET_WindowPos2iMESA(struct _glapi_table *disp)
-{
-    return (_glptr_WindowPos2iMESA) (GET_by_offset
-                                     (disp, _gloffset_WindowPos2iMESA));
+typedef void (GLAPIENTRYP _glptr_IndexPointerEXT)(GLenum, GLsizei, GLsizei, const GLvoid *);
+#define CALL_IndexPointerEXT(disp, parameters) \
+    (* GET_IndexPointerEXT(disp)) parameters
+static INLINE _glptr_IndexPointerEXT GET_IndexPointerEXT(struct _glapi_table *disp) {
+   return (_glptr_IndexPointerEXT) (GET_by_offset(disp, _gloffset_IndexPointerEXT));
 }
 
-static inline void
-SET_WindowPos2iMESA(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_WindowPos2iMESA, fn);
+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_WindowPos2ivMESA) (const GLint *);
-
-#define CALL_WindowPos2ivMESA(disp, parameters) \
-    (* GET_WindowPos2ivMESA(disp)) parameters
-static inline _glptr_WindowPos2ivMESA
-GET_WindowPos2ivMESA(struct _glapi_table *disp)
-{
-    return (_glptr_WindowPos2ivMESA) (GET_by_offset
-                                      (disp, _gloffset_WindowPos2ivMESA));
+typedef void (GLAPIENTRYP _glptr_NormalPointerEXT)(GLenum, GLsizei, GLsizei, const GLvoid *);
+#define CALL_NormalPointerEXT(disp, parameters) \
+    (* GET_NormalPointerEXT(disp)) parameters
+static INLINE _glptr_NormalPointerEXT GET_NormalPointerEXT(struct _glapi_table *disp) {
+   return (_glptr_NormalPointerEXT) (GET_by_offset(disp, _gloffset_NormalPointerEXT));
 }
 
-static inline void
-SET_WindowPos2ivMESA(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (const GLint *))
-{
-    SET_by_offset(disp, _gloffset_WindowPos2ivMESA, fn);
+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_WindowPos2sMESA) (GLshort, GLshort);
-
-#define CALL_WindowPos2sMESA(disp, parameters) \
-    (* GET_WindowPos2sMESA(disp)) parameters
-static inline _glptr_WindowPos2sMESA
-GET_WindowPos2sMESA(struct _glapi_table *disp)
-{
-    return (_glptr_WindowPos2sMESA) (GET_by_offset
-                                     (disp, _gloffset_WindowPos2sMESA));
+typedef void (GLAPIENTRYP _glptr_TexCoordPointerEXT)(GLint, GLenum, GLsizei, GLsizei, const GLvoid *);
+#define CALL_TexCoordPointerEXT(disp, parameters) \
+    (* GET_TexCoordPointerEXT(disp)) parameters
+static INLINE _glptr_TexCoordPointerEXT GET_TexCoordPointerEXT(struct _glapi_table *disp) {
+   return (_glptr_TexCoordPointerEXT) (GET_by_offset(disp, _gloffset_TexCoordPointerEXT));
 }
 
-static inline void
-SET_WindowPos2sMESA(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLshort, GLshort))
-{
-    SET_by_offset(disp, _gloffset_WindowPos2sMESA, fn);
+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_WindowPos2svMESA) (const GLshort *);
-
-#define CALL_WindowPos2svMESA(disp, parameters) \
-    (* GET_WindowPos2svMESA(disp)) parameters
-static inline _glptr_WindowPos2svMESA
-GET_WindowPos2svMESA(struct _glapi_table *disp)
-{
-    return (_glptr_WindowPos2svMESA) (GET_by_offset
-                                      (disp, _gloffset_WindowPos2svMESA));
+typedef void (GLAPIENTRYP _glptr_VertexPointerEXT)(GLint, GLenum, GLsizei, GLsizei, const GLvoid *);
+#define CALL_VertexPointerEXT(disp, parameters) \
+    (* GET_VertexPointerEXT(disp)) parameters
+static INLINE _glptr_VertexPointerEXT GET_VertexPointerEXT(struct _glapi_table *disp) {
+   return (_glptr_VertexPointerEXT) (GET_by_offset(disp, _gloffset_VertexPointerEXT));
 }
 
-static inline void
-SET_WindowPos2svMESA(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_WindowPos2svMESA, fn);
+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_WindowPos3dMESA) (GLdouble, GLdouble,
-                                                   GLdouble);
-#define CALL_WindowPos3dMESA(disp, parameters) \
-    (* GET_WindowPos3dMESA(disp)) parameters
-static inline _glptr_WindowPos3dMESA
-GET_WindowPos3dMESA(struct _glapi_table *disp)
-{
-    return (_glptr_WindowPos3dMESA) (GET_by_offset
-                                     (disp, _gloffset_WindowPos3dMESA));
+typedef void (GLAPIENTRYP _glptr_LockArraysEXT)(GLint, GLsizei);
+#define CALL_LockArraysEXT(disp, parameters) \
+    (* GET_LockArraysEXT(disp)) parameters
+static INLINE _glptr_LockArraysEXT GET_LockArraysEXT(struct _glapi_table *disp) {
+   return (_glptr_LockArraysEXT) (GET_by_offset(disp, _gloffset_LockArraysEXT));
 }
 
-static inline void
-SET_WindowPos3dMESA(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLdouble, GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_WindowPos3dMESA, fn);
+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_WindowPos3dvMESA) (const GLdouble *);
-
-#define CALL_WindowPos3dvMESA(disp, parameters) \
-    (* GET_WindowPos3dvMESA(disp)) parameters
-static inline _glptr_WindowPos3dvMESA
-GET_WindowPos3dvMESA(struct _glapi_table *disp)
-{
-    return (_glptr_WindowPos3dvMESA) (GET_by_offset
-                                      (disp, _gloffset_WindowPos3dvMESA));
+typedef void (GLAPIENTRYP _glptr_UnlockArraysEXT)(void);
+#define CALL_UnlockArraysEXT(disp, parameters) \
+    (* GET_UnlockArraysEXT(disp)) parameters
+static INLINE _glptr_UnlockArraysEXT GET_UnlockArraysEXT(struct _glapi_table *disp) {
+   return (_glptr_UnlockArraysEXT) (GET_by_offset(disp, _gloffset_UnlockArraysEXT));
 }
 
-static inline void
-SET_WindowPos3dvMESA(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_WindowPos3dvMESA, fn);
+static INLINE void SET_UnlockArraysEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) {
+   SET_by_offset(disp, _gloffset_UnlockArraysEXT, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_WindowPos3fMESA) (GLfloat, GLfloat, GLfloat);
-
-#define CALL_WindowPos3fMESA(disp, parameters) \
-    (* GET_WindowPos3fMESA(disp)) parameters
-static inline _glptr_WindowPos3fMESA
-GET_WindowPos3fMESA(struct _glapi_table *disp)
-{
-    return (_glptr_WindowPos3fMESA) (GET_by_offset
-                                     (disp, _gloffset_WindowPos3fMESA));
+typedef void (GLAPIENTRYP _glptr_SecondaryColor3fEXT)(GLfloat, GLfloat, GLfloat);
+#define CALL_SecondaryColor3fEXT(disp, parameters) \
+    (* GET_SecondaryColor3fEXT(disp)) parameters
+static INLINE _glptr_SecondaryColor3fEXT GET_SecondaryColor3fEXT(struct _glapi_table *disp) {
+   return (_glptr_SecondaryColor3fEXT) (GET_by_offset(disp, _gloffset_SecondaryColor3fEXT));
 }
 
-static inline void
-SET_WindowPos3fMESA(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLfloat, GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_WindowPos3fMESA, fn);
+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_WindowPos3fvMESA) (const GLfloat *);
-
-#define CALL_WindowPos3fvMESA(disp, parameters) \
-    (* GET_WindowPos3fvMESA(disp)) parameters
-static inline _glptr_WindowPos3fvMESA
-GET_WindowPos3fvMESA(struct _glapi_table *disp)
-{
-    return (_glptr_WindowPos3fvMESA) (GET_by_offset
-                                      (disp, _gloffset_WindowPos3fvMESA));
+typedef void (GLAPIENTRYP _glptr_SecondaryColor3fvEXT)(const GLfloat *);
+#define CALL_SecondaryColor3fvEXT(disp, parameters) \
+    (* GET_SecondaryColor3fvEXT(disp)) parameters
+static INLINE _glptr_SecondaryColor3fvEXT GET_SecondaryColor3fvEXT(struct _glapi_table *disp) {
+   return (_glptr_SecondaryColor3fvEXT) (GET_by_offset(disp, _gloffset_SecondaryColor3fvEXT));
 }
 
-static inline void
-SET_WindowPos3fvMESA(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_WindowPos3fvMESA, fn);
+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_WindowPos3iMESA) (GLint, GLint, GLint);
-
-#define CALL_WindowPos3iMESA(disp, parameters) \
-    (* GET_WindowPos3iMESA(disp)) parameters
-static inline _glptr_WindowPos3iMESA
-GET_WindowPos3iMESA(struct _glapi_table *disp)
-{
-    return (_glptr_WindowPos3iMESA) (GET_by_offset
-                                     (disp, _gloffset_WindowPos3iMESA));
+typedef void (GLAPIENTRYP _glptr_MultiDrawElementsEXT)(GLenum, const GLsizei *, GLenum, const GLvoid **, GLsizei);
+#define CALL_MultiDrawElementsEXT(disp, parameters) \
+    (* GET_MultiDrawElementsEXT(disp)) parameters
+static INLINE _glptr_MultiDrawElementsEXT GET_MultiDrawElementsEXT(struct _glapi_table *disp) {
+   return (_glptr_MultiDrawElementsEXT) (GET_by_offset(disp, _gloffset_MultiDrawElementsEXT));
 }
 
-static inline void
-SET_WindowPos3iMESA(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLint, GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_WindowPos3iMESA, fn);
+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_WindowPos3ivMESA) (const GLint *);
-
-#define CALL_WindowPos3ivMESA(disp, parameters) \
-    (* GET_WindowPos3ivMESA(disp)) parameters
-static inline _glptr_WindowPos3ivMESA
-GET_WindowPos3ivMESA(struct _glapi_table *disp)
-{
-    return (_glptr_WindowPos3ivMESA) (GET_by_offset
-                                      (disp, _gloffset_WindowPos3ivMESA));
+typedef void (GLAPIENTRYP _glptr_FogCoordfEXT)(GLfloat);
+#define CALL_FogCoordfEXT(disp, parameters) \
+    (* GET_FogCoordfEXT(disp)) parameters
+static INLINE _glptr_FogCoordfEXT GET_FogCoordfEXT(struct _glapi_table *disp) {
+   return (_glptr_FogCoordfEXT) (GET_by_offset(disp, _gloffset_FogCoordfEXT));
 }
 
-static inline void
-SET_WindowPos3ivMESA(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (const GLint *))
-{
-    SET_by_offset(disp, _gloffset_WindowPos3ivMESA, fn);
+static INLINE void SET_FogCoordfEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat)) {
+   SET_by_offset(disp, _gloffset_FogCoordfEXT, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_WindowPos3sMESA) (GLshort, GLshort, GLshort);
-
-#define CALL_WindowPos3sMESA(disp, parameters) \
-    (* GET_WindowPos3sMESA(disp)) parameters
-static inline _glptr_WindowPos3sMESA
-GET_WindowPos3sMESA(struct _glapi_table *disp)
-{
-    return (_glptr_WindowPos3sMESA) (GET_by_offset
-                                     (disp, _gloffset_WindowPos3sMESA));
+typedef void (GLAPIENTRYP _glptr_FogCoordfvEXT)(const GLfloat *);
+#define CALL_FogCoordfvEXT(disp, parameters) \
+    (* GET_FogCoordfvEXT(disp)) parameters
+static INLINE _glptr_FogCoordfvEXT GET_FogCoordfvEXT(struct _glapi_table *disp) {
+   return (_glptr_FogCoordfvEXT) (GET_by_offset(disp, _gloffset_FogCoordfvEXT));
 }
 
-static inline void
-SET_WindowPos3sMESA(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLshort, GLshort, GLshort))
-{
-    SET_by_offset(disp, _gloffset_WindowPos3sMESA, fn);
+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_WindowPos3svMESA) (const GLshort *);
-
-#define CALL_WindowPos3svMESA(disp, parameters) \
-    (* GET_WindowPos3svMESA(disp)) parameters
-static inline _glptr_WindowPos3svMESA
-GET_WindowPos3svMESA(struct _glapi_table *disp)
-{
-    return (_glptr_WindowPos3svMESA) (GET_by_offset
-                                      (disp, _gloffset_WindowPos3svMESA));
+typedef void (GLAPIENTRYP _glptr_ResizeBuffersMESA)(void);
+#define CALL_ResizeBuffersMESA(disp, parameters) \
+    (* GET_ResizeBuffersMESA(disp)) parameters
+static INLINE _glptr_ResizeBuffersMESA GET_ResizeBuffersMESA(struct _glapi_table *disp) {
+   return (_glptr_ResizeBuffersMESA) (GET_by_offset(disp, _gloffset_ResizeBuffersMESA));
 }
 
-static inline void
-SET_WindowPos3svMESA(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_WindowPos3svMESA, fn);
+static INLINE void SET_ResizeBuffersMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) {
+   SET_by_offset(disp, _gloffset_ResizeBuffersMESA, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_WindowPos4dMESA) (GLdouble, GLdouble, GLdouble,
-                                                   GLdouble);
+typedef void (GLAPIENTRYP _glptr_WindowPos4dMESA)(GLdouble, GLdouble, GLdouble, GLdouble);
 #define CALL_WindowPos4dMESA(disp, parameters) \
     (* GET_WindowPos4dMESA(disp)) parameters
-static inline _glptr_WindowPos4dMESA
-GET_WindowPos4dMESA(struct _glapi_table *disp)
-{
-    return (_glptr_WindowPos4dMESA) (GET_by_offset
-                                     (disp, _gloffset_WindowPos4dMESA));
+static INLINE _glptr_WindowPos4dMESA GET_WindowPos4dMESA(struct _glapi_table *disp) {
+   return (_glptr_WindowPos4dMESA) (GET_by_offset(disp, _gloffset_WindowPos4dMESA));
 }
 
-static inline void
-SET_WindowPos4dMESA(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLdouble, GLdouble, GLdouble,
-                                           GLdouble))
-{
-    SET_by_offset(disp, _gloffset_WindowPos4dMESA, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_WindowPos4dvMESA)(const GLdouble *);
 #define CALL_WindowPos4dvMESA(disp, parameters) \
     (* GET_WindowPos4dvMESA(disp)) parameters
-static inline _glptr_WindowPos4dvMESA
-GET_WindowPos4dvMESA(struct _glapi_table *disp)
-{
-    return (_glptr_WindowPos4dvMESA) (GET_by_offset
-                                      (disp, _gloffset_WindowPos4dvMESA));
+static INLINE _glptr_WindowPos4dvMESA GET_WindowPos4dvMESA(struct _glapi_table *disp) {
+   return (_glptr_WindowPos4dvMESA) (GET_by_offset(disp, _gloffset_WindowPos4dvMESA));
 }
 
-static inline void
-SET_WindowPos4dvMESA(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_WindowPos4dvMESA, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_WindowPos4fMESA)(GLfloat, GLfloat, GLfloat, GLfloat);
 #define CALL_WindowPos4fMESA(disp, parameters) \
     (* GET_WindowPos4fMESA(disp)) parameters
-static inline _glptr_WindowPos4fMESA
-GET_WindowPos4fMESA(struct _glapi_table *disp)
-{
-    return (_glptr_WindowPos4fMESA) (GET_by_offset
-                                     (disp, _gloffset_WindowPos4fMESA));
+static INLINE _glptr_WindowPos4fMESA GET_WindowPos4fMESA(struct _glapi_table *disp) {
+   return (_glptr_WindowPos4fMESA) (GET_by_offset(disp, _gloffset_WindowPos4fMESA));
 }
 
-static inline void
-SET_WindowPos4fMESA(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLfloat, GLfloat, GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_WindowPos4fMESA, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_WindowPos4fvMESA)(const GLfloat *);
 #define CALL_WindowPos4fvMESA(disp, parameters) \
     (* GET_WindowPos4fvMESA(disp)) parameters
-static inline _glptr_WindowPos4fvMESA
-GET_WindowPos4fvMESA(struct _glapi_table *disp)
-{
-    return (_glptr_WindowPos4fvMESA) (GET_by_offset
-                                      (disp, _gloffset_WindowPos4fvMESA));
+static INLINE _glptr_WindowPos4fvMESA GET_WindowPos4fvMESA(struct _glapi_table *disp) {
+   return (_glptr_WindowPos4fvMESA) (GET_by_offset(disp, _gloffset_WindowPos4fvMESA));
 }
 
-static inline void
-SET_WindowPos4fvMESA(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_WindowPos4fvMESA, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_WindowPos4iMESA)(GLint, GLint, GLint, GLint);
 #define CALL_WindowPos4iMESA(disp, parameters) \
     (* GET_WindowPos4iMESA(disp)) parameters
-static inline _glptr_WindowPos4iMESA
-GET_WindowPos4iMESA(struct _glapi_table *disp)
-{
-    return (_glptr_WindowPos4iMESA) (GET_by_offset
-                                     (disp, _gloffset_WindowPos4iMESA));
+static INLINE _glptr_WindowPos4iMESA GET_WindowPos4iMESA(struct _glapi_table *disp) {
+   return (_glptr_WindowPos4iMESA) (GET_by_offset(disp, _gloffset_WindowPos4iMESA));
 }
 
-static inline void
-SET_WindowPos4iMESA(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLint, GLint, GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_WindowPos4iMESA, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_WindowPos4ivMESA)(const GLint *);
 #define CALL_WindowPos4ivMESA(disp, parameters) \
     (* GET_WindowPos4ivMESA(disp)) parameters
-static inline _glptr_WindowPos4ivMESA
-GET_WindowPos4ivMESA(struct _glapi_table *disp)
-{
-    return (_glptr_WindowPos4ivMESA) (GET_by_offset
-                                      (disp, _gloffset_WindowPos4ivMESA));
+static INLINE _glptr_WindowPos4ivMESA GET_WindowPos4ivMESA(struct _glapi_table *disp) {
+   return (_glptr_WindowPos4ivMESA) (GET_by_offset(disp, _gloffset_WindowPos4ivMESA));
 }
 
-static inline void
-SET_WindowPos4ivMESA(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (const GLint *))
-{
-    SET_by_offset(disp, _gloffset_WindowPos4ivMESA, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_WindowPos4sMESA)(GLshort, GLshort, GLshort, GLshort);
 #define CALL_WindowPos4sMESA(disp, parameters) \
     (* GET_WindowPos4sMESA(disp)) parameters
-static inline _glptr_WindowPos4sMESA
-GET_WindowPos4sMESA(struct _glapi_table *disp)
-{
-    return (_glptr_WindowPos4sMESA) (GET_by_offset
-                                     (disp, _gloffset_WindowPos4sMESA));
+static INLINE _glptr_WindowPos4sMESA GET_WindowPos4sMESA(struct _glapi_table *disp) {
+   return (_glptr_WindowPos4sMESA) (GET_by_offset(disp, _gloffset_WindowPos4sMESA));
 }
 
-static inline void
-SET_WindowPos4sMESA(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLshort, GLshort, GLshort, GLshort))
-{
-    SET_by_offset(disp, _gloffset_WindowPos4sMESA, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_WindowPos4svMESA)(const GLshort *);
 #define CALL_WindowPos4svMESA(disp, parameters) \
     (* GET_WindowPos4svMESA(disp)) parameters
-static inline _glptr_WindowPos4svMESA
-GET_WindowPos4svMESA(struct _glapi_table *disp)
-{
-    return (_glptr_WindowPos4svMESA) (GET_by_offset
-                                      (disp, _gloffset_WindowPos4svMESA));
+static INLINE _glptr_WindowPos4svMESA GET_WindowPos4svMESA(struct _glapi_table *disp) {
+   return (_glptr_WindowPos4svMESA) (GET_by_offset(disp, _gloffset_WindowPos4svMESA));
 }
 
-static inline void
-SET_WindowPos4svMESA(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_WindowPos4svMESA, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_MultiModeDrawArraysIBM)(const GLenum *, const GLint *, const GLsizei *, GLsizei, GLint);
 #define CALL_MultiModeDrawArraysIBM(disp, parameters) \
     (* GET_MultiModeDrawArraysIBM(disp)) parameters
-static inline _glptr_MultiModeDrawArraysIBM
-GET_MultiModeDrawArraysIBM(struct _glapi_table *disp)
-{
-    return (_glptr_MultiModeDrawArraysIBM) (GET_by_offset
-                                            (disp,
-                                             _gloffset_MultiModeDrawArraysIBM));
-}
-
-static inline void
-SET_MultiModeDrawArraysIBM(struct _glapi_table *disp,
-                           void (GLAPIENTRYP fn) (const GLenum *, const GLint *,
-                                                  const GLsizei *, GLsizei,
-                                                  GLint))
-{
-    SET_by_offset(disp, _gloffset_MultiModeDrawArraysIBM, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_MultiModeDrawElementsIBM) (const GLenum *,
-                                                            const GLsizei *,
-                                                            GLenum,
-                                                            const GLvoid *
-                                                            const *, GLsizei,
-                                                            GLint);
-#define CALL_MultiModeDrawElementsIBM(disp, parameters) \
-    (* GET_MultiModeDrawElementsIBM(disp)) parameters
-static inline _glptr_MultiModeDrawElementsIBM
-GET_MultiModeDrawElementsIBM(struct _glapi_table *disp)
-{
-    return (_glptr_MultiModeDrawElementsIBM) (GET_by_offset
-                                              (disp,
-                                               _gloffset_MultiModeDrawElementsIBM));
-}
-
-static inline void
-SET_MultiModeDrawElementsIBM(struct _glapi_table *disp,
-                             void (GLAPIENTRYP fn) (const GLenum *,
-                                                    const GLsizei *, GLenum,
-                                                    const GLvoid * const *,
-                                                    GLsizei, GLint))
-{
-    SET_by_offset(disp, _gloffset_MultiModeDrawElementsIBM, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_DeleteFencesNV) (GLsizei, const GLuint *);
-
-#define CALL_DeleteFencesNV(disp, parameters) \
-    (* GET_DeleteFencesNV(disp)) parameters
-static inline _glptr_DeleteFencesNV
-GET_DeleteFencesNV(struct _glapi_table *disp)
-{
-    return (_glptr_DeleteFencesNV) (GET_by_offset
-                                    (disp, _gloffset_DeleteFencesNV));
-}
-
-static inline void
-SET_DeleteFencesNV(struct _glapi_table *disp,
-                   void (GLAPIENTRYP fn) (GLsizei, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_DeleteFencesNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_FinishFenceNV) (GLuint);
-
-#define CALL_FinishFenceNV(disp, parameters) \
-    (* GET_FinishFenceNV(disp)) parameters
-static inline _glptr_FinishFenceNV
-GET_FinishFenceNV(struct _glapi_table *disp)
-{
-    return (_glptr_FinishFenceNV) (GET_by_offset
-                                   (disp, _gloffset_FinishFenceNV));
-}
-
-static inline void
-SET_FinishFenceNV(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_FinishFenceNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GenFencesNV) (GLsizei, GLuint *);
-
-#define CALL_GenFencesNV(disp, parameters) \
-    (* GET_GenFencesNV(disp)) parameters
-static inline _glptr_GenFencesNV
-GET_GenFencesNV(struct _glapi_table *disp)
-{
-    return (_glptr_GenFencesNV) (GET_by_offset(disp, _gloffset_GenFencesNV));
-}
-
-static inline void
-SET_GenFencesNV(struct _glapi_table *disp,
-                void (GLAPIENTRYP fn) (GLsizei, GLuint *))
-{
-    SET_by_offset(disp, _gloffset_GenFencesNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetFenceivNV) (GLuint, GLenum, GLint *);
-
-#define CALL_GetFenceivNV(disp, parameters) \
-    (* GET_GetFenceivNV(disp)) parameters
-static inline _glptr_GetFenceivNV
-GET_GetFenceivNV(struct _glapi_table *disp)
-{
-    return (_glptr_GetFenceivNV) (GET_by_offset(disp, _gloffset_GetFenceivNV));
-}
-
-static inline void
-SET_GetFenceivNV(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLuint, GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetFenceivNV, fn);
-}
-
-typedef GLboolean(GLAPIENTRYP _glptr_IsFenceNV) (GLuint);
-
-#define CALL_IsFenceNV(disp, parameters) \
-    (* GET_IsFenceNV(disp)) parameters
-static inline _glptr_IsFenceNV
-GET_IsFenceNV(struct _glapi_table *disp)
-{
-    return (_glptr_IsFenceNV) (GET_by_offset(disp, _gloffset_IsFenceNV));
-}
-
-static inline void
-SET_IsFenceNV(struct _glapi_table *disp, GLboolean(GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_IsFenceNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_SetFenceNV) (GLuint, GLenum);
-
-#define CALL_SetFenceNV(disp, parameters) \
-    (* GET_SetFenceNV(disp)) parameters
-static inline _glptr_SetFenceNV
-GET_SetFenceNV(struct _glapi_table *disp)
-{
-    return (_glptr_SetFenceNV) (GET_by_offset(disp, _gloffset_SetFenceNV));
+static INLINE _glptr_MultiModeDrawArraysIBM GET_MultiModeDrawArraysIBM(struct _glapi_table *disp) {
+   return (_glptr_MultiModeDrawArraysIBM) (GET_by_offset(disp, _gloffset_MultiModeDrawArraysIBM));
 }
 
-static inline void
-SET_SetFenceNV(struct _glapi_table *disp,
-               void (GLAPIENTRYP fn) (GLuint, GLenum))
-{
-    SET_by_offset(disp, _gloffset_SetFenceNV, fn);
+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 GLboolean(GLAPIENTRYP _glptr_TestFenceNV) (GLuint);
-
-#define CALL_TestFenceNV(disp, parameters) \
-    (* GET_TestFenceNV(disp)) parameters
-static inline _glptr_TestFenceNV
-GET_TestFenceNV(struct _glapi_table *disp)
-{
-    return (_glptr_TestFenceNV) (GET_by_offset(disp, _gloffset_TestFenceNV));
+typedef void (GLAPIENTRYP _glptr_MultiModeDrawElementsIBM)(const GLenum *, const GLsizei *, GLenum, const GLvoid * const *, GLsizei, GLint);
+#define CALL_MultiModeDrawElementsIBM(disp, parameters) \
+    (* GET_MultiModeDrawElementsIBM(disp)) parameters
+static INLINE _glptr_MultiModeDrawElementsIBM GET_MultiModeDrawElementsIBM(struct _glapi_table *disp) {
+   return (_glptr_MultiModeDrawElementsIBM) (GET_by_offset(disp, _gloffset_MultiModeDrawElementsIBM));
 }
 
-static inline void
-SET_TestFenceNV(struct _glapi_table *disp, GLboolean(GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_TestFenceNV, fn);
+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 GLboolean(GLAPIENTRYP _glptr_AreProgramsResidentNV) (GLsizei,
-                                                             const GLuint *,
-                                                             GLboolean *);
+typedef GLboolean (GLAPIENTRYP _glptr_AreProgramsResidentNV)(GLsizei, const GLuint *, GLboolean *);
 #define CALL_AreProgramsResidentNV(disp, parameters) \
     (* GET_AreProgramsResidentNV(disp)) parameters
-static inline _glptr_AreProgramsResidentNV
-GET_AreProgramsResidentNV(struct _glapi_table *disp)
-{
-    return (_glptr_AreProgramsResidentNV) (GET_by_offset
-                                           (disp,
-                                            _gloffset_AreProgramsResidentNV));
-}
-
-static inline void
-SET_AreProgramsResidentNV(struct _glapi_table *disp,
-                          GLboolean(GLAPIENTRYP fn) (GLsizei, const GLuint *,
-                                                     GLboolean *))
-{
-    SET_by_offset(disp, _gloffset_AreProgramsResidentNV, fn);
+static INLINE _glptr_AreProgramsResidentNV GET_AreProgramsResidentNV(struct _glapi_table *disp) {
+   return (_glptr_AreProgramsResidentNV) (GET_by_offset(disp, _gloffset_AreProgramsResidentNV));
 }
 
-typedef void (GLAPIENTRYP _glptr_BindProgramNV) (GLenum, GLuint);
-
-#define CALL_BindProgramNV(disp, parameters) \
-    (* GET_BindProgramNV(disp)) parameters
-static inline _glptr_BindProgramNV
-GET_BindProgramNV(struct _glapi_table *disp)
-{
-    return (_glptr_BindProgramNV) (GET_by_offset
-                                   (disp, _gloffset_BindProgramNV));
-}
-
-static inline void
-SET_BindProgramNV(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_BindProgramNV, fn);
+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_DeleteProgramsNV) (GLsizei, const GLuint *);
-
-#define CALL_DeleteProgramsNV(disp, parameters) \
-    (* GET_DeleteProgramsNV(disp)) parameters
-static inline _glptr_DeleteProgramsNV
-GET_DeleteProgramsNV(struct _glapi_table *disp)
-{
-    return (_glptr_DeleteProgramsNV) (GET_by_offset
-                                      (disp, _gloffset_DeleteProgramsNV));
-}
-
-static inline void
-SET_DeleteProgramsNV(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLsizei, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_DeleteProgramsNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ExecuteProgramNV) (GLenum, GLuint,
-                                                    const GLfloat *);
+typedef void (GLAPIENTRYP _glptr_ExecuteProgramNV)(GLenum, GLuint, const GLfloat *);
 #define CALL_ExecuteProgramNV(disp, parameters) \
     (* GET_ExecuteProgramNV(disp)) parameters
-static inline _glptr_ExecuteProgramNV
-GET_ExecuteProgramNV(struct _glapi_table *disp)
-{
-    return (_glptr_ExecuteProgramNV) (GET_by_offset
-                                      (disp, _gloffset_ExecuteProgramNV));
-}
-
-static inline void
-SET_ExecuteProgramNV(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLenum, GLuint, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_ExecuteProgramNV, fn);
+static INLINE _glptr_ExecuteProgramNV GET_ExecuteProgramNV(struct _glapi_table *disp) {
+   return (_glptr_ExecuteProgramNV) (GET_by_offset(disp, _gloffset_ExecuteProgramNV));
 }
 
-typedef void (GLAPIENTRYP _glptr_GenProgramsNV) (GLsizei, GLuint *);
-
-#define CALL_GenProgramsNV(disp, parameters) \
-    (* GET_GenProgramsNV(disp)) parameters
-static inline _glptr_GenProgramsNV
-GET_GenProgramsNV(struct _glapi_table *disp)
-{
-    return (_glptr_GenProgramsNV) (GET_by_offset
-                                   (disp, _gloffset_GenProgramsNV));
+static INLINE void SET_ExecuteProgramNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, const GLfloat *)) {
+   SET_by_offset(disp, _gloffset_ExecuteProgramNV, fn);
 }
 
-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 *);
+typedef void (GLAPIENTRYP _glptr_GetProgramParameterdvNV)(GLenum, GLuint, GLenum, GLdouble *);
 #define CALL_GetProgramParameterdvNV(disp, parameters) \
     (* GET_GetProgramParameterdvNV(disp)) parameters
-static inline _glptr_GetProgramParameterdvNV
-GET_GetProgramParameterdvNV(struct _glapi_table *disp)
-{
-    return (_glptr_GetProgramParameterdvNV) (GET_by_offset
-                                             (disp,
-                                              _gloffset_GetProgramParameterdvNV));
+static INLINE _glptr_GetProgramParameterdvNV GET_GetProgramParameterdvNV(struct _glapi_table *disp) {
+   return (_glptr_GetProgramParameterdvNV) (GET_by_offset(disp, _gloffset_GetProgramParameterdvNV));
 }
 
-static inline void
-SET_GetProgramParameterdvNV(struct _glapi_table *disp,
-                            void (GLAPIENTRYP fn) (GLenum, GLuint, GLenum,
-                                                   GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_GetProgramParameterdvNV, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_GetProgramParameterfvNV)(GLenum, GLuint, GLenum, GLfloat *);
 #define CALL_GetProgramParameterfvNV(disp, parameters) \
     (* GET_GetProgramParameterfvNV(disp)) parameters
-static inline _glptr_GetProgramParameterfvNV
-GET_GetProgramParameterfvNV(struct _glapi_table *disp)
-{
-    return (_glptr_GetProgramParameterfvNV) (GET_by_offset
-                                             (disp,
-                                              _gloffset_GetProgramParameterfvNV));
+static INLINE _glptr_GetProgramParameterfvNV GET_GetProgramParameterfvNV(struct _glapi_table *disp) {
+   return (_glptr_GetProgramParameterfvNV) (GET_by_offset(disp, _gloffset_GetProgramParameterfvNV));
 }
 
-static inline void
-SET_GetProgramParameterfvNV(struct _glapi_table *disp,
-                            void (GLAPIENTRYP fn) (GLenum, GLuint, GLenum,
-                                                   GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetProgramParameterfvNV, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_GetProgramStringNV)(GLuint, GLenum, GLubyte *);
 #define CALL_GetProgramStringNV(disp, parameters) \
     (* GET_GetProgramStringNV(disp)) parameters
-static inline _glptr_GetProgramStringNV
-GET_GetProgramStringNV(struct _glapi_table *disp)
-{
-    return (_glptr_GetProgramStringNV) (GET_by_offset
-                                        (disp, _gloffset_GetProgramStringNV));
+static INLINE _glptr_GetProgramStringNV GET_GetProgramStringNV(struct _glapi_table *disp) {
+   return (_glptr_GetProgramStringNV) (GET_by_offset(disp, _gloffset_GetProgramStringNV));
 }
 
-static inline void
-SET_GetProgramStringNV(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, GLenum, GLubyte *))
-{
-    SET_by_offset(disp, _gloffset_GetProgramStringNV, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_GetProgramivNV)(GLuint, GLenum, GLint *);
 #define CALL_GetProgramivNV(disp, parameters) \
     (* GET_GetProgramivNV(disp)) parameters
-static inline _glptr_GetProgramivNV
-GET_GetProgramivNV(struct _glapi_table *disp)
-{
-    return (_glptr_GetProgramivNV) (GET_by_offset
-                                    (disp, _gloffset_GetProgramivNV));
+static INLINE _glptr_GetProgramivNV GET_GetProgramivNV(struct _glapi_table *disp) {
+   return (_glptr_GetProgramivNV) (GET_by_offset(disp, _gloffset_GetProgramivNV));
 }
 
-static inline void
-SET_GetProgramivNV(struct _glapi_table *disp,
-                   void (GLAPIENTRYP fn) (GLuint, GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetProgramivNV, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_GetTrackMatrixivNV)(GLenum, GLuint, GLenum, GLint *);
 #define CALL_GetTrackMatrixivNV(disp, parameters) \
     (* GET_GetTrackMatrixivNV(disp)) parameters
-static inline _glptr_GetTrackMatrixivNV
-GET_GetTrackMatrixivNV(struct _glapi_table *disp)
-{
-    return (_glptr_GetTrackMatrixivNV) (GET_by_offset
-                                        (disp, _gloffset_GetTrackMatrixivNV));
+static INLINE _glptr_GetTrackMatrixivNV GET_GetTrackMatrixivNV(struct _glapi_table *disp) {
+   return (_glptr_GetTrackMatrixivNV) (GET_by_offset(disp, _gloffset_GetTrackMatrixivNV));
 }
 
-static inline void
-SET_GetTrackMatrixivNV(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, GLuint, GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetTrackMatrixivNV, fn);
+static INLINE void SET_GetTrackMatrixivNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLenum, GLint *)) {
+   SET_by_offset(disp, _gloffset_GetTrackMatrixivNV, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_GetVertexAttribPointervNV) (GLuint, GLenum,
-                                                             GLvoid **);
-#define CALL_GetVertexAttribPointervNV(disp, parameters) \
-    (* GET_GetVertexAttribPointervNV(disp)) parameters
-static inline _glptr_GetVertexAttribPointervNV
-GET_GetVertexAttribPointervNV(struct _glapi_table *disp)
-{
-    return (_glptr_GetVertexAttribPointervNV) (GET_by_offset
-                                               (disp,
-                                                _gloffset_GetVertexAttribPointervNV));
-}
-
-static inline void
-SET_GetVertexAttribPointervNV(struct _glapi_table *disp,
-                              void (GLAPIENTRYP fn) (GLuint, GLenum, GLvoid **))
-{
-    SET_by_offset(disp, _gloffset_GetVertexAttribPointervNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetVertexAttribdvNV) (GLuint, GLenum,
-                                                       GLdouble *);
+typedef void (GLAPIENTRYP _glptr_GetVertexAttribdvNV)(GLuint, GLenum, GLdouble *);
 #define CALL_GetVertexAttribdvNV(disp, parameters) \
     (* GET_GetVertexAttribdvNV(disp)) parameters
-static inline _glptr_GetVertexAttribdvNV
-GET_GetVertexAttribdvNV(struct _glapi_table *disp)
-{
-    return (_glptr_GetVertexAttribdvNV) (GET_by_offset
-                                         (disp, _gloffset_GetVertexAttribdvNV));
+static INLINE _glptr_GetVertexAttribdvNV GET_GetVertexAttribdvNV(struct _glapi_table *disp) {
+   return (_glptr_GetVertexAttribdvNV) (GET_by_offset(disp, _gloffset_GetVertexAttribdvNV));
 }
 
-static inline void
-SET_GetVertexAttribdvNV(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLuint, GLenum, GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_GetVertexAttribdvNV, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_GetVertexAttribfvNV)(GLuint, GLenum, GLfloat *);
 #define CALL_GetVertexAttribfvNV(disp, parameters) \
     (* GET_GetVertexAttribfvNV(disp)) parameters
-static inline _glptr_GetVertexAttribfvNV
-GET_GetVertexAttribfvNV(struct _glapi_table *disp)
-{
-    return (_glptr_GetVertexAttribfvNV) (GET_by_offset
-                                         (disp, _gloffset_GetVertexAttribfvNV));
+static INLINE _glptr_GetVertexAttribfvNV GET_GetVertexAttribfvNV(struct _glapi_table *disp) {
+   return (_glptr_GetVertexAttribfvNV) (GET_by_offset(disp, _gloffset_GetVertexAttribfvNV));
 }
 
-static inline void
-SET_GetVertexAttribfvNV(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLuint, GLenum, GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetVertexAttribfvNV, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_GetVertexAttribivNV)(GLuint, GLenum, GLint *);
 #define CALL_GetVertexAttribivNV(disp, parameters) \
     (* GET_GetVertexAttribivNV(disp)) parameters
-static inline _glptr_GetVertexAttribivNV
-GET_GetVertexAttribivNV(struct _glapi_table *disp)
-{
-    return (_glptr_GetVertexAttribivNV) (GET_by_offset
-                                         (disp, _gloffset_GetVertexAttribivNV));
-}
-
-static inline void
-SET_GetVertexAttribivNV(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLuint, GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetVertexAttribivNV, fn);
+static INLINE _glptr_GetVertexAttribivNV GET_GetVertexAttribivNV(struct _glapi_table *disp) {
+   return (_glptr_GetVertexAttribivNV) (GET_by_offset(disp, _gloffset_GetVertexAttribivNV));
 }
 
-typedef GLboolean(GLAPIENTRYP _glptr_IsProgramNV) (GLuint);
-
-#define CALL_IsProgramNV(disp, parameters) \
-    (* GET_IsProgramNV(disp)) parameters
-static inline _glptr_IsProgramNV
-GET_IsProgramNV(struct _glapi_table *disp)
-{
-    return (_glptr_IsProgramNV) (GET_by_offset(disp, _gloffset_IsProgramNV));
-}
-
-static inline void
-SET_IsProgramNV(struct _glapi_table *disp, GLboolean(GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_IsProgramNV, fn);
+static INLINE void SET_GetVertexAttribivNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint *)) {
+   SET_by_offset(disp, _gloffset_GetVertexAttribivNV, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_LoadProgramNV) (GLenum, GLuint, GLsizei,
-                                                 const GLubyte *);
+typedef void (GLAPIENTRYP _glptr_LoadProgramNV)(GLenum, GLuint, GLsizei, const GLubyte *);
 #define CALL_LoadProgramNV(disp, parameters) \
     (* GET_LoadProgramNV(disp)) parameters
-static inline _glptr_LoadProgramNV
-GET_LoadProgramNV(struct _glapi_table *disp)
-{
-    return (_glptr_LoadProgramNV) (GET_by_offset
-                                   (disp, _gloffset_LoadProgramNV));
+static INLINE _glptr_LoadProgramNV GET_LoadProgramNV(struct _glapi_table *disp) {
+   return (_glptr_LoadProgramNV) (GET_by_offset(disp, _gloffset_LoadProgramNV));
 }
 
-static inline void
-SET_LoadProgramNV(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, GLuint, GLsizei,
-                                         const GLubyte *))
-{
-    SET_by_offset(disp, _gloffset_LoadProgramNV, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_ProgramParameters4dvNV)(GLenum, GLuint, GLsizei, const GLdouble *);
 #define CALL_ProgramParameters4dvNV(disp, parameters) \
     (* GET_ProgramParameters4dvNV(disp)) parameters
-static inline _glptr_ProgramParameters4dvNV
-GET_ProgramParameters4dvNV(struct _glapi_table *disp)
-{
-    return (_glptr_ProgramParameters4dvNV) (GET_by_offset
-                                            (disp,
-                                             _gloffset_ProgramParameters4dvNV));
+static INLINE _glptr_ProgramParameters4dvNV GET_ProgramParameters4dvNV(struct _glapi_table *disp) {
+   return (_glptr_ProgramParameters4dvNV) (GET_by_offset(disp, _gloffset_ProgramParameters4dvNV));
 }
 
-static inline void
-SET_ProgramParameters4dvNV(struct _glapi_table *disp,
-                           void (GLAPIENTRYP fn) (GLenum, GLuint, GLsizei,
-                                                  const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_ProgramParameters4dvNV, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_ProgramParameters4fvNV)(GLenum, GLuint, GLsizei, const GLfloat *);
 #define CALL_ProgramParameters4fvNV(disp, parameters) \
     (* GET_ProgramParameters4fvNV(disp)) parameters
-static inline _glptr_ProgramParameters4fvNV
-GET_ProgramParameters4fvNV(struct _glapi_table *disp)
-{
-    return (_glptr_ProgramParameters4fvNV) (GET_by_offset
-                                            (disp,
-                                             _gloffset_ProgramParameters4fvNV));
+static INLINE _glptr_ProgramParameters4fvNV GET_ProgramParameters4fvNV(struct _glapi_table *disp) {
+   return (_glptr_ProgramParameters4fvNV) (GET_by_offset(disp, _gloffset_ProgramParameters4fvNV));
 }
 
-static inline void
-SET_ProgramParameters4fvNV(struct _glapi_table *disp,
-                           void (GLAPIENTRYP fn) (GLenum, GLuint, GLsizei,
-                                                  const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_ProgramParameters4fvNV, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_RequestResidentProgramsNV)(GLsizei, const GLuint *);
 #define CALL_RequestResidentProgramsNV(disp, parameters) \
     (* GET_RequestResidentProgramsNV(disp)) parameters
-static inline _glptr_RequestResidentProgramsNV
-GET_RequestResidentProgramsNV(struct _glapi_table *disp)
-{
-    return (_glptr_RequestResidentProgramsNV) (GET_by_offset
-                                               (disp,
-                                                _gloffset_RequestResidentProgramsNV));
+static INLINE _glptr_RequestResidentProgramsNV GET_RequestResidentProgramsNV(struct _glapi_table *disp) {
+   return (_glptr_RequestResidentProgramsNV) (GET_by_offset(disp, _gloffset_RequestResidentProgramsNV));
 }
 
-static inline void
-SET_RequestResidentProgramsNV(struct _glapi_table *disp,
-                              void (GLAPIENTRYP fn) (GLsizei, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_RequestResidentProgramsNV, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_TrackMatrixNV)(GLenum, GLuint, GLenum, GLenum);
 #define CALL_TrackMatrixNV(disp, parameters) \
     (* GET_TrackMatrixNV(disp)) parameters
-static inline _glptr_TrackMatrixNV
-GET_TrackMatrixNV(struct _glapi_table *disp)
-{
-    return (_glptr_TrackMatrixNV) (GET_by_offset
-                                   (disp, _gloffset_TrackMatrixNV));
+static INLINE _glptr_TrackMatrixNV GET_TrackMatrixNV(struct _glapi_table *disp) {
+   return (_glptr_TrackMatrixNV) (GET_by_offset(disp, _gloffset_TrackMatrixNV));
 }
 
-static inline void
-SET_TrackMatrixNV(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLenum, GLuint, GLenum, GLenum))
-{
-    SET_by_offset(disp, _gloffset_TrackMatrixNV, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_VertexAttrib1dNV)(GLuint, GLdouble);
 #define CALL_VertexAttrib1dNV(disp, parameters) \
     (* GET_VertexAttrib1dNV(disp)) parameters
-static inline _glptr_VertexAttrib1dNV
-GET_VertexAttrib1dNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib1dNV) (GET_by_offset
-                                      (disp, _gloffset_VertexAttrib1dNV));
+static INLINE _glptr_VertexAttrib1dNV GET_VertexAttrib1dNV(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib1dNV) (GET_by_offset(disp, _gloffset_VertexAttrib1dNV));
 }
 
-static inline void
-SET_VertexAttrib1dNV(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLuint, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib1dNV, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_VertexAttrib1dvNV)(GLuint, const GLdouble *);
 #define CALL_VertexAttrib1dvNV(disp, parameters) \
     (* GET_VertexAttrib1dvNV(disp)) parameters
-static inline _glptr_VertexAttrib1dvNV
-GET_VertexAttrib1dvNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib1dvNV) (GET_by_offset
-                                       (disp, _gloffset_VertexAttrib1dvNV));
+static INLINE _glptr_VertexAttrib1dvNV GET_VertexAttrib1dvNV(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib1dvNV) (GET_by_offset(disp, _gloffset_VertexAttrib1dvNV));
 }
 
-static inline void
-SET_VertexAttrib1dvNV(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib1dvNV, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_VertexAttrib1fNV)(GLuint, GLfloat);
 #define CALL_VertexAttrib1fNV(disp, parameters) \
     (* GET_VertexAttrib1fNV(disp)) parameters
-static inline _glptr_VertexAttrib1fNV
-GET_VertexAttrib1fNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib1fNV) (GET_by_offset
-                                      (disp, _gloffset_VertexAttrib1fNV));
+static INLINE _glptr_VertexAttrib1fNV GET_VertexAttrib1fNV(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib1fNV) (GET_by_offset(disp, _gloffset_VertexAttrib1fNV));
 }
 
-static inline void
-SET_VertexAttrib1fNV(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLuint, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib1fNV, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_VertexAttrib1fvNV)(GLuint, const GLfloat *);
 #define CALL_VertexAttrib1fvNV(disp, parameters) \
     (* GET_VertexAttrib1fvNV(disp)) parameters
-static inline _glptr_VertexAttrib1fvNV
-GET_VertexAttrib1fvNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib1fvNV) (GET_by_offset
-                                       (disp, _gloffset_VertexAttrib1fvNV));
+static INLINE _glptr_VertexAttrib1fvNV GET_VertexAttrib1fvNV(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib1fvNV) (GET_by_offset(disp, _gloffset_VertexAttrib1fvNV));
 }
 
-static inline void
-SET_VertexAttrib1fvNV(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib1fvNV, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_VertexAttrib1sNV)(GLuint, GLshort);
 #define CALL_VertexAttrib1sNV(disp, parameters) \
     (* GET_VertexAttrib1sNV(disp)) parameters
-static inline _glptr_VertexAttrib1sNV
-GET_VertexAttrib1sNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib1sNV) (GET_by_offset
-                                      (disp, _gloffset_VertexAttrib1sNV));
+static INLINE _glptr_VertexAttrib1sNV GET_VertexAttrib1sNV(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib1sNV) (GET_by_offset(disp, _gloffset_VertexAttrib1sNV));
 }
 
-static inline void
-SET_VertexAttrib1sNV(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLuint, GLshort))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib1sNV, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_VertexAttrib1svNV)(GLuint, const GLshort *);
 #define CALL_VertexAttrib1svNV(disp, parameters) \
     (* GET_VertexAttrib1svNV(disp)) parameters
-static inline _glptr_VertexAttrib1svNV
-GET_VertexAttrib1svNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib1svNV) (GET_by_offset
-                                       (disp, _gloffset_VertexAttrib1svNV));
+static INLINE _glptr_VertexAttrib1svNV GET_VertexAttrib1svNV(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib1svNV) (GET_by_offset(disp, _gloffset_VertexAttrib1svNV));
 }
 
-static inline void
-SET_VertexAttrib1svNV(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib1svNV, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_VertexAttrib2dNV)(GLuint, GLdouble, GLdouble);
 #define CALL_VertexAttrib2dNV(disp, parameters) \
     (* GET_VertexAttrib2dNV(disp)) parameters
-static inline _glptr_VertexAttrib2dNV
-GET_VertexAttrib2dNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib2dNV) (GET_by_offset
-                                      (disp, _gloffset_VertexAttrib2dNV));
+static INLINE _glptr_VertexAttrib2dNV GET_VertexAttrib2dNV(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib2dNV) (GET_by_offset(disp, _gloffset_VertexAttrib2dNV));
 }
 
-static inline void
-SET_VertexAttrib2dNV(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLuint, GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib2dNV, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_VertexAttrib2dvNV)(GLuint, const GLdouble *);
 #define CALL_VertexAttrib2dvNV(disp, parameters) \
     (* GET_VertexAttrib2dvNV(disp)) parameters
-static inline _glptr_VertexAttrib2dvNV
-GET_VertexAttrib2dvNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib2dvNV) (GET_by_offset
-                                       (disp, _gloffset_VertexAttrib2dvNV));
+static INLINE _glptr_VertexAttrib2dvNV GET_VertexAttrib2dvNV(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib2dvNV) (GET_by_offset(disp, _gloffset_VertexAttrib2dvNV));
 }
 
-static inline void
-SET_VertexAttrib2dvNV(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib2dvNV, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_VertexAttrib2fNV)(GLuint, GLfloat, GLfloat);
 #define CALL_VertexAttrib2fNV(disp, parameters) \
     (* GET_VertexAttrib2fNV(disp)) parameters
-static inline _glptr_VertexAttrib2fNV
-GET_VertexAttrib2fNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib2fNV) (GET_by_offset
-                                      (disp, _gloffset_VertexAttrib2fNV));
+static INLINE _glptr_VertexAttrib2fNV GET_VertexAttrib2fNV(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib2fNV) (GET_by_offset(disp, _gloffset_VertexAttrib2fNV));
 }
 
-static inline void
-SET_VertexAttrib2fNV(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLuint, GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib2fNV, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_VertexAttrib2fvNV)(GLuint, const GLfloat *);
 #define CALL_VertexAttrib2fvNV(disp, parameters) \
     (* GET_VertexAttrib2fvNV(disp)) parameters
-static inline _glptr_VertexAttrib2fvNV
-GET_VertexAttrib2fvNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib2fvNV) (GET_by_offset
-                                       (disp, _gloffset_VertexAttrib2fvNV));
+static INLINE _glptr_VertexAttrib2fvNV GET_VertexAttrib2fvNV(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib2fvNV) (GET_by_offset(disp, _gloffset_VertexAttrib2fvNV));
 }
 
-static inline void
-SET_VertexAttrib2fvNV(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib2fvNV, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_VertexAttrib2sNV)(GLuint, GLshort, GLshort);
 #define CALL_VertexAttrib2sNV(disp, parameters) \
     (* GET_VertexAttrib2sNV(disp)) parameters
-static inline _glptr_VertexAttrib2sNV
-GET_VertexAttrib2sNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib2sNV) (GET_by_offset
-                                      (disp, _gloffset_VertexAttrib2sNV));
+static INLINE _glptr_VertexAttrib2sNV GET_VertexAttrib2sNV(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib2sNV) (GET_by_offset(disp, _gloffset_VertexAttrib2sNV));
 }
 
-static inline void
-SET_VertexAttrib2sNV(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLuint, GLshort, GLshort))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib2sNV, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_VertexAttrib2svNV)(GLuint, const GLshort *);
 #define CALL_VertexAttrib2svNV(disp, parameters) \
     (* GET_VertexAttrib2svNV(disp)) parameters
-static inline _glptr_VertexAttrib2svNV
-GET_VertexAttrib2svNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib2svNV) (GET_by_offset
-                                       (disp, _gloffset_VertexAttrib2svNV));
+static INLINE _glptr_VertexAttrib2svNV GET_VertexAttrib2svNV(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib2svNV) (GET_by_offset(disp, _gloffset_VertexAttrib2svNV));
 }
 
-static inline void
-SET_VertexAttrib2svNV(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib2svNV, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_VertexAttrib3dNV)(GLuint, GLdouble, GLdouble, GLdouble);
 #define CALL_VertexAttrib3dNV(disp, parameters) \
     (* GET_VertexAttrib3dNV(disp)) parameters
-static inline _glptr_VertexAttrib3dNV
-GET_VertexAttrib3dNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib3dNV) (GET_by_offset
-                                      (disp, _gloffset_VertexAttrib3dNV));
+static INLINE _glptr_VertexAttrib3dNV GET_VertexAttrib3dNV(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib3dNV) (GET_by_offset(disp, _gloffset_VertexAttrib3dNV));
 }
 
-static inline void
-SET_VertexAttrib3dNV(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLuint, GLdouble, GLdouble,
-                                            GLdouble))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib3dNV, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_VertexAttrib3dvNV)(GLuint, const GLdouble *);
 #define CALL_VertexAttrib3dvNV(disp, parameters) \
     (* GET_VertexAttrib3dvNV(disp)) parameters
-static inline _glptr_VertexAttrib3dvNV
-GET_VertexAttrib3dvNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib3dvNV) (GET_by_offset
-                                       (disp, _gloffset_VertexAttrib3dvNV));
+static INLINE _glptr_VertexAttrib3dvNV GET_VertexAttrib3dvNV(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib3dvNV) (GET_by_offset(disp, _gloffset_VertexAttrib3dvNV));
 }
 
-static inline void
-SET_VertexAttrib3dvNV(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib3dvNV, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_VertexAttrib3fNV)(GLuint, GLfloat, GLfloat, GLfloat);
 #define CALL_VertexAttrib3fNV(disp, parameters) \
     (* GET_VertexAttrib3fNV(disp)) parameters
-static inline _glptr_VertexAttrib3fNV
-GET_VertexAttrib3fNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib3fNV) (GET_by_offset
-                                      (disp, _gloffset_VertexAttrib3fNV));
+static INLINE _glptr_VertexAttrib3fNV GET_VertexAttrib3fNV(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib3fNV) (GET_by_offset(disp, _gloffset_VertexAttrib3fNV));
 }
 
-static inline void
-SET_VertexAttrib3fNV(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLuint, GLfloat, GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib3fNV, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_VertexAttrib3fvNV)(GLuint, const GLfloat *);
 #define CALL_VertexAttrib3fvNV(disp, parameters) \
     (* GET_VertexAttrib3fvNV(disp)) parameters
-static inline _glptr_VertexAttrib3fvNV
-GET_VertexAttrib3fvNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib3fvNV) (GET_by_offset
-                                       (disp, _gloffset_VertexAttrib3fvNV));
+static INLINE _glptr_VertexAttrib3fvNV GET_VertexAttrib3fvNV(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib3fvNV) (GET_by_offset(disp, _gloffset_VertexAttrib3fvNV));
 }
 
-static inline void
-SET_VertexAttrib3fvNV(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib3fvNV, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_VertexAttrib3sNV)(GLuint, GLshort, GLshort, GLshort);
 #define CALL_VertexAttrib3sNV(disp, parameters) \
     (* GET_VertexAttrib3sNV(disp)) parameters
-static inline _glptr_VertexAttrib3sNV
-GET_VertexAttrib3sNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib3sNV) (GET_by_offset
-                                      (disp, _gloffset_VertexAttrib3sNV));
+static INLINE _glptr_VertexAttrib3sNV GET_VertexAttrib3sNV(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib3sNV) (GET_by_offset(disp, _gloffset_VertexAttrib3sNV));
 }
 
-static inline void
-SET_VertexAttrib3sNV(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLuint, GLshort, GLshort, GLshort))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib3sNV, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_VertexAttrib3svNV)(GLuint, const GLshort *);
 #define CALL_VertexAttrib3svNV(disp, parameters) \
     (* GET_VertexAttrib3svNV(disp)) parameters
-static inline _glptr_VertexAttrib3svNV
-GET_VertexAttrib3svNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib3svNV) (GET_by_offset
-                                       (disp, _gloffset_VertexAttrib3svNV));
+static INLINE _glptr_VertexAttrib3svNV GET_VertexAttrib3svNV(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib3svNV) (GET_by_offset(disp, _gloffset_VertexAttrib3svNV));
 }
 
-static inline void
-SET_VertexAttrib3svNV(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib3svNV, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_VertexAttrib4dNV)(GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
 #define CALL_VertexAttrib4dNV(disp, parameters) \
     (* GET_VertexAttrib4dNV(disp)) parameters
-static inline _glptr_VertexAttrib4dNV
-GET_VertexAttrib4dNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib4dNV) (GET_by_offset
-                                      (disp, _gloffset_VertexAttrib4dNV));
+static INLINE _glptr_VertexAttrib4dNV GET_VertexAttrib4dNV(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib4dNV) (GET_by_offset(disp, _gloffset_VertexAttrib4dNV));
 }
 
-static inline void
-SET_VertexAttrib4dNV(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLuint, GLdouble, GLdouble,
-                                            GLdouble, GLdouble))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib4dNV, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_VertexAttrib4dvNV)(GLuint, const GLdouble *);
 #define CALL_VertexAttrib4dvNV(disp, parameters) \
     (* GET_VertexAttrib4dvNV(disp)) parameters
-static inline _glptr_VertexAttrib4dvNV
-GET_VertexAttrib4dvNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib4dvNV) (GET_by_offset
-                                       (disp, _gloffset_VertexAttrib4dvNV));
+static INLINE _glptr_VertexAttrib4dvNV GET_VertexAttrib4dvNV(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib4dvNV) (GET_by_offset(disp, _gloffset_VertexAttrib4dvNV));
 }
 
-static inline void
-SET_VertexAttrib4dvNV(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib4dvNV, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_VertexAttrib4fNV)(GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
 #define CALL_VertexAttrib4fNV(disp, parameters) \
     (* GET_VertexAttrib4fNV(disp)) parameters
-static inline _glptr_VertexAttrib4fNV
-GET_VertexAttrib4fNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib4fNV) (GET_by_offset
-                                      (disp, _gloffset_VertexAttrib4fNV));
+static INLINE _glptr_VertexAttrib4fNV GET_VertexAttrib4fNV(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib4fNV) (GET_by_offset(disp, _gloffset_VertexAttrib4fNV));
 }
 
-static inline void
-SET_VertexAttrib4fNV(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLuint, GLfloat, GLfloat, GLfloat,
-                                            GLfloat))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib4fNV, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_VertexAttrib4fvNV)(GLuint, const GLfloat *);
 #define CALL_VertexAttrib4fvNV(disp, parameters) \
     (* GET_VertexAttrib4fvNV(disp)) parameters
-static inline _glptr_VertexAttrib4fvNV
-GET_VertexAttrib4fvNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib4fvNV) (GET_by_offset
-                                       (disp, _gloffset_VertexAttrib4fvNV));
+static INLINE _glptr_VertexAttrib4fvNV GET_VertexAttrib4fvNV(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib4fvNV) (GET_by_offset(disp, _gloffset_VertexAttrib4fvNV));
 }
 
-static inline void
-SET_VertexAttrib4fvNV(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib4fvNV, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_VertexAttrib4sNV)(GLuint, GLshort, GLshort, GLshort, GLshort);
 #define CALL_VertexAttrib4sNV(disp, parameters) \
     (* GET_VertexAttrib4sNV(disp)) parameters
-static inline _glptr_VertexAttrib4sNV
-GET_VertexAttrib4sNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib4sNV) (GET_by_offset
-                                      (disp, _gloffset_VertexAttrib4sNV));
+static INLINE _glptr_VertexAttrib4sNV GET_VertexAttrib4sNV(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib4sNV) (GET_by_offset(disp, _gloffset_VertexAttrib4sNV));
 }
 
-static inline void
-SET_VertexAttrib4sNV(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLuint, GLshort, GLshort, GLshort,
-                                            GLshort))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib4sNV, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_VertexAttrib4svNV)(GLuint, const GLshort *);
 #define CALL_VertexAttrib4svNV(disp, parameters) \
     (* GET_VertexAttrib4svNV(disp)) parameters
-static inline _glptr_VertexAttrib4svNV
-GET_VertexAttrib4svNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib4svNV) (GET_by_offset
-                                       (disp, _gloffset_VertexAttrib4svNV));
+static INLINE _glptr_VertexAttrib4svNV GET_VertexAttrib4svNV(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib4svNV) (GET_by_offset(disp, _gloffset_VertexAttrib4svNV));
 }
 
-static inline void
-SET_VertexAttrib4svNV(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib4svNV, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_VertexAttrib4ubNV)(GLuint, GLubyte, GLubyte, GLubyte, GLubyte);
 #define CALL_VertexAttrib4ubNV(disp, parameters) \
     (* GET_VertexAttrib4ubNV(disp)) parameters
-static inline _glptr_VertexAttrib4ubNV
-GET_VertexAttrib4ubNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib4ubNV) (GET_by_offset
-                                       (disp, _gloffset_VertexAttrib4ubNV));
+static INLINE _glptr_VertexAttrib4ubNV GET_VertexAttrib4ubNV(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib4ubNV) (GET_by_offset(disp, _gloffset_VertexAttrib4ubNV));
 }
 
-static inline void
-SET_VertexAttrib4ubNV(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLuint, GLubyte, GLubyte, GLubyte,
-                                             GLubyte))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib4ubNV, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_VertexAttrib4ubvNV)(GLuint, const GLubyte *);
 #define CALL_VertexAttrib4ubvNV(disp, parameters) \
     (* GET_VertexAttrib4ubvNV(disp)) parameters
-static inline _glptr_VertexAttrib4ubvNV
-GET_VertexAttrib4ubvNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttrib4ubvNV) (GET_by_offset
-                                        (disp, _gloffset_VertexAttrib4ubvNV));
+static INLINE _glptr_VertexAttrib4ubvNV GET_VertexAttrib4ubvNV(struct _glapi_table *disp) {
+   return (_glptr_VertexAttrib4ubvNV) (GET_by_offset(disp, _gloffset_VertexAttrib4ubvNV));
 }
 
-static inline void
-SET_VertexAttrib4ubvNV(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, const GLubyte *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttrib4ubvNV, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_VertexAttribPointerNV)(GLuint, GLint, GLenum, GLsizei, const GLvoid *);
 #define CALL_VertexAttribPointerNV(disp, parameters) \
     (* GET_VertexAttribPointerNV(disp)) parameters
-static inline _glptr_VertexAttribPointerNV
-GET_VertexAttribPointerNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribPointerNV) (GET_by_offset
-                                           (disp,
-                                            _gloffset_VertexAttribPointerNV));
+static INLINE _glptr_VertexAttribPointerNV GET_VertexAttribPointerNV(struct _glapi_table *disp) {
+   return (_glptr_VertexAttribPointerNV) (GET_by_offset(disp, _gloffset_VertexAttribPointerNV));
 }
 
-static inline void
-SET_VertexAttribPointerNV(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (GLuint, GLint, GLenum, GLsizei,
-                                                 const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribPointerNV, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_VertexAttribs1dvNV)(GLuint, GLsizei, const GLdouble *);
 #define CALL_VertexAttribs1dvNV(disp, parameters) \
     (* GET_VertexAttribs1dvNV(disp)) parameters
-static inline _glptr_VertexAttribs1dvNV
-GET_VertexAttribs1dvNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribs1dvNV) (GET_by_offset
-                                        (disp, _gloffset_VertexAttribs1dvNV));
+static INLINE _glptr_VertexAttribs1dvNV GET_VertexAttribs1dvNV(struct _glapi_table *disp) {
+   return (_glptr_VertexAttribs1dvNV) (GET_by_offset(disp, _gloffset_VertexAttribs1dvNV));
 }
 
-static inline void
-SET_VertexAttribs1dvNV(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, GLsizei,
-                                              const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribs1dvNV, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_VertexAttribs1fvNV)(GLuint, GLsizei, const GLfloat *);
 #define CALL_VertexAttribs1fvNV(disp, parameters) \
     (* GET_VertexAttribs1fvNV(disp)) parameters
-static inline _glptr_VertexAttribs1fvNV
-GET_VertexAttribs1fvNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribs1fvNV) (GET_by_offset
-                                        (disp, _gloffset_VertexAttribs1fvNV));
+static INLINE _glptr_VertexAttribs1fvNV GET_VertexAttribs1fvNV(struct _glapi_table *disp) {
+   return (_glptr_VertexAttribs1fvNV) (GET_by_offset(disp, _gloffset_VertexAttribs1fvNV));
 }
 
-static inline void
-SET_VertexAttribs1fvNV(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, GLsizei, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribs1fvNV, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_VertexAttribs1svNV)(GLuint, GLsizei, const GLshort *);
 #define CALL_VertexAttribs1svNV(disp, parameters) \
     (* GET_VertexAttribs1svNV(disp)) parameters
-static inline _glptr_VertexAttribs1svNV
-GET_VertexAttribs1svNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribs1svNV) (GET_by_offset
-                                        (disp, _gloffset_VertexAttribs1svNV));
+static INLINE _glptr_VertexAttribs1svNV GET_VertexAttribs1svNV(struct _glapi_table *disp) {
+   return (_glptr_VertexAttribs1svNV) (GET_by_offset(disp, _gloffset_VertexAttribs1svNV));
 }
 
-static inline void
-SET_VertexAttribs1svNV(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, GLsizei, const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribs1svNV, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_VertexAttribs2dvNV)(GLuint, GLsizei, const GLdouble *);
 #define CALL_VertexAttribs2dvNV(disp, parameters) \
     (* GET_VertexAttribs2dvNV(disp)) parameters
-static inline _glptr_VertexAttribs2dvNV
-GET_VertexAttribs2dvNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribs2dvNV) (GET_by_offset
-                                        (disp, _gloffset_VertexAttribs2dvNV));
+static INLINE _glptr_VertexAttribs2dvNV GET_VertexAttribs2dvNV(struct _glapi_table *disp) {
+   return (_glptr_VertexAttribs2dvNV) (GET_by_offset(disp, _gloffset_VertexAttribs2dvNV));
 }
 
-static inline void
-SET_VertexAttribs2dvNV(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, GLsizei,
-                                              const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribs2dvNV, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_VertexAttribs2fvNV)(GLuint, GLsizei, const GLfloat *);
 #define CALL_VertexAttribs2fvNV(disp, parameters) \
     (* GET_VertexAttribs2fvNV(disp)) parameters
-static inline _glptr_VertexAttribs2fvNV
-GET_VertexAttribs2fvNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribs2fvNV) (GET_by_offset
-                                        (disp, _gloffset_VertexAttribs2fvNV));
+static INLINE _glptr_VertexAttribs2fvNV GET_VertexAttribs2fvNV(struct _glapi_table *disp) {
+   return (_glptr_VertexAttribs2fvNV) (GET_by_offset(disp, _gloffset_VertexAttribs2fvNV));
 }
 
-static inline void
-SET_VertexAttribs2fvNV(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, GLsizei, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribs2fvNV, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_VertexAttribs2svNV)(GLuint, GLsizei, const GLshort *);
 #define CALL_VertexAttribs2svNV(disp, parameters) \
     (* GET_VertexAttribs2svNV(disp)) parameters
-static inline _glptr_VertexAttribs2svNV
-GET_VertexAttribs2svNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribs2svNV) (GET_by_offset
-                                        (disp, _gloffset_VertexAttribs2svNV));
+static INLINE _glptr_VertexAttribs2svNV GET_VertexAttribs2svNV(struct _glapi_table *disp) {
+   return (_glptr_VertexAttribs2svNV) (GET_by_offset(disp, _gloffset_VertexAttribs2svNV));
 }
 
-static inline void
-SET_VertexAttribs2svNV(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, GLsizei, const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribs2svNV, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_VertexAttribs3dvNV)(GLuint, GLsizei, const GLdouble *);
 #define CALL_VertexAttribs3dvNV(disp, parameters) \
     (* GET_VertexAttribs3dvNV(disp)) parameters
-static inline _glptr_VertexAttribs3dvNV
-GET_VertexAttribs3dvNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribs3dvNV) (GET_by_offset
-                                        (disp, _gloffset_VertexAttribs3dvNV));
+static INLINE _glptr_VertexAttribs3dvNV GET_VertexAttribs3dvNV(struct _glapi_table *disp) {
+   return (_glptr_VertexAttribs3dvNV) (GET_by_offset(disp, _gloffset_VertexAttribs3dvNV));
 }
 
-static inline void
-SET_VertexAttribs3dvNV(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, GLsizei,
-                                              const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribs3dvNV, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_VertexAttribs3fvNV)(GLuint, GLsizei, const GLfloat *);
 #define CALL_VertexAttribs3fvNV(disp, parameters) \
     (* GET_VertexAttribs3fvNV(disp)) parameters
-static inline _glptr_VertexAttribs3fvNV
-GET_VertexAttribs3fvNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribs3fvNV) (GET_by_offset
-                                        (disp, _gloffset_VertexAttribs3fvNV));
+static INLINE _glptr_VertexAttribs3fvNV GET_VertexAttribs3fvNV(struct _glapi_table *disp) {
+   return (_glptr_VertexAttribs3fvNV) (GET_by_offset(disp, _gloffset_VertexAttribs3fvNV));
 }
 
-static inline void
-SET_VertexAttribs3fvNV(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, GLsizei, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribs3fvNV, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_VertexAttribs3svNV)(GLuint, GLsizei, const GLshort *);
 #define CALL_VertexAttribs3svNV(disp, parameters) \
     (* GET_VertexAttribs3svNV(disp)) parameters
-static inline _glptr_VertexAttribs3svNV
-GET_VertexAttribs3svNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribs3svNV) (GET_by_offset
-                                        (disp, _gloffset_VertexAttribs3svNV));
+static INLINE _glptr_VertexAttribs3svNV GET_VertexAttribs3svNV(struct _glapi_table *disp) {
+   return (_glptr_VertexAttribs3svNV) (GET_by_offset(disp, _gloffset_VertexAttribs3svNV));
 }
 
-static inline void
-SET_VertexAttribs3svNV(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, GLsizei, const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribs3svNV, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_VertexAttribs4dvNV)(GLuint, GLsizei, const GLdouble *);
 #define CALL_VertexAttribs4dvNV(disp, parameters) \
     (* GET_VertexAttribs4dvNV(disp)) parameters
-static inline _glptr_VertexAttribs4dvNV
-GET_VertexAttribs4dvNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribs4dvNV) (GET_by_offset
-                                        (disp, _gloffset_VertexAttribs4dvNV));
+static INLINE _glptr_VertexAttribs4dvNV GET_VertexAttribs4dvNV(struct _glapi_table *disp) {
+   return (_glptr_VertexAttribs4dvNV) (GET_by_offset(disp, _gloffset_VertexAttribs4dvNV));
 }
 
-static inline void
-SET_VertexAttribs4dvNV(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, GLsizei,
-                                              const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribs4dvNV, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_VertexAttribs4fvNV)(GLuint, GLsizei, const GLfloat *);
 #define CALL_VertexAttribs4fvNV(disp, parameters) \
     (* GET_VertexAttribs4fvNV(disp)) parameters
-static inline _glptr_VertexAttribs4fvNV
-GET_VertexAttribs4fvNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribs4fvNV) (GET_by_offset
-                                        (disp, _gloffset_VertexAttribs4fvNV));
+static INLINE _glptr_VertexAttribs4fvNV GET_VertexAttribs4fvNV(struct _glapi_table *disp) {
+   return (_glptr_VertexAttribs4fvNV) (GET_by_offset(disp, _gloffset_VertexAttribs4fvNV));
 }
 
-static inline void
-SET_VertexAttribs4fvNV(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, GLsizei, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribs4fvNV, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_VertexAttribs4svNV)(GLuint, GLsizei, const GLshort *);
 #define CALL_VertexAttribs4svNV(disp, parameters) \
     (* GET_VertexAttribs4svNV(disp)) parameters
-static inline _glptr_VertexAttribs4svNV
-GET_VertexAttribs4svNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribs4svNV) (GET_by_offset
-                                        (disp, _gloffset_VertexAttribs4svNV));
+static INLINE _glptr_VertexAttribs4svNV GET_VertexAttribs4svNV(struct _glapi_table *disp) {
+   return (_glptr_VertexAttribs4svNV) (GET_by_offset(disp, _gloffset_VertexAttribs4svNV));
 }
 
-static inline void
-SET_VertexAttribs4svNV(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, GLsizei, const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribs4svNV, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_VertexAttribs4ubvNV)(GLuint, GLsizei, const GLubyte *);
 #define CALL_VertexAttribs4ubvNV(disp, parameters) \
     (* GET_VertexAttribs4ubvNV(disp)) parameters
-static inline _glptr_VertexAttribs4ubvNV
-GET_VertexAttribs4ubvNV(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribs4ubvNV) (GET_by_offset
-                                         (disp, _gloffset_VertexAttribs4ubvNV));
+static INLINE _glptr_VertexAttribs4ubvNV GET_VertexAttribs4ubvNV(struct _glapi_table *disp) {
+   return (_glptr_VertexAttribs4ubvNV) (GET_by_offset(disp, _gloffset_VertexAttribs4ubvNV));
 }
 
-static inline void
-SET_VertexAttribs4ubvNV(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLuint, GLsizei,
-                                               const GLubyte *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribs4ubvNV, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_GetTexBumpParameterfvATI)(GLenum, GLfloat *);
 #define CALL_GetTexBumpParameterfvATI(disp, parameters) \
     (* GET_GetTexBumpParameterfvATI(disp)) parameters
-static inline _glptr_GetTexBumpParameterfvATI
-GET_GetTexBumpParameterfvATI(struct _glapi_table *disp)
-{
-    return (_glptr_GetTexBumpParameterfvATI) (GET_by_offset
-                                              (disp,
-                                               _gloffset_GetTexBumpParameterfvATI));
+static INLINE _glptr_GetTexBumpParameterfvATI GET_GetTexBumpParameterfvATI(struct _glapi_table *disp) {
+   return (_glptr_GetTexBumpParameterfvATI) (GET_by_offset(disp, _gloffset_GetTexBumpParameterfvATI));
 }
 
-static inline void
-SET_GetTexBumpParameterfvATI(struct _glapi_table *disp,
-                             void (GLAPIENTRYP fn) (GLenum, GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetTexBumpParameterfvATI, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_GetTexBumpParameterivATI)(GLenum, GLint *);
 #define CALL_GetTexBumpParameterivATI(disp, parameters) \
     (* GET_GetTexBumpParameterivATI(disp)) parameters
-static inline _glptr_GetTexBumpParameterivATI
-GET_GetTexBumpParameterivATI(struct _glapi_table *disp)
-{
-    return (_glptr_GetTexBumpParameterivATI) (GET_by_offset
-                                              (disp,
-                                               _gloffset_GetTexBumpParameterivATI));
+static INLINE _glptr_GetTexBumpParameterivATI GET_GetTexBumpParameterivATI(struct _glapi_table *disp) {
+   return (_glptr_GetTexBumpParameterivATI) (GET_by_offset(disp, _gloffset_GetTexBumpParameterivATI));
 }
 
-static inline void
-SET_GetTexBumpParameterivATI(struct _glapi_table *disp,
-                             void (GLAPIENTRYP fn) (GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetTexBumpParameterivATI, fn);
+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 *);
+typedef void (GLAPIENTRYP _glptr_TexBumpParameterfvATI)(GLenum, const GLfloat *);
 #define CALL_TexBumpParameterfvATI(disp, parameters) \
     (* GET_TexBumpParameterfvATI(disp)) parameters
-static inline _glptr_TexBumpParameterfvATI
-GET_TexBumpParameterfvATI(struct _glapi_table *disp)
-{
-    return (_glptr_TexBumpParameterfvATI) (GET_by_offset
-                                           (disp,
-                                            _gloffset_TexBumpParameterfvATI));
+static INLINE _glptr_TexBumpParameterfvATI GET_TexBumpParameterfvATI(struct _glapi_table *disp) {
+   return (_glptr_TexBumpParameterfvATI) (GET_by_offset(disp, _gloffset_TexBumpParameterfvATI));
 }
 
-static inline void
-SET_TexBumpParameterfvATI(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (GLenum, const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_TexBumpParameterfvATI, fn);
+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 *);
-
+typedef void (GLAPIENTRYP _glptr_TexBumpParameterivATI)(GLenum, const GLint *);
 #define CALL_TexBumpParameterivATI(disp, parameters) \
     (* GET_TexBumpParameterivATI(disp)) parameters
-static inline _glptr_TexBumpParameterivATI
-GET_TexBumpParameterivATI(struct _glapi_table *disp)
-{
-    return (_glptr_TexBumpParameterivATI) (GET_by_offset
-                                           (disp,
-                                            _gloffset_TexBumpParameterivATI));
+static INLINE _glptr_TexBumpParameterivATI GET_TexBumpParameterivATI(struct _glapi_table *disp) {
+   return (_glptr_TexBumpParameterivATI) (GET_by_offset(disp, _gloffset_TexBumpParameterivATI));
 }
 
-static inline void
-SET_TexBumpParameterivATI(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (GLenum, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_TexBumpParameterivATI, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_AlphaFragmentOp1ATI)(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint);
 #define CALL_AlphaFragmentOp1ATI(disp, parameters) \
     (* GET_AlphaFragmentOp1ATI(disp)) parameters
-static inline _glptr_AlphaFragmentOp1ATI
-GET_AlphaFragmentOp1ATI(struct _glapi_table *disp)
-{
-    return (_glptr_AlphaFragmentOp1ATI) (GET_by_offset
-                                         (disp, _gloffset_AlphaFragmentOp1ATI));
+static INLINE _glptr_AlphaFragmentOp1ATI GET_AlphaFragmentOp1ATI(struct _glapi_table *disp) {
+   return (_glptr_AlphaFragmentOp1ATI) (GET_by_offset(disp, _gloffset_AlphaFragmentOp1ATI));
 }
 
-static inline void
-SET_AlphaFragmentOp1ATI(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, GLuint, GLuint, GLuint,
-                                               GLuint, GLuint))
-{
-    SET_by_offset(disp, _gloffset_AlphaFragmentOp1ATI, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_AlphaFragmentOp2ATI)(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
 #define CALL_AlphaFragmentOp2ATI(disp, parameters) \
     (* GET_AlphaFragmentOp2ATI(disp)) parameters
-static inline _glptr_AlphaFragmentOp2ATI
-GET_AlphaFragmentOp2ATI(struct _glapi_table *disp)
-{
-    return (_glptr_AlphaFragmentOp2ATI) (GET_by_offset
-                                         (disp, _gloffset_AlphaFragmentOp2ATI));
-}
-
-static inline void
-SET_AlphaFragmentOp2ATI(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, GLuint, GLuint, GLuint,
-                                               GLuint, GLuint, GLuint, GLuint,
-                                               GLuint))
-{
-    SET_by_offset(disp, _gloffset_AlphaFragmentOp2ATI, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_AlphaFragmentOp3ATI) (GLenum, GLuint, GLuint,
-                                                       GLuint, GLuint, GLuint,
-                                                       GLuint, GLuint, GLuint,
-                                                       GLuint, GLuint, GLuint);
+static INLINE _glptr_AlphaFragmentOp2ATI GET_AlphaFragmentOp2ATI(struct _glapi_table *disp) {
+   return (_glptr_AlphaFragmentOp2ATI) (GET_by_offset(disp, _gloffset_AlphaFragmentOp2ATI));
+}
+
+static INLINE void SET_AlphaFragmentOp2ATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint)) {
+   SET_by_offset(disp, _gloffset_AlphaFragmentOp2ATI, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_AlphaFragmentOp3ATI)(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
 #define CALL_AlphaFragmentOp3ATI(disp, parameters) \
     (* GET_AlphaFragmentOp3ATI(disp)) parameters
-static inline _glptr_AlphaFragmentOp3ATI
-GET_AlphaFragmentOp3ATI(struct _glapi_table *disp)
-{
-    return (_glptr_AlphaFragmentOp3ATI) (GET_by_offset
-                                         (disp, _gloffset_AlphaFragmentOp3ATI));
+static INLINE _glptr_AlphaFragmentOp3ATI GET_AlphaFragmentOp3ATI(struct _glapi_table *disp) {
+   return (_glptr_AlphaFragmentOp3ATI) (GET_by_offset(disp, _gloffset_AlphaFragmentOp3ATI));
 }
 
-static inline void
-SET_AlphaFragmentOp3ATI(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, GLuint, GLuint, GLuint,
-                                               GLuint, GLuint, GLuint, GLuint,
-                                               GLuint, GLuint, GLuint, GLuint))
-{
-    SET_by_offset(disp, _gloffset_AlphaFragmentOp3ATI, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_BeginFragmentShaderATI)(void);
 #define CALL_BeginFragmentShaderATI(disp, parameters) \
     (* GET_BeginFragmentShaderATI(disp)) parameters
-static inline _glptr_BeginFragmentShaderATI
-GET_BeginFragmentShaderATI(struct _glapi_table *disp)
-{
-    return (_glptr_BeginFragmentShaderATI) (GET_by_offset
-                                            (disp,
-                                             _gloffset_BeginFragmentShaderATI));
+static INLINE _glptr_BeginFragmentShaderATI GET_BeginFragmentShaderATI(struct _glapi_table *disp) {
+   return (_glptr_BeginFragmentShaderATI) (GET_by_offset(disp, _gloffset_BeginFragmentShaderATI));
 }
 
-static inline void
-SET_BeginFragmentShaderATI(struct _glapi_table *disp,
-                           void (GLAPIENTRYP fn) (void))
-{
-    SET_by_offset(disp, _gloffset_BeginFragmentShaderATI, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_BindFragmentShaderATI)(GLuint);
 #define CALL_BindFragmentShaderATI(disp, parameters) \
     (* GET_BindFragmentShaderATI(disp)) parameters
-static inline _glptr_BindFragmentShaderATI
-GET_BindFragmentShaderATI(struct _glapi_table *disp)
-{
-    return (_glptr_BindFragmentShaderATI) (GET_by_offset
-                                           (disp,
-                                            _gloffset_BindFragmentShaderATI));
+static INLINE _glptr_BindFragmentShaderATI GET_BindFragmentShaderATI(struct _glapi_table *disp) {
+   return (_glptr_BindFragmentShaderATI) (GET_by_offset(disp, _gloffset_BindFragmentShaderATI));
 }
 
-static inline void
-SET_BindFragmentShaderATI(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_BindFragmentShaderATI, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_ColorFragmentOp1ATI)(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
 #define CALL_ColorFragmentOp1ATI(disp, parameters) \
     (* GET_ColorFragmentOp1ATI(disp)) parameters
-static inline _glptr_ColorFragmentOp1ATI
-GET_ColorFragmentOp1ATI(struct _glapi_table *disp)
-{
-    return (_glptr_ColorFragmentOp1ATI) (GET_by_offset
-                                         (disp, _gloffset_ColorFragmentOp1ATI));
+static INLINE _glptr_ColorFragmentOp1ATI GET_ColorFragmentOp1ATI(struct _glapi_table *disp) {
+   return (_glptr_ColorFragmentOp1ATI) (GET_by_offset(disp, _gloffset_ColorFragmentOp1ATI));
 }
 
-static inline void
-SET_ColorFragmentOp1ATI(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, GLuint, GLuint, GLuint,
-                                               GLuint, GLuint, GLuint))
-{
-    SET_by_offset(disp, _gloffset_ColorFragmentOp1ATI, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_ColorFragmentOp2ATI)(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
 #define CALL_ColorFragmentOp2ATI(disp, parameters) \
     (* GET_ColorFragmentOp2ATI(disp)) parameters
-static inline _glptr_ColorFragmentOp2ATI
-GET_ColorFragmentOp2ATI(struct _glapi_table *disp)
-{
-    return (_glptr_ColorFragmentOp2ATI) (GET_by_offset
-                                         (disp, _gloffset_ColorFragmentOp2ATI));
-}
-
-static inline void
-SET_ColorFragmentOp2ATI(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, GLuint, GLuint, GLuint,
-                                               GLuint, GLuint, GLuint, GLuint,
-                                               GLuint, GLuint))
-{
-    SET_by_offset(disp, _gloffset_ColorFragmentOp2ATI, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ColorFragmentOp3ATI) (GLenum, GLuint, GLuint,
-                                                       GLuint, GLuint, GLuint,
-                                                       GLuint, GLuint, GLuint,
-                                                       GLuint, GLuint, GLuint,
-                                                       GLuint);
+static INLINE _glptr_ColorFragmentOp2ATI GET_ColorFragmentOp2ATI(struct _glapi_table *disp) {
+   return (_glptr_ColorFragmentOp2ATI) (GET_by_offset(disp, _gloffset_ColorFragmentOp2ATI));
+}
+
+static INLINE void SET_ColorFragmentOp2ATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint)) {
+   SET_by_offset(disp, _gloffset_ColorFragmentOp2ATI, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_ColorFragmentOp3ATI)(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
 #define CALL_ColorFragmentOp3ATI(disp, parameters) \
     (* GET_ColorFragmentOp3ATI(disp)) parameters
-static inline _glptr_ColorFragmentOp3ATI
-GET_ColorFragmentOp3ATI(struct _glapi_table *disp)
-{
-    return (_glptr_ColorFragmentOp3ATI) (GET_by_offset
-                                         (disp, _gloffset_ColorFragmentOp3ATI));
+static INLINE _glptr_ColorFragmentOp3ATI GET_ColorFragmentOp3ATI(struct _glapi_table *disp) {
+   return (_glptr_ColorFragmentOp3ATI) (GET_by_offset(disp, _gloffset_ColorFragmentOp3ATI));
 }
 
-static inline void
-SET_ColorFragmentOp3ATI(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, GLuint, GLuint, GLuint,
-                                               GLuint, GLuint, GLuint, GLuint,
-                                               GLuint, GLuint, GLuint, GLuint,
-                                               GLuint))
-{
-    SET_by_offset(disp, _gloffset_ColorFragmentOp3ATI, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_DeleteFragmentShaderATI)(GLuint);
 #define CALL_DeleteFragmentShaderATI(disp, parameters) \
     (* GET_DeleteFragmentShaderATI(disp)) parameters
-static inline _glptr_DeleteFragmentShaderATI
-GET_DeleteFragmentShaderATI(struct _glapi_table *disp)
-{
-    return (_glptr_DeleteFragmentShaderATI) (GET_by_offset
-                                             (disp,
-                                              _gloffset_DeleteFragmentShaderATI));
+static INLINE _glptr_DeleteFragmentShaderATI GET_DeleteFragmentShaderATI(struct _glapi_table *disp) {
+   return (_glptr_DeleteFragmentShaderATI) (GET_by_offset(disp, _gloffset_DeleteFragmentShaderATI));
 }
 
-static inline void
-SET_DeleteFragmentShaderATI(struct _glapi_table *disp,
-                            void (GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_DeleteFragmentShaderATI, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_EndFragmentShaderATI)(void);
 #define CALL_EndFragmentShaderATI(disp, parameters) \
     (* GET_EndFragmentShaderATI(disp)) parameters
-static inline _glptr_EndFragmentShaderATI
-GET_EndFragmentShaderATI(struct _glapi_table *disp)
-{
-    return (_glptr_EndFragmentShaderATI) (GET_by_offset
-                                          (disp,
-                                           _gloffset_EndFragmentShaderATI));
+static INLINE _glptr_EndFragmentShaderATI GET_EndFragmentShaderATI(struct _glapi_table *disp) {
+   return (_glptr_EndFragmentShaderATI) (GET_by_offset(disp, _gloffset_EndFragmentShaderATI));
 }
 
-static inline void
-SET_EndFragmentShaderATI(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (void))
-{
-    SET_by_offset(disp, _gloffset_EndFragmentShaderATI, fn);
+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);
-
+typedef GLuint (GLAPIENTRYP _glptr_GenFragmentShadersATI)(GLuint);
 #define CALL_GenFragmentShadersATI(disp, parameters) \
     (* GET_GenFragmentShadersATI(disp)) parameters
-static inline _glptr_GenFragmentShadersATI
-GET_GenFragmentShadersATI(struct _glapi_table *disp)
-{
-    return (_glptr_GenFragmentShadersATI) (GET_by_offset
-                                           (disp,
-                                            _gloffset_GenFragmentShadersATI));
+static INLINE _glptr_GenFragmentShadersATI GET_GenFragmentShadersATI(struct _glapi_table *disp) {
+   return (_glptr_GenFragmentShadersATI) (GET_by_offset(disp, _gloffset_GenFragmentShadersATI));
 }
 
-static inline void
-SET_GenFragmentShadersATI(struct _glapi_table *disp,
-                          GLuint(GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_GenFragmentShadersATI, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_PassTexCoordATI)(GLuint, GLuint, GLenum);
 #define CALL_PassTexCoordATI(disp, parameters) \
     (* GET_PassTexCoordATI(disp)) parameters
-static inline _glptr_PassTexCoordATI
-GET_PassTexCoordATI(struct _glapi_table *disp)
-{
-    return (_glptr_PassTexCoordATI) (GET_by_offset
-                                     (disp, _gloffset_PassTexCoordATI));
+static INLINE _glptr_PassTexCoordATI GET_PassTexCoordATI(struct _glapi_table *disp) {
+   return (_glptr_PassTexCoordATI) (GET_by_offset(disp, _gloffset_PassTexCoordATI));
 }
 
-static inline void
-SET_PassTexCoordATI(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLuint, GLuint, GLenum))
-{
-    SET_by_offset(disp, _gloffset_PassTexCoordATI, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_SampleMapATI)(GLuint, GLuint, GLenum);
 #define CALL_SampleMapATI(disp, parameters) \
     (* GET_SampleMapATI(disp)) parameters
-static inline _glptr_SampleMapATI
-GET_SampleMapATI(struct _glapi_table *disp)
-{
-    return (_glptr_SampleMapATI) (GET_by_offset(disp, _gloffset_SampleMapATI));
+static INLINE _glptr_SampleMapATI GET_SampleMapATI(struct _glapi_table *disp) {
+   return (_glptr_SampleMapATI) (GET_by_offset(disp, _gloffset_SampleMapATI));
 }
 
-static inline void
-SET_SampleMapATI(struct _glapi_table *disp,
-                 void (GLAPIENTRYP fn) (GLuint, GLuint, GLenum))
-{
-    SET_by_offset(disp, _gloffset_SampleMapATI, fn);
+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
-                                                                *);
+typedef void (GLAPIENTRYP _glptr_SetFragmentShaderConstantATI)(GLuint, const GLfloat *);
 #define CALL_SetFragmentShaderConstantATI(disp, parameters) \
     (* GET_SetFragmentShaderConstantATI(disp)) parameters
-static inline _glptr_SetFragmentShaderConstantATI
-GET_SetFragmentShaderConstantATI(struct _glapi_table *disp)
-{
-    return (_glptr_SetFragmentShaderConstantATI) (GET_by_offset
-                                                  (disp,
-                                                   _gloffset_SetFragmentShaderConstantATI));
+static INLINE _glptr_SetFragmentShaderConstantATI GET_SetFragmentShaderConstantATI(struct _glapi_table *disp) {
+   return (_glptr_SetFragmentShaderConstantATI) (GET_by_offset(disp, _gloffset_SetFragmentShaderConstantATI));
 }
 
-static inline void
-SET_SetFragmentShaderConstantATI(struct _glapi_table *disp,
-                                 void (GLAPIENTRYP fn) (GLuint,
-                                                        const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_SetFragmentShaderConstantATI, fn);
+static INLINE void SET_SetFragmentShaderConstantATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLfloat *)) {
+   SET_by_offset(disp, _gloffset_SetFragmentShaderConstantATI, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_PointParameteriNV) (GLenum, GLint);
-
-#define CALL_PointParameteriNV(disp, parameters) \
-    (* GET_PointParameteriNV(disp)) parameters
-static inline _glptr_PointParameteriNV
-GET_PointParameteriNV(struct _glapi_table *disp)
-{
-    return (_glptr_PointParameteriNV) (GET_by_offset
-                                       (disp, _gloffset_PointParameteriNV));
-}
-
-static inline void
-SET_PointParameteriNV(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLenum, GLint))
-{
-    SET_by_offset(disp, _gloffset_PointParameteriNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_PointParameterivNV) (GLenum, const GLint *);
-
-#define CALL_PointParameterivNV(disp, parameters) \
-    (* GET_PointParameterivNV(disp)) parameters
-static inline _glptr_PointParameterivNV
-GET_PointParameterivNV(struct _glapi_table *disp)
-{
-    return (_glptr_PointParameterivNV) (GET_by_offset
-                                        (disp, _gloffset_PointParameterivNV));
-}
-
-static inline void
-SET_PointParameterivNV(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_PointParameterivNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ActiveStencilFaceEXT) (GLenum);
-
+typedef void (GLAPIENTRYP _glptr_ActiveStencilFaceEXT)(GLenum);
 #define CALL_ActiveStencilFaceEXT(disp, parameters) \
     (* GET_ActiveStencilFaceEXT(disp)) parameters
-static inline _glptr_ActiveStencilFaceEXT
-GET_ActiveStencilFaceEXT(struct _glapi_table *disp)
-{
-    return (_glptr_ActiveStencilFaceEXT) (GET_by_offset
-                                          (disp,
-                                           _gloffset_ActiveStencilFaceEXT));
+static INLINE _glptr_ActiveStencilFaceEXT GET_ActiveStencilFaceEXT(struct _glapi_table *disp) {
+   return (_glptr_ActiveStencilFaceEXT) (GET_by_offset(disp, _gloffset_ActiveStencilFaceEXT));
 }
 
-static inline void
-SET_ActiveStencilFaceEXT(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_ActiveStencilFaceEXT, fn);
+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);
-
+typedef void (GLAPIENTRYP _glptr_BindVertexArrayAPPLE)(GLuint);
 #define CALL_BindVertexArrayAPPLE(disp, parameters) \
     (* GET_BindVertexArrayAPPLE(disp)) parameters
-static inline _glptr_BindVertexArrayAPPLE
-GET_BindVertexArrayAPPLE(struct _glapi_table *disp)
-{
-    return (_glptr_BindVertexArrayAPPLE) (GET_by_offset
-                                          (disp,
-                                           _gloffset_BindVertexArrayAPPLE));
-}
-
-static inline void
-SET_BindVertexArrayAPPLE(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_BindVertexArrayAPPLE, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_DeleteVertexArraysAPPLE) (GLsizei,
-                                                           const GLuint *);
-#define CALL_DeleteVertexArraysAPPLE(disp, parameters) \
-    (* GET_DeleteVertexArraysAPPLE(disp)) parameters
-static inline _glptr_DeleteVertexArraysAPPLE
-GET_DeleteVertexArraysAPPLE(struct _glapi_table *disp)
-{
-    return (_glptr_DeleteVertexArraysAPPLE) (GET_by_offset
-                                             (disp,
-                                              _gloffset_DeleteVertexArraysAPPLE));
+static INLINE _glptr_BindVertexArrayAPPLE GET_BindVertexArrayAPPLE(struct _glapi_table *disp) {
+   return (_glptr_BindVertexArrayAPPLE) (GET_by_offset(disp, _gloffset_BindVertexArrayAPPLE));
 }
 
-static inline void
-SET_DeleteVertexArraysAPPLE(struct _glapi_table *disp,
-                            void (GLAPIENTRYP fn) (GLsizei, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_DeleteVertexArraysAPPLE, fn);
+static INLINE void SET_BindVertexArrayAPPLE(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) {
+   SET_by_offset(disp, _gloffset_BindVertexArrayAPPLE, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_GenVertexArraysAPPLE) (GLsizei, GLuint *);
-
+typedef void (GLAPIENTRYP _glptr_GenVertexArraysAPPLE)(GLsizei, GLuint *);
 #define CALL_GenVertexArraysAPPLE(disp, parameters) \
     (* GET_GenVertexArraysAPPLE(disp)) parameters
-static inline _glptr_GenVertexArraysAPPLE
-GET_GenVertexArraysAPPLE(struct _glapi_table *disp)
-{
-    return (_glptr_GenVertexArraysAPPLE) (GET_by_offset
-                                          (disp,
-                                           _gloffset_GenVertexArraysAPPLE));
+static INLINE _glptr_GenVertexArraysAPPLE GET_GenVertexArraysAPPLE(struct _glapi_table *disp) {
+   return (_glptr_GenVertexArraysAPPLE) (GET_by_offset(disp, _gloffset_GenVertexArraysAPPLE));
 }
 
-static inline void
-SET_GenVertexArraysAPPLE(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (GLsizei, GLuint *))
-{
-    SET_by_offset(disp, _gloffset_GenVertexArraysAPPLE, fn);
+static INLINE void SET_GenVertexArraysAPPLE(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLuint *)) {
+   SET_by_offset(disp, _gloffset_GenVertexArraysAPPLE, fn);
 }
 
-typedef GLboolean(GLAPIENTRYP _glptr_IsVertexArrayAPPLE) (GLuint);
-
-#define CALL_IsVertexArrayAPPLE(disp, parameters) \
-    (* GET_IsVertexArrayAPPLE(disp)) parameters
-static inline _glptr_IsVertexArrayAPPLE
-GET_IsVertexArrayAPPLE(struct _glapi_table *disp)
-{
-    return (_glptr_IsVertexArrayAPPLE) (GET_by_offset
-                                        (disp, _gloffset_IsVertexArrayAPPLE));
+typedef void (GLAPIENTRYP _glptr_GetProgramNamedParameterdvNV)(GLuint, GLsizei, const GLubyte *, GLdouble *);
+#define CALL_GetProgramNamedParameterdvNV(disp, parameters) \
+    (* GET_GetProgramNamedParameterdvNV(disp)) parameters
+static INLINE _glptr_GetProgramNamedParameterdvNV GET_GetProgramNamedParameterdvNV(struct _glapi_table *disp) {
+   return (_glptr_GetProgramNamedParameterdvNV) (GET_by_offset(disp, _gloffset_GetProgramNamedParameterdvNV));
 }
 
-static inline void
-SET_IsVertexArrayAPPLE(struct _glapi_table *disp,
-                       GLboolean(GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_IsVertexArrayAPPLE, fn);
+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_GetProgramNamedParameterdvNV) (GLuint, GLsizei,
-                                                                const GLubyte *,
-                                                                GLdouble *);
-#define CALL_GetProgramNamedParameterdvNV(disp, parameters) \
-    (* GET_GetProgramNamedParameterdvNV(disp)) parameters
-static inline _glptr_GetProgramNamedParameterdvNV
-GET_GetProgramNamedParameterdvNV(struct _glapi_table *disp)
-{
-    return (_glptr_GetProgramNamedParameterdvNV) (GET_by_offset
-                                                  (disp,
-                                                   _gloffset_GetProgramNamedParameterdvNV));
-}
-
-static inline void
-SET_GetProgramNamedParameterdvNV(struct _glapi_table *disp,
-                                 void (GLAPIENTRYP fn) (GLuint, GLsizei,
-                                                        const GLubyte *,
-                                                        GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_GetProgramNamedParameterdvNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetProgramNamedParameterfvNV) (GLuint, GLsizei,
-                                                                const GLubyte *,
-                                                                GLfloat *);
+typedef void (GLAPIENTRYP _glptr_GetProgramNamedParameterfvNV)(GLuint, GLsizei, const GLubyte *, GLfloat *);
 #define CALL_GetProgramNamedParameterfvNV(disp, parameters) \
     (* GET_GetProgramNamedParameterfvNV(disp)) parameters
-static inline _glptr_GetProgramNamedParameterfvNV
-GET_GetProgramNamedParameterfvNV(struct _glapi_table *disp)
-{
-    return (_glptr_GetProgramNamedParameterfvNV) (GET_by_offset
-                                                  (disp,
-                                                   _gloffset_GetProgramNamedParameterfvNV));
-}
-
-static inline void
-SET_GetProgramNamedParameterfvNV(struct _glapi_table *disp,
-                                 void (GLAPIENTRYP fn) (GLuint, GLsizei,
-                                                        const GLubyte *,
-                                                        GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_GetProgramNamedParameterfvNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ProgramNamedParameter4dNV) (GLuint, GLsizei,
-                                                             const GLubyte *,
-                                                             GLdouble, GLdouble,
-                                                             GLdouble,
-                                                             GLdouble);
+static INLINE _glptr_GetProgramNamedParameterfvNV GET_GetProgramNamedParameterfvNV(struct _glapi_table *disp) {
+   return (_glptr_GetProgramNamedParameterfvNV) (GET_by_offset(disp, _gloffset_GetProgramNamedParameterfvNV));
+}
+
+static INLINE void SET_GetProgramNamedParameterfvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLubyte *, GLfloat *)) {
+   SET_by_offset(disp, _gloffset_GetProgramNamedParameterfvNV, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_ProgramNamedParameter4dNV)(GLuint, GLsizei, const GLubyte *, GLdouble, GLdouble, GLdouble, GLdouble);
 #define CALL_ProgramNamedParameter4dNV(disp, parameters) \
     (* GET_ProgramNamedParameter4dNV(disp)) parameters
-static inline _glptr_ProgramNamedParameter4dNV
-GET_ProgramNamedParameter4dNV(struct _glapi_table *disp)
-{
-    return (_glptr_ProgramNamedParameter4dNV) (GET_by_offset
-                                               (disp,
-                                                _gloffset_ProgramNamedParameter4dNV));
-}
-
-static inline void
-SET_ProgramNamedParameter4dNV(struct _glapi_table *disp,
-                              void (GLAPIENTRYP fn) (GLuint, GLsizei,
-                                                     const GLubyte *, GLdouble,
-                                                     GLdouble, GLdouble,
-                                                     GLdouble))
-{
-    SET_by_offset(disp, _gloffset_ProgramNamedParameter4dNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ProgramNamedParameter4dvNV) (GLuint, GLsizei,
-                                                              const GLubyte *,
-                                                              const GLdouble *);
+static INLINE _glptr_ProgramNamedParameter4dNV GET_ProgramNamedParameter4dNV(struct _glapi_table *disp) {
+   return (_glptr_ProgramNamedParameter4dNV) (GET_by_offset(disp, _gloffset_ProgramNamedParameter4dNV));
+}
+
+static INLINE void SET_ProgramNamedParameter4dNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLubyte *, GLdouble, GLdouble, GLdouble, GLdouble)) {
+   SET_by_offset(disp, _gloffset_ProgramNamedParameter4dNV, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_ProgramNamedParameter4dvNV)(GLuint, GLsizei, const GLubyte *, const GLdouble *);
 #define CALL_ProgramNamedParameter4dvNV(disp, parameters) \
     (* GET_ProgramNamedParameter4dvNV(disp)) parameters
-static inline _glptr_ProgramNamedParameter4dvNV
-GET_ProgramNamedParameter4dvNV(struct _glapi_table *disp)
-{
-    return (_glptr_ProgramNamedParameter4dvNV) (GET_by_offset
-                                                (disp,
-                                                 _gloffset_ProgramNamedParameter4dvNV));
-}
-
-static inline void
-SET_ProgramNamedParameter4dvNV(struct _glapi_table *disp,
-                               void (GLAPIENTRYP fn) (GLuint, GLsizei,
-                                                      const GLubyte *,
-                                                      const GLdouble *))
-{
-    SET_by_offset(disp, _gloffset_ProgramNamedParameter4dvNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ProgramNamedParameter4fNV) (GLuint, GLsizei,
-                                                             const GLubyte *,
-                                                             GLfloat, GLfloat,
-                                                             GLfloat, GLfloat);
-#define CALL_ProgramNamedParameter4fNV(disp, parameters) \
-    (* GET_ProgramNamedParameter4fNV(disp)) parameters
-static inline _glptr_ProgramNamedParameter4fNV
-GET_ProgramNamedParameter4fNV(struct _glapi_table *disp)
-{
-    return (_glptr_ProgramNamedParameter4fNV) (GET_by_offset
-                                               (disp,
-                                                _gloffset_ProgramNamedParameter4fNV));
-}
-
-static inline void
-SET_ProgramNamedParameter4fNV(struct _glapi_table *disp,
-                              void (GLAPIENTRYP fn) (GLuint, GLsizei,
-                                                     const GLubyte *, GLfloat,
-                                                     GLfloat, GLfloat, GLfloat))
-{
-    SET_by_offset(disp, _gloffset_ProgramNamedParameter4fNV, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ProgramNamedParameter4fvNV) (GLuint, GLsizei,
-                                                              const GLubyte *,
-                                                              const GLfloat *);
-#define CALL_ProgramNamedParameter4fvNV(disp, parameters) \
-    (* GET_ProgramNamedParameter4fvNV(disp)) parameters
-static inline _glptr_ProgramNamedParameter4fvNV
-GET_ProgramNamedParameter4fvNV(struct _glapi_table *disp)
-{
-    return (_glptr_ProgramNamedParameter4fvNV) (GET_by_offset
-                                                (disp,
-                                                 _gloffset_ProgramNamedParameter4fvNV));
+static INLINE _glptr_ProgramNamedParameter4dvNV GET_ProgramNamedParameter4dvNV(struct _glapi_table *disp) {
+   return (_glptr_ProgramNamedParameter4dvNV) (GET_by_offset(disp, _gloffset_ProgramNamedParameter4dvNV));
 }
 
-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);
+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_PrimitiveRestartIndexNV) (GLuint);
+typedef void (GLAPIENTRYP _glptr_ProgramNamedParameter4fNV)(GLuint, GLsizei, const GLubyte *, GLfloat, GLfloat, GLfloat, GLfloat);
+#define CALL_ProgramNamedParameter4fNV(disp, parameters) \
+    (* GET_ProgramNamedParameter4fNV(disp)) parameters
+static INLINE _glptr_ProgramNamedParameter4fNV GET_ProgramNamedParameter4fNV(struct _glapi_table *disp) {
+   return (_glptr_ProgramNamedParameter4fNV) (GET_by_offset(disp, _gloffset_ProgramNamedParameter4fNV));
+}
 
-#define CALL_PrimitiveRestartIndexNV(disp, parameters) \
-    (* GET_PrimitiveRestartIndexNV(disp)) parameters
-static inline _glptr_PrimitiveRestartIndexNV
-GET_PrimitiveRestartIndexNV(struct _glapi_table *disp)
-{
-    return (_glptr_PrimitiveRestartIndexNV) (GET_by_offset
-                                             (disp,
-                                              _gloffset_PrimitiveRestartIndexNV));
+static INLINE void SET_ProgramNamedParameter4fNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLubyte *, GLfloat, GLfloat, GLfloat, GLfloat)) {
+   SET_by_offset(disp, _gloffset_ProgramNamedParameter4fNV, fn);
 }
 
-static inline void
-SET_PrimitiveRestartIndexNV(struct _glapi_table *disp,
-                            void (GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_PrimitiveRestartIndexNV, fn);
+typedef void (GLAPIENTRYP _glptr_ProgramNamedParameter4fvNV)(GLuint, GLsizei, const GLubyte *, const GLfloat *);
+#define CALL_ProgramNamedParameter4fvNV(disp, parameters) \
+    (* GET_ProgramNamedParameter4fvNV(disp)) parameters
+static INLINE _glptr_ProgramNamedParameter4fvNV GET_ProgramNamedParameter4fvNV(struct _glapi_table *disp) {
+   return (_glptr_ProgramNamedParameter4fvNV) (GET_by_offset(disp, _gloffset_ProgramNamedParameter4fvNV));
 }
 
-typedef void (GLAPIENTRYP _glptr_PrimitiveRestartNV) (void);
+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_PrimitiveRestartNV)(void);
 #define CALL_PrimitiveRestartNV(disp, parameters) \
     (* GET_PrimitiveRestartNV(disp)) parameters
-static inline _glptr_PrimitiveRestartNV
-GET_PrimitiveRestartNV(struct _glapi_table *disp)
-{
-    return (_glptr_PrimitiveRestartNV) (GET_by_offset
-                                        (disp, _gloffset_PrimitiveRestartNV));
+static INLINE _glptr_PrimitiveRestartNV GET_PrimitiveRestartNV(struct _glapi_table *disp) {
+   return (_glptr_PrimitiveRestartNV) (GET_by_offset(disp, _gloffset_PrimitiveRestartNV));
 }
 
-static inline void
-SET_PrimitiveRestartNV(struct _glapi_table *disp, void (GLAPIENTRYP fn) (void))
-{
-    SET_by_offset(disp, _gloffset_PrimitiveRestartNV, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_GetTexGenxvOES)(GLenum, GLenum, GLfixed *);
+#define CALL_GetTexGenxvOES(disp, parameters) \
+    (* GET_GetTexGenxvOES(disp)) parameters
+static INLINE _glptr_GetTexGenxvOES GET_GetTexGenxvOES(struct _glapi_table *disp) {
+   return (_glptr_GetTexGenxvOES) (GET_by_offset(disp, _gloffset_GetTexGenxvOES));
+}
 
-#define CALL_DepthBoundsEXT(disp, parameters) \
-    (* GET_DepthBoundsEXT(disp)) parameters
-static inline _glptr_DepthBoundsEXT
-GET_DepthBoundsEXT(struct _glapi_table *disp)
-{
-    return (_glptr_DepthBoundsEXT) (GET_by_offset
-                                    (disp, _gloffset_DepthBoundsEXT));
+static INLINE void SET_GetTexGenxvOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfixed *)) {
+   SET_by_offset(disp, _gloffset_GetTexGenxvOES, fn);
 }
 
-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_TexGenxOES)(GLenum, GLenum, GLint);
+#define CALL_TexGenxOES(disp, parameters) \
+    (* GET_TexGenxOES(disp)) parameters
+static INLINE _glptr_TexGenxOES GET_TexGenxOES(struct _glapi_table *disp) {
+   return (_glptr_TexGenxOES) (GET_by_offset(disp, _gloffset_TexGenxOES));
 }
 
-typedef void (GLAPIENTRYP _glptr_BlendEquationSeparateEXT) (GLenum, GLenum);
-
-#define CALL_BlendEquationSeparateEXT(disp, parameters) \
-    (* GET_BlendEquationSeparateEXT(disp)) parameters
-static inline _glptr_BlendEquationSeparateEXT
-GET_BlendEquationSeparateEXT(struct _glapi_table *disp)
-{
-    return (_glptr_BlendEquationSeparateEXT) (GET_by_offset
-                                              (disp,
-                                               _gloffset_BlendEquationSeparateEXT));
+static INLINE void SET_TexGenxOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint)) {
+   SET_by_offset(disp, _gloffset_TexGenxOES, fn);
 }
 
-static inline void
-SET_BlendEquationSeparateEXT(struct _glapi_table *disp,
-                             void (GLAPIENTRYP fn) (GLenum, GLenum))
-{
-    SET_by_offset(disp, _gloffset_BlendEquationSeparateEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_BindFramebufferEXT) (GLenum, GLuint);
-
-#define CALL_BindFramebufferEXT(disp, parameters) \
-    (* GET_BindFramebufferEXT(disp)) parameters
-static inline _glptr_BindFramebufferEXT
-GET_BindFramebufferEXT(struct _glapi_table *disp)
-{
-    return (_glptr_BindFramebufferEXT) (GET_by_offset
-                                        (disp, _gloffset_BindFramebufferEXT));
-}
-
-static inline void
-SET_BindFramebufferEXT(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_BindFramebufferEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_BindRenderbufferEXT) (GLenum, GLuint);
-
-#define CALL_BindRenderbufferEXT(disp, parameters) \
-    (* GET_BindRenderbufferEXT(disp)) parameters
-static inline _glptr_BindRenderbufferEXT
-GET_BindRenderbufferEXT(struct _glapi_table *disp)
-{
-    return (_glptr_BindRenderbufferEXT) (GET_by_offset
-                                         (disp, _gloffset_BindRenderbufferEXT));
-}
-
-static inline void
-SET_BindRenderbufferEXT(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_BindRenderbufferEXT, fn);
-}
-
-typedef GLenum(GLAPIENTRYP _glptr_CheckFramebufferStatusEXT) (GLenum);
-
-#define CALL_CheckFramebufferStatusEXT(disp, parameters) \
-    (* GET_CheckFramebufferStatusEXT(disp)) parameters
-static inline _glptr_CheckFramebufferStatusEXT
-GET_CheckFramebufferStatusEXT(struct _glapi_table *disp)
-{
-    return (_glptr_CheckFramebufferStatusEXT) (GET_by_offset
-                                               (disp,
-                                                _gloffset_CheckFramebufferStatusEXT));
-}
-
-static inline void
-SET_CheckFramebufferStatusEXT(struct _glapi_table *disp,
-                              GLenum(GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_CheckFramebufferStatusEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_DeleteFramebuffersEXT) (GLsizei,
-                                                         const GLuint *);
-#define CALL_DeleteFramebuffersEXT(disp, parameters) \
-    (* GET_DeleteFramebuffersEXT(disp)) parameters
-static inline _glptr_DeleteFramebuffersEXT
-GET_DeleteFramebuffersEXT(struct _glapi_table *disp)
-{
-    return (_glptr_DeleteFramebuffersEXT) (GET_by_offset
-                                           (disp,
-                                            _gloffset_DeleteFramebuffersEXT));
-}
-
-static inline void
-SET_DeleteFramebuffersEXT(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (GLsizei, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_DeleteFramebuffersEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_DeleteRenderbuffersEXT) (GLsizei,
-                                                          const GLuint *);
-#define CALL_DeleteRenderbuffersEXT(disp, parameters) \
-    (* GET_DeleteRenderbuffersEXT(disp)) parameters
-static inline _glptr_DeleteRenderbuffersEXT
-GET_DeleteRenderbuffersEXT(struct _glapi_table *disp)
-{
-    return (_glptr_DeleteRenderbuffersEXT) (GET_by_offset
-                                            (disp,
-                                             _gloffset_DeleteRenderbuffersEXT));
-}
-
-static inline void
-SET_DeleteRenderbuffersEXT(struct _glapi_table *disp,
-                           void (GLAPIENTRYP fn) (GLsizei, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_DeleteRenderbuffersEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_FramebufferRenderbufferEXT) (GLenum, GLenum,
-                                                              GLenum, GLuint);
-#define CALL_FramebufferRenderbufferEXT(disp, parameters) \
-    (* GET_FramebufferRenderbufferEXT(disp)) parameters
-static inline _glptr_FramebufferRenderbufferEXT
-GET_FramebufferRenderbufferEXT(struct _glapi_table *disp)
-{
-    return (_glptr_FramebufferRenderbufferEXT) (GET_by_offset
-                                                (disp,
-                                                 _gloffset_FramebufferRenderbufferEXT));
-}
-
-static inline void
-SET_FramebufferRenderbufferEXT(struct _glapi_table *disp,
-                               void (GLAPIENTRYP fn) (GLenum, GLenum, GLenum,
-                                                      GLuint))
-{
-    SET_by_offset(disp, _gloffset_FramebufferRenderbufferEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_FramebufferTexture1DEXT) (GLenum, GLenum,
-                                                           GLenum, GLuint,
-                                                           GLint);
-#define CALL_FramebufferTexture1DEXT(disp, parameters) \
-    (* GET_FramebufferTexture1DEXT(disp)) parameters
-static inline _glptr_FramebufferTexture1DEXT
-GET_FramebufferTexture1DEXT(struct _glapi_table *disp)
-{
-    return (_glptr_FramebufferTexture1DEXT) (GET_by_offset
-                                             (disp,
-                                              _gloffset_FramebufferTexture1DEXT));
-}
-
-static inline void
-SET_FramebufferTexture1DEXT(struct _glapi_table *disp,
-                            void (GLAPIENTRYP fn) (GLenum, GLenum, GLenum,
-                                                   GLuint, GLint))
-{
-    SET_by_offset(disp, _gloffset_FramebufferTexture1DEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_FramebufferTexture2DEXT) (GLenum, GLenum,
-                                                           GLenum, GLuint,
-                                                           GLint);
-#define CALL_FramebufferTexture2DEXT(disp, parameters) \
-    (* GET_FramebufferTexture2DEXT(disp)) parameters
-static inline _glptr_FramebufferTexture2DEXT
-GET_FramebufferTexture2DEXT(struct _glapi_table *disp)
-{
-    return (_glptr_FramebufferTexture2DEXT) (GET_by_offset
-                                             (disp,
-                                              _gloffset_FramebufferTexture2DEXT));
-}
-
-static inline void
-SET_FramebufferTexture2DEXT(struct _glapi_table *disp,
-                            void (GLAPIENTRYP fn) (GLenum, GLenum, GLenum,
-                                                   GLuint, GLint))
-{
-    SET_by_offset(disp, _gloffset_FramebufferTexture2DEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_FramebufferTexture3DEXT) (GLenum, GLenum,
-                                                           GLenum, GLuint,
-                                                           GLint, GLint);
-#define CALL_FramebufferTexture3DEXT(disp, parameters) \
-    (* GET_FramebufferTexture3DEXT(disp)) parameters
-static inline _glptr_FramebufferTexture3DEXT
-GET_FramebufferTexture3DEXT(struct _glapi_table *disp)
-{
-    return (_glptr_FramebufferTexture3DEXT) (GET_by_offset
-                                             (disp,
-                                              _gloffset_FramebufferTexture3DEXT));
-}
-
-static inline void
-SET_FramebufferTexture3DEXT(struct _glapi_table *disp,
-                            void (GLAPIENTRYP fn) (GLenum, GLenum, GLenum,
-                                                   GLuint, GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_FramebufferTexture3DEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GenFramebuffersEXT) (GLsizei, GLuint *);
-
-#define CALL_GenFramebuffersEXT(disp, parameters) \
-    (* GET_GenFramebuffersEXT(disp)) parameters
-static inline _glptr_GenFramebuffersEXT
-GET_GenFramebuffersEXT(struct _glapi_table *disp)
-{
-    return (_glptr_GenFramebuffersEXT) (GET_by_offset
-                                        (disp, _gloffset_GenFramebuffersEXT));
-}
-
-static inline void
-SET_GenFramebuffersEXT(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLsizei, GLuint *))
-{
-    SET_by_offset(disp, _gloffset_GenFramebuffersEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GenRenderbuffersEXT) (GLsizei, GLuint *);
-
-#define CALL_GenRenderbuffersEXT(disp, parameters) \
-    (* GET_GenRenderbuffersEXT(disp)) parameters
-static inline _glptr_GenRenderbuffersEXT
-GET_GenRenderbuffersEXT(struct _glapi_table *disp)
-{
-    return (_glptr_GenRenderbuffersEXT) (GET_by_offset
-                                         (disp, _gloffset_GenRenderbuffersEXT));
-}
-
-static inline void
-SET_GenRenderbuffersEXT(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLsizei, GLuint *))
-{
-    SET_by_offset(disp, _gloffset_GenRenderbuffersEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GenerateMipmapEXT) (GLenum);
-
-#define CALL_GenerateMipmapEXT(disp, parameters) \
-    (* GET_GenerateMipmapEXT(disp)) parameters
-static inline _glptr_GenerateMipmapEXT
-GET_GenerateMipmapEXT(struct _glapi_table *disp)
-{
-    return (_glptr_GenerateMipmapEXT) (GET_by_offset
-                                       (disp, _gloffset_GenerateMipmapEXT));
-}
-
-static inline void
-SET_GenerateMipmapEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_GenerateMipmapEXT, fn);
-}
-
-typedef void (GLAPIENTRYP
-              _glptr_GetFramebufferAttachmentParameterivEXT) (GLenum, GLenum,
-                                                              GLenum, GLint *);
-#define CALL_GetFramebufferAttachmentParameterivEXT(disp, parameters) \
-    (* GET_GetFramebufferAttachmentParameterivEXT(disp)) parameters
-static inline _glptr_GetFramebufferAttachmentParameterivEXT
-GET_GetFramebufferAttachmentParameterivEXT(struct _glapi_table *disp)
-{
-    return (_glptr_GetFramebufferAttachmentParameterivEXT) (GET_by_offset
-                                                            (disp,
-                                                             _gloffset_GetFramebufferAttachmentParameterivEXT));
-}
-
-static inline void
-SET_GetFramebufferAttachmentParameterivEXT(struct _glapi_table *disp,
-                                           void (GLAPIENTRYP fn) (GLenum,
-                                                                  GLenum,
-                                                                  GLenum,
-                                                                  GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetFramebufferAttachmentParameterivEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetRenderbufferParameterivEXT) (GLenum, GLenum,
-                                                                 GLint *);
-#define CALL_GetRenderbufferParameterivEXT(disp, parameters) \
-    (* GET_GetRenderbufferParameterivEXT(disp)) parameters
-static inline _glptr_GetRenderbufferParameterivEXT
-GET_GetRenderbufferParameterivEXT(struct _glapi_table *disp)
-{
-    return (_glptr_GetRenderbufferParameterivEXT) (GET_by_offset
-                                                   (disp,
-                                                    _gloffset_GetRenderbufferParameterivEXT));
-}
-
-static inline void
-SET_GetRenderbufferParameterivEXT(struct _glapi_table *disp,
-                                  void (GLAPIENTRYP fn) (GLenum, GLenum,
-                                                         GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetRenderbufferParameterivEXT, fn);
-}
-
-typedef GLboolean(GLAPIENTRYP _glptr_IsFramebufferEXT) (GLuint);
+typedef void (GLAPIENTRYP _glptr_TexGenxvOES)(GLenum, GLenum, const GLfixed *);
+#define CALL_TexGenxvOES(disp, parameters) \
+    (* GET_TexGenxvOES(disp)) parameters
+static INLINE _glptr_TexGenxvOES GET_TexGenxvOES(struct _glapi_table *disp) {
+   return (_glptr_TexGenxvOES) (GET_by_offset(disp, _gloffset_TexGenxvOES));
+}
 
-#define CALL_IsFramebufferEXT(disp, parameters) \
-    (* GET_IsFramebufferEXT(disp)) parameters
-static inline _glptr_IsFramebufferEXT
-GET_IsFramebufferEXT(struct _glapi_table *disp)
-{
-    return (_glptr_IsFramebufferEXT) (GET_by_offset
-                                      (disp, _gloffset_IsFramebufferEXT));
-}
-
-static inline void
-SET_IsFramebufferEXT(struct _glapi_table *disp,
-                     GLboolean(GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_IsFramebufferEXT, fn);
-}
-
-typedef GLboolean(GLAPIENTRYP _glptr_IsRenderbufferEXT) (GLuint);
-
-#define CALL_IsRenderbufferEXT(disp, parameters) \
-    (* GET_IsRenderbufferEXT(disp)) parameters
-static inline _glptr_IsRenderbufferEXT
-GET_IsRenderbufferEXT(struct _glapi_table *disp)
-{
-    return (_glptr_IsRenderbufferEXT) (GET_by_offset
-                                       (disp, _gloffset_IsRenderbufferEXT));
-}
-
-static inline void
-SET_IsRenderbufferEXT(struct _glapi_table *disp,
-                      GLboolean(GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_IsRenderbufferEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_RenderbufferStorageEXT) (GLenum, GLenum,
-                                                          GLsizei, GLsizei);
-#define CALL_RenderbufferStorageEXT(disp, parameters) \
-    (* GET_RenderbufferStorageEXT(disp)) parameters
-static inline _glptr_RenderbufferStorageEXT
-GET_RenderbufferStorageEXT(struct _glapi_table *disp)
-{
-    return (_glptr_RenderbufferStorageEXT) (GET_by_offset
-                                            (disp,
-                                             _gloffset_RenderbufferStorageEXT));
-}
-
-static inline void
-SET_RenderbufferStorageEXT(struct _glapi_table *disp,
-                           void (GLAPIENTRYP fn) (GLenum, GLenum, GLsizei,
-                                                  GLsizei))
-{
-    SET_by_offset(disp, _gloffset_RenderbufferStorageEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_BlitFramebufferEXT) (GLint, GLint, GLint,
-                                                      GLint, GLint, GLint,
-                                                      GLint, GLint, GLbitfield,
-                                                      GLenum);
-#define CALL_BlitFramebufferEXT(disp, parameters) \
-    (* GET_BlitFramebufferEXT(disp)) parameters
-static inline _glptr_BlitFramebufferEXT
-GET_BlitFramebufferEXT(struct _glapi_table *disp)
-{
-    return (_glptr_BlitFramebufferEXT) (GET_by_offset
-                                        (disp, _gloffset_BlitFramebufferEXT));
-}
-
-static inline void
-SET_BlitFramebufferEXT(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLint, GLint, GLint, GLint, GLint,
-                                              GLint, GLint, GLint, GLbitfield,
-                                              GLenum))
-{
-    SET_by_offset(disp, _gloffset_BlitFramebufferEXT, fn);
-}
+static INLINE void SET_TexGenxvOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLfixed *)) {
+   SET_by_offset(disp, _gloffset_TexGenxvOES, fn);
+}
 
-typedef void (GLAPIENTRYP _glptr_BufferParameteriAPPLE) (GLenum, GLenum, GLint);
+typedef void (GLAPIENTRYP _glptr_DepthBoundsEXT)(GLclampd, GLclampd);
+#define CALL_DepthBoundsEXT(disp, parameters) \
+    (* GET_DepthBoundsEXT(disp)) parameters
+static INLINE _glptr_DepthBoundsEXT GET_DepthBoundsEXT(struct _glapi_table *disp) {
+   return (_glptr_DepthBoundsEXT) (GET_by_offset(disp, _gloffset_DepthBoundsEXT));
+}
 
+static INLINE void SET_DepthBoundsEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLclampd, GLclampd)) {
+   SET_by_offset(disp, _gloffset_DepthBoundsEXT, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_BufferParameteriAPPLE)(GLenum, GLenum, GLint);
 #define CALL_BufferParameteriAPPLE(disp, parameters) \
     (* GET_BufferParameteriAPPLE(disp)) parameters
-static inline _glptr_BufferParameteriAPPLE
-GET_BufferParameteriAPPLE(struct _glapi_table *disp)
-{
-    return (_glptr_BufferParameteriAPPLE) (GET_by_offset
-                                           (disp,
-                                            _gloffset_BufferParameteriAPPLE));
+static INLINE _glptr_BufferParameteriAPPLE GET_BufferParameteriAPPLE(struct _glapi_table *disp) {
+   return (_glptr_BufferParameteriAPPLE) (GET_by_offset(disp, _gloffset_BufferParameteriAPPLE));
 }
 
-static inline void
-SET_BufferParameteriAPPLE(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (GLenum, GLenum, GLint))
-{
-    SET_by_offset(disp, _gloffset_BufferParameteriAPPLE, fn);
+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);
+typedef void (GLAPIENTRYP _glptr_FlushMappedBufferRangeAPPLE)(GLenum, GLintptr, GLsizeiptr);
 #define CALL_FlushMappedBufferRangeAPPLE(disp, parameters) \
     (* GET_FlushMappedBufferRangeAPPLE(disp)) parameters
-static inline _glptr_FlushMappedBufferRangeAPPLE
-GET_FlushMappedBufferRangeAPPLE(struct _glapi_table *disp)
-{
-    return (_glptr_FlushMappedBufferRangeAPPLE) (GET_by_offset
-                                                 (disp,
-                                                  _gloffset_FlushMappedBufferRangeAPPLE));
-}
-
-static inline void
-SET_FlushMappedBufferRangeAPPLE(struct _glapi_table *disp,
-                                void (GLAPIENTRYP fn) (GLenum, GLintptr,
-                                                       GLsizeiptr))
-{
-    SET_by_offset(disp, _gloffset_FlushMappedBufferRangeAPPLE, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_BindFragDataLocationEXT) (GLuint, GLuint,
-                                                           const GLchar *);
-#define CALL_BindFragDataLocationEXT(disp, parameters) \
-    (* GET_BindFragDataLocationEXT(disp)) parameters
-static inline _glptr_BindFragDataLocationEXT
-GET_BindFragDataLocationEXT(struct _glapi_table *disp)
-{
-    return (_glptr_BindFragDataLocationEXT) (GET_by_offset
-                                             (disp,
-                                              _gloffset_BindFragDataLocationEXT));
-}
-
-static inline void
-SET_BindFragDataLocationEXT(struct _glapi_table *disp,
-                            void (GLAPIENTRYP fn) (GLuint, GLuint,
-                                                   const GLchar *))
-{
-    SET_by_offset(disp, _gloffset_BindFragDataLocationEXT, fn);
-}
-
-typedef GLint(GLAPIENTRYP _glptr_GetFragDataLocationEXT) (GLuint,
-                                                          const GLchar *);
-#define CALL_GetFragDataLocationEXT(disp, parameters) \
-    (* GET_GetFragDataLocationEXT(disp)) parameters
-static inline _glptr_GetFragDataLocationEXT
-GET_GetFragDataLocationEXT(struct _glapi_table *disp)
-{
-    return (_glptr_GetFragDataLocationEXT) (GET_by_offset
-                                            (disp,
-                                             _gloffset_GetFragDataLocationEXT));
-}
-
-static inline void
-SET_GetFragDataLocationEXT(struct _glapi_table *disp,
-                           GLint(GLAPIENTRYP fn) (GLuint, const GLchar *))
-{
-    SET_by_offset(disp, _gloffset_GetFragDataLocationEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetUniformuivEXT) (GLuint, GLint, GLuint *);
-
-#define CALL_GetUniformuivEXT(disp, parameters) \
-    (* GET_GetUniformuivEXT(disp)) parameters
-static inline _glptr_GetUniformuivEXT
-GET_GetUniformuivEXT(struct _glapi_table *disp)
-{
-    return (_glptr_GetUniformuivEXT) (GET_by_offset
-                                      (disp, _gloffset_GetUniformuivEXT));
-}
-
-static inline void
-SET_GetUniformuivEXT(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLuint, GLint, GLuint *))
-{
-    SET_by_offset(disp, _gloffset_GetUniformuivEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetVertexAttribIivEXT) (GLuint, GLenum,
-                                                         GLint *);
-#define CALL_GetVertexAttribIivEXT(disp, parameters) \
-    (* GET_GetVertexAttribIivEXT(disp)) parameters
-static inline _glptr_GetVertexAttribIivEXT
-GET_GetVertexAttribIivEXT(struct _glapi_table *disp)
-{
-    return (_glptr_GetVertexAttribIivEXT) (GET_by_offset
-                                           (disp,
-                                            _gloffset_GetVertexAttribIivEXT));
-}
-
-static inline void
-SET_GetVertexAttribIivEXT(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (GLuint, GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetVertexAttribIivEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetVertexAttribIuivEXT) (GLuint, GLenum,
-                                                          GLuint *);
-#define CALL_GetVertexAttribIuivEXT(disp, parameters) \
-    (* GET_GetVertexAttribIuivEXT(disp)) parameters
-static inline _glptr_GetVertexAttribIuivEXT
-GET_GetVertexAttribIuivEXT(struct _glapi_table *disp)
-{
-    return (_glptr_GetVertexAttribIuivEXT) (GET_by_offset
-                                            (disp,
-                                             _gloffset_GetVertexAttribIuivEXT));
-}
-
-static inline void
-SET_GetVertexAttribIuivEXT(struct _glapi_table *disp,
-                           void (GLAPIENTRYP fn) (GLuint, GLenum, GLuint *))
-{
-    SET_by_offset(disp, _gloffset_GetVertexAttribIuivEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Uniform1uiEXT) (GLint, GLuint);
-
-#define CALL_Uniform1uiEXT(disp, parameters) \
-    (* GET_Uniform1uiEXT(disp)) parameters
-static inline _glptr_Uniform1uiEXT
-GET_Uniform1uiEXT(struct _glapi_table *disp)
-{
-    return (_glptr_Uniform1uiEXT) (GET_by_offset
-                                   (disp, _gloffset_Uniform1uiEXT));
-}
-
-static inline void
-SET_Uniform1uiEXT(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLint, GLuint))
-{
-    SET_by_offset(disp, _gloffset_Uniform1uiEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Uniform1uivEXT) (GLint, GLsizei,
-                                                  const GLuint *);
-#define CALL_Uniform1uivEXT(disp, parameters) \
-    (* GET_Uniform1uivEXT(disp)) parameters
-static inline _glptr_Uniform1uivEXT
-GET_Uniform1uivEXT(struct _glapi_table *disp)
-{
-    return (_glptr_Uniform1uivEXT) (GET_by_offset
-                                    (disp, _gloffset_Uniform1uivEXT));
-}
-
-static inline void
-SET_Uniform1uivEXT(struct _glapi_table *disp,
-                   void (GLAPIENTRYP fn) (GLint, GLsizei, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_Uniform1uivEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_Uniform2uiEXT) (GLint, GLuint, GLuint);
-
-#define CALL_Uniform2uiEXT(disp, parameters) \
-    (* GET_Uniform2uiEXT(disp)) parameters
-static inline _glptr_Uniform2uiEXT
-GET_Uniform2uiEXT(struct _glapi_table *disp)
-{
-    return (_glptr_Uniform2uiEXT) (GET_by_offset
-                                   (disp, _gloffset_Uniform2uiEXT));
-}
-
-static inline void
-SET_Uniform2uiEXT(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLint, GLuint, GLuint))
-{
-    SET_by_offset(disp, _gloffset_Uniform2uiEXT, fn);
+static INLINE _glptr_FlushMappedBufferRangeAPPLE GET_FlushMappedBufferRangeAPPLE(struct _glapi_table *disp) {
+   return (_glptr_FlushMappedBufferRangeAPPLE) (GET_by_offset(disp, _gloffset_FlushMappedBufferRangeAPPLE));
+}
+
+static INLINE void SET_FlushMappedBufferRangeAPPLE(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLintptr, GLsizeiptr)) {
+   SET_by_offset(disp, _gloffset_FlushMappedBufferRangeAPPLE, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_VertexAttribI1iEXT)(GLuint, GLint);
+#define CALL_VertexAttribI1iEXT(disp, parameters) \
+    (* GET_VertexAttribI1iEXT(disp)) parameters
+static INLINE _glptr_VertexAttribI1iEXT GET_VertexAttribI1iEXT(struct _glapi_table *disp) {
+   return (_glptr_VertexAttribI1iEXT) (GET_by_offset(disp, _gloffset_VertexAttribI1iEXT));
+}
+
+static INLINE void SET_VertexAttribI1iEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint)) {
+   SET_by_offset(disp, _gloffset_VertexAttribI1iEXT, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_Uniform2uivEXT) (GLint, GLsizei,
-                                                  const GLuint *);
-#define CALL_Uniform2uivEXT(disp, parameters) \
-    (* GET_Uniform2uivEXT(disp)) parameters
-static inline _glptr_Uniform2uivEXT
-GET_Uniform2uivEXT(struct _glapi_table *disp)
-{
-    return (_glptr_Uniform2uivEXT) (GET_by_offset
-                                    (disp, _gloffset_Uniform2uivEXT));
-}
-
-static inline void
-SET_Uniform2uivEXT(struct _glapi_table *disp,
-                   void (GLAPIENTRYP fn) (GLint, GLsizei, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_Uniform2uivEXT, fn);
+typedef void (GLAPIENTRYP _glptr_VertexAttribI1uiEXT)(GLuint, GLuint);
+#define CALL_VertexAttribI1uiEXT(disp, parameters) \
+    (* GET_VertexAttribI1uiEXT(disp)) parameters
+static INLINE _glptr_VertexAttribI1uiEXT GET_VertexAttribI1uiEXT(struct _glapi_table *disp) {
+   return (_glptr_VertexAttribI1uiEXT) (GET_by_offset(disp, _gloffset_VertexAttribI1uiEXT));
 }
 
-typedef void (GLAPIENTRYP _glptr_Uniform3uiEXT) (GLint, GLuint, GLuint, GLuint);
+static INLINE void SET_VertexAttribI1uiEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint)) {
+   SET_by_offset(disp, _gloffset_VertexAttribI1uiEXT, fn);
+}
 
-#define CALL_Uniform3uiEXT(disp, parameters) \
-    (* GET_Uniform3uiEXT(disp)) parameters
-static inline _glptr_Uniform3uiEXT
-GET_Uniform3uiEXT(struct _glapi_table *disp)
-{
-    return (_glptr_Uniform3uiEXT) (GET_by_offset
-                                   (disp, _gloffset_Uniform3uiEXT));
-}
-
-static inline void
-SET_Uniform3uiEXT(struct _glapi_table *disp,
-                  void (GLAPIENTRYP fn) (GLint, GLuint, GLuint, GLuint))
-{
-    SET_by_offset(disp, _gloffset_Uniform3uiEXT, fn);
+typedef void (GLAPIENTRYP _glptr_VertexAttribI2iEXT)(GLuint, GLint, GLint);
+#define CALL_VertexAttribI2iEXT(disp, parameters) \
+    (* GET_VertexAttribI2iEXT(disp)) parameters
+static INLINE _glptr_VertexAttribI2iEXT GET_VertexAttribI2iEXT(struct _glapi_table *disp) {
+   return (_glptr_VertexAttribI2iEXT) (GET_by_offset(disp, _gloffset_VertexAttribI2iEXT));
 }
 
-typedef void (GLAPIENTRYP _glptr_Uniform3uivEXT) (GLint, GLsizei,
-                                                  const GLuint *);
-#define CALL_Uniform3uivEXT(disp, parameters) \
-    (* GET_Uniform3uivEXT(disp)) parameters
-static inline _glptr_Uniform3uivEXT
-GET_Uniform3uivEXT(struct _glapi_table *disp)
-{
-    return (_glptr_Uniform3uivEXT) (GET_by_offset
-                                    (disp, _gloffset_Uniform3uivEXT));
+static INLINE void SET_VertexAttribI2iEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLint)) {
+   SET_by_offset(disp, _gloffset_VertexAttribI2iEXT, fn);
 }
 
-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_VertexAttribI2ivEXT)(GLuint, const GLint *);
+#define CALL_VertexAttribI2ivEXT(disp, parameters) \
+    (* GET_VertexAttribI2ivEXT(disp)) parameters
+static INLINE _glptr_VertexAttribI2ivEXT GET_VertexAttribI2ivEXT(struct _glapi_table *disp) {
+   return (_glptr_VertexAttribI2ivEXT) (GET_by_offset(disp, _gloffset_VertexAttribI2ivEXT));
 }
 
-typedef void (GLAPIENTRYP _glptr_Uniform4uiEXT) (GLint, GLuint, GLuint, GLuint,
-                                                 GLuint);
-#define CALL_Uniform4uiEXT(disp, parameters) \
-    (* GET_Uniform4uiEXT(disp)) parameters
-static inline _glptr_Uniform4uiEXT
-GET_Uniform4uiEXT(struct _glapi_table *disp)
-{
-    return (_glptr_Uniform4uiEXT) (GET_by_offset
-                                   (disp, _gloffset_Uniform4uiEXT));
+static INLINE void SET_VertexAttribI2ivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLint *)) {
+   SET_by_offset(disp, _gloffset_VertexAttribI2ivEXT, fn);
 }
-
-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_VertexAttribI2uiEXT)(GLuint, GLuint, GLuint);
+#define CALL_VertexAttribI2uiEXT(disp, parameters) \
+    (* GET_VertexAttribI2uiEXT(disp)) parameters
+static INLINE _glptr_VertexAttribI2uiEXT GET_VertexAttribI2uiEXT(struct _glapi_table *disp) {
+   return (_glptr_VertexAttribI2uiEXT) (GET_by_offset(disp, _gloffset_VertexAttribI2uiEXT));
 }
 
-typedef void (GLAPIENTRYP _glptr_Uniform4uivEXT) (GLint, GLsizei,
-                                                  const GLuint *);
-#define CALL_Uniform4uivEXT(disp, parameters) \
-    (* GET_Uniform4uivEXT(disp)) parameters
-static inline _glptr_Uniform4uivEXT
-GET_Uniform4uivEXT(struct _glapi_table *disp)
-{
-    return (_glptr_Uniform4uivEXT) (GET_by_offset
-                                    (disp, _gloffset_Uniform4uivEXT));
+static INLINE void SET_VertexAttribI2uiEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLuint)) {
+   SET_by_offset(disp, _gloffset_VertexAttribI2uiEXT, fn);
 }
 
-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_VertexAttribI2uivEXT)(GLuint, const GLuint *);
+#define CALL_VertexAttribI2uivEXT(disp, parameters) \
+    (* GET_VertexAttribI2uivEXT(disp)) parameters
+static INLINE _glptr_VertexAttribI2uivEXT GET_VertexAttribI2uivEXT(struct _glapi_table *disp) {
+   return (_glptr_VertexAttribI2uivEXT) (GET_by_offset(disp, _gloffset_VertexAttribI2uivEXT));
 }
 
-typedef void (GLAPIENTRYP _glptr_VertexAttribI1iEXT) (GLuint, GLint);
+static INLINE void SET_VertexAttribI2uivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLuint *)) {
+   SET_by_offset(disp, _gloffset_VertexAttribI2uivEXT, fn);
+}
 
-#define CALL_VertexAttribI1iEXT(disp, parameters) \
-    (* GET_VertexAttribI1iEXT(disp)) parameters
-static inline _glptr_VertexAttribI1iEXT
-GET_VertexAttribI1iEXT(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribI1iEXT) (GET_by_offset
-                                        (disp, _gloffset_VertexAttribI1iEXT));
+typedef void (GLAPIENTRYP _glptr_VertexAttribI3iEXT)(GLuint, GLint, GLint, GLint);
+#define CALL_VertexAttribI3iEXT(disp, parameters) \
+    (* GET_VertexAttribI3iEXT(disp)) parameters
+static INLINE _glptr_VertexAttribI3iEXT GET_VertexAttribI3iEXT(struct _glapi_table *disp) {
+   return (_glptr_VertexAttribI3iEXT) (GET_by_offset(disp, _gloffset_VertexAttribI3iEXT));
 }
 
-static inline void
-SET_VertexAttribI1iEXT(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, GLint))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribI1iEXT, fn);
+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_VertexAttribI1ivEXT) (GLuint, const GLint *);
+typedef void (GLAPIENTRYP _glptr_VertexAttribI3ivEXT)(GLuint, const GLint *);
+#define CALL_VertexAttribI3ivEXT(disp, parameters) \
+    (* GET_VertexAttribI3ivEXT(disp)) parameters
+static INLINE _glptr_VertexAttribI3ivEXT GET_VertexAttribI3ivEXT(struct _glapi_table *disp) {
+   return (_glptr_VertexAttribI3ivEXT) (GET_by_offset(disp, _gloffset_VertexAttribI3ivEXT));
+}
 
-#define CALL_VertexAttribI1ivEXT(disp, parameters) \
-    (* GET_VertexAttribI1ivEXT(disp)) parameters
-static inline _glptr_VertexAttribI1ivEXT
-GET_VertexAttribI1ivEXT(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribI1ivEXT) (GET_by_offset
-                                         (disp, _gloffset_VertexAttribI1ivEXT));
+static INLINE void SET_VertexAttribI3ivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLint *)) {
+   SET_by_offset(disp, _gloffset_VertexAttribI3ivEXT, fn);
 }
 
-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_VertexAttribI3uiEXT)(GLuint, GLuint, GLuint, GLuint);
+#define CALL_VertexAttribI3uiEXT(disp, parameters) \
+    (* GET_VertexAttribI3uiEXT(disp)) parameters
+static INLINE _glptr_VertexAttribI3uiEXT GET_VertexAttribI3uiEXT(struct _glapi_table *disp) {
+   return (_glptr_VertexAttribI3uiEXT) (GET_by_offset(disp, _gloffset_VertexAttribI3uiEXT));
 }
 
-typedef void (GLAPIENTRYP _glptr_VertexAttribI1uiEXT) (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);
+}
 
-#define CALL_VertexAttribI1uiEXT(disp, parameters) \
-    (* GET_VertexAttribI1uiEXT(disp)) parameters
-static inline _glptr_VertexAttribI1uiEXT
-GET_VertexAttribI1uiEXT(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribI1uiEXT) (GET_by_offset
-                                         (disp, _gloffset_VertexAttribI1uiEXT));
+typedef void (GLAPIENTRYP _glptr_VertexAttribI3uivEXT)(GLuint, const GLuint *);
+#define CALL_VertexAttribI3uivEXT(disp, parameters) \
+    (* GET_VertexAttribI3uivEXT(disp)) parameters
+static INLINE _glptr_VertexAttribI3uivEXT GET_VertexAttribI3uivEXT(struct _glapi_table *disp) {
+   return (_glptr_VertexAttribI3uivEXT) (GET_by_offset(disp, _gloffset_VertexAttribI3uivEXT));
 }
 
-static inline void
-SET_VertexAttribI1uiEXT(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLuint, GLuint))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribI1uiEXT, fn);
+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_VertexAttribI1uivEXT) (GLuint, const GLuint *);
+typedef void (GLAPIENTRYP _glptr_VertexAttribI4iEXT)(GLuint, GLint, GLint, GLint, GLint);
+#define CALL_VertexAttribI4iEXT(disp, parameters) \
+    (* GET_VertexAttribI4iEXT(disp)) parameters
+static INLINE _glptr_VertexAttribI4iEXT GET_VertexAttribI4iEXT(struct _glapi_table *disp) {
+   return (_glptr_VertexAttribI4iEXT) (GET_by_offset(disp, _gloffset_VertexAttribI4iEXT));
+}
 
-#define CALL_VertexAttribI1uivEXT(disp, parameters) \
-    (* GET_VertexAttribI1uivEXT(disp)) parameters
-static inline _glptr_VertexAttribI1uivEXT
-GET_VertexAttribI1uivEXT(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribI1uivEXT) (GET_by_offset
-                                          (disp,
-                                           _gloffset_VertexAttribI1uivEXT));
+static INLINE void SET_VertexAttribI4iEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLint, GLint, GLint)) {
+   SET_by_offset(disp, _gloffset_VertexAttribI4iEXT, fn);
 }
 
-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_VertexAttribI4ivEXT)(GLuint, const GLint *);
+#define CALL_VertexAttribI4ivEXT(disp, parameters) \
+    (* GET_VertexAttribI4ivEXT(disp)) parameters
+static INLINE _glptr_VertexAttribI4ivEXT GET_VertexAttribI4ivEXT(struct _glapi_table *disp) {
+   return (_glptr_VertexAttribI4ivEXT) (GET_by_offset(disp, _gloffset_VertexAttribI4ivEXT));
 }
 
-typedef void (GLAPIENTRYP _glptr_VertexAttribI2iEXT) (GLuint, GLint, GLint);
+static INLINE void SET_VertexAttribI4ivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLint *)) {
+   SET_by_offset(disp, _gloffset_VertexAttribI4ivEXT, fn);
+}
 
-#define CALL_VertexAttribI2iEXT(disp, parameters) \
-    (* GET_VertexAttribI2iEXT(disp)) parameters
-static inline _glptr_VertexAttribI2iEXT
-GET_VertexAttribI2iEXT(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribI2iEXT) (GET_by_offset
-                                        (disp, _gloffset_VertexAttribI2iEXT));
+typedef void (GLAPIENTRYP _glptr_VertexAttribI4uiEXT)(GLuint, GLuint, GLuint, GLuint, GLuint);
+#define CALL_VertexAttribI4uiEXT(disp, parameters) \
+    (* GET_VertexAttribI4uiEXT(disp)) parameters
+static INLINE _glptr_VertexAttribI4uiEXT GET_VertexAttribI4uiEXT(struct _glapi_table *disp) {
+   return (_glptr_VertexAttribI4uiEXT) (GET_by_offset(disp, _gloffset_VertexAttribI4uiEXT));
 }
 
-static inline void
-SET_VertexAttribI2iEXT(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribI2iEXT, fn);
+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_VertexAttribI2ivEXT) (GLuint, const GLint *);
+typedef void (GLAPIENTRYP _glptr_VertexAttribI4uivEXT)(GLuint, const GLuint *);
+#define CALL_VertexAttribI4uivEXT(disp, parameters) \
+    (* GET_VertexAttribI4uivEXT(disp)) parameters
+static INLINE _glptr_VertexAttribI4uivEXT GET_VertexAttribI4uivEXT(struct _glapi_table *disp) {
+   return (_glptr_VertexAttribI4uivEXT) (GET_by_offset(disp, _gloffset_VertexAttribI4uivEXT));
+}
 
-#define CALL_VertexAttribI2ivEXT(disp, parameters) \
-    (* GET_VertexAttribI2ivEXT(disp)) parameters
-static inline _glptr_VertexAttribI2ivEXT
-GET_VertexAttribI2ivEXT(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribI2ivEXT) (GET_by_offset
-                                         (disp, _gloffset_VertexAttribI2ivEXT));
+static INLINE void SET_VertexAttribI4uivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLuint *)) {
+   SET_by_offset(disp, _gloffset_VertexAttribI4uivEXT, fn);
 }
 
-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_ClearColorIiEXT)(GLint, GLint, GLint, GLint);
+#define CALL_ClearColorIiEXT(disp, parameters) \
+    (* GET_ClearColorIiEXT(disp)) parameters
+static INLINE _glptr_ClearColorIiEXT GET_ClearColorIiEXT(struct _glapi_table *disp) {
+   return (_glptr_ClearColorIiEXT) (GET_by_offset(disp, _gloffset_ClearColorIiEXT));
 }
 
-typedef void (GLAPIENTRYP _glptr_VertexAttribI2uiEXT) (GLuint, GLuint, GLuint);
+static INLINE void SET_ClearColorIiEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint, GLint)) {
+   SET_by_offset(disp, _gloffset_ClearColorIiEXT, fn);
+}
 
-#define CALL_VertexAttribI2uiEXT(disp, parameters) \
-    (* GET_VertexAttribI2uiEXT(disp)) parameters
-static inline _glptr_VertexAttribI2uiEXT
-GET_VertexAttribI2uiEXT(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribI2uiEXT) (GET_by_offset
-                                         (disp, _gloffset_VertexAttribI2uiEXT));
+typedef void (GLAPIENTRYP _glptr_ClearColorIuiEXT)(GLuint, GLuint, GLuint, GLuint);
+#define CALL_ClearColorIuiEXT(disp, parameters) \
+    (* GET_ClearColorIuiEXT(disp)) parameters
+static INLINE _glptr_ClearColorIuiEXT GET_ClearColorIuiEXT(struct _glapi_table *disp) {
+   return (_glptr_ClearColorIuiEXT) (GET_by_offset(disp, _gloffset_ClearColorIuiEXT));
 }
 
-static inline void
-SET_VertexAttribI2uiEXT(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLuint, GLuint, GLuint))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribI2uiEXT, fn);
+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_VertexAttribI2uivEXT) (GLuint, const GLuint *);
+typedef void (GLAPIENTRYP _glptr_BindBufferOffsetEXT)(GLenum, GLuint, GLuint, GLintptr);
+#define CALL_BindBufferOffsetEXT(disp, parameters) \
+    (* GET_BindBufferOffsetEXT(disp)) parameters
+static INLINE _glptr_BindBufferOffsetEXT GET_BindBufferOffsetEXT(struct _glapi_table *disp) {
+   return (_glptr_BindBufferOffsetEXT) (GET_by_offset(disp, _gloffset_BindBufferOffsetEXT));
+}
 
-#define CALL_VertexAttribI2uivEXT(disp, parameters) \
-    (* GET_VertexAttribI2uivEXT(disp)) parameters
-static inline _glptr_VertexAttribI2uivEXT
-GET_VertexAttribI2uivEXT(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribI2uivEXT) (GET_by_offset
-                                          (disp,
-                                           _gloffset_VertexAttribI2uivEXT));
+static INLINE void SET_BindBufferOffsetEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLuint, GLintptr)) {
+   SET_by_offset(disp, _gloffset_BindBufferOffsetEXT, fn);
 }
 
-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_GetObjectParameterivAPPLE)(GLenum, GLuint, GLenum, GLint *);
+#define CALL_GetObjectParameterivAPPLE(disp, parameters) \
+    (* GET_GetObjectParameterivAPPLE(disp)) parameters
+static INLINE _glptr_GetObjectParameterivAPPLE GET_GetObjectParameterivAPPLE(struct _glapi_table *disp) {
+   return (_glptr_GetObjectParameterivAPPLE) (GET_by_offset(disp, _gloffset_GetObjectParameterivAPPLE));
 }
 
-typedef void (GLAPIENTRYP _glptr_VertexAttribI3iEXT) (GLuint, GLint, GLint,
-                                                      GLint);
-#define CALL_VertexAttribI3iEXT(disp, parameters) \
-    (* GET_VertexAttribI3iEXT(disp)) parameters
-static inline _glptr_VertexAttribI3iEXT
-GET_VertexAttribI3iEXT(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribI3iEXT) (GET_by_offset
-                                        (disp, _gloffset_VertexAttribI3iEXT));
+static INLINE void SET_GetObjectParameterivAPPLE(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLenum, GLint *)) {
+   SET_by_offset(disp, _gloffset_GetObjectParameterivAPPLE, fn);
 }
 
-static inline void
-SET_VertexAttribI3iEXT(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, GLint, GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribI3iEXT, fn);
+typedef GLenum (GLAPIENTRYP _glptr_ObjectPurgeableAPPLE)(GLenum, GLuint, GLenum);
+#define CALL_ObjectPurgeableAPPLE(disp, parameters) \
+    (* GET_ObjectPurgeableAPPLE(disp)) parameters
+static INLINE _glptr_ObjectPurgeableAPPLE GET_ObjectPurgeableAPPLE(struct _glapi_table *disp) {
+   return (_glptr_ObjectPurgeableAPPLE) (GET_by_offset(disp, _gloffset_ObjectPurgeableAPPLE));
 }
 
-typedef void (GLAPIENTRYP _glptr_VertexAttribI3ivEXT) (GLuint, const GLint *);
+static INLINE void SET_ObjectPurgeableAPPLE(struct _glapi_table *disp, GLenum (GLAPIENTRYP fn)(GLenum, GLuint, GLenum)) {
+   SET_by_offset(disp, _gloffset_ObjectPurgeableAPPLE, fn);
+}
 
-#define CALL_VertexAttribI3ivEXT(disp, parameters) \
-    (* GET_VertexAttribI3ivEXT(disp)) parameters
-static inline _glptr_VertexAttribI3ivEXT
-GET_VertexAttribI3ivEXT(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribI3ivEXT) (GET_by_offset
-                                         (disp, _gloffset_VertexAttribI3ivEXT));
+typedef GLenum (GLAPIENTRYP _glptr_ObjectUnpurgeableAPPLE)(GLenum, GLuint, GLenum);
+#define CALL_ObjectUnpurgeableAPPLE(disp, parameters) \
+    (* GET_ObjectUnpurgeableAPPLE(disp)) parameters
+static INLINE _glptr_ObjectUnpurgeableAPPLE GET_ObjectUnpurgeableAPPLE(struct _glapi_table *disp) {
+   return (_glptr_ObjectUnpurgeableAPPLE) (GET_by_offset(disp, _gloffset_ObjectUnpurgeableAPPLE));
 }
 
-static inline void
-SET_VertexAttribI3ivEXT(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLuint, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribI3ivEXT, fn);
+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_VertexAttribI3uiEXT) (GLuint, GLuint, GLuint,
-                                                       GLuint);
-#define CALL_VertexAttribI3uiEXT(disp, parameters) \
-    (* GET_VertexAttribI3uiEXT(disp)) parameters
-static inline _glptr_VertexAttribI3uiEXT
-GET_VertexAttribI3uiEXT(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribI3uiEXT) (GET_by_offset
-                                         (disp, _gloffset_VertexAttribI3uiEXT));
+typedef void (GLAPIENTRYP _glptr_ActiveProgramEXT)(GLuint);
+#define CALL_ActiveProgramEXT(disp, parameters) \
+    (* GET_ActiveProgramEXT(disp)) parameters
+static INLINE _glptr_ActiveProgramEXT GET_ActiveProgramEXT(struct _glapi_table *disp) {
+   return (_glptr_ActiveProgramEXT) (GET_by_offset(disp, _gloffset_ActiveProgramEXT));
 }
 
-static inline void
-SET_VertexAttribI3uiEXT(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLuint, GLuint, GLuint, GLuint))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribI3uiEXT, fn);
+static INLINE void SET_ActiveProgramEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) {
+   SET_by_offset(disp, _gloffset_ActiveProgramEXT, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_VertexAttribI3uivEXT) (GLuint, const GLuint *);
+typedef GLuint (GLAPIENTRYP _glptr_CreateShaderProgramEXT)(GLenum, const GLchar *);
+#define CALL_CreateShaderProgramEXT(disp, parameters) \
+    (* GET_CreateShaderProgramEXT(disp)) parameters
+static INLINE _glptr_CreateShaderProgramEXT GET_CreateShaderProgramEXT(struct _glapi_table *disp) {
+   return (_glptr_CreateShaderProgramEXT) (GET_by_offset(disp, _gloffset_CreateShaderProgramEXT));
+}
 
-#define CALL_VertexAttribI3uivEXT(disp, parameters) \
-    (* GET_VertexAttribI3uivEXT(disp)) parameters
-static inline _glptr_VertexAttribI3uivEXT
-GET_VertexAttribI3uivEXT(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribI3uivEXT) (GET_by_offset
-                                          (disp,
-                                           _gloffset_VertexAttribI3uivEXT));
+static INLINE void SET_CreateShaderProgramEXT(struct _glapi_table *disp, GLuint (GLAPIENTRYP fn)(GLenum, const GLchar *)) {
+   SET_by_offset(disp, _gloffset_CreateShaderProgramEXT, fn);
 }
 
-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_UseShaderProgramEXT)(GLenum, GLuint);
+#define CALL_UseShaderProgramEXT(disp, parameters) \
+    (* GET_UseShaderProgramEXT(disp)) parameters
+static INLINE _glptr_UseShaderProgramEXT GET_UseShaderProgramEXT(struct _glapi_table *disp) {
+   return (_glptr_UseShaderProgramEXT) (GET_by_offset(disp, _gloffset_UseShaderProgramEXT));
 }
 
-typedef void (GLAPIENTRYP _glptr_VertexAttribI4bvEXT) (GLuint, const GLbyte *);
+static INLINE void SET_UseShaderProgramEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) {
+   SET_by_offset(disp, _gloffset_UseShaderProgramEXT, fn);
+}
 
-#define CALL_VertexAttribI4bvEXT(disp, parameters) \
-    (* GET_VertexAttribI4bvEXT(disp)) parameters
-static inline _glptr_VertexAttribI4bvEXT
-GET_VertexAttribI4bvEXT(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribI4bvEXT) (GET_by_offset
-                                         (disp, _gloffset_VertexAttribI4bvEXT));
+typedef void (GLAPIENTRYP _glptr_TextureBarrierNV)(void);
+#define CALL_TextureBarrierNV(disp, parameters) \
+    (* GET_TextureBarrierNV(disp)) parameters
+static INLINE _glptr_TextureBarrierNV GET_TextureBarrierNV(struct _glapi_table *disp) {
+   return (_glptr_TextureBarrierNV) (GET_by_offset(disp, _gloffset_TextureBarrierNV));
 }
 
-static inline void
-SET_VertexAttribI4bvEXT(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLuint, const GLbyte *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribI4bvEXT, fn);
+static INLINE void SET_TextureBarrierNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) {
+   SET_by_offset(disp, _gloffset_TextureBarrierNV, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_VertexAttribI4iEXT) (GLuint, GLint, GLint,
-                                                      GLint, GLint);
-#define CALL_VertexAttribI4iEXT(disp, parameters) \
-    (* GET_VertexAttribI4iEXT(disp)) parameters
-static inline _glptr_VertexAttribI4iEXT
-GET_VertexAttribI4iEXT(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribI4iEXT) (GET_by_offset
-                                        (disp, _gloffset_VertexAttribI4iEXT));
+typedef void (GLAPIENTRYP _glptr_StencilFuncSeparateATI)(GLenum, GLenum, GLint, GLuint);
+#define CALL_StencilFuncSeparateATI(disp, parameters) \
+    (* GET_StencilFuncSeparateATI(disp)) parameters
+static INLINE _glptr_StencilFuncSeparateATI GET_StencilFuncSeparateATI(struct _glapi_table *disp) {
+   return (_glptr_StencilFuncSeparateATI) (GET_by_offset(disp, _gloffset_StencilFuncSeparateATI));
 }
 
-static inline void
-SET_VertexAttribI4iEXT(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLuint, GLint, GLint, GLint,
-                                              GLint))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribI4iEXT, fn);
+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_VertexAttribI4ivEXT) (GLuint, const GLint *);
+typedef void (GLAPIENTRYP _glptr_ProgramEnvParameters4fvEXT)(GLenum, GLuint, GLsizei, const GLfloat *);
+#define CALL_ProgramEnvParameters4fvEXT(disp, parameters) \
+    (* GET_ProgramEnvParameters4fvEXT(disp)) parameters
+static INLINE _glptr_ProgramEnvParameters4fvEXT GET_ProgramEnvParameters4fvEXT(struct _glapi_table *disp) {
+   return (_glptr_ProgramEnvParameters4fvEXT) (GET_by_offset(disp, _gloffset_ProgramEnvParameters4fvEXT));
+}
 
-#define CALL_VertexAttribI4ivEXT(disp, parameters) \
-    (* GET_VertexAttribI4ivEXT(disp)) parameters
-static inline _glptr_VertexAttribI4ivEXT
-GET_VertexAttribI4ivEXT(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribI4ivEXT) (GET_by_offset
-                                         (disp, _gloffset_VertexAttribI4ivEXT));
+static INLINE void SET_ProgramEnvParameters4fvEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLsizei, const GLfloat *)) {
+   SET_by_offset(disp, _gloffset_ProgramEnvParameters4fvEXT, fn);
 }
 
-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_ProgramLocalParameters4fvEXT)(GLenum, GLuint, GLsizei, const GLfloat *);
+#define CALL_ProgramLocalParameters4fvEXT(disp, parameters) \
+    (* GET_ProgramLocalParameters4fvEXT(disp)) parameters
+static INLINE _glptr_ProgramLocalParameters4fvEXT GET_ProgramLocalParameters4fvEXT(struct _glapi_table *disp) {
+   return (_glptr_ProgramLocalParameters4fvEXT) (GET_by_offset(disp, _gloffset_ProgramLocalParameters4fvEXT));
 }
 
-typedef void (GLAPIENTRYP _glptr_VertexAttribI4svEXT) (GLuint, const GLshort *);
+static INLINE void SET_ProgramLocalParameters4fvEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLsizei, const GLfloat *)) {
+   SET_by_offset(disp, _gloffset_ProgramLocalParameters4fvEXT, fn);
+}
 
-#define CALL_VertexAttribI4svEXT(disp, parameters) \
-    (* GET_VertexAttribI4svEXT(disp)) parameters
-static inline _glptr_VertexAttribI4svEXT
-GET_VertexAttribI4svEXT(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribI4svEXT) (GET_by_offset
-                                         (disp, _gloffset_VertexAttribI4svEXT));
+typedef void (GLAPIENTRYP _glptr_EGLImageTargetRenderbufferStorageOES)(GLenum, GLvoid *);
+#define CALL_EGLImageTargetRenderbufferStorageOES(disp, parameters) \
+    (* GET_EGLImageTargetRenderbufferStorageOES(disp)) parameters
+static INLINE _glptr_EGLImageTargetRenderbufferStorageOES GET_EGLImageTargetRenderbufferStorageOES(struct _glapi_table *disp) {
+   return (_glptr_EGLImageTargetRenderbufferStorageOES) (GET_by_offset(disp, _gloffset_EGLImageTargetRenderbufferStorageOES));
 }
 
-static inline void
-SET_VertexAttribI4svEXT(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLuint, const GLshort *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribI4svEXT, fn);
+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_VertexAttribI4ubvEXT) (GLuint,
-                                                        const GLubyte *);
-#define CALL_VertexAttribI4ubvEXT(disp, parameters) \
-    (* GET_VertexAttribI4ubvEXT(disp)) parameters
-static inline _glptr_VertexAttribI4ubvEXT
-GET_VertexAttribI4ubvEXT(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribI4ubvEXT) (GET_by_offset
-                                          (disp,
-                                           _gloffset_VertexAttribI4ubvEXT));
+typedef void (GLAPIENTRYP _glptr_EGLImageTargetTexture2DOES)(GLenum, GLvoid *);
+#define CALL_EGLImageTargetTexture2DOES(disp, parameters) \
+    (* GET_EGLImageTargetTexture2DOES(disp)) parameters
+static INLINE _glptr_EGLImageTargetTexture2DOES GET_EGLImageTargetTexture2DOES(struct _glapi_table *disp) {
+   return (_glptr_EGLImageTargetTexture2DOES) (GET_by_offset(disp, _gloffset_EGLImageTargetTexture2DOES));
 }
 
-static inline void
-SET_VertexAttribI4ubvEXT(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (GLuint, const GLubyte *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribI4ubvEXT, fn);
+static INLINE void SET_EGLImageTargetTexture2DOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLvoid *)) {
+   SET_by_offset(disp, _gloffset_EGLImageTargetTexture2DOES, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_VertexAttribI4uiEXT) (GLuint, GLuint, GLuint,
-                                                       GLuint, GLuint);
-#define CALL_VertexAttribI4uiEXT(disp, parameters) \
-    (* GET_VertexAttribI4uiEXT(disp)) parameters
-static inline _glptr_VertexAttribI4uiEXT
-GET_VertexAttribI4uiEXT(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribI4uiEXT) (GET_by_offset
-                                         (disp, _gloffset_VertexAttribI4uiEXT));
+typedef void (GLAPIENTRYP _glptr_AlphaFuncx)(GLenum, GLclampx);
+#define CALL_AlphaFuncx(disp, parameters) \
+    (* GET_AlphaFuncx(disp)) parameters
+static INLINE _glptr_AlphaFuncx GET_AlphaFuncx(struct _glapi_table *disp) {
+   return (_glptr_AlphaFuncx) (GET_by_offset(disp, _gloffset_AlphaFuncx));
 }
 
-static inline void
-SET_VertexAttribI4uiEXT(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLuint, GLuint, GLuint, GLuint,
-                                               GLuint))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribI4uiEXT, fn);
+static INLINE void SET_AlphaFuncx(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLclampx)) {
+   SET_by_offset(disp, _gloffset_AlphaFuncx, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_VertexAttribI4uivEXT) (GLuint, const GLuint *);
+typedef void (GLAPIENTRYP _glptr_ClearColorx)(GLclampx, GLclampx, GLclampx, GLclampx);
+#define CALL_ClearColorx(disp, parameters) \
+    (* GET_ClearColorx(disp)) parameters
+static INLINE _glptr_ClearColorx GET_ClearColorx(struct _glapi_table *disp) {
+   return (_glptr_ClearColorx) (GET_by_offset(disp, _gloffset_ClearColorx));
+}
 
-#define CALL_VertexAttribI4uivEXT(disp, parameters) \
-    (* GET_VertexAttribI4uivEXT(disp)) parameters
-static inline _glptr_VertexAttribI4uivEXT
-GET_VertexAttribI4uivEXT(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribI4uivEXT) (GET_by_offset
-                                          (disp,
-                                           _gloffset_VertexAttribI4uivEXT));
-}
-
-static inline void
-SET_VertexAttribI4uivEXT(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (GLuint, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribI4uivEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttribI4usvEXT) (GLuint,
-                                                        const GLushort *);
-#define CALL_VertexAttribI4usvEXT(disp, parameters) \
-    (* GET_VertexAttribI4usvEXT(disp)) parameters
-static inline _glptr_VertexAttribI4usvEXT
-GET_VertexAttribI4usvEXT(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribI4usvEXT) (GET_by_offset
-                                          (disp,
-                                           _gloffset_VertexAttribI4usvEXT));
-}
-
-static inline void
-SET_VertexAttribI4usvEXT(struct _glapi_table *disp,
-                         void (GLAPIENTRYP fn) (GLuint, const GLushort *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribI4usvEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_VertexAttribIPointerEXT) (GLuint, GLint,
-                                                           GLenum, GLsizei,
-                                                           const GLvoid *);
-#define CALL_VertexAttribIPointerEXT(disp, parameters) \
-    (* GET_VertexAttribIPointerEXT(disp)) parameters
-static inline _glptr_VertexAttribIPointerEXT
-GET_VertexAttribIPointerEXT(struct _glapi_table *disp)
-{
-    return (_glptr_VertexAttribIPointerEXT) (GET_by_offset
-                                             (disp,
-                                              _gloffset_VertexAttribIPointerEXT));
-}
-
-static inline void
-SET_VertexAttribIPointerEXT(struct _glapi_table *disp,
-                            void (GLAPIENTRYP fn) (GLuint, GLint, GLenum,
-                                                   GLsizei, const GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_VertexAttribIPointerEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_FramebufferTextureLayerEXT) (GLenum, GLenum,
-                                                              GLuint, GLint,
-                                                              GLint);
-#define CALL_FramebufferTextureLayerEXT(disp, parameters) \
-    (* GET_FramebufferTextureLayerEXT(disp)) parameters
-static inline _glptr_FramebufferTextureLayerEXT
-GET_FramebufferTextureLayerEXT(struct _glapi_table *disp)
-{
-    return (_glptr_FramebufferTextureLayerEXT) (GET_by_offset
-                                                (disp,
-                                                 _gloffset_FramebufferTextureLayerEXT));
-}
-
-static inline void
-SET_FramebufferTextureLayerEXT(struct _glapi_table *disp,
-                               void (GLAPIENTRYP fn) (GLenum, GLenum, GLuint,
-                                                      GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_FramebufferTextureLayerEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ColorMaskIndexedEXT) (GLuint, GLboolean,
-                                                       GLboolean, GLboolean,
-                                                       GLboolean);
-#define CALL_ColorMaskIndexedEXT(disp, parameters) \
-    (* GET_ColorMaskIndexedEXT(disp)) parameters
-static inline _glptr_ColorMaskIndexedEXT
-GET_ColorMaskIndexedEXT(struct _glapi_table *disp)
-{
-    return (_glptr_ColorMaskIndexedEXT) (GET_by_offset
-                                         (disp, _gloffset_ColorMaskIndexedEXT));
-}
-
-static inline void
-SET_ColorMaskIndexedEXT(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLuint, GLboolean, GLboolean,
-                                               GLboolean, GLboolean))
-{
-    SET_by_offset(disp, _gloffset_ColorMaskIndexedEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_DisableIndexedEXT) (GLenum, GLuint);
-
-#define CALL_DisableIndexedEXT(disp, parameters) \
-    (* GET_DisableIndexedEXT(disp)) parameters
-static inline _glptr_DisableIndexedEXT
-GET_DisableIndexedEXT(struct _glapi_table *disp)
-{
-    return (_glptr_DisableIndexedEXT) (GET_by_offset
-                                       (disp, _gloffset_DisableIndexedEXT));
-}
-
-static inline void
-SET_DisableIndexedEXT(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_DisableIndexedEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_EnableIndexedEXT) (GLenum, GLuint);
-
-#define CALL_EnableIndexedEXT(disp, parameters) \
-    (* GET_EnableIndexedEXT(disp)) parameters
-static inline _glptr_EnableIndexedEXT
-GET_EnableIndexedEXT(struct _glapi_table *disp)
-{
-    return (_glptr_EnableIndexedEXT) (GET_by_offset
-                                      (disp, _gloffset_EnableIndexedEXT));
-}
-
-static inline void
-SET_EnableIndexedEXT(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_EnableIndexedEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetBooleanIndexedvEXT) (GLenum, GLuint,
-                                                         GLboolean *);
-#define CALL_GetBooleanIndexedvEXT(disp, parameters) \
-    (* GET_GetBooleanIndexedvEXT(disp)) parameters
-static inline _glptr_GetBooleanIndexedvEXT
-GET_GetBooleanIndexedvEXT(struct _glapi_table *disp)
-{
-    return (_glptr_GetBooleanIndexedvEXT) (GET_by_offset
-                                           (disp,
-                                            _gloffset_GetBooleanIndexedvEXT));
-}
+static INLINE void SET_ClearColorx(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLclampx, GLclampx, GLclampx, GLclampx)) {
+   SET_by_offset(disp, _gloffset_ClearColorx, fn);
+}
 
-static inline void
-SET_GetBooleanIndexedvEXT(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (GLenum, GLuint, GLboolean *))
-{
-    SET_by_offset(disp, _gloffset_GetBooleanIndexedvEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetIntegerIndexedvEXT) (GLenum, GLuint,
-                                                         GLint *);
-#define CALL_GetIntegerIndexedvEXT(disp, parameters) \
-    (* GET_GetIntegerIndexedvEXT(disp)) parameters
-static inline _glptr_GetIntegerIndexedvEXT
-GET_GetIntegerIndexedvEXT(struct _glapi_table *disp)
-{
-    return (_glptr_GetIntegerIndexedvEXT) (GET_by_offset
-                                           (disp,
-                                            _gloffset_GetIntegerIndexedvEXT));
+typedef void (GLAPIENTRYP _glptr_ClearDepthx)(GLclampx);
+#define CALL_ClearDepthx(disp, parameters) \
+    (* GET_ClearDepthx(disp)) parameters
+static INLINE _glptr_ClearDepthx GET_ClearDepthx(struct _glapi_table *disp) {
+   return (_glptr_ClearDepthx) (GET_by_offset(disp, _gloffset_ClearDepthx));
 }
 
-static inline void
-SET_GetIntegerIndexedvEXT(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (GLenum, GLuint, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetIntegerIndexedvEXT, fn);
+static INLINE void SET_ClearDepthx(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLclampx)) {
+   SET_by_offset(disp, _gloffset_ClearDepthx, fn);
 }
 
-typedef GLboolean(GLAPIENTRYP _glptr_IsEnabledIndexedEXT) (GLenum, GLuint);
+typedef void (GLAPIENTRYP _glptr_Color4x)(GLfixed, GLfixed, GLfixed, GLfixed);
+#define CALL_Color4x(disp, parameters) \
+    (* GET_Color4x(disp)) parameters
+static INLINE _glptr_Color4x GET_Color4x(struct _glapi_table *disp) {
+   return (_glptr_Color4x) (GET_by_offset(disp, _gloffset_Color4x));
+}
 
-#define CALL_IsEnabledIndexedEXT(disp, parameters) \
-    (* GET_IsEnabledIndexedEXT(disp)) parameters
-static inline _glptr_IsEnabledIndexedEXT
-GET_IsEnabledIndexedEXT(struct _glapi_table *disp)
-{
-    return (_glptr_IsEnabledIndexedEXT) (GET_by_offset
-                                         (disp, _gloffset_IsEnabledIndexedEXT));
+static INLINE void SET_Color4x(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfixed, GLfixed, GLfixed, GLfixed)) {
+   SET_by_offset(disp, _gloffset_Color4x, fn);
 }
 
-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_DepthRangex)(GLclampx, GLclampx);
+#define CALL_DepthRangex(disp, parameters) \
+    (* GET_DepthRangex(disp)) parameters
+static INLINE _glptr_DepthRangex GET_DepthRangex(struct _glapi_table *disp) {
+   return (_glptr_DepthRangex) (GET_by_offset(disp, _gloffset_DepthRangex));
 }
 
-typedef void (GLAPIENTRYP _glptr_ClearColorIiEXT) (GLint, GLint, GLint, GLint);
+static INLINE void SET_DepthRangex(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLclampx, GLclampx)) {
+   SET_by_offset(disp, _gloffset_DepthRangex, fn);
+}
 
-#define CALL_ClearColorIiEXT(disp, parameters) \
-    (* GET_ClearColorIiEXT(disp)) parameters
-static inline _glptr_ClearColorIiEXT
-GET_ClearColorIiEXT(struct _glapi_table *disp)
-{
-    return (_glptr_ClearColorIiEXT) (GET_by_offset
-                                     (disp, _gloffset_ClearColorIiEXT));
+typedef void (GLAPIENTRYP _glptr_Fogx)(GLenum, GLfixed);
+#define CALL_Fogx(disp, parameters) \
+    (* GET_Fogx(disp)) parameters
+static INLINE _glptr_Fogx GET_Fogx(struct _glapi_table *disp) {
+   return (_glptr_Fogx) (GET_by_offset(disp, _gloffset_Fogx));
 }
 
-static inline void
-SET_ClearColorIiEXT(struct _glapi_table *disp,
-                    void (GLAPIENTRYP fn) (GLint, GLint, GLint, GLint))
-{
-    SET_by_offset(disp, _gloffset_ClearColorIiEXT, fn);
+static INLINE void SET_Fogx(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfixed)) {
+   SET_by_offset(disp, _gloffset_Fogx, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_ClearColorIuiEXT) (GLuint, GLuint, GLuint,
-                                                    GLuint);
-#define CALL_ClearColorIuiEXT(disp, parameters) \
-    (* GET_ClearColorIuiEXT(disp)) parameters
-static inline _glptr_ClearColorIuiEXT
-GET_ClearColorIuiEXT(struct _glapi_table *disp)
-{
-    return (_glptr_ClearColorIuiEXT) (GET_by_offset
-                                      (disp, _gloffset_ClearColorIuiEXT));
-}
-
-static inline void
-SET_ClearColorIuiEXT(struct _glapi_table *disp,
-                     void (GLAPIENTRYP fn) (GLuint, GLuint, GLuint, GLuint))
-{
-    SET_by_offset(disp, _gloffset_ClearColorIuiEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetTexParameterIivEXT) (GLenum, GLenum,
-                                                         GLint *);
-#define CALL_GetTexParameterIivEXT(disp, parameters) \
-    (* GET_GetTexParameterIivEXT(disp)) parameters
-static inline _glptr_GetTexParameterIivEXT
-GET_GetTexParameterIivEXT(struct _glapi_table *disp)
-{
-    return (_glptr_GetTexParameterIivEXT) (GET_by_offset
-                                           (disp,
-                                            _gloffset_GetTexParameterIivEXT));
-}
-
-static inline void
-SET_GetTexParameterIivEXT(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (GLenum, GLenum, GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetTexParameterIivEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetTexParameterIuivEXT) (GLenum, GLenum,
-                                                          GLuint *);
-#define CALL_GetTexParameterIuivEXT(disp, parameters) \
-    (* GET_GetTexParameterIuivEXT(disp)) parameters
-static inline _glptr_GetTexParameterIuivEXT
-GET_GetTexParameterIuivEXT(struct _glapi_table *disp)
-{
-    return (_glptr_GetTexParameterIuivEXT) (GET_by_offset
-                                            (disp,
-                                             _gloffset_GetTexParameterIuivEXT));
-}
-
-static inline void
-SET_GetTexParameterIuivEXT(struct _glapi_table *disp,
-                           void (GLAPIENTRYP fn) (GLenum, GLenum, GLuint *))
-{
-    SET_by_offset(disp, _gloffset_GetTexParameterIuivEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexParameterIivEXT) (GLenum, GLenum,
-                                                      const GLint *);
-#define CALL_TexParameterIivEXT(disp, parameters) \
-    (* GET_TexParameterIivEXT(disp)) parameters
-static inline _glptr_TexParameterIivEXT
-GET_TexParameterIivEXT(struct _glapi_table *disp)
-{
-    return (_glptr_TexParameterIivEXT) (GET_by_offset
-                                        (disp, _gloffset_TexParameterIivEXT));
-}
+typedef void (GLAPIENTRYP _glptr_Fogxv)(GLenum, const GLfixed *);
+#define CALL_Fogxv(disp, parameters) \
+    (* GET_Fogxv(disp)) parameters
+static INLINE _glptr_Fogxv GET_Fogxv(struct _glapi_table *disp) {
+   return (_glptr_Fogxv) (GET_by_offset(disp, _gloffset_Fogxv));
+}
 
-static inline void
-SET_TexParameterIivEXT(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, GLenum, const GLint *))
-{
-    SET_by_offset(disp, _gloffset_TexParameterIivEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TexParameterIuivEXT) (GLenum, GLenum,
-                                                       const GLuint *);
-#define CALL_TexParameterIuivEXT(disp, parameters) \
-    (* GET_TexParameterIuivEXT(disp)) parameters
-static inline _glptr_TexParameterIuivEXT
-GET_TexParameterIuivEXT(struct _glapi_table *disp)
-{
-    return (_glptr_TexParameterIuivEXT) (GET_by_offset
-                                         (disp, _gloffset_TexParameterIuivEXT));
-}
-
-static inline void
-SET_TexParameterIuivEXT(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, GLenum, const GLuint *))
-{
-    SET_by_offset(disp, _gloffset_TexParameterIuivEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_BeginConditionalRenderNV) (GLuint, GLenum);
-
-#define CALL_BeginConditionalRenderNV(disp, parameters) \
-    (* GET_BeginConditionalRenderNV(disp)) parameters
-static inline _glptr_BeginConditionalRenderNV
-GET_BeginConditionalRenderNV(struct _glapi_table *disp)
-{
-    return (_glptr_BeginConditionalRenderNV) (GET_by_offset
-                                              (disp,
-                                               _gloffset_BeginConditionalRenderNV));
-}
-
-static inline void
-SET_BeginConditionalRenderNV(struct _glapi_table *disp,
-                             void (GLAPIENTRYP fn) (GLuint, GLenum))
-{
-    SET_by_offset(disp, _gloffset_BeginConditionalRenderNV, fn);
+static INLINE void SET_Fogxv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLfixed *)) {
+   SET_by_offset(disp, _gloffset_Fogxv, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_EndConditionalRenderNV) (void);
-
-#define CALL_EndConditionalRenderNV(disp, parameters) \
-    (* GET_EndConditionalRenderNV(disp)) parameters
-static inline _glptr_EndConditionalRenderNV
-GET_EndConditionalRenderNV(struct _glapi_table *disp)
-{
-    return (_glptr_EndConditionalRenderNV) (GET_by_offset
-                                            (disp,
-                                             _gloffset_EndConditionalRenderNV));
-}
+typedef void (GLAPIENTRYP _glptr_Frustumf)(GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+#define CALL_Frustumf(disp, parameters) \
+    (* GET_Frustumf(disp)) parameters
+static INLINE _glptr_Frustumf GET_Frustumf(struct _glapi_table *disp) {
+   return (_glptr_Frustumf) (GET_by_offset(disp, _gloffset_Frustumf));
+}
 
-static inline void
-SET_EndConditionalRenderNV(struct _glapi_table *disp,
-                           void (GLAPIENTRYP fn) (void))
-{
-    SET_by_offset(disp, _gloffset_EndConditionalRenderNV, fn);
+static INLINE void SET_Frustumf(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat)) {
+   SET_by_offset(disp, _gloffset_Frustumf, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_BeginTransformFeedbackEXT) (GLenum);
+typedef void (GLAPIENTRYP _glptr_Frustumx)(GLfixed, GLfixed, GLfixed, GLfixed, GLfixed, GLfixed);
+#define CALL_Frustumx(disp, parameters) \
+    (* GET_Frustumx(disp)) parameters
+static INLINE _glptr_Frustumx GET_Frustumx(struct _glapi_table *disp) {
+   return (_glptr_Frustumx) (GET_by_offset(disp, _gloffset_Frustumx));
+}
 
-#define CALL_BeginTransformFeedbackEXT(disp, parameters) \
-    (* GET_BeginTransformFeedbackEXT(disp)) parameters
-static inline _glptr_BeginTransformFeedbackEXT
-GET_BeginTransformFeedbackEXT(struct _glapi_table *disp)
-{
-    return (_glptr_BeginTransformFeedbackEXT) (GET_by_offset
-                                               (disp,
-                                                _gloffset_BeginTransformFeedbackEXT));
+static INLINE void SET_Frustumx(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfixed, GLfixed, GLfixed, GLfixed, GLfixed, GLfixed)) {
+   SET_by_offset(disp, _gloffset_Frustumx, fn);
 }
 
-static inline void
-SET_BeginTransformFeedbackEXT(struct _glapi_table *disp,
-                              void (GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_BeginTransformFeedbackEXT, fn);
+typedef void (GLAPIENTRYP _glptr_LightModelx)(GLenum, GLfixed);
+#define CALL_LightModelx(disp, parameters) \
+    (* GET_LightModelx(disp)) parameters
+static INLINE _glptr_LightModelx GET_LightModelx(struct _glapi_table *disp) {
+   return (_glptr_LightModelx) (GET_by_offset(disp, _gloffset_LightModelx));
 }
 
-typedef void (GLAPIENTRYP _glptr_BindBufferBaseEXT) (GLenum, GLuint, GLuint);
+static INLINE void SET_LightModelx(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfixed)) {
+   SET_by_offset(disp, _gloffset_LightModelx, fn);
+}
 
-#define CALL_BindBufferBaseEXT(disp, parameters) \
-    (* GET_BindBufferBaseEXT(disp)) parameters
-static inline _glptr_BindBufferBaseEXT
-GET_BindBufferBaseEXT(struct _glapi_table *disp)
-{
-    return (_glptr_BindBufferBaseEXT) (GET_by_offset
-                                       (disp, _gloffset_BindBufferBaseEXT));
+typedef void (GLAPIENTRYP _glptr_LightModelxv)(GLenum, const GLfixed *);
+#define CALL_LightModelxv(disp, parameters) \
+    (* GET_LightModelxv(disp)) parameters
+static INLINE _glptr_LightModelxv GET_LightModelxv(struct _glapi_table *disp) {
+   return (_glptr_LightModelxv) (GET_by_offset(disp, _gloffset_LightModelxv));
 }
 
-static inline void
-SET_BindBufferBaseEXT(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLenum, GLuint, GLuint))
-{
-    SET_by_offset(disp, _gloffset_BindBufferBaseEXT, fn);
+static INLINE void SET_LightModelxv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLfixed *)) {
+   SET_by_offset(disp, _gloffset_LightModelxv, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_BindBufferOffsetEXT) (GLenum, GLuint, GLuint,
-                                                       GLintptr);
-#define CALL_BindBufferOffsetEXT(disp, parameters) \
-    (* GET_BindBufferOffsetEXT(disp)) parameters
-static inline _glptr_BindBufferOffsetEXT
-GET_BindBufferOffsetEXT(struct _glapi_table *disp)
-{
-    return (_glptr_BindBufferOffsetEXT) (GET_by_offset
-                                         (disp, _gloffset_BindBufferOffsetEXT));
-}
-
-static inline void
-SET_BindBufferOffsetEXT(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, GLuint, GLuint,
-                                               GLintptr))
-{
-    SET_by_offset(disp, _gloffset_BindBufferOffsetEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_BindBufferRangeEXT) (GLenum, GLuint, GLuint,
-                                                      GLintptr, GLsizeiptr);
-#define CALL_BindBufferRangeEXT(disp, parameters) \
-    (* GET_BindBufferRangeEXT(disp)) parameters
-static inline _glptr_BindBufferRangeEXT
-GET_BindBufferRangeEXT(struct _glapi_table *disp)
-{
-    return (_glptr_BindBufferRangeEXT) (GET_by_offset
-                                        (disp, _gloffset_BindBufferRangeEXT));
-}
-
-static inline void
-SET_BindBufferRangeEXT(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum, GLuint, GLuint, GLintptr,
-                                              GLsizeiptr))
-{
-    SET_by_offset(disp, _gloffset_BindBufferRangeEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_EndTransformFeedbackEXT) (void);
-
-#define CALL_EndTransformFeedbackEXT(disp, parameters) \
-    (* GET_EndTransformFeedbackEXT(disp)) parameters
-static inline _glptr_EndTransformFeedbackEXT
-GET_EndTransformFeedbackEXT(struct _glapi_table *disp)
-{
-    return (_glptr_EndTransformFeedbackEXT) (GET_by_offset
-                                             (disp,
-                                              _gloffset_EndTransformFeedbackEXT));
-}
-
-static inline void
-SET_EndTransformFeedbackEXT(struct _glapi_table *disp,
-                            void (GLAPIENTRYP fn) (void))
-{
-    SET_by_offset(disp, _gloffset_EndTransformFeedbackEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetTransformFeedbackVaryingEXT) (GLuint,
-                                                                  GLuint,
-                                                                  GLsizei,
-                                                                  GLsizei *,
-                                                                  GLsizei *,
-                                                                  GLenum *,
-                                                                  GLchar *);
-#define CALL_GetTransformFeedbackVaryingEXT(disp, parameters) \
-    (* GET_GetTransformFeedbackVaryingEXT(disp)) parameters
-static inline _glptr_GetTransformFeedbackVaryingEXT
-GET_GetTransformFeedbackVaryingEXT(struct _glapi_table *disp)
-{
-    return (_glptr_GetTransformFeedbackVaryingEXT) (GET_by_offset
-                                                    (disp,
-                                                     _gloffset_GetTransformFeedbackVaryingEXT));
-}
-
-static inline void
-SET_GetTransformFeedbackVaryingEXT(struct _glapi_table *disp,
-                                   void (GLAPIENTRYP fn) (GLuint, GLuint,
-                                                          GLsizei, GLsizei *,
-                                                          GLsizei *, GLenum *,
-                                                          GLchar *))
-{
-    SET_by_offset(disp, _gloffset_GetTransformFeedbackVaryingEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TransformFeedbackVaryingsEXT) (GLuint, GLsizei,
-                                                                const char **,
-                                                                GLenum);
-#define CALL_TransformFeedbackVaryingsEXT(disp, parameters) \
-    (* GET_TransformFeedbackVaryingsEXT(disp)) parameters
-static inline _glptr_TransformFeedbackVaryingsEXT
-GET_TransformFeedbackVaryingsEXT(struct _glapi_table *disp)
-{
-    return (_glptr_TransformFeedbackVaryingsEXT) (GET_by_offset
-                                                  (disp,
-                                                   _gloffset_TransformFeedbackVaryingsEXT));
-}
-
-static inline void
-SET_TransformFeedbackVaryingsEXT(struct _glapi_table *disp,
-                                 void (GLAPIENTRYP fn) (GLuint, GLsizei,
-                                                        const char **, GLenum))
-{
-    SET_by_offset(disp, _gloffset_TransformFeedbackVaryingsEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ProvokingVertexEXT) (GLenum);
-
-#define CALL_ProvokingVertexEXT(disp, parameters) \
-    (* GET_ProvokingVertexEXT(disp)) parameters
-static inline _glptr_ProvokingVertexEXT
-GET_ProvokingVertexEXT(struct _glapi_table *disp)
-{
-    return (_glptr_ProvokingVertexEXT) (GET_by_offset
-                                        (disp, _gloffset_ProvokingVertexEXT));
-}
-
-static inline void
-SET_ProvokingVertexEXT(struct _glapi_table *disp,
-                       void (GLAPIENTRYP fn) (GLenum))
-{
-    SET_by_offset(disp, _gloffset_ProvokingVertexEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetTexParameterPointervAPPLE) (GLenum, GLenum,
-                                                                GLvoid **);
-#define CALL_GetTexParameterPointervAPPLE(disp, parameters) \
-    (* GET_GetTexParameterPointervAPPLE(disp)) parameters
-static inline _glptr_GetTexParameterPointervAPPLE
-GET_GetTexParameterPointervAPPLE(struct _glapi_table *disp)
-{
-    return (_glptr_GetTexParameterPointervAPPLE) (GET_by_offset
-                                                  (disp,
-                                                   _gloffset_GetTexParameterPointervAPPLE));
-}
-
-static inline void
-SET_GetTexParameterPointervAPPLE(struct _glapi_table *disp,
-                                 void (GLAPIENTRYP fn) (GLenum, GLenum,
-                                                        GLvoid **))
-{
-    SET_by_offset(disp, _gloffset_GetTexParameterPointervAPPLE, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_TextureRangeAPPLE) (GLenum, GLsizei, GLvoid *);
-
-#define CALL_TextureRangeAPPLE(disp, parameters) \
-    (* GET_TextureRangeAPPLE(disp)) parameters
-static inline _glptr_TextureRangeAPPLE
-GET_TextureRangeAPPLE(struct _glapi_table *disp)
-{
-    return (_glptr_TextureRangeAPPLE) (GET_by_offset
-                                       (disp, _gloffset_TextureRangeAPPLE));
-}
-
-static inline void
-SET_TextureRangeAPPLE(struct _glapi_table *disp,
-                      void (GLAPIENTRYP fn) (GLenum, GLsizei, GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_TextureRangeAPPLE, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetObjectParameterivAPPLE) (GLenum, GLuint,
-                                                             GLenum, GLint *);
-#define CALL_GetObjectParameterivAPPLE(disp, parameters) \
-    (* GET_GetObjectParameterivAPPLE(disp)) parameters
-static inline _glptr_GetObjectParameterivAPPLE
-GET_GetObjectParameterivAPPLE(struct _glapi_table *disp)
-{
-    return (_glptr_GetObjectParameterivAPPLE) (GET_by_offset
-                                               (disp,
-                                                _gloffset_GetObjectParameterivAPPLE));
+typedef void (GLAPIENTRYP _glptr_Lightx)(GLenum, GLenum, GLfixed);
+#define CALL_Lightx(disp, parameters) \
+    (* GET_Lightx(disp)) parameters
+static INLINE _glptr_Lightx GET_Lightx(struct _glapi_table *disp) {
+   return (_glptr_Lightx) (GET_by_offset(disp, _gloffset_Lightx));
 }
 
-static inline void
-SET_GetObjectParameterivAPPLE(struct _glapi_table *disp,
-                              void (GLAPIENTRYP fn) (GLenum, GLuint, GLenum,
-                                                     GLint *))
-{
-    SET_by_offset(disp, _gloffset_GetObjectParameterivAPPLE, fn);
+static INLINE void SET_Lightx(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfixed)) {
+   SET_by_offset(disp, _gloffset_Lightx, fn);
 }
 
-typedef GLenum(GLAPIENTRYP _glptr_ObjectPurgeableAPPLE) (GLenum, GLuint,
-                                                         GLenum);
-#define CALL_ObjectPurgeableAPPLE(disp, parameters) \
-    (* GET_ObjectPurgeableAPPLE(disp)) parameters
-static inline _glptr_ObjectPurgeableAPPLE
-GET_ObjectPurgeableAPPLE(struct _glapi_table *disp)
-{
-    return (_glptr_ObjectPurgeableAPPLE) (GET_by_offset
-                                          (disp,
-                                           _gloffset_ObjectPurgeableAPPLE));
+typedef void (GLAPIENTRYP _glptr_Lightxv)(GLenum, GLenum, const GLfixed *);
+#define CALL_Lightxv(disp, parameters) \
+    (* GET_Lightxv(disp)) parameters
+static INLINE _glptr_Lightxv GET_Lightxv(struct _glapi_table *disp) {
+   return (_glptr_Lightxv) (GET_by_offset(disp, _gloffset_Lightxv));
 }
 
-static inline void
-SET_ObjectPurgeableAPPLE(struct _glapi_table *disp,
-                         GLenum(GLAPIENTRYP fn) (GLenum, GLuint, GLenum))
-{
-    SET_by_offset(disp, _gloffset_ObjectPurgeableAPPLE, fn);
+static INLINE void SET_Lightxv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLfixed *)) {
+   SET_by_offset(disp, _gloffset_Lightxv, fn);
 }
 
-typedef GLenum(GLAPIENTRYP _glptr_ObjectUnpurgeableAPPLE) (GLenum, GLuint,
-                                                           GLenum);
-#define CALL_ObjectUnpurgeableAPPLE(disp, parameters) \
-    (* GET_ObjectUnpurgeableAPPLE(disp)) parameters
-static inline _glptr_ObjectUnpurgeableAPPLE
-GET_ObjectUnpurgeableAPPLE(struct _glapi_table *disp)
-{
-    return (_glptr_ObjectUnpurgeableAPPLE) (GET_by_offset
-                                            (disp,
-                                             _gloffset_ObjectUnpurgeableAPPLE));
+typedef void (GLAPIENTRYP _glptr_LineWidthx)(GLfixed);
+#define CALL_LineWidthx(disp, parameters) \
+    (* GET_LineWidthx(disp)) parameters
+static INLINE _glptr_LineWidthx GET_LineWidthx(struct _glapi_table *disp) {
+   return (_glptr_LineWidthx) (GET_by_offset(disp, _gloffset_LineWidthx));
 }
 
-static inline void
-SET_ObjectUnpurgeableAPPLE(struct _glapi_table *disp,
-                           GLenum(GLAPIENTRYP fn) (GLenum, GLuint, GLenum))
-{
-    SET_by_offset(disp, _gloffset_ObjectUnpurgeableAPPLE, fn);
+static INLINE void SET_LineWidthx(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfixed)) {
+   SET_by_offset(disp, _gloffset_LineWidthx, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_ActiveProgramEXT) (GLuint);
+typedef void (GLAPIENTRYP _glptr_LoadMatrixx)(const GLfixed *);
+#define CALL_LoadMatrixx(disp, parameters) \
+    (* GET_LoadMatrixx(disp)) parameters
+static INLINE _glptr_LoadMatrixx GET_LoadMatrixx(struct _glapi_table *disp) {
+   return (_glptr_LoadMatrixx) (GET_by_offset(disp, _gloffset_LoadMatrixx));
+}
 
-#define CALL_ActiveProgramEXT(disp, parameters) \
-    (* GET_ActiveProgramEXT(disp)) parameters
-static inline _glptr_ActiveProgramEXT
-GET_ActiveProgramEXT(struct _glapi_table *disp)
-{
-    return (_glptr_ActiveProgramEXT) (GET_by_offset
-                                      (disp, _gloffset_ActiveProgramEXT));
+static INLINE void SET_LoadMatrixx(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfixed *)) {
+   SET_by_offset(disp, _gloffset_LoadMatrixx, fn);
 }
 
-static inline void
-SET_ActiveProgramEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn) (GLuint))
-{
-    SET_by_offset(disp, _gloffset_ActiveProgramEXT, fn);
+typedef void (GLAPIENTRYP _glptr_Materialx)(GLenum, GLenum, GLfixed);
+#define CALL_Materialx(disp, parameters) \
+    (* GET_Materialx(disp)) parameters
+static INLINE _glptr_Materialx GET_Materialx(struct _glapi_table *disp) {
+   return (_glptr_Materialx) (GET_by_offset(disp, _gloffset_Materialx));
 }
 
-typedef GLuint(GLAPIENTRYP _glptr_CreateShaderProgramEXT) (GLenum,
-                                                           const GLchar *);
-#define CALL_CreateShaderProgramEXT(disp, parameters) \
-    (* GET_CreateShaderProgramEXT(disp)) parameters
-static inline _glptr_CreateShaderProgramEXT
-GET_CreateShaderProgramEXT(struct _glapi_table *disp)
-{
-    return (_glptr_CreateShaderProgramEXT) (GET_by_offset
-                                            (disp,
-                                             _gloffset_CreateShaderProgramEXT));
+static INLINE void SET_Materialx(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfixed)) {
+   SET_by_offset(disp, _gloffset_Materialx, fn);
 }
 
-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_Materialxv)(GLenum, GLenum, const GLfixed *);
+#define CALL_Materialxv(disp, parameters) \
+    (* GET_Materialxv(disp)) parameters
+static INLINE _glptr_Materialxv GET_Materialxv(struct _glapi_table *disp) {
+   return (_glptr_Materialxv) (GET_by_offset(disp, _gloffset_Materialxv));
 }
 
-typedef void (GLAPIENTRYP _glptr_UseShaderProgramEXT) (GLenum, GLuint);
+static INLINE void SET_Materialxv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLfixed *)) {
+   SET_by_offset(disp, _gloffset_Materialxv, fn);
+}
 
-#define CALL_UseShaderProgramEXT(disp, parameters) \
-    (* GET_UseShaderProgramEXT(disp)) parameters
-static inline _glptr_UseShaderProgramEXT
-GET_UseShaderProgramEXT(struct _glapi_table *disp)
-{
-    return (_glptr_UseShaderProgramEXT) (GET_by_offset
-                                         (disp, _gloffset_UseShaderProgramEXT));
+typedef void (GLAPIENTRYP _glptr_MultMatrixx)(const GLfixed *);
+#define CALL_MultMatrixx(disp, parameters) \
+    (* GET_MultMatrixx(disp)) parameters
+static INLINE _glptr_MultMatrixx GET_MultMatrixx(struct _glapi_table *disp) {
+   return (_glptr_MultMatrixx) (GET_by_offset(disp, _gloffset_MultMatrixx));
 }
 
-static inline void
-SET_UseShaderProgramEXT(struct _glapi_table *disp,
-                        void (GLAPIENTRYP fn) (GLenum, GLuint))
-{
-    SET_by_offset(disp, _gloffset_UseShaderProgramEXT, fn);
+static INLINE void SET_MultMatrixx(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfixed *)) {
+   SET_by_offset(disp, _gloffset_MultMatrixx, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_TextureBarrierNV) (void);
+typedef void (GLAPIENTRYP _glptr_MultiTexCoord4x)(GLenum, GLfixed, GLfixed, GLfixed, GLfixed);
+#define CALL_MultiTexCoord4x(disp, parameters) \
+    (* GET_MultiTexCoord4x(disp)) parameters
+static INLINE _glptr_MultiTexCoord4x GET_MultiTexCoord4x(struct _glapi_table *disp) {
+   return (_glptr_MultiTexCoord4x) (GET_by_offset(disp, _gloffset_MultiTexCoord4x));
+}
 
-#define CALL_TextureBarrierNV(disp, parameters) \
-    (* GET_TextureBarrierNV(disp)) parameters
-static inline _glptr_TextureBarrierNV
-GET_TextureBarrierNV(struct _glapi_table *disp)
-{
-    return (_glptr_TextureBarrierNV) (GET_by_offset
-                                      (disp, _gloffset_TextureBarrierNV));
+static INLINE void SET_MultiTexCoord4x(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfixed, GLfixed, GLfixed, GLfixed)) {
+   SET_by_offset(disp, _gloffset_MultiTexCoord4x, fn);
 }
 
-static inline void
-SET_TextureBarrierNV(struct _glapi_table *disp, void (GLAPIENTRYP fn) (void))
-{
-    SET_by_offset(disp, _gloffset_TextureBarrierNV, fn);
+typedef void (GLAPIENTRYP _glptr_Normal3x)(GLfixed, GLfixed, GLfixed);
+#define CALL_Normal3x(disp, parameters) \
+    (* GET_Normal3x(disp)) parameters
+static INLINE _glptr_Normal3x GET_Normal3x(struct _glapi_table *disp) {
+   return (_glptr_Normal3x) (GET_by_offset(disp, _gloffset_Normal3x));
 }
 
-typedef void (GLAPIENTRYP _glptr_StencilFuncSeparateATI) (GLenum, GLenum, GLint,
-                                                          GLuint);
-#define CALL_StencilFuncSeparateATI(disp, parameters) \
-    (* GET_StencilFuncSeparateATI(disp)) parameters
-static inline _glptr_StencilFuncSeparateATI
-GET_StencilFuncSeparateATI(struct _glapi_table *disp)
-{
-    return (_glptr_StencilFuncSeparateATI) (GET_by_offset
-                                            (disp,
-                                             _gloffset_StencilFuncSeparateATI));
+static INLINE void SET_Normal3x(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfixed, GLfixed, GLfixed)) {
+   SET_by_offset(disp, _gloffset_Normal3x, fn);
 }
 
-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_Orthof)(GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+#define CALL_Orthof(disp, parameters) \
+    (* GET_Orthof(disp)) parameters
+static INLINE _glptr_Orthof GET_Orthof(struct _glapi_table *disp) {
+   return (_glptr_Orthof) (GET_by_offset(disp, _gloffset_Orthof));
 }
 
-typedef void (GLAPIENTRYP _glptr_ProgramEnvParameters4fvEXT) (GLenum, GLuint,
-                                                              GLsizei,
-                                                              const GLfloat *);
-#define CALL_ProgramEnvParameters4fvEXT(disp, parameters) \
-    (* GET_ProgramEnvParameters4fvEXT(disp)) parameters
-static inline _glptr_ProgramEnvParameters4fvEXT
-GET_ProgramEnvParameters4fvEXT(struct _glapi_table *disp)
-{
-    return (_glptr_ProgramEnvParameters4fvEXT) (GET_by_offset
-                                                (disp,
-                                                 _gloffset_ProgramEnvParameters4fvEXT));
-}
-
-static inline void
-SET_ProgramEnvParameters4fvEXT(struct _glapi_table *disp,
-                               void (GLAPIENTRYP fn) (GLenum, GLuint, GLsizei,
-                                                      const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_ProgramEnvParameters4fvEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_ProgramLocalParameters4fvEXT) (GLenum, GLuint,
-                                                                GLsizei,
-                                                                const GLfloat
-                                                                *);
-#define CALL_ProgramLocalParameters4fvEXT(disp, parameters) \
-    (* GET_ProgramLocalParameters4fvEXT(disp)) parameters
-static inline _glptr_ProgramLocalParameters4fvEXT
-GET_ProgramLocalParameters4fvEXT(struct _glapi_table *disp)
-{
-    return (_glptr_ProgramLocalParameters4fvEXT) (GET_by_offset
-                                                  (disp,
-                                                   _gloffset_ProgramLocalParameters4fvEXT));
-}
-
-static inline void
-SET_ProgramLocalParameters4fvEXT(struct _glapi_table *disp,
-                                 void (GLAPIENTRYP fn) (GLenum, GLuint, GLsizei,
-                                                        const GLfloat *))
-{
-    SET_by_offset(disp, _gloffset_ProgramLocalParameters4fvEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetQueryObjecti64vEXT) (GLuint, GLenum,
-                                                         GLint64EXT *);
-#define CALL_GetQueryObjecti64vEXT(disp, parameters) \
-    (* GET_GetQueryObjecti64vEXT(disp)) parameters
-static inline _glptr_GetQueryObjecti64vEXT
-GET_GetQueryObjecti64vEXT(struct _glapi_table *disp)
-{
-    return (_glptr_GetQueryObjecti64vEXT) (GET_by_offset
-                                           (disp,
-                                            _gloffset_GetQueryObjecti64vEXT));
-}
-
-static inline void
-SET_GetQueryObjecti64vEXT(struct _glapi_table *disp,
-                          void (GLAPIENTRYP fn) (GLuint, GLenum, GLint64EXT *))
-{
-    SET_by_offset(disp, _gloffset_GetQueryObjecti64vEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_GetQueryObjectui64vEXT) (GLuint, GLenum,
-                                                          GLuint64EXT *);
-#define CALL_GetQueryObjectui64vEXT(disp, parameters) \
-    (* GET_GetQueryObjectui64vEXT(disp)) parameters
-static inline _glptr_GetQueryObjectui64vEXT
-GET_GetQueryObjectui64vEXT(struct _glapi_table *disp)
-{
-    return (_glptr_GetQueryObjectui64vEXT) (GET_by_offset
-                                            (disp,
-                                             _gloffset_GetQueryObjectui64vEXT));
-}
-
-static inline void
-SET_GetQueryObjectui64vEXT(struct _glapi_table *disp,
-                           void (GLAPIENTRYP fn) (GLuint, GLenum,
-                                                  GLuint64EXT *))
-{
-    SET_by_offset(disp, _gloffset_GetQueryObjectui64vEXT, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_EGLImageTargetRenderbufferStorageOES) (GLenum,
-                                                                        GLvoid
-                                                                        *);
-#define CALL_EGLImageTargetRenderbufferStorageOES(disp, parameters) \
-    (* GET_EGLImageTargetRenderbufferStorageOES(disp)) parameters
-static inline _glptr_EGLImageTargetRenderbufferStorageOES
-GET_EGLImageTargetRenderbufferStorageOES(struct _glapi_table *disp)
-{
-    return (_glptr_EGLImageTargetRenderbufferStorageOES) (GET_by_offset
-                                                          (disp,
-                                                           _gloffset_EGLImageTargetRenderbufferStorageOES));
+static INLINE void SET_Orthof(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat)) {
+   SET_by_offset(disp, _gloffset_Orthof, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_Orthox)(GLfixed, GLfixed, GLfixed, GLfixed, GLfixed, GLfixed);
+#define CALL_Orthox(disp, parameters) \
+    (* GET_Orthox(disp)) parameters
+static INLINE _glptr_Orthox GET_Orthox(struct _glapi_table *disp) {
+   return (_glptr_Orthox) (GET_by_offset(disp, _gloffset_Orthox));
 }
 
-static inline void
-SET_EGLImageTargetRenderbufferStorageOES(struct _glapi_table *disp,
-                                         void (GLAPIENTRYP fn) (GLenum,
-                                                                GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_EGLImageTargetRenderbufferStorageOES, fn);
+static INLINE void SET_Orthox(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfixed, GLfixed, GLfixed, GLfixed, GLfixed, GLfixed)) {
+   SET_by_offset(disp, _gloffset_Orthox, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_EGLImageTargetTexture2DOES) (GLenum, GLvoid *);
+typedef void (GLAPIENTRYP _glptr_PointSizex)(GLfixed);
+#define CALL_PointSizex(disp, parameters) \
+    (* GET_PointSizex(disp)) parameters
+static INLINE _glptr_PointSizex GET_PointSizex(struct _glapi_table *disp) {
+   return (_glptr_PointSizex) (GET_by_offset(disp, _gloffset_PointSizex));
+}
 
-#define CALL_EGLImageTargetTexture2DOES(disp, parameters) \
-    (* GET_EGLImageTargetTexture2DOES(disp)) parameters
-static inline _glptr_EGLImageTargetTexture2DOES
-GET_EGLImageTargetTexture2DOES(struct _glapi_table *disp)
-{
-    return (_glptr_EGLImageTargetTexture2DOES) (GET_by_offset
-                                                (disp,
-                                                 _gloffset_EGLImageTargetTexture2DOES));
+static INLINE void SET_PointSizex(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfixed)) {
+   SET_by_offset(disp, _gloffset_PointSizex, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_PolygonOffsetx)(GLfixed, GLfixed);
+#define CALL_PolygonOffsetx(disp, parameters) \
+    (* GET_PolygonOffsetx(disp)) parameters
+static INLINE _glptr_PolygonOffsetx GET_PolygonOffsetx(struct _glapi_table *disp) {
+   return (_glptr_PolygonOffsetx) (GET_by_offset(disp, _gloffset_PolygonOffsetx));
+}
+
+static INLINE void SET_PolygonOffsetx(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfixed, GLfixed)) {
+   SET_by_offset(disp, _gloffset_PolygonOffsetx, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_Rotatex)(GLfixed, GLfixed, GLfixed, GLfixed);
+#define CALL_Rotatex(disp, parameters) \
+    (* GET_Rotatex(disp)) parameters
+static INLINE _glptr_Rotatex GET_Rotatex(struct _glapi_table *disp) {
+   return (_glptr_Rotatex) (GET_by_offset(disp, _gloffset_Rotatex));
+}
+
+static INLINE void SET_Rotatex(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfixed, GLfixed, GLfixed, GLfixed)) {
+   SET_by_offset(disp, _gloffset_Rotatex, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_SampleCoveragex)(GLclampx, GLboolean);
+#define CALL_SampleCoveragex(disp, parameters) \
+    (* GET_SampleCoveragex(disp)) parameters
+static INLINE _glptr_SampleCoveragex GET_SampleCoveragex(struct _glapi_table *disp) {
+   return (_glptr_SampleCoveragex) (GET_by_offset(disp, _gloffset_SampleCoveragex));
+}
+
+static INLINE void SET_SampleCoveragex(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLclampx, GLboolean)) {
+   SET_by_offset(disp, _gloffset_SampleCoveragex, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_Scalex)(GLfixed, GLfixed, GLfixed);
+#define CALL_Scalex(disp, parameters) \
+    (* GET_Scalex(disp)) parameters
+static INLINE _glptr_Scalex GET_Scalex(struct _glapi_table *disp) {
+   return (_glptr_Scalex) (GET_by_offset(disp, _gloffset_Scalex));
+}
+
+static INLINE void SET_Scalex(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfixed, GLfixed, GLfixed)) {
+   SET_by_offset(disp, _gloffset_Scalex, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_TexEnvx)(GLenum, GLenum, GLfixed);
+#define CALL_TexEnvx(disp, parameters) \
+    (* GET_TexEnvx(disp)) parameters
+static INLINE _glptr_TexEnvx GET_TexEnvx(struct _glapi_table *disp) {
+   return (_glptr_TexEnvx) (GET_by_offset(disp, _gloffset_TexEnvx));
+}
+
+static INLINE void SET_TexEnvx(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfixed)) {
+   SET_by_offset(disp, _gloffset_TexEnvx, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_TexEnvxv)(GLenum, GLenum, const GLfixed *);
+#define CALL_TexEnvxv(disp, parameters) \
+    (* GET_TexEnvxv(disp)) parameters
+static INLINE _glptr_TexEnvxv GET_TexEnvxv(struct _glapi_table *disp) {
+   return (_glptr_TexEnvxv) (GET_by_offset(disp, _gloffset_TexEnvxv));
+}
+
+static INLINE void SET_TexEnvxv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLfixed *)) {
+   SET_by_offset(disp, _gloffset_TexEnvxv, fn);
 }
 
-static inline void
-SET_EGLImageTargetTexture2DOES(struct _glapi_table *disp,
-                               void (GLAPIENTRYP fn) (GLenum, GLvoid *))
-{
-    SET_by_offset(disp, _gloffset_EGLImageTargetTexture2DOES, fn);
+typedef void (GLAPIENTRYP _glptr_TexParameterx)(GLenum, GLenum, GLfixed);
+#define CALL_TexParameterx(disp, parameters) \
+    (* GET_TexParameterx(disp)) parameters
+static INLINE _glptr_TexParameterx GET_TexParameterx(struct _glapi_table *disp) {
+   return (_glptr_TexParameterx) (GET_by_offset(disp, _gloffset_TexParameterx));
 }
 
-#endif                          /* !defined( _DISPATCH_H_ ) */
+static INLINE void SET_TexParameterx(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfixed)) {
+   SET_by_offset(disp, _gloffset_TexParameterx, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_Translatex)(GLfixed, GLfixed, GLfixed);
+#define CALL_Translatex(disp, parameters) \
+    (* GET_Translatex(disp)) parameters
+static INLINE _glptr_Translatex GET_Translatex(struct _glapi_table *disp) {
+   return (_glptr_Translatex) (GET_by_offset(disp, _gloffset_Translatex));
+}
+
+static INLINE void SET_Translatex(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfixed, GLfixed, GLfixed)) {
+   SET_by_offset(disp, _gloffset_Translatex, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_ClipPlanef)(GLenum, const GLfloat *);
+#define CALL_ClipPlanef(disp, parameters) \
+    (* GET_ClipPlanef(disp)) parameters
+static INLINE _glptr_ClipPlanef GET_ClipPlanef(struct _glapi_table *disp) {
+   return (_glptr_ClipPlanef) (GET_by_offset(disp, _gloffset_ClipPlanef));
+}
+
+static INLINE void SET_ClipPlanef(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLfloat *)) {
+   SET_by_offset(disp, _gloffset_ClipPlanef, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_ClipPlanex)(GLenum, const GLfixed *);
+#define CALL_ClipPlanex(disp, parameters) \
+    (* GET_ClipPlanex(disp)) parameters
+static INLINE _glptr_ClipPlanex GET_ClipPlanex(struct _glapi_table *disp) {
+   return (_glptr_ClipPlanex) (GET_by_offset(disp, _gloffset_ClipPlanex));
+}
+
+static INLINE void SET_ClipPlanex(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLfixed *)) {
+   SET_by_offset(disp, _gloffset_ClipPlanex, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetClipPlanef)(GLenum, GLfloat *);
+#define CALL_GetClipPlanef(disp, parameters) \
+    (* GET_GetClipPlanef(disp)) parameters
+static INLINE _glptr_GetClipPlanef GET_GetClipPlanef(struct _glapi_table *disp) {
+   return (_glptr_GetClipPlanef) (GET_by_offset(disp, _gloffset_GetClipPlanef));
+}
+
+static INLINE void SET_GetClipPlanef(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat *)) {
+   SET_by_offset(disp, _gloffset_GetClipPlanef, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetClipPlanex)(GLenum, GLfixed *);
+#define CALL_GetClipPlanex(disp, parameters) \
+    (* GET_GetClipPlanex(disp)) parameters
+static INLINE _glptr_GetClipPlanex GET_GetClipPlanex(struct _glapi_table *disp) {
+   return (_glptr_GetClipPlanex) (GET_by_offset(disp, _gloffset_GetClipPlanex));
+}
+
+static INLINE void SET_GetClipPlanex(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfixed *)) {
+   SET_by_offset(disp, _gloffset_GetClipPlanex, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetFixedv)(GLenum, GLfixed *);
+#define CALL_GetFixedv(disp, parameters) \
+    (* GET_GetFixedv(disp)) parameters
+static INLINE _glptr_GetFixedv GET_GetFixedv(struct _glapi_table *disp) {
+   return (_glptr_GetFixedv) (GET_by_offset(disp, _gloffset_GetFixedv));
+}
+
+static INLINE void SET_GetFixedv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfixed *)) {
+   SET_by_offset(disp, _gloffset_GetFixedv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetLightxv)(GLenum, GLenum, GLfixed *);
+#define CALL_GetLightxv(disp, parameters) \
+    (* GET_GetLightxv(disp)) parameters
+static INLINE _glptr_GetLightxv GET_GetLightxv(struct _glapi_table *disp) {
+   return (_glptr_GetLightxv) (GET_by_offset(disp, _gloffset_GetLightxv));
+}
+
+static INLINE void SET_GetLightxv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfixed *)) {
+   SET_by_offset(disp, _gloffset_GetLightxv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetMaterialxv)(GLenum, GLenum, GLfixed *);
+#define CALL_GetMaterialxv(disp, parameters) \
+    (* GET_GetMaterialxv(disp)) parameters
+static INLINE _glptr_GetMaterialxv GET_GetMaterialxv(struct _glapi_table *disp) {
+   return (_glptr_GetMaterialxv) (GET_by_offset(disp, _gloffset_GetMaterialxv));
+}
+
+static INLINE void SET_GetMaterialxv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfixed *)) {
+   SET_by_offset(disp, _gloffset_GetMaterialxv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetTexEnvxv)(GLenum, GLenum, GLfixed *);
+#define CALL_GetTexEnvxv(disp, parameters) \
+    (* GET_GetTexEnvxv(disp)) parameters
+static INLINE _glptr_GetTexEnvxv GET_GetTexEnvxv(struct _glapi_table *disp) {
+   return (_glptr_GetTexEnvxv) (GET_by_offset(disp, _gloffset_GetTexEnvxv));
+}
+
+static INLINE void SET_GetTexEnvxv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfixed *)) {
+   SET_by_offset(disp, _gloffset_GetTexEnvxv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_GetTexParameterxv)(GLenum, GLenum, GLfixed *);
+#define CALL_GetTexParameterxv(disp, parameters) \
+    (* GET_GetTexParameterxv(disp)) parameters
+static INLINE _glptr_GetTexParameterxv GET_GetTexParameterxv(struct _glapi_table *disp) {
+   return (_glptr_GetTexParameterxv) (GET_by_offset(disp, _gloffset_GetTexParameterxv));
+}
+
+static INLINE void SET_GetTexParameterxv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfixed *)) {
+   SET_by_offset(disp, _gloffset_GetTexParameterxv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_PointParameterx)(GLenum, GLfixed);
+#define CALL_PointParameterx(disp, parameters) \
+    (* GET_PointParameterx(disp)) parameters
+static INLINE _glptr_PointParameterx GET_PointParameterx(struct _glapi_table *disp) {
+   return (_glptr_PointParameterx) (GET_by_offset(disp, _gloffset_PointParameterx));
+}
+
+static INLINE void SET_PointParameterx(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfixed)) {
+   SET_by_offset(disp, _gloffset_PointParameterx, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_PointParameterxv)(GLenum, const GLfixed *);
+#define CALL_PointParameterxv(disp, parameters) \
+    (* GET_PointParameterxv(disp)) parameters
+static INLINE _glptr_PointParameterxv GET_PointParameterxv(struct _glapi_table *disp) {
+   return (_glptr_PointParameterxv) (GET_by_offset(disp, _gloffset_PointParameterxv));
+}
+
+static INLINE void SET_PointParameterxv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLfixed *)) {
+   SET_by_offset(disp, _gloffset_PointParameterxv, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_TexParameterxv)(GLenum, GLenum, const GLfixed *);
+#define CALL_TexParameterxv(disp, parameters) \
+    (* GET_TexParameterxv(disp)) parameters
+static INLINE _glptr_TexParameterxv GET_TexParameterxv(struct _glapi_table *disp) {
+   return (_glptr_TexParameterxv) (GET_by_offset(disp, _gloffset_TexParameterxv));
+}
+
+static INLINE void SET_TexParameterxv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLfixed *)) {
+   SET_by_offset(disp, _gloffset_TexParameterxv, fn);
+}
+
+
+#endif /* !defined( _DISPATCH_H_ ) */
diff --git a/xorg-server/glx/glapi.c b/xorg-server/glx/glapi.c
index ad7329eff..7b2fe9eb2 100644
--- a/xorg-server/glx/glapi.c
+++ b/xorg-server/glx/glapi.c
@@ -35,15 +35,21 @@
 #include <dix-config.h>
 #include <X11/Xfuncproto.h>
 #include <os.h>
+#ifdef _MSC_VER
+#define PUBLIC _declspec(dllexport)
+#else
 #define PUBLIC _X_EXPORT
+#endif
 
 #include <stdlib.h>
 #include <string.h>
 #ifdef DEBUG
 #include <assert.h>
 #endif
+#include <unistd.h>
 
 #include "glapi.h"
+#include "glheader.h"
 #include "dispatch.h"
 #include "glapitable.h"
 
@@ -125,7 +131,7 @@ _glapi_check_multithread(void)
  * The context pointer is an opaque type which should be cast to
  * void from the real context pointer type.
  */
-PUBLIC void
+void
 _glapi_set_context(void *context)
 {
 #if defined(GLX_USE_TLS)
@@ -143,7 +149,7 @@ _glapi_set_context(void *context)
  * The context pointer is an opaque type which should be cast from
  * void to the real context pointer type.
  */
-PUBLIC void *
+void *
 _glapi_get_context(void)
 {
 #if defined(GLX_USE_TLS)
@@ -156,7 +162,7 @@ _glapi_get_context(void)
 /**
  * Set the global or per-thread dispatch table pointer.
  */
-PUBLIC void
+void
 _glapi_set_dispatch(struct _glapi_table *dispatch)
 {
 #if defined(PTHREADS) || defined(GLX_USE_TLS)
@@ -178,7 +184,7 @@ _glapi_set_dispatch(struct _glapi_table *dispatch)
 /**
  * Return pointer to current dispatch table for calling thread.
  */
-PUBLIC struct _glapi_table *
+struct _glapi_table *
 _glapi_get_dispatch(void)
 {
     struct _glapi_table *api;
@@ -460,7 +466,7 @@ _glapi_add_dispatch(const char *const *function_names,
  * glXGetProcAddress doesn't exist in the protocol, the drivers never call
  * this themselves, and neither does the server.  warn if it happens though.
  */
-PUBLIC _glapi_proc
+_GLAPI_EXPORT _glapi_proc
 _glapi_get_proc_address(const char *funcName)
 {
     ErrorF("_glapi_get_proc_address called!\n");
@@ -471,7 +477,7 @@ _glapi_get_proc_address(const char *funcName)
  * Return size of dispatch table struct as number of functions (or
  * slots).
  */
-PUBLIC GLuint
+GLuint
 _glapi_get_dispatch_table_size(void)
 {
     return DISPATCH_TABLE_SIZE;
diff --git a/xorg-server/glx/glapi.h b/xorg-server/glx/glapi.h
index bad791eab..5edec8ebd 100644
--- a/xorg-server/glx/glapi.h
+++ b/xorg-server/glx/glapi.h
@@ -22,6 +22,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
+
 /**
  * \mainpage Mesa GL API Module
  *
@@ -39,20 +40,44 @@
  * with the X/DRI libGL also.
  */
 
+
 #ifndef _GLAPI_H
 #define _GLAPI_H
 
-#define GL_GLEXT_PROTOTYPES
+#include "glthread.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef _GLAPI_NO_EXPORTS
+#  define _GLAPI_EXPORT
+#else /* _GLAPI_NO_EXPORTS */
+#  ifdef _WIN32
+#    ifdef _GLAPI_DLL_EXPORTS
+#      define _GLAPI_EXPORT __declspec(dllexport)
+#    else
+#      define _GLAPI_EXPORT __declspec(dllimport)
+#    endif
+#  elif defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
+#    define _GLAPI_EXPORT __attribute__((visibility("default")))
+#  else
+#    define _GLAPI_EXPORT
+#  endif
+#endif /* _GLAPI_NO_EXPORTS */
 
 #include "GL/gl.h"
 #include "GL/glext.h"
 #include "glthread.h"
 
+
 struct _glapi_table;
 
-typedef void (*_glapi_proc) (void);     /* generic function pointer */
+typedef void (*_glapi_proc)(void); /* generic function pointer */
+
+typedef void (*_glapi_warning_func)(void *ctx, const char *str, ...);
 
-typedef void (*_glapi_warning_func) (void *ctx, const char *str, ...);
 
 #if defined(USE_MGL_NAMESPACE)
 #define _glapi_set_dispatch _mglapi_set_dispatch
@@ -68,68 +93,98 @@ typedef void (*_glapi_warning_func) (void *ctx, const char *str, ...);
  */
 #define MAX_EXTENSION_FUNCS 300
 
+
 /**
  ** Define the GET_CURRENT_CONTEXT() macro.
  ** \param C local variable which will hold the current context.
  **/
 #if defined (GLX_USE_TLS)
 
-const extern void *_glapi_Context;
-const extern struct _glapi_table *_glapi_Dispatch;
+_GLAPI_EXPORT extern __thread struct _glapi_table * _glapi_tls_Dispatch;
 
-extern TLS void *_glapi_tls_Context;
+_GLAPI_EXPORT extern const void *_glapi_Context;
+_GLAPI_EXPORT extern const struct _glapi_table *_glapi_Dispatch;
 
-#define GET_CURRENT_CONTEXT(C)  GLcontext *C = (GLcontext *) _glapi_tls_Context
+_GLAPI_EXPORT extern __thread void * _glapi_tls_Context;
 
-#else
+# define GET_DISPATCH() _glapi_tls_Dispatch
+# define GET_CURRENT_CONTEXT(C)  struct gl_context *C = (struct gl_context *) _glapi_tls_Context
 
-extern void *_glapi_Context;
-extern struct _glapi_table *_glapi_Dispatch;
+#else
 
-#ifdef THREADS
-#define GET_CURRENT_CONTEXT(C)  GLcontext *C = (GLcontext *) (_glapi_Context ? _glapi_Context : _glapi_get_context())
+#ifdef INSERVER
+#define SERVEXTERN _declspec(dllimport)
 #else
-#define GET_CURRENT_CONTEXT(C)  GLcontext *C = (GLcontext *) _glapi_Context
+#define SERVEXTERN _declspec(dllexport)
 #endif
 
-#endif                          /* defined (GLX_USE_TLS) */
+SERVEXTERN void *_glapi_Context;
+SERVEXTERN struct _glapi_table *_glapi_Dispatch;
+
+# ifdef THREADS
+
+#  define GET_DISPATCH() \
+     (likely(_glapi_Dispatch) ? _glapi_Dispatch : _glapi_get_dispatch())
+
+
+#  define GET_CURRENT_CONTEXT(C)  struct gl_context *C = (struct gl_context *) \
+     (likely(_glapi_Context) ? _glapi_Context : _glapi_get_context())
+# else
+#  define GET_DISPATCH() _glapi_Dispatch
+#  define GET_CURRENT_CONTEXT(C)  struct gl_context *C = (struct gl_context *) _glapi_Context
+# endif
+
+#endif /* defined (GLX_USE_TLS) */
+
 
 /**
  ** GL API public functions
  **/
 
-extern void
- _glapi_check_multithread(void);
+SERVEXTERN void
+_glapi_check_multithread(void);
 
-extern void
- _glapi_set_context(void *context);
 
-extern void *_glapi_get_context(void);
+SERVEXTERN void
+_glapi_set_context(void *context);
 
-extern void
- _glapi_set_dispatch(struct _glapi_table *dispatch);
 
-extern struct _glapi_table *_glapi_get_dispatch(void);
+SERVEXTERN void *
+_glapi_get_context(void);
 
-extern int
- _glapi_begin_dispatch_override(struct _glapi_table *override);
 
-extern void
- _glapi_end_dispatch_override(int layer);
+SERVEXTERN void
+_glapi_set_dispatch(struct _glapi_table *dispatch);
 
-struct _glapi_table *_glapi_get_override_dispatch(int layer);
 
-extern GLuint _glapi_get_dispatch_table_size(void);
+SERVEXTERN struct _glapi_table *
+_glapi_get_dispatch(void);
 
-extern int
+SERVEXTERN int
+_glapi_begin_dispatch_override(struct _glapi_table *override);
 
-_glapi_add_dispatch(const char *const *function_names,
-                    const char *parameter_signature);
+SERVEXTERN void
+_glapi_end_dispatch_override(int layer);
 
-extern _glapi_proc _glapi_get_proc_address(const char *funcName);
+struct _glapi_table *
+_glapi_get_override_dispatch(int layer);
 
-extern struct _glapi_table *_glapi_create_table_from_handle(void *handle,
-                                                            const char
-                                                            *symbol_prefix);
+SERVEXTERN GLuint
+_glapi_get_dispatch_table_size(void);
+
+
+SERVEXTERN int
+_glapi_add_dispatch( const char * const * function_names,
+		     const char * parameter_signature );
+
+_GLAPI_EXPORT _glapi_proc
+_glapi_get_proc_address(const char *funcName);
+
+extern struct _glapi_table *
+_glapi_create_table_from_handle(void *handle, const char *symbol_prefix);
+
+#endif
 
+#ifdef __cplusplus
+}
 #endif
diff --git a/xorg-server/glx/glapi_gentable.c b/xorg-server/glx/glapi_gentable.c
index 4b2801547..219e32db8 100644
--- a/xorg-server/glx/glapi_gentable.c
+++ b/xorg-server/glx/glapi_gentable.c
@@ -36,7 +36,7 @@
 #endif
 
 #if (defined(GLXEXT) && defined(HAVE_BACKTRACE)) \
-	|| (!defined(GLXEXT) && defined(DEBUG) && !defined(_WIN32_WCE))
+	|| (!defined(GLXEXT) && defined(DEBUG) && !defined(_WIN32_WCE) && !defined(__CYGWIN__) && !defined(__MINGW32__))
 #define USE_BACKTRACE
 #endif
 
@@ -48,7 +48,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include <GL/gl.h>
+#include "glheader.h"
 
 #include "glapi.h"
 #include "glapitable.h"
@@ -58,8 +58,7 @@
 #endif
 
 static void
-__glapi_gentable_NoOp(void)
-{
+__glapi_gentable_NoOp(void) {
     const char *fstr = "Unknown";
 
     /* Silence potential GCC warning for some #ifdef paths.
@@ -72,11 +71,10 @@ __glapi_gentable_NoOp(void)
     {
         void *frames[2];
 
-        if (backtrace(frames, 2) == 2) {
+        if(backtrace(frames, 2) == 2) {
             Dl_info info;
-
             dladdr(frames[1], &info);
-            if (info.dli_sname)
+            if(info.dli_sname)
                 fstr = info.dli_sname;
         }
 
@@ -91,9968 +89,10436 @@ __glapi_gentable_NoOp(void)
 }
 
 static void
-__glapi_gentable_set_remaining_noop(struct _glapi_table *disp)
-{
+__glapi_gentable_set_remaining_noop(struct _glapi_table *disp) {
     GLuint entries = _glapi_get_dispatch_table_size();
     void **dispatch = (void **) disp;
     int i;
 
     /* ISO C is annoying sometimes */
-    union {
-        _glapi_proc p;
-        void *v;
-    } p;
-
+    union {_glapi_proc p; void *v;} p;
     p.p = __glapi_gentable_NoOp;
 
-    for (i = 0; i < entries; i++)
-        if (dispatch[i] == NULL)
+    for(i=0; i < entries; i++)
+        if(dispatch[i] == NULL)
             dispatch[i] = p.v;
 }
 
 struct _glapi_table *
-_glapi_create_table_from_handle(void *handle, const char *symbol_prefix)
-{
+_glapi_create_table_from_handle(void *handle, const char *symbol_prefix) {
     struct _glapi_table *disp = calloc(_glapi_get_dispatch_table_size(), sizeof(void*));
     char symboln[512];
 
-    if (!disp)
+    if(!disp)
         return NULL;
 
-    if (symbol_prefix == NULL)
+    if(symbol_prefix == NULL)
         symbol_prefix = "";
 
-    if (!disp->NewList) {
-        void **procp = (void **) &disp->NewList;
 
+    if(!disp->NewList) {
+        void ** procp = (void **) &disp->NewList;
         snprintf(symboln, sizeof(symboln), "%sNewList", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->EndList) {
-        void **procp = (void **) &disp->EndList;
 
+    if(!disp->EndList) {
+        void ** procp = (void **) &disp->EndList;
         snprintf(symboln, sizeof(symboln), "%sEndList", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->CallList) {
-        void **procp = (void **) &disp->CallList;
 
+    if(!disp->CallList) {
+        void ** procp = (void **) &disp->CallList;
         snprintf(symboln, sizeof(symboln), "%sCallList", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->CallLists) {
-        void **procp = (void **) &disp->CallLists;
 
+    if(!disp->CallLists) {
+        void ** procp = (void **) &disp->CallLists;
         snprintf(symboln, sizeof(symboln), "%sCallLists", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DeleteLists) {
-        void **procp = (void **) &disp->DeleteLists;
 
+    if(!disp->DeleteLists) {
+        void ** procp = (void **) &disp->DeleteLists;
         snprintf(symboln, sizeof(symboln), "%sDeleteLists", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GenLists) {
-        void **procp = (void **) &disp->GenLists;
 
+    if(!disp->GenLists) {
+        void ** procp = (void **) &disp->GenLists;
         snprintf(symboln, sizeof(symboln), "%sGenLists", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ListBase) {
-        void **procp = (void **) &disp->ListBase;
 
+    if(!disp->ListBase) {
+        void ** procp = (void **) &disp->ListBase;
         snprintf(symboln, sizeof(symboln), "%sListBase", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Begin) {
-        void **procp = (void **) &disp->Begin;
 
+    if(!disp->Begin) {
+        void ** procp = (void **) &disp->Begin;
         snprintf(symboln, sizeof(symboln), "%sBegin", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Bitmap) {
-        void **procp = (void **) &disp->Bitmap;
 
+    if(!disp->Bitmap) {
+        void ** procp = (void **) &disp->Bitmap;
         snprintf(symboln, sizeof(symboln), "%sBitmap", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Color3b) {
-        void **procp = (void **) &disp->Color3b;
 
+    if(!disp->Color3b) {
+        void ** procp = (void **) &disp->Color3b;
         snprintf(symboln, sizeof(symboln), "%sColor3b", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Color3bv) {
-        void **procp = (void **) &disp->Color3bv;
 
+    if(!disp->Color3bv) {
+        void ** procp = (void **) &disp->Color3bv;
         snprintf(symboln, sizeof(symboln), "%sColor3bv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Color3d) {
-        void **procp = (void **) &disp->Color3d;
 
+    if(!disp->Color3d) {
+        void ** procp = (void **) &disp->Color3d;
         snprintf(symboln, sizeof(symboln), "%sColor3d", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Color3dv) {
-        void **procp = (void **) &disp->Color3dv;
 
+    if(!disp->Color3dv) {
+        void ** procp = (void **) &disp->Color3dv;
         snprintf(symboln, sizeof(symboln), "%sColor3dv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Color3f) {
-        void **procp = (void **) &disp->Color3f;
 
+    if(!disp->Color3f) {
+        void ** procp = (void **) &disp->Color3f;
         snprintf(symboln, sizeof(symboln), "%sColor3f", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Color3fv) {
-        void **procp = (void **) &disp->Color3fv;
 
+    if(!disp->Color3fv) {
+        void ** procp = (void **) &disp->Color3fv;
         snprintf(symboln, sizeof(symboln), "%sColor3fv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Color3i) {
-        void **procp = (void **) &disp->Color3i;
 
+    if(!disp->Color3i) {
+        void ** procp = (void **) &disp->Color3i;
         snprintf(symboln, sizeof(symboln), "%sColor3i", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Color3iv) {
-        void **procp = (void **) &disp->Color3iv;
 
+    if(!disp->Color3iv) {
+        void ** procp = (void **) &disp->Color3iv;
         snprintf(symboln, sizeof(symboln), "%sColor3iv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Color3s) {
-        void **procp = (void **) &disp->Color3s;
 
+    if(!disp->Color3s) {
+        void ** procp = (void **) &disp->Color3s;
         snprintf(symboln, sizeof(symboln), "%sColor3s", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Color3sv) {
-        void **procp = (void **) &disp->Color3sv;
 
+    if(!disp->Color3sv) {
+        void ** procp = (void **) &disp->Color3sv;
         snprintf(symboln, sizeof(symboln), "%sColor3sv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Color3ub) {
-        void **procp = (void **) &disp->Color3ub;
 
+    if(!disp->Color3ub) {
+        void ** procp = (void **) &disp->Color3ub;
         snprintf(symboln, sizeof(symboln), "%sColor3ub", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Color3ubv) {
-        void **procp = (void **) &disp->Color3ubv;
 
+    if(!disp->Color3ubv) {
+        void ** procp = (void **) &disp->Color3ubv;
         snprintf(symboln, sizeof(symboln), "%sColor3ubv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Color3ui) {
-        void **procp = (void **) &disp->Color3ui;
 
+    if(!disp->Color3ui) {
+        void ** procp = (void **) &disp->Color3ui;
         snprintf(symboln, sizeof(symboln), "%sColor3ui", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Color3uiv) {
-        void **procp = (void **) &disp->Color3uiv;
 
+    if(!disp->Color3uiv) {
+        void ** procp = (void **) &disp->Color3uiv;
         snprintf(symboln, sizeof(symboln), "%sColor3uiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Color3us) {
-        void **procp = (void **) &disp->Color3us;
 
+    if(!disp->Color3us) {
+        void ** procp = (void **) &disp->Color3us;
         snprintf(symboln, sizeof(symboln), "%sColor3us", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Color3usv) {
-        void **procp = (void **) &disp->Color3usv;
 
+    if(!disp->Color3usv) {
+        void ** procp = (void **) &disp->Color3usv;
         snprintf(symboln, sizeof(symboln), "%sColor3usv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Color4b) {
-        void **procp = (void **) &disp->Color4b;
 
+    if(!disp->Color4b) {
+        void ** procp = (void **) &disp->Color4b;
         snprintf(symboln, sizeof(symboln), "%sColor4b", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Color4bv) {
-        void **procp = (void **) &disp->Color4bv;
 
+    if(!disp->Color4bv) {
+        void ** procp = (void **) &disp->Color4bv;
         snprintf(symboln, sizeof(symboln), "%sColor4bv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Color4d) {
-        void **procp = (void **) &disp->Color4d;
 
+    if(!disp->Color4d) {
+        void ** procp = (void **) &disp->Color4d;
         snprintf(symboln, sizeof(symboln), "%sColor4d", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Color4dv) {
-        void **procp = (void **) &disp->Color4dv;
 
+    if(!disp->Color4dv) {
+        void ** procp = (void **) &disp->Color4dv;
         snprintf(symboln, sizeof(symboln), "%sColor4dv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Color4f) {
-        void **procp = (void **) &disp->Color4f;
 
+    if(!disp->Color4f) {
+        void ** procp = (void **) &disp->Color4f;
         snprintf(symboln, sizeof(symboln), "%sColor4f", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Color4fv) {
-        void **procp = (void **) &disp->Color4fv;
 
+    if(!disp->Color4fv) {
+        void ** procp = (void **) &disp->Color4fv;
         snprintf(symboln, sizeof(symboln), "%sColor4fv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Color4i) {
-        void **procp = (void **) &disp->Color4i;
 
+    if(!disp->Color4i) {
+        void ** procp = (void **) &disp->Color4i;
         snprintf(symboln, sizeof(symboln), "%sColor4i", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Color4iv) {
-        void **procp = (void **) &disp->Color4iv;
 
+    if(!disp->Color4iv) {
+        void ** procp = (void **) &disp->Color4iv;
         snprintf(symboln, sizeof(symboln), "%sColor4iv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Color4s) {
-        void **procp = (void **) &disp->Color4s;
 
+    if(!disp->Color4s) {
+        void ** procp = (void **) &disp->Color4s;
         snprintf(symboln, sizeof(symboln), "%sColor4s", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Color4sv) {
-        void **procp = (void **) &disp->Color4sv;
 
+    if(!disp->Color4sv) {
+        void ** procp = (void **) &disp->Color4sv;
         snprintf(symboln, sizeof(symboln), "%sColor4sv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Color4ub) {
-        void **procp = (void **) &disp->Color4ub;
 
+    if(!disp->Color4ub) {
+        void ** procp = (void **) &disp->Color4ub;
         snprintf(symboln, sizeof(symboln), "%sColor4ub", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Color4ubv) {
-        void **procp = (void **) &disp->Color4ubv;
 
+    if(!disp->Color4ubv) {
+        void ** procp = (void **) &disp->Color4ubv;
         snprintf(symboln, sizeof(symboln), "%sColor4ubv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Color4ui) {
-        void **procp = (void **) &disp->Color4ui;
 
+    if(!disp->Color4ui) {
+        void ** procp = (void **) &disp->Color4ui;
         snprintf(symboln, sizeof(symboln), "%sColor4ui", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Color4uiv) {
-        void **procp = (void **) &disp->Color4uiv;
 
+    if(!disp->Color4uiv) {
+        void ** procp = (void **) &disp->Color4uiv;
         snprintf(symboln, sizeof(symboln), "%sColor4uiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Color4us) {
-        void **procp = (void **) &disp->Color4us;
 
+    if(!disp->Color4us) {
+        void ** procp = (void **) &disp->Color4us;
         snprintf(symboln, sizeof(symboln), "%sColor4us", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Color4usv) {
-        void **procp = (void **) &disp->Color4usv;
 
+    if(!disp->Color4usv) {
+        void ** procp = (void **) &disp->Color4usv;
         snprintf(symboln, sizeof(symboln), "%sColor4usv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->EdgeFlag) {
-        void **procp = (void **) &disp->EdgeFlag;
 
+    if(!disp->EdgeFlag) {
+        void ** procp = (void **) &disp->EdgeFlag;
         snprintf(symboln, sizeof(symboln), "%sEdgeFlag", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->EdgeFlagv) {
-        void **procp = (void **) &disp->EdgeFlagv;
 
+    if(!disp->EdgeFlagv) {
+        void ** procp = (void **) &disp->EdgeFlagv;
         snprintf(symboln, sizeof(symboln), "%sEdgeFlagv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->End) {
-        void **procp = (void **) &disp->End;
 
+    if(!disp->End) {
+        void ** procp = (void **) &disp->End;
         snprintf(symboln, sizeof(symboln), "%sEnd", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Indexd) {
-        void **procp = (void **) &disp->Indexd;
 
+    if(!disp->Indexd) {
+        void ** procp = (void **) &disp->Indexd;
         snprintf(symboln, sizeof(symboln), "%sIndexd", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Indexdv) {
-        void **procp = (void **) &disp->Indexdv;
 
+    if(!disp->Indexdv) {
+        void ** procp = (void **) &disp->Indexdv;
         snprintf(symboln, sizeof(symboln), "%sIndexdv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Indexf) {
-        void **procp = (void **) &disp->Indexf;
 
+    if(!disp->Indexf) {
+        void ** procp = (void **) &disp->Indexf;
         snprintf(symboln, sizeof(symboln), "%sIndexf", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Indexfv) {
-        void **procp = (void **) &disp->Indexfv;
 
+    if(!disp->Indexfv) {
+        void ** procp = (void **) &disp->Indexfv;
         snprintf(symboln, sizeof(symboln), "%sIndexfv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Indexi) {
-        void **procp = (void **) &disp->Indexi;
 
+    if(!disp->Indexi) {
+        void ** procp = (void **) &disp->Indexi;
         snprintf(symboln, sizeof(symboln), "%sIndexi", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Indexiv) {
-        void **procp = (void **) &disp->Indexiv;
 
+    if(!disp->Indexiv) {
+        void ** procp = (void **) &disp->Indexiv;
         snprintf(symboln, sizeof(symboln), "%sIndexiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Indexs) {
-        void **procp = (void **) &disp->Indexs;
 
+    if(!disp->Indexs) {
+        void ** procp = (void **) &disp->Indexs;
         snprintf(symboln, sizeof(symboln), "%sIndexs", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Indexsv) {
-        void **procp = (void **) &disp->Indexsv;
 
+    if(!disp->Indexsv) {
+        void ** procp = (void **) &disp->Indexsv;
         snprintf(symboln, sizeof(symboln), "%sIndexsv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Normal3b) {
-        void **procp = (void **) &disp->Normal3b;
 
+    if(!disp->Normal3b) {
+        void ** procp = (void **) &disp->Normal3b;
         snprintf(symboln, sizeof(symboln), "%sNormal3b", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Normal3bv) {
-        void **procp = (void **) &disp->Normal3bv;
 
+    if(!disp->Normal3bv) {
+        void ** procp = (void **) &disp->Normal3bv;
         snprintf(symboln, sizeof(symboln), "%sNormal3bv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Normal3d) {
-        void **procp = (void **) &disp->Normal3d;
 
+    if(!disp->Normal3d) {
+        void ** procp = (void **) &disp->Normal3d;
         snprintf(symboln, sizeof(symboln), "%sNormal3d", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Normal3dv) {
-        void **procp = (void **) &disp->Normal3dv;
 
+    if(!disp->Normal3dv) {
+        void ** procp = (void **) &disp->Normal3dv;
         snprintf(symboln, sizeof(symboln), "%sNormal3dv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Normal3f) {
-        void **procp = (void **) &disp->Normal3f;
 
+    if(!disp->Normal3f) {
+        void ** procp = (void **) &disp->Normal3f;
         snprintf(symboln, sizeof(symboln), "%sNormal3f", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Normal3fv) {
-        void **procp = (void **) &disp->Normal3fv;
 
+    if(!disp->Normal3fv) {
+        void ** procp = (void **) &disp->Normal3fv;
         snprintf(symboln, sizeof(symboln), "%sNormal3fv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Normal3i) {
-        void **procp = (void **) &disp->Normal3i;
 
+    if(!disp->Normal3i) {
+        void ** procp = (void **) &disp->Normal3i;
         snprintf(symboln, sizeof(symboln), "%sNormal3i", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Normal3iv) {
-        void **procp = (void **) &disp->Normal3iv;
 
+    if(!disp->Normal3iv) {
+        void ** procp = (void **) &disp->Normal3iv;
         snprintf(symboln, sizeof(symboln), "%sNormal3iv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Normal3s) {
-        void **procp = (void **) &disp->Normal3s;
 
+    if(!disp->Normal3s) {
+        void ** procp = (void **) &disp->Normal3s;
         snprintf(symboln, sizeof(symboln), "%sNormal3s", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Normal3sv) {
-        void **procp = (void **) &disp->Normal3sv;
 
+    if(!disp->Normal3sv) {
+        void ** procp = (void **) &disp->Normal3sv;
         snprintf(symboln, sizeof(symboln), "%sNormal3sv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->RasterPos2d) {
-        void **procp = (void **) &disp->RasterPos2d;
 
+    if(!disp->RasterPos2d) {
+        void ** procp = (void **) &disp->RasterPos2d;
         snprintf(symboln, sizeof(symboln), "%sRasterPos2d", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->RasterPos2dv) {
-        void **procp = (void **) &disp->RasterPos2dv;
 
+    if(!disp->RasterPos2dv) {
+        void ** procp = (void **) &disp->RasterPos2dv;
         snprintf(symboln, sizeof(symboln), "%sRasterPos2dv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->RasterPos2f) {
-        void **procp = (void **) &disp->RasterPos2f;
 
+    if(!disp->RasterPos2f) {
+        void ** procp = (void **) &disp->RasterPos2f;
         snprintf(symboln, sizeof(symboln), "%sRasterPos2f", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->RasterPos2fv) {
-        void **procp = (void **) &disp->RasterPos2fv;
 
+    if(!disp->RasterPos2fv) {
+        void ** procp = (void **) &disp->RasterPos2fv;
         snprintf(symboln, sizeof(symboln), "%sRasterPos2fv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->RasterPos2i) {
-        void **procp = (void **) &disp->RasterPos2i;
 
+    if(!disp->RasterPos2i) {
+        void ** procp = (void **) &disp->RasterPos2i;
         snprintf(symboln, sizeof(symboln), "%sRasterPos2i", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->RasterPos2iv) {
-        void **procp = (void **) &disp->RasterPos2iv;
 
+    if(!disp->RasterPos2iv) {
+        void ** procp = (void **) &disp->RasterPos2iv;
         snprintf(symboln, sizeof(symboln), "%sRasterPos2iv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->RasterPos2s) {
-        void **procp = (void **) &disp->RasterPos2s;
 
+    if(!disp->RasterPos2s) {
+        void ** procp = (void **) &disp->RasterPos2s;
         snprintf(symboln, sizeof(symboln), "%sRasterPos2s", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->RasterPos2sv) {
-        void **procp = (void **) &disp->RasterPos2sv;
 
+    if(!disp->RasterPos2sv) {
+        void ** procp = (void **) &disp->RasterPos2sv;
         snprintf(symboln, sizeof(symboln), "%sRasterPos2sv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->RasterPos3d) {
-        void **procp = (void **) &disp->RasterPos3d;
 
+    if(!disp->RasterPos3d) {
+        void ** procp = (void **) &disp->RasterPos3d;
         snprintf(symboln, sizeof(symboln), "%sRasterPos3d", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->RasterPos3dv) {
-        void **procp = (void **) &disp->RasterPos3dv;
 
+    if(!disp->RasterPos3dv) {
+        void ** procp = (void **) &disp->RasterPos3dv;
         snprintf(symboln, sizeof(symboln), "%sRasterPos3dv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->RasterPos3f) {
-        void **procp = (void **) &disp->RasterPos3f;
 
+    if(!disp->RasterPos3f) {
+        void ** procp = (void **) &disp->RasterPos3f;
         snprintf(symboln, sizeof(symboln), "%sRasterPos3f", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->RasterPos3fv) {
-        void **procp = (void **) &disp->RasterPos3fv;
 
+    if(!disp->RasterPos3fv) {
+        void ** procp = (void **) &disp->RasterPos3fv;
         snprintf(symboln, sizeof(symboln), "%sRasterPos3fv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->RasterPos3i) {
-        void **procp = (void **) &disp->RasterPos3i;
 
+    if(!disp->RasterPos3i) {
+        void ** procp = (void **) &disp->RasterPos3i;
         snprintf(symboln, sizeof(symboln), "%sRasterPos3i", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->RasterPos3iv) {
-        void **procp = (void **) &disp->RasterPos3iv;
 
+    if(!disp->RasterPos3iv) {
+        void ** procp = (void **) &disp->RasterPos3iv;
         snprintf(symboln, sizeof(symboln), "%sRasterPos3iv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->RasterPos3s) {
-        void **procp = (void **) &disp->RasterPos3s;
 
+    if(!disp->RasterPos3s) {
+        void ** procp = (void **) &disp->RasterPos3s;
         snprintf(symboln, sizeof(symboln), "%sRasterPos3s", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->RasterPos3sv) {
-        void **procp = (void **) &disp->RasterPos3sv;
 
+    if(!disp->RasterPos3sv) {
+        void ** procp = (void **) &disp->RasterPos3sv;
         snprintf(symboln, sizeof(symboln), "%sRasterPos3sv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->RasterPos4d) {
-        void **procp = (void **) &disp->RasterPos4d;
 
+    if(!disp->RasterPos4d) {
+        void ** procp = (void **) &disp->RasterPos4d;
         snprintf(symboln, sizeof(symboln), "%sRasterPos4d", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->RasterPos4dv) {
-        void **procp = (void **) &disp->RasterPos4dv;
 
+    if(!disp->RasterPos4dv) {
+        void ** procp = (void **) &disp->RasterPos4dv;
         snprintf(symboln, sizeof(symboln), "%sRasterPos4dv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->RasterPos4f) {
-        void **procp = (void **) &disp->RasterPos4f;
 
+    if(!disp->RasterPos4f) {
+        void ** procp = (void **) &disp->RasterPos4f;
         snprintf(symboln, sizeof(symboln), "%sRasterPos4f", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->RasterPos4fv) {
-        void **procp = (void **) &disp->RasterPos4fv;
 
+    if(!disp->RasterPos4fv) {
+        void ** procp = (void **) &disp->RasterPos4fv;
         snprintf(symboln, sizeof(symboln), "%sRasterPos4fv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->RasterPos4i) {
-        void **procp = (void **) &disp->RasterPos4i;
 
+    if(!disp->RasterPos4i) {
+        void ** procp = (void **) &disp->RasterPos4i;
         snprintf(symboln, sizeof(symboln), "%sRasterPos4i", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->RasterPos4iv) {
-        void **procp = (void **) &disp->RasterPos4iv;
 
+    if(!disp->RasterPos4iv) {
+        void ** procp = (void **) &disp->RasterPos4iv;
         snprintf(symboln, sizeof(symboln), "%sRasterPos4iv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->RasterPos4s) {
-        void **procp = (void **) &disp->RasterPos4s;
 
+    if(!disp->RasterPos4s) {
+        void ** procp = (void **) &disp->RasterPos4s;
         snprintf(symboln, sizeof(symboln), "%sRasterPos4s", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->RasterPos4sv) {
-        void **procp = (void **) &disp->RasterPos4sv;
 
+    if(!disp->RasterPos4sv) {
+        void ** procp = (void **) &disp->RasterPos4sv;
         snprintf(symboln, sizeof(symboln), "%sRasterPos4sv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Rectd) {
-        void **procp = (void **) &disp->Rectd;
 
+    if(!disp->Rectd) {
+        void ** procp = (void **) &disp->Rectd;
         snprintf(symboln, sizeof(symboln), "%sRectd", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Rectdv) {
-        void **procp = (void **) &disp->Rectdv;
 
+    if(!disp->Rectdv) {
+        void ** procp = (void **) &disp->Rectdv;
         snprintf(symboln, sizeof(symboln), "%sRectdv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Rectf) {
-        void **procp = (void **) &disp->Rectf;
 
+    if(!disp->Rectf) {
+        void ** procp = (void **) &disp->Rectf;
         snprintf(symboln, sizeof(symboln), "%sRectf", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Rectfv) {
-        void **procp = (void **) &disp->Rectfv;
 
+    if(!disp->Rectfv) {
+        void ** procp = (void **) &disp->Rectfv;
         snprintf(symboln, sizeof(symboln), "%sRectfv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Recti) {
-        void **procp = (void **) &disp->Recti;
 
+    if(!disp->Recti) {
+        void ** procp = (void **) &disp->Recti;
         snprintf(symboln, sizeof(symboln), "%sRecti", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Rectiv) {
-        void **procp = (void **) &disp->Rectiv;
 
+    if(!disp->Rectiv) {
+        void ** procp = (void **) &disp->Rectiv;
         snprintf(symboln, sizeof(symboln), "%sRectiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Rects) {
-        void **procp = (void **) &disp->Rects;
 
+    if(!disp->Rects) {
+        void ** procp = (void **) &disp->Rects;
         snprintf(symboln, sizeof(symboln), "%sRects", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Rectsv) {
-        void **procp = (void **) &disp->Rectsv;
 
+    if(!disp->Rectsv) {
+        void ** procp = (void **) &disp->Rectsv;
         snprintf(symboln, sizeof(symboln), "%sRectsv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexCoord1d) {
-        void **procp = (void **) &disp->TexCoord1d;
 
+    if(!disp->TexCoord1d) {
+        void ** procp = (void **) &disp->TexCoord1d;
         snprintf(symboln, sizeof(symboln), "%sTexCoord1d", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexCoord1dv) {
-        void **procp = (void **) &disp->TexCoord1dv;
 
+    if(!disp->TexCoord1dv) {
+        void ** procp = (void **) &disp->TexCoord1dv;
         snprintf(symboln, sizeof(symboln), "%sTexCoord1dv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexCoord1f) {
-        void **procp = (void **) &disp->TexCoord1f;
 
+    if(!disp->TexCoord1f) {
+        void ** procp = (void **) &disp->TexCoord1f;
         snprintf(symboln, sizeof(symboln), "%sTexCoord1f", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexCoord1fv) {
-        void **procp = (void **) &disp->TexCoord1fv;
 
+    if(!disp->TexCoord1fv) {
+        void ** procp = (void **) &disp->TexCoord1fv;
         snprintf(symboln, sizeof(symboln), "%sTexCoord1fv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexCoord1i) {
-        void **procp = (void **) &disp->TexCoord1i;
 
+    if(!disp->TexCoord1i) {
+        void ** procp = (void **) &disp->TexCoord1i;
         snprintf(symboln, sizeof(symboln), "%sTexCoord1i", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexCoord1iv) {
-        void **procp = (void **) &disp->TexCoord1iv;
 
+    if(!disp->TexCoord1iv) {
+        void ** procp = (void **) &disp->TexCoord1iv;
         snprintf(symboln, sizeof(symboln), "%sTexCoord1iv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexCoord1s) {
-        void **procp = (void **) &disp->TexCoord1s;
 
+    if(!disp->TexCoord1s) {
+        void ** procp = (void **) &disp->TexCoord1s;
         snprintf(symboln, sizeof(symboln), "%sTexCoord1s", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexCoord1sv) {
-        void **procp = (void **) &disp->TexCoord1sv;
 
+    if(!disp->TexCoord1sv) {
+        void ** procp = (void **) &disp->TexCoord1sv;
         snprintf(symboln, sizeof(symboln), "%sTexCoord1sv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexCoord2d) {
-        void **procp = (void **) &disp->TexCoord2d;
 
+    if(!disp->TexCoord2d) {
+        void ** procp = (void **) &disp->TexCoord2d;
         snprintf(symboln, sizeof(symboln), "%sTexCoord2d", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexCoord2dv) {
-        void **procp = (void **) &disp->TexCoord2dv;
 
+    if(!disp->TexCoord2dv) {
+        void ** procp = (void **) &disp->TexCoord2dv;
         snprintf(symboln, sizeof(symboln), "%sTexCoord2dv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexCoord2f) {
-        void **procp = (void **) &disp->TexCoord2f;
 
+    if(!disp->TexCoord2f) {
+        void ** procp = (void **) &disp->TexCoord2f;
         snprintf(symboln, sizeof(symboln), "%sTexCoord2f", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexCoord2fv) {
-        void **procp = (void **) &disp->TexCoord2fv;
 
+    if(!disp->TexCoord2fv) {
+        void ** procp = (void **) &disp->TexCoord2fv;
         snprintf(symboln, sizeof(symboln), "%sTexCoord2fv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexCoord2i) {
-        void **procp = (void **) &disp->TexCoord2i;
 
+    if(!disp->TexCoord2i) {
+        void ** procp = (void **) &disp->TexCoord2i;
         snprintf(symboln, sizeof(symboln), "%sTexCoord2i", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexCoord2iv) {
-        void **procp = (void **) &disp->TexCoord2iv;
 
+    if(!disp->TexCoord2iv) {
+        void ** procp = (void **) &disp->TexCoord2iv;
         snprintf(symboln, sizeof(symboln), "%sTexCoord2iv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexCoord2s) {
-        void **procp = (void **) &disp->TexCoord2s;
 
+    if(!disp->TexCoord2s) {
+        void ** procp = (void **) &disp->TexCoord2s;
         snprintf(symboln, sizeof(symboln), "%sTexCoord2s", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexCoord2sv) {
-        void **procp = (void **) &disp->TexCoord2sv;
 
+    if(!disp->TexCoord2sv) {
+        void ** procp = (void **) &disp->TexCoord2sv;
         snprintf(symboln, sizeof(symboln), "%sTexCoord2sv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexCoord3d) {
-        void **procp = (void **) &disp->TexCoord3d;
 
+    if(!disp->TexCoord3d) {
+        void ** procp = (void **) &disp->TexCoord3d;
         snprintf(symboln, sizeof(symboln), "%sTexCoord3d", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexCoord3dv) {
-        void **procp = (void **) &disp->TexCoord3dv;
 
+    if(!disp->TexCoord3dv) {
+        void ** procp = (void **) &disp->TexCoord3dv;
         snprintf(symboln, sizeof(symboln), "%sTexCoord3dv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexCoord3f) {
-        void **procp = (void **) &disp->TexCoord3f;
 
+    if(!disp->TexCoord3f) {
+        void ** procp = (void **) &disp->TexCoord3f;
         snprintf(symboln, sizeof(symboln), "%sTexCoord3f", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexCoord3fv) {
-        void **procp = (void **) &disp->TexCoord3fv;
 
+    if(!disp->TexCoord3fv) {
+        void ** procp = (void **) &disp->TexCoord3fv;
         snprintf(symboln, sizeof(symboln), "%sTexCoord3fv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexCoord3i) {
-        void **procp = (void **) &disp->TexCoord3i;
 
+    if(!disp->TexCoord3i) {
+        void ** procp = (void **) &disp->TexCoord3i;
         snprintf(symboln, sizeof(symboln), "%sTexCoord3i", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexCoord3iv) {
-        void **procp = (void **) &disp->TexCoord3iv;
 
+    if(!disp->TexCoord3iv) {
+        void ** procp = (void **) &disp->TexCoord3iv;
         snprintf(symboln, sizeof(symboln), "%sTexCoord3iv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexCoord3s) {
-        void **procp = (void **) &disp->TexCoord3s;
 
+    if(!disp->TexCoord3s) {
+        void ** procp = (void **) &disp->TexCoord3s;
         snprintf(symboln, sizeof(symboln), "%sTexCoord3s", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexCoord3sv) {
-        void **procp = (void **) &disp->TexCoord3sv;
 
+    if(!disp->TexCoord3sv) {
+        void ** procp = (void **) &disp->TexCoord3sv;
         snprintf(symboln, sizeof(symboln), "%sTexCoord3sv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexCoord4d) {
-        void **procp = (void **) &disp->TexCoord4d;
 
+    if(!disp->TexCoord4d) {
+        void ** procp = (void **) &disp->TexCoord4d;
         snprintf(symboln, sizeof(symboln), "%sTexCoord4d", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexCoord4dv) {
-        void **procp = (void **) &disp->TexCoord4dv;
 
+    if(!disp->TexCoord4dv) {
+        void ** procp = (void **) &disp->TexCoord4dv;
         snprintf(symboln, sizeof(symboln), "%sTexCoord4dv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexCoord4f) {
-        void **procp = (void **) &disp->TexCoord4f;
 
+    if(!disp->TexCoord4f) {
+        void ** procp = (void **) &disp->TexCoord4f;
         snprintf(symboln, sizeof(symboln), "%sTexCoord4f", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexCoord4fv) {
-        void **procp = (void **) &disp->TexCoord4fv;
 
+    if(!disp->TexCoord4fv) {
+        void ** procp = (void **) &disp->TexCoord4fv;
         snprintf(symboln, sizeof(symboln), "%sTexCoord4fv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexCoord4i) {
-        void **procp = (void **) &disp->TexCoord4i;
 
+    if(!disp->TexCoord4i) {
+        void ** procp = (void **) &disp->TexCoord4i;
         snprintf(symboln, sizeof(symboln), "%sTexCoord4i", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexCoord4iv) {
-        void **procp = (void **) &disp->TexCoord4iv;
 
+    if(!disp->TexCoord4iv) {
+        void ** procp = (void **) &disp->TexCoord4iv;
         snprintf(symboln, sizeof(symboln), "%sTexCoord4iv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexCoord4s) {
-        void **procp = (void **) &disp->TexCoord4s;
 
+    if(!disp->TexCoord4s) {
+        void ** procp = (void **) &disp->TexCoord4s;
         snprintf(symboln, sizeof(symboln), "%sTexCoord4s", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexCoord4sv) {
-        void **procp = (void **) &disp->TexCoord4sv;
 
+    if(!disp->TexCoord4sv) {
+        void ** procp = (void **) &disp->TexCoord4sv;
         snprintf(symboln, sizeof(symboln), "%sTexCoord4sv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Vertex2d) {
-        void **procp = (void **) &disp->Vertex2d;
 
+    if(!disp->Vertex2d) {
+        void ** procp = (void **) &disp->Vertex2d;
         snprintf(symboln, sizeof(symboln), "%sVertex2d", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Vertex2dv) {
-        void **procp = (void **) &disp->Vertex2dv;
 
+    if(!disp->Vertex2dv) {
+        void ** procp = (void **) &disp->Vertex2dv;
         snprintf(symboln, sizeof(symboln), "%sVertex2dv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Vertex2f) {
-        void **procp = (void **) &disp->Vertex2f;
 
+    if(!disp->Vertex2f) {
+        void ** procp = (void **) &disp->Vertex2f;
         snprintf(symboln, sizeof(symboln), "%sVertex2f", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Vertex2fv) {
-        void **procp = (void **) &disp->Vertex2fv;
 
+    if(!disp->Vertex2fv) {
+        void ** procp = (void **) &disp->Vertex2fv;
         snprintf(symboln, sizeof(symboln), "%sVertex2fv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Vertex2i) {
-        void **procp = (void **) &disp->Vertex2i;
 
+    if(!disp->Vertex2i) {
+        void ** procp = (void **) &disp->Vertex2i;
         snprintf(symboln, sizeof(symboln), "%sVertex2i", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Vertex2iv) {
-        void **procp = (void **) &disp->Vertex2iv;
 
+    if(!disp->Vertex2iv) {
+        void ** procp = (void **) &disp->Vertex2iv;
         snprintf(symboln, sizeof(symboln), "%sVertex2iv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Vertex2s) {
-        void **procp = (void **) &disp->Vertex2s;
 
+    if(!disp->Vertex2s) {
+        void ** procp = (void **) &disp->Vertex2s;
         snprintf(symboln, sizeof(symboln), "%sVertex2s", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Vertex2sv) {
-        void **procp = (void **) &disp->Vertex2sv;
 
+    if(!disp->Vertex2sv) {
+        void ** procp = (void **) &disp->Vertex2sv;
         snprintf(symboln, sizeof(symboln), "%sVertex2sv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Vertex3d) {
-        void **procp = (void **) &disp->Vertex3d;
 
+    if(!disp->Vertex3d) {
+        void ** procp = (void **) &disp->Vertex3d;
         snprintf(symboln, sizeof(symboln), "%sVertex3d", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Vertex3dv) {
-        void **procp = (void **) &disp->Vertex3dv;
 
+    if(!disp->Vertex3dv) {
+        void ** procp = (void **) &disp->Vertex3dv;
         snprintf(symboln, sizeof(symboln), "%sVertex3dv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Vertex3f) {
-        void **procp = (void **) &disp->Vertex3f;
 
+    if(!disp->Vertex3f) {
+        void ** procp = (void **) &disp->Vertex3f;
         snprintf(symboln, sizeof(symboln), "%sVertex3f", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Vertex3fv) {
-        void **procp = (void **) &disp->Vertex3fv;
 
+    if(!disp->Vertex3fv) {
+        void ** procp = (void **) &disp->Vertex3fv;
         snprintf(symboln, sizeof(symboln), "%sVertex3fv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Vertex3i) {
-        void **procp = (void **) &disp->Vertex3i;
 
+    if(!disp->Vertex3i) {
+        void ** procp = (void **) &disp->Vertex3i;
         snprintf(symboln, sizeof(symboln), "%sVertex3i", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Vertex3iv) {
-        void **procp = (void **) &disp->Vertex3iv;
 
+    if(!disp->Vertex3iv) {
+        void ** procp = (void **) &disp->Vertex3iv;
         snprintf(symboln, sizeof(symboln), "%sVertex3iv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Vertex3s) {
-        void **procp = (void **) &disp->Vertex3s;
 
+    if(!disp->Vertex3s) {
+        void ** procp = (void **) &disp->Vertex3s;
         snprintf(symboln, sizeof(symboln), "%sVertex3s", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Vertex3sv) {
-        void **procp = (void **) &disp->Vertex3sv;
 
+    if(!disp->Vertex3sv) {
+        void ** procp = (void **) &disp->Vertex3sv;
         snprintf(symboln, sizeof(symboln), "%sVertex3sv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Vertex4d) {
-        void **procp = (void **) &disp->Vertex4d;
 
+    if(!disp->Vertex4d) {
+        void ** procp = (void **) &disp->Vertex4d;
         snprintf(symboln, sizeof(symboln), "%sVertex4d", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Vertex4dv) {
-        void **procp = (void **) &disp->Vertex4dv;
 
+    if(!disp->Vertex4dv) {
+        void ** procp = (void **) &disp->Vertex4dv;
         snprintf(symboln, sizeof(symboln), "%sVertex4dv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Vertex4f) {
-        void **procp = (void **) &disp->Vertex4f;
 
+    if(!disp->Vertex4f) {
+        void ** procp = (void **) &disp->Vertex4f;
         snprintf(symboln, sizeof(symboln), "%sVertex4f", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Vertex4fv) {
-        void **procp = (void **) &disp->Vertex4fv;
 
+    if(!disp->Vertex4fv) {
+        void ** procp = (void **) &disp->Vertex4fv;
         snprintf(symboln, sizeof(symboln), "%sVertex4fv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Vertex4i) {
-        void **procp = (void **) &disp->Vertex4i;
 
+    if(!disp->Vertex4i) {
+        void ** procp = (void **) &disp->Vertex4i;
         snprintf(symboln, sizeof(symboln), "%sVertex4i", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Vertex4iv) {
-        void **procp = (void **) &disp->Vertex4iv;
 
+    if(!disp->Vertex4iv) {
+        void ** procp = (void **) &disp->Vertex4iv;
         snprintf(symboln, sizeof(symboln), "%sVertex4iv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Vertex4s) {
-        void **procp = (void **) &disp->Vertex4s;
 
+    if(!disp->Vertex4s) {
+        void ** procp = (void **) &disp->Vertex4s;
         snprintf(symboln, sizeof(symboln), "%sVertex4s", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Vertex4sv) {
-        void **procp = (void **) &disp->Vertex4sv;
 
+    if(!disp->Vertex4sv) {
+        void ** procp = (void **) &disp->Vertex4sv;
         snprintf(symboln, sizeof(symboln), "%sVertex4sv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ClipPlane) {
-        void **procp = (void **) &disp->ClipPlane;
 
+    if(!disp->ClipPlane) {
+        void ** procp = (void **) &disp->ClipPlane;
         snprintf(symboln, sizeof(symboln), "%sClipPlane", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ColorMaterial) {
-        void **procp = (void **) &disp->ColorMaterial;
 
+    if(!disp->ColorMaterial) {
+        void ** procp = (void **) &disp->ColorMaterial;
         snprintf(symboln, sizeof(symboln), "%sColorMaterial", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->CullFace) {
-        void **procp = (void **) &disp->CullFace;
 
+    if(!disp->CullFace) {
+        void ** procp = (void **) &disp->CullFace;
         snprintf(symboln, sizeof(symboln), "%sCullFace", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Fogf) {
-        void **procp = (void **) &disp->Fogf;
 
+    if(!disp->Fogf) {
+        void ** procp = (void **) &disp->Fogf;
         snprintf(symboln, sizeof(symboln), "%sFogf", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Fogfv) {
-        void **procp = (void **) &disp->Fogfv;
 
+    if(!disp->Fogfv) {
+        void ** procp = (void **) &disp->Fogfv;
         snprintf(symboln, sizeof(symboln), "%sFogfv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Fogi) {
-        void **procp = (void **) &disp->Fogi;
 
+    if(!disp->Fogi) {
+        void ** procp = (void **) &disp->Fogi;
         snprintf(symboln, sizeof(symboln), "%sFogi", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Fogiv) {
-        void **procp = (void **) &disp->Fogiv;
 
+    if(!disp->Fogiv) {
+        void ** procp = (void **) &disp->Fogiv;
         snprintf(symboln, sizeof(symboln), "%sFogiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->FrontFace) {
-        void **procp = (void **) &disp->FrontFace;
 
+    if(!disp->FrontFace) {
+        void ** procp = (void **) &disp->FrontFace;
         snprintf(symboln, sizeof(symboln), "%sFrontFace", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Hint) {
-        void **procp = (void **) &disp->Hint;
 
+    if(!disp->Hint) {
+        void ** procp = (void **) &disp->Hint;
         snprintf(symboln, sizeof(symboln), "%sHint", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Lightf) {
-        void **procp = (void **) &disp->Lightf;
 
+    if(!disp->Lightf) {
+        void ** procp = (void **) &disp->Lightf;
         snprintf(symboln, sizeof(symboln), "%sLightf", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Lightfv) {
-        void **procp = (void **) &disp->Lightfv;
 
+    if(!disp->Lightfv) {
+        void ** procp = (void **) &disp->Lightfv;
         snprintf(symboln, sizeof(symboln), "%sLightfv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Lighti) {
-        void **procp = (void **) &disp->Lighti;
 
+    if(!disp->Lighti) {
+        void ** procp = (void **) &disp->Lighti;
         snprintf(symboln, sizeof(symboln), "%sLighti", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Lightiv) {
-        void **procp = (void **) &disp->Lightiv;
 
+    if(!disp->Lightiv) {
+        void ** procp = (void **) &disp->Lightiv;
         snprintf(symboln, sizeof(symboln), "%sLightiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->LightModelf) {
-        void **procp = (void **) &disp->LightModelf;
 
+    if(!disp->LightModelf) {
+        void ** procp = (void **) &disp->LightModelf;
         snprintf(symboln, sizeof(symboln), "%sLightModelf", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->LightModelfv) {
-        void **procp = (void **) &disp->LightModelfv;
 
+    if(!disp->LightModelfv) {
+        void ** procp = (void **) &disp->LightModelfv;
         snprintf(symboln, sizeof(symboln), "%sLightModelfv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->LightModeli) {
-        void **procp = (void **) &disp->LightModeli;
 
+    if(!disp->LightModeli) {
+        void ** procp = (void **) &disp->LightModeli;
         snprintf(symboln, sizeof(symboln), "%sLightModeli", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->LightModeliv) {
-        void **procp = (void **) &disp->LightModeliv;
 
+    if(!disp->LightModeliv) {
+        void ** procp = (void **) &disp->LightModeliv;
         snprintf(symboln, sizeof(symboln), "%sLightModeliv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->LineStipple) {
-        void **procp = (void **) &disp->LineStipple;
 
+    if(!disp->LineStipple) {
+        void ** procp = (void **) &disp->LineStipple;
         snprintf(symboln, sizeof(symboln), "%sLineStipple", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->LineWidth) {
-        void **procp = (void **) &disp->LineWidth;
 
+    if(!disp->LineWidth) {
+        void ** procp = (void **) &disp->LineWidth;
         snprintf(symboln, sizeof(symboln), "%sLineWidth", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Materialf) {
-        void **procp = (void **) &disp->Materialf;
 
+    if(!disp->Materialf) {
+        void ** procp = (void **) &disp->Materialf;
         snprintf(symboln, sizeof(symboln), "%sMaterialf", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Materialfv) {
-        void **procp = (void **) &disp->Materialfv;
 
+    if(!disp->Materialfv) {
+        void ** procp = (void **) &disp->Materialfv;
         snprintf(symboln, sizeof(symboln), "%sMaterialfv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Materiali) {
-        void **procp = (void **) &disp->Materiali;
 
+    if(!disp->Materiali) {
+        void ** procp = (void **) &disp->Materiali;
         snprintf(symboln, sizeof(symboln), "%sMateriali", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Materialiv) {
-        void **procp = (void **) &disp->Materialiv;
 
+    if(!disp->Materialiv) {
+        void ** procp = (void **) &disp->Materialiv;
         snprintf(symboln, sizeof(symboln), "%sMaterialiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->PointSize) {
-        void **procp = (void **) &disp->PointSize;
 
+    if(!disp->PointSize) {
+        void ** procp = (void **) &disp->PointSize;
         snprintf(symboln, sizeof(symboln), "%sPointSize", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->PolygonMode) {
-        void **procp = (void **) &disp->PolygonMode;
 
+    if(!disp->PolygonMode) {
+        void ** procp = (void **) &disp->PolygonMode;
         snprintf(symboln, sizeof(symboln), "%sPolygonMode", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->PolygonStipple) {
-        void **procp = (void **) &disp->PolygonStipple;
 
+    if(!disp->PolygonStipple) {
+        void ** procp = (void **) &disp->PolygonStipple;
         snprintf(symboln, sizeof(symboln), "%sPolygonStipple", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Scissor) {
-        void **procp = (void **) &disp->Scissor;
 
+    if(!disp->Scissor) {
+        void ** procp = (void **) &disp->Scissor;
         snprintf(symboln, sizeof(symboln), "%sScissor", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ShadeModel) {
-        void **procp = (void **) &disp->ShadeModel;
 
+    if(!disp->ShadeModel) {
+        void ** procp = (void **) &disp->ShadeModel;
         snprintf(symboln, sizeof(symboln), "%sShadeModel", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexParameterf) {
-        void **procp = (void **) &disp->TexParameterf;
 
+    if(!disp->TexParameterf) {
+        void ** procp = (void **) &disp->TexParameterf;
         snprintf(symboln, sizeof(symboln), "%sTexParameterf", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexParameterfv) {
-        void **procp = (void **) &disp->TexParameterfv;
 
+    if(!disp->TexParameterfv) {
+        void ** procp = (void **) &disp->TexParameterfv;
         snprintf(symboln, sizeof(symboln), "%sTexParameterfv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexParameteri) {
-        void **procp = (void **) &disp->TexParameteri;
 
+    if(!disp->TexParameteri) {
+        void ** procp = (void **) &disp->TexParameteri;
         snprintf(symboln, sizeof(symboln), "%sTexParameteri", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexParameteriv) {
-        void **procp = (void **) &disp->TexParameteriv;
 
+    if(!disp->TexParameteriv) {
+        void ** procp = (void **) &disp->TexParameteriv;
         snprintf(symboln, sizeof(symboln), "%sTexParameteriv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexImage1D) {
-        void **procp = (void **) &disp->TexImage1D;
 
+    if(!disp->TexImage1D) {
+        void ** procp = (void **) &disp->TexImage1D;
         snprintf(symboln, sizeof(symboln), "%sTexImage1D", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexImage2D) {
-        void **procp = (void **) &disp->TexImage2D;
 
+    if(!disp->TexImage2D) {
+        void ** procp = (void **) &disp->TexImage2D;
         snprintf(symboln, sizeof(symboln), "%sTexImage2D", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexEnvf) {
-        void **procp = (void **) &disp->TexEnvf;
 
+    if(!disp->TexEnvf) {
+        void ** procp = (void **) &disp->TexEnvf;
         snprintf(symboln, sizeof(symboln), "%sTexEnvf", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexEnvfv) {
-        void **procp = (void **) &disp->TexEnvfv;
 
+    if(!disp->TexEnvfv) {
+        void ** procp = (void **) &disp->TexEnvfv;
         snprintf(symboln, sizeof(symboln), "%sTexEnvfv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexEnvi) {
-        void **procp = (void **) &disp->TexEnvi;
 
+    if(!disp->TexEnvi) {
+        void ** procp = (void **) &disp->TexEnvi;
         snprintf(symboln, sizeof(symboln), "%sTexEnvi", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexEnviv) {
-        void **procp = (void **) &disp->TexEnviv;
 
+    if(!disp->TexEnviv) {
+        void ** procp = (void **) &disp->TexEnviv;
         snprintf(symboln, sizeof(symboln), "%sTexEnviv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexGend) {
-        void **procp = (void **) &disp->TexGend;
 
+    if(!disp->TexGend) {
+        void ** procp = (void **) &disp->TexGend;
         snprintf(symboln, sizeof(symboln), "%sTexGend", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexGendv) {
-        void **procp = (void **) &disp->TexGendv;
 
+    if(!disp->TexGendv) {
+        void ** procp = (void **) &disp->TexGendv;
         snprintf(symboln, sizeof(symboln), "%sTexGendv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexGenf) {
-        void **procp = (void **) &disp->TexGenf;
 
+    if(!disp->TexGenf) {
+        void ** procp = (void **) &disp->TexGenf;
         snprintf(symboln, sizeof(symboln), "%sTexGenf", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexGenfv) {
-        void **procp = (void **) &disp->TexGenfv;
 
+    if(!disp->TexGenf) {
+        void ** procp = (void **) &disp->TexGenf;
+        snprintf(symboln, sizeof(symboln), "%sTexGenfOES", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->TexGenfv) {
+        void ** procp = (void **) &disp->TexGenfv;
         snprintf(symboln, sizeof(symboln), "%sTexGenfv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexGeni) {
-        void **procp = (void **) &disp->TexGeni;
 
+    if(!disp->TexGenfv) {
+        void ** procp = (void **) &disp->TexGenfv;
+        snprintf(symboln, sizeof(symboln), "%sTexGenfvOES", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->TexGeni) {
+        void ** procp = (void **) &disp->TexGeni;
         snprintf(symboln, sizeof(symboln), "%sTexGeni", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexGeniv) {
-        void **procp = (void **) &disp->TexGeniv;
 
+    if(!disp->TexGeni) {
+        void ** procp = (void **) &disp->TexGeni;
+        snprintf(symboln, sizeof(symboln), "%sTexGeniOES", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->TexGeniv) {
+        void ** procp = (void **) &disp->TexGeniv;
         snprintf(symboln, sizeof(symboln), "%sTexGeniv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->FeedbackBuffer) {
-        void **procp = (void **) &disp->FeedbackBuffer;
 
+    if(!disp->TexGeniv) {
+        void ** procp = (void **) &disp->TexGeniv;
+        snprintf(symboln, sizeof(symboln), "%sTexGenivOES", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->FeedbackBuffer) {
+        void ** procp = (void **) &disp->FeedbackBuffer;
         snprintf(symboln, sizeof(symboln), "%sFeedbackBuffer", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->SelectBuffer) {
-        void **procp = (void **) &disp->SelectBuffer;
 
+    if(!disp->SelectBuffer) {
+        void ** procp = (void **) &disp->SelectBuffer;
         snprintf(symboln, sizeof(symboln), "%sSelectBuffer", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->RenderMode) {
-        void **procp = (void **) &disp->RenderMode;
 
+    if(!disp->RenderMode) {
+        void ** procp = (void **) &disp->RenderMode;
         snprintf(symboln, sizeof(symboln), "%sRenderMode", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->InitNames) {
-        void **procp = (void **) &disp->InitNames;
 
+    if(!disp->InitNames) {
+        void ** procp = (void **) &disp->InitNames;
         snprintf(symboln, sizeof(symboln), "%sInitNames", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->LoadName) {
-        void **procp = (void **) &disp->LoadName;
 
+    if(!disp->LoadName) {
+        void ** procp = (void **) &disp->LoadName;
         snprintf(symboln, sizeof(symboln), "%sLoadName", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->PassThrough) {
-        void **procp = (void **) &disp->PassThrough;
 
+    if(!disp->PassThrough) {
+        void ** procp = (void **) &disp->PassThrough;
         snprintf(symboln, sizeof(symboln), "%sPassThrough", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->PopName) {
-        void **procp = (void **) &disp->PopName;
 
+    if(!disp->PopName) {
+        void ** procp = (void **) &disp->PopName;
         snprintf(symboln, sizeof(symboln), "%sPopName", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->PushName) {
-        void **procp = (void **) &disp->PushName;
 
+    if(!disp->PushName) {
+        void ** procp = (void **) &disp->PushName;
         snprintf(symboln, sizeof(symboln), "%sPushName", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DrawBuffer) {
-        void **procp = (void **) &disp->DrawBuffer;
 
+    if(!disp->DrawBuffer) {
+        void ** procp = (void **) &disp->DrawBuffer;
         snprintf(symboln, sizeof(symboln), "%sDrawBuffer", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Clear) {
-        void **procp = (void **) &disp->Clear;
 
+    if(!disp->Clear) {
+        void ** procp = (void **) &disp->Clear;
         snprintf(symboln, sizeof(symboln), "%sClear", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ClearAccum) {
-        void **procp = (void **) &disp->ClearAccum;
 
+    if(!disp->ClearAccum) {
+        void ** procp = (void **) &disp->ClearAccum;
         snprintf(symboln, sizeof(symboln), "%sClearAccum", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ClearIndex) {
-        void **procp = (void **) &disp->ClearIndex;
 
+    if(!disp->ClearIndex) {
+        void ** procp = (void **) &disp->ClearIndex;
         snprintf(symboln, sizeof(symboln), "%sClearIndex", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ClearColor) {
-        void **procp = (void **) &disp->ClearColor;
 
+    if(!disp->ClearColor) {
+        void ** procp = (void **) &disp->ClearColor;
         snprintf(symboln, sizeof(symboln), "%sClearColor", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ClearStencil) {
-        void **procp = (void **) &disp->ClearStencil;
 
+    if(!disp->ClearStencil) {
+        void ** procp = (void **) &disp->ClearStencil;
         snprintf(symboln, sizeof(symboln), "%sClearStencil", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ClearDepth) {
-        void **procp = (void **) &disp->ClearDepth;
 
+    if(!disp->ClearDepth) {
+        void ** procp = (void **) &disp->ClearDepth;
         snprintf(symboln, sizeof(symboln), "%sClearDepth", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->StencilMask) {
-        void **procp = (void **) &disp->StencilMask;
 
+    if(!disp->StencilMask) {
+        void ** procp = (void **) &disp->StencilMask;
         snprintf(symboln, sizeof(symboln), "%sStencilMask", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ColorMask) {
-        void **procp = (void **) &disp->ColorMask;
 
+    if(!disp->ColorMask) {
+        void ** procp = (void **) &disp->ColorMask;
         snprintf(symboln, sizeof(symboln), "%sColorMask", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DepthMask) {
-        void **procp = (void **) &disp->DepthMask;
 
+    if(!disp->DepthMask) {
+        void ** procp = (void **) &disp->DepthMask;
         snprintf(symboln, sizeof(symboln), "%sDepthMask", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->IndexMask) {
-        void **procp = (void **) &disp->IndexMask;
 
+    if(!disp->IndexMask) {
+        void ** procp = (void **) &disp->IndexMask;
         snprintf(symboln, sizeof(symboln), "%sIndexMask", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Accum) {
-        void **procp = (void **) &disp->Accum;
 
+    if(!disp->Accum) {
+        void ** procp = (void **) &disp->Accum;
         snprintf(symboln, sizeof(symboln), "%sAccum", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Disable) {
-        void **procp = (void **) &disp->Disable;
 
+    if(!disp->Disable) {
+        void ** procp = (void **) &disp->Disable;
         snprintf(symboln, sizeof(symboln), "%sDisable", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Enable) {
-        void **procp = (void **) &disp->Enable;
 
+    if(!disp->Enable) {
+        void ** procp = (void **) &disp->Enable;
         snprintf(symboln, sizeof(symboln), "%sEnable", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Finish) {
-        void **procp = (void **) &disp->Finish;
 
+    if(!disp->Finish) {
+        void ** procp = (void **) &disp->Finish;
         snprintf(symboln, sizeof(symboln), "%sFinish", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Flush) {
-        void **procp = (void **) &disp->Flush;
 
+    if(!disp->Flush) {
+        void ** procp = (void **) &disp->Flush;
         snprintf(symboln, sizeof(symboln), "%sFlush", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->PopAttrib) {
-        void **procp = (void **) &disp->PopAttrib;
 
+    if(!disp->PopAttrib) {
+        void ** procp = (void **) &disp->PopAttrib;
         snprintf(symboln, sizeof(symboln), "%sPopAttrib", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->PushAttrib) {
-        void **procp = (void **) &disp->PushAttrib;
 
+    if(!disp->PushAttrib) {
+        void ** procp = (void **) &disp->PushAttrib;
         snprintf(symboln, sizeof(symboln), "%sPushAttrib", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Map1d) {
-        void **procp = (void **) &disp->Map1d;
 
+    if(!disp->Map1d) {
+        void ** procp = (void **) &disp->Map1d;
         snprintf(symboln, sizeof(symboln), "%sMap1d", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Map1f) {
-        void **procp = (void **) &disp->Map1f;
 
+    if(!disp->Map1f) {
+        void ** procp = (void **) &disp->Map1f;
         snprintf(symboln, sizeof(symboln), "%sMap1f", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Map2d) {
-        void **procp = (void **) &disp->Map2d;
 
+    if(!disp->Map2d) {
+        void ** procp = (void **) &disp->Map2d;
         snprintf(symboln, sizeof(symboln), "%sMap2d", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Map2f) {
-        void **procp = (void **) &disp->Map2f;
 
+    if(!disp->Map2f) {
+        void ** procp = (void **) &disp->Map2f;
         snprintf(symboln, sizeof(symboln), "%sMap2f", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MapGrid1d) {
-        void **procp = (void **) &disp->MapGrid1d;
 
+    if(!disp->MapGrid1d) {
+        void ** procp = (void **) &disp->MapGrid1d;
         snprintf(symboln, sizeof(symboln), "%sMapGrid1d", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MapGrid1f) {
-        void **procp = (void **) &disp->MapGrid1f;
 
+    if(!disp->MapGrid1f) {
+        void ** procp = (void **) &disp->MapGrid1f;
         snprintf(symboln, sizeof(symboln), "%sMapGrid1f", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MapGrid2d) {
-        void **procp = (void **) &disp->MapGrid2d;
 
+    if(!disp->MapGrid2d) {
+        void ** procp = (void **) &disp->MapGrid2d;
         snprintf(symboln, sizeof(symboln), "%sMapGrid2d", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MapGrid2f) {
-        void **procp = (void **) &disp->MapGrid2f;
 
+    if(!disp->MapGrid2f) {
+        void ** procp = (void **) &disp->MapGrid2f;
         snprintf(symboln, sizeof(symboln), "%sMapGrid2f", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->EvalCoord1d) {
-        void **procp = (void **) &disp->EvalCoord1d;
 
+    if(!disp->EvalCoord1d) {
+        void ** procp = (void **) &disp->EvalCoord1d;
         snprintf(symboln, sizeof(symboln), "%sEvalCoord1d", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->EvalCoord1dv) {
-        void **procp = (void **) &disp->EvalCoord1dv;
 
+    if(!disp->EvalCoord1dv) {
+        void ** procp = (void **) &disp->EvalCoord1dv;
         snprintf(symboln, sizeof(symboln), "%sEvalCoord1dv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->EvalCoord1f) {
-        void **procp = (void **) &disp->EvalCoord1f;
 
+    if(!disp->EvalCoord1f) {
+        void ** procp = (void **) &disp->EvalCoord1f;
         snprintf(symboln, sizeof(symboln), "%sEvalCoord1f", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->EvalCoord1fv) {
-        void **procp = (void **) &disp->EvalCoord1fv;
 
+    if(!disp->EvalCoord1fv) {
+        void ** procp = (void **) &disp->EvalCoord1fv;
         snprintf(symboln, sizeof(symboln), "%sEvalCoord1fv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->EvalCoord2d) {
-        void **procp = (void **) &disp->EvalCoord2d;
 
+    if(!disp->EvalCoord2d) {
+        void ** procp = (void **) &disp->EvalCoord2d;
         snprintf(symboln, sizeof(symboln), "%sEvalCoord2d", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->EvalCoord2dv) {
-        void **procp = (void **) &disp->EvalCoord2dv;
 
+    if(!disp->EvalCoord2dv) {
+        void ** procp = (void **) &disp->EvalCoord2dv;
         snprintf(symboln, sizeof(symboln), "%sEvalCoord2dv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->EvalCoord2f) {
-        void **procp = (void **) &disp->EvalCoord2f;
 
+    if(!disp->EvalCoord2f) {
+        void ** procp = (void **) &disp->EvalCoord2f;
         snprintf(symboln, sizeof(symboln), "%sEvalCoord2f", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->EvalCoord2fv) {
-        void **procp = (void **) &disp->EvalCoord2fv;
 
+    if(!disp->EvalCoord2fv) {
+        void ** procp = (void **) &disp->EvalCoord2fv;
         snprintf(symboln, sizeof(symboln), "%sEvalCoord2fv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->EvalMesh1) {
-        void **procp = (void **) &disp->EvalMesh1;
 
+    if(!disp->EvalMesh1) {
+        void ** procp = (void **) &disp->EvalMesh1;
         snprintf(symboln, sizeof(symboln), "%sEvalMesh1", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->EvalPoint1) {
-        void **procp = (void **) &disp->EvalPoint1;
 
+    if(!disp->EvalPoint1) {
+        void ** procp = (void **) &disp->EvalPoint1;
         snprintf(symboln, sizeof(symboln), "%sEvalPoint1", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->EvalMesh2) {
-        void **procp = (void **) &disp->EvalMesh2;
 
+    if(!disp->EvalMesh2) {
+        void ** procp = (void **) &disp->EvalMesh2;
         snprintf(symboln, sizeof(symboln), "%sEvalMesh2", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->EvalPoint2) {
-        void **procp = (void **) &disp->EvalPoint2;
 
+    if(!disp->EvalPoint2) {
+        void ** procp = (void **) &disp->EvalPoint2;
         snprintf(symboln, sizeof(symboln), "%sEvalPoint2", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->AlphaFunc) {
-        void **procp = (void **) &disp->AlphaFunc;
 
+    if(!disp->AlphaFunc) {
+        void ** procp = (void **) &disp->AlphaFunc;
         snprintf(symboln, sizeof(symboln), "%sAlphaFunc", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BlendFunc) {
-        void **procp = (void **) &disp->BlendFunc;
 
+    if(!disp->BlendFunc) {
+        void ** procp = (void **) &disp->BlendFunc;
         snprintf(symboln, sizeof(symboln), "%sBlendFunc", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->LogicOp) {
-        void **procp = (void **) &disp->LogicOp;
 
+    if(!disp->LogicOp) {
+        void ** procp = (void **) &disp->LogicOp;
         snprintf(symboln, sizeof(symboln), "%sLogicOp", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->StencilFunc) {
-        void **procp = (void **) &disp->StencilFunc;
 
+    if(!disp->StencilFunc) {
+        void ** procp = (void **) &disp->StencilFunc;
         snprintf(symboln, sizeof(symboln), "%sStencilFunc", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->StencilOp) {
-        void **procp = (void **) &disp->StencilOp;
 
+    if(!disp->StencilOp) {
+        void ** procp = (void **) &disp->StencilOp;
         snprintf(symboln, sizeof(symboln), "%sStencilOp", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DepthFunc) {
-        void **procp = (void **) &disp->DepthFunc;
 
+    if(!disp->DepthFunc) {
+        void ** procp = (void **) &disp->DepthFunc;
         snprintf(symboln, sizeof(symboln), "%sDepthFunc", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->PixelZoom) {
-        void **procp = (void **) &disp->PixelZoom;
 
+    if(!disp->PixelZoom) {
+        void ** procp = (void **) &disp->PixelZoom;
         snprintf(symboln, sizeof(symboln), "%sPixelZoom", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->PixelTransferf) {
-        void **procp = (void **) &disp->PixelTransferf;
 
+    if(!disp->PixelTransferf) {
+        void ** procp = (void **) &disp->PixelTransferf;
         snprintf(symboln, sizeof(symboln), "%sPixelTransferf", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->PixelTransferi) {
-        void **procp = (void **) &disp->PixelTransferi;
 
+    if(!disp->PixelTransferi) {
+        void ** procp = (void **) &disp->PixelTransferi;
         snprintf(symboln, sizeof(symboln), "%sPixelTransferi", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->PixelStoref) {
-        void **procp = (void **) &disp->PixelStoref;
 
+    if(!disp->PixelStoref) {
+        void ** procp = (void **) &disp->PixelStoref;
         snprintf(symboln, sizeof(symboln), "%sPixelStoref", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->PixelStorei) {
-        void **procp = (void **) &disp->PixelStorei;
 
+    if(!disp->PixelStorei) {
+        void ** procp = (void **) &disp->PixelStorei;
         snprintf(symboln, sizeof(symboln), "%sPixelStorei", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->PixelMapfv) {
-        void **procp = (void **) &disp->PixelMapfv;
 
+    if(!disp->PixelMapfv) {
+        void ** procp = (void **) &disp->PixelMapfv;
         snprintf(symboln, sizeof(symboln), "%sPixelMapfv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->PixelMapuiv) {
-        void **procp = (void **) &disp->PixelMapuiv;
 
+    if(!disp->PixelMapuiv) {
+        void ** procp = (void **) &disp->PixelMapuiv;
         snprintf(symboln, sizeof(symboln), "%sPixelMapuiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->PixelMapusv) {
-        void **procp = (void **) &disp->PixelMapusv;
 
+    if(!disp->PixelMapusv) {
+        void ** procp = (void **) &disp->PixelMapusv;
         snprintf(symboln, sizeof(symboln), "%sPixelMapusv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ReadBuffer) {
-        void **procp = (void **) &disp->ReadBuffer;
 
+    if(!disp->ReadBuffer) {
+        void ** procp = (void **) &disp->ReadBuffer;
         snprintf(symboln, sizeof(symboln), "%sReadBuffer", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->CopyPixels) {
-        void **procp = (void **) &disp->CopyPixels;
 
+    if(!disp->ReadBuffer) {
+        void ** procp = (void **) &disp->ReadBuffer;
+        snprintf(symboln, sizeof(symboln), "%sReadBufferNV", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->CopyPixels) {
+        void ** procp = (void **) &disp->CopyPixels;
         snprintf(symboln, sizeof(symboln), "%sCopyPixels", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ReadPixels) {
-        void **procp = (void **) &disp->ReadPixels;
 
+    if(!disp->ReadPixels) {
+        void ** procp = (void **) &disp->ReadPixels;
         snprintf(symboln, sizeof(symboln), "%sReadPixels", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DrawPixels) {
-        void **procp = (void **) &disp->DrawPixels;
 
+    if(!disp->DrawPixels) {
+        void ** procp = (void **) &disp->DrawPixels;
         snprintf(symboln, sizeof(symboln), "%sDrawPixels", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetBooleanv) {
-        void **procp = (void **) &disp->GetBooleanv;
 
+    if(!disp->GetBooleanv) {
+        void ** procp = (void **) &disp->GetBooleanv;
         snprintf(symboln, sizeof(symboln), "%sGetBooleanv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetClipPlane) {
-        void **procp = (void **) &disp->GetClipPlane;
 
+    if(!disp->GetClipPlane) {
+        void ** procp = (void **) &disp->GetClipPlane;
         snprintf(symboln, sizeof(symboln), "%sGetClipPlane", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetDoublev) {
-        void **procp = (void **) &disp->GetDoublev;
 
+    if(!disp->GetDoublev) {
+        void ** procp = (void **) &disp->GetDoublev;
         snprintf(symboln, sizeof(symboln), "%sGetDoublev", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetError) {
-        void **procp = (void **) &disp->GetError;
 
+    if(!disp->GetError) {
+        void ** procp = (void **) &disp->GetError;
         snprintf(symboln, sizeof(symboln), "%sGetError", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetFloatv) {
-        void **procp = (void **) &disp->GetFloatv;
 
+    if(!disp->GetFloatv) {
+        void ** procp = (void **) &disp->GetFloatv;
         snprintf(symboln, sizeof(symboln), "%sGetFloatv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetIntegerv) {
-        void **procp = (void **) &disp->GetIntegerv;
 
+    if(!disp->GetIntegerv) {
+        void ** procp = (void **) &disp->GetIntegerv;
         snprintf(symboln, sizeof(symboln), "%sGetIntegerv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetLightfv) {
-        void **procp = (void **) &disp->GetLightfv;
 
+    if(!disp->GetLightfv) {
+        void ** procp = (void **) &disp->GetLightfv;
         snprintf(symboln, sizeof(symboln), "%sGetLightfv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetLightiv) {
-        void **procp = (void **) &disp->GetLightiv;
 
+    if(!disp->GetLightiv) {
+        void ** procp = (void **) &disp->GetLightiv;
         snprintf(symboln, sizeof(symboln), "%sGetLightiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetMapdv) {
-        void **procp = (void **) &disp->GetMapdv;
 
+    if(!disp->GetMapdv) {
+        void ** procp = (void **) &disp->GetMapdv;
         snprintf(symboln, sizeof(symboln), "%sGetMapdv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetMapfv) {
-        void **procp = (void **) &disp->GetMapfv;
 
+    if(!disp->GetMapfv) {
+        void ** procp = (void **) &disp->GetMapfv;
         snprintf(symboln, sizeof(symboln), "%sGetMapfv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetMapiv) {
-        void **procp = (void **) &disp->GetMapiv;
 
+    if(!disp->GetMapiv) {
+        void ** procp = (void **) &disp->GetMapiv;
         snprintf(symboln, sizeof(symboln), "%sGetMapiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetMaterialfv) {
-        void **procp = (void **) &disp->GetMaterialfv;
 
+    if(!disp->GetMaterialfv) {
+        void ** procp = (void **) &disp->GetMaterialfv;
         snprintf(symboln, sizeof(symboln), "%sGetMaterialfv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetMaterialiv) {
-        void **procp = (void **) &disp->GetMaterialiv;
 
+    if(!disp->GetMaterialiv) {
+        void ** procp = (void **) &disp->GetMaterialiv;
         snprintf(symboln, sizeof(symboln), "%sGetMaterialiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetPixelMapfv) {
-        void **procp = (void **) &disp->GetPixelMapfv;
 
+    if(!disp->GetPixelMapfv) {
+        void ** procp = (void **) &disp->GetPixelMapfv;
         snprintf(symboln, sizeof(symboln), "%sGetPixelMapfv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetPixelMapuiv) {
-        void **procp = (void **) &disp->GetPixelMapuiv;
 
+    if(!disp->GetPixelMapuiv) {
+        void ** procp = (void **) &disp->GetPixelMapuiv;
         snprintf(symboln, sizeof(symboln), "%sGetPixelMapuiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetPixelMapusv) {
-        void **procp = (void **) &disp->GetPixelMapusv;
 
+    if(!disp->GetPixelMapusv) {
+        void ** procp = (void **) &disp->GetPixelMapusv;
         snprintf(symboln, sizeof(symboln), "%sGetPixelMapusv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetPolygonStipple) {
-        void **procp = (void **) &disp->GetPolygonStipple;
 
-        snprintf(symboln, sizeof(symboln), "%sGetPolygonStipple",
-                 symbol_prefix);
+    if(!disp->GetPolygonStipple) {
+        void ** procp = (void **) &disp->GetPolygonStipple;
+        snprintf(symboln, sizeof(symboln), "%sGetPolygonStipple", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetString) {
-        void **procp = (void **) &disp->GetString;
 
+    if(!disp->GetString) {
+        void ** procp = (void **) &disp->GetString;
         snprintf(symboln, sizeof(symboln), "%sGetString", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetTexEnvfv) {
-        void **procp = (void **) &disp->GetTexEnvfv;
 
+    if(!disp->GetTexEnvfv) {
+        void ** procp = (void **) &disp->GetTexEnvfv;
         snprintf(symboln, sizeof(symboln), "%sGetTexEnvfv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetTexEnviv) {
-        void **procp = (void **) &disp->GetTexEnviv;
 
+    if(!disp->GetTexEnviv) {
+        void ** procp = (void **) &disp->GetTexEnviv;
         snprintf(symboln, sizeof(symboln), "%sGetTexEnviv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetTexGendv) {
-        void **procp = (void **) &disp->GetTexGendv;
 
+    if(!disp->GetTexGendv) {
+        void ** procp = (void **) &disp->GetTexGendv;
         snprintf(symboln, sizeof(symboln), "%sGetTexGendv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetTexGenfv) {
-        void **procp = (void **) &disp->GetTexGenfv;
 
+    if(!disp->GetTexGenfv) {
+        void ** procp = (void **) &disp->GetTexGenfv;
         snprintf(symboln, sizeof(symboln), "%sGetTexGenfv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetTexGeniv) {
-        void **procp = (void **) &disp->GetTexGeniv;
 
+    if(!disp->GetTexGenfv) {
+        void ** procp = (void **) &disp->GetTexGenfv;
+        snprintf(symboln, sizeof(symboln), "%sGetTexGenfvOES", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->GetTexGeniv) {
+        void ** procp = (void **) &disp->GetTexGeniv;
         snprintf(symboln, sizeof(symboln), "%sGetTexGeniv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetTexImage) {
-        void **procp = (void **) &disp->GetTexImage;
 
+    if(!disp->GetTexGeniv) {
+        void ** procp = (void **) &disp->GetTexGeniv;
+        snprintf(symboln, sizeof(symboln), "%sGetTexGenivOES", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->GetTexImage) {
+        void ** procp = (void **) &disp->GetTexImage;
         snprintf(symboln, sizeof(symboln), "%sGetTexImage", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetTexParameterfv) {
-        void **procp = (void **) &disp->GetTexParameterfv;
 
-        snprintf(symboln, sizeof(symboln), "%sGetTexParameterfv",
-                 symbol_prefix);
+    if(!disp->GetTexParameterfv) {
+        void ** procp = (void **) &disp->GetTexParameterfv;
+        snprintf(symboln, sizeof(symboln), "%sGetTexParameterfv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetTexParameteriv) {
-        void **procp = (void **) &disp->GetTexParameteriv;
 
-        snprintf(symboln, sizeof(symboln), "%sGetTexParameteriv",
-                 symbol_prefix);
+    if(!disp->GetTexParameteriv) {
+        void ** procp = (void **) &disp->GetTexParameteriv;
+        snprintf(symboln, sizeof(symboln), "%sGetTexParameteriv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetTexLevelParameterfv) {
-        void **procp = (void **) &disp->GetTexLevelParameterfv;
 
-        snprintf(symboln, sizeof(symboln), "%sGetTexLevelParameterfv",
-                 symbol_prefix);
+    if(!disp->GetTexLevelParameterfv) {
+        void ** procp = (void **) &disp->GetTexLevelParameterfv;
+        snprintf(symboln, sizeof(symboln), "%sGetTexLevelParameterfv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetTexLevelParameteriv) {
-        void **procp = (void **) &disp->GetTexLevelParameteriv;
 
-        snprintf(symboln, sizeof(symboln), "%sGetTexLevelParameteriv",
-                 symbol_prefix);
+    if(!disp->GetTexLevelParameteriv) {
+        void ** procp = (void **) &disp->GetTexLevelParameteriv;
+        snprintf(symboln, sizeof(symboln), "%sGetTexLevelParameteriv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->IsEnabled) {
-        void **procp = (void **) &disp->IsEnabled;
 
+    if(!disp->IsEnabled) {
+        void ** procp = (void **) &disp->IsEnabled;
         snprintf(symboln, sizeof(symboln), "%sIsEnabled", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->IsList) {
-        void **procp = (void **) &disp->IsList;
 
+    if(!disp->IsList) {
+        void ** procp = (void **) &disp->IsList;
         snprintf(symboln, sizeof(symboln), "%sIsList", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DepthRange) {
-        void **procp = (void **) &disp->DepthRange;
 
+    if(!disp->DepthRange) {
+        void ** procp = (void **) &disp->DepthRange;
         snprintf(symboln, sizeof(symboln), "%sDepthRange", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Frustum) {
-        void **procp = (void **) &disp->Frustum;
 
+    if(!disp->Frustum) {
+        void ** procp = (void **) &disp->Frustum;
         snprintf(symboln, sizeof(symboln), "%sFrustum", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->LoadIdentity) {
-        void **procp = (void **) &disp->LoadIdentity;
 
+    if(!disp->LoadIdentity) {
+        void ** procp = (void **) &disp->LoadIdentity;
         snprintf(symboln, sizeof(symboln), "%sLoadIdentity", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->LoadMatrixf) {
-        void **procp = (void **) &disp->LoadMatrixf;
 
+    if(!disp->LoadMatrixf) {
+        void ** procp = (void **) &disp->LoadMatrixf;
         snprintf(symboln, sizeof(symboln), "%sLoadMatrixf", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->LoadMatrixd) {
-        void **procp = (void **) &disp->LoadMatrixd;
 
+    if(!disp->LoadMatrixd) {
+        void ** procp = (void **) &disp->LoadMatrixd;
         snprintf(symboln, sizeof(symboln), "%sLoadMatrixd", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MatrixMode) {
-        void **procp = (void **) &disp->MatrixMode;
 
+    if(!disp->MatrixMode) {
+        void ** procp = (void **) &disp->MatrixMode;
         snprintf(symboln, sizeof(symboln), "%sMatrixMode", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultMatrixf) {
-        void **procp = (void **) &disp->MultMatrixf;
 
+    if(!disp->MultMatrixf) {
+        void ** procp = (void **) &disp->MultMatrixf;
         snprintf(symboln, sizeof(symboln), "%sMultMatrixf", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultMatrixd) {
-        void **procp = (void **) &disp->MultMatrixd;
 
+    if(!disp->MultMatrixd) {
+        void ** procp = (void **) &disp->MultMatrixd;
         snprintf(symboln, sizeof(symboln), "%sMultMatrixd", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Ortho) {
-        void **procp = (void **) &disp->Ortho;
 
+    if(!disp->Ortho) {
+        void ** procp = (void **) &disp->Ortho;
         snprintf(symboln, sizeof(symboln), "%sOrtho", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->PopMatrix) {
-        void **procp = (void **) &disp->PopMatrix;
 
+    if(!disp->PopMatrix) {
+        void ** procp = (void **) &disp->PopMatrix;
         snprintf(symboln, sizeof(symboln), "%sPopMatrix", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->PushMatrix) {
-        void **procp = (void **) &disp->PushMatrix;
 
+    if(!disp->PushMatrix) {
+        void ** procp = (void **) &disp->PushMatrix;
         snprintf(symboln, sizeof(symboln), "%sPushMatrix", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Rotated) {
-        void **procp = (void **) &disp->Rotated;
 
+    if(!disp->Rotated) {
+        void ** procp = (void **) &disp->Rotated;
         snprintf(symboln, sizeof(symboln), "%sRotated", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Rotatef) {
-        void **procp = (void **) &disp->Rotatef;
 
+    if(!disp->Rotatef) {
+        void ** procp = (void **) &disp->Rotatef;
         snprintf(symboln, sizeof(symboln), "%sRotatef", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Scaled) {
-        void **procp = (void **) &disp->Scaled;
 
+    if(!disp->Scaled) {
+        void ** procp = (void **) &disp->Scaled;
         snprintf(symboln, sizeof(symboln), "%sScaled", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Scalef) {
-        void **procp = (void **) &disp->Scalef;
 
+    if(!disp->Scalef) {
+        void ** procp = (void **) &disp->Scalef;
         snprintf(symboln, sizeof(symboln), "%sScalef", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Translated) {
-        void **procp = (void **) &disp->Translated;
 
+    if(!disp->Translated) {
+        void ** procp = (void **) &disp->Translated;
         snprintf(symboln, sizeof(symboln), "%sTranslated", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Translatef) {
-        void **procp = (void **) &disp->Translatef;
 
+    if(!disp->Translatef) {
+        void ** procp = (void **) &disp->Translatef;
         snprintf(symboln, sizeof(symboln), "%sTranslatef", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Viewport) {
-        void **procp = (void **) &disp->Viewport;
 
+    if(!disp->Viewport) {
+        void ** procp = (void **) &disp->Viewport;
         snprintf(symboln, sizeof(symboln), "%sViewport", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ArrayElement) {
-        void **procp = (void **) &disp->ArrayElement;
 
+    if(!disp->ArrayElement) {
+        void ** procp = (void **) &disp->ArrayElement;
         snprintf(symboln, sizeof(symboln), "%sArrayElement", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ArrayElement) {
-        void **procp = (void **) &disp->ArrayElement;
 
+    if(!disp->ArrayElement) {
+        void ** procp = (void **) &disp->ArrayElement;
         snprintf(symboln, sizeof(symboln), "%sArrayElementEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BindTexture) {
-        void **procp = (void **) &disp->BindTexture;
 
+    if(!disp->BindTexture) {
+        void ** procp = (void **) &disp->BindTexture;
         snprintf(symboln, sizeof(symboln), "%sBindTexture", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BindTexture) {
-        void **procp = (void **) &disp->BindTexture;
 
+    if(!disp->BindTexture) {
+        void ** procp = (void **) &disp->BindTexture;
         snprintf(symboln, sizeof(symboln), "%sBindTextureEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ColorPointer) {
-        void **procp = (void **) &disp->ColorPointer;
 
+    if(!disp->ColorPointer) {
+        void ** procp = (void **) &disp->ColorPointer;
         snprintf(symboln, sizeof(symboln), "%sColorPointer", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DisableClientState) {
-        void **procp = (void **) &disp->DisableClientState;
 
-        snprintf(symboln, sizeof(symboln), "%sDisableClientState",
-                 symbol_prefix);
+    if(!disp->DisableClientState) {
+        void ** procp = (void **) &disp->DisableClientState;
+        snprintf(symboln, sizeof(symboln), "%sDisableClientState", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DrawArrays) {
-        void **procp = (void **) &disp->DrawArrays;
 
+    if(!disp->DrawArrays) {
+        void ** procp = (void **) &disp->DrawArrays;
         snprintf(symboln, sizeof(symboln), "%sDrawArrays", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DrawArrays) {
-        void **procp = (void **) &disp->DrawArrays;
 
+    if(!disp->DrawArrays) {
+        void ** procp = (void **) &disp->DrawArrays;
         snprintf(symboln, sizeof(symboln), "%sDrawArraysEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DrawElements) {
-        void **procp = (void **) &disp->DrawElements;
 
+    if(!disp->DrawElements) {
+        void ** procp = (void **) &disp->DrawElements;
         snprintf(symboln, sizeof(symboln), "%sDrawElements", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->EdgeFlagPointer) {
-        void **procp = (void **) &disp->EdgeFlagPointer;
 
+    if(!disp->EdgeFlagPointer) {
+        void ** procp = (void **) &disp->EdgeFlagPointer;
         snprintf(symboln, sizeof(symboln), "%sEdgeFlagPointer", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->EnableClientState) {
-        void **procp = (void **) &disp->EnableClientState;
 
-        snprintf(symboln, sizeof(symboln), "%sEnableClientState",
-                 symbol_prefix);
+    if(!disp->EnableClientState) {
+        void ** procp = (void **) &disp->EnableClientState;
+        snprintf(symboln, sizeof(symboln), "%sEnableClientState", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->IndexPointer) {
-        void **procp = (void **) &disp->IndexPointer;
 
+    if(!disp->IndexPointer) {
+        void ** procp = (void **) &disp->IndexPointer;
         snprintf(symboln, sizeof(symboln), "%sIndexPointer", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Indexub) {
-        void **procp = (void **) &disp->Indexub;
 
+    if(!disp->Indexub) {
+        void ** procp = (void **) &disp->Indexub;
         snprintf(symboln, sizeof(symboln), "%sIndexub", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Indexubv) {
-        void **procp = (void **) &disp->Indexubv;
 
+    if(!disp->Indexubv) {
+        void ** procp = (void **) &disp->Indexubv;
         snprintf(symboln, sizeof(symboln), "%sIndexubv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->InterleavedArrays) {
-        void **procp = (void **) &disp->InterleavedArrays;
 
-        snprintf(symboln, sizeof(symboln), "%sInterleavedArrays",
-                 symbol_prefix);
+    if(!disp->InterleavedArrays) {
+        void ** procp = (void **) &disp->InterleavedArrays;
+        snprintf(symboln, sizeof(symboln), "%sInterleavedArrays", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->NormalPointer) {
-        void **procp = (void **) &disp->NormalPointer;
 
+    if(!disp->NormalPointer) {
+        void ** procp = (void **) &disp->NormalPointer;
         snprintf(symboln, sizeof(symboln), "%sNormalPointer", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->PolygonOffset) {
-        void **procp = (void **) &disp->PolygonOffset;
 
+    if(!disp->PolygonOffset) {
+        void ** procp = (void **) &disp->PolygonOffset;
         snprintf(symboln, sizeof(symboln), "%sPolygonOffset", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexCoordPointer) {
-        void **procp = (void **) &disp->TexCoordPointer;
 
+    if(!disp->TexCoordPointer) {
+        void ** procp = (void **) &disp->TexCoordPointer;
         snprintf(symboln, sizeof(symboln), "%sTexCoordPointer", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexPointer) {
-        void **procp = (void **) &disp->VertexPointer;
 
+    if(!disp->VertexPointer) {
+        void ** procp = (void **) &disp->VertexPointer;
         snprintf(symboln, sizeof(symboln), "%sVertexPointer", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->AreTexturesResident) {
-        void **procp = (void **) &disp->AreTexturesResident;
 
-        snprintf(symboln, sizeof(symboln), "%sAreTexturesResident",
-                 symbol_prefix);
+    if(!disp->AreTexturesResident) {
+        void ** procp = (void **) &disp->AreTexturesResident;
+        snprintf(symboln, sizeof(symboln), "%sAreTexturesResident", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->AreTexturesResident) {
-        void **procp = (void **) &disp->AreTexturesResident;
 
-        snprintf(symboln, sizeof(symboln), "%sAreTexturesResidentEXT",
-                 symbol_prefix);
+    if(!disp->AreTexturesResident) {
+        void ** procp = (void **) &disp->AreTexturesResident;
+        snprintf(symboln, sizeof(symboln), "%sAreTexturesResidentEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->CopyTexImage1D) {
-        void **procp = (void **) &disp->CopyTexImage1D;
 
+    if(!disp->CopyTexImage1D) {
+        void ** procp = (void **) &disp->CopyTexImage1D;
         snprintf(symboln, sizeof(symboln), "%sCopyTexImage1D", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->CopyTexImage1D) {
-        void **procp = (void **) &disp->CopyTexImage1D;
 
-        snprintf(symboln, sizeof(symboln), "%sCopyTexImage1DEXT",
-                 symbol_prefix);
+    if(!disp->CopyTexImage1D) {
+        void ** procp = (void **) &disp->CopyTexImage1D;
+        snprintf(symboln, sizeof(symboln), "%sCopyTexImage1DEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->CopyTexImage2D) {
-        void **procp = (void **) &disp->CopyTexImage2D;
 
+    if(!disp->CopyTexImage2D) {
+        void ** procp = (void **) &disp->CopyTexImage2D;
         snprintf(symboln, sizeof(symboln), "%sCopyTexImage2D", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->CopyTexImage2D) {
-        void **procp = (void **) &disp->CopyTexImage2D;
 
-        snprintf(symboln, sizeof(symboln), "%sCopyTexImage2DEXT",
-                 symbol_prefix);
+    if(!disp->CopyTexImage2D) {
+        void ** procp = (void **) &disp->CopyTexImage2D;
+        snprintf(symboln, sizeof(symboln), "%sCopyTexImage2DEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->CopyTexSubImage1D) {
-        void **procp = (void **) &disp->CopyTexSubImage1D;
 
-        snprintf(symboln, sizeof(symboln), "%sCopyTexSubImage1D",
-                 symbol_prefix);
+    if(!disp->CopyTexSubImage1D) {
+        void ** procp = (void **) &disp->CopyTexSubImage1D;
+        snprintf(symboln, sizeof(symboln), "%sCopyTexSubImage1D", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->CopyTexSubImage1D) {
-        void **procp = (void **) &disp->CopyTexSubImage1D;
 
-        snprintf(symboln, sizeof(symboln), "%sCopyTexSubImage1DEXT",
-                 symbol_prefix);
+    if(!disp->CopyTexSubImage1D) {
+        void ** procp = (void **) &disp->CopyTexSubImage1D;
+        snprintf(symboln, sizeof(symboln), "%sCopyTexSubImage1DEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->CopyTexSubImage2D) {
-        void **procp = (void **) &disp->CopyTexSubImage2D;
 
-        snprintf(symboln, sizeof(symboln), "%sCopyTexSubImage2D",
-                 symbol_prefix);
+    if(!disp->CopyTexSubImage2D) {
+        void ** procp = (void **) &disp->CopyTexSubImage2D;
+        snprintf(symboln, sizeof(symboln), "%sCopyTexSubImage2D", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->CopyTexSubImage2D) {
-        void **procp = (void **) &disp->CopyTexSubImage2D;
 
-        snprintf(symboln, sizeof(symboln), "%sCopyTexSubImage2DEXT",
-                 symbol_prefix);
+    if(!disp->CopyTexSubImage2D) {
+        void ** procp = (void **) &disp->CopyTexSubImage2D;
+        snprintf(symboln, sizeof(symboln), "%sCopyTexSubImage2DEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DeleteTextures) {
-        void **procp = (void **) &disp->DeleteTextures;
 
+    if(!disp->DeleteTextures) {
+        void ** procp = (void **) &disp->DeleteTextures;
         snprintf(symboln, sizeof(symboln), "%sDeleteTextures", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DeleteTextures) {
-        void **procp = (void **) &disp->DeleteTextures;
 
-        snprintf(symboln, sizeof(symboln), "%sDeleteTexturesEXT",
-                 symbol_prefix);
+    if(!disp->DeleteTextures) {
+        void ** procp = (void **) &disp->DeleteTextures;
+        snprintf(symboln, sizeof(symboln), "%sDeleteTexturesEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GenTextures) {
-        void **procp = (void **) &disp->GenTextures;
 
+    if(!disp->GenTextures) {
+        void ** procp = (void **) &disp->GenTextures;
         snprintf(symboln, sizeof(symboln), "%sGenTextures", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GenTextures) {
-        void **procp = (void **) &disp->GenTextures;
 
+    if(!disp->GenTextures) {
+        void ** procp = (void **) &disp->GenTextures;
         snprintf(symboln, sizeof(symboln), "%sGenTexturesEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetPointerv) {
-        void **procp = (void **) &disp->GetPointerv;
 
+    if(!disp->GetPointerv) {
+        void ** procp = (void **) &disp->GetPointerv;
         snprintf(symboln, sizeof(symboln), "%sGetPointerv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetPointerv) {
-        void **procp = (void **) &disp->GetPointerv;
 
+    if(!disp->GetPointerv) {
+        void ** procp = (void **) &disp->GetPointerv;
         snprintf(symboln, sizeof(symboln), "%sGetPointervEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->IsTexture) {
-        void **procp = (void **) &disp->IsTexture;
 
+    if(!disp->IsTexture) {
+        void ** procp = (void **) &disp->IsTexture;
         snprintf(symboln, sizeof(symboln), "%sIsTexture", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->IsTexture) {
-        void **procp = (void **) &disp->IsTexture;
 
+    if(!disp->IsTexture) {
+        void ** procp = (void **) &disp->IsTexture;
         snprintf(symboln, sizeof(symboln), "%sIsTextureEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->PrioritizeTextures) {
-        void **procp = (void **) &disp->PrioritizeTextures;
 
-        snprintf(symboln, sizeof(symboln), "%sPrioritizeTextures",
-                 symbol_prefix);
+    if(!disp->PrioritizeTextures) {
+        void ** procp = (void **) &disp->PrioritizeTextures;
+        snprintf(symboln, sizeof(symboln), "%sPrioritizeTextures", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->PrioritizeTextures) {
-        void **procp = (void **) &disp->PrioritizeTextures;
 
-        snprintf(symboln, sizeof(symboln), "%sPrioritizeTexturesEXT",
-                 symbol_prefix);
+    if(!disp->PrioritizeTextures) {
+        void ** procp = (void **) &disp->PrioritizeTextures;
+        snprintf(symboln, sizeof(symboln), "%sPrioritizeTexturesEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexSubImage1D) {
-        void **procp = (void **) &disp->TexSubImage1D;
 
+    if(!disp->TexSubImage1D) {
+        void ** procp = (void **) &disp->TexSubImage1D;
         snprintf(symboln, sizeof(symboln), "%sTexSubImage1D", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexSubImage1D) {
-        void **procp = (void **) &disp->TexSubImage1D;
 
+    if(!disp->TexSubImage1D) {
+        void ** procp = (void **) &disp->TexSubImage1D;
         snprintf(symboln, sizeof(symboln), "%sTexSubImage1DEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexSubImage2D) {
-        void **procp = (void **) &disp->TexSubImage2D;
 
+    if(!disp->TexSubImage2D) {
+        void ** procp = (void **) &disp->TexSubImage2D;
         snprintf(symboln, sizeof(symboln), "%sTexSubImage2D", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexSubImage2D) {
-        void **procp = (void **) &disp->TexSubImage2D;
 
+    if(!disp->TexSubImage2D) {
+        void ** procp = (void **) &disp->TexSubImage2D;
         snprintf(symboln, sizeof(symboln), "%sTexSubImage2DEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->PopClientAttrib) {
-        void **procp = (void **) &disp->PopClientAttrib;
 
+    if(!disp->PopClientAttrib) {
+        void ** procp = (void **) &disp->PopClientAttrib;
         snprintf(symboln, sizeof(symboln), "%sPopClientAttrib", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->PushClientAttrib) {
-        void **procp = (void **) &disp->PushClientAttrib;
 
+    if(!disp->PushClientAttrib) {
+        void ** procp = (void **) &disp->PushClientAttrib;
         snprintf(symboln, sizeof(symboln), "%sPushClientAttrib", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BlendColor) {
-        void **procp = (void **) &disp->BlendColor;
 
+    if(!disp->BlendColor) {
+        void ** procp = (void **) &disp->BlendColor;
         snprintf(symboln, sizeof(symboln), "%sBlendColor", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BlendColor) {
-        void **procp = (void **) &disp->BlendColor;
 
+    if(!disp->BlendColor) {
+        void ** procp = (void **) &disp->BlendColor;
         snprintf(symboln, sizeof(symboln), "%sBlendColorEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BlendEquation) {
-        void **procp = (void **) &disp->BlendEquation;
 
+    if(!disp->BlendEquation) {
+        void ** procp = (void **) &disp->BlendEquation;
         snprintf(symboln, sizeof(symboln), "%sBlendEquation", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BlendEquation) {
-        void **procp = (void **) &disp->BlendEquation;
 
+    if(!disp->BlendEquation) {
+        void ** procp = (void **) &disp->BlendEquation;
         snprintf(symboln, sizeof(symboln), "%sBlendEquationEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DrawRangeElements) {
-        void **procp = (void **) &disp->DrawRangeElements;
 
-        snprintf(symboln, sizeof(symboln), "%sDrawRangeElements",
-                 symbol_prefix);
+    if(!disp->BlendEquation) {
+        void ** procp = (void **) &disp->BlendEquation;
+        snprintf(symboln, sizeof(symboln), "%sBlendEquationOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DrawRangeElements) {
-        void **procp = (void **) &disp->DrawRangeElements;
 
-        snprintf(symboln, sizeof(symboln), "%sDrawRangeElementsEXT",
-                 symbol_prefix);
+    if(!disp->DrawRangeElements) {
+        void ** procp = (void **) &disp->DrawRangeElements;
+        snprintf(symboln, sizeof(symboln), "%sDrawRangeElements", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ColorTable) {
-        void **procp = (void **) &disp->ColorTable;
 
+    if(!disp->DrawRangeElements) {
+        void ** procp = (void **) &disp->DrawRangeElements;
+        snprintf(symboln, sizeof(symboln), "%sDrawRangeElementsEXT", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->ColorTable) {
+        void ** procp = (void **) &disp->ColorTable;
         snprintf(symboln, sizeof(symboln), "%sColorTable", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ColorTable) {
-        void **procp = (void **) &disp->ColorTable;
 
+    if(!disp->ColorTable) {
+        void ** procp = (void **) &disp->ColorTable;
         snprintf(symboln, sizeof(symboln), "%sColorTableSGI", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ColorTable) {
-        void **procp = (void **) &disp->ColorTable;
 
+    if(!disp->ColorTable) {
+        void ** procp = (void **) &disp->ColorTable;
         snprintf(symboln, sizeof(symboln), "%sColorTableEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ColorTableParameterfv) {
-        void **procp = (void **) &disp->ColorTableParameterfv;
 
-        snprintf(symboln, sizeof(symboln), "%sColorTableParameterfv",
-                 symbol_prefix);
+    if(!disp->ColorTableParameterfv) {
+        void ** procp = (void **) &disp->ColorTableParameterfv;
+        snprintf(symboln, sizeof(symboln), "%sColorTableParameterfv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ColorTableParameterfv) {
-        void **procp = (void **) &disp->ColorTableParameterfv;
 
-        snprintf(symboln, sizeof(symboln), "%sColorTableParameterfvSGI",
-                 symbol_prefix);
+    if(!disp->ColorTableParameterfv) {
+        void ** procp = (void **) &disp->ColorTableParameterfv;
+        snprintf(symboln, sizeof(symboln), "%sColorTableParameterfvSGI", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ColorTableParameteriv) {
-        void **procp = (void **) &disp->ColorTableParameteriv;
 
-        snprintf(symboln, sizeof(symboln), "%sColorTableParameteriv",
-                 symbol_prefix);
+    if(!disp->ColorTableParameteriv) {
+        void ** procp = (void **) &disp->ColorTableParameteriv;
+        snprintf(symboln, sizeof(symboln), "%sColorTableParameteriv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ColorTableParameteriv) {
-        void **procp = (void **) &disp->ColorTableParameteriv;
 
-        snprintf(symboln, sizeof(symboln), "%sColorTableParameterivSGI",
-                 symbol_prefix);
+    if(!disp->ColorTableParameteriv) {
+        void ** procp = (void **) &disp->ColorTableParameteriv;
+        snprintf(symboln, sizeof(symboln), "%sColorTableParameterivSGI", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->CopyColorTable) {
-        void **procp = (void **) &disp->CopyColorTable;
 
+    if(!disp->CopyColorTable) {
+        void ** procp = (void **) &disp->CopyColorTable;
         snprintf(symboln, sizeof(symboln), "%sCopyColorTable", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->CopyColorTable) {
-        void **procp = (void **) &disp->CopyColorTable;
 
-        snprintf(symboln, sizeof(symboln), "%sCopyColorTableSGI",
-                 symbol_prefix);
+    if(!disp->CopyColorTable) {
+        void ** procp = (void **) &disp->CopyColorTable;
+        snprintf(symboln, sizeof(symboln), "%sCopyColorTableSGI", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetColorTable) {
-        void **procp = (void **) &disp->GetColorTable;
 
+    if(!disp->GetColorTable) {
+        void ** procp = (void **) &disp->GetColorTable;
         snprintf(symboln, sizeof(symboln), "%sGetColorTable", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetColorTable) {
-        void **procp = (void **) &disp->GetColorTable;
 
+    if(!disp->GetColorTable) {
+        void ** procp = (void **) &disp->GetColorTable;
         snprintf(symboln, sizeof(symboln), "%sGetColorTableSGI", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetColorTable) {
-        void **procp = (void **) &disp->GetColorTable;
 
+    if(!disp->GetColorTable) {
+        void ** procp = (void **) &disp->GetColorTable;
         snprintf(symboln, sizeof(symboln), "%sGetColorTableEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetColorTableParameterfv) {
-        void **procp = (void **) &disp->GetColorTableParameterfv;
 
-        snprintf(symboln, sizeof(symboln), "%sGetColorTableParameterfv",
-                 symbol_prefix);
+    if(!disp->GetColorTableParameterfv) {
+        void ** procp = (void **) &disp->GetColorTableParameterfv;
+        snprintf(symboln, sizeof(symboln), "%sGetColorTableParameterfv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetColorTableParameterfv) {
-        void **procp = (void **) &disp->GetColorTableParameterfv;
 
-        snprintf(symboln, sizeof(symboln), "%sGetColorTableParameterfvSGI",
-                 symbol_prefix);
+    if(!disp->GetColorTableParameterfv) {
+        void ** procp = (void **) &disp->GetColorTableParameterfv;
+        snprintf(symboln, sizeof(symboln), "%sGetColorTableParameterfvSGI", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetColorTableParameterfv) {
-        void **procp = (void **) &disp->GetColorTableParameterfv;
 
-        snprintf(symboln, sizeof(symboln), "%sGetColorTableParameterfvEXT",
-                 symbol_prefix);
+    if(!disp->GetColorTableParameterfv) {
+        void ** procp = (void **) &disp->GetColorTableParameterfv;
+        snprintf(symboln, sizeof(symboln), "%sGetColorTableParameterfvEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetColorTableParameteriv) {
-        void **procp = (void **) &disp->GetColorTableParameteriv;
 
-        snprintf(symboln, sizeof(symboln), "%sGetColorTableParameteriv",
-                 symbol_prefix);
+    if(!disp->GetColorTableParameteriv) {
+        void ** procp = (void **) &disp->GetColorTableParameteriv;
+        snprintf(symboln, sizeof(symboln), "%sGetColorTableParameteriv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetColorTableParameteriv) {
-        void **procp = (void **) &disp->GetColorTableParameteriv;
 
-        snprintf(symboln, sizeof(symboln), "%sGetColorTableParameterivSGI",
-                 symbol_prefix);
+    if(!disp->GetColorTableParameteriv) {
+        void ** procp = (void **) &disp->GetColorTableParameteriv;
+        snprintf(symboln, sizeof(symboln), "%sGetColorTableParameterivSGI", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetColorTableParameteriv) {
-        void **procp = (void **) &disp->GetColorTableParameteriv;
 
-        snprintf(symboln, sizeof(symboln), "%sGetColorTableParameterivEXT",
-                 symbol_prefix);
+    if(!disp->GetColorTableParameteriv) {
+        void ** procp = (void **) &disp->GetColorTableParameteriv;
+        snprintf(symboln, sizeof(symboln), "%sGetColorTableParameterivEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ColorSubTable) {
-        void **procp = (void **) &disp->ColorSubTable;
 
+    if(!disp->ColorSubTable) {
+        void ** procp = (void **) &disp->ColorSubTable;
         snprintf(symboln, sizeof(symboln), "%sColorSubTable", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ColorSubTable) {
-        void **procp = (void **) &disp->ColorSubTable;
 
+    if(!disp->ColorSubTable) {
+        void ** procp = (void **) &disp->ColorSubTable;
         snprintf(symboln, sizeof(symboln), "%sColorSubTableEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->CopyColorSubTable) {
-        void **procp = (void **) &disp->CopyColorSubTable;
 
-        snprintf(symboln, sizeof(symboln), "%sCopyColorSubTable",
-                 symbol_prefix);
+    if(!disp->CopyColorSubTable) {
+        void ** procp = (void **) &disp->CopyColorSubTable;
+        snprintf(symboln, sizeof(symboln), "%sCopyColorSubTable", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->CopyColorSubTable) {
-        void **procp = (void **) &disp->CopyColorSubTable;
 
-        snprintf(symboln, sizeof(symboln), "%sCopyColorSubTableEXT",
-                 symbol_prefix);
+    if(!disp->CopyColorSubTable) {
+        void ** procp = (void **) &disp->CopyColorSubTable;
+        snprintf(symboln, sizeof(symboln), "%sCopyColorSubTableEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ConvolutionFilter1D) {
-        void **procp = (void **) &disp->ConvolutionFilter1D;
 
-        snprintf(symboln, sizeof(symboln), "%sConvolutionFilter1D",
-                 symbol_prefix);
+    if(!disp->ConvolutionFilter1D) {
+        void ** procp = (void **) &disp->ConvolutionFilter1D;
+        snprintf(symboln, sizeof(symboln), "%sConvolutionFilter1D", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ConvolutionFilter1D) {
-        void **procp = (void **) &disp->ConvolutionFilter1D;
 
-        snprintf(symboln, sizeof(symboln), "%sConvolutionFilter1DEXT",
-                 symbol_prefix);
+    if(!disp->ConvolutionFilter1D) {
+        void ** procp = (void **) &disp->ConvolutionFilter1D;
+        snprintf(symboln, sizeof(symboln), "%sConvolutionFilter1DEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ConvolutionFilter2D) {
-        void **procp = (void **) &disp->ConvolutionFilter2D;
 
-        snprintf(symboln, sizeof(symboln), "%sConvolutionFilter2D",
-                 symbol_prefix);
+    if(!disp->ConvolutionFilter2D) {
+        void ** procp = (void **) &disp->ConvolutionFilter2D;
+        snprintf(symboln, sizeof(symboln), "%sConvolutionFilter2D", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ConvolutionFilter2D) {
-        void **procp = (void **) &disp->ConvolutionFilter2D;
 
-        snprintf(symboln, sizeof(symboln), "%sConvolutionFilter2DEXT",
-                 symbol_prefix);
+    if(!disp->ConvolutionFilter2D) {
+        void ** procp = (void **) &disp->ConvolutionFilter2D;
+        snprintf(symboln, sizeof(symboln), "%sConvolutionFilter2DEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ConvolutionParameterf) {
-        void **procp = (void **) &disp->ConvolutionParameterf;
 
-        snprintf(symboln, sizeof(symboln), "%sConvolutionParameterf",
-                 symbol_prefix);
+    if(!disp->ConvolutionParameterf) {
+        void ** procp = (void **) &disp->ConvolutionParameterf;
+        snprintf(symboln, sizeof(symboln), "%sConvolutionParameterf", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ConvolutionParameterf) {
-        void **procp = (void **) &disp->ConvolutionParameterf;
 
-        snprintf(symboln, sizeof(symboln), "%sConvolutionParameterfEXT",
-                 symbol_prefix);
+    if(!disp->ConvolutionParameterf) {
+        void ** procp = (void **) &disp->ConvolutionParameterf;
+        snprintf(symboln, sizeof(symboln), "%sConvolutionParameterfEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ConvolutionParameterfv) {
-        void **procp = (void **) &disp->ConvolutionParameterfv;
 
-        snprintf(symboln, sizeof(symboln), "%sConvolutionParameterfv",
-                 symbol_prefix);
+    if(!disp->ConvolutionParameterfv) {
+        void ** procp = (void **) &disp->ConvolutionParameterfv;
+        snprintf(symboln, sizeof(symboln), "%sConvolutionParameterfv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ConvolutionParameterfv) {
-        void **procp = (void **) &disp->ConvolutionParameterfv;
 
-        snprintf(symboln, sizeof(symboln), "%sConvolutionParameterfvEXT",
-                 symbol_prefix);
+    if(!disp->ConvolutionParameterfv) {
+        void ** procp = (void **) &disp->ConvolutionParameterfv;
+        snprintf(symboln, sizeof(symboln), "%sConvolutionParameterfvEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ConvolutionParameteri) {
-        void **procp = (void **) &disp->ConvolutionParameteri;
 
-        snprintf(symboln, sizeof(symboln), "%sConvolutionParameteri",
-                 symbol_prefix);
+    if(!disp->ConvolutionParameteri) {
+        void ** procp = (void **) &disp->ConvolutionParameteri;
+        snprintf(symboln, sizeof(symboln), "%sConvolutionParameteri", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ConvolutionParameteri) {
-        void **procp = (void **) &disp->ConvolutionParameteri;
 
-        snprintf(symboln, sizeof(symboln), "%sConvolutionParameteriEXT",
-                 symbol_prefix);
+    if(!disp->ConvolutionParameteri) {
+        void ** procp = (void **) &disp->ConvolutionParameteri;
+        snprintf(symboln, sizeof(symboln), "%sConvolutionParameteriEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ConvolutionParameteriv) {
-        void **procp = (void **) &disp->ConvolutionParameteriv;
 
-        snprintf(symboln, sizeof(symboln), "%sConvolutionParameteriv",
-                 symbol_prefix);
+    if(!disp->ConvolutionParameteriv) {
+        void ** procp = (void **) &disp->ConvolutionParameteriv;
+        snprintf(symboln, sizeof(symboln), "%sConvolutionParameteriv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ConvolutionParameteriv) {
-        void **procp = (void **) &disp->ConvolutionParameteriv;
 
-        snprintf(symboln, sizeof(symboln), "%sConvolutionParameterivEXT",
-                 symbol_prefix);
+    if(!disp->ConvolutionParameteriv) {
+        void ** procp = (void **) &disp->ConvolutionParameteriv;
+        snprintf(symboln, sizeof(symboln), "%sConvolutionParameterivEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->CopyConvolutionFilter1D) {
-        void **procp = (void **) &disp->CopyConvolutionFilter1D;
 
-        snprintf(symboln, sizeof(symboln), "%sCopyConvolutionFilter1D",
-                 symbol_prefix);
+    if(!disp->CopyConvolutionFilter1D) {
+        void ** procp = (void **) &disp->CopyConvolutionFilter1D;
+        snprintf(symboln, sizeof(symboln), "%sCopyConvolutionFilter1D", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->CopyConvolutionFilter1D) {
-        void **procp = (void **) &disp->CopyConvolutionFilter1D;
 
-        snprintf(symboln, sizeof(symboln), "%sCopyConvolutionFilter1DEXT",
-                 symbol_prefix);
+    if(!disp->CopyConvolutionFilter1D) {
+        void ** procp = (void **) &disp->CopyConvolutionFilter1D;
+        snprintf(symboln, sizeof(symboln), "%sCopyConvolutionFilter1DEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->CopyConvolutionFilter2D) {
-        void **procp = (void **) &disp->CopyConvolutionFilter2D;
 
-        snprintf(symboln, sizeof(symboln), "%sCopyConvolutionFilter2D",
-                 symbol_prefix);
+    if(!disp->CopyConvolutionFilter2D) {
+        void ** procp = (void **) &disp->CopyConvolutionFilter2D;
+        snprintf(symboln, sizeof(symboln), "%sCopyConvolutionFilter2D", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->CopyConvolutionFilter2D) {
-        void **procp = (void **) &disp->CopyConvolutionFilter2D;
 
-        snprintf(symboln, sizeof(symboln), "%sCopyConvolutionFilter2DEXT",
-                 symbol_prefix);
+    if(!disp->CopyConvolutionFilter2D) {
+        void ** procp = (void **) &disp->CopyConvolutionFilter2D;
+        snprintf(symboln, sizeof(symboln), "%sCopyConvolutionFilter2DEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetConvolutionFilter) {
-        void **procp = (void **) &disp->GetConvolutionFilter;
 
-        snprintf(symboln, sizeof(symboln), "%sGetConvolutionFilter",
-                 symbol_prefix);
+    if(!disp->GetConvolutionFilter) {
+        void ** procp = (void **) &disp->GetConvolutionFilter;
+        snprintf(symboln, sizeof(symboln), "%sGetConvolutionFilter", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetConvolutionFilter) {
-        void **procp = (void **) &disp->GetConvolutionFilter;
 
-        snprintf(symboln, sizeof(symboln), "%sGetConvolutionFilterEXT",
-                 symbol_prefix);
+    if(!disp->GetConvolutionFilter) {
+        void ** procp = (void **) &disp->GetConvolutionFilter;
+        snprintf(symboln, sizeof(symboln), "%sGetConvolutionFilterEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetConvolutionParameterfv) {
-        void **procp = (void **) &disp->GetConvolutionParameterfv;
 
-        snprintf(symboln, sizeof(symboln), "%sGetConvolutionParameterfv",
-                 symbol_prefix);
+    if(!disp->GetConvolutionParameterfv) {
+        void ** procp = (void **) &disp->GetConvolutionParameterfv;
+        snprintf(symboln, sizeof(symboln), "%sGetConvolutionParameterfv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetConvolutionParameterfv) {
-        void **procp = (void **) &disp->GetConvolutionParameterfv;
 
-        snprintf(symboln, sizeof(symboln), "%sGetConvolutionParameterfvEXT",
-                 symbol_prefix);
+    if(!disp->GetConvolutionParameterfv) {
+        void ** procp = (void **) &disp->GetConvolutionParameterfv;
+        snprintf(symboln, sizeof(symboln), "%sGetConvolutionParameterfvEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetConvolutionParameteriv) {
-        void **procp = (void **) &disp->GetConvolutionParameteriv;
 
-        snprintf(symboln, sizeof(symboln), "%sGetConvolutionParameteriv",
-                 symbol_prefix);
+    if(!disp->GetConvolutionParameteriv) {
+        void ** procp = (void **) &disp->GetConvolutionParameteriv;
+        snprintf(symboln, sizeof(symboln), "%sGetConvolutionParameteriv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetConvolutionParameteriv) {
-        void **procp = (void **) &disp->GetConvolutionParameteriv;
 
-        snprintf(symboln, sizeof(symboln), "%sGetConvolutionParameterivEXT",
-                 symbol_prefix);
+    if(!disp->GetConvolutionParameteriv) {
+        void ** procp = (void **) &disp->GetConvolutionParameteriv;
+        snprintf(symboln, sizeof(symboln), "%sGetConvolutionParameterivEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetSeparableFilter) {
-        void **procp = (void **) &disp->GetSeparableFilter;
 
-        snprintf(symboln, sizeof(symboln), "%sGetSeparableFilter",
-                 symbol_prefix);
+    if(!disp->GetSeparableFilter) {
+        void ** procp = (void **) &disp->GetSeparableFilter;
+        snprintf(symboln, sizeof(symboln), "%sGetSeparableFilter", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetSeparableFilter) {
-        void **procp = (void **) &disp->GetSeparableFilter;
 
-        snprintf(symboln, sizeof(symboln), "%sGetSeparableFilterEXT",
-                 symbol_prefix);
+    if(!disp->GetSeparableFilter) {
+        void ** procp = (void **) &disp->GetSeparableFilter;
+        snprintf(symboln, sizeof(symboln), "%sGetSeparableFilterEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->SeparableFilter2D) {
-        void **procp = (void **) &disp->SeparableFilter2D;
 
-        snprintf(symboln, sizeof(symboln), "%sSeparableFilter2D",
-                 symbol_prefix);
+    if(!disp->SeparableFilter2D) {
+        void ** procp = (void **) &disp->SeparableFilter2D;
+        snprintf(symboln, sizeof(symboln), "%sSeparableFilter2D", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->SeparableFilter2D) {
-        void **procp = (void **) &disp->SeparableFilter2D;
 
-        snprintf(symboln, sizeof(symboln), "%sSeparableFilter2DEXT",
-                 symbol_prefix);
+    if(!disp->SeparableFilter2D) {
+        void ** procp = (void **) &disp->SeparableFilter2D;
+        snprintf(symboln, sizeof(symboln), "%sSeparableFilter2DEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetHistogram) {
-        void **procp = (void **) &disp->GetHistogram;
 
+    if(!disp->GetHistogram) {
+        void ** procp = (void **) &disp->GetHistogram;
         snprintf(symboln, sizeof(symboln), "%sGetHistogram", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetHistogram) {
-        void **procp = (void **) &disp->GetHistogram;
 
+    if(!disp->GetHistogram) {
+        void ** procp = (void **) &disp->GetHistogram;
         snprintf(symboln, sizeof(symboln), "%sGetHistogramEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetHistogramParameterfv) {
-        void **procp = (void **) &disp->GetHistogramParameterfv;
 
-        snprintf(symboln, sizeof(symboln), "%sGetHistogramParameterfv",
-                 symbol_prefix);
+    if(!disp->GetHistogramParameterfv) {
+        void ** procp = (void **) &disp->GetHistogramParameterfv;
+        snprintf(symboln, sizeof(symboln), "%sGetHistogramParameterfv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetHistogramParameterfv) {
-        void **procp = (void **) &disp->GetHistogramParameterfv;
 
-        snprintf(symboln, sizeof(symboln), "%sGetHistogramParameterfvEXT",
-                 symbol_prefix);
+    if(!disp->GetHistogramParameterfv) {
+        void ** procp = (void **) &disp->GetHistogramParameterfv;
+        snprintf(symboln, sizeof(symboln), "%sGetHistogramParameterfvEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetHistogramParameteriv) {
-        void **procp = (void **) &disp->GetHistogramParameteriv;
 
-        snprintf(symboln, sizeof(symboln), "%sGetHistogramParameteriv",
-                 symbol_prefix);
+    if(!disp->GetHistogramParameteriv) {
+        void ** procp = (void **) &disp->GetHistogramParameteriv;
+        snprintf(symboln, sizeof(symboln), "%sGetHistogramParameteriv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetHistogramParameteriv) {
-        void **procp = (void **) &disp->GetHistogramParameteriv;
 
-        snprintf(symboln, sizeof(symboln), "%sGetHistogramParameterivEXT",
-                 symbol_prefix);
+    if(!disp->GetHistogramParameteriv) {
+        void ** procp = (void **) &disp->GetHistogramParameteriv;
+        snprintf(symboln, sizeof(symboln), "%sGetHistogramParameterivEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetMinmax) {
-        void **procp = (void **) &disp->GetMinmax;
 
+    if(!disp->GetMinmax) {
+        void ** procp = (void **) &disp->GetMinmax;
         snprintf(symboln, sizeof(symboln), "%sGetMinmax", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetMinmax) {
-        void **procp = (void **) &disp->GetMinmax;
 
+    if(!disp->GetMinmax) {
+        void ** procp = (void **) &disp->GetMinmax;
         snprintf(symboln, sizeof(symboln), "%sGetMinmaxEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetMinmaxParameterfv) {
-        void **procp = (void **) &disp->GetMinmaxParameterfv;
 
-        snprintf(symboln, sizeof(symboln), "%sGetMinmaxParameterfv",
-                 symbol_prefix);
+    if(!disp->GetMinmaxParameterfv) {
+        void ** procp = (void **) &disp->GetMinmaxParameterfv;
+        snprintf(symboln, sizeof(symboln), "%sGetMinmaxParameterfv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetMinmaxParameterfv) {
-        void **procp = (void **) &disp->GetMinmaxParameterfv;
 
-        snprintf(symboln, sizeof(symboln), "%sGetMinmaxParameterfvEXT",
-                 symbol_prefix);
+    if(!disp->GetMinmaxParameterfv) {
+        void ** procp = (void **) &disp->GetMinmaxParameterfv;
+        snprintf(symboln, sizeof(symboln), "%sGetMinmaxParameterfvEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetMinmaxParameteriv) {
-        void **procp = (void **) &disp->GetMinmaxParameteriv;
 
-        snprintf(symboln, sizeof(symboln), "%sGetMinmaxParameteriv",
-                 symbol_prefix);
+    if(!disp->GetMinmaxParameteriv) {
+        void ** procp = (void **) &disp->GetMinmaxParameteriv;
+        snprintf(symboln, sizeof(symboln), "%sGetMinmaxParameteriv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetMinmaxParameteriv) {
-        void **procp = (void **) &disp->GetMinmaxParameteriv;
 
-        snprintf(symboln, sizeof(symboln), "%sGetMinmaxParameterivEXT",
-                 symbol_prefix);
+    if(!disp->GetMinmaxParameteriv) {
+        void ** procp = (void **) &disp->GetMinmaxParameteriv;
+        snprintf(symboln, sizeof(symboln), "%sGetMinmaxParameterivEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Histogram) {
-        void **procp = (void **) &disp->Histogram;
 
+    if(!disp->Histogram) {
+        void ** procp = (void **) &disp->Histogram;
         snprintf(symboln, sizeof(symboln), "%sHistogram", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Histogram) {
-        void **procp = (void **) &disp->Histogram;
 
+    if(!disp->Histogram) {
+        void ** procp = (void **) &disp->Histogram;
         snprintf(symboln, sizeof(symboln), "%sHistogramEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Minmax) {
-        void **procp = (void **) &disp->Minmax;
 
+    if(!disp->Minmax) {
+        void ** procp = (void **) &disp->Minmax;
         snprintf(symboln, sizeof(symboln), "%sMinmax", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Minmax) {
-        void **procp = (void **) &disp->Minmax;
 
+    if(!disp->Minmax) {
+        void ** procp = (void **) &disp->Minmax;
         snprintf(symboln, sizeof(symboln), "%sMinmaxEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ResetHistogram) {
-        void **procp = (void **) &disp->ResetHistogram;
 
+    if(!disp->ResetHistogram) {
+        void ** procp = (void **) &disp->ResetHistogram;
         snprintf(symboln, sizeof(symboln), "%sResetHistogram", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ResetHistogram) {
-        void **procp = (void **) &disp->ResetHistogram;
 
-        snprintf(symboln, sizeof(symboln), "%sResetHistogramEXT",
-                 symbol_prefix);
+    if(!disp->ResetHistogram) {
+        void ** procp = (void **) &disp->ResetHistogram;
+        snprintf(symboln, sizeof(symboln), "%sResetHistogramEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ResetMinmax) {
-        void **procp = (void **) &disp->ResetMinmax;
 
+    if(!disp->ResetMinmax) {
+        void ** procp = (void **) &disp->ResetMinmax;
         snprintf(symboln, sizeof(symboln), "%sResetMinmax", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ResetMinmax) {
-        void **procp = (void **) &disp->ResetMinmax;
 
+    if(!disp->ResetMinmax) {
+        void ** procp = (void **) &disp->ResetMinmax;
         snprintf(symboln, sizeof(symboln), "%sResetMinmaxEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexImage3D) {
-        void **procp = (void **) &disp->TexImage3D;
 
+    if(!disp->TexImage3D) {
+        void ** procp = (void **) &disp->TexImage3D;
         snprintf(symboln, sizeof(symboln), "%sTexImage3D", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexImage3D) {
-        void **procp = (void **) &disp->TexImage3D;
 
+    if(!disp->TexImage3D) {
+        void ** procp = (void **) &disp->TexImage3D;
         snprintf(symboln, sizeof(symboln), "%sTexImage3DEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexSubImage3D) {
-        void **procp = (void **) &disp->TexSubImage3D;
 
+    if(!disp->TexImage3D) {
+        void ** procp = (void **) &disp->TexImage3D;
+        snprintf(symboln, sizeof(symboln), "%sTexImage3DOES", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->TexSubImage3D) {
+        void ** procp = (void **) &disp->TexSubImage3D;
         snprintf(symboln, sizeof(symboln), "%sTexSubImage3D", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexSubImage3D) {
-        void **procp = (void **) &disp->TexSubImage3D;
 
+    if(!disp->TexSubImage3D) {
+        void ** procp = (void **) &disp->TexSubImage3D;
         snprintf(symboln, sizeof(symboln), "%sTexSubImage3DEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->CopyTexSubImage3D) {
-        void **procp = (void **) &disp->CopyTexSubImage3D;
 
-        snprintf(symboln, sizeof(symboln), "%sCopyTexSubImage3D",
-                 symbol_prefix);
+    if(!disp->TexSubImage3D) {
+        void ** procp = (void **) &disp->TexSubImage3D;
+        snprintf(symboln, sizeof(symboln), "%sTexSubImage3DOES", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->CopyTexSubImage3D) {
+        void ** procp = (void **) &disp->CopyTexSubImage3D;
+        snprintf(symboln, sizeof(symboln), "%sCopyTexSubImage3D", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->CopyTexSubImage3D) {
+        void ** procp = (void **) &disp->CopyTexSubImage3D;
+        snprintf(symboln, sizeof(symboln), "%sCopyTexSubImage3DEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->CopyTexSubImage3D) {
-        void **procp = (void **) &disp->CopyTexSubImage3D;
 
-        snprintf(symboln, sizeof(symboln), "%sCopyTexSubImage3DEXT",
-                 symbol_prefix);
+    if(!disp->CopyTexSubImage3D) {
+        void ** procp = (void **) &disp->CopyTexSubImage3D;
+        snprintf(symboln, sizeof(symboln), "%sCopyTexSubImage3DOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ActiveTextureARB) {
-        void **procp = (void **) &disp->ActiveTextureARB;
 
+    if(!disp->ActiveTexture) {
+        void ** procp = (void **) &disp->ActiveTexture;
         snprintf(symboln, sizeof(symboln), "%sActiveTexture", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ActiveTextureARB) {
-        void **procp = (void **) &disp->ActiveTextureARB;
 
+    if(!disp->ActiveTexture) {
+        void ** procp = (void **) &disp->ActiveTexture;
         snprintf(symboln, sizeof(symboln), "%sActiveTextureARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ClientActiveTextureARB) {
-        void **procp = (void **) &disp->ClientActiveTextureARB;
 
-        snprintf(symboln, sizeof(symboln), "%sClientActiveTexture",
-                 symbol_prefix);
+    if(!disp->ClientActiveTexture) {
+        void ** procp = (void **) &disp->ClientActiveTexture;
+        snprintf(symboln, sizeof(symboln), "%sClientActiveTexture", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ClientActiveTextureARB) {
-        void **procp = (void **) &disp->ClientActiveTextureARB;
 
-        snprintf(symboln, sizeof(symboln), "%sClientActiveTextureARB",
-                 symbol_prefix);
+    if(!disp->ClientActiveTexture) {
+        void ** procp = (void **) &disp->ClientActiveTexture;
+        snprintf(symboln, sizeof(symboln), "%sClientActiveTextureARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord1dARB) {
-        void **procp = (void **) &disp->MultiTexCoord1dARB;
 
+    if(!disp->MultiTexCoord1d) {
+        void ** procp = (void **) &disp->MultiTexCoord1d;
         snprintf(symboln, sizeof(symboln), "%sMultiTexCoord1d", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord1dARB) {
-        void **procp = (void **) &disp->MultiTexCoord1dARB;
 
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord1dARB",
-                 symbol_prefix);
+    if(!disp->MultiTexCoord1d) {
+        void ** procp = (void **) &disp->MultiTexCoord1d;
+        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord1dARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord1dvARB) {
-        void **procp = (void **) &disp->MultiTexCoord1dvARB;
 
+    if(!disp->MultiTexCoord1dv) {
+        void ** procp = (void **) &disp->MultiTexCoord1dv;
         snprintf(symboln, sizeof(symboln), "%sMultiTexCoord1dv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord1dvARB) {
-        void **procp = (void **) &disp->MultiTexCoord1dvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord1dvARB",
-                 symbol_prefix);
+    if(!disp->MultiTexCoord1dv) {
+        void ** procp = (void **) &disp->MultiTexCoord1dv;
+        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord1dvARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord1fARB) {
-        void **procp = (void **) &disp->MultiTexCoord1fARB;
 
+    if(!disp->MultiTexCoord1fARB) {
+        void ** procp = (void **) &disp->MultiTexCoord1fARB;
         snprintf(symboln, sizeof(symboln), "%sMultiTexCoord1f", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord1fARB) {
-        void **procp = (void **) &disp->MultiTexCoord1fARB;
 
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord1fARB",
-                 symbol_prefix);
+    if(!disp->MultiTexCoord1fARB) {
+        void ** procp = (void **) &disp->MultiTexCoord1fARB;
+        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord1fARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord1fvARB) {
-        void **procp = (void **) &disp->MultiTexCoord1fvARB;
 
+    if(!disp->MultiTexCoord1fvARB) {
+        void ** procp = (void **) &disp->MultiTexCoord1fvARB;
         snprintf(symboln, sizeof(symboln), "%sMultiTexCoord1fv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord1fvARB) {
-        void **procp = (void **) &disp->MultiTexCoord1fvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord1fvARB",
-                 symbol_prefix);
+    if(!disp->MultiTexCoord1fvARB) {
+        void ** procp = (void **) &disp->MultiTexCoord1fvARB;
+        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord1fvARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord1iARB) {
-        void **procp = (void **) &disp->MultiTexCoord1iARB;
 
+    if(!disp->MultiTexCoord1i) {
+        void ** procp = (void **) &disp->MultiTexCoord1i;
         snprintf(symboln, sizeof(symboln), "%sMultiTexCoord1i", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord1iARB) {
-        void **procp = (void **) &disp->MultiTexCoord1iARB;
 
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord1iARB",
-                 symbol_prefix);
+    if(!disp->MultiTexCoord1i) {
+        void ** procp = (void **) &disp->MultiTexCoord1i;
+        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord1iARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord1ivARB) {
-        void **procp = (void **) &disp->MultiTexCoord1ivARB;
 
+    if(!disp->MultiTexCoord1iv) {
+        void ** procp = (void **) &disp->MultiTexCoord1iv;
         snprintf(symboln, sizeof(symboln), "%sMultiTexCoord1iv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord1ivARB) {
-        void **procp = (void **) &disp->MultiTexCoord1ivARB;
 
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord1ivARB",
-                 symbol_prefix);
+    if(!disp->MultiTexCoord1iv) {
+        void ** procp = (void **) &disp->MultiTexCoord1iv;
+        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord1ivARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord1sARB) {
-        void **procp = (void **) &disp->MultiTexCoord1sARB;
 
+    if(!disp->MultiTexCoord1s) {
+        void ** procp = (void **) &disp->MultiTexCoord1s;
         snprintf(symboln, sizeof(symboln), "%sMultiTexCoord1s", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord1sARB) {
-        void **procp = (void **) &disp->MultiTexCoord1sARB;
 
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord1sARB",
-                 symbol_prefix);
+    if(!disp->MultiTexCoord1s) {
+        void ** procp = (void **) &disp->MultiTexCoord1s;
+        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord1sARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord1svARB) {
-        void **procp = (void **) &disp->MultiTexCoord1svARB;
 
+    if(!disp->MultiTexCoord1sv) {
+        void ** procp = (void **) &disp->MultiTexCoord1sv;
         snprintf(symboln, sizeof(symboln), "%sMultiTexCoord1sv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord1svARB) {
-        void **procp = (void **) &disp->MultiTexCoord1svARB;
 
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord1svARB",
-                 symbol_prefix);
+    if(!disp->MultiTexCoord1sv) {
+        void ** procp = (void **) &disp->MultiTexCoord1sv;
+        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord1svARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord2dARB) {
-        void **procp = (void **) &disp->MultiTexCoord2dARB;
 
+    if(!disp->MultiTexCoord2d) {
+        void ** procp = (void **) &disp->MultiTexCoord2d;
         snprintf(symboln, sizeof(symboln), "%sMultiTexCoord2d", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord2dARB) {
-        void **procp = (void **) &disp->MultiTexCoord2dARB;
 
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord2dARB",
-                 symbol_prefix);
+    if(!disp->MultiTexCoord2d) {
+        void ** procp = (void **) &disp->MultiTexCoord2d;
+        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord2dARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord2dvARB) {
-        void **procp = (void **) &disp->MultiTexCoord2dvARB;
 
+    if(!disp->MultiTexCoord2dv) {
+        void ** procp = (void **) &disp->MultiTexCoord2dv;
         snprintf(symboln, sizeof(symboln), "%sMultiTexCoord2dv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord2dvARB) {
-        void **procp = (void **) &disp->MultiTexCoord2dvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord2dvARB",
-                 symbol_prefix);
+    if(!disp->MultiTexCoord2dv) {
+        void ** procp = (void **) &disp->MultiTexCoord2dv;
+        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord2dvARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord2fARB) {
-        void **procp = (void **) &disp->MultiTexCoord2fARB;
 
+    if(!disp->MultiTexCoord2fARB) {
+        void ** procp = (void **) &disp->MultiTexCoord2fARB;
         snprintf(symboln, sizeof(symboln), "%sMultiTexCoord2f", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord2fARB) {
-        void **procp = (void **) &disp->MultiTexCoord2fARB;
 
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord2fARB",
-                 symbol_prefix);
+    if(!disp->MultiTexCoord2fARB) {
+        void ** procp = (void **) &disp->MultiTexCoord2fARB;
+        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord2fARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord2fvARB) {
-        void **procp = (void **) &disp->MultiTexCoord2fvARB;
 
+    if(!disp->MultiTexCoord2fvARB) {
+        void ** procp = (void **) &disp->MultiTexCoord2fvARB;
         snprintf(symboln, sizeof(symboln), "%sMultiTexCoord2fv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord2fvARB) {
-        void **procp = (void **) &disp->MultiTexCoord2fvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord2fvARB",
-                 symbol_prefix);
+    if(!disp->MultiTexCoord2fvARB) {
+        void ** procp = (void **) &disp->MultiTexCoord2fvARB;
+        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord2fvARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord2iARB) {
-        void **procp = (void **) &disp->MultiTexCoord2iARB;
 
+    if(!disp->MultiTexCoord2i) {
+        void ** procp = (void **) &disp->MultiTexCoord2i;
         snprintf(symboln, sizeof(symboln), "%sMultiTexCoord2i", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord2iARB) {
-        void **procp = (void **) &disp->MultiTexCoord2iARB;
 
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord2iARB",
-                 symbol_prefix);
+    if(!disp->MultiTexCoord2i) {
+        void ** procp = (void **) &disp->MultiTexCoord2i;
+        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord2iARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord2ivARB) {
-        void **procp = (void **) &disp->MultiTexCoord2ivARB;
 
+    if(!disp->MultiTexCoord2iv) {
+        void ** procp = (void **) &disp->MultiTexCoord2iv;
         snprintf(symboln, sizeof(symboln), "%sMultiTexCoord2iv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord2ivARB) {
-        void **procp = (void **) &disp->MultiTexCoord2ivARB;
 
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord2ivARB",
-                 symbol_prefix);
+    if(!disp->MultiTexCoord2iv) {
+        void ** procp = (void **) &disp->MultiTexCoord2iv;
+        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord2ivARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord2sARB) {
-        void **procp = (void **) &disp->MultiTexCoord2sARB;
 
+    if(!disp->MultiTexCoord2s) {
+        void ** procp = (void **) &disp->MultiTexCoord2s;
         snprintf(symboln, sizeof(symboln), "%sMultiTexCoord2s", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord2sARB) {
-        void **procp = (void **) &disp->MultiTexCoord2sARB;
 
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord2sARB",
-                 symbol_prefix);
+    if(!disp->MultiTexCoord2s) {
+        void ** procp = (void **) &disp->MultiTexCoord2s;
+        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord2sARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord2svARB) {
-        void **procp = (void **) &disp->MultiTexCoord2svARB;
 
+    if(!disp->MultiTexCoord2sv) {
+        void ** procp = (void **) &disp->MultiTexCoord2sv;
         snprintf(symboln, sizeof(symboln), "%sMultiTexCoord2sv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord2svARB) {
-        void **procp = (void **) &disp->MultiTexCoord2svARB;
 
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord2svARB",
-                 symbol_prefix);
+    if(!disp->MultiTexCoord2sv) {
+        void ** procp = (void **) &disp->MultiTexCoord2sv;
+        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord2svARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord3dARB) {
-        void **procp = (void **) &disp->MultiTexCoord3dARB;
 
+    if(!disp->MultiTexCoord3d) {
+        void ** procp = (void **) &disp->MultiTexCoord3d;
         snprintf(symboln, sizeof(symboln), "%sMultiTexCoord3d", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord3dARB) {
-        void **procp = (void **) &disp->MultiTexCoord3dARB;
 
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord3dARB",
-                 symbol_prefix);
+    if(!disp->MultiTexCoord3d) {
+        void ** procp = (void **) &disp->MultiTexCoord3d;
+        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord3dARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord3dvARB) {
-        void **procp = (void **) &disp->MultiTexCoord3dvARB;
 
+    if(!disp->MultiTexCoord3dv) {
+        void ** procp = (void **) &disp->MultiTexCoord3dv;
         snprintf(symboln, sizeof(symboln), "%sMultiTexCoord3dv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord3dvARB) {
-        void **procp = (void **) &disp->MultiTexCoord3dvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord3dvARB",
-                 symbol_prefix);
+    if(!disp->MultiTexCoord3dv) {
+        void ** procp = (void **) &disp->MultiTexCoord3dv;
+        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord3dvARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord3fARB) {
-        void **procp = (void **) &disp->MultiTexCoord3fARB;
 
+    if(!disp->MultiTexCoord3fARB) {
+        void ** procp = (void **) &disp->MultiTexCoord3fARB;
         snprintf(symboln, sizeof(symboln), "%sMultiTexCoord3f", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord3fARB) {
-        void **procp = (void **) &disp->MultiTexCoord3fARB;
 
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord3fARB",
-                 symbol_prefix);
+    if(!disp->MultiTexCoord3fARB) {
+        void ** procp = (void **) &disp->MultiTexCoord3fARB;
+        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord3fARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord3fvARB) {
-        void **procp = (void **) &disp->MultiTexCoord3fvARB;
 
+    if(!disp->MultiTexCoord3fvARB) {
+        void ** procp = (void **) &disp->MultiTexCoord3fvARB;
         snprintf(symboln, sizeof(symboln), "%sMultiTexCoord3fv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord3fvARB) {
-        void **procp = (void **) &disp->MultiTexCoord3fvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord3fvARB",
-                 symbol_prefix);
+    if(!disp->MultiTexCoord3fvARB) {
+        void ** procp = (void **) &disp->MultiTexCoord3fvARB;
+        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord3fvARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord3iARB) {
-        void **procp = (void **) &disp->MultiTexCoord3iARB;
 
+    if(!disp->MultiTexCoord3i) {
+        void ** procp = (void **) &disp->MultiTexCoord3i;
         snprintf(symboln, sizeof(symboln), "%sMultiTexCoord3i", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord3iARB) {
-        void **procp = (void **) &disp->MultiTexCoord3iARB;
 
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord3iARB",
-                 symbol_prefix);
+    if(!disp->MultiTexCoord3i) {
+        void ** procp = (void **) &disp->MultiTexCoord3i;
+        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord3iARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord3ivARB) {
-        void **procp = (void **) &disp->MultiTexCoord3ivARB;
 
+    if(!disp->MultiTexCoord3iv) {
+        void ** procp = (void **) &disp->MultiTexCoord3iv;
         snprintf(symboln, sizeof(symboln), "%sMultiTexCoord3iv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord3ivARB) {
-        void **procp = (void **) &disp->MultiTexCoord3ivARB;
 
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord3ivARB",
-                 symbol_prefix);
+    if(!disp->MultiTexCoord3iv) {
+        void ** procp = (void **) &disp->MultiTexCoord3iv;
+        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord3ivARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord3sARB) {
-        void **procp = (void **) &disp->MultiTexCoord3sARB;
 
+    if(!disp->MultiTexCoord3s) {
+        void ** procp = (void **) &disp->MultiTexCoord3s;
         snprintf(symboln, sizeof(symboln), "%sMultiTexCoord3s", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord3sARB) {
-        void **procp = (void **) &disp->MultiTexCoord3sARB;
 
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord3sARB",
-                 symbol_prefix);
+    if(!disp->MultiTexCoord3s) {
+        void ** procp = (void **) &disp->MultiTexCoord3s;
+        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord3sARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord3svARB) {
-        void **procp = (void **) &disp->MultiTexCoord3svARB;
 
+    if(!disp->MultiTexCoord3sv) {
+        void ** procp = (void **) &disp->MultiTexCoord3sv;
         snprintf(symboln, sizeof(symboln), "%sMultiTexCoord3sv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord3svARB) {
-        void **procp = (void **) &disp->MultiTexCoord3svARB;
 
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord3svARB",
-                 symbol_prefix);
+    if(!disp->MultiTexCoord3sv) {
+        void ** procp = (void **) &disp->MultiTexCoord3sv;
+        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord3svARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord4dARB) {
-        void **procp = (void **) &disp->MultiTexCoord4dARB;
 
+    if(!disp->MultiTexCoord4d) {
+        void ** procp = (void **) &disp->MultiTexCoord4d;
         snprintf(symboln, sizeof(symboln), "%sMultiTexCoord4d", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord4dARB) {
-        void **procp = (void **) &disp->MultiTexCoord4dARB;
 
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord4dARB",
-                 symbol_prefix);
+    if(!disp->MultiTexCoord4d) {
+        void ** procp = (void **) &disp->MultiTexCoord4d;
+        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord4dARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord4dvARB) {
-        void **procp = (void **) &disp->MultiTexCoord4dvARB;
 
+    if(!disp->MultiTexCoord4dv) {
+        void ** procp = (void **) &disp->MultiTexCoord4dv;
         snprintf(symboln, sizeof(symboln), "%sMultiTexCoord4dv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord4dvARB) {
-        void **procp = (void **) &disp->MultiTexCoord4dvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord4dvARB",
-                 symbol_prefix);
+    if(!disp->MultiTexCoord4dv) {
+        void ** procp = (void **) &disp->MultiTexCoord4dv;
+        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord4dvARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord4fARB) {
-        void **procp = (void **) &disp->MultiTexCoord4fARB;
 
+    if(!disp->MultiTexCoord4fARB) {
+        void ** procp = (void **) &disp->MultiTexCoord4fARB;
         snprintf(symboln, sizeof(symboln), "%sMultiTexCoord4f", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord4fARB) {
-        void **procp = (void **) &disp->MultiTexCoord4fARB;
 
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord4fARB",
-                 symbol_prefix);
+    if(!disp->MultiTexCoord4fARB) {
+        void ** procp = (void **) &disp->MultiTexCoord4fARB;
+        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord4fARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord4fvARB) {
-        void **procp = (void **) &disp->MultiTexCoord4fvARB;
 
+    if(!disp->MultiTexCoord4fvARB) {
+        void ** procp = (void **) &disp->MultiTexCoord4fvARB;
         snprintf(symboln, sizeof(symboln), "%sMultiTexCoord4fv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord4fvARB) {
-        void **procp = (void **) &disp->MultiTexCoord4fvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord4fvARB",
-                 symbol_prefix);
+    if(!disp->MultiTexCoord4fvARB) {
+        void ** procp = (void **) &disp->MultiTexCoord4fvARB;
+        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord4fvARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord4iARB) {
-        void **procp = (void **) &disp->MultiTexCoord4iARB;
 
+    if(!disp->MultiTexCoord4i) {
+        void ** procp = (void **) &disp->MultiTexCoord4i;
         snprintf(symboln, sizeof(symboln), "%sMultiTexCoord4i", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord4iARB) {
-        void **procp = (void **) &disp->MultiTexCoord4iARB;
 
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord4iARB",
-                 symbol_prefix);
+    if(!disp->MultiTexCoord4i) {
+        void ** procp = (void **) &disp->MultiTexCoord4i;
+        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord4iARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord4ivARB) {
-        void **procp = (void **) &disp->MultiTexCoord4ivARB;
 
+    if(!disp->MultiTexCoord4iv) {
+        void ** procp = (void **) &disp->MultiTexCoord4iv;
         snprintf(symboln, sizeof(symboln), "%sMultiTexCoord4iv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord4ivARB) {
-        void **procp = (void **) &disp->MultiTexCoord4ivARB;
 
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord4ivARB",
-                 symbol_prefix);
+    if(!disp->MultiTexCoord4iv) {
+        void ** procp = (void **) &disp->MultiTexCoord4iv;
+        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord4ivARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord4sARB) {
-        void **procp = (void **) &disp->MultiTexCoord4sARB;
 
+    if(!disp->MultiTexCoord4s) {
+        void ** procp = (void **) &disp->MultiTexCoord4s;
         snprintf(symboln, sizeof(symboln), "%sMultiTexCoord4s", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord4sARB) {
-        void **procp = (void **) &disp->MultiTexCoord4sARB;
 
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord4sARB",
-                 symbol_prefix);
+    if(!disp->MultiTexCoord4s) {
+        void ** procp = (void **) &disp->MultiTexCoord4s;
+        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord4sARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord4svARB) {
-        void **procp = (void **) &disp->MultiTexCoord4svARB;
 
+    if(!disp->MultiTexCoord4sv) {
+        void ** procp = (void **) &disp->MultiTexCoord4sv;
         snprintf(symboln, sizeof(symboln), "%sMultiTexCoord4sv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoord4svARB) {
-        void **procp = (void **) &disp->MultiTexCoord4svARB;
 
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord4svARB",
-                 symbol_prefix);
+    if(!disp->MultiTexCoord4sv) {
+        void ** procp = (void **) &disp->MultiTexCoord4sv;
+        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord4svARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->AttachShader) {
-        void **procp = (void **) &disp->AttachShader;
 
-        snprintf(symboln, sizeof(symboln), "%sAttachShader", symbol_prefix);
+    if(!disp->CompressedTexImage1D) {
+        void ** procp = (void **) &disp->CompressedTexImage1D;
+        snprintf(symboln, sizeof(symboln), "%sCompressedTexImage1D", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->CreateProgram) {
-        void **procp = (void **) &disp->CreateProgram;
 
-        snprintf(symboln, sizeof(symboln), "%sCreateProgram", symbol_prefix);
+    if(!disp->CompressedTexImage1D) {
+        void ** procp = (void **) &disp->CompressedTexImage1D;
+        snprintf(symboln, sizeof(symboln), "%sCompressedTexImage1DARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->CreateShader) {
-        void **procp = (void **) &disp->CreateShader;
 
-        snprintf(symboln, sizeof(symboln), "%sCreateShader", symbol_prefix);
+    if(!disp->CompressedTexImage2D) {
+        void ** procp = (void **) &disp->CompressedTexImage2D;
+        snprintf(symboln, sizeof(symboln), "%sCompressedTexImage2D", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DeleteProgram) {
-        void **procp = (void **) &disp->DeleteProgram;
 
-        snprintf(symboln, sizeof(symboln), "%sDeleteProgram", symbol_prefix);
+    if(!disp->CompressedTexImage2D) {
+        void ** procp = (void **) &disp->CompressedTexImage2D;
+        snprintf(symboln, sizeof(symboln), "%sCompressedTexImage2DARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DeleteShader) {
-        void **procp = (void **) &disp->DeleteShader;
 
-        snprintf(symboln, sizeof(symboln), "%sDeleteShader", symbol_prefix);
+    if(!disp->CompressedTexImage3D) {
+        void ** procp = (void **) &disp->CompressedTexImage3D;
+        snprintf(symboln, sizeof(symboln), "%sCompressedTexImage3D", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DetachShader) {
-        void **procp = (void **) &disp->DetachShader;
 
-        snprintf(symboln, sizeof(symboln), "%sDetachShader", symbol_prefix);
+    if(!disp->CompressedTexImage3D) {
+        void ** procp = (void **) &disp->CompressedTexImage3D;
+        snprintf(symboln, sizeof(symboln), "%sCompressedTexImage3DARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetAttachedShaders) {
-        void **procp = (void **) &disp->GetAttachedShaders;
 
-        snprintf(symboln, sizeof(symboln), "%sGetAttachedShaders",
-                 symbol_prefix);
+    if(!disp->CompressedTexImage3D) {
+        void ** procp = (void **) &disp->CompressedTexImage3D;
+        snprintf(symboln, sizeof(symboln), "%sCompressedTexImage3DOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetProgramInfoLog) {
-        void **procp = (void **) &disp->GetProgramInfoLog;
 
-        snprintf(symboln, sizeof(symboln), "%sGetProgramInfoLog",
-                 symbol_prefix);
+    if(!disp->CompressedTexSubImage1D) {
+        void ** procp = (void **) &disp->CompressedTexSubImage1D;
+        snprintf(symboln, sizeof(symboln), "%sCompressedTexSubImage1D", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetProgramiv) {
-        void **procp = (void **) &disp->GetProgramiv;
 
-        snprintf(symboln, sizeof(symboln), "%sGetProgramiv", symbol_prefix);
+    if(!disp->CompressedTexSubImage1D) {
+        void ** procp = (void **) &disp->CompressedTexSubImage1D;
+        snprintf(symboln, sizeof(symboln), "%sCompressedTexSubImage1DARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetShaderInfoLog) {
-        void **procp = (void **) &disp->GetShaderInfoLog;
 
-        snprintf(symboln, sizeof(symboln), "%sGetShaderInfoLog", symbol_prefix);
+    if(!disp->CompressedTexSubImage2D) {
+        void ** procp = (void **) &disp->CompressedTexSubImage2D;
+        snprintf(symboln, sizeof(symboln), "%sCompressedTexSubImage2D", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetShaderiv) {
-        void **procp = (void **) &disp->GetShaderiv;
 
-        snprintf(symboln, sizeof(symboln), "%sGetShaderiv", symbol_prefix);
+    if(!disp->CompressedTexSubImage2D) {
+        void ** procp = (void **) &disp->CompressedTexSubImage2D;
+        snprintf(symboln, sizeof(symboln), "%sCompressedTexSubImage2DARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->IsProgram) {
-        void **procp = (void **) &disp->IsProgram;
 
-        snprintf(symboln, sizeof(symboln), "%sIsProgram", symbol_prefix);
+    if(!disp->CompressedTexSubImage3D) {
+        void ** procp = (void **) &disp->CompressedTexSubImage3D;
+        snprintf(symboln, sizeof(symboln), "%sCompressedTexSubImage3D", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->IsShader) {
-        void **procp = (void **) &disp->IsShader;
 
-        snprintf(symboln, sizeof(symboln), "%sIsShader", symbol_prefix);
+    if(!disp->CompressedTexSubImage3D) {
+        void ** procp = (void **) &disp->CompressedTexSubImage3D;
+        snprintf(symboln, sizeof(symboln), "%sCompressedTexSubImage3DARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->StencilFuncSeparate) {
-        void **procp = (void **) &disp->StencilFuncSeparate;
 
-        snprintf(symboln, sizeof(symboln), "%sStencilFuncSeparate",
-                 symbol_prefix);
+    if(!disp->CompressedTexSubImage3D) {
+        void ** procp = (void **) &disp->CompressedTexSubImage3D;
+        snprintf(symboln, sizeof(symboln), "%sCompressedTexSubImage3DOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->StencilMaskSeparate) {
-        void **procp = (void **) &disp->StencilMaskSeparate;
 
-        snprintf(symboln, sizeof(symboln), "%sStencilMaskSeparate",
-                 symbol_prefix);
+    if(!disp->GetCompressedTexImage) {
+        void ** procp = (void **) &disp->GetCompressedTexImage;
+        snprintf(symboln, sizeof(symboln), "%sGetCompressedTexImage", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->StencilOpSeparate) {
-        void **procp = (void **) &disp->StencilOpSeparate;
 
-        snprintf(symboln, sizeof(symboln), "%sStencilOpSeparate",
-                 symbol_prefix);
+    if(!disp->GetCompressedTexImage) {
+        void ** procp = (void **) &disp->GetCompressedTexImage;
+        snprintf(symboln, sizeof(symboln), "%sGetCompressedTexImageARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->StencilOpSeparate) {
-        void **procp = (void **) &disp->StencilOpSeparate;
 
-        snprintf(symboln, sizeof(symboln), "%sStencilOpSeparateATI",
-                 symbol_prefix);
+    if(!disp->LoadTransposeMatrixd) {
+        void ** procp = (void **) &disp->LoadTransposeMatrixd;
+        snprintf(symboln, sizeof(symboln), "%sLoadTransposeMatrixd", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->UniformMatrix2x3fv) {
-        void **procp = (void **) &disp->UniformMatrix2x3fv;
 
-        snprintf(symboln, sizeof(symboln), "%sUniformMatrix2x3fv",
-                 symbol_prefix);
+    if(!disp->LoadTransposeMatrixd) {
+        void ** procp = (void **) &disp->LoadTransposeMatrixd;
+        snprintf(symboln, sizeof(symboln), "%sLoadTransposeMatrixdARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->UniformMatrix2x4fv) {
-        void **procp = (void **) &disp->UniformMatrix2x4fv;
 
-        snprintf(symboln, sizeof(symboln), "%sUniformMatrix2x4fv",
-                 symbol_prefix);
+    if(!disp->LoadTransposeMatrixf) {
+        void ** procp = (void **) &disp->LoadTransposeMatrixf;
+        snprintf(symboln, sizeof(symboln), "%sLoadTransposeMatrixf", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->UniformMatrix3x2fv) {
-        void **procp = (void **) &disp->UniformMatrix3x2fv;
 
-        snprintf(symboln, sizeof(symboln), "%sUniformMatrix3x2fv",
-                 symbol_prefix);
+    if(!disp->LoadTransposeMatrixf) {
+        void ** procp = (void **) &disp->LoadTransposeMatrixf;
+        snprintf(symboln, sizeof(symboln), "%sLoadTransposeMatrixfARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->UniformMatrix3x4fv) {
-        void **procp = (void **) &disp->UniformMatrix3x4fv;
 
-        snprintf(symboln, sizeof(symboln), "%sUniformMatrix3x4fv",
-                 symbol_prefix);
+    if(!disp->MultTransposeMatrixd) {
+        void ** procp = (void **) &disp->MultTransposeMatrixd;
+        snprintf(symboln, sizeof(symboln), "%sMultTransposeMatrixd", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->UniformMatrix4x2fv) {
-        void **procp = (void **) &disp->UniformMatrix4x2fv;
 
-        snprintf(symboln, sizeof(symboln), "%sUniformMatrix4x2fv",
-                 symbol_prefix);
+    if(!disp->MultTransposeMatrixd) {
+        void ** procp = (void **) &disp->MultTransposeMatrixd;
+        snprintf(symboln, sizeof(symboln), "%sMultTransposeMatrixdARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->UniformMatrix4x3fv) {
-        void **procp = (void **) &disp->UniformMatrix4x3fv;
 
-        snprintf(symboln, sizeof(symboln), "%sUniformMatrix4x3fv",
-                 symbol_prefix);
+    if(!disp->MultTransposeMatrixf) {
+        void ** procp = (void **) &disp->MultTransposeMatrixf;
+        snprintf(symboln, sizeof(symboln), "%sMultTransposeMatrixf", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ClampColor) {
-        void **procp = (void **) &disp->ClampColor;
 
-        snprintf(symboln, sizeof(symboln), "%sClampColor", symbol_prefix);
+    if(!disp->MultTransposeMatrixf) {
+        void ** procp = (void **) &disp->MultTransposeMatrixf;
+        snprintf(symboln, sizeof(symboln), "%sMultTransposeMatrixfARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ClearBufferfi) {
-        void **procp = (void **) &disp->ClearBufferfi;
 
-        snprintf(symboln, sizeof(symboln), "%sClearBufferfi", symbol_prefix);
+    if(!disp->SampleCoverage) {
+        void ** procp = (void **) &disp->SampleCoverage;
+        snprintf(symboln, sizeof(symboln), "%sSampleCoverage", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ClearBufferfv) {
-        void **procp = (void **) &disp->ClearBufferfv;
 
-        snprintf(symboln, sizeof(symboln), "%sClearBufferfv", symbol_prefix);
+    if(!disp->SampleCoverage) {
+        void ** procp = (void **) &disp->SampleCoverage;
+        snprintf(symboln, sizeof(symboln), "%sSampleCoverageARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ClearBufferiv) {
-        void **procp = (void **) &disp->ClearBufferiv;
 
-        snprintf(symboln, sizeof(symboln), "%sClearBufferiv", symbol_prefix);
+    if(!disp->BlendFuncSeparate) {
+        void ** procp = (void **) &disp->BlendFuncSeparate;
+        snprintf(symboln, sizeof(symboln), "%sBlendFuncSeparate", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ClearBufferuiv) {
-        void **procp = (void **) &disp->ClearBufferuiv;
 
-        snprintf(symboln, sizeof(symboln), "%sClearBufferuiv", symbol_prefix);
+    if(!disp->BlendFuncSeparate) {
+        void ** procp = (void **) &disp->BlendFuncSeparate;
+        snprintf(symboln, sizeof(symboln), "%sBlendFuncSeparateEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetStringi) {
-        void **procp = (void **) &disp->GetStringi;
 
-        snprintf(symboln, sizeof(symboln), "%sGetStringi", symbol_prefix);
+    if(!disp->BlendFuncSeparate) {
+        void ** procp = (void **) &disp->BlendFuncSeparate;
+        snprintf(symboln, sizeof(symboln), "%sBlendFuncSeparateINGR", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexBuffer) {
-        void **procp = (void **) &disp->TexBuffer;
 
-        snprintf(symboln, sizeof(symboln), "%sTexBuffer", symbol_prefix);
+    if(!disp->BlendFuncSeparate) {
+        void ** procp = (void **) &disp->BlendFuncSeparate;
+        snprintf(symboln, sizeof(symboln), "%sBlendFuncSeparateOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->FramebufferTexture) {
-        void **procp = (void **) &disp->FramebufferTexture;
 
-        snprintf(symboln, sizeof(symboln), "%sFramebufferTexture",
-                 symbol_prefix);
+    if(!disp->FogCoordPointer) {
+        void ** procp = (void **) &disp->FogCoordPointer;
+        snprintf(symboln, sizeof(symboln), "%sFogCoordPointer", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetBufferParameteri64v) {
-        void **procp = (void **) &disp->GetBufferParameteri64v;
 
-        snprintf(symboln, sizeof(symboln), "%sGetBufferParameteri64v",
-                 symbol_prefix);
+    if(!disp->FogCoordPointer) {
+        void ** procp = (void **) &disp->FogCoordPointer;
+        snprintf(symboln, sizeof(symboln), "%sFogCoordPointerEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetInteger64i_v) {
-        void **procp = (void **) &disp->GetInteger64i_v;
 
-        snprintf(symboln, sizeof(symboln), "%sGetInteger64i_v", symbol_prefix);
+    if(!disp->FogCoordd) {
+        void ** procp = (void **) &disp->FogCoordd;
+        snprintf(symboln, sizeof(symboln), "%sFogCoordd", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribDivisor) {
-        void **procp = (void **) &disp->VertexAttribDivisor;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribDivisor",
-                 symbol_prefix);
+    if(!disp->FogCoordd) {
+        void ** procp = (void **) &disp->FogCoordd;
+        snprintf(symboln, sizeof(symboln), "%sFogCoorddEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->LoadTransposeMatrixdARB) {
-        void **procp = (void **) &disp->LoadTransposeMatrixdARB;
 
-        snprintf(symboln, sizeof(symboln), "%sLoadTransposeMatrixd",
-                 symbol_prefix);
+    if(!disp->FogCoorddv) {
+        void ** procp = (void **) &disp->FogCoorddv;
+        snprintf(symboln, sizeof(symboln), "%sFogCoorddv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->LoadTransposeMatrixdARB) {
-        void **procp = (void **) &disp->LoadTransposeMatrixdARB;
 
-        snprintf(symboln, sizeof(symboln), "%sLoadTransposeMatrixdARB",
-                 symbol_prefix);
+    if(!disp->FogCoorddv) {
+        void ** procp = (void **) &disp->FogCoorddv;
+        snprintf(symboln, sizeof(symboln), "%sFogCoorddvEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->LoadTransposeMatrixfARB) {
-        void **procp = (void **) &disp->LoadTransposeMatrixfARB;
 
-        snprintf(symboln, sizeof(symboln), "%sLoadTransposeMatrixf",
-                 symbol_prefix);
+    if(!disp->MultiDrawArrays) {
+        void ** procp = (void **) &disp->MultiDrawArrays;
+        snprintf(symboln, sizeof(symboln), "%sMultiDrawArrays", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->LoadTransposeMatrixfARB) {
-        void **procp = (void **) &disp->LoadTransposeMatrixfARB;
 
-        snprintf(symboln, sizeof(symboln), "%sLoadTransposeMatrixfARB",
-                 symbol_prefix);
+    if(!disp->MultiDrawArrays) {
+        void ** procp = (void **) &disp->MultiDrawArrays;
+        snprintf(symboln, sizeof(symboln), "%sMultiDrawArraysEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultTransposeMatrixdARB) {
-        void **procp = (void **) &disp->MultTransposeMatrixdARB;
 
-        snprintf(symboln, sizeof(symboln), "%sMultTransposeMatrixd",
-                 symbol_prefix);
+    if(!disp->PointParameterf) {
+        void ** procp = (void **) &disp->PointParameterf;
+        snprintf(symboln, sizeof(symboln), "%sPointParameterf", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultTransposeMatrixdARB) {
-        void **procp = (void **) &disp->MultTransposeMatrixdARB;
 
-        snprintf(symboln, sizeof(symboln), "%sMultTransposeMatrixdARB",
-                 symbol_prefix);
+    if(!disp->PointParameterf) {
+        void ** procp = (void **) &disp->PointParameterf;
+        snprintf(symboln, sizeof(symboln), "%sPointParameterfARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultTransposeMatrixfARB) {
-        void **procp = (void **) &disp->MultTransposeMatrixfARB;
 
-        snprintf(symboln, sizeof(symboln), "%sMultTransposeMatrixf",
-                 symbol_prefix);
+    if(!disp->PointParameterf) {
+        void ** procp = (void **) &disp->PointParameterf;
+        snprintf(symboln, sizeof(symboln), "%sPointParameterfEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultTransposeMatrixfARB) {
-        void **procp = (void **) &disp->MultTransposeMatrixfARB;
 
-        snprintf(symboln, sizeof(symboln), "%sMultTransposeMatrixfARB",
-                 symbol_prefix);
+    if(!disp->PointParameterf) {
+        void ** procp = (void **) &disp->PointParameterf;
+        snprintf(symboln, sizeof(symboln), "%sPointParameterfSGIS", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->SampleCoverageARB) {
-        void **procp = (void **) &disp->SampleCoverageARB;
 
-        snprintf(symboln, sizeof(symboln), "%sSampleCoverage", symbol_prefix);
+    if(!disp->PointParameterfv) {
+        void ** procp = (void **) &disp->PointParameterfv;
+        snprintf(symboln, sizeof(symboln), "%sPointParameterfv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->SampleCoverageARB) {
-        void **procp = (void **) &disp->SampleCoverageARB;
 
-        snprintf(symboln, sizeof(symboln), "%sSampleCoverageARB",
-                 symbol_prefix);
+    if(!disp->PointParameterfv) {
+        void ** procp = (void **) &disp->PointParameterfv;
+        snprintf(symboln, sizeof(symboln), "%sPointParameterfvARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->CompressedTexImage1DARB) {
-        void **procp = (void **) &disp->CompressedTexImage1DARB;
 
-        snprintf(symboln, sizeof(symboln), "%sCompressedTexImage1D",
-                 symbol_prefix);
+    if(!disp->PointParameterfv) {
+        void ** procp = (void **) &disp->PointParameterfv;
+        snprintf(symboln, sizeof(symboln), "%sPointParameterfvEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->CompressedTexImage1DARB) {
-        void **procp = (void **) &disp->CompressedTexImage1DARB;
 
-        snprintf(symboln, sizeof(symboln), "%sCompressedTexImage1DARB",
-                 symbol_prefix);
+    if(!disp->PointParameterfv) {
+        void ** procp = (void **) &disp->PointParameterfv;
+        snprintf(symboln, sizeof(symboln), "%sPointParameterfvSGIS", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->CompressedTexImage2DARB) {
-        void **procp = (void **) &disp->CompressedTexImage2DARB;
 
-        snprintf(symboln, sizeof(symboln), "%sCompressedTexImage2D",
-                 symbol_prefix);
+    if(!disp->PointParameteri) {
+        void ** procp = (void **) &disp->PointParameteri;
+        snprintf(symboln, sizeof(symboln), "%sPointParameteri", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->CompressedTexImage2DARB) {
-        void **procp = (void **) &disp->CompressedTexImage2DARB;
 
-        snprintf(symboln, sizeof(symboln), "%sCompressedTexImage2DARB",
-                 symbol_prefix);
+    if(!disp->PointParameteri) {
+        void ** procp = (void **) &disp->PointParameteri;
+        snprintf(symboln, sizeof(symboln), "%sPointParameteriNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->CompressedTexImage3DARB) {
-        void **procp = (void **) &disp->CompressedTexImage3DARB;
 
-        snprintf(symboln, sizeof(symboln), "%sCompressedTexImage3D",
-                 symbol_prefix);
+    if(!disp->PointParameteriv) {
+        void ** procp = (void **) &disp->PointParameteriv;
+        snprintf(symboln, sizeof(symboln), "%sPointParameteriv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->CompressedTexImage3DARB) {
-        void **procp = (void **) &disp->CompressedTexImage3DARB;
 
-        snprintf(symboln, sizeof(symboln), "%sCompressedTexImage3DARB",
-                 symbol_prefix);
+    if(!disp->PointParameteriv) {
+        void ** procp = (void **) &disp->PointParameteriv;
+        snprintf(symboln, sizeof(symboln), "%sPointParameterivNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->CompressedTexSubImage1DARB) {
-        void **procp = (void **) &disp->CompressedTexSubImage1DARB;
 
-        snprintf(symboln, sizeof(symboln), "%sCompressedTexSubImage1D",
-                 symbol_prefix);
+    if(!disp->SecondaryColor3b) {
+        void ** procp = (void **) &disp->SecondaryColor3b;
+        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3b", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->CompressedTexSubImage1DARB) {
-        void **procp = (void **) &disp->CompressedTexSubImage1DARB;
 
-        snprintf(symboln, sizeof(symboln), "%sCompressedTexSubImage1DARB",
-                 symbol_prefix);
+    if(!disp->SecondaryColor3b) {
+        void ** procp = (void **) &disp->SecondaryColor3b;
+        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3bEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->CompressedTexSubImage2DARB) {
-        void **procp = (void **) &disp->CompressedTexSubImage2DARB;
 
-        snprintf(symboln, sizeof(symboln), "%sCompressedTexSubImage2D",
-                 symbol_prefix);
+    if(!disp->SecondaryColor3bv) {
+        void ** procp = (void **) &disp->SecondaryColor3bv;
+        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3bv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->CompressedTexSubImage2DARB) {
-        void **procp = (void **) &disp->CompressedTexSubImage2DARB;
 
-        snprintf(symboln, sizeof(symboln), "%sCompressedTexSubImage2DARB",
-                 symbol_prefix);
+    if(!disp->SecondaryColor3bv) {
+        void ** procp = (void **) &disp->SecondaryColor3bv;
+        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3bvEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->CompressedTexSubImage3DARB) {
-        void **procp = (void **) &disp->CompressedTexSubImage3DARB;
 
-        snprintf(symboln, sizeof(symboln), "%sCompressedTexSubImage3D",
-                 symbol_prefix);
+    if(!disp->SecondaryColor3d) {
+        void ** procp = (void **) &disp->SecondaryColor3d;
+        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3d", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->CompressedTexSubImage3DARB) {
-        void **procp = (void **) &disp->CompressedTexSubImage3DARB;
 
-        snprintf(symboln, sizeof(symboln), "%sCompressedTexSubImage3DARB",
-                 symbol_prefix);
+    if(!disp->SecondaryColor3d) {
+        void ** procp = (void **) &disp->SecondaryColor3d;
+        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3dEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetCompressedTexImageARB) {
-        void **procp = (void **) &disp->GetCompressedTexImageARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetCompressedTexImage",
-                 symbol_prefix);
+    if(!disp->SecondaryColor3dv) {
+        void ** procp = (void **) &disp->SecondaryColor3dv;
+        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3dv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetCompressedTexImageARB) {
-        void **procp = (void **) &disp->GetCompressedTexImageARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetCompressedTexImageARB",
-                 symbol_prefix);
+    if(!disp->SecondaryColor3dv) {
+        void ** procp = (void **) &disp->SecondaryColor3dv;
+        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3dvEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DisableVertexAttribArrayARB) {
-        void **procp = (void **) &disp->DisableVertexAttribArrayARB;
 
-        snprintf(symboln, sizeof(symboln), "%sDisableVertexAttribArray",
-                 symbol_prefix);
+    if(!disp->SecondaryColor3i) {
+        void ** procp = (void **) &disp->SecondaryColor3i;
+        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3i", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DisableVertexAttribArrayARB) {
-        void **procp = (void **) &disp->DisableVertexAttribArrayARB;
 
-        snprintf(symboln, sizeof(symboln), "%sDisableVertexAttribArrayARB",
-                 symbol_prefix);
+    if(!disp->SecondaryColor3i) {
+        void ** procp = (void **) &disp->SecondaryColor3i;
+        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3iEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->EnableVertexAttribArrayARB) {
-        void **procp = (void **) &disp->EnableVertexAttribArrayARB;
 
-        snprintf(symboln, sizeof(symboln), "%sEnableVertexAttribArray",
-                 symbol_prefix);
+    if(!disp->SecondaryColor3iv) {
+        void ** procp = (void **) &disp->SecondaryColor3iv;
+        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3iv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->EnableVertexAttribArrayARB) {
-        void **procp = (void **) &disp->EnableVertexAttribArrayARB;
 
-        snprintf(symboln, sizeof(symboln), "%sEnableVertexAttribArrayARB",
-                 symbol_prefix);
+    if(!disp->SecondaryColor3iv) {
+        void ** procp = (void **) &disp->SecondaryColor3iv;
+        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3ivEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetProgramEnvParameterdvARB) {
-        void **procp = (void **) &disp->GetProgramEnvParameterdvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetProgramEnvParameterdvARB",
-                 symbol_prefix);
+    if(!disp->SecondaryColor3s) {
+        void ** procp = (void **) &disp->SecondaryColor3s;
+        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3s", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetProgramEnvParameterfvARB) {
-        void **procp = (void **) &disp->GetProgramEnvParameterfvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetProgramEnvParameterfvARB",
-                 symbol_prefix);
+    if(!disp->SecondaryColor3s) {
+        void ** procp = (void **) &disp->SecondaryColor3s;
+        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3sEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetProgramLocalParameterdvARB) {
-        void **procp = (void **) &disp->GetProgramLocalParameterdvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetProgramLocalParameterdvARB",
-                 symbol_prefix);
+    if(!disp->SecondaryColor3sv) {
+        void ** procp = (void **) &disp->SecondaryColor3sv;
+        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3sv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetProgramLocalParameterfvARB) {
-        void **procp = (void **) &disp->GetProgramLocalParameterfvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetProgramLocalParameterfvARB",
-                 symbol_prefix);
+    if(!disp->SecondaryColor3sv) {
+        void ** procp = (void **) &disp->SecondaryColor3sv;
+        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3svEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetProgramStringARB) {
-        void **procp = (void **) &disp->GetProgramStringARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetProgramStringARB",
-                 symbol_prefix);
+    if(!disp->SecondaryColor3ub) {
+        void ** procp = (void **) &disp->SecondaryColor3ub;
+        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3ub", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetProgramivARB) {
-        void **procp = (void **) &disp->GetProgramivARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetProgramivARB", symbol_prefix);
+    if(!disp->SecondaryColor3ub) {
+        void ** procp = (void **) &disp->SecondaryColor3ub;
+        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3ubEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetVertexAttribdvARB) {
-        void **procp = (void **) &disp->GetVertexAttribdvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetVertexAttribdv",
-                 symbol_prefix);
+    if(!disp->SecondaryColor3ubv) {
+        void ** procp = (void **) &disp->SecondaryColor3ubv;
+        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3ubv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetVertexAttribdvARB) {
-        void **procp = (void **) &disp->GetVertexAttribdvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetVertexAttribdvARB",
-                 symbol_prefix);
+    if(!disp->SecondaryColor3ubv) {
+        void ** procp = (void **) &disp->SecondaryColor3ubv;
+        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3ubvEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetVertexAttribfvARB) {
-        void **procp = (void **) &disp->GetVertexAttribfvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetVertexAttribfv",
-                 symbol_prefix);
+    if(!disp->SecondaryColor3ui) {
+        void ** procp = (void **) &disp->SecondaryColor3ui;
+        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3ui", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetVertexAttribfvARB) {
-        void **procp = (void **) &disp->GetVertexAttribfvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetVertexAttribfvARB",
-                 symbol_prefix);
+    if(!disp->SecondaryColor3ui) {
+        void ** procp = (void **) &disp->SecondaryColor3ui;
+        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3uiEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetVertexAttribivARB) {
-        void **procp = (void **) &disp->GetVertexAttribivARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetVertexAttribiv",
-                 symbol_prefix);
+    if(!disp->SecondaryColor3uiv) {
+        void ** procp = (void **) &disp->SecondaryColor3uiv;
+        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3uiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetVertexAttribivARB) {
-        void **procp = (void **) &disp->GetVertexAttribivARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetVertexAttribivARB",
-                 symbol_prefix);
+    if(!disp->SecondaryColor3uiv) {
+        void ** procp = (void **) &disp->SecondaryColor3uiv;
+        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3uivEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ProgramEnvParameter4dARB) {
-        void **procp = (void **) &disp->ProgramEnvParameter4dARB;
 
-        snprintf(symboln, sizeof(symboln), "%sProgramEnvParameter4dARB",
-                 symbol_prefix);
+    if(!disp->SecondaryColor3us) {
+        void ** procp = (void **) &disp->SecondaryColor3us;
+        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3us", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ProgramEnvParameter4dARB) {
-        void **procp = (void **) &disp->ProgramEnvParameter4dARB;
 
-        snprintf(symboln, sizeof(symboln), "%sProgramParameter4dNV",
-                 symbol_prefix);
+    if(!disp->SecondaryColor3us) {
+        void ** procp = (void **) &disp->SecondaryColor3us;
+        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3usEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ProgramEnvParameter4dvARB) {
-        void **procp = (void **) &disp->ProgramEnvParameter4dvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sProgramEnvParameter4dvARB",
-                 symbol_prefix);
+    if(!disp->SecondaryColor3usv) {
+        void ** procp = (void **) &disp->SecondaryColor3usv;
+        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3usv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ProgramEnvParameter4dvARB) {
-        void **procp = (void **) &disp->ProgramEnvParameter4dvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sProgramParameter4dvNV",
-                 symbol_prefix);
+    if(!disp->SecondaryColor3usv) {
+        void ** procp = (void **) &disp->SecondaryColor3usv;
+        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3usvEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ProgramEnvParameter4fARB) {
-        void **procp = (void **) &disp->ProgramEnvParameter4fARB;
 
-        snprintf(symboln, sizeof(symboln), "%sProgramEnvParameter4fARB",
-                 symbol_prefix);
+    if(!disp->SecondaryColorPointer) {
+        void ** procp = (void **) &disp->SecondaryColorPointer;
+        snprintf(symboln, sizeof(symboln), "%sSecondaryColorPointer", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ProgramEnvParameter4fARB) {
-        void **procp = (void **) &disp->ProgramEnvParameter4fARB;
 
-        snprintf(symboln, sizeof(symboln), "%sProgramParameter4fNV",
-                 symbol_prefix);
+    if(!disp->SecondaryColorPointer) {
+        void ** procp = (void **) &disp->SecondaryColorPointer;
+        snprintf(symboln, sizeof(symboln), "%sSecondaryColorPointerEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ProgramEnvParameter4fvARB) {
-        void **procp = (void **) &disp->ProgramEnvParameter4fvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sProgramEnvParameter4fvARB",
-                 symbol_prefix);
+    if(!disp->WindowPos2d) {
+        void ** procp = (void **) &disp->WindowPos2d;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos2d", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ProgramEnvParameter4fvARB) {
-        void **procp = (void **) &disp->ProgramEnvParameter4fvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sProgramParameter4fvNV",
-                 symbol_prefix);
+    if(!disp->WindowPos2d) {
+        void ** procp = (void **) &disp->WindowPos2d;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos2dARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ProgramLocalParameter4dARB) {
-        void **procp = (void **) &disp->ProgramLocalParameter4dARB;
 
-        snprintf(symboln, sizeof(symboln), "%sProgramLocalParameter4dARB",
-                 symbol_prefix);
+    if(!disp->WindowPos2d) {
+        void ** procp = (void **) &disp->WindowPos2d;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos2dMESA", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ProgramLocalParameter4dvARB) {
-        void **procp = (void **) &disp->ProgramLocalParameter4dvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sProgramLocalParameter4dvARB",
-                 symbol_prefix);
+    if(!disp->WindowPos2dv) {
+        void ** procp = (void **) &disp->WindowPos2dv;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos2dv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ProgramLocalParameter4fARB) {
-        void **procp = (void **) &disp->ProgramLocalParameter4fARB;
 
-        snprintf(symboln, sizeof(symboln), "%sProgramLocalParameter4fARB",
-                 symbol_prefix);
+    if(!disp->WindowPos2dv) {
+        void ** procp = (void **) &disp->WindowPos2dv;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos2dvARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ProgramLocalParameter4fvARB) {
-        void **procp = (void **) &disp->ProgramLocalParameter4fvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sProgramLocalParameter4fvARB",
-                 symbol_prefix);
+    if(!disp->WindowPos2dv) {
+        void ** procp = (void **) &disp->WindowPos2dv;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos2dvMESA", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ProgramStringARB) {
-        void **procp = (void **) &disp->ProgramStringARB;
 
-        snprintf(symboln, sizeof(symboln), "%sProgramStringARB", symbol_prefix);
+    if(!disp->WindowPos2f) {
+        void ** procp = (void **) &disp->WindowPos2f;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos2f", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib1dARB) {
-        void **procp = (void **) &disp->VertexAttrib1dARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib1d", symbol_prefix);
+    if(!disp->WindowPos2f) {
+        void ** procp = (void **) &disp->WindowPos2f;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos2fARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib1dARB) {
-        void **procp = (void **) &disp->VertexAttrib1dARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib1dARB",
-                 symbol_prefix);
+    if(!disp->WindowPos2f) {
+        void ** procp = (void **) &disp->WindowPos2f;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos2fMESA", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib1dvARB) {
-        void **procp = (void **) &disp->VertexAttrib1dvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib1dv", symbol_prefix);
+    if(!disp->WindowPos2fv) {
+        void ** procp = (void **) &disp->WindowPos2fv;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos2fv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib1dvARB) {
-        void **procp = (void **) &disp->VertexAttrib1dvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib1dvARB",
-                 symbol_prefix);
+    if(!disp->WindowPos2fv) {
+        void ** procp = (void **) &disp->WindowPos2fv;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos2fvARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib1fARB) {
-        void **procp = (void **) &disp->VertexAttrib1fARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib1f", symbol_prefix);
+    if(!disp->WindowPos2fv) {
+        void ** procp = (void **) &disp->WindowPos2fv;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos2fvMESA", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib1fARB) {
-        void **procp = (void **) &disp->VertexAttrib1fARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib1fARB",
-                 symbol_prefix);
+    if(!disp->WindowPos2i) {
+        void ** procp = (void **) &disp->WindowPos2i;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos2i", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib1fvARB) {
-        void **procp = (void **) &disp->VertexAttrib1fvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib1fv", symbol_prefix);
+    if(!disp->WindowPos2i) {
+        void ** procp = (void **) &disp->WindowPos2i;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos2iARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib1fvARB) {
-        void **procp = (void **) &disp->VertexAttrib1fvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib1fvARB",
-                 symbol_prefix);
+    if(!disp->WindowPos2i) {
+        void ** procp = (void **) &disp->WindowPos2i;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos2iMESA", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib1sARB) {
-        void **procp = (void **) &disp->VertexAttrib1sARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib1s", symbol_prefix);
+    if(!disp->WindowPos2iv) {
+        void ** procp = (void **) &disp->WindowPos2iv;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos2iv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib1sARB) {
-        void **procp = (void **) &disp->VertexAttrib1sARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib1sARB",
-                 symbol_prefix);
+    if(!disp->WindowPos2iv) {
+        void ** procp = (void **) &disp->WindowPos2iv;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos2ivARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib1svARB) {
-        void **procp = (void **) &disp->VertexAttrib1svARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib1sv", symbol_prefix);
+    if(!disp->WindowPos2iv) {
+        void ** procp = (void **) &disp->WindowPos2iv;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos2ivMESA", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib1svARB) {
-        void **procp = (void **) &disp->VertexAttrib1svARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib1svARB",
-                 symbol_prefix);
+    if(!disp->WindowPos2s) {
+        void ** procp = (void **) &disp->WindowPos2s;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos2s", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib2dARB) {
-        void **procp = (void **) &disp->VertexAttrib2dARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib2d", symbol_prefix);
+    if(!disp->WindowPos2s) {
+        void ** procp = (void **) &disp->WindowPos2s;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos2sARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib2dARB) {
-        void **procp = (void **) &disp->VertexAttrib2dARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib2dARB",
-                 symbol_prefix);
+    if(!disp->WindowPos2s) {
+        void ** procp = (void **) &disp->WindowPos2s;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos2sMESA", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib2dvARB) {
-        void **procp = (void **) &disp->VertexAttrib2dvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib2dv", symbol_prefix);
+    if(!disp->WindowPos2sv) {
+        void ** procp = (void **) &disp->WindowPos2sv;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos2sv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib2dvARB) {
-        void **procp = (void **) &disp->VertexAttrib2dvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib2dvARB",
-                 symbol_prefix);
+    if(!disp->WindowPos2sv) {
+        void ** procp = (void **) &disp->WindowPos2sv;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos2svARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib2fARB) {
-        void **procp = (void **) &disp->VertexAttrib2fARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib2f", symbol_prefix);
+    if(!disp->WindowPos2sv) {
+        void ** procp = (void **) &disp->WindowPos2sv;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos2svMESA", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib2fARB) {
-        void **procp = (void **) &disp->VertexAttrib2fARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib2fARB",
-                 symbol_prefix);
+    if(!disp->WindowPos3d) {
+        void ** procp = (void **) &disp->WindowPos3d;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos3d", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib2fvARB) {
-        void **procp = (void **) &disp->VertexAttrib2fvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib2fv", symbol_prefix);
+    if(!disp->WindowPos3d) {
+        void ** procp = (void **) &disp->WindowPos3d;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos3dARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib2fvARB) {
-        void **procp = (void **) &disp->VertexAttrib2fvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib2fvARB",
-                 symbol_prefix);
+    if(!disp->WindowPos3d) {
+        void ** procp = (void **) &disp->WindowPos3d;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos3dMESA", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib2sARB) {
-        void **procp = (void **) &disp->VertexAttrib2sARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib2s", symbol_prefix);
+    if(!disp->WindowPos3dv) {
+        void ** procp = (void **) &disp->WindowPos3dv;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos3dv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib2sARB) {
-        void **procp = (void **) &disp->VertexAttrib2sARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib2sARB",
-                 symbol_prefix);
+    if(!disp->WindowPos3dv) {
+        void ** procp = (void **) &disp->WindowPos3dv;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos3dvARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib2svARB) {
-        void **procp = (void **) &disp->VertexAttrib2svARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib2sv", symbol_prefix);
+    if(!disp->WindowPos3dv) {
+        void ** procp = (void **) &disp->WindowPos3dv;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos3dvMESA", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib2svARB) {
-        void **procp = (void **) &disp->VertexAttrib2svARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib2svARB",
-                 symbol_prefix);
+    if(!disp->WindowPos3f) {
+        void ** procp = (void **) &disp->WindowPos3f;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos3f", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib3dARB) {
-        void **procp = (void **) &disp->VertexAttrib3dARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib3d", symbol_prefix);
+    if(!disp->WindowPos3f) {
+        void ** procp = (void **) &disp->WindowPos3f;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos3fARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib3dARB) {
-        void **procp = (void **) &disp->VertexAttrib3dARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib3dARB",
-                 symbol_prefix);
+    if(!disp->WindowPos3f) {
+        void ** procp = (void **) &disp->WindowPos3f;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos3fMESA", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib3dvARB) {
-        void **procp = (void **) &disp->VertexAttrib3dvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib3dv", symbol_prefix);
+    if(!disp->WindowPos3fv) {
+        void ** procp = (void **) &disp->WindowPos3fv;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos3fv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib3dvARB) {
-        void **procp = (void **) &disp->VertexAttrib3dvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib3dvARB",
-                 symbol_prefix);
+    if(!disp->WindowPos3fv) {
+        void ** procp = (void **) &disp->WindowPos3fv;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos3fvARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib3fARB) {
-        void **procp = (void **) &disp->VertexAttrib3fARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib3f", symbol_prefix);
+    if(!disp->WindowPos3fv) {
+        void ** procp = (void **) &disp->WindowPos3fv;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos3fvMESA", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib3fARB) {
-        void **procp = (void **) &disp->VertexAttrib3fARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib3fARB",
-                 symbol_prefix);
+    if(!disp->WindowPos3i) {
+        void ** procp = (void **) &disp->WindowPos3i;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos3i", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib3fvARB) {
-        void **procp = (void **) &disp->VertexAttrib3fvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib3fv", symbol_prefix);
+    if(!disp->WindowPos3i) {
+        void ** procp = (void **) &disp->WindowPos3i;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos3iARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib3fvARB) {
-        void **procp = (void **) &disp->VertexAttrib3fvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib3fvARB",
-                 symbol_prefix);
+    if(!disp->WindowPos3i) {
+        void ** procp = (void **) &disp->WindowPos3i;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos3iMESA", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib3sARB) {
-        void **procp = (void **) &disp->VertexAttrib3sARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib3s", symbol_prefix);
+    if(!disp->WindowPos3iv) {
+        void ** procp = (void **) &disp->WindowPos3iv;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos3iv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib3sARB) {
-        void **procp = (void **) &disp->VertexAttrib3sARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib3sARB",
-                 symbol_prefix);
+    if(!disp->WindowPos3iv) {
+        void ** procp = (void **) &disp->WindowPos3iv;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos3ivARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib3svARB) {
-        void **procp = (void **) &disp->VertexAttrib3svARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib3sv", symbol_prefix);
+    if(!disp->WindowPos3iv) {
+        void ** procp = (void **) &disp->WindowPos3iv;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos3ivMESA", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib3svARB) {
-        void **procp = (void **) &disp->VertexAttrib3svARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib3svARB",
-                 symbol_prefix);
+    if(!disp->WindowPos3s) {
+        void ** procp = (void **) &disp->WindowPos3s;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos3s", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib4NbvARB) {
-        void **procp = (void **) &disp->VertexAttrib4NbvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4Nbv", symbol_prefix);
+    if(!disp->WindowPos3s) {
+        void ** procp = (void **) &disp->WindowPos3s;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos3sARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib4NbvARB) {
-        void **procp = (void **) &disp->VertexAttrib4NbvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4NbvARB",
-                 symbol_prefix);
+    if(!disp->WindowPos3s) {
+        void ** procp = (void **) &disp->WindowPos3s;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos3sMESA", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib4NivARB) {
-        void **procp = (void **) &disp->VertexAttrib4NivARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4Niv", symbol_prefix);
+    if(!disp->WindowPos3sv) {
+        void ** procp = (void **) &disp->WindowPos3sv;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos3sv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib4NivARB) {
-        void **procp = (void **) &disp->VertexAttrib4NivARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4NivARB",
-                 symbol_prefix);
+    if(!disp->WindowPos3sv) {
+        void ** procp = (void **) &disp->WindowPos3sv;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos3svARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib4NsvARB) {
-        void **procp = (void **) &disp->VertexAttrib4NsvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4Nsv", symbol_prefix);
+    if(!disp->WindowPos3sv) {
+        void ** procp = (void **) &disp->WindowPos3sv;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos3svMESA", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib4NsvARB) {
-        void **procp = (void **) &disp->VertexAttrib4NsvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4NsvARB",
-                 symbol_prefix);
+    if(!disp->BeginQuery) {
+        void ** procp = (void **) &disp->BeginQuery;
+        snprintf(symboln, sizeof(symboln), "%sBeginQuery", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib4NubARB) {
-        void **procp = (void **) &disp->VertexAttrib4NubARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4Nub", symbol_prefix);
+    if(!disp->BeginQuery) {
+        void ** procp = (void **) &disp->BeginQuery;
+        snprintf(symboln, sizeof(symboln), "%sBeginQueryARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib4NubARB) {
-        void **procp = (void **) &disp->VertexAttrib4NubARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4NubARB",
-                 symbol_prefix);
+    if(!disp->BindBuffer) {
+        void ** procp = (void **) &disp->BindBuffer;
+        snprintf(symboln, sizeof(symboln), "%sBindBuffer", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib4NubvARB) {
-        void **procp = (void **) &disp->VertexAttrib4NubvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4Nubv",
-                 symbol_prefix);
+    if(!disp->BindBuffer) {
+        void ** procp = (void **) &disp->BindBuffer;
+        snprintf(symboln, sizeof(symboln), "%sBindBufferARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib4NubvARB) {
-        void **procp = (void **) &disp->VertexAttrib4NubvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4NubvARB",
-                 symbol_prefix);
+    if(!disp->BufferData) {
+        void ** procp = (void **) &disp->BufferData;
+        snprintf(symboln, sizeof(symboln), "%sBufferData", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib4NuivARB) {
-        void **procp = (void **) &disp->VertexAttrib4NuivARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4Nuiv",
-                 symbol_prefix);
+    if(!disp->BufferData) {
+        void ** procp = (void **) &disp->BufferData;
+        snprintf(symboln, sizeof(symboln), "%sBufferDataARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib4NuivARB) {
-        void **procp = (void **) &disp->VertexAttrib4NuivARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4NuivARB",
-                 symbol_prefix);
+    if(!disp->BufferSubData) {
+        void ** procp = (void **) &disp->BufferSubData;
+        snprintf(symboln, sizeof(symboln), "%sBufferSubData", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib4NusvARB) {
-        void **procp = (void **) &disp->VertexAttrib4NusvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4Nusv",
-                 symbol_prefix);
+    if(!disp->BufferSubData) {
+        void ** procp = (void **) &disp->BufferSubData;
+        snprintf(symboln, sizeof(symboln), "%sBufferSubDataARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib4NusvARB) {
-        void **procp = (void **) &disp->VertexAttrib4NusvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4NusvARB",
-                 symbol_prefix);
+    if(!disp->DeleteBuffers) {
+        void ** procp = (void **) &disp->DeleteBuffers;
+        snprintf(symboln, sizeof(symboln), "%sDeleteBuffers", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib4bvARB) {
-        void **procp = (void **) &disp->VertexAttrib4bvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4bv", symbol_prefix);
+    if(!disp->DeleteBuffers) {
+        void ** procp = (void **) &disp->DeleteBuffers;
+        snprintf(symboln, sizeof(symboln), "%sDeleteBuffersARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib4bvARB) {
-        void **procp = (void **) &disp->VertexAttrib4bvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4bvARB",
-                 symbol_prefix);
+    if(!disp->DeleteQueries) {
+        void ** procp = (void **) &disp->DeleteQueries;
+        snprintf(symboln, sizeof(symboln), "%sDeleteQueries", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib4dARB) {
-        void **procp = (void **) &disp->VertexAttrib4dARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4d", symbol_prefix);
+    if(!disp->DeleteQueries) {
+        void ** procp = (void **) &disp->DeleteQueries;
+        snprintf(symboln, sizeof(symboln), "%sDeleteQueriesARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib4dARB) {
-        void **procp = (void **) &disp->VertexAttrib4dARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4dARB",
-                 symbol_prefix);
+    if(!disp->EndQuery) {
+        void ** procp = (void **) &disp->EndQuery;
+        snprintf(symboln, sizeof(symboln), "%sEndQuery", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib4dvARB) {
-        void **procp = (void **) &disp->VertexAttrib4dvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4dv", symbol_prefix);
+    if(!disp->EndQuery) {
+        void ** procp = (void **) &disp->EndQuery;
+        snprintf(symboln, sizeof(symboln), "%sEndQueryARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib4dvARB) {
-        void **procp = (void **) &disp->VertexAttrib4dvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4dvARB",
-                 symbol_prefix);
+    if(!disp->GenBuffers) {
+        void ** procp = (void **) &disp->GenBuffers;
+        snprintf(symboln, sizeof(symboln), "%sGenBuffers", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib4fARB) {
-        void **procp = (void **) &disp->VertexAttrib4fARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4f", symbol_prefix);
+    if(!disp->GenBuffers) {
+        void ** procp = (void **) &disp->GenBuffers;
+        snprintf(symboln, sizeof(symboln), "%sGenBuffersARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib4fARB) {
-        void **procp = (void **) &disp->VertexAttrib4fARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4fARB",
-                 symbol_prefix);
+    if(!disp->GenQueries) {
+        void ** procp = (void **) &disp->GenQueries;
+        snprintf(symboln, sizeof(symboln), "%sGenQueries", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib4fvARB) {
-        void **procp = (void **) &disp->VertexAttrib4fvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4fv", symbol_prefix);
+    if(!disp->GenQueries) {
+        void ** procp = (void **) &disp->GenQueries;
+        snprintf(symboln, sizeof(symboln), "%sGenQueriesARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib4fvARB) {
-        void **procp = (void **) &disp->VertexAttrib4fvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4fvARB",
-                 symbol_prefix);
+    if(!disp->GetBufferParameteriv) {
+        void ** procp = (void **) &disp->GetBufferParameteriv;
+        snprintf(symboln, sizeof(symboln), "%sGetBufferParameteriv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib4ivARB) {
-        void **procp = (void **) &disp->VertexAttrib4ivARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4iv", symbol_prefix);
+    if(!disp->GetBufferParameteriv) {
+        void ** procp = (void **) &disp->GetBufferParameteriv;
+        snprintf(symboln, sizeof(symboln), "%sGetBufferParameterivARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib4ivARB) {
-        void **procp = (void **) &disp->VertexAttrib4ivARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4ivARB",
-                 symbol_prefix);
+    if(!disp->GetBufferPointerv) {
+        void ** procp = (void **) &disp->GetBufferPointerv;
+        snprintf(symboln, sizeof(symboln), "%sGetBufferPointerv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib4sARB) {
-        void **procp = (void **) &disp->VertexAttrib4sARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4s", symbol_prefix);
+    if(!disp->GetBufferPointerv) {
+        void ** procp = (void **) &disp->GetBufferPointerv;
+        snprintf(symboln, sizeof(symboln), "%sGetBufferPointervARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib4sARB) {
-        void **procp = (void **) &disp->VertexAttrib4sARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4sARB",
-                 symbol_prefix);
+    if(!disp->GetBufferPointerv) {
+        void ** procp = (void **) &disp->GetBufferPointerv;
+        snprintf(symboln, sizeof(symboln), "%sGetBufferPointervOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib4svARB) {
-        void **procp = (void **) &disp->VertexAttrib4svARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4sv", symbol_prefix);
+    if(!disp->GetBufferSubData) {
+        void ** procp = (void **) &disp->GetBufferSubData;
+        snprintf(symboln, sizeof(symboln), "%sGetBufferSubData", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib4svARB) {
-        void **procp = (void **) &disp->VertexAttrib4svARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4svARB",
-                 symbol_prefix);
+    if(!disp->GetBufferSubData) {
+        void ** procp = (void **) &disp->GetBufferSubData;
+        snprintf(symboln, sizeof(symboln), "%sGetBufferSubDataARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib4ubvARB) {
-        void **procp = (void **) &disp->VertexAttrib4ubvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4ubv", symbol_prefix);
+    if(!disp->GetQueryObjectiv) {
+        void ** procp = (void **) &disp->GetQueryObjectiv;
+        snprintf(symboln, sizeof(symboln), "%sGetQueryObjectiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib4ubvARB) {
-        void **procp = (void **) &disp->VertexAttrib4ubvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4ubvARB",
-                 symbol_prefix);
+    if(!disp->GetQueryObjectiv) {
+        void ** procp = (void **) &disp->GetQueryObjectiv;
+        snprintf(symboln, sizeof(symboln), "%sGetQueryObjectivARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib4uivARB) {
-        void **procp = (void **) &disp->VertexAttrib4uivARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4uiv", symbol_prefix);
+    if(!disp->GetQueryObjectuiv) {
+        void ** procp = (void **) &disp->GetQueryObjectuiv;
+        snprintf(symboln, sizeof(symboln), "%sGetQueryObjectuiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib4uivARB) {
-        void **procp = (void **) &disp->VertexAttrib4uivARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4uivARB",
-                 symbol_prefix);
+    if(!disp->GetQueryObjectuiv) {
+        void ** procp = (void **) &disp->GetQueryObjectuiv;
+        snprintf(symboln, sizeof(symboln), "%sGetQueryObjectuivARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib4usvARB) {
-        void **procp = (void **) &disp->VertexAttrib4usvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4usv", symbol_prefix);
+    if(!disp->GetQueryiv) {
+        void ** procp = (void **) &disp->GetQueryiv;
+        snprintf(symboln, sizeof(symboln), "%sGetQueryiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib4usvARB) {
-        void **procp = (void **) &disp->VertexAttrib4usvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4usvARB",
-                 symbol_prefix);
+    if(!disp->GetQueryiv) {
+        void ** procp = (void **) &disp->GetQueryiv;
+        snprintf(symboln, sizeof(symboln), "%sGetQueryivARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribPointerARB) {
-        void **procp = (void **) &disp->VertexAttribPointerARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribPointer",
-                 symbol_prefix);
+    if(!disp->IsBuffer) {
+        void ** procp = (void **) &disp->IsBuffer;
+        snprintf(symboln, sizeof(symboln), "%sIsBuffer", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribPointerARB) {
-        void **procp = (void **) &disp->VertexAttribPointerARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribPointerARB",
-                 symbol_prefix);
+    if(!disp->IsBuffer) {
+        void ** procp = (void **) &disp->IsBuffer;
+        snprintf(symboln, sizeof(symboln), "%sIsBufferARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BindBufferARB) {
-        void **procp = (void **) &disp->BindBufferARB;
 
-        snprintf(symboln, sizeof(symboln), "%sBindBuffer", symbol_prefix);
+    if(!disp->IsQuery) {
+        void ** procp = (void **) &disp->IsQuery;
+        snprintf(symboln, sizeof(symboln), "%sIsQuery", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BindBufferARB) {
-        void **procp = (void **) &disp->BindBufferARB;
 
-        snprintf(symboln, sizeof(symboln), "%sBindBufferARB", symbol_prefix);
+    if(!disp->IsQuery) {
+        void ** procp = (void **) &disp->IsQuery;
+        snprintf(symboln, sizeof(symboln), "%sIsQueryARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BufferDataARB) {
-        void **procp = (void **) &disp->BufferDataARB;
 
-        snprintf(symboln, sizeof(symboln), "%sBufferData", symbol_prefix);
+    if(!disp->MapBuffer) {
+        void ** procp = (void **) &disp->MapBuffer;
+        snprintf(symboln, sizeof(symboln), "%sMapBuffer", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BufferDataARB) {
-        void **procp = (void **) &disp->BufferDataARB;
 
-        snprintf(symboln, sizeof(symboln), "%sBufferDataARB", symbol_prefix);
+    if(!disp->MapBuffer) {
+        void ** procp = (void **) &disp->MapBuffer;
+        snprintf(symboln, sizeof(symboln), "%sMapBufferARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BufferSubDataARB) {
-        void **procp = (void **) &disp->BufferSubDataARB;
 
-        snprintf(symboln, sizeof(symboln), "%sBufferSubData", symbol_prefix);
+    if(!disp->MapBuffer) {
+        void ** procp = (void **) &disp->MapBuffer;
+        snprintf(symboln, sizeof(symboln), "%sMapBufferOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BufferSubDataARB) {
-        void **procp = (void **) &disp->BufferSubDataARB;
 
-        snprintf(symboln, sizeof(symboln), "%sBufferSubDataARB", symbol_prefix);
+    if(!disp->UnmapBuffer) {
+        void ** procp = (void **) &disp->UnmapBuffer;
+        snprintf(symboln, sizeof(symboln), "%sUnmapBuffer", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DeleteBuffersARB) {
-        void **procp = (void **) &disp->DeleteBuffersARB;
 
-        snprintf(symboln, sizeof(symboln), "%sDeleteBuffers", symbol_prefix);
+    if(!disp->UnmapBuffer) {
+        void ** procp = (void **) &disp->UnmapBuffer;
+        snprintf(symboln, sizeof(symboln), "%sUnmapBufferARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DeleteBuffersARB) {
-        void **procp = (void **) &disp->DeleteBuffersARB;
 
-        snprintf(symboln, sizeof(symboln), "%sDeleteBuffersARB", symbol_prefix);
+    if(!disp->UnmapBuffer) {
+        void ** procp = (void **) &disp->UnmapBuffer;
+        snprintf(symboln, sizeof(symboln), "%sUnmapBufferOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GenBuffersARB) {
-        void **procp = (void **) &disp->GenBuffersARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGenBuffers", symbol_prefix);
+    if(!disp->AttachShader) {
+        void ** procp = (void **) &disp->AttachShader;
+        snprintf(symboln, sizeof(symboln), "%sAttachShader", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GenBuffersARB) {
-        void **procp = (void **) &disp->GenBuffersARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGenBuffersARB", symbol_prefix);
+    if(!disp->BindAttribLocation) {
+        void ** procp = (void **) &disp->BindAttribLocation;
+        snprintf(symboln, sizeof(symboln), "%sBindAttribLocation", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetBufferParameterivARB) {
-        void **procp = (void **) &disp->GetBufferParameterivARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetBufferParameteriv",
-                 symbol_prefix);
+    if(!disp->BindAttribLocation) {
+        void ** procp = (void **) &disp->BindAttribLocation;
+        snprintf(symboln, sizeof(symboln), "%sBindAttribLocationARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetBufferParameterivARB) {
-        void **procp = (void **) &disp->GetBufferParameterivARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetBufferParameterivARB",
-                 symbol_prefix);
+    if(!disp->BlendEquationSeparate) {
+        void ** procp = (void **) &disp->BlendEquationSeparate;
+        snprintf(symboln, sizeof(symboln), "%sBlendEquationSeparate", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetBufferPointervARB) {
-        void **procp = (void **) &disp->GetBufferPointervARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetBufferPointerv",
-                 symbol_prefix);
+    if(!disp->BlendEquationSeparate) {
+        void ** procp = (void **) &disp->BlendEquationSeparate;
+        snprintf(symboln, sizeof(symboln), "%sBlendEquationSeparateEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetBufferPointervARB) {
-        void **procp = (void **) &disp->GetBufferPointervARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetBufferPointervARB",
-                 symbol_prefix);
+    if(!disp->BlendEquationSeparate) {
+        void ** procp = (void **) &disp->BlendEquationSeparate;
+        snprintf(symboln, sizeof(symboln), "%sBlendEquationSeparateATI", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetBufferSubDataARB) {
-        void **procp = (void **) &disp->GetBufferSubDataARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetBufferSubData", symbol_prefix);
+    if(!disp->BlendEquationSeparate) {
+        void ** procp = (void **) &disp->BlendEquationSeparate;
+        snprintf(symboln, sizeof(symboln), "%sBlendEquationSeparateOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetBufferSubDataARB) {
-        void **procp = (void **) &disp->GetBufferSubDataARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetBufferSubDataARB",
-                 symbol_prefix);
+    if(!disp->CompileShader) {
+        void ** procp = (void **) &disp->CompileShader;
+        snprintf(symboln, sizeof(symboln), "%sCompileShader", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->IsBufferARB) {
-        void **procp = (void **) &disp->IsBufferARB;
 
-        snprintf(symboln, sizeof(symboln), "%sIsBuffer", symbol_prefix);
+    if(!disp->CompileShader) {
+        void ** procp = (void **) &disp->CompileShader;
+        snprintf(symboln, sizeof(symboln), "%sCompileShaderARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->IsBufferARB) {
-        void **procp = (void **) &disp->IsBufferARB;
 
-        snprintf(symboln, sizeof(symboln), "%sIsBufferARB", symbol_prefix);
+    if(!disp->CreateProgram) {
+        void ** procp = (void **) &disp->CreateProgram;
+        snprintf(symboln, sizeof(symboln), "%sCreateProgram", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MapBufferARB) {
-        void **procp = (void **) &disp->MapBufferARB;
 
-        snprintf(symboln, sizeof(symboln), "%sMapBuffer", symbol_prefix);
+    if(!disp->CreateShader) {
+        void ** procp = (void **) &disp->CreateShader;
+        snprintf(symboln, sizeof(symboln), "%sCreateShader", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MapBufferARB) {
-        void **procp = (void **) &disp->MapBufferARB;
 
-        snprintf(symboln, sizeof(symboln), "%sMapBufferARB", symbol_prefix);
+    if(!disp->DeleteProgram) {
+        void ** procp = (void **) &disp->DeleteProgram;
+        snprintf(symboln, sizeof(symboln), "%sDeleteProgram", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->UnmapBufferARB) {
-        void **procp = (void **) &disp->UnmapBufferARB;
 
-        snprintf(symboln, sizeof(symboln), "%sUnmapBuffer", symbol_prefix);
+    if(!disp->DeleteShader) {
+        void ** procp = (void **) &disp->DeleteShader;
+        snprintf(symboln, sizeof(symboln), "%sDeleteShader", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->UnmapBufferARB) {
-        void **procp = (void **) &disp->UnmapBufferARB;
 
-        snprintf(symboln, sizeof(symboln), "%sUnmapBufferARB", symbol_prefix);
+    if(!disp->DetachShader) {
+        void ** procp = (void **) &disp->DetachShader;
+        snprintf(symboln, sizeof(symboln), "%sDetachShader", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BeginQueryARB) {
-        void **procp = (void **) &disp->BeginQueryARB;
 
-        snprintf(symboln, sizeof(symboln), "%sBeginQuery", symbol_prefix);
+    if(!disp->DisableVertexAttribArray) {
+        void ** procp = (void **) &disp->DisableVertexAttribArray;
+        snprintf(symboln, sizeof(symboln), "%sDisableVertexAttribArray", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BeginQueryARB) {
-        void **procp = (void **) &disp->BeginQueryARB;
 
-        snprintf(symboln, sizeof(symboln), "%sBeginQueryARB", symbol_prefix);
+    if(!disp->DisableVertexAttribArray) {
+        void ** procp = (void **) &disp->DisableVertexAttribArray;
+        snprintf(symboln, sizeof(symboln), "%sDisableVertexAttribArrayARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DeleteQueriesARB) {
-        void **procp = (void **) &disp->DeleteQueriesARB;
 
-        snprintf(symboln, sizeof(symboln), "%sDeleteQueries", symbol_prefix);
+    if(!disp->DrawBuffers) {
+        void ** procp = (void **) &disp->DrawBuffers;
+        snprintf(symboln, sizeof(symboln), "%sDrawBuffers", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DeleteQueriesARB) {
-        void **procp = (void **) &disp->DeleteQueriesARB;
 
-        snprintf(symboln, sizeof(symboln), "%sDeleteQueriesARB", symbol_prefix);
+    if(!disp->DrawBuffers) {
+        void ** procp = (void **) &disp->DrawBuffers;
+        snprintf(symboln, sizeof(symboln), "%sDrawBuffersARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->EndQueryARB) {
-        void **procp = (void **) &disp->EndQueryARB;
 
-        snprintf(symboln, sizeof(symboln), "%sEndQuery", symbol_prefix);
+    if(!disp->DrawBuffers) {
+        void ** procp = (void **) &disp->DrawBuffers;
+        snprintf(symboln, sizeof(symboln), "%sDrawBuffersATI", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->EndQueryARB) {
-        void **procp = (void **) &disp->EndQueryARB;
 
-        snprintf(symboln, sizeof(symboln), "%sEndQueryARB", symbol_prefix);
+    if(!disp->DrawBuffers) {
+        void ** procp = (void **) &disp->DrawBuffers;
+        snprintf(symboln, sizeof(symboln), "%sDrawBuffersNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GenQueriesARB) {
-        void **procp = (void **) &disp->GenQueriesARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGenQueries", symbol_prefix);
+    if(!disp->EnableVertexAttribArray) {
+        void ** procp = (void **) &disp->EnableVertexAttribArray;
+        snprintf(symboln, sizeof(symboln), "%sEnableVertexAttribArray", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GenQueriesARB) {
-        void **procp = (void **) &disp->GenQueriesARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGenQueriesARB", symbol_prefix);
+    if(!disp->EnableVertexAttribArray) {
+        void ** procp = (void **) &disp->EnableVertexAttribArray;
+        snprintf(symboln, sizeof(symboln), "%sEnableVertexAttribArrayARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetQueryObjectivARB) {
-        void **procp = (void **) &disp->GetQueryObjectivARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetQueryObjectiv", symbol_prefix);
+    if(!disp->GetActiveAttrib) {
+        void ** procp = (void **) &disp->GetActiveAttrib;
+        snprintf(symboln, sizeof(symboln), "%sGetActiveAttrib", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetQueryObjectivARB) {
-        void **procp = (void **) &disp->GetQueryObjectivARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetQueryObjectivARB",
-                 symbol_prefix);
+    if(!disp->GetActiveAttrib) {
+        void ** procp = (void **) &disp->GetActiveAttrib;
+        snprintf(symboln, sizeof(symboln), "%sGetActiveAttribARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetQueryObjectuivARB) {
-        void **procp = (void **) &disp->GetQueryObjectuivARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetQueryObjectuiv",
-                 symbol_prefix);
+    if(!disp->GetActiveUniform) {
+        void ** procp = (void **) &disp->GetActiveUniform;
+        snprintf(symboln, sizeof(symboln), "%sGetActiveUniform", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetQueryObjectuivARB) {
-        void **procp = (void **) &disp->GetQueryObjectuivARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetQueryObjectuivARB",
-                 symbol_prefix);
+    if(!disp->GetActiveUniform) {
+        void ** procp = (void **) &disp->GetActiveUniform;
+        snprintf(symboln, sizeof(symboln), "%sGetActiveUniformARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetQueryivARB) {
-        void **procp = (void **) &disp->GetQueryivARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetQueryiv", symbol_prefix);
+    if(!disp->GetAttachedShaders) {
+        void ** procp = (void **) &disp->GetAttachedShaders;
+        snprintf(symboln, sizeof(symboln), "%sGetAttachedShaders", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetQueryivARB) {
-        void **procp = (void **) &disp->GetQueryivARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetQueryivARB", symbol_prefix);
+    if(!disp->GetAttribLocation) {
+        void ** procp = (void **) &disp->GetAttribLocation;
+        snprintf(symboln, sizeof(symboln), "%sGetAttribLocation", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->IsQueryARB) {
-        void **procp = (void **) &disp->IsQueryARB;
 
-        snprintf(symboln, sizeof(symboln), "%sIsQuery", symbol_prefix);
+    if(!disp->GetAttribLocation) {
+        void ** procp = (void **) &disp->GetAttribLocation;
+        snprintf(symboln, sizeof(symboln), "%sGetAttribLocationARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->IsQueryARB) {
-        void **procp = (void **) &disp->IsQueryARB;
 
-        snprintf(symboln, sizeof(symboln), "%sIsQueryARB", symbol_prefix);
+    if(!disp->GetProgramInfoLog) {
+        void ** procp = (void **) &disp->GetProgramInfoLog;
+        snprintf(symboln, sizeof(symboln), "%sGetProgramInfoLog", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->AttachObjectARB) {
-        void **procp = (void **) &disp->AttachObjectARB;
 
-        snprintf(symboln, sizeof(symboln), "%sAttachObjectARB", symbol_prefix);
+    if(!disp->GetProgramiv) {
+        void ** procp = (void **) &disp->GetProgramiv;
+        snprintf(symboln, sizeof(symboln), "%sGetProgramiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->CompileShaderARB) {
-        void **procp = (void **) &disp->CompileShaderARB;
 
-        snprintf(symboln, sizeof(symboln), "%sCompileShader", symbol_prefix);
+    if(!disp->GetShaderInfoLog) {
+        void ** procp = (void **) &disp->GetShaderInfoLog;
+        snprintf(symboln, sizeof(symboln), "%sGetShaderInfoLog", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->CompileShaderARB) {
-        void **procp = (void **) &disp->CompileShaderARB;
 
-        snprintf(symboln, sizeof(symboln), "%sCompileShaderARB", symbol_prefix);
+    if(!disp->GetShaderSource) {
+        void ** procp = (void **) &disp->GetShaderSource;
+        snprintf(symboln, sizeof(symboln), "%sGetShaderSource", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->CreateProgramObjectARB) {
-        void **procp = (void **) &disp->CreateProgramObjectARB;
 
-        snprintf(symboln, sizeof(symboln), "%sCreateProgramObjectARB",
-                 symbol_prefix);
+    if(!disp->GetShaderSource) {
+        void ** procp = (void **) &disp->GetShaderSource;
+        snprintf(symboln, sizeof(symboln), "%sGetShaderSourceARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->CreateShaderObjectARB) {
-        void **procp = (void **) &disp->CreateShaderObjectARB;
 
-        snprintf(symboln, sizeof(symboln), "%sCreateShaderObjectARB",
-                 symbol_prefix);
+    if(!disp->GetShaderiv) {
+        void ** procp = (void **) &disp->GetShaderiv;
+        snprintf(symboln, sizeof(symboln), "%sGetShaderiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DeleteObjectARB) {
-        void **procp = (void **) &disp->DeleteObjectARB;
 
-        snprintf(symboln, sizeof(symboln), "%sDeleteObjectARB", symbol_prefix);
+    if(!disp->GetUniformLocation) {
+        void ** procp = (void **) &disp->GetUniformLocation;
+        snprintf(symboln, sizeof(symboln), "%sGetUniformLocation", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DetachObjectARB) {
-        void **procp = (void **) &disp->DetachObjectARB;
 
-        snprintf(symboln, sizeof(symboln), "%sDetachObjectARB", symbol_prefix);
+    if(!disp->GetUniformLocation) {
+        void ** procp = (void **) &disp->GetUniformLocation;
+        snprintf(symboln, sizeof(symboln), "%sGetUniformLocationARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetActiveUniformARB) {
-        void **procp = (void **) &disp->GetActiveUniformARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetActiveUniform", symbol_prefix);
+    if(!disp->GetUniformfv) {
+        void ** procp = (void **) &disp->GetUniformfv;
+        snprintf(symboln, sizeof(symboln), "%sGetUniformfv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetActiveUniformARB) {
-        void **procp = (void **) &disp->GetActiveUniformARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetActiveUniformARB",
-                 symbol_prefix);
+    if(!disp->GetUniformfv) {
+        void ** procp = (void **) &disp->GetUniformfv;
+        snprintf(symboln, sizeof(symboln), "%sGetUniformfvARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetAttachedObjectsARB) {
-        void **procp = (void **) &disp->GetAttachedObjectsARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetAttachedObjectsARB",
-                 symbol_prefix);
+    if(!disp->GetUniformiv) {
+        void ** procp = (void **) &disp->GetUniformiv;
+        snprintf(symboln, sizeof(symboln), "%sGetUniformiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetHandleARB) {
-        void **procp = (void **) &disp->GetHandleARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetHandleARB", symbol_prefix);
+    if(!disp->GetUniformiv) {
+        void ** procp = (void **) &disp->GetUniformiv;
+        snprintf(symboln, sizeof(symboln), "%sGetUniformivARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetInfoLogARB) {
-        void **procp = (void **) &disp->GetInfoLogARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetInfoLogARB", symbol_prefix);
+    if(!disp->GetVertexAttribPointerv) {
+        void ** procp = (void **) &disp->GetVertexAttribPointerv;
+        snprintf(symboln, sizeof(symboln), "%sGetVertexAttribPointerv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetObjectParameterfvARB) {
-        void **procp = (void **) &disp->GetObjectParameterfvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetObjectParameterfvARB",
-                 symbol_prefix);
+    if(!disp->GetVertexAttribPointerv) {
+        void ** procp = (void **) &disp->GetVertexAttribPointerv;
+        snprintf(symboln, sizeof(symboln), "%sGetVertexAttribPointervARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetObjectParameterivARB) {
-        void **procp = (void **) &disp->GetObjectParameterivARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetObjectParameterivARB",
-                 symbol_prefix);
+    if(!disp->GetVertexAttribPointerv) {
+        void ** procp = (void **) &disp->GetVertexAttribPointerv;
+        snprintf(symboln, sizeof(symboln), "%sGetVertexAttribPointervNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetShaderSourceARB) {
-        void **procp = (void **) &disp->GetShaderSourceARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetShaderSource", symbol_prefix);
+    if(!disp->GetVertexAttribdv) {
+        void ** procp = (void **) &disp->GetVertexAttribdv;
+        snprintf(symboln, sizeof(symboln), "%sGetVertexAttribdv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetShaderSourceARB) {
-        void **procp = (void **) &disp->GetShaderSourceARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetShaderSourceARB",
-                 symbol_prefix);
+    if(!disp->GetVertexAttribdv) {
+        void ** procp = (void **) &disp->GetVertexAttribdv;
+        snprintf(symboln, sizeof(symboln), "%sGetVertexAttribdvARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetUniformLocationARB) {
-        void **procp = (void **) &disp->GetUniformLocationARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetUniformLocation",
-                 symbol_prefix);
+    if(!disp->GetVertexAttribfv) {
+        void ** procp = (void **) &disp->GetVertexAttribfv;
+        snprintf(symboln, sizeof(symboln), "%sGetVertexAttribfv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetUniformLocationARB) {
-        void **procp = (void **) &disp->GetUniformLocationARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetUniformLocationARB",
-                 symbol_prefix);
+    if(!disp->GetVertexAttribfv) {
+        void ** procp = (void **) &disp->GetVertexAttribfv;
+        snprintf(symboln, sizeof(symboln), "%sGetVertexAttribfvARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetUniformfvARB) {
-        void **procp = (void **) &disp->GetUniformfvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetUniformfv", symbol_prefix);
+    if(!disp->GetVertexAttribiv) {
+        void ** procp = (void **) &disp->GetVertexAttribiv;
+        snprintf(symboln, sizeof(symboln), "%sGetVertexAttribiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetUniformfvARB) {
-        void **procp = (void **) &disp->GetUniformfvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetUniformfvARB", symbol_prefix);
+    if(!disp->GetVertexAttribiv) {
+        void ** procp = (void **) &disp->GetVertexAttribiv;
+        snprintf(symboln, sizeof(symboln), "%sGetVertexAttribivARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetUniformivARB) {
-        void **procp = (void **) &disp->GetUniformivARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetUniformiv", symbol_prefix);
+    if(!disp->IsProgram) {
+        void ** procp = (void **) &disp->IsProgram;
+        snprintf(symboln, sizeof(symboln), "%sIsProgram", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetUniformivARB) {
-        void **procp = (void **) &disp->GetUniformivARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetUniformivARB", symbol_prefix);
+    if(!disp->IsShader) {
+        void ** procp = (void **) &disp->IsShader;
+        snprintf(symboln, sizeof(symboln), "%sIsShader", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->LinkProgramARB) {
-        void **procp = (void **) &disp->LinkProgramARB;
 
+    if(!disp->LinkProgram) {
+        void ** procp = (void **) &disp->LinkProgram;
         snprintf(symboln, sizeof(symboln), "%sLinkProgram", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->LinkProgramARB) {
-        void **procp = (void **) &disp->LinkProgramARB;
 
+    if(!disp->LinkProgram) {
+        void ** procp = (void **) &disp->LinkProgram;
         snprintf(symboln, sizeof(symboln), "%sLinkProgramARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ShaderSourceARB) {
-        void **procp = (void **) &disp->ShaderSourceARB;
 
+    if(!disp->ShaderSource) {
+        void ** procp = (void **) &disp->ShaderSource;
         snprintf(symboln, sizeof(symboln), "%sShaderSource", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ShaderSourceARB) {
-        void **procp = (void **) &disp->ShaderSourceARB;
 
+    if(!disp->ShaderSource) {
+        void ** procp = (void **) &disp->ShaderSource;
         snprintf(symboln, sizeof(symboln), "%sShaderSourceARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Uniform1fARB) {
-        void **procp = (void **) &disp->Uniform1fARB;
 
+    if(!disp->StencilFuncSeparate) {
+        void ** procp = (void **) &disp->StencilFuncSeparate;
+        snprintf(symboln, sizeof(symboln), "%sStencilFuncSeparate", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->StencilMaskSeparate) {
+        void ** procp = (void **) &disp->StencilMaskSeparate;
+        snprintf(symboln, sizeof(symboln), "%sStencilMaskSeparate", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->StencilOpSeparate) {
+        void ** procp = (void **) &disp->StencilOpSeparate;
+        snprintf(symboln, sizeof(symboln), "%sStencilOpSeparate", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->StencilOpSeparate) {
+        void ** procp = (void **) &disp->StencilOpSeparate;
+        snprintf(symboln, sizeof(symboln), "%sStencilOpSeparateATI", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->Uniform1f) {
+        void ** procp = (void **) &disp->Uniform1f;
         snprintf(symboln, sizeof(symboln), "%sUniform1f", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Uniform1fARB) {
-        void **procp = (void **) &disp->Uniform1fARB;
 
+    if(!disp->Uniform1f) {
+        void ** procp = (void **) &disp->Uniform1f;
         snprintf(symboln, sizeof(symboln), "%sUniform1fARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Uniform1fvARB) {
-        void **procp = (void **) &disp->Uniform1fvARB;
 
+    if(!disp->Uniform1fv) {
+        void ** procp = (void **) &disp->Uniform1fv;
         snprintf(symboln, sizeof(symboln), "%sUniform1fv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Uniform1fvARB) {
-        void **procp = (void **) &disp->Uniform1fvARB;
 
+    if(!disp->Uniform1fv) {
+        void ** procp = (void **) &disp->Uniform1fv;
         snprintf(symboln, sizeof(symboln), "%sUniform1fvARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Uniform1iARB) {
-        void **procp = (void **) &disp->Uniform1iARB;
 
+    if(!disp->Uniform1i) {
+        void ** procp = (void **) &disp->Uniform1i;
         snprintf(symboln, sizeof(symboln), "%sUniform1i", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Uniform1iARB) {
-        void **procp = (void **) &disp->Uniform1iARB;
 
+    if(!disp->Uniform1i) {
+        void ** procp = (void **) &disp->Uniform1i;
         snprintf(symboln, sizeof(symboln), "%sUniform1iARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Uniform1ivARB) {
-        void **procp = (void **) &disp->Uniform1ivARB;
 
+    if(!disp->Uniform1iv) {
+        void ** procp = (void **) &disp->Uniform1iv;
         snprintf(symboln, sizeof(symboln), "%sUniform1iv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Uniform1ivARB) {
-        void **procp = (void **) &disp->Uniform1ivARB;
 
+    if(!disp->Uniform1iv) {
+        void ** procp = (void **) &disp->Uniform1iv;
         snprintf(symboln, sizeof(symboln), "%sUniform1ivARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Uniform2fARB) {
-        void **procp = (void **) &disp->Uniform2fARB;
 
+    if(!disp->Uniform2f) {
+        void ** procp = (void **) &disp->Uniform2f;
         snprintf(symboln, sizeof(symboln), "%sUniform2f", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Uniform2fARB) {
-        void **procp = (void **) &disp->Uniform2fARB;
 
+    if(!disp->Uniform2f) {
+        void ** procp = (void **) &disp->Uniform2f;
         snprintf(symboln, sizeof(symboln), "%sUniform2fARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Uniform2fvARB) {
-        void **procp = (void **) &disp->Uniform2fvARB;
 
+    if(!disp->Uniform2fv) {
+        void ** procp = (void **) &disp->Uniform2fv;
         snprintf(symboln, sizeof(symboln), "%sUniform2fv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Uniform2fvARB) {
-        void **procp = (void **) &disp->Uniform2fvARB;
 
+    if(!disp->Uniform2fv) {
+        void ** procp = (void **) &disp->Uniform2fv;
         snprintf(symboln, sizeof(symboln), "%sUniform2fvARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Uniform2iARB) {
-        void **procp = (void **) &disp->Uniform2iARB;
 
+    if(!disp->Uniform2i) {
+        void ** procp = (void **) &disp->Uniform2i;
         snprintf(symboln, sizeof(symboln), "%sUniform2i", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Uniform2iARB) {
-        void **procp = (void **) &disp->Uniform2iARB;
 
+    if(!disp->Uniform2i) {
+        void ** procp = (void **) &disp->Uniform2i;
         snprintf(symboln, sizeof(symboln), "%sUniform2iARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Uniform2ivARB) {
-        void **procp = (void **) &disp->Uniform2ivARB;
 
+    if(!disp->Uniform2iv) {
+        void ** procp = (void **) &disp->Uniform2iv;
         snprintf(symboln, sizeof(symboln), "%sUniform2iv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Uniform2ivARB) {
-        void **procp = (void **) &disp->Uniform2ivARB;
 
+    if(!disp->Uniform2iv) {
+        void ** procp = (void **) &disp->Uniform2iv;
         snprintf(symboln, sizeof(symboln), "%sUniform2ivARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Uniform3fARB) {
-        void **procp = (void **) &disp->Uniform3fARB;
 
+    if(!disp->Uniform3f) {
+        void ** procp = (void **) &disp->Uniform3f;
         snprintf(symboln, sizeof(symboln), "%sUniform3f", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Uniform3fARB) {
-        void **procp = (void **) &disp->Uniform3fARB;
 
+    if(!disp->Uniform3f) {
+        void ** procp = (void **) &disp->Uniform3f;
         snprintf(symboln, sizeof(symboln), "%sUniform3fARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Uniform3fvARB) {
-        void **procp = (void **) &disp->Uniform3fvARB;
 
+    if(!disp->Uniform3fv) {
+        void ** procp = (void **) &disp->Uniform3fv;
         snprintf(symboln, sizeof(symboln), "%sUniform3fv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Uniform3fvARB) {
-        void **procp = (void **) &disp->Uniform3fvARB;
 
+    if(!disp->Uniform3fv) {
+        void ** procp = (void **) &disp->Uniform3fv;
         snprintf(symboln, sizeof(symboln), "%sUniform3fvARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Uniform3iARB) {
-        void **procp = (void **) &disp->Uniform3iARB;
 
+    if(!disp->Uniform3i) {
+        void ** procp = (void **) &disp->Uniform3i;
         snprintf(symboln, sizeof(symboln), "%sUniform3i", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Uniform3iARB) {
-        void **procp = (void **) &disp->Uniform3iARB;
 
+    if(!disp->Uniform3i) {
+        void ** procp = (void **) &disp->Uniform3i;
         snprintf(symboln, sizeof(symboln), "%sUniform3iARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Uniform3ivARB) {
-        void **procp = (void **) &disp->Uniform3ivARB;
 
+    if(!disp->Uniform3iv) {
+        void ** procp = (void **) &disp->Uniform3iv;
         snprintf(symboln, sizeof(symboln), "%sUniform3iv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Uniform3ivARB) {
-        void **procp = (void **) &disp->Uniform3ivARB;
 
+    if(!disp->Uniform3iv) {
+        void ** procp = (void **) &disp->Uniform3iv;
         snprintf(symboln, sizeof(symboln), "%sUniform3ivARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Uniform4fARB) {
-        void **procp = (void **) &disp->Uniform4fARB;
 
+    if(!disp->Uniform4f) {
+        void ** procp = (void **) &disp->Uniform4f;
         snprintf(symboln, sizeof(symboln), "%sUniform4f", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Uniform4fARB) {
-        void **procp = (void **) &disp->Uniform4fARB;
 
+    if(!disp->Uniform4f) {
+        void ** procp = (void **) &disp->Uniform4f;
         snprintf(symboln, sizeof(symboln), "%sUniform4fARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Uniform4fvARB) {
-        void **procp = (void **) &disp->Uniform4fvARB;
 
+    if(!disp->Uniform4fv) {
+        void ** procp = (void **) &disp->Uniform4fv;
         snprintf(symboln, sizeof(symboln), "%sUniform4fv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Uniform4fvARB) {
-        void **procp = (void **) &disp->Uniform4fvARB;
 
+    if(!disp->Uniform4fv) {
+        void ** procp = (void **) &disp->Uniform4fv;
         snprintf(symboln, sizeof(symboln), "%sUniform4fvARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Uniform4iARB) {
-        void **procp = (void **) &disp->Uniform4iARB;
 
+    if(!disp->Uniform4i) {
+        void ** procp = (void **) &disp->Uniform4i;
         snprintf(symboln, sizeof(symboln), "%sUniform4i", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Uniform4iARB) {
-        void **procp = (void **) &disp->Uniform4iARB;
 
+    if(!disp->Uniform4i) {
+        void ** procp = (void **) &disp->Uniform4i;
         snprintf(symboln, sizeof(symboln), "%sUniform4iARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Uniform4ivARB) {
-        void **procp = (void **) &disp->Uniform4ivARB;
 
+    if(!disp->Uniform4iv) {
+        void ** procp = (void **) &disp->Uniform4iv;
         snprintf(symboln, sizeof(symboln), "%sUniform4iv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Uniform4ivARB) {
-        void **procp = (void **) &disp->Uniform4ivARB;
 
+    if(!disp->Uniform4iv) {
+        void ** procp = (void **) &disp->Uniform4iv;
         snprintf(symboln, sizeof(symboln), "%sUniform4ivARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->UniformMatrix2fvARB) {
-        void **procp = (void **) &disp->UniformMatrix2fvARB;
 
+    if(!disp->UniformMatrix2fv) {
+        void ** procp = (void **) &disp->UniformMatrix2fv;
         snprintf(symboln, sizeof(symboln), "%sUniformMatrix2fv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->UniformMatrix2fvARB) {
-        void **procp = (void **) &disp->UniformMatrix2fvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sUniformMatrix2fvARB",
-                 symbol_prefix);
+    if(!disp->UniformMatrix2fv) {
+        void ** procp = (void **) &disp->UniformMatrix2fv;
+        snprintf(symboln, sizeof(symboln), "%sUniformMatrix2fvARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->UniformMatrix3fvARB) {
-        void **procp = (void **) &disp->UniformMatrix3fvARB;
 
+    if(!disp->UniformMatrix3fv) {
+        void ** procp = (void **) &disp->UniformMatrix3fv;
         snprintf(symboln, sizeof(symboln), "%sUniformMatrix3fv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->UniformMatrix3fvARB) {
-        void **procp = (void **) &disp->UniformMatrix3fvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sUniformMatrix3fvARB",
-                 symbol_prefix);
+    if(!disp->UniformMatrix3fv) {
+        void ** procp = (void **) &disp->UniformMatrix3fv;
+        snprintf(symboln, sizeof(symboln), "%sUniformMatrix3fvARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->UniformMatrix4fvARB) {
-        void **procp = (void **) &disp->UniformMatrix4fvARB;
 
+    if(!disp->UniformMatrix4fv) {
+        void ** procp = (void **) &disp->UniformMatrix4fv;
         snprintf(symboln, sizeof(symboln), "%sUniformMatrix4fv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->UniformMatrix4fvARB) {
-        void **procp = (void **) &disp->UniformMatrix4fvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sUniformMatrix4fvARB",
-                 symbol_prefix);
+    if(!disp->UniformMatrix4fv) {
+        void ** procp = (void **) &disp->UniformMatrix4fv;
+        snprintf(symboln, sizeof(symboln), "%sUniformMatrix4fvARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->UseProgramObjectARB) {
-        void **procp = (void **) &disp->UseProgramObjectARB;
 
+    if(!disp->UseProgram) {
+        void ** procp = (void **) &disp->UseProgram;
         snprintf(symboln, sizeof(symboln), "%sUseProgram", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->UseProgramObjectARB) {
-        void **procp = (void **) &disp->UseProgramObjectARB;
 
-        snprintf(symboln, sizeof(symboln), "%sUseProgramObjectARB",
-                 symbol_prefix);
+    if(!disp->UseProgram) {
+        void ** procp = (void **) &disp->UseProgram;
+        snprintf(symboln, sizeof(symboln), "%sUseProgramObjectARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ValidateProgramARB) {
-        void **procp = (void **) &disp->ValidateProgramARB;
 
+    if(!disp->ValidateProgram) {
+        void ** procp = (void **) &disp->ValidateProgram;
         snprintf(symboln, sizeof(symboln), "%sValidateProgram", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ValidateProgramARB) {
-        void **procp = (void **) &disp->ValidateProgramARB;
 
-        snprintf(symboln, sizeof(symboln), "%sValidateProgramARB",
-                 symbol_prefix);
+    if(!disp->ValidateProgram) {
+        void ** procp = (void **) &disp->ValidateProgram;
+        snprintf(symboln, sizeof(symboln), "%sValidateProgramARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BindAttribLocationARB) {
-        void **procp = (void **) &disp->BindAttribLocationARB;
 
-        snprintf(symboln, sizeof(symboln), "%sBindAttribLocation",
-                 symbol_prefix);
+    if(!disp->VertexAttrib1d) {
+        void ** procp = (void **) &disp->VertexAttrib1d;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib1d", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BindAttribLocationARB) {
-        void **procp = (void **) &disp->BindAttribLocationARB;
 
-        snprintf(symboln, sizeof(symboln), "%sBindAttribLocationARB",
-                 symbol_prefix);
+    if(!disp->VertexAttrib1d) {
+        void ** procp = (void **) &disp->VertexAttrib1d;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib1dARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetActiveAttribARB) {
-        void **procp = (void **) &disp->GetActiveAttribARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetActiveAttrib", symbol_prefix);
+    if(!disp->VertexAttrib1dv) {
+        void ** procp = (void **) &disp->VertexAttrib1dv;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib1dv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetActiveAttribARB) {
-        void **procp = (void **) &disp->GetActiveAttribARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetActiveAttribARB",
-                 symbol_prefix);
+    if(!disp->VertexAttrib1dv) {
+        void ** procp = (void **) &disp->VertexAttrib1dv;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib1dvARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetAttribLocationARB) {
-        void **procp = (void **) &disp->GetAttribLocationARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetAttribLocation",
-                 symbol_prefix);
+    if(!disp->VertexAttrib1s) {
+        void ** procp = (void **) &disp->VertexAttrib1s;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib1s", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetAttribLocationARB) {
-        void **procp = (void **) &disp->GetAttribLocationARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetAttribLocationARB",
-                 symbol_prefix);
+    if(!disp->VertexAttrib1s) {
+        void ** procp = (void **) &disp->VertexAttrib1s;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib1sARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DrawBuffersARB) {
-        void **procp = (void **) &disp->DrawBuffersARB;
 
-        snprintf(symboln, sizeof(symboln), "%sDrawBuffers", symbol_prefix);
+    if(!disp->VertexAttrib1sv) {
+        void ** procp = (void **) &disp->VertexAttrib1sv;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib1sv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DrawBuffersARB) {
-        void **procp = (void **) &disp->DrawBuffersARB;
 
-        snprintf(symboln, sizeof(symboln), "%sDrawBuffersARB", symbol_prefix);
+    if(!disp->VertexAttrib1sv) {
+        void ** procp = (void **) &disp->VertexAttrib1sv;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib1svARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DrawBuffersARB) {
-        void **procp = (void **) &disp->DrawBuffersARB;
 
-        snprintf(symboln, sizeof(symboln), "%sDrawBuffersATI", symbol_prefix);
+    if(!disp->VertexAttrib2d) {
+        void ** procp = (void **) &disp->VertexAttrib2d;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib2d", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DrawBuffersARB) {
-        void **procp = (void **) &disp->DrawBuffersARB;
 
-        snprintf(symboln, sizeof(symboln), "%sDrawBuffersNV", symbol_prefix);
+    if(!disp->VertexAttrib2d) {
+        void ** procp = (void **) &disp->VertexAttrib2d;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib2dARB", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->VertexAttrib2dv) {
+        void ** procp = (void **) &disp->VertexAttrib2dv;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib2dv", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->VertexAttrib2dv) {
+        void ** procp = (void **) &disp->VertexAttrib2dv;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib2dvARB", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->VertexAttrib2s) {
+        void ** procp = (void **) &disp->VertexAttrib2s;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib2s", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->VertexAttrib2s) {
+        void ** procp = (void **) &disp->VertexAttrib2s;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib2sARB", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->VertexAttrib2sv) {
+        void ** procp = (void **) &disp->VertexAttrib2sv;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib2sv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ClampColorARB) {
-        void **procp = (void **) &disp->ClampColorARB;
 
+    if(!disp->VertexAttrib2sv) {
+        void ** procp = (void **) &disp->VertexAttrib2sv;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib2svARB", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->VertexAttrib3d) {
+        void ** procp = (void **) &disp->VertexAttrib3d;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib3d", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->VertexAttrib3d) {
+        void ** procp = (void **) &disp->VertexAttrib3d;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib3dARB", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->VertexAttrib3dv) {
+        void ** procp = (void **) &disp->VertexAttrib3dv;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib3dv", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->VertexAttrib3dv) {
+        void ** procp = (void **) &disp->VertexAttrib3dv;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib3dvARB", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->VertexAttrib3s) {
+        void ** procp = (void **) &disp->VertexAttrib3s;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib3s", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->VertexAttrib3s) {
+        void ** procp = (void **) &disp->VertexAttrib3s;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib3sARB", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->VertexAttrib3sv) {
+        void ** procp = (void **) &disp->VertexAttrib3sv;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib3sv", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->VertexAttrib3sv) {
+        void ** procp = (void **) &disp->VertexAttrib3sv;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib3svARB", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->VertexAttrib4Nbv) {
+        void ** procp = (void **) &disp->VertexAttrib4Nbv;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4Nbv", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->VertexAttrib4Nbv) {
+        void ** procp = (void **) &disp->VertexAttrib4Nbv;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4NbvARB", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->VertexAttrib4Niv) {
+        void ** procp = (void **) &disp->VertexAttrib4Niv;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4Niv", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->VertexAttrib4Niv) {
+        void ** procp = (void **) &disp->VertexAttrib4Niv;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4NivARB", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->VertexAttrib4Nsv) {
+        void ** procp = (void **) &disp->VertexAttrib4Nsv;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4Nsv", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->VertexAttrib4Nsv) {
+        void ** procp = (void **) &disp->VertexAttrib4Nsv;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4NsvARB", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->VertexAttrib4Nub) {
+        void ** procp = (void **) &disp->VertexAttrib4Nub;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4Nub", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->VertexAttrib4Nub) {
+        void ** procp = (void **) &disp->VertexAttrib4Nub;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4NubARB", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->VertexAttrib4Nubv) {
+        void ** procp = (void **) &disp->VertexAttrib4Nubv;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4Nubv", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->VertexAttrib4Nubv) {
+        void ** procp = (void **) &disp->VertexAttrib4Nubv;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4NubvARB", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->VertexAttrib4Nuiv) {
+        void ** procp = (void **) &disp->VertexAttrib4Nuiv;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4Nuiv", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->VertexAttrib4Nuiv) {
+        void ** procp = (void **) &disp->VertexAttrib4Nuiv;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4NuivARB", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->VertexAttrib4Nusv) {
+        void ** procp = (void **) &disp->VertexAttrib4Nusv;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4Nusv", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->VertexAttrib4Nusv) {
+        void ** procp = (void **) &disp->VertexAttrib4Nusv;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4NusvARB", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->VertexAttrib4bv) {
+        void ** procp = (void **) &disp->VertexAttrib4bv;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4bv", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->VertexAttrib4bv) {
+        void ** procp = (void **) &disp->VertexAttrib4bv;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4bvARB", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->VertexAttrib4d) {
+        void ** procp = (void **) &disp->VertexAttrib4d;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4d", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->VertexAttrib4d) {
+        void ** procp = (void **) &disp->VertexAttrib4d;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4dARB", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->VertexAttrib4dv) {
+        void ** procp = (void **) &disp->VertexAttrib4dv;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4dv", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->VertexAttrib4dv) {
+        void ** procp = (void **) &disp->VertexAttrib4dv;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4dvARB", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->VertexAttrib4iv) {
+        void ** procp = (void **) &disp->VertexAttrib4iv;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4iv", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->VertexAttrib4iv) {
+        void ** procp = (void **) &disp->VertexAttrib4iv;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4ivARB", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->VertexAttrib4s) {
+        void ** procp = (void **) &disp->VertexAttrib4s;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4s", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->VertexAttrib4s) {
+        void ** procp = (void **) &disp->VertexAttrib4s;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4sARB", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->VertexAttrib4sv) {
+        void ** procp = (void **) &disp->VertexAttrib4sv;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4sv", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->VertexAttrib4sv) {
+        void ** procp = (void **) &disp->VertexAttrib4sv;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4svARB", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->VertexAttrib4ubv) {
+        void ** procp = (void **) &disp->VertexAttrib4ubv;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4ubv", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->VertexAttrib4ubv) {
+        void ** procp = (void **) &disp->VertexAttrib4ubv;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4ubvARB", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->VertexAttrib4uiv) {
+        void ** procp = (void **) &disp->VertexAttrib4uiv;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4uiv", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->VertexAttrib4uiv) {
+        void ** procp = (void **) &disp->VertexAttrib4uiv;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4uivARB", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->VertexAttrib4usv) {
+        void ** procp = (void **) &disp->VertexAttrib4usv;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4usv", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->VertexAttrib4usv) {
+        void ** procp = (void **) &disp->VertexAttrib4usv;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4usvARB", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->VertexAttribPointer) {
+        void ** procp = (void **) &disp->VertexAttribPointer;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribPointer", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->VertexAttribPointer) {
+        void ** procp = (void **) &disp->VertexAttribPointer;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribPointerARB", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->UniformMatrix2x3fv) {
+        void ** procp = (void **) &disp->UniformMatrix2x3fv;
+        snprintf(symboln, sizeof(symboln), "%sUniformMatrix2x3fv", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->UniformMatrix2x4fv) {
+        void ** procp = (void **) &disp->UniformMatrix2x4fv;
+        snprintf(symboln, sizeof(symboln), "%sUniformMatrix2x4fv", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->UniformMatrix3x2fv) {
+        void ** procp = (void **) &disp->UniformMatrix3x2fv;
+        snprintf(symboln, sizeof(symboln), "%sUniformMatrix3x2fv", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->UniformMatrix3x4fv) {
+        void ** procp = (void **) &disp->UniformMatrix3x4fv;
+        snprintf(symboln, sizeof(symboln), "%sUniformMatrix3x4fv", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->UniformMatrix4x2fv) {
+        void ** procp = (void **) &disp->UniformMatrix4x2fv;
+        snprintf(symboln, sizeof(symboln), "%sUniformMatrix4x2fv", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->UniformMatrix4x3fv) {
+        void ** procp = (void **) &disp->UniformMatrix4x3fv;
+        snprintf(symboln, sizeof(symboln), "%sUniformMatrix4x3fv", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->BeginConditionalRender) {
+        void ** procp = (void **) &disp->BeginConditionalRender;
+        snprintf(symboln, sizeof(symboln), "%sBeginConditionalRender", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->BeginConditionalRender) {
+        void ** procp = (void **) &disp->BeginConditionalRender;
+        snprintf(symboln, sizeof(symboln), "%sBeginConditionalRenderNV", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->BeginTransformFeedback) {
+        void ** procp = (void **) &disp->BeginTransformFeedback;
+        snprintf(symboln, sizeof(symboln), "%sBeginTransformFeedback", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->BeginTransformFeedback) {
+        void ** procp = (void **) &disp->BeginTransformFeedback;
+        snprintf(symboln, sizeof(symboln), "%sBeginTransformFeedbackEXT", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->BindBufferBase) {
+        void ** procp = (void **) &disp->BindBufferBase;
+        snprintf(symboln, sizeof(symboln), "%sBindBufferBase", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->BindBufferBase) {
+        void ** procp = (void **) &disp->BindBufferBase;
+        snprintf(symboln, sizeof(symboln), "%sBindBufferBaseEXT", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->BindBufferRange) {
+        void ** procp = (void **) &disp->BindBufferRange;
+        snprintf(symboln, sizeof(symboln), "%sBindBufferRange", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->BindBufferRange) {
+        void ** procp = (void **) &disp->BindBufferRange;
+        snprintf(symboln, sizeof(symboln), "%sBindBufferRangeEXT", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->BindFragDataLocation) {
+        void ** procp = (void **) &disp->BindFragDataLocation;
+        snprintf(symboln, sizeof(symboln), "%sBindFragDataLocationEXT", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->BindFragDataLocation) {
+        void ** procp = (void **) &disp->BindFragDataLocation;
+        snprintf(symboln, sizeof(symboln), "%sBindFragDataLocation", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->ClampColor) {
+        void ** procp = (void **) &disp->ClampColor;
         snprintf(symboln, sizeof(symboln), "%sClampColorARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DrawArraysInstancedARB) {
-        void **procp = (void **) &disp->DrawArraysInstancedARB;
 
-        snprintf(symboln, sizeof(symboln), "%sDrawArraysInstancedARB",
-                 symbol_prefix);
+    if(!disp->ClampColor) {
+        void ** procp = (void **) &disp->ClampColor;
+        snprintf(symboln, sizeof(symboln), "%sClampColor", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DrawArraysInstancedARB) {
-        void **procp = (void **) &disp->DrawArraysInstancedARB;
 
-        snprintf(symboln, sizeof(symboln), "%sDrawArraysInstancedEXT",
-                 symbol_prefix);
+    if(!disp->ClearBufferfi) {
+        void ** procp = (void **) &disp->ClearBufferfi;
+        snprintf(symboln, sizeof(symboln), "%sClearBufferfi", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DrawArraysInstancedARB) {
-        void **procp = (void **) &disp->DrawArraysInstancedARB;
 
-        snprintf(symboln, sizeof(symboln), "%sDrawArraysInstanced",
-                 symbol_prefix);
+    if(!disp->ClearBufferfv) {
+        void ** procp = (void **) &disp->ClearBufferfv;
+        snprintf(symboln, sizeof(symboln), "%sClearBufferfv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DrawElementsInstancedARB) {
-        void **procp = (void **) &disp->DrawElementsInstancedARB;
 
-        snprintf(symboln, sizeof(symboln), "%sDrawElementsInstancedARB",
-                 symbol_prefix);
+    if(!disp->ClearBufferiv) {
+        void ** procp = (void **) &disp->ClearBufferiv;
+        snprintf(symboln, sizeof(symboln), "%sClearBufferiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DrawElementsInstancedARB) {
-        void **procp = (void **) &disp->DrawElementsInstancedARB;
 
-        snprintf(symboln, sizeof(symboln), "%sDrawElementsInstancedEXT",
-                 symbol_prefix);
+    if(!disp->ClearBufferuiv) {
+        void ** procp = (void **) &disp->ClearBufferuiv;
+        snprintf(symboln, sizeof(symboln), "%sClearBufferuiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DrawElementsInstancedARB) {
-        void **procp = (void **) &disp->DrawElementsInstancedARB;
 
-        snprintf(symboln, sizeof(symboln), "%sDrawElementsInstanced",
-                 symbol_prefix);
+    if(!disp->ColorMaski) {
+        void ** procp = (void **) &disp->ColorMaski;
+        snprintf(symboln, sizeof(symboln), "%sColorMaskIndexedEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->RenderbufferStorageMultisample) {
-        void **procp = (void **) &disp->RenderbufferStorageMultisample;
 
-        snprintf(symboln, sizeof(symboln), "%sRenderbufferStorageMultisample",
-                 symbol_prefix);
+    if(!disp->ColorMaski) {
+        void ** procp = (void **) &disp->ColorMaski;
+        snprintf(symboln, sizeof(symboln), "%sColorMaski", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->RenderbufferStorageMultisample) {
-        void **procp = (void **) &disp->RenderbufferStorageMultisample;
 
-        snprintf(symboln, sizeof(symboln),
-                 "%sRenderbufferStorageMultisampleEXT", symbol_prefix);
+    if(!disp->Disablei) {
+        void ** procp = (void **) &disp->Disablei;
+        snprintf(symboln, sizeof(symboln), "%sDisableIndexedEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->FramebufferTextureARB) {
-        void **procp = (void **) &disp->FramebufferTextureARB;
 
-        snprintf(symboln, sizeof(symboln), "%sFramebufferTextureARB",
-                 symbol_prefix);
+    if(!disp->Disablei) {
+        void ** procp = (void **) &disp->Disablei;
+        snprintf(symboln, sizeof(symboln), "%sDisablei", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->FramebufferTextureFaceARB) {
-        void **procp = (void **) &disp->FramebufferTextureFaceARB;
 
-        snprintf(symboln, sizeof(symboln), "%sFramebufferTextureFaceARB",
-                 symbol_prefix);
+    if(!disp->Enablei) {
+        void ** procp = (void **) &disp->Enablei;
+        snprintf(symboln, sizeof(symboln), "%sEnableIndexedEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ProgramParameteriARB) {
-        void **procp = (void **) &disp->ProgramParameteriARB;
 
-        snprintf(symboln, sizeof(symboln), "%sProgramParameteriARB",
-                 symbol_prefix);
+    if(!disp->Enablei) {
+        void ** procp = (void **) &disp->Enablei;
+        snprintf(symboln, sizeof(symboln), "%sEnablei", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribDivisorARB) {
-        void **procp = (void **) &disp->VertexAttribDivisorARB;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribDivisorARB",
-                 symbol_prefix);
+    if(!disp->EndConditionalRender) {
+        void ** procp = (void **) &disp->EndConditionalRender;
+        snprintf(symboln, sizeof(symboln), "%sEndConditionalRender", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->FlushMappedBufferRange) {
-        void **procp = (void **) &disp->FlushMappedBufferRange;
 
-        snprintf(symboln, sizeof(symboln), "%sFlushMappedBufferRange",
-                 symbol_prefix);
+    if(!disp->EndConditionalRender) {
+        void ** procp = (void **) &disp->EndConditionalRender;
+        snprintf(symboln, sizeof(symboln), "%sEndConditionalRenderNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MapBufferRange) {
-        void **procp = (void **) &disp->MapBufferRange;
 
-        snprintf(symboln, sizeof(symboln), "%sMapBufferRange", symbol_prefix);
+    if(!disp->EndTransformFeedback) {
+        void ** procp = (void **) &disp->EndTransformFeedback;
+        snprintf(symboln, sizeof(symboln), "%sEndTransformFeedback", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexBufferARB) {
-        void **procp = (void **) &disp->TexBufferARB;
 
-        snprintf(symboln, sizeof(symboln), "%sTexBufferARB", symbol_prefix);
+    if(!disp->EndTransformFeedback) {
+        void ** procp = (void **) &disp->EndTransformFeedback;
+        snprintf(symboln, sizeof(symboln), "%sEndTransformFeedbackEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BindVertexArray) {
-        void **procp = (void **) &disp->BindVertexArray;
 
-        snprintf(symboln, sizeof(symboln), "%sBindVertexArray", symbol_prefix);
+    if(!disp->GetBooleani_v) {
+        void ** procp = (void **) &disp->GetBooleani_v;
+        snprintf(symboln, sizeof(symboln), "%sGetBooleanIndexedvEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GenVertexArrays) {
-        void **procp = (void **) &disp->GenVertexArrays;
 
-        snprintf(symboln, sizeof(symboln), "%sGenVertexArrays", symbol_prefix);
+    if(!disp->GetBooleani_v) {
+        void ** procp = (void **) &disp->GetBooleani_v;
+        snprintf(symboln, sizeof(symboln), "%sGetBooleani_v", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->CopyBufferSubData) {
-        void **procp = (void **) &disp->CopyBufferSubData;
 
-        snprintf(symboln, sizeof(symboln), "%sCopyBufferSubData",
-                 symbol_prefix);
+    if(!disp->GetFragDataLocation) {
+        void ** procp = (void **) &disp->GetFragDataLocation;
+        snprintf(symboln, sizeof(symboln), "%sGetFragDataLocationEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ClientWaitSync) {
-        void **procp = (void **) &disp->ClientWaitSync;
 
-        snprintf(symboln, sizeof(symboln), "%sClientWaitSync", symbol_prefix);
+    if(!disp->GetFragDataLocation) {
+        void ** procp = (void **) &disp->GetFragDataLocation;
+        snprintf(symboln, sizeof(symboln), "%sGetFragDataLocation", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DeleteSync) {
-        void **procp = (void **) &disp->DeleteSync;
 
-        snprintf(symboln, sizeof(symboln), "%sDeleteSync", symbol_prefix);
+    if(!disp->GetIntegeri_v) {
+        void ** procp = (void **) &disp->GetIntegeri_v;
+        snprintf(symboln, sizeof(symboln), "%sGetIntegerIndexedvEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->FenceSync) {
-        void **procp = (void **) &disp->FenceSync;
 
-        snprintf(symboln, sizeof(symboln), "%sFenceSync", symbol_prefix);
+    if(!disp->GetIntegeri_v) {
+        void ** procp = (void **) &disp->GetIntegeri_v;
+        snprintf(symboln, sizeof(symboln), "%sGetIntegeri_v", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetInteger64v) {
-        void **procp = (void **) &disp->GetInteger64v;
 
-        snprintf(symboln, sizeof(symboln), "%sGetInteger64v", symbol_prefix);
+    if(!disp->GetStringi) {
+        void ** procp = (void **) &disp->GetStringi;
+        snprintf(symboln, sizeof(symboln), "%sGetStringi", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetSynciv) {
-        void **procp = (void **) &disp->GetSynciv;
 
-        snprintf(symboln, sizeof(symboln), "%sGetSynciv", symbol_prefix);
+    if(!disp->GetTexParameterIiv) {
+        void ** procp = (void **) &disp->GetTexParameterIiv;
+        snprintf(symboln, sizeof(symboln), "%sGetTexParameterIivEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->IsSync) {
-        void **procp = (void **) &disp->IsSync;
 
-        snprintf(symboln, sizeof(symboln), "%sIsSync", symbol_prefix);
+    if(!disp->GetTexParameterIiv) {
+        void ** procp = (void **) &disp->GetTexParameterIiv;
+        snprintf(symboln, sizeof(symboln), "%sGetTexParameterIiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WaitSync) {
-        void **procp = (void **) &disp->WaitSync;
 
-        snprintf(symboln, sizeof(symboln), "%sWaitSync", symbol_prefix);
+    if(!disp->GetTexParameterIuiv) {
+        void ** procp = (void **) &disp->GetTexParameterIuiv;
+        snprintf(symboln, sizeof(symboln), "%sGetTexParameterIuivEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DrawElementsBaseVertex) {
-        void **procp = (void **) &disp->DrawElementsBaseVertex;
 
-        snprintf(symboln, sizeof(symboln), "%sDrawElementsBaseVertex",
-                 symbol_prefix);
+    if(!disp->GetTexParameterIuiv) {
+        void ** procp = (void **) &disp->GetTexParameterIuiv;
+        snprintf(symboln, sizeof(symboln), "%sGetTexParameterIuiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DrawElementsInstancedBaseVertex) {
-        void **procp = (void **) &disp->DrawElementsInstancedBaseVertex;
 
-        snprintf(symboln, sizeof(symboln), "%sDrawElementsInstancedBaseVertex",
-                 symbol_prefix);
+    if(!disp->GetTransformFeedbackVarying) {
+        void ** procp = (void **) &disp->GetTransformFeedbackVarying;
+        snprintf(symboln, sizeof(symboln), "%sGetTransformFeedbackVarying", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DrawRangeElementsBaseVertex) {
-        void **procp = (void **) &disp->DrawRangeElementsBaseVertex;
 
-        snprintf(symboln, sizeof(symboln), "%sDrawRangeElementsBaseVertex",
-                 symbol_prefix);
+    if(!disp->GetTransformFeedbackVarying) {
+        void ** procp = (void **) &disp->GetTransformFeedbackVarying;
+        snprintf(symboln, sizeof(symboln), "%sGetTransformFeedbackVaryingEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiDrawElementsBaseVertex) {
-        void **procp = (void **) &disp->MultiDrawElementsBaseVertex;
 
-        snprintf(symboln, sizeof(symboln), "%sMultiDrawElementsBaseVertex",
-                 symbol_prefix);
+    if(!disp->GetUniformuiv) {
+        void ** procp = (void **) &disp->GetUniformuiv;
+        snprintf(symboln, sizeof(symboln), "%sGetUniformuivEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BlendEquationSeparateiARB) {
-        void **procp = (void **) &disp->BlendEquationSeparateiARB;
 
-        snprintf(symboln, sizeof(symboln), "%sBlendEquationSeparateiARB",
-                 symbol_prefix);
+    if(!disp->GetUniformuiv) {
+        void ** procp = (void **) &disp->GetUniformuiv;
+        snprintf(symboln, sizeof(symboln), "%sGetUniformuiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BlendEquationSeparateiARB) {
-        void **procp = (void **) &disp->BlendEquationSeparateiARB;
 
-        snprintf(symboln, sizeof(symboln), "%sBlendEquationSeparateIndexedAMD",
-                 symbol_prefix);
+    if(!disp->GetVertexAttribIiv) {
+        void ** procp = (void **) &disp->GetVertexAttribIiv;
+        snprintf(symboln, sizeof(symboln), "%sGetVertexAttribIivEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BlendEquationiARB) {
-        void **procp = (void **) &disp->BlendEquationiARB;
 
-        snprintf(symboln, sizeof(symboln), "%sBlendEquationiARB",
-                 symbol_prefix);
+    if(!disp->GetVertexAttribIiv) {
+        void ** procp = (void **) &disp->GetVertexAttribIiv;
+        snprintf(symboln, sizeof(symboln), "%sGetVertexAttribIiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BlendEquationiARB) {
-        void **procp = (void **) &disp->BlendEquationiARB;
 
-        snprintf(symboln, sizeof(symboln), "%sBlendEquationIndexedAMD",
-                 symbol_prefix);
+    if(!disp->GetVertexAttribIuiv) {
+        void ** procp = (void **) &disp->GetVertexAttribIuiv;
+        snprintf(symboln, sizeof(symboln), "%sGetVertexAttribIuivEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BlendFuncSeparateiARB) {
-        void **procp = (void **) &disp->BlendFuncSeparateiARB;
 
-        snprintf(symboln, sizeof(symboln), "%sBlendFuncSeparateiARB",
-                 symbol_prefix);
+    if(!disp->GetVertexAttribIuiv) {
+        void ** procp = (void **) &disp->GetVertexAttribIuiv;
+        snprintf(symboln, sizeof(symboln), "%sGetVertexAttribIuiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BlendFuncSeparateiARB) {
-        void **procp = (void **) &disp->BlendFuncSeparateiARB;
 
-        snprintf(symboln, sizeof(symboln), "%sBlendFuncSeparateIndexedAMD",
-                 symbol_prefix);
+    if(!disp->IsEnabledi) {
+        void ** procp = (void **) &disp->IsEnabledi;
+        snprintf(symboln, sizeof(symboln), "%sIsEnabledIndexedEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BlendFunciARB) {
-        void **procp = (void **) &disp->BlendFunciARB;
 
-        snprintf(symboln, sizeof(symboln), "%sBlendFunciARB", symbol_prefix);
+    if(!disp->IsEnabledi) {
+        void ** procp = (void **) &disp->IsEnabledi;
+        snprintf(symboln, sizeof(symboln), "%sIsEnabledi", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BlendFunciARB) {
-        void **procp = (void **) &disp->BlendFunciARB;
 
-        snprintf(symboln, sizeof(symboln), "%sBlendFuncIndexedAMD",
-                 symbol_prefix);
+    if(!disp->TexParameterIiv) {
+        void ** procp = (void **) &disp->TexParameterIiv;
+        snprintf(symboln, sizeof(symboln), "%sTexParameterIivEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BindSampler) {
-        void **procp = (void **) &disp->BindSampler;
 
-        snprintf(symboln, sizeof(symboln), "%sBindSampler", symbol_prefix);
+    if(!disp->TexParameterIiv) {
+        void ** procp = (void **) &disp->TexParameterIiv;
+        snprintf(symboln, sizeof(symboln), "%sTexParameterIiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DeleteSamplers) {
-        void **procp = (void **) &disp->DeleteSamplers;
 
-        snprintf(symboln, sizeof(symboln), "%sDeleteSamplers", symbol_prefix);
+    if(!disp->TexParameterIuiv) {
+        void ** procp = (void **) &disp->TexParameterIuiv;
+        snprintf(symboln, sizeof(symboln), "%sTexParameterIuivEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GenSamplers) {
-        void **procp = (void **) &disp->GenSamplers;
 
-        snprintf(symboln, sizeof(symboln), "%sGenSamplers", symbol_prefix);
+    if(!disp->TexParameterIuiv) {
+        void ** procp = (void **) &disp->TexParameterIuiv;
+        snprintf(symboln, sizeof(symboln), "%sTexParameterIuiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetSamplerParameterIiv) {
-        void **procp = (void **) &disp->GetSamplerParameterIiv;
 
-        snprintf(symboln, sizeof(symboln), "%sGetSamplerParameterIiv",
-                 symbol_prefix);
+    if(!disp->TransformFeedbackVaryings) {
+        void ** procp = (void **) &disp->TransformFeedbackVaryings;
+        snprintf(symboln, sizeof(symboln), "%sTransformFeedbackVaryings", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetSamplerParameterIuiv) {
-        void **procp = (void **) &disp->GetSamplerParameterIuiv;
 
-        snprintf(symboln, sizeof(symboln), "%sGetSamplerParameterIuiv",
-                 symbol_prefix);
+    if(!disp->TransformFeedbackVaryings) {
+        void ** procp = (void **) &disp->TransformFeedbackVaryings;
+        snprintf(symboln, sizeof(symboln), "%sTransformFeedbackVaryingsEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetSamplerParameterfv) {
-        void **procp = (void **) &disp->GetSamplerParameterfv;
 
-        snprintf(symboln, sizeof(symboln), "%sGetSamplerParameterfv",
-                 symbol_prefix);
+    if(!disp->Uniform1ui) {
+        void ** procp = (void **) &disp->Uniform1ui;
+        snprintf(symboln, sizeof(symboln), "%sUniform1uiEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetSamplerParameteriv) {
-        void **procp = (void **) &disp->GetSamplerParameteriv;
 
-        snprintf(symboln, sizeof(symboln), "%sGetSamplerParameteriv",
-                 symbol_prefix);
+    if(!disp->Uniform1ui) {
+        void ** procp = (void **) &disp->Uniform1ui;
+        snprintf(symboln, sizeof(symboln), "%sUniform1ui", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->IsSampler) {
-        void **procp = (void **) &disp->IsSampler;
 
-        snprintf(symboln, sizeof(symboln), "%sIsSampler", symbol_prefix);
+    if(!disp->Uniform1uiv) {
+        void ** procp = (void **) &disp->Uniform1uiv;
+        snprintf(symboln, sizeof(symboln), "%sUniform1uivEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->SamplerParameterIiv) {
-        void **procp = (void **) &disp->SamplerParameterIiv;
 
-        snprintf(symboln, sizeof(symboln), "%sSamplerParameterIiv",
-                 symbol_prefix);
+    if(!disp->Uniform1uiv) {
+        void ** procp = (void **) &disp->Uniform1uiv;
+        snprintf(symboln, sizeof(symboln), "%sUniform1uiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->SamplerParameterIuiv) {
-        void **procp = (void **) &disp->SamplerParameterIuiv;
 
-        snprintf(symboln, sizeof(symboln), "%sSamplerParameterIuiv",
-                 symbol_prefix);
+    if(!disp->Uniform2ui) {
+        void ** procp = (void **) &disp->Uniform2ui;
+        snprintf(symboln, sizeof(symboln), "%sUniform2uiEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->SamplerParameterf) {
-        void **procp = (void **) &disp->SamplerParameterf;
 
-        snprintf(symboln, sizeof(symboln), "%sSamplerParameterf",
-                 symbol_prefix);
+    if(!disp->Uniform2ui) {
+        void ** procp = (void **) &disp->Uniform2ui;
+        snprintf(symboln, sizeof(symboln), "%sUniform2ui", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->SamplerParameterfv) {
-        void **procp = (void **) &disp->SamplerParameterfv;
 
-        snprintf(symboln, sizeof(symboln), "%sSamplerParameterfv",
-                 symbol_prefix);
+    if(!disp->Uniform2uiv) {
+        void ** procp = (void **) &disp->Uniform2uiv;
+        snprintf(symboln, sizeof(symboln), "%sUniform2uivEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->SamplerParameteri) {
-        void **procp = (void **) &disp->SamplerParameteri;
 
-        snprintf(symboln, sizeof(symboln), "%sSamplerParameteri",
-                 symbol_prefix);
+    if(!disp->Uniform2uiv) {
+        void ** procp = (void **) &disp->Uniform2uiv;
+        snprintf(symboln, sizeof(symboln), "%sUniform2uiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->SamplerParameteriv) {
-        void **procp = (void **) &disp->SamplerParameteriv;
 
-        snprintf(symboln, sizeof(symboln), "%sSamplerParameteriv",
-                 symbol_prefix);
+    if(!disp->Uniform3ui) {
+        void ** procp = (void **) &disp->Uniform3ui;
+        snprintf(symboln, sizeof(symboln), "%sUniform3uiEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ColorP3ui) {
-        void **procp = (void **) &disp->ColorP3ui;
 
-        snprintf(symboln, sizeof(symboln), "%sColorP3ui", symbol_prefix);
+    if(!disp->Uniform3ui) {
+        void ** procp = (void **) &disp->Uniform3ui;
+        snprintf(symboln, sizeof(symboln), "%sUniform3ui", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ColorP3uiv) {
-        void **procp = (void **) &disp->ColorP3uiv;
 
-        snprintf(symboln, sizeof(symboln), "%sColorP3uiv", symbol_prefix);
+    if(!disp->Uniform3uiv) {
+        void ** procp = (void **) &disp->Uniform3uiv;
+        snprintf(symboln, sizeof(symboln), "%sUniform3uivEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ColorP4ui) {
-        void **procp = (void **) &disp->ColorP4ui;
 
-        snprintf(symboln, sizeof(symboln), "%sColorP4ui", symbol_prefix);
+    if(!disp->Uniform3uiv) {
+        void ** procp = (void **) &disp->Uniform3uiv;
+        snprintf(symboln, sizeof(symboln), "%sUniform3uiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ColorP4uiv) {
-        void **procp = (void **) &disp->ColorP4uiv;
 
-        snprintf(symboln, sizeof(symboln), "%sColorP4uiv", symbol_prefix);
+    if(!disp->Uniform4ui) {
+        void ** procp = (void **) &disp->Uniform4ui;
+        snprintf(symboln, sizeof(symboln), "%sUniform4uiEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoordP1ui) {
-        void **procp = (void **) &disp->MultiTexCoordP1ui;
 
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoordP1ui",
-                 symbol_prefix);
+    if(!disp->Uniform4ui) {
+        void ** procp = (void **) &disp->Uniform4ui;
+        snprintf(symboln, sizeof(symboln), "%sUniform4ui", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoordP1uiv) {
-        void **procp = (void **) &disp->MultiTexCoordP1uiv;
 
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoordP1uiv",
-                 symbol_prefix);
+    if(!disp->Uniform4uiv) {
+        void ** procp = (void **) &disp->Uniform4uiv;
+        snprintf(symboln, sizeof(symboln), "%sUniform4uivEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoordP2ui) {
-        void **procp = (void **) &disp->MultiTexCoordP2ui;
 
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoordP2ui",
-                 symbol_prefix);
+    if(!disp->Uniform4uiv) {
+        void ** procp = (void **) &disp->Uniform4uiv;
+        snprintf(symboln, sizeof(symboln), "%sUniform4uiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoordP2uiv) {
-        void **procp = (void **) &disp->MultiTexCoordP2uiv;
 
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoordP2uiv",
-                 symbol_prefix);
+    if(!disp->VertexAttribI1iv) {
+        void ** procp = (void **) &disp->VertexAttribI1iv;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribI1ivEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoordP3ui) {
-        void **procp = (void **) &disp->MultiTexCoordP3ui;
 
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoordP3ui",
-                 symbol_prefix);
+    if(!disp->VertexAttribI1iv) {
+        void ** procp = (void **) &disp->VertexAttribI1iv;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribI1iv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoordP3uiv) {
-        void **procp = (void **) &disp->MultiTexCoordP3uiv;
 
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoordP3uiv",
-                 symbol_prefix);
+    if(!disp->VertexAttribI1uiv) {
+        void ** procp = (void **) &disp->VertexAttribI1uiv;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribI1uivEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoordP4ui) {
-        void **procp = (void **) &disp->MultiTexCoordP4ui;
 
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoordP4ui",
-                 symbol_prefix);
+    if(!disp->VertexAttribI1uiv) {
+        void ** procp = (void **) &disp->VertexAttribI1uiv;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribI1uiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiTexCoordP4uiv) {
-        void **procp = (void **) &disp->MultiTexCoordP4uiv;
 
-        snprintf(symboln, sizeof(symboln), "%sMultiTexCoordP4uiv",
-                 symbol_prefix);
+    if(!disp->VertexAttribI4bv) {
+        void ** procp = (void **) &disp->VertexAttribI4bv;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribI4bvEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->NormalP3ui) {
-        void **procp = (void **) &disp->NormalP3ui;
 
-        snprintf(symboln, sizeof(symboln), "%sNormalP3ui", symbol_prefix);
+    if(!disp->VertexAttribI4bv) {
+        void ** procp = (void **) &disp->VertexAttribI4bv;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribI4bv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->NormalP3uiv) {
-        void **procp = (void **) &disp->NormalP3uiv;
 
-        snprintf(symboln, sizeof(symboln), "%sNormalP3uiv", symbol_prefix);
+    if(!disp->VertexAttribI4sv) {
+        void ** procp = (void **) &disp->VertexAttribI4sv;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribI4svEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->SecondaryColorP3ui) {
-        void **procp = (void **) &disp->SecondaryColorP3ui;
 
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColorP3ui",
-                 symbol_prefix);
+    if(!disp->VertexAttribI4sv) {
+        void ** procp = (void **) &disp->VertexAttribI4sv;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribI4sv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->SecondaryColorP3uiv) {
-        void **procp = (void **) &disp->SecondaryColorP3uiv;
 
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColorP3uiv",
-                 symbol_prefix);
+    if(!disp->VertexAttribI4ubv) {
+        void ** procp = (void **) &disp->VertexAttribI4ubv;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribI4ubvEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexCoordP1ui) {
-        void **procp = (void **) &disp->TexCoordP1ui;
 
-        snprintf(symboln, sizeof(symboln), "%sTexCoordP1ui", symbol_prefix);
+    if(!disp->VertexAttribI4ubv) {
+        void ** procp = (void **) &disp->VertexAttribI4ubv;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribI4ubv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexCoordP1uiv) {
-        void **procp = (void **) &disp->TexCoordP1uiv;
 
-        snprintf(symboln, sizeof(symboln), "%sTexCoordP1uiv", symbol_prefix);
+    if(!disp->VertexAttribI4usv) {
+        void ** procp = (void **) &disp->VertexAttribI4usv;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribI4usvEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexCoordP2ui) {
-        void **procp = (void **) &disp->TexCoordP2ui;
 
-        snprintf(symboln, sizeof(symboln), "%sTexCoordP2ui", symbol_prefix);
+    if(!disp->VertexAttribI4usv) {
+        void ** procp = (void **) &disp->VertexAttribI4usv;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribI4usv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexCoordP2uiv) {
-        void **procp = (void **) &disp->TexCoordP2uiv;
 
-        snprintf(symboln, sizeof(symboln), "%sTexCoordP2uiv", symbol_prefix);
+    if(!disp->VertexAttribIPointer) {
+        void ** procp = (void **) &disp->VertexAttribIPointer;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribIPointerEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexCoordP3ui) {
-        void **procp = (void **) &disp->TexCoordP3ui;
 
-        snprintf(symboln, sizeof(symboln), "%sTexCoordP3ui", symbol_prefix);
+    if(!disp->VertexAttribIPointer) {
+        void ** procp = (void **) &disp->VertexAttribIPointer;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribIPointer", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexCoordP3uiv) {
-        void **procp = (void **) &disp->TexCoordP3uiv;
 
-        snprintf(symboln, sizeof(symboln), "%sTexCoordP3uiv", symbol_prefix);
+    if(!disp->PrimitiveRestartIndex) {
+        void ** procp = (void **) &disp->PrimitiveRestartIndex;
+        snprintf(symboln, sizeof(symboln), "%sPrimitiveRestartIndex", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexCoordP4ui) {
-        void **procp = (void **) &disp->TexCoordP4ui;
 
-        snprintf(symboln, sizeof(symboln), "%sTexCoordP4ui", symbol_prefix);
+    if(!disp->PrimitiveRestartIndex) {
+        void ** procp = (void **) &disp->PrimitiveRestartIndex;
+        snprintf(symboln, sizeof(symboln), "%sPrimitiveRestartIndexNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexCoordP4uiv) {
-        void **procp = (void **) &disp->TexCoordP4uiv;
 
-        snprintf(symboln, sizeof(symboln), "%sTexCoordP4uiv", symbol_prefix);
+    if(!disp->TexBuffer) {
+        void ** procp = (void **) &disp->TexBuffer;
+        snprintf(symboln, sizeof(symboln), "%sTexBufferARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribP1ui) {
-        void **procp = (void **) &disp->VertexAttribP1ui;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribP1ui", symbol_prefix);
+    if(!disp->TexBuffer) {
+        void ** procp = (void **) &disp->TexBuffer;
+        snprintf(symboln, sizeof(symboln), "%sTexBuffer", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribP1uiv) {
-        void **procp = (void **) &disp->VertexAttribP1uiv;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribP1uiv",
-                 symbol_prefix);
+    if(!disp->FramebufferTexture) {
+        void ** procp = (void **) &disp->FramebufferTexture;
+        snprintf(symboln, sizeof(symboln), "%sFramebufferTextureARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribP2ui) {
-        void **procp = (void **) &disp->VertexAttribP2ui;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribP2ui", symbol_prefix);
+    if(!disp->FramebufferTexture) {
+        void ** procp = (void **) &disp->FramebufferTexture;
+        snprintf(symboln, sizeof(symboln), "%sFramebufferTexture", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribP2uiv) {
-        void **procp = (void **) &disp->VertexAttribP2uiv;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribP2uiv",
-                 symbol_prefix);
+    if(!disp->GetBufferParameteri64v) {
+        void ** procp = (void **) &disp->GetBufferParameteri64v;
+        snprintf(symboln, sizeof(symboln), "%sGetBufferParameteri64v", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribP3ui) {
-        void **procp = (void **) &disp->VertexAttribP3ui;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribP3ui", symbol_prefix);
+    if(!disp->GetInteger64i_v) {
+        void ** procp = (void **) &disp->GetInteger64i_v;
+        snprintf(symboln, sizeof(symboln), "%sGetInteger64i_v", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribP3uiv) {
-        void **procp = (void **) &disp->VertexAttribP3uiv;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribP3uiv",
-                 symbol_prefix);
+    if(!disp->VertexAttribDivisor) {
+        void ** procp = (void **) &disp->VertexAttribDivisor;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribDivisorARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribP4ui) {
-        void **procp = (void **) &disp->VertexAttribP4ui;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribP4ui", symbol_prefix);
+    if(!disp->VertexAttribDivisor) {
+        void ** procp = (void **) &disp->VertexAttribDivisor;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribDivisor", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribP4uiv) {
-        void **procp = (void **) &disp->VertexAttribP4uiv;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribP4uiv",
-                 symbol_prefix);
+    if(!disp->BindProgramARB) {
+        void ** procp = (void **) &disp->BindProgramARB;
+        snprintf(symboln, sizeof(symboln), "%sBindProgramARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexP2ui) {
-        void **procp = (void **) &disp->VertexP2ui;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexP2ui", symbol_prefix);
+    if(!disp->BindProgramARB) {
+        void ** procp = (void **) &disp->BindProgramARB;
+        snprintf(symboln, sizeof(symboln), "%sBindProgramNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexP2uiv) {
-        void **procp = (void **) &disp->VertexP2uiv;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexP2uiv", symbol_prefix);
+    if(!disp->DeleteProgramsARB) {
+        void ** procp = (void **) &disp->DeleteProgramsARB;
+        snprintf(symboln, sizeof(symboln), "%sDeleteProgramsARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexP3ui) {
-        void **procp = (void **) &disp->VertexP3ui;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexP3ui", symbol_prefix);
+    if(!disp->DeleteProgramsARB) {
+        void ** procp = (void **) &disp->DeleteProgramsARB;
+        snprintf(symboln, sizeof(symboln), "%sDeleteProgramsNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexP3uiv) {
-        void **procp = (void **) &disp->VertexP3uiv;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexP3uiv", symbol_prefix);
+    if(!disp->GenProgramsARB) {
+        void ** procp = (void **) &disp->GenProgramsARB;
+        snprintf(symboln, sizeof(symboln), "%sGenProgramsARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexP4ui) {
-        void **procp = (void **) &disp->VertexP4ui;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexP4ui", symbol_prefix);
+    if(!disp->GenProgramsARB) {
+        void ** procp = (void **) &disp->GenProgramsARB;
+        snprintf(symboln, sizeof(symboln), "%sGenProgramsNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexP4uiv) {
-        void **procp = (void **) &disp->VertexP4uiv;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexP4uiv", symbol_prefix);
+    if(!disp->GetProgramEnvParameterdvARB) {
+        void ** procp = (void **) &disp->GetProgramEnvParameterdvARB;
+        snprintf(symboln, sizeof(symboln), "%sGetProgramEnvParameterdvARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BindTransformFeedback) {
-        void **procp = (void **) &disp->BindTransformFeedback;
 
-        snprintf(symboln, sizeof(symboln), "%sBindTransformFeedback",
-                 symbol_prefix);
+    if(!disp->GetProgramEnvParameterfvARB) {
+        void ** procp = (void **) &disp->GetProgramEnvParameterfvARB;
+        snprintf(symboln, sizeof(symboln), "%sGetProgramEnvParameterfvARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DeleteTransformFeedbacks) {
-        void **procp = (void **) &disp->DeleteTransformFeedbacks;
 
-        snprintf(symboln, sizeof(symboln), "%sDeleteTransformFeedbacks",
-                 symbol_prefix);
+    if(!disp->GetProgramLocalParameterdvARB) {
+        void ** procp = (void **) &disp->GetProgramLocalParameterdvARB;
+        snprintf(symboln, sizeof(symboln), "%sGetProgramLocalParameterdvARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DrawTransformFeedback) {
-        void **procp = (void **) &disp->DrawTransformFeedback;
 
-        snprintf(symboln, sizeof(symboln), "%sDrawTransformFeedback",
-                 symbol_prefix);
+    if(!disp->GetProgramLocalParameterfvARB) {
+        void ** procp = (void **) &disp->GetProgramLocalParameterfvARB;
+        snprintf(symboln, sizeof(symboln), "%sGetProgramLocalParameterfvARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GenTransformFeedbacks) {
-        void **procp = (void **) &disp->GenTransformFeedbacks;
 
-        snprintf(symboln, sizeof(symboln), "%sGenTransformFeedbacks",
-                 symbol_prefix);
+    if(!disp->GetProgramStringARB) {
+        void ** procp = (void **) &disp->GetProgramStringARB;
+        snprintf(symboln, sizeof(symboln), "%sGetProgramStringARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->IsTransformFeedback) {
-        void **procp = (void **) &disp->IsTransformFeedback;
 
-        snprintf(symboln, sizeof(symboln), "%sIsTransformFeedback",
-                 symbol_prefix);
+    if(!disp->GetProgramivARB) {
+        void ** procp = (void **) &disp->GetProgramivARB;
+        snprintf(symboln, sizeof(symboln), "%sGetProgramivARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->PauseTransformFeedback) {
-        void **procp = (void **) &disp->PauseTransformFeedback;
 
-        snprintf(symboln, sizeof(symboln), "%sPauseTransformFeedback",
-                 symbol_prefix);
+    if(!disp->IsProgramARB) {
+        void ** procp = (void **) &disp->IsProgramARB;
+        snprintf(symboln, sizeof(symboln), "%sIsProgramARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ResumeTransformFeedback) {
-        void **procp = (void **) &disp->ResumeTransformFeedback;
 
-        snprintf(symboln, sizeof(symboln), "%sResumeTransformFeedback",
-                 symbol_prefix);
+    if(!disp->IsProgramARB) {
+        void ** procp = (void **) &disp->IsProgramARB;
+        snprintf(symboln, sizeof(symboln), "%sIsProgramNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ClearDepthf) {
-        void **procp = (void **) &disp->ClearDepthf;
 
-        snprintf(symboln, sizeof(symboln), "%sClearDepthf", symbol_prefix);
+    if(!disp->ProgramEnvParameter4dARB) {
+        void ** procp = (void **) &disp->ProgramEnvParameter4dARB;
+        snprintf(symboln, sizeof(symboln), "%sProgramEnvParameter4dARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DepthRangef) {
-        void **procp = (void **) &disp->DepthRangef;
 
-        snprintf(symboln, sizeof(symboln), "%sDepthRangef", symbol_prefix);
+    if(!disp->ProgramEnvParameter4dARB) {
+        void ** procp = (void **) &disp->ProgramEnvParameter4dARB;
+        snprintf(symboln, sizeof(symboln), "%sProgramParameter4dNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetShaderPrecisionFormat) {
-        void **procp = (void **) &disp->GetShaderPrecisionFormat;
 
-        snprintf(symboln, sizeof(symboln), "%sGetShaderPrecisionFormat",
-                 symbol_prefix);
+    if(!disp->ProgramEnvParameter4dvARB) {
+        void ** procp = (void **) &disp->ProgramEnvParameter4dvARB;
+        snprintf(symboln, sizeof(symboln), "%sProgramEnvParameter4dvARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ReleaseShaderCompiler) {
-        void **procp = (void **) &disp->ReleaseShaderCompiler;
 
-        snprintf(symboln, sizeof(symboln), "%sReleaseShaderCompiler",
-                 symbol_prefix);
+    if(!disp->ProgramEnvParameter4dvARB) {
+        void ** procp = (void **) &disp->ProgramEnvParameter4dvARB;
+        snprintf(symboln, sizeof(symboln), "%sProgramParameter4dvNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ShaderBinary) {
-        void **procp = (void **) &disp->ShaderBinary;
 
-        snprintf(symboln, sizeof(symboln), "%sShaderBinary", symbol_prefix);
+    if(!disp->ProgramEnvParameter4fARB) {
+        void ** procp = (void **) &disp->ProgramEnvParameter4fARB;
+        snprintf(symboln, sizeof(symboln), "%sProgramEnvParameter4fARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetGraphicsResetStatusARB) {
-        void **procp = (void **) &disp->GetGraphicsResetStatusARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetGraphicsResetStatusARB",
-                 symbol_prefix);
+    if(!disp->ProgramEnvParameter4fARB) {
+        void ** procp = (void **) &disp->ProgramEnvParameter4fARB;
+        snprintf(symboln, sizeof(symboln), "%sProgramParameter4fNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetnColorTableARB) {
-        void **procp = (void **) &disp->GetnColorTableARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetnColorTableARB",
-                 symbol_prefix);
+    if(!disp->ProgramEnvParameter4fvARB) {
+        void ** procp = (void **) &disp->ProgramEnvParameter4fvARB;
+        snprintf(symboln, sizeof(symboln), "%sProgramEnvParameter4fvARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetnCompressedTexImageARB) {
-        void **procp = (void **) &disp->GetnCompressedTexImageARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetnCompressedTexImageARB",
-                 symbol_prefix);
+    if(!disp->ProgramEnvParameter4fvARB) {
+        void ** procp = (void **) &disp->ProgramEnvParameter4fvARB;
+        snprintf(symboln, sizeof(symboln), "%sProgramParameter4fvNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetnConvolutionFilterARB) {
-        void **procp = (void **) &disp->GetnConvolutionFilterARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetnConvolutionFilterARB",
-                 symbol_prefix);
+    if(!disp->ProgramLocalParameter4dARB) {
+        void ** procp = (void **) &disp->ProgramLocalParameter4dARB;
+        snprintf(symboln, sizeof(symboln), "%sProgramLocalParameter4dARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetnHistogramARB) {
-        void **procp = (void **) &disp->GetnHistogramARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetnHistogramARB", symbol_prefix);
+    if(!disp->ProgramLocalParameter4dvARB) {
+        void ** procp = (void **) &disp->ProgramLocalParameter4dvARB;
+        snprintf(symboln, sizeof(symboln), "%sProgramLocalParameter4dvARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetnMapdvARB) {
-        void **procp = (void **) &disp->GetnMapdvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetnMapdvARB", symbol_prefix);
+    if(!disp->ProgramLocalParameter4fARB) {
+        void ** procp = (void **) &disp->ProgramLocalParameter4fARB;
+        snprintf(symboln, sizeof(symboln), "%sProgramLocalParameter4fARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetnMapfvARB) {
-        void **procp = (void **) &disp->GetnMapfvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetnMapfvARB", symbol_prefix);
+    if(!disp->ProgramLocalParameter4fvARB) {
+        void ** procp = (void **) &disp->ProgramLocalParameter4fvARB;
+        snprintf(symboln, sizeof(symboln), "%sProgramLocalParameter4fvARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetnMapivARB) {
-        void **procp = (void **) &disp->GetnMapivARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetnMapivARB", symbol_prefix);
+    if(!disp->ProgramStringARB) {
+        void ** procp = (void **) &disp->ProgramStringARB;
+        snprintf(symboln, sizeof(symboln), "%sProgramStringARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetnMinmaxARB) {
-        void **procp = (void **) &disp->GetnMinmaxARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetnMinmaxARB", symbol_prefix);
+    if(!disp->VertexAttrib1fARB) {
+        void ** procp = (void **) &disp->VertexAttrib1fARB;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib1f", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetnPixelMapfvARB) {
-        void **procp = (void **) &disp->GetnPixelMapfvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetnPixelMapfvARB",
-                 symbol_prefix);
+    if(!disp->VertexAttrib1fARB) {
+        void ** procp = (void **) &disp->VertexAttrib1fARB;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib1fARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetnPixelMapuivARB) {
-        void **procp = (void **) &disp->GetnPixelMapuivARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetnPixelMapuivARB",
-                 symbol_prefix);
+    if(!disp->VertexAttrib1fvARB) {
+        void ** procp = (void **) &disp->VertexAttrib1fvARB;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib1fv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetnPixelMapusvARB) {
-        void **procp = (void **) &disp->GetnPixelMapusvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetnPixelMapusvARB",
-                 symbol_prefix);
+    if(!disp->VertexAttrib1fvARB) {
+        void ** procp = (void **) &disp->VertexAttrib1fvARB;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib1fvARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetnPolygonStippleARB) {
-        void **procp = (void **) &disp->GetnPolygonStippleARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetnPolygonStippleARB",
-                 symbol_prefix);
+    if(!disp->VertexAttrib2fARB) {
+        void ** procp = (void **) &disp->VertexAttrib2fARB;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib2f", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetnSeparableFilterARB) {
-        void **procp = (void **) &disp->GetnSeparableFilterARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetnSeparableFilterARB",
-                 symbol_prefix);
+    if(!disp->VertexAttrib2fARB) {
+        void ** procp = (void **) &disp->VertexAttrib2fARB;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib2fARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetnTexImageARB) {
-        void **procp = (void **) &disp->GetnTexImageARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetnTexImageARB", symbol_prefix);
+    if(!disp->VertexAttrib2fvARB) {
+        void ** procp = (void **) &disp->VertexAttrib2fvARB;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib2fv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetnUniformdvARB) {
-        void **procp = (void **) &disp->GetnUniformdvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetnUniformdvARB", symbol_prefix);
+    if(!disp->VertexAttrib2fvARB) {
+        void ** procp = (void **) &disp->VertexAttrib2fvARB;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib2fvARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetnUniformfvARB) {
-        void **procp = (void **) &disp->GetnUniformfvARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetnUniformfvARB", symbol_prefix);
+    if(!disp->VertexAttrib3fARB) {
+        void ** procp = (void **) &disp->VertexAttrib3fARB;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib3f", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetnUniformivARB) {
-        void **procp = (void **) &disp->GetnUniformivARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetnUniformivARB", symbol_prefix);
+    if(!disp->VertexAttrib3fARB) {
+        void ** procp = (void **) &disp->VertexAttrib3fARB;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib3fARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetnUniformuivARB) {
-        void **procp = (void **) &disp->GetnUniformuivARB;
 
-        snprintf(symboln, sizeof(symboln), "%sGetnUniformuivARB",
-                 symbol_prefix);
+    if(!disp->VertexAttrib3fvARB) {
+        void ** procp = (void **) &disp->VertexAttrib3fvARB;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib3fv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ReadnPixelsARB) {
-        void **procp = (void **) &disp->ReadnPixelsARB;
 
-        snprintf(symboln, sizeof(symboln), "%sReadnPixelsARB", symbol_prefix);
+    if(!disp->VertexAttrib3fvARB) {
+        void ** procp = (void **) &disp->VertexAttrib3fvARB;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib3fvARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexStorage1D) {
-        void **procp = (void **) &disp->TexStorage1D;
 
-        snprintf(symboln, sizeof(symboln), "%sTexStorage1D", symbol_prefix);
+    if(!disp->VertexAttrib4fARB) {
+        void ** procp = (void **) &disp->VertexAttrib4fARB;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4f", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexStorage2D) {
-        void **procp = (void **) &disp->TexStorage2D;
 
-        snprintf(symboln, sizeof(symboln), "%sTexStorage2D", symbol_prefix);
+    if(!disp->VertexAttrib4fARB) {
+        void ** procp = (void **) &disp->VertexAttrib4fARB;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4fARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexStorage3D) {
-        void **procp = (void **) &disp->TexStorage3D;
 
-        snprintf(symboln, sizeof(symboln), "%sTexStorage3D", symbol_prefix);
+    if(!disp->VertexAttrib4fvARB) {
+        void ** procp = (void **) &disp->VertexAttrib4fvARB;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4fv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TextureStorage1DEXT) {
-        void **procp = (void **) &disp->TextureStorage1DEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sTextureStorage1DEXT",
-                 symbol_prefix);
+    if(!disp->VertexAttrib4fvARB) {
+        void ** procp = (void **) &disp->VertexAttrib4fvARB;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4fvARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TextureStorage2DEXT) {
-        void **procp = (void **) &disp->TextureStorage2DEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sTextureStorage2DEXT",
-                 symbol_prefix);
+    if(!disp->AttachObjectARB) {
+        void ** procp = (void **) &disp->AttachObjectARB;
+        snprintf(symboln, sizeof(symboln), "%sAttachObjectARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TextureStorage3DEXT) {
-        void **procp = (void **) &disp->TextureStorage3DEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sTextureStorage3DEXT",
-                 symbol_prefix);
+    if(!disp->CreateProgramObjectARB) {
+        void ** procp = (void **) &disp->CreateProgramObjectARB;
+        snprintf(symboln, sizeof(symboln), "%sCreateProgramObjectARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->PolygonOffsetEXT) {
-        void **procp = (void **) &disp->PolygonOffsetEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sPolygonOffsetEXT", symbol_prefix);
+    if(!disp->CreateShaderObjectARB) {
+        void ** procp = (void **) &disp->CreateShaderObjectARB;
+        snprintf(symboln, sizeof(symboln), "%sCreateShaderObjectARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetPixelTexGenParameterfvSGIS) {
-        void **procp = (void **) &disp->GetPixelTexGenParameterfvSGIS;
 
-        snprintf(symboln, sizeof(symboln), "%sGetPixelTexGenParameterfvSGIS",
-                 symbol_prefix);
+    if(!disp->DeleteObjectARB) {
+        void ** procp = (void **) &disp->DeleteObjectARB;
+        snprintf(symboln, sizeof(symboln), "%sDeleteObjectARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetPixelTexGenParameterivSGIS) {
-        void **procp = (void **) &disp->GetPixelTexGenParameterivSGIS;
 
-        snprintf(symboln, sizeof(symboln), "%sGetPixelTexGenParameterivSGIS",
-                 symbol_prefix);
+    if(!disp->DetachObjectARB) {
+        void ** procp = (void **) &disp->DetachObjectARB;
+        snprintf(symboln, sizeof(symboln), "%sDetachObjectARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->PixelTexGenParameterfSGIS) {
-        void **procp = (void **) &disp->PixelTexGenParameterfSGIS;
 
-        snprintf(symboln, sizeof(symboln), "%sPixelTexGenParameterfSGIS",
-                 symbol_prefix);
+    if(!disp->GetAttachedObjectsARB) {
+        void ** procp = (void **) &disp->GetAttachedObjectsARB;
+        snprintf(symboln, sizeof(symboln), "%sGetAttachedObjectsARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->PixelTexGenParameterfvSGIS) {
-        void **procp = (void **) &disp->PixelTexGenParameterfvSGIS;
 
-        snprintf(symboln, sizeof(symboln), "%sPixelTexGenParameterfvSGIS",
-                 symbol_prefix);
+    if(!disp->GetHandleARB) {
+        void ** procp = (void **) &disp->GetHandleARB;
+        snprintf(symboln, sizeof(symboln), "%sGetHandleARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->PixelTexGenParameteriSGIS) {
-        void **procp = (void **) &disp->PixelTexGenParameteriSGIS;
 
-        snprintf(symboln, sizeof(symboln), "%sPixelTexGenParameteriSGIS",
-                 symbol_prefix);
+    if(!disp->GetInfoLogARB) {
+        void ** procp = (void **) &disp->GetInfoLogARB;
+        snprintf(symboln, sizeof(symboln), "%sGetInfoLogARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->PixelTexGenParameterivSGIS) {
-        void **procp = (void **) &disp->PixelTexGenParameterivSGIS;
 
-        snprintf(symboln, sizeof(symboln), "%sPixelTexGenParameterivSGIS",
-                 symbol_prefix);
+    if(!disp->GetObjectParameterfvARB) {
+        void ** procp = (void **) &disp->GetObjectParameterfvARB;
+        snprintf(symboln, sizeof(symboln), "%sGetObjectParameterfvARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->SampleMaskSGIS) {
-        void **procp = (void **) &disp->SampleMaskSGIS;
 
-        snprintf(symboln, sizeof(symboln), "%sSampleMaskSGIS", symbol_prefix);
+    if(!disp->GetObjectParameterivARB) {
+        void ** procp = (void **) &disp->GetObjectParameterivARB;
+        snprintf(symboln, sizeof(symboln), "%sGetObjectParameterivARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->SampleMaskSGIS) {
-        void **procp = (void **) &disp->SampleMaskSGIS;
 
-        snprintf(symboln, sizeof(symboln), "%sSampleMaskEXT", symbol_prefix);
+    if(!disp->DrawArraysInstancedARB) {
+        void ** procp = (void **) &disp->DrawArraysInstancedARB;
+        snprintf(symboln, sizeof(symboln), "%sDrawArraysInstancedARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->SamplePatternSGIS) {
-        void **procp = (void **) &disp->SamplePatternSGIS;
 
-        snprintf(symboln, sizeof(symboln), "%sSamplePatternSGIS",
-                 symbol_prefix);
+    if(!disp->DrawArraysInstancedARB) {
+        void ** procp = (void **) &disp->DrawArraysInstancedARB;
+        snprintf(symboln, sizeof(symboln), "%sDrawArraysInstancedEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->SamplePatternSGIS) {
-        void **procp = (void **) &disp->SamplePatternSGIS;
 
-        snprintf(symboln, sizeof(symboln), "%sSamplePatternEXT", symbol_prefix);
+    if(!disp->DrawArraysInstancedARB) {
+        void ** procp = (void **) &disp->DrawArraysInstancedARB;
+        snprintf(symboln, sizeof(symboln), "%sDrawArraysInstanced", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ColorPointerEXT) {
-        void **procp = (void **) &disp->ColorPointerEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sColorPointerEXT", symbol_prefix);
+    if(!disp->DrawElementsInstancedARB) {
+        void ** procp = (void **) &disp->DrawElementsInstancedARB;
+        snprintf(symboln, sizeof(symboln), "%sDrawElementsInstancedARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->EdgeFlagPointerEXT) {
-        void **procp = (void **) &disp->EdgeFlagPointerEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sEdgeFlagPointerEXT",
-                 symbol_prefix);
+    if(!disp->DrawElementsInstancedARB) {
+        void ** procp = (void **) &disp->DrawElementsInstancedARB;
+        snprintf(symboln, sizeof(symboln), "%sDrawElementsInstancedEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->IndexPointerEXT) {
-        void **procp = (void **) &disp->IndexPointerEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sIndexPointerEXT", symbol_prefix);
+    if(!disp->DrawElementsInstancedARB) {
+        void ** procp = (void **) &disp->DrawElementsInstancedARB;
+        snprintf(symboln, sizeof(symboln), "%sDrawElementsInstanced", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->NormalPointerEXT) {
-        void **procp = (void **) &disp->NormalPointerEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sNormalPointerEXT", symbol_prefix);
+    if(!disp->BindFramebuffer) {
+        void ** procp = (void **) &disp->BindFramebuffer;
+        snprintf(symboln, sizeof(symboln), "%sBindFramebuffer", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexCoordPointerEXT) {
-        void **procp = (void **) &disp->TexCoordPointerEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sTexCoordPointerEXT",
-                 symbol_prefix);
+    if(!disp->BindFramebuffer) {
+        void ** procp = (void **) &disp->BindFramebuffer;
+        snprintf(symboln, sizeof(symboln), "%sBindFramebufferEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexPointerEXT) {
-        void **procp = (void **) &disp->VertexPointerEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexPointerEXT", symbol_prefix);
+    if(!disp->BindFramebuffer) {
+        void ** procp = (void **) &disp->BindFramebuffer;
+        snprintf(symboln, sizeof(symboln), "%sBindFramebufferOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->PointParameterfEXT) {
-        void **procp = (void **) &disp->PointParameterfEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sPointParameterf", symbol_prefix);
+    if(!disp->BindRenderbuffer) {
+        void ** procp = (void **) &disp->BindRenderbuffer;
+        snprintf(symboln, sizeof(symboln), "%sBindRenderbuffer", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->PointParameterfEXT) {
-        void **procp = (void **) &disp->PointParameterfEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sPointParameterfARB",
-                 symbol_prefix);
+    if(!disp->BindRenderbuffer) {
+        void ** procp = (void **) &disp->BindRenderbuffer;
+        snprintf(symboln, sizeof(symboln), "%sBindRenderbufferEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->PointParameterfEXT) {
-        void **procp = (void **) &disp->PointParameterfEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sPointParameterfEXT",
-                 symbol_prefix);
+    if(!disp->BindRenderbuffer) {
+        void ** procp = (void **) &disp->BindRenderbuffer;
+        snprintf(symboln, sizeof(symboln), "%sBindRenderbufferOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->PointParameterfEXT) {
-        void **procp = (void **) &disp->PointParameterfEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sPointParameterfSGIS",
-                 symbol_prefix);
+    if(!disp->BlitFramebuffer) {
+        void ** procp = (void **) &disp->BlitFramebuffer;
+        snprintf(symboln, sizeof(symboln), "%sBlitFramebuffer", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->PointParameterfvEXT) {
-        void **procp = (void **) &disp->PointParameterfvEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sPointParameterfv", symbol_prefix);
+    if(!disp->BlitFramebuffer) {
+        void ** procp = (void **) &disp->BlitFramebuffer;
+        snprintf(symboln, sizeof(symboln), "%sBlitFramebufferEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->PointParameterfvEXT) {
-        void **procp = (void **) &disp->PointParameterfvEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sPointParameterfvARB",
-                 symbol_prefix);
+    if(!disp->CheckFramebufferStatus) {
+        void ** procp = (void **) &disp->CheckFramebufferStatus;
+        snprintf(symboln, sizeof(symboln), "%sCheckFramebufferStatus", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->PointParameterfvEXT) {
-        void **procp = (void **) &disp->PointParameterfvEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sPointParameterfvEXT",
-                 symbol_prefix);
+    if(!disp->CheckFramebufferStatus) {
+        void ** procp = (void **) &disp->CheckFramebufferStatus;
+        snprintf(symboln, sizeof(symboln), "%sCheckFramebufferStatusEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->PointParameterfvEXT) {
-        void **procp = (void **) &disp->PointParameterfvEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sPointParameterfvSGIS",
-                 symbol_prefix);
+    if(!disp->CheckFramebufferStatus) {
+        void ** procp = (void **) &disp->CheckFramebufferStatus;
+        snprintf(symboln, sizeof(symboln), "%sCheckFramebufferStatusOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->LockArraysEXT) {
-        void **procp = (void **) &disp->LockArraysEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sLockArraysEXT", symbol_prefix);
+    if(!disp->DeleteFramebuffers) {
+        void ** procp = (void **) &disp->DeleteFramebuffers;
+        snprintf(symboln, sizeof(symboln), "%sDeleteFramebuffers", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->UnlockArraysEXT) {
-        void **procp = (void **) &disp->UnlockArraysEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sUnlockArraysEXT", symbol_prefix);
+    if(!disp->DeleteFramebuffers) {
+        void ** procp = (void **) &disp->DeleteFramebuffers;
+        snprintf(symboln, sizeof(symboln), "%sDeleteFramebuffersEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->SecondaryColor3bEXT) {
-        void **procp = (void **) &disp->SecondaryColor3bEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3b", symbol_prefix);
+    if(!disp->DeleteFramebuffers) {
+        void ** procp = (void **) &disp->DeleteFramebuffers;
+        snprintf(symboln, sizeof(symboln), "%sDeleteFramebuffersOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->SecondaryColor3bEXT) {
-        void **procp = (void **) &disp->SecondaryColor3bEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3bEXT",
-                 symbol_prefix);
+    if(!disp->DeleteRenderbuffers) {
+        void ** procp = (void **) &disp->DeleteRenderbuffers;
+        snprintf(symboln, sizeof(symboln), "%sDeleteRenderbuffers", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->SecondaryColor3bvEXT) {
-        void **procp = (void **) &disp->SecondaryColor3bvEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3bv",
-                 symbol_prefix);
+    if(!disp->DeleteRenderbuffers) {
+        void ** procp = (void **) &disp->DeleteRenderbuffers;
+        snprintf(symboln, sizeof(symboln), "%sDeleteRenderbuffersEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->SecondaryColor3bvEXT) {
-        void **procp = (void **) &disp->SecondaryColor3bvEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3bvEXT",
-                 symbol_prefix);
+    if(!disp->DeleteRenderbuffers) {
+        void ** procp = (void **) &disp->DeleteRenderbuffers;
+        snprintf(symboln, sizeof(symboln), "%sDeleteRenderbuffersOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->SecondaryColor3dEXT) {
-        void **procp = (void **) &disp->SecondaryColor3dEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3d", symbol_prefix);
+    if(!disp->FramebufferRenderbuffer) {
+        void ** procp = (void **) &disp->FramebufferRenderbuffer;
+        snprintf(symboln, sizeof(symboln), "%sFramebufferRenderbuffer", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->SecondaryColor3dEXT) {
-        void **procp = (void **) &disp->SecondaryColor3dEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3dEXT",
-                 symbol_prefix);
+    if(!disp->FramebufferRenderbuffer) {
+        void ** procp = (void **) &disp->FramebufferRenderbuffer;
+        snprintf(symboln, sizeof(symboln), "%sFramebufferRenderbufferEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->SecondaryColor3dvEXT) {
-        void **procp = (void **) &disp->SecondaryColor3dvEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3dv",
-                 symbol_prefix);
+    if(!disp->FramebufferRenderbuffer) {
+        void ** procp = (void **) &disp->FramebufferRenderbuffer;
+        snprintf(symboln, sizeof(symboln), "%sFramebufferRenderbufferOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->SecondaryColor3dvEXT) {
-        void **procp = (void **) &disp->SecondaryColor3dvEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3dvEXT",
-                 symbol_prefix);
+    if(!disp->FramebufferTexture1D) {
+        void ** procp = (void **) &disp->FramebufferTexture1D;
+        snprintf(symboln, sizeof(symboln), "%sFramebufferTexture1D", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->SecondaryColor3fEXT) {
-        void **procp = (void **) &disp->SecondaryColor3fEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3f", symbol_prefix);
+    if(!disp->FramebufferTexture1D) {
+        void ** procp = (void **) &disp->FramebufferTexture1D;
+        snprintf(symboln, sizeof(symboln), "%sFramebufferTexture1DEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->SecondaryColor3fEXT) {
-        void **procp = (void **) &disp->SecondaryColor3fEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3fEXT",
-                 symbol_prefix);
+    if(!disp->FramebufferTexture2D) {
+        void ** procp = (void **) &disp->FramebufferTexture2D;
+        snprintf(symboln, sizeof(symboln), "%sFramebufferTexture2D", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->SecondaryColor3fvEXT) {
-        void **procp = (void **) &disp->SecondaryColor3fvEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3fv",
-                 symbol_prefix);
+    if(!disp->FramebufferTexture2D) {
+        void ** procp = (void **) &disp->FramebufferTexture2D;
+        snprintf(symboln, sizeof(symboln), "%sFramebufferTexture2DEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->SecondaryColor3fvEXT) {
-        void **procp = (void **) &disp->SecondaryColor3fvEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3fvEXT",
-                 symbol_prefix);
+    if(!disp->FramebufferTexture2D) {
+        void ** procp = (void **) &disp->FramebufferTexture2D;
+        snprintf(symboln, sizeof(symboln), "%sFramebufferTexture2DOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->SecondaryColor3iEXT) {
-        void **procp = (void **) &disp->SecondaryColor3iEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3i", symbol_prefix);
+    if(!disp->FramebufferTexture3D) {
+        void ** procp = (void **) &disp->FramebufferTexture3D;
+        snprintf(symboln, sizeof(symboln), "%sFramebufferTexture3D", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->SecondaryColor3iEXT) {
-        void **procp = (void **) &disp->SecondaryColor3iEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3iEXT",
-                 symbol_prefix);
+    if(!disp->FramebufferTexture3D) {
+        void ** procp = (void **) &disp->FramebufferTexture3D;
+        snprintf(symboln, sizeof(symboln), "%sFramebufferTexture3DEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->SecondaryColor3ivEXT) {
-        void **procp = (void **) &disp->SecondaryColor3ivEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3iv",
-                 symbol_prefix);
+    if(!disp->FramebufferTexture3D) {
+        void ** procp = (void **) &disp->FramebufferTexture3D;
+        snprintf(symboln, sizeof(symboln), "%sFramebufferTexture3DOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->SecondaryColor3ivEXT) {
-        void **procp = (void **) &disp->SecondaryColor3ivEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3ivEXT",
-                 symbol_prefix);
+    if(!disp->FramebufferTextureLayer) {
+        void ** procp = (void **) &disp->FramebufferTextureLayer;
+        snprintf(symboln, sizeof(symboln), "%sFramebufferTextureLayer", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->SecondaryColor3sEXT) {
-        void **procp = (void **) &disp->SecondaryColor3sEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3s", symbol_prefix);
+    if(!disp->FramebufferTextureLayer) {
+        void ** procp = (void **) &disp->FramebufferTextureLayer;
+        snprintf(symboln, sizeof(symboln), "%sFramebufferTextureLayerARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->SecondaryColor3sEXT) {
-        void **procp = (void **) &disp->SecondaryColor3sEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3sEXT",
-                 symbol_prefix);
+    if(!disp->FramebufferTextureLayer) {
+        void ** procp = (void **) &disp->FramebufferTextureLayer;
+        snprintf(symboln, sizeof(symboln), "%sFramebufferTextureLayerEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->SecondaryColor3svEXT) {
-        void **procp = (void **) &disp->SecondaryColor3svEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3sv",
-                 symbol_prefix);
+    if(!disp->GenFramebuffers) {
+        void ** procp = (void **) &disp->GenFramebuffers;
+        snprintf(symboln, sizeof(symboln), "%sGenFramebuffers", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->SecondaryColor3svEXT) {
-        void **procp = (void **) &disp->SecondaryColor3svEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3svEXT",
-                 symbol_prefix);
+    if(!disp->GenFramebuffers) {
+        void ** procp = (void **) &disp->GenFramebuffers;
+        snprintf(symboln, sizeof(symboln), "%sGenFramebuffersEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->SecondaryColor3ubEXT) {
-        void **procp = (void **) &disp->SecondaryColor3ubEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3ub",
-                 symbol_prefix);
+    if(!disp->GenFramebuffers) {
+        void ** procp = (void **) &disp->GenFramebuffers;
+        snprintf(symboln, sizeof(symboln), "%sGenFramebuffersOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->SecondaryColor3ubEXT) {
-        void **procp = (void **) &disp->SecondaryColor3ubEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3ubEXT",
-                 symbol_prefix);
+    if(!disp->GenRenderbuffers) {
+        void ** procp = (void **) &disp->GenRenderbuffers;
+        snprintf(symboln, sizeof(symboln), "%sGenRenderbuffers", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->SecondaryColor3ubvEXT) {
-        void **procp = (void **) &disp->SecondaryColor3ubvEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3ubv",
-                 symbol_prefix);
+    if(!disp->GenRenderbuffers) {
+        void ** procp = (void **) &disp->GenRenderbuffers;
+        snprintf(symboln, sizeof(symboln), "%sGenRenderbuffersEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->SecondaryColor3ubvEXT) {
-        void **procp = (void **) &disp->SecondaryColor3ubvEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3ubvEXT",
-                 symbol_prefix);
+    if(!disp->GenRenderbuffers) {
+        void ** procp = (void **) &disp->GenRenderbuffers;
+        snprintf(symboln, sizeof(symboln), "%sGenRenderbuffersOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->SecondaryColor3uiEXT) {
-        void **procp = (void **) &disp->SecondaryColor3uiEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3ui",
-                 symbol_prefix);
+    if(!disp->GenerateMipmap) {
+        void ** procp = (void **) &disp->GenerateMipmap;
+        snprintf(symboln, sizeof(symboln), "%sGenerateMipmap", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->SecondaryColor3uiEXT) {
-        void **procp = (void **) &disp->SecondaryColor3uiEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3uiEXT",
-                 symbol_prefix);
+    if(!disp->GenerateMipmap) {
+        void ** procp = (void **) &disp->GenerateMipmap;
+        snprintf(symboln, sizeof(symboln), "%sGenerateMipmapEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->SecondaryColor3uivEXT) {
-        void **procp = (void **) &disp->SecondaryColor3uivEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3uiv",
-                 symbol_prefix);
+    if(!disp->GenerateMipmap) {
+        void ** procp = (void **) &disp->GenerateMipmap;
+        snprintf(symboln, sizeof(symboln), "%sGenerateMipmapOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->SecondaryColor3uivEXT) {
-        void **procp = (void **) &disp->SecondaryColor3uivEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3uivEXT",
-                 symbol_prefix);
+    if(!disp->GetFramebufferAttachmentParameteriv) {
+        void ** procp = (void **) &disp->GetFramebufferAttachmentParameteriv;
+        snprintf(symboln, sizeof(symboln), "%sGetFramebufferAttachmentParameteriv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->SecondaryColor3usEXT) {
-        void **procp = (void **) &disp->SecondaryColor3usEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3us",
-                 symbol_prefix);
+    if(!disp->GetFramebufferAttachmentParameteriv) {
+        void ** procp = (void **) &disp->GetFramebufferAttachmentParameteriv;
+        snprintf(symboln, sizeof(symboln), "%sGetFramebufferAttachmentParameterivEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->SecondaryColor3usEXT) {
-        void **procp = (void **) &disp->SecondaryColor3usEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3usEXT",
-                 symbol_prefix);
+    if(!disp->GetFramebufferAttachmentParameteriv) {
+        void ** procp = (void **) &disp->GetFramebufferAttachmentParameteriv;
+        snprintf(symboln, sizeof(symboln), "%sGetFramebufferAttachmentParameterivOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->SecondaryColor3usvEXT) {
-        void **procp = (void **) &disp->SecondaryColor3usvEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3usv",
-                 symbol_prefix);
+    if(!disp->GetRenderbufferParameteriv) {
+        void ** procp = (void **) &disp->GetRenderbufferParameteriv;
+        snprintf(symboln, sizeof(symboln), "%sGetRenderbufferParameteriv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->SecondaryColor3usvEXT) {
-        void **procp = (void **) &disp->SecondaryColor3usvEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3usvEXT",
-                 symbol_prefix);
+    if(!disp->GetRenderbufferParameteriv) {
+        void ** procp = (void **) &disp->GetRenderbufferParameteriv;
+        snprintf(symboln, sizeof(symboln), "%sGetRenderbufferParameterivEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->SecondaryColorPointerEXT) {
-        void **procp = (void **) &disp->SecondaryColorPointerEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColorPointer",
-                 symbol_prefix);
+    if(!disp->GetRenderbufferParameteriv) {
+        void ** procp = (void **) &disp->GetRenderbufferParameteriv;
+        snprintf(symboln, sizeof(symboln), "%sGetRenderbufferParameterivOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->SecondaryColorPointerEXT) {
-        void **procp = (void **) &disp->SecondaryColorPointerEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sSecondaryColorPointerEXT",
-                 symbol_prefix);
+    if(!disp->IsFramebuffer) {
+        void ** procp = (void **) &disp->IsFramebuffer;
+        snprintf(symboln, sizeof(symboln), "%sIsFramebuffer", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiDrawArraysEXT) {
-        void **procp = (void **) &disp->MultiDrawArraysEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sMultiDrawArrays", symbol_prefix);
+    if(!disp->IsFramebuffer) {
+        void ** procp = (void **) &disp->IsFramebuffer;
+        snprintf(symboln, sizeof(symboln), "%sIsFramebufferEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiDrawArraysEXT) {
-        void **procp = (void **) &disp->MultiDrawArraysEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sMultiDrawArraysEXT",
-                 symbol_prefix);
+    if(!disp->IsFramebuffer) {
+        void ** procp = (void **) &disp->IsFramebuffer;
+        snprintf(symboln, sizeof(symboln), "%sIsFramebufferOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiDrawElementsEXT) {
-        void **procp = (void **) &disp->MultiDrawElementsEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sMultiDrawElements",
-                 symbol_prefix);
+    if(!disp->IsRenderbuffer) {
+        void ** procp = (void **) &disp->IsRenderbuffer;
+        snprintf(symboln, sizeof(symboln), "%sIsRenderbuffer", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiDrawElementsEXT) {
-        void **procp = (void **) &disp->MultiDrawElementsEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sMultiDrawElementsEXT",
-                 symbol_prefix);
+    if(!disp->IsRenderbuffer) {
+        void ** procp = (void **) &disp->IsRenderbuffer;
+        snprintf(symboln, sizeof(symboln), "%sIsRenderbufferEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->FogCoordPointerEXT) {
-        void **procp = (void **) &disp->FogCoordPointerEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sFogCoordPointer", symbol_prefix);
+    if(!disp->IsRenderbuffer) {
+        void ** procp = (void **) &disp->IsRenderbuffer;
+        snprintf(symboln, sizeof(symboln), "%sIsRenderbufferOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->FogCoordPointerEXT) {
-        void **procp = (void **) &disp->FogCoordPointerEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sFogCoordPointerEXT",
-                 symbol_prefix);
+    if(!disp->RenderbufferStorage) {
+        void ** procp = (void **) &disp->RenderbufferStorage;
+        snprintf(symboln, sizeof(symboln), "%sRenderbufferStorage", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->FogCoorddEXT) {
-        void **procp = (void **) &disp->FogCoorddEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sFogCoordd", symbol_prefix);
+    if(!disp->RenderbufferStorage) {
+        void ** procp = (void **) &disp->RenderbufferStorage;
+        snprintf(symboln, sizeof(symboln), "%sRenderbufferStorageEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->FogCoorddEXT) {
-        void **procp = (void **) &disp->FogCoorddEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sFogCoorddEXT", symbol_prefix);
+    if(!disp->RenderbufferStorage) {
+        void ** procp = (void **) &disp->RenderbufferStorage;
+        snprintf(symboln, sizeof(symboln), "%sRenderbufferStorageOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->FogCoorddvEXT) {
-        void **procp = (void **) &disp->FogCoorddvEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sFogCoorddv", symbol_prefix);
+    if(!disp->RenderbufferStorageMultisample) {
+        void ** procp = (void **) &disp->RenderbufferStorageMultisample;
+        snprintf(symboln, sizeof(symboln), "%sRenderbufferStorageMultisample", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->FogCoorddvEXT) {
-        void **procp = (void **) &disp->FogCoorddvEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sFogCoorddvEXT", symbol_prefix);
+    if(!disp->RenderbufferStorageMultisample) {
+        void ** procp = (void **) &disp->RenderbufferStorageMultisample;
+        snprintf(symboln, sizeof(symboln), "%sRenderbufferStorageMultisampleEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->FogCoordfEXT) {
-        void **procp = (void **) &disp->FogCoordfEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sFogCoordf", symbol_prefix);
+    if(!disp->FramebufferTextureFaceARB) {
+        void ** procp = (void **) &disp->FramebufferTextureFaceARB;
+        snprintf(symboln, sizeof(symboln), "%sFramebufferTextureFaceARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->FogCoordfEXT) {
-        void **procp = (void **) &disp->FogCoordfEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sFogCoordfEXT", symbol_prefix);
+    if(!disp->FlushMappedBufferRange) {
+        void ** procp = (void **) &disp->FlushMappedBufferRange;
+        snprintf(symboln, sizeof(symboln), "%sFlushMappedBufferRange", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->FogCoordfvEXT) {
-        void **procp = (void **) &disp->FogCoordfvEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sFogCoordfv", symbol_prefix);
+    if(!disp->FlushMappedBufferRange) {
+        void ** procp = (void **) &disp->FlushMappedBufferRange;
+        snprintf(symboln, sizeof(symboln), "%sFlushMappedBufferRangeEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->FogCoordfvEXT) {
-        void **procp = (void **) &disp->FogCoordfvEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sFogCoordfvEXT", symbol_prefix);
+    if(!disp->MapBufferRange) {
+        void ** procp = (void **) &disp->MapBufferRange;
+        snprintf(symboln, sizeof(symboln), "%sMapBufferRange", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->PixelTexGenSGIX) {
-        void **procp = (void **) &disp->PixelTexGenSGIX;
 
-        snprintf(symboln, sizeof(symboln), "%sPixelTexGenSGIX", symbol_prefix);
+    if(!disp->MapBufferRange) {
+        void ** procp = (void **) &disp->MapBufferRange;
+        snprintf(symboln, sizeof(symboln), "%sMapBufferRangeEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BlendFuncSeparateEXT) {
-        void **procp = (void **) &disp->BlendFuncSeparateEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sBlendFuncSeparate",
-                 symbol_prefix);
+    if(!disp->BindVertexArray) {
+        void ** procp = (void **) &disp->BindVertexArray;
+        snprintf(symboln, sizeof(symboln), "%sBindVertexArray", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BlendFuncSeparateEXT) {
-        void **procp = (void **) &disp->BlendFuncSeparateEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sBlendFuncSeparateEXT",
-                 symbol_prefix);
+    if(!disp->BindVertexArray) {
+        void ** procp = (void **) &disp->BindVertexArray;
+        snprintf(symboln, sizeof(symboln), "%sBindVertexArrayOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BlendFuncSeparateEXT) {
-        void **procp = (void **) &disp->BlendFuncSeparateEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sBlendFuncSeparateINGR",
-                 symbol_prefix);
+    if(!disp->DeleteVertexArrays) {
+        void ** procp = (void **) &disp->DeleteVertexArrays;
+        snprintf(symboln, sizeof(symboln), "%sDeleteVertexArrays", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->FlushVertexArrayRangeNV) {
-        void **procp = (void **) &disp->FlushVertexArrayRangeNV;
 
-        snprintf(symboln, sizeof(symboln), "%sFlushVertexArrayRangeNV",
-                 symbol_prefix);
+    if(!disp->DeleteVertexArrays) {
+        void ** procp = (void **) &disp->DeleteVertexArrays;
+        snprintf(symboln, sizeof(symboln), "%sDeleteVertexArraysAPPLE", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexArrayRangeNV) {
-        void **procp = (void **) &disp->VertexArrayRangeNV;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexArrayRangeNV",
-                 symbol_prefix);
+    if(!disp->DeleteVertexArrays) {
+        void ** procp = (void **) &disp->DeleteVertexArrays;
+        snprintf(symboln, sizeof(symboln), "%sDeleteVertexArraysOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->CombinerInputNV) {
-        void **procp = (void **) &disp->CombinerInputNV;
 
-        snprintf(symboln, sizeof(symboln), "%sCombinerInputNV", symbol_prefix);
+    if(!disp->GenVertexArrays) {
+        void ** procp = (void **) &disp->GenVertexArrays;
+        snprintf(symboln, sizeof(symboln), "%sGenVertexArrays", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->CombinerOutputNV) {
-        void **procp = (void **) &disp->CombinerOutputNV;
 
-        snprintf(symboln, sizeof(symboln), "%sCombinerOutputNV", symbol_prefix);
+    if(!disp->GenVertexArrays) {
+        void ** procp = (void **) &disp->GenVertexArrays;
+        snprintf(symboln, sizeof(symboln), "%sGenVertexArraysOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->CombinerParameterfNV) {
-        void **procp = (void **) &disp->CombinerParameterfNV;
 
-        snprintf(symboln, sizeof(symboln), "%sCombinerParameterfNV",
-                 symbol_prefix);
+    if(!disp->IsVertexArray) {
+        void ** procp = (void **) &disp->IsVertexArray;
+        snprintf(symboln, sizeof(symboln), "%sIsVertexArray", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->CombinerParameterfvNV) {
-        void **procp = (void **) &disp->CombinerParameterfvNV;
 
-        snprintf(symboln, sizeof(symboln), "%sCombinerParameterfvNV",
-                 symbol_prefix);
+    if(!disp->IsVertexArray) {
+        void ** procp = (void **) &disp->IsVertexArray;
+        snprintf(symboln, sizeof(symboln), "%sIsVertexArrayAPPLE", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->CombinerParameteriNV) {
-        void **procp = (void **) &disp->CombinerParameteriNV;
 
-        snprintf(symboln, sizeof(symboln), "%sCombinerParameteriNV",
-                 symbol_prefix);
+    if(!disp->IsVertexArray) {
+        void ** procp = (void **) &disp->IsVertexArray;
+        snprintf(symboln, sizeof(symboln), "%sIsVertexArrayOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->CombinerParameterivNV) {
-        void **procp = (void **) &disp->CombinerParameterivNV;
 
-        snprintf(symboln, sizeof(symboln), "%sCombinerParameterivNV",
-                 symbol_prefix);
+    if(!disp->GetActiveUniformBlockName) {
+        void ** procp = (void **) &disp->GetActiveUniformBlockName;
+        snprintf(symboln, sizeof(symboln), "%sGetActiveUniformBlockName", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->FinalCombinerInputNV) {
-        void **procp = (void **) &disp->FinalCombinerInputNV;
 
-        snprintf(symboln, sizeof(symboln), "%sFinalCombinerInputNV",
-                 symbol_prefix);
+    if(!disp->GetActiveUniformBlockiv) {
+        void ** procp = (void **) &disp->GetActiveUniformBlockiv;
+        snprintf(symboln, sizeof(symboln), "%sGetActiveUniformBlockiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetCombinerInputParameterfvNV) {
-        void **procp = (void **) &disp->GetCombinerInputParameterfvNV;
 
-        snprintf(symboln, sizeof(symboln), "%sGetCombinerInputParameterfvNV",
-                 symbol_prefix);
+    if(!disp->GetActiveUniformName) {
+        void ** procp = (void **) &disp->GetActiveUniformName;
+        snprintf(symboln, sizeof(symboln), "%sGetActiveUniformName", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetCombinerInputParameterivNV) {
-        void **procp = (void **) &disp->GetCombinerInputParameterivNV;
 
-        snprintf(symboln, sizeof(symboln), "%sGetCombinerInputParameterivNV",
-                 symbol_prefix);
+    if(!disp->GetActiveUniformsiv) {
+        void ** procp = (void **) &disp->GetActiveUniformsiv;
+        snprintf(symboln, sizeof(symboln), "%sGetActiveUniformsiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetCombinerOutputParameterfvNV) {
-        void **procp = (void **) &disp->GetCombinerOutputParameterfvNV;
 
-        snprintf(symboln, sizeof(symboln), "%sGetCombinerOutputParameterfvNV",
-                 symbol_prefix);
+    if(!disp->GetUniformBlockIndex) {
+        void ** procp = (void **) &disp->GetUniformBlockIndex;
+        snprintf(symboln, sizeof(symboln), "%sGetUniformBlockIndex", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetCombinerOutputParameterivNV) {
-        void **procp = (void **) &disp->GetCombinerOutputParameterivNV;
 
-        snprintf(symboln, sizeof(symboln), "%sGetCombinerOutputParameterivNV",
-                 symbol_prefix);
+    if(!disp->GetUniformIndices) {
+        void ** procp = (void **) &disp->GetUniformIndices;
+        snprintf(symboln, sizeof(symboln), "%sGetUniformIndices", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetFinalCombinerInputParameterfvNV) {
-        void **procp = (void **) &disp->GetFinalCombinerInputParameterfvNV;
 
-        snprintf(symboln, sizeof(symboln),
-                 "%sGetFinalCombinerInputParameterfvNV", symbol_prefix);
+    if(!disp->UniformBlockBinding) {
+        void ** procp = (void **) &disp->UniformBlockBinding;
+        snprintf(symboln, sizeof(symboln), "%sUniformBlockBinding", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetFinalCombinerInputParameterivNV) {
-        void **procp = (void **) &disp->GetFinalCombinerInputParameterivNV;
 
-        snprintf(symboln, sizeof(symboln),
-                 "%sGetFinalCombinerInputParameterivNV", symbol_prefix);
+    if(!disp->CopyBufferSubData) {
+        void ** procp = (void **) &disp->CopyBufferSubData;
+        snprintf(symboln, sizeof(symboln), "%sCopyBufferSubData", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ResizeBuffersMESA) {
-        void **procp = (void **) &disp->ResizeBuffersMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sResizeBuffersMESA",
-                 symbol_prefix);
+    if(!disp->ClientWaitSync) {
+        void ** procp = (void **) &disp->ClientWaitSync;
+        snprintf(symboln, sizeof(symboln), "%sClientWaitSync", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos2dMESA) {
-        void **procp = (void **) &disp->WindowPos2dMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos2d", symbol_prefix);
+    if(!disp->DeleteSync) {
+        void ** procp = (void **) &disp->DeleteSync;
+        snprintf(symboln, sizeof(symboln), "%sDeleteSync", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos2dMESA) {
-        void **procp = (void **) &disp->WindowPos2dMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos2dARB", symbol_prefix);
+    if(!disp->FenceSync) {
+        void ** procp = (void **) &disp->FenceSync;
+        snprintf(symboln, sizeof(symboln), "%sFenceSync", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos2dMESA) {
-        void **procp = (void **) &disp->WindowPos2dMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos2dMESA", symbol_prefix);
+    if(!disp->GetInteger64v) {
+        void ** procp = (void **) &disp->GetInteger64v;
+        snprintf(symboln, sizeof(symboln), "%sGetInteger64v", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos2dvMESA) {
-        void **procp = (void **) &disp->WindowPos2dvMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos2dv", symbol_prefix);
+    if(!disp->GetSynciv) {
+        void ** procp = (void **) &disp->GetSynciv;
+        snprintf(symboln, sizeof(symboln), "%sGetSynciv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos2dvMESA) {
-        void **procp = (void **) &disp->WindowPos2dvMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos2dvARB", symbol_prefix);
+    if(!disp->IsSync) {
+        void ** procp = (void **) &disp->IsSync;
+        snprintf(symboln, sizeof(symboln), "%sIsSync", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos2dvMESA) {
-        void **procp = (void **) &disp->WindowPos2dvMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos2dvMESA", symbol_prefix);
+    if(!disp->WaitSync) {
+        void ** procp = (void **) &disp->WaitSync;
+        snprintf(symboln, sizeof(symboln), "%sWaitSync", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos2fMESA) {
-        void **procp = (void **) &disp->WindowPos2fMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos2f", symbol_prefix);
+    if(!disp->DrawElementsBaseVertex) {
+        void ** procp = (void **) &disp->DrawElementsBaseVertex;
+        snprintf(symboln, sizeof(symboln), "%sDrawElementsBaseVertex", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos2fMESA) {
-        void **procp = (void **) &disp->WindowPos2fMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos2fARB", symbol_prefix);
+    if(!disp->DrawElementsInstancedBaseVertex) {
+        void ** procp = (void **) &disp->DrawElementsInstancedBaseVertex;
+        snprintf(symboln, sizeof(symboln), "%sDrawElementsInstancedBaseVertex", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos2fMESA) {
-        void **procp = (void **) &disp->WindowPos2fMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos2fMESA", symbol_prefix);
+    if(!disp->DrawRangeElementsBaseVertex) {
+        void ** procp = (void **) &disp->DrawRangeElementsBaseVertex;
+        snprintf(symboln, sizeof(symboln), "%sDrawRangeElementsBaseVertex", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos2fvMESA) {
-        void **procp = (void **) &disp->WindowPos2fvMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos2fv", symbol_prefix);
+    if(!disp->MultiDrawElementsBaseVertex) {
+        void ** procp = (void **) &disp->MultiDrawElementsBaseVertex;
+        snprintf(symboln, sizeof(symboln), "%sMultiDrawElementsBaseVertex", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos2fvMESA) {
-        void **procp = (void **) &disp->WindowPos2fvMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos2fvARB", symbol_prefix);
+    if(!disp->ProvokingVertex) {
+        void ** procp = (void **) &disp->ProvokingVertex;
+        snprintf(symboln, sizeof(symboln), "%sProvokingVertexEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos2fvMESA) {
-        void **procp = (void **) &disp->WindowPos2fvMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos2fvMESA", symbol_prefix);
+    if(!disp->ProvokingVertex) {
+        void ** procp = (void **) &disp->ProvokingVertex;
+        snprintf(symboln, sizeof(symboln), "%sProvokingVertex", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos2iMESA) {
-        void **procp = (void **) &disp->WindowPos2iMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos2i", symbol_prefix);
+    if(!disp->BlendEquationSeparateiARB) {
+        void ** procp = (void **) &disp->BlendEquationSeparateiARB;
+        snprintf(symboln, sizeof(symboln), "%sBlendEquationSeparateiARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos2iMESA) {
-        void **procp = (void **) &disp->WindowPos2iMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos2iARB", symbol_prefix);
+    if(!disp->BlendEquationSeparateiARB) {
+        void ** procp = (void **) &disp->BlendEquationSeparateiARB;
+        snprintf(symboln, sizeof(symboln), "%sBlendEquationSeparateIndexedAMD", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos2iMESA) {
-        void **procp = (void **) &disp->WindowPos2iMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos2iMESA", symbol_prefix);
+    if(!disp->BlendEquationiARB) {
+        void ** procp = (void **) &disp->BlendEquationiARB;
+        snprintf(symboln, sizeof(symboln), "%sBlendEquationiARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos2ivMESA) {
-        void **procp = (void **) &disp->WindowPos2ivMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos2iv", symbol_prefix);
+    if(!disp->BlendEquationiARB) {
+        void ** procp = (void **) &disp->BlendEquationiARB;
+        snprintf(symboln, sizeof(symboln), "%sBlendEquationIndexedAMD", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos2ivMESA) {
-        void **procp = (void **) &disp->WindowPos2ivMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos2ivARB", symbol_prefix);
+    if(!disp->BlendFuncSeparateiARB) {
+        void ** procp = (void **) &disp->BlendFuncSeparateiARB;
+        snprintf(symboln, sizeof(symboln), "%sBlendFuncSeparateiARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos2ivMESA) {
-        void **procp = (void **) &disp->WindowPos2ivMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos2ivMESA", symbol_prefix);
+    if(!disp->BlendFuncSeparateiARB) {
+        void ** procp = (void **) &disp->BlendFuncSeparateiARB;
+        snprintf(symboln, sizeof(symboln), "%sBlendFuncSeparateIndexedAMD", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos2sMESA) {
-        void **procp = (void **) &disp->WindowPos2sMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos2s", symbol_prefix);
+    if(!disp->BlendFunciARB) {
+        void ** procp = (void **) &disp->BlendFunciARB;
+        snprintf(symboln, sizeof(symboln), "%sBlendFunciARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos2sMESA) {
-        void **procp = (void **) &disp->WindowPos2sMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos2sARB", symbol_prefix);
+    if(!disp->BlendFunciARB) {
+        void ** procp = (void **) &disp->BlendFunciARB;
+        snprintf(symboln, sizeof(symboln), "%sBlendFuncIndexedAMD", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos2sMESA) {
-        void **procp = (void **) &disp->WindowPos2sMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos2sMESA", symbol_prefix);
+    if(!disp->BindFragDataLocationIndexed) {
+        void ** procp = (void **) &disp->BindFragDataLocationIndexed;
+        snprintf(symboln, sizeof(symboln), "%sBindFragDataLocationIndexed", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos2svMESA) {
-        void **procp = (void **) &disp->WindowPos2svMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos2sv", symbol_prefix);
+    if(!disp->GetFragDataIndex) {
+        void ** procp = (void **) &disp->GetFragDataIndex;
+        snprintf(symboln, sizeof(symboln), "%sGetFragDataIndex", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos2svMESA) {
-        void **procp = (void **) &disp->WindowPos2svMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos2svARB", symbol_prefix);
+    if(!disp->BindSampler) {
+        void ** procp = (void **) &disp->BindSampler;
+        snprintf(symboln, sizeof(symboln), "%sBindSampler", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos2svMESA) {
-        void **procp = (void **) &disp->WindowPos2svMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos2svMESA", symbol_prefix);
+    if(!disp->DeleteSamplers) {
+        void ** procp = (void **) &disp->DeleteSamplers;
+        snprintf(symboln, sizeof(symboln), "%sDeleteSamplers", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos3dMESA) {
-        void **procp = (void **) &disp->WindowPos3dMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos3d", symbol_prefix);
+    if(!disp->GenSamplers) {
+        void ** procp = (void **) &disp->GenSamplers;
+        snprintf(symboln, sizeof(symboln), "%sGenSamplers", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos3dMESA) {
-        void **procp = (void **) &disp->WindowPos3dMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos3dARB", symbol_prefix);
+    if(!disp->GetSamplerParameterIiv) {
+        void ** procp = (void **) &disp->GetSamplerParameterIiv;
+        snprintf(symboln, sizeof(symboln), "%sGetSamplerParameterIiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos3dMESA) {
-        void **procp = (void **) &disp->WindowPos3dMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos3dMESA", symbol_prefix);
+    if(!disp->GetSamplerParameterIuiv) {
+        void ** procp = (void **) &disp->GetSamplerParameterIuiv;
+        snprintf(symboln, sizeof(symboln), "%sGetSamplerParameterIuiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos3dvMESA) {
-        void **procp = (void **) &disp->WindowPos3dvMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos3dv", symbol_prefix);
+    if(!disp->GetSamplerParameterfv) {
+        void ** procp = (void **) &disp->GetSamplerParameterfv;
+        snprintf(symboln, sizeof(symboln), "%sGetSamplerParameterfv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos3dvMESA) {
-        void **procp = (void **) &disp->WindowPos3dvMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos3dvARB", symbol_prefix);
+    if(!disp->GetSamplerParameteriv) {
+        void ** procp = (void **) &disp->GetSamplerParameteriv;
+        snprintf(symboln, sizeof(symboln), "%sGetSamplerParameteriv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos3dvMESA) {
-        void **procp = (void **) &disp->WindowPos3dvMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos3dvMESA", symbol_prefix);
+    if(!disp->IsSampler) {
+        void ** procp = (void **) &disp->IsSampler;
+        snprintf(symboln, sizeof(symboln), "%sIsSampler", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos3fMESA) {
-        void **procp = (void **) &disp->WindowPos3fMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos3f", symbol_prefix);
+    if(!disp->SamplerParameterIiv) {
+        void ** procp = (void **) &disp->SamplerParameterIiv;
+        snprintf(symboln, sizeof(symboln), "%sSamplerParameterIiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos3fMESA) {
-        void **procp = (void **) &disp->WindowPos3fMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos3fARB", symbol_prefix);
+    if(!disp->SamplerParameterIuiv) {
+        void ** procp = (void **) &disp->SamplerParameterIuiv;
+        snprintf(symboln, sizeof(symboln), "%sSamplerParameterIuiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos3fMESA) {
-        void **procp = (void **) &disp->WindowPos3fMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos3fMESA", symbol_prefix);
+    if(!disp->SamplerParameterf) {
+        void ** procp = (void **) &disp->SamplerParameterf;
+        snprintf(symboln, sizeof(symboln), "%sSamplerParameterf", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos3fvMESA) {
-        void **procp = (void **) &disp->WindowPos3fvMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos3fv", symbol_prefix);
+    if(!disp->SamplerParameterfv) {
+        void ** procp = (void **) &disp->SamplerParameterfv;
+        snprintf(symboln, sizeof(symboln), "%sSamplerParameterfv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos3fvMESA) {
-        void **procp = (void **) &disp->WindowPos3fvMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos3fvARB", symbol_prefix);
+    if(!disp->SamplerParameteri) {
+        void ** procp = (void **) &disp->SamplerParameteri;
+        snprintf(symboln, sizeof(symboln), "%sSamplerParameteri", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos3fvMESA) {
-        void **procp = (void **) &disp->WindowPos3fvMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos3fvMESA", symbol_prefix);
+    if(!disp->SamplerParameteriv) {
+        void ** procp = (void **) &disp->SamplerParameteriv;
+        snprintf(symboln, sizeof(symboln), "%sSamplerParameteriv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos3iMESA) {
-        void **procp = (void **) &disp->WindowPos3iMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos3i", symbol_prefix);
+    if(!disp->GetQueryObjecti64v) {
+        void ** procp = (void **) &disp->GetQueryObjecti64v;
+        snprintf(symboln, sizeof(symboln), "%sGetQueryObjecti64v", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos3iMESA) {
-        void **procp = (void **) &disp->WindowPos3iMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos3iARB", symbol_prefix);
+    if(!disp->GetQueryObjecti64v) {
+        void ** procp = (void **) &disp->GetQueryObjecti64v;
+        snprintf(symboln, sizeof(symboln), "%sGetQueryObjecti64vEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos3iMESA) {
-        void **procp = (void **) &disp->WindowPos3iMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos3iMESA", symbol_prefix);
+    if(!disp->GetQueryObjectui64v) {
+        void ** procp = (void **) &disp->GetQueryObjectui64v;
+        snprintf(symboln, sizeof(symboln), "%sGetQueryObjectui64v", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos3ivMESA) {
-        void **procp = (void **) &disp->WindowPos3ivMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos3iv", symbol_prefix);
+    if(!disp->GetQueryObjectui64v) {
+        void ** procp = (void **) &disp->GetQueryObjectui64v;
+        snprintf(symboln, sizeof(symboln), "%sGetQueryObjectui64vEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos3ivMESA) {
-        void **procp = (void **) &disp->WindowPos3ivMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos3ivARB", symbol_prefix);
+    if(!disp->QueryCounter) {
+        void ** procp = (void **) &disp->QueryCounter;
+        snprintf(symboln, sizeof(symboln), "%sQueryCounter", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos3ivMESA) {
-        void **procp = (void **) &disp->WindowPos3ivMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos3ivMESA", symbol_prefix);
+    if(!disp->ColorP3ui) {
+        void ** procp = (void **) &disp->ColorP3ui;
+        snprintf(symboln, sizeof(symboln), "%sColorP3ui", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos3sMESA) {
-        void **procp = (void **) &disp->WindowPos3sMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos3s", symbol_prefix);
+    if(!disp->ColorP3uiv) {
+        void ** procp = (void **) &disp->ColorP3uiv;
+        snprintf(symboln, sizeof(symboln), "%sColorP3uiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos3sMESA) {
-        void **procp = (void **) &disp->WindowPos3sMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos3sARB", symbol_prefix);
+    if(!disp->ColorP4ui) {
+        void ** procp = (void **) &disp->ColorP4ui;
+        snprintf(symboln, sizeof(symboln), "%sColorP4ui", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos3sMESA) {
-        void **procp = (void **) &disp->WindowPos3sMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos3sMESA", symbol_prefix);
+    if(!disp->ColorP4uiv) {
+        void ** procp = (void **) &disp->ColorP4uiv;
+        snprintf(symboln, sizeof(symboln), "%sColorP4uiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos3svMESA) {
-        void **procp = (void **) &disp->WindowPos3svMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos3sv", symbol_prefix);
+    if(!disp->MultiTexCoordP1ui) {
+        void ** procp = (void **) &disp->MultiTexCoordP1ui;
+        snprintf(symboln, sizeof(symboln), "%sMultiTexCoordP1ui", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos3svMESA) {
-        void **procp = (void **) &disp->WindowPos3svMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos3svARB", symbol_prefix);
+    if(!disp->MultiTexCoordP1uiv) {
+        void ** procp = (void **) &disp->MultiTexCoordP1uiv;
+        snprintf(symboln, sizeof(symboln), "%sMultiTexCoordP1uiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos3svMESA) {
-        void **procp = (void **) &disp->WindowPos3svMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos3svMESA", symbol_prefix);
+    if(!disp->MultiTexCoordP2ui) {
+        void ** procp = (void **) &disp->MultiTexCoordP2ui;
+        snprintf(symboln, sizeof(symboln), "%sMultiTexCoordP2ui", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos4dMESA) {
-        void **procp = (void **) &disp->WindowPos4dMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos4dMESA", symbol_prefix);
+    if(!disp->MultiTexCoordP2uiv) {
+        void ** procp = (void **) &disp->MultiTexCoordP2uiv;
+        snprintf(symboln, sizeof(symboln), "%sMultiTexCoordP2uiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos4dvMESA) {
-        void **procp = (void **) &disp->WindowPos4dvMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos4dvMESA", symbol_prefix);
+    if(!disp->MultiTexCoordP3ui) {
+        void ** procp = (void **) &disp->MultiTexCoordP3ui;
+        snprintf(symboln, sizeof(symboln), "%sMultiTexCoordP3ui", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos4fMESA) {
-        void **procp = (void **) &disp->WindowPos4fMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos4fMESA", symbol_prefix);
+    if(!disp->MultiTexCoordP3uiv) {
+        void ** procp = (void **) &disp->MultiTexCoordP3uiv;
+        snprintf(symboln, sizeof(symboln), "%sMultiTexCoordP3uiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos4fvMESA) {
-        void **procp = (void **) &disp->WindowPos4fvMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos4fvMESA", symbol_prefix);
+    if(!disp->MultiTexCoordP4ui) {
+        void ** procp = (void **) &disp->MultiTexCoordP4ui;
+        snprintf(symboln, sizeof(symboln), "%sMultiTexCoordP4ui", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos4iMESA) {
-        void **procp = (void **) &disp->WindowPos4iMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos4iMESA", symbol_prefix);
+    if(!disp->MultiTexCoordP4uiv) {
+        void ** procp = (void **) &disp->MultiTexCoordP4uiv;
+        snprintf(symboln, sizeof(symboln), "%sMultiTexCoordP4uiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos4ivMESA) {
-        void **procp = (void **) &disp->WindowPos4ivMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos4ivMESA", symbol_prefix);
+    if(!disp->NormalP3ui) {
+        void ** procp = (void **) &disp->NormalP3ui;
+        snprintf(symboln, sizeof(symboln), "%sNormalP3ui", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos4sMESA) {
-        void **procp = (void **) &disp->WindowPos4sMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos4sMESA", symbol_prefix);
+    if(!disp->NormalP3uiv) {
+        void ** procp = (void **) &disp->NormalP3uiv;
+        snprintf(symboln, sizeof(symboln), "%sNormalP3uiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->WindowPos4svMESA) {
-        void **procp = (void **) &disp->WindowPos4svMESA;
 
-        snprintf(symboln, sizeof(symboln), "%sWindowPos4svMESA", symbol_prefix);
+    if(!disp->SecondaryColorP3ui) {
+        void ** procp = (void **) &disp->SecondaryColorP3ui;
+        snprintf(symboln, sizeof(symboln), "%sSecondaryColorP3ui", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiModeDrawArraysIBM) {
-        void **procp = (void **) &disp->MultiModeDrawArraysIBM;
 
-        snprintf(symboln, sizeof(symboln), "%sMultiModeDrawArraysIBM",
-                 symbol_prefix);
+    if(!disp->SecondaryColorP3uiv) {
+        void ** procp = (void **) &disp->SecondaryColorP3uiv;
+        snprintf(symboln, sizeof(symboln), "%sSecondaryColorP3uiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->MultiModeDrawElementsIBM) {
-        void **procp = (void **) &disp->MultiModeDrawElementsIBM;
 
-        snprintf(symboln, sizeof(symboln), "%sMultiModeDrawElementsIBM",
-                 symbol_prefix);
+    if(!disp->TexCoordP1ui) {
+        void ** procp = (void **) &disp->TexCoordP1ui;
+        snprintf(symboln, sizeof(symboln), "%sTexCoordP1ui", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DeleteFencesNV) {
-        void **procp = (void **) &disp->DeleteFencesNV;
 
-        snprintf(symboln, sizeof(symboln), "%sDeleteFencesNV", symbol_prefix);
+    if(!disp->TexCoordP1uiv) {
+        void ** procp = (void **) &disp->TexCoordP1uiv;
+        snprintf(symboln, sizeof(symboln), "%sTexCoordP1uiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->FinishFenceNV) {
-        void **procp = (void **) &disp->FinishFenceNV;
 
-        snprintf(symboln, sizeof(symboln), "%sFinishFenceNV", symbol_prefix);
+    if(!disp->TexCoordP2ui) {
+        void ** procp = (void **) &disp->TexCoordP2ui;
+        snprintf(symboln, sizeof(symboln), "%sTexCoordP2ui", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GenFencesNV) {
-        void **procp = (void **) &disp->GenFencesNV;
 
-        snprintf(symboln, sizeof(symboln), "%sGenFencesNV", symbol_prefix);
+    if(!disp->TexCoordP2uiv) {
+        void ** procp = (void **) &disp->TexCoordP2uiv;
+        snprintf(symboln, sizeof(symboln), "%sTexCoordP2uiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetFenceivNV) {
-        void **procp = (void **) &disp->GetFenceivNV;
 
-        snprintf(symboln, sizeof(symboln), "%sGetFenceivNV", symbol_prefix);
+    if(!disp->TexCoordP3ui) {
+        void ** procp = (void **) &disp->TexCoordP3ui;
+        snprintf(symboln, sizeof(symboln), "%sTexCoordP3ui", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->IsFenceNV) {
-        void **procp = (void **) &disp->IsFenceNV;
 
-        snprintf(symboln, sizeof(symboln), "%sIsFenceNV", symbol_prefix);
+    if(!disp->TexCoordP3uiv) {
+        void ** procp = (void **) &disp->TexCoordP3uiv;
+        snprintf(symboln, sizeof(symboln), "%sTexCoordP3uiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->SetFenceNV) {
-        void **procp = (void **) &disp->SetFenceNV;
 
-        snprintf(symboln, sizeof(symboln), "%sSetFenceNV", symbol_prefix);
+    if(!disp->TexCoordP4ui) {
+        void ** procp = (void **) &disp->TexCoordP4ui;
+        snprintf(symboln, sizeof(symboln), "%sTexCoordP4ui", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TestFenceNV) {
-        void **procp = (void **) &disp->TestFenceNV;
 
-        snprintf(symboln, sizeof(symboln), "%sTestFenceNV", symbol_prefix);
+    if(!disp->TexCoordP4uiv) {
+        void ** procp = (void **) &disp->TexCoordP4uiv;
+        snprintf(symboln, sizeof(symboln), "%sTexCoordP4uiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->AreProgramsResidentNV) {
-        void **procp = (void **) &disp->AreProgramsResidentNV;
 
-        snprintf(symboln, sizeof(symboln), "%sAreProgramsResidentNV",
-                 symbol_prefix);
+    if(!disp->VertexAttribP1ui) {
+        void ** procp = (void **) &disp->VertexAttribP1ui;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribP1ui", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BindProgramNV) {
-        void **procp = (void **) &disp->BindProgramNV;
 
-        snprintf(symboln, sizeof(symboln), "%sBindProgramARB", symbol_prefix);
+    if(!disp->VertexAttribP1uiv) {
+        void ** procp = (void **) &disp->VertexAttribP1uiv;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribP1uiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BindProgramNV) {
-        void **procp = (void **) &disp->BindProgramNV;
 
-        snprintf(symboln, sizeof(symboln), "%sBindProgramNV", symbol_prefix);
+    if(!disp->VertexAttribP2ui) {
+        void ** procp = (void **) &disp->VertexAttribP2ui;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribP2ui", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DeleteProgramsNV) {
-        void **procp = (void **) &disp->DeleteProgramsNV;
 
-        snprintf(symboln, sizeof(symboln), "%sDeleteProgramsARB",
-                 symbol_prefix);
+    if(!disp->VertexAttribP2uiv) {
+        void ** procp = (void **) &disp->VertexAttribP2uiv;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribP2uiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DeleteProgramsNV) {
-        void **procp = (void **) &disp->DeleteProgramsNV;
 
-        snprintf(symboln, sizeof(symboln), "%sDeleteProgramsNV", symbol_prefix);
+    if(!disp->VertexAttribP3ui) {
+        void ** procp = (void **) &disp->VertexAttribP3ui;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribP3ui", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ExecuteProgramNV) {
-        void **procp = (void **) &disp->ExecuteProgramNV;
 
-        snprintf(symboln, sizeof(symboln), "%sExecuteProgramNV", symbol_prefix);
+    if(!disp->VertexAttribP3uiv) {
+        void ** procp = (void **) &disp->VertexAttribP3uiv;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribP3uiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GenProgramsNV) {
-        void **procp = (void **) &disp->GenProgramsNV;
 
-        snprintf(symboln, sizeof(symboln), "%sGenProgramsARB", symbol_prefix);
+    if(!disp->VertexAttribP4ui) {
+        void ** procp = (void **) &disp->VertexAttribP4ui;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribP4ui", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GenProgramsNV) {
-        void **procp = (void **) &disp->GenProgramsNV;
 
-        snprintf(symboln, sizeof(symboln), "%sGenProgramsNV", symbol_prefix);
+    if(!disp->VertexAttribP4uiv) {
+        void ** procp = (void **) &disp->VertexAttribP4uiv;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribP4uiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetProgramParameterdvNV) {
-        void **procp = (void **) &disp->GetProgramParameterdvNV;
 
-        snprintf(symboln, sizeof(symboln), "%sGetProgramParameterdvNV",
-                 symbol_prefix);
+    if(!disp->VertexP2ui) {
+        void ** procp = (void **) &disp->VertexP2ui;
+        snprintf(symboln, sizeof(symboln), "%sVertexP2ui", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetProgramParameterfvNV) {
-        void **procp = (void **) &disp->GetProgramParameterfvNV;
 
-        snprintf(symboln, sizeof(symboln), "%sGetProgramParameterfvNV",
-                 symbol_prefix);
+    if(!disp->VertexP2uiv) {
+        void ** procp = (void **) &disp->VertexP2uiv;
+        snprintf(symboln, sizeof(symboln), "%sVertexP2uiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetProgramStringNV) {
-        void **procp = (void **) &disp->GetProgramStringNV;
 
-        snprintf(symboln, sizeof(symboln), "%sGetProgramStringNV",
-                 symbol_prefix);
+    if(!disp->VertexP3ui) {
+        void ** procp = (void **) &disp->VertexP3ui;
+        snprintf(symboln, sizeof(symboln), "%sVertexP3ui", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetProgramivNV) {
-        void **procp = (void **) &disp->GetProgramivNV;
 
-        snprintf(symboln, sizeof(symboln), "%sGetProgramivNV", symbol_prefix);
+    if(!disp->VertexP3uiv) {
+        void ** procp = (void **) &disp->VertexP3uiv;
+        snprintf(symboln, sizeof(symboln), "%sVertexP3uiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetTrackMatrixivNV) {
-        void **procp = (void **) &disp->GetTrackMatrixivNV;
 
-        snprintf(symboln, sizeof(symboln), "%sGetTrackMatrixivNV",
-                 symbol_prefix);
+    if(!disp->VertexP4ui) {
+        void ** procp = (void **) &disp->VertexP4ui;
+        snprintf(symboln, sizeof(symboln), "%sVertexP4ui", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetVertexAttribPointervNV) {
-        void **procp = (void **) &disp->GetVertexAttribPointervNV;
 
-        snprintf(symboln, sizeof(symboln), "%sGetVertexAttribPointerv",
-                 symbol_prefix);
+    if(!disp->VertexP4uiv) {
+        void ** procp = (void **) &disp->VertexP4uiv;
+        snprintf(symboln, sizeof(symboln), "%sVertexP4uiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetVertexAttribPointervNV) {
-        void **procp = (void **) &disp->GetVertexAttribPointervNV;
 
-        snprintf(symboln, sizeof(symboln), "%sGetVertexAttribPointervARB",
-                 symbol_prefix);
+    if(!disp->BindTransformFeedback) {
+        void ** procp = (void **) &disp->BindTransformFeedback;
+        snprintf(symboln, sizeof(symboln), "%sBindTransformFeedback", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetVertexAttribPointervNV) {
-        void **procp = (void **) &disp->GetVertexAttribPointervNV;
 
-        snprintf(symboln, sizeof(symboln), "%sGetVertexAttribPointervNV",
-                 symbol_prefix);
+    if(!disp->DeleteTransformFeedbacks) {
+        void ** procp = (void **) &disp->DeleteTransformFeedbacks;
+        snprintf(symboln, sizeof(symboln), "%sDeleteTransformFeedbacks", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetVertexAttribdvNV) {
-        void **procp = (void **) &disp->GetVertexAttribdvNV;
 
-        snprintf(symboln, sizeof(symboln), "%sGetVertexAttribdvNV",
-                 symbol_prefix);
+    if(!disp->DrawTransformFeedback) {
+        void ** procp = (void **) &disp->DrawTransformFeedback;
+        snprintf(symboln, sizeof(symboln), "%sDrawTransformFeedback", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetVertexAttribfvNV) {
-        void **procp = (void **) &disp->GetVertexAttribfvNV;
 
-        snprintf(symboln, sizeof(symboln), "%sGetVertexAttribfvNV",
-                 symbol_prefix);
+    if(!disp->GenTransformFeedbacks) {
+        void ** procp = (void **) &disp->GenTransformFeedbacks;
+        snprintf(symboln, sizeof(symboln), "%sGenTransformFeedbacks", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetVertexAttribivNV) {
-        void **procp = (void **) &disp->GetVertexAttribivNV;
 
-        snprintf(symboln, sizeof(symboln), "%sGetVertexAttribivNV",
-                 symbol_prefix);
+    if(!disp->IsTransformFeedback) {
+        void ** procp = (void **) &disp->IsTransformFeedback;
+        snprintf(symboln, sizeof(symboln), "%sIsTransformFeedback", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->IsProgramNV) {
-        void **procp = (void **) &disp->IsProgramNV;
 
-        snprintf(symboln, sizeof(symboln), "%sIsProgramARB", symbol_prefix);
+    if(!disp->PauseTransformFeedback) {
+        void ** procp = (void **) &disp->PauseTransformFeedback;
+        snprintf(symboln, sizeof(symboln), "%sPauseTransformFeedback", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->IsProgramNV) {
-        void **procp = (void **) &disp->IsProgramNV;
 
-        snprintf(symboln, sizeof(symboln), "%sIsProgramNV", symbol_prefix);
+    if(!disp->ResumeTransformFeedback) {
+        void ** procp = (void **) &disp->ResumeTransformFeedback;
+        snprintf(symboln, sizeof(symboln), "%sResumeTransformFeedback", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->LoadProgramNV) {
-        void **procp = (void **) &disp->LoadProgramNV;
 
-        snprintf(symboln, sizeof(symboln), "%sLoadProgramNV", symbol_prefix);
+    if(!disp->BeginQueryIndexed) {
+        void ** procp = (void **) &disp->BeginQueryIndexed;
+        snprintf(symboln, sizeof(symboln), "%sBeginQueryIndexed", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ProgramParameters4dvNV) {
-        void **procp = (void **) &disp->ProgramParameters4dvNV;
 
-        snprintf(symboln, sizeof(symboln), "%sProgramParameters4dvNV",
-                 symbol_prefix);
+    if(!disp->DrawTransformFeedbackStream) {
+        void ** procp = (void **) &disp->DrawTransformFeedbackStream;
+        snprintf(symboln, sizeof(symboln), "%sDrawTransformFeedbackStream", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ProgramParameters4fvNV) {
-        void **procp = (void **) &disp->ProgramParameters4fvNV;
 
-        snprintf(symboln, sizeof(symboln), "%sProgramParameters4fvNV",
-                 symbol_prefix);
+    if(!disp->EndQueryIndexed) {
+        void ** procp = (void **) &disp->EndQueryIndexed;
+        snprintf(symboln, sizeof(symboln), "%sEndQueryIndexed", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->RequestResidentProgramsNV) {
-        void **procp = (void **) &disp->RequestResidentProgramsNV;
 
-        snprintf(symboln, sizeof(symboln), "%sRequestResidentProgramsNV",
-                 symbol_prefix);
+    if(!disp->GetQueryIndexediv) {
+        void ** procp = (void **) &disp->GetQueryIndexediv;
+        snprintf(symboln, sizeof(symboln), "%sGetQueryIndexediv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TrackMatrixNV) {
-        void **procp = (void **) &disp->TrackMatrixNV;
 
-        snprintf(symboln, sizeof(symboln), "%sTrackMatrixNV", symbol_prefix);
+    if(!disp->ClearDepthf) {
+        void ** procp = (void **) &disp->ClearDepthf;
+        snprintf(symboln, sizeof(symboln), "%sClearDepthf", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib1dNV) {
-        void **procp = (void **) &disp->VertexAttrib1dNV;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib1dNV", symbol_prefix);
+    if(!disp->ClearDepthf) {
+        void ** procp = (void **) &disp->ClearDepthf;
+        snprintf(symboln, sizeof(symboln), "%sClearDepthfOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib1dvNV) {
-        void **procp = (void **) &disp->VertexAttrib1dvNV;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib1dvNV",
-                 symbol_prefix);
+    if(!disp->DepthRangef) {
+        void ** procp = (void **) &disp->DepthRangef;
+        snprintf(symboln, sizeof(symboln), "%sDepthRangef", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib1fNV) {
-        void **procp = (void **) &disp->VertexAttrib1fNV;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib1fNV", symbol_prefix);
+    if(!disp->DepthRangef) {
+        void ** procp = (void **) &disp->DepthRangef;
+        snprintf(symboln, sizeof(symboln), "%sDepthRangefOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib1fvNV) {
-        void **procp = (void **) &disp->VertexAttrib1fvNV;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib1fvNV",
-                 symbol_prefix);
+    if(!disp->GetShaderPrecisionFormat) {
+        void ** procp = (void **) &disp->GetShaderPrecisionFormat;
+        snprintf(symboln, sizeof(symboln), "%sGetShaderPrecisionFormat", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib1sNV) {
-        void **procp = (void **) &disp->VertexAttrib1sNV;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib1sNV", symbol_prefix);
+    if(!disp->ReleaseShaderCompiler) {
+        void ** procp = (void **) &disp->ReleaseShaderCompiler;
+        snprintf(symboln, sizeof(symboln), "%sReleaseShaderCompiler", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib1svNV) {
-        void **procp = (void **) &disp->VertexAttrib1svNV;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib1svNV",
-                 symbol_prefix);
+    if(!disp->ShaderBinary) {
+        void ** procp = (void **) &disp->ShaderBinary;
+        snprintf(symboln, sizeof(symboln), "%sShaderBinary", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib2dNV) {
-        void **procp = (void **) &disp->VertexAttrib2dNV;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib2dNV", symbol_prefix);
+    if(!disp->GetProgramBinary) {
+        void ** procp = (void **) &disp->GetProgramBinary;
+        snprintf(symboln, sizeof(symboln), "%sGetProgramBinary", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib2dvNV) {
-        void **procp = (void **) &disp->VertexAttrib2dvNV;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib2dvNV",
-                 symbol_prefix);
+    if(!disp->GetProgramBinary) {
+        void ** procp = (void **) &disp->GetProgramBinary;
+        snprintf(symboln, sizeof(symboln), "%sGetProgramBinaryOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib2fNV) {
-        void **procp = (void **) &disp->VertexAttrib2fNV;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib2fNV", symbol_prefix);
+    if(!disp->ProgramBinary) {
+        void ** procp = (void **) &disp->ProgramBinary;
+        snprintf(symboln, sizeof(symboln), "%sProgramBinary", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib2fvNV) {
-        void **procp = (void **) &disp->VertexAttrib2fvNV;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib2fvNV",
-                 symbol_prefix);
+    if(!disp->ProgramBinary) {
+        void ** procp = (void **) &disp->ProgramBinary;
+        snprintf(symboln, sizeof(symboln), "%sProgramBinaryOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib2sNV) {
-        void **procp = (void **) &disp->VertexAttrib2sNV;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib2sNV", symbol_prefix);
+    if(!disp->ProgramParameteri) {
+        void ** procp = (void **) &disp->ProgramParameteri;
+        snprintf(symboln, sizeof(symboln), "%sProgramParameteriARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib2svNV) {
-        void **procp = (void **) &disp->VertexAttrib2svNV;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib2svNV",
-                 symbol_prefix);
+    if(!disp->ProgramParameteri) {
+        void ** procp = (void **) &disp->ProgramParameteri;
+        snprintf(symboln, sizeof(symboln), "%sProgramParameteri", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib3dNV) {
-        void **procp = (void **) &disp->VertexAttrib3dNV;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib3dNV", symbol_prefix);
+    if(!disp->DebugMessageCallbackARB) {
+        void ** procp = (void **) &disp->DebugMessageCallbackARB;
+        snprintf(symboln, sizeof(symboln), "%sDebugMessageCallbackARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib3dvNV) {
-        void **procp = (void **) &disp->VertexAttrib3dvNV;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib3dvNV",
-                 symbol_prefix);
+    if(!disp->DebugMessageControlARB) {
+        void ** procp = (void **) &disp->DebugMessageControlARB;
+        snprintf(symboln, sizeof(symboln), "%sDebugMessageControlARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib3fNV) {
-        void **procp = (void **) &disp->VertexAttrib3fNV;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib3fNV", symbol_prefix);
+    if(!disp->DebugMessageInsertARB) {
+        void ** procp = (void **) &disp->DebugMessageInsertARB;
+        snprintf(symboln, sizeof(symboln), "%sDebugMessageInsertARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib3fvNV) {
-        void **procp = (void **) &disp->VertexAttrib3fvNV;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib3fvNV",
-                 symbol_prefix);
+    if(!disp->GetDebugMessageLogARB) {
+        void ** procp = (void **) &disp->GetDebugMessageLogARB;
+        snprintf(symboln, sizeof(symboln), "%sGetDebugMessageLogARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib3sNV) {
-        void **procp = (void **) &disp->VertexAttrib3sNV;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib3sNV", symbol_prefix);
+    if(!disp->GetGraphicsResetStatusARB) {
+        void ** procp = (void **) &disp->GetGraphicsResetStatusARB;
+        snprintf(symboln, sizeof(symboln), "%sGetGraphicsResetStatusARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib3svNV) {
-        void **procp = (void **) &disp->VertexAttrib3svNV;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib3svNV",
-                 symbol_prefix);
+    if(!disp->GetnColorTableARB) {
+        void ** procp = (void **) &disp->GetnColorTableARB;
+        snprintf(symboln, sizeof(symboln), "%sGetnColorTableARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib4dNV) {
-        void **procp = (void **) &disp->VertexAttrib4dNV;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4dNV", symbol_prefix);
+    if(!disp->GetnCompressedTexImageARB) {
+        void ** procp = (void **) &disp->GetnCompressedTexImageARB;
+        snprintf(symboln, sizeof(symboln), "%sGetnCompressedTexImageARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib4dvNV) {
-        void **procp = (void **) &disp->VertexAttrib4dvNV;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4dvNV",
-                 symbol_prefix);
+    if(!disp->GetnConvolutionFilterARB) {
+        void ** procp = (void **) &disp->GetnConvolutionFilterARB;
+        snprintf(symboln, sizeof(symboln), "%sGetnConvolutionFilterARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib4fNV) {
-        void **procp = (void **) &disp->VertexAttrib4fNV;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4fNV", symbol_prefix);
+    if(!disp->GetnHistogramARB) {
+        void ** procp = (void **) &disp->GetnHistogramARB;
+        snprintf(symboln, sizeof(symboln), "%sGetnHistogramARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib4fvNV) {
-        void **procp = (void **) &disp->VertexAttrib4fvNV;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4fvNV",
-                 symbol_prefix);
+    if(!disp->GetnMapdvARB) {
+        void ** procp = (void **) &disp->GetnMapdvARB;
+        snprintf(symboln, sizeof(symboln), "%sGetnMapdvARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib4sNV) {
-        void **procp = (void **) &disp->VertexAttrib4sNV;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4sNV", symbol_prefix);
+    if(!disp->GetnMapfvARB) {
+        void ** procp = (void **) &disp->GetnMapfvARB;
+        snprintf(symboln, sizeof(symboln), "%sGetnMapfvARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib4svNV) {
-        void **procp = (void **) &disp->VertexAttrib4svNV;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4svNV",
-                 symbol_prefix);
+    if(!disp->GetnMapivARB) {
+        void ** procp = (void **) &disp->GetnMapivARB;
+        snprintf(symboln, sizeof(symboln), "%sGetnMapivARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib4ubNV) {
-        void **procp = (void **) &disp->VertexAttrib4ubNV;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4ubNV",
-                 symbol_prefix);
+    if(!disp->GetnMinmaxARB) {
+        void ** procp = (void **) &disp->GetnMinmaxARB;
+        snprintf(symboln, sizeof(symboln), "%sGetnMinmaxARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttrib4ubvNV) {
-        void **procp = (void **) &disp->VertexAttrib4ubvNV;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4ubvNV",
-                 symbol_prefix);
+    if(!disp->GetnPixelMapfvARB) {
+        void ** procp = (void **) &disp->GetnPixelMapfvARB;
+        snprintf(symboln, sizeof(symboln), "%sGetnPixelMapfvARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribPointerNV) {
-        void **procp = (void **) &disp->VertexAttribPointerNV;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribPointerNV",
-                 symbol_prefix);
+    if(!disp->GetnPixelMapuivARB) {
+        void ** procp = (void **) &disp->GetnPixelMapuivARB;
+        snprintf(symboln, sizeof(symboln), "%sGetnPixelMapuivARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribs1dvNV) {
-        void **procp = (void **) &disp->VertexAttribs1dvNV;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribs1dvNV",
-                 symbol_prefix);
+    if(!disp->GetnPixelMapusvARB) {
+        void ** procp = (void **) &disp->GetnPixelMapusvARB;
+        snprintf(symboln, sizeof(symboln), "%sGetnPixelMapusvARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribs1fvNV) {
-        void **procp = (void **) &disp->VertexAttribs1fvNV;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribs1fvNV",
-                 symbol_prefix);
+    if(!disp->GetnPolygonStippleARB) {
+        void ** procp = (void **) &disp->GetnPolygonStippleARB;
+        snprintf(symboln, sizeof(symboln), "%sGetnPolygonStippleARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribs1svNV) {
-        void **procp = (void **) &disp->VertexAttribs1svNV;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribs1svNV",
-                 symbol_prefix);
+    if(!disp->GetnSeparableFilterARB) {
+        void ** procp = (void **) &disp->GetnSeparableFilterARB;
+        snprintf(symboln, sizeof(symboln), "%sGetnSeparableFilterARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribs2dvNV) {
-        void **procp = (void **) &disp->VertexAttribs2dvNV;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribs2dvNV",
-                 symbol_prefix);
+    if(!disp->GetnTexImageARB) {
+        void ** procp = (void **) &disp->GetnTexImageARB;
+        snprintf(symboln, sizeof(symboln), "%sGetnTexImageARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribs2fvNV) {
-        void **procp = (void **) &disp->VertexAttribs2fvNV;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribs2fvNV",
-                 symbol_prefix);
+    if(!disp->GetnUniformdvARB) {
+        void ** procp = (void **) &disp->GetnUniformdvARB;
+        snprintf(symboln, sizeof(symboln), "%sGetnUniformdvARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribs2svNV) {
-        void **procp = (void **) &disp->VertexAttribs2svNV;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribs2svNV",
-                 symbol_prefix);
+    if(!disp->GetnUniformfvARB) {
+        void ** procp = (void **) &disp->GetnUniformfvARB;
+        snprintf(symboln, sizeof(symboln), "%sGetnUniformfvARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribs3dvNV) {
-        void **procp = (void **) &disp->VertexAttribs3dvNV;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribs3dvNV",
-                 symbol_prefix);
+    if(!disp->GetnUniformivARB) {
+        void ** procp = (void **) &disp->GetnUniformivARB;
+        snprintf(symboln, sizeof(symboln), "%sGetnUniformivARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribs3fvNV) {
-        void **procp = (void **) &disp->VertexAttribs3fvNV;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribs3fvNV",
-                 symbol_prefix);
+    if(!disp->GetnUniformuivARB) {
+        void ** procp = (void **) &disp->GetnUniformuivARB;
+        snprintf(symboln, sizeof(symboln), "%sGetnUniformuivARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribs3svNV) {
-        void **procp = (void **) &disp->VertexAttribs3svNV;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribs3svNV",
-                 symbol_prefix);
+    if(!disp->ReadnPixelsARB) {
+        void ** procp = (void **) &disp->ReadnPixelsARB;
+        snprintf(symboln, sizeof(symboln), "%sReadnPixelsARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribs4dvNV) {
-        void **procp = (void **) &disp->VertexAttribs4dvNV;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribs4dvNV",
-                 symbol_prefix);
+    if(!disp->DrawArraysInstancedBaseInstance) {
+        void ** procp = (void **) &disp->DrawArraysInstancedBaseInstance;
+        snprintf(symboln, sizeof(symboln), "%sDrawArraysInstancedBaseInstance", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribs4fvNV) {
-        void **procp = (void **) &disp->VertexAttribs4fvNV;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribs4fvNV",
-                 symbol_prefix);
+    if(!disp->DrawElementsInstancedBaseInstance) {
+        void ** procp = (void **) &disp->DrawElementsInstancedBaseInstance;
+        snprintf(symboln, sizeof(symboln), "%sDrawElementsInstancedBaseInstance", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribs4svNV) {
-        void **procp = (void **) &disp->VertexAttribs4svNV;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribs4svNV",
-                 symbol_prefix);
+    if(!disp->DrawElementsInstancedBaseVertexBaseInstance) {
+        void ** procp = (void **) &disp->DrawElementsInstancedBaseVertexBaseInstance;
+        snprintf(symboln, sizeof(symboln), "%sDrawElementsInstancedBaseVertexBaseInstance", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribs4ubvNV) {
-        void **procp = (void **) &disp->VertexAttribs4ubvNV;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribs4ubvNV",
-                 symbol_prefix);
+    if(!disp->DrawTransformFeedbackInstanced) {
+        void ** procp = (void **) &disp->DrawTransformFeedbackInstanced;
+        snprintf(symboln, sizeof(symboln), "%sDrawTransformFeedbackInstanced", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetTexBumpParameterfvATI) {
-        void **procp = (void **) &disp->GetTexBumpParameterfvATI;
 
-        snprintf(symboln, sizeof(symboln), "%sGetTexBumpParameterfvATI",
-                 symbol_prefix);
+    if(!disp->DrawTransformFeedbackStreamInstanced) {
+        void ** procp = (void **) &disp->DrawTransformFeedbackStreamInstanced;
+        snprintf(symboln, sizeof(symboln), "%sDrawTransformFeedbackStreamInstanced", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetTexBumpParameterivATI) {
-        void **procp = (void **) &disp->GetTexBumpParameterivATI;
 
-        snprintf(symboln, sizeof(symboln), "%sGetTexBumpParameterivATI",
-                 symbol_prefix);
+    if(!disp->GetInternalformativ) {
+        void ** procp = (void **) &disp->GetInternalformativ;
+        snprintf(symboln, sizeof(symboln), "%sGetInternalformativ", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexBumpParameterfvATI) {
-        void **procp = (void **) &disp->TexBumpParameterfvATI;
 
-        snprintf(symboln, sizeof(symboln), "%sTexBumpParameterfvATI",
-                 symbol_prefix);
+    if(!disp->TexStorage1D) {
+        void ** procp = (void **) &disp->TexStorage1D;
+        snprintf(symboln, sizeof(symboln), "%sTexStorage1D", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexBumpParameterivATI) {
-        void **procp = (void **) &disp->TexBumpParameterivATI;
 
-        snprintf(symboln, sizeof(symboln), "%sTexBumpParameterivATI",
-                 symbol_prefix);
+    if(!disp->TexStorage2D) {
+        void ** procp = (void **) &disp->TexStorage2D;
+        snprintf(symboln, sizeof(symboln), "%sTexStorage2D", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->AlphaFragmentOp1ATI) {
-        void **procp = (void **) &disp->AlphaFragmentOp1ATI;
 
-        snprintf(symboln, sizeof(symboln), "%sAlphaFragmentOp1ATI",
-                 symbol_prefix);
+    if(!disp->TexStorage3D) {
+        void ** procp = (void **) &disp->TexStorage3D;
+        snprintf(symboln, sizeof(symboln), "%sTexStorage3D", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->AlphaFragmentOp2ATI) {
-        void **procp = (void **) &disp->AlphaFragmentOp2ATI;
 
-        snprintf(symboln, sizeof(symboln), "%sAlphaFragmentOp2ATI",
-                 symbol_prefix);
+    if(!disp->TextureStorage1DEXT) {
+        void ** procp = (void **) &disp->TextureStorage1DEXT;
+        snprintf(symboln, sizeof(symboln), "%sTextureStorage1DEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->AlphaFragmentOp3ATI) {
-        void **procp = (void **) &disp->AlphaFragmentOp3ATI;
 
-        snprintf(symboln, sizeof(symboln), "%sAlphaFragmentOp3ATI",
-                 symbol_prefix);
+    if(!disp->TextureStorage2DEXT) {
+        void ** procp = (void **) &disp->TextureStorage2DEXT;
+        snprintf(symboln, sizeof(symboln), "%sTextureStorage2DEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BeginFragmentShaderATI) {
-        void **procp = (void **) &disp->BeginFragmentShaderATI;
 
-        snprintf(symboln, sizeof(symboln), "%sBeginFragmentShaderATI",
-                 symbol_prefix);
+    if(!disp->TextureStorage3DEXT) {
+        void ** procp = (void **) &disp->TextureStorage3DEXT;
+        snprintf(symboln, sizeof(symboln), "%sTextureStorage3DEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BindFragmentShaderATI) {
-        void **procp = (void **) &disp->BindFragmentShaderATI;
 
-        snprintf(symboln, sizeof(symboln), "%sBindFragmentShaderATI",
-                 symbol_prefix);
+    if(!disp->TexBufferRange) {
+        void ** procp = (void **) &disp->TexBufferRange;
+        snprintf(symboln, sizeof(symboln), "%sTexBufferRange", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ColorFragmentOp1ATI) {
-        void **procp = (void **) &disp->ColorFragmentOp1ATI;
 
-        snprintf(symboln, sizeof(symboln), "%sColorFragmentOp1ATI",
-                 symbol_prefix);
+    if(!disp->InvalidateBufferData) {
+        void ** procp = (void **) &disp->InvalidateBufferData;
+        snprintf(symboln, sizeof(symboln), "%sInvalidateBufferData", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ColorFragmentOp2ATI) {
-        void **procp = (void **) &disp->ColorFragmentOp2ATI;
 
-        snprintf(symboln, sizeof(symboln), "%sColorFragmentOp2ATI",
-                 symbol_prefix);
+    if(!disp->InvalidateBufferSubData) {
+        void ** procp = (void **) &disp->InvalidateBufferSubData;
+        snprintf(symboln, sizeof(symboln), "%sInvalidateBufferSubData", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ColorFragmentOp3ATI) {
-        void **procp = (void **) &disp->ColorFragmentOp3ATI;
 
-        snprintf(symboln, sizeof(symboln), "%sColorFragmentOp3ATI",
-                 symbol_prefix);
+    if(!disp->InvalidateFramebuffer) {
+        void ** procp = (void **) &disp->InvalidateFramebuffer;
+        snprintf(symboln, sizeof(symboln), "%sInvalidateFramebuffer", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DeleteFragmentShaderATI) {
-        void **procp = (void **) &disp->DeleteFragmentShaderATI;
 
-        snprintf(symboln, sizeof(symboln), "%sDeleteFragmentShaderATI",
-                 symbol_prefix);
+    if(!disp->InvalidateSubFramebuffer) {
+        void ** procp = (void **) &disp->InvalidateSubFramebuffer;
+        snprintf(symboln, sizeof(symboln), "%sInvalidateSubFramebuffer", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->EndFragmentShaderATI) {
-        void **procp = (void **) &disp->EndFragmentShaderATI;
 
-        snprintf(symboln, sizeof(symboln), "%sEndFragmentShaderATI",
-                 symbol_prefix);
+    if(!disp->InvalidateTexImage) {
+        void ** procp = (void **) &disp->InvalidateTexImage;
+        snprintf(symboln, sizeof(symboln), "%sInvalidateTexImage", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GenFragmentShadersATI) {
-        void **procp = (void **) &disp->GenFragmentShadersATI;
 
-        snprintf(symboln, sizeof(symboln), "%sGenFragmentShadersATI",
-                 symbol_prefix);
+    if(!disp->InvalidateTexSubImage) {
+        void ** procp = (void **) &disp->InvalidateTexSubImage;
+        snprintf(symboln, sizeof(symboln), "%sInvalidateTexSubImage", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->PassTexCoordATI) {
-        void **procp = (void **) &disp->PassTexCoordATI;
 
-        snprintf(symboln, sizeof(symboln), "%sPassTexCoordATI", symbol_prefix);
+    if(!disp->PolygonOffsetEXT) {
+        void ** procp = (void **) &disp->PolygonOffsetEXT;
+        snprintf(symboln, sizeof(symboln), "%sPolygonOffsetEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->SampleMapATI) {
-        void **procp = (void **) &disp->SampleMapATI;
 
-        snprintf(symboln, sizeof(symboln), "%sSampleMapATI", symbol_prefix);
+    if(!disp->DrawTexfOES) {
+        void ** procp = (void **) &disp->DrawTexfOES;
+        snprintf(symboln, sizeof(symboln), "%sDrawTexfOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->SetFragmentShaderConstantATI) {
-        void **procp = (void **) &disp->SetFragmentShaderConstantATI;
 
-        snprintf(symboln, sizeof(symboln), "%sSetFragmentShaderConstantATI",
-                 symbol_prefix);
+    if(!disp->DrawTexfvOES) {
+        void ** procp = (void **) &disp->DrawTexfvOES;
+        snprintf(symboln, sizeof(symboln), "%sDrawTexfvOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->PointParameteriNV) {
-        void **procp = (void **) &disp->PointParameteriNV;
 
-        snprintf(symboln, sizeof(symboln), "%sPointParameteri", symbol_prefix);
+    if(!disp->DrawTexiOES) {
+        void ** procp = (void **) &disp->DrawTexiOES;
+        snprintf(symboln, sizeof(symboln), "%sDrawTexiOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->PointParameteriNV) {
-        void **procp = (void **) &disp->PointParameteriNV;
 
-        snprintf(symboln, sizeof(symboln), "%sPointParameteriNV",
-                 symbol_prefix);
+    if(!disp->DrawTexivOES) {
+        void ** procp = (void **) &disp->DrawTexivOES;
+        snprintf(symboln, sizeof(symboln), "%sDrawTexivOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->PointParameterivNV) {
-        void **procp = (void **) &disp->PointParameterivNV;
 
-        snprintf(symboln, sizeof(symboln), "%sPointParameteriv", symbol_prefix);
+    if(!disp->DrawTexsOES) {
+        void ** procp = (void **) &disp->DrawTexsOES;
+        snprintf(symboln, sizeof(symboln), "%sDrawTexsOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->PointParameterivNV) {
-        void **procp = (void **) &disp->PointParameterivNV;
 
-        snprintf(symboln, sizeof(symboln), "%sPointParameterivNV",
-                 symbol_prefix);
+    if(!disp->DrawTexsvOES) {
+        void ** procp = (void **) &disp->DrawTexsvOES;
+        snprintf(symboln, sizeof(symboln), "%sDrawTexsvOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ActiveStencilFaceEXT) {
-        void **procp = (void **) &disp->ActiveStencilFaceEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sActiveStencilFaceEXT",
-                 symbol_prefix);
+    if(!disp->DrawTexxOES) {
+        void ** procp = (void **) &disp->DrawTexxOES;
+        snprintf(symboln, sizeof(symboln), "%sDrawTexxOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BindVertexArrayAPPLE) {
-        void **procp = (void **) &disp->BindVertexArrayAPPLE;
 
-        snprintf(symboln, sizeof(symboln), "%sBindVertexArrayAPPLE",
-                 symbol_prefix);
+    if(!disp->DrawTexxvOES) {
+        void ** procp = (void **) &disp->DrawTexxvOES;
+        snprintf(symboln, sizeof(symboln), "%sDrawTexxvOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DeleteVertexArraysAPPLE) {
-        void **procp = (void **) &disp->DeleteVertexArraysAPPLE;
 
-        snprintf(symboln, sizeof(symboln), "%sDeleteVertexArrays",
-                 symbol_prefix);
+    if(!disp->PointSizePointerOES) {
+        void ** procp = (void **) &disp->PointSizePointerOES;
+        snprintf(symboln, sizeof(symboln), "%sPointSizePointerOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DeleteVertexArraysAPPLE) {
-        void **procp = (void **) &disp->DeleteVertexArraysAPPLE;
 
-        snprintf(symboln, sizeof(symboln), "%sDeleteVertexArraysAPPLE",
-                 symbol_prefix);
+    if(!disp->QueryMatrixxOES) {
+        void ** procp = (void **) &disp->QueryMatrixxOES;
+        snprintf(symboln, sizeof(symboln), "%sQueryMatrixxOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GenVertexArraysAPPLE) {
-        void **procp = (void **) &disp->GenVertexArraysAPPLE;
 
-        snprintf(symboln, sizeof(symboln), "%sGenVertexArraysAPPLE",
-                 symbol_prefix);
+    if(!disp->SampleMaskSGIS) {
+        void ** procp = (void **) &disp->SampleMaskSGIS;
+        snprintf(symboln, sizeof(symboln), "%sSampleMaskSGIS", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->IsVertexArrayAPPLE) {
-        void **procp = (void **) &disp->IsVertexArrayAPPLE;
 
-        snprintf(symboln, sizeof(symboln), "%sIsVertexArray", symbol_prefix);
+    if(!disp->SampleMaskSGIS) {
+        void ** procp = (void **) &disp->SampleMaskSGIS;
+        snprintf(symboln, sizeof(symboln), "%sSampleMaskEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->IsVertexArrayAPPLE) {
-        void **procp = (void **) &disp->IsVertexArrayAPPLE;
 
-        snprintf(symboln, sizeof(symboln), "%sIsVertexArrayAPPLE",
-                 symbol_prefix);
+    if(!disp->SamplePatternSGIS) {
+        void ** procp = (void **) &disp->SamplePatternSGIS;
+        snprintf(symboln, sizeof(symboln), "%sSamplePatternSGIS", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetProgramNamedParameterdvNV) {
-        void **procp = (void **) &disp->GetProgramNamedParameterdvNV;
 
-        snprintf(symboln, sizeof(symboln), "%sGetProgramNamedParameterdvNV",
-                 symbol_prefix);
+    if(!disp->SamplePatternSGIS) {
+        void ** procp = (void **) &disp->SamplePatternSGIS;
+        snprintf(symboln, sizeof(symboln), "%sSamplePatternEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetProgramNamedParameterfvNV) {
-        void **procp = (void **) &disp->GetProgramNamedParameterfvNV;
 
-        snprintf(symboln, sizeof(symboln), "%sGetProgramNamedParameterfvNV",
-                 symbol_prefix);
+    if(!disp->ColorPointerEXT) {
+        void ** procp = (void **) &disp->ColorPointerEXT;
+        snprintf(symboln, sizeof(symboln), "%sColorPointerEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ProgramNamedParameter4dNV) {
-        void **procp = (void **) &disp->ProgramNamedParameter4dNV;
 
-        snprintf(symboln, sizeof(symboln), "%sProgramNamedParameter4dNV",
-                 symbol_prefix);
+    if(!disp->EdgeFlagPointerEXT) {
+        void ** procp = (void **) &disp->EdgeFlagPointerEXT;
+        snprintf(symboln, sizeof(symboln), "%sEdgeFlagPointerEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ProgramNamedParameter4dvNV) {
-        void **procp = (void **) &disp->ProgramNamedParameter4dvNV;
 
-        snprintf(symboln, sizeof(symboln), "%sProgramNamedParameter4dvNV",
-                 symbol_prefix);
+    if(!disp->IndexPointerEXT) {
+        void ** procp = (void **) &disp->IndexPointerEXT;
+        snprintf(symboln, sizeof(symboln), "%sIndexPointerEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ProgramNamedParameter4fNV) {
-        void **procp = (void **) &disp->ProgramNamedParameter4fNV;
 
-        snprintf(symboln, sizeof(symboln), "%sProgramNamedParameter4fNV",
-                 symbol_prefix);
+    if(!disp->NormalPointerEXT) {
+        void ** procp = (void **) &disp->NormalPointerEXT;
+        snprintf(symboln, sizeof(symboln), "%sNormalPointerEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ProgramNamedParameter4fvNV) {
-        void **procp = (void **) &disp->ProgramNamedParameter4fvNV;
 
-        snprintf(symboln, sizeof(symboln), "%sProgramNamedParameter4fvNV",
-                 symbol_prefix);
+    if(!disp->TexCoordPointerEXT) {
+        void ** procp = (void **) &disp->TexCoordPointerEXT;
+        snprintf(symboln, sizeof(symboln), "%sTexCoordPointerEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->PrimitiveRestartIndexNV) {
-        void **procp = (void **) &disp->PrimitiveRestartIndexNV;
 
-        snprintf(symboln, sizeof(symboln), "%sPrimitiveRestartIndexNV",
-                 symbol_prefix);
+    if(!disp->VertexPointerEXT) {
+        void ** procp = (void **) &disp->VertexPointerEXT;
+        snprintf(symboln, sizeof(symboln), "%sVertexPointerEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->PrimitiveRestartIndexNV) {
-        void **procp = (void **) &disp->PrimitiveRestartIndexNV;
 
-        snprintf(symboln, sizeof(symboln), "%sPrimitiveRestartIndex",
-                 symbol_prefix);
+    if(!disp->LockArraysEXT) {
+        void ** procp = (void **) &disp->LockArraysEXT;
+        snprintf(symboln, sizeof(symboln), "%sLockArraysEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->PrimitiveRestartNV) {
-        void **procp = (void **) &disp->PrimitiveRestartNV;
 
-        snprintf(symboln, sizeof(symboln), "%sPrimitiveRestartNV",
-                 symbol_prefix);
+    if(!disp->UnlockArraysEXT) {
+        void ** procp = (void **) &disp->UnlockArraysEXT;
+        snprintf(symboln, sizeof(symboln), "%sUnlockArraysEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DepthBoundsEXT) {
-        void **procp = (void **) &disp->DepthBoundsEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sDepthBoundsEXT", symbol_prefix);
+    if(!disp->SecondaryColor3fEXT) {
+        void ** procp = (void **) &disp->SecondaryColor3fEXT;
+        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3f", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BlendEquationSeparateEXT) {
-        void **procp = (void **) &disp->BlendEquationSeparateEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sBlendEquationSeparate",
-                 symbol_prefix);
+    if(!disp->SecondaryColor3fEXT) {
+        void ** procp = (void **) &disp->SecondaryColor3fEXT;
+        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3fEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BlendEquationSeparateEXT) {
-        void **procp = (void **) &disp->BlendEquationSeparateEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sBlendEquationSeparateEXT",
-                 symbol_prefix);
+    if(!disp->SecondaryColor3fvEXT) {
+        void ** procp = (void **) &disp->SecondaryColor3fvEXT;
+        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3fv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BlendEquationSeparateEXT) {
-        void **procp = (void **) &disp->BlendEquationSeparateEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sBlendEquationSeparateATI",
-                 symbol_prefix);
+    if(!disp->SecondaryColor3fvEXT) {
+        void ** procp = (void **) &disp->SecondaryColor3fvEXT;
+        snprintf(symboln, sizeof(symboln), "%sSecondaryColor3fvEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BindFramebufferEXT) {
-        void **procp = (void **) &disp->BindFramebufferEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sBindFramebuffer", symbol_prefix);
+    if(!disp->MultiDrawElementsEXT) {
+        void ** procp = (void **) &disp->MultiDrawElementsEXT;
+        snprintf(symboln, sizeof(symboln), "%sMultiDrawElements", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BindFramebufferEXT) {
-        void **procp = (void **) &disp->BindFramebufferEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sBindFramebufferEXT",
-                 symbol_prefix);
+    if(!disp->MultiDrawElementsEXT) {
+        void ** procp = (void **) &disp->MultiDrawElementsEXT;
+        snprintf(symboln, sizeof(symboln), "%sMultiDrawElementsEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BindRenderbufferEXT) {
-        void **procp = (void **) &disp->BindRenderbufferEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sBindRenderbuffer", symbol_prefix);
+    if(!disp->FogCoordfEXT) {
+        void ** procp = (void **) &disp->FogCoordfEXT;
+        snprintf(symboln, sizeof(symboln), "%sFogCoordf", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BindRenderbufferEXT) {
-        void **procp = (void **) &disp->BindRenderbufferEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sBindRenderbufferEXT",
-                 symbol_prefix);
+    if(!disp->FogCoordfEXT) {
+        void ** procp = (void **) &disp->FogCoordfEXT;
+        snprintf(symboln, sizeof(symboln), "%sFogCoordfEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->CheckFramebufferStatusEXT) {
-        void **procp = (void **) &disp->CheckFramebufferStatusEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sCheckFramebufferStatus",
-                 symbol_prefix);
+    if(!disp->FogCoordfvEXT) {
+        void ** procp = (void **) &disp->FogCoordfvEXT;
+        snprintf(symboln, sizeof(symboln), "%sFogCoordfv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->CheckFramebufferStatusEXT) {
-        void **procp = (void **) &disp->CheckFramebufferStatusEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sCheckFramebufferStatusEXT",
-                 symbol_prefix);
+    if(!disp->FogCoordfvEXT) {
+        void ** procp = (void **) &disp->FogCoordfvEXT;
+        snprintf(symboln, sizeof(symboln), "%sFogCoordfvEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DeleteFramebuffersEXT) {
-        void **procp = (void **) &disp->DeleteFramebuffersEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sDeleteFramebuffers",
-                 symbol_prefix);
+    if(!disp->ResizeBuffersMESA) {
+        void ** procp = (void **) &disp->ResizeBuffersMESA;
+        snprintf(symboln, sizeof(symboln), "%sResizeBuffersMESA", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DeleteFramebuffersEXT) {
-        void **procp = (void **) &disp->DeleteFramebuffersEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sDeleteFramebuffersEXT",
-                 symbol_prefix);
+    if(!disp->WindowPos4dMESA) {
+        void ** procp = (void **) &disp->WindowPos4dMESA;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos4dMESA", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DeleteRenderbuffersEXT) {
-        void **procp = (void **) &disp->DeleteRenderbuffersEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sDeleteRenderbuffers",
-                 symbol_prefix);
+    if(!disp->WindowPos4dvMESA) {
+        void ** procp = (void **) &disp->WindowPos4dvMESA;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos4dvMESA", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DeleteRenderbuffersEXT) {
-        void **procp = (void **) &disp->DeleteRenderbuffersEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sDeleteRenderbuffersEXT",
-                 symbol_prefix);
+    if(!disp->WindowPos4fMESA) {
+        void ** procp = (void **) &disp->WindowPos4fMESA;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos4fMESA", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->FramebufferRenderbufferEXT) {
-        void **procp = (void **) &disp->FramebufferRenderbufferEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sFramebufferRenderbuffer",
-                 symbol_prefix);
+    if(!disp->WindowPos4fvMESA) {
+        void ** procp = (void **) &disp->WindowPos4fvMESA;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos4fvMESA", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->FramebufferRenderbufferEXT) {
-        void **procp = (void **) &disp->FramebufferRenderbufferEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sFramebufferRenderbufferEXT",
-                 symbol_prefix);
+    if(!disp->WindowPos4iMESA) {
+        void ** procp = (void **) &disp->WindowPos4iMESA;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos4iMESA", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->FramebufferTexture1DEXT) {
-        void **procp = (void **) &disp->FramebufferTexture1DEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sFramebufferTexture1D",
-                 symbol_prefix);
+    if(!disp->WindowPos4ivMESA) {
+        void ** procp = (void **) &disp->WindowPos4ivMESA;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos4ivMESA", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->FramebufferTexture1DEXT) {
-        void **procp = (void **) &disp->FramebufferTexture1DEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sFramebufferTexture1DEXT",
-                 symbol_prefix);
+    if(!disp->WindowPos4sMESA) {
+        void ** procp = (void **) &disp->WindowPos4sMESA;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos4sMESA", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->FramebufferTexture2DEXT) {
-        void **procp = (void **) &disp->FramebufferTexture2DEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sFramebufferTexture2D",
-                 symbol_prefix);
+    if(!disp->WindowPos4svMESA) {
+        void ** procp = (void **) &disp->WindowPos4svMESA;
+        snprintf(symboln, sizeof(symboln), "%sWindowPos4svMESA", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->FramebufferTexture2DEXT) {
-        void **procp = (void **) &disp->FramebufferTexture2DEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sFramebufferTexture2DEXT",
-                 symbol_prefix);
+    if(!disp->MultiModeDrawArraysIBM) {
+        void ** procp = (void **) &disp->MultiModeDrawArraysIBM;
+        snprintf(symboln, sizeof(symboln), "%sMultiModeDrawArraysIBM", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->FramebufferTexture3DEXT) {
-        void **procp = (void **) &disp->FramebufferTexture3DEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sFramebufferTexture3D",
-                 symbol_prefix);
+    if(!disp->MultiModeDrawElementsIBM) {
+        void ** procp = (void **) &disp->MultiModeDrawElementsIBM;
+        snprintf(symboln, sizeof(symboln), "%sMultiModeDrawElementsIBM", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->FramebufferTexture3DEXT) {
-        void **procp = (void **) &disp->FramebufferTexture3DEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sFramebufferTexture3DEXT",
-                 symbol_prefix);
+    if(!disp->AreProgramsResidentNV) {
+        void ** procp = (void **) &disp->AreProgramsResidentNV;
+        snprintf(symboln, sizeof(symboln), "%sAreProgramsResidentNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GenFramebuffersEXT) {
-        void **procp = (void **) &disp->GenFramebuffersEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sGenFramebuffers", symbol_prefix);
+    if(!disp->ExecuteProgramNV) {
+        void ** procp = (void **) &disp->ExecuteProgramNV;
+        snprintf(symboln, sizeof(symboln), "%sExecuteProgramNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GenFramebuffersEXT) {
-        void **procp = (void **) &disp->GenFramebuffersEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sGenFramebuffersEXT",
-                 symbol_prefix);
+    if(!disp->GetProgramParameterdvNV) {
+        void ** procp = (void **) &disp->GetProgramParameterdvNV;
+        snprintf(symboln, sizeof(symboln), "%sGetProgramParameterdvNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GenRenderbuffersEXT) {
-        void **procp = (void **) &disp->GenRenderbuffersEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sGenRenderbuffers", symbol_prefix);
+    if(!disp->GetProgramParameterfvNV) {
+        void ** procp = (void **) &disp->GetProgramParameterfvNV;
+        snprintf(symboln, sizeof(symboln), "%sGetProgramParameterfvNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GenRenderbuffersEXT) {
-        void **procp = (void **) &disp->GenRenderbuffersEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sGenRenderbuffersEXT",
-                 symbol_prefix);
+    if(!disp->GetProgramStringNV) {
+        void ** procp = (void **) &disp->GetProgramStringNV;
+        snprintf(symboln, sizeof(symboln), "%sGetProgramStringNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GenerateMipmapEXT) {
-        void **procp = (void **) &disp->GenerateMipmapEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sGenerateMipmap", symbol_prefix);
+    if(!disp->GetProgramivNV) {
+        void ** procp = (void **) &disp->GetProgramivNV;
+        snprintf(symboln, sizeof(symboln), "%sGetProgramivNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GenerateMipmapEXT) {
-        void **procp = (void **) &disp->GenerateMipmapEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sGenerateMipmapEXT",
-                 symbol_prefix);
+    if(!disp->GetTrackMatrixivNV) {
+        void ** procp = (void **) &disp->GetTrackMatrixivNV;
+        snprintf(symboln, sizeof(symboln), "%sGetTrackMatrixivNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetFramebufferAttachmentParameterivEXT) {
-        void **procp = (void **) &disp->GetFramebufferAttachmentParameterivEXT;
 
-        snprintf(symboln, sizeof(symboln),
-                 "%sGetFramebufferAttachmentParameteriv", symbol_prefix);
+    if(!disp->GetVertexAttribdvNV) {
+        void ** procp = (void **) &disp->GetVertexAttribdvNV;
+        snprintf(symboln, sizeof(symboln), "%sGetVertexAttribdvNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetFramebufferAttachmentParameterivEXT) {
-        void **procp = (void **) &disp->GetFramebufferAttachmentParameterivEXT;
 
-        snprintf(symboln, sizeof(symboln),
-                 "%sGetFramebufferAttachmentParameterivEXT", symbol_prefix);
+    if(!disp->GetVertexAttribfvNV) {
+        void ** procp = (void **) &disp->GetVertexAttribfvNV;
+        snprintf(symboln, sizeof(symboln), "%sGetVertexAttribfvNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetRenderbufferParameterivEXT) {
-        void **procp = (void **) &disp->GetRenderbufferParameterivEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sGetRenderbufferParameteriv",
-                 symbol_prefix);
+    if(!disp->GetVertexAttribivNV) {
+        void ** procp = (void **) &disp->GetVertexAttribivNV;
+        snprintf(symboln, sizeof(symboln), "%sGetVertexAttribivNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetRenderbufferParameterivEXT) {
-        void **procp = (void **) &disp->GetRenderbufferParameterivEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sGetRenderbufferParameterivEXT",
-                 symbol_prefix);
+    if(!disp->LoadProgramNV) {
+        void ** procp = (void **) &disp->LoadProgramNV;
+        snprintf(symboln, sizeof(symboln), "%sLoadProgramNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->IsFramebufferEXT) {
-        void **procp = (void **) &disp->IsFramebufferEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sIsFramebuffer", symbol_prefix);
+    if(!disp->ProgramParameters4dvNV) {
+        void ** procp = (void **) &disp->ProgramParameters4dvNV;
+        snprintf(symboln, sizeof(symboln), "%sProgramParameters4dvNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->IsFramebufferEXT) {
-        void **procp = (void **) &disp->IsFramebufferEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sIsFramebufferEXT", symbol_prefix);
+    if(!disp->ProgramParameters4fvNV) {
+        void ** procp = (void **) &disp->ProgramParameters4fvNV;
+        snprintf(symboln, sizeof(symboln), "%sProgramParameters4fvNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->IsRenderbufferEXT) {
-        void **procp = (void **) &disp->IsRenderbufferEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sIsRenderbuffer", symbol_prefix);
+    if(!disp->RequestResidentProgramsNV) {
+        void ** procp = (void **) &disp->RequestResidentProgramsNV;
+        snprintf(symboln, sizeof(symboln), "%sRequestResidentProgramsNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->IsRenderbufferEXT) {
-        void **procp = (void **) &disp->IsRenderbufferEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sIsRenderbufferEXT",
-                 symbol_prefix);
+    if(!disp->TrackMatrixNV) {
+        void ** procp = (void **) &disp->TrackMatrixNV;
+        snprintf(symboln, sizeof(symboln), "%sTrackMatrixNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->RenderbufferStorageEXT) {
-        void **procp = (void **) &disp->RenderbufferStorageEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sRenderbufferStorage",
-                 symbol_prefix);
+    if(!disp->VertexAttrib1dNV) {
+        void ** procp = (void **) &disp->VertexAttrib1dNV;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib1dNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->RenderbufferStorageEXT) {
-        void **procp = (void **) &disp->RenderbufferStorageEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sRenderbufferStorageEXT",
-                 symbol_prefix);
+    if(!disp->VertexAttrib1dvNV) {
+        void ** procp = (void **) &disp->VertexAttrib1dvNV;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib1dvNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BlitFramebufferEXT) {
-        void **procp = (void **) &disp->BlitFramebufferEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sBlitFramebuffer", symbol_prefix);
+    if(!disp->VertexAttrib1fNV) {
+        void ** procp = (void **) &disp->VertexAttrib1fNV;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib1fNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BlitFramebufferEXT) {
-        void **procp = (void **) &disp->BlitFramebufferEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sBlitFramebufferEXT",
-                 symbol_prefix);
+    if(!disp->VertexAttrib1fvNV) {
+        void ** procp = (void **) &disp->VertexAttrib1fvNV;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib1fvNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BufferParameteriAPPLE) {
-        void **procp = (void **) &disp->BufferParameteriAPPLE;
 
-        snprintf(symboln, sizeof(symboln), "%sBufferParameteriAPPLE",
-                 symbol_prefix);
+    if(!disp->VertexAttrib1sNV) {
+        void ** procp = (void **) &disp->VertexAttrib1sNV;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib1sNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->FlushMappedBufferRangeAPPLE) {
-        void **procp = (void **) &disp->FlushMappedBufferRangeAPPLE;
 
-        snprintf(symboln, sizeof(symboln), "%sFlushMappedBufferRangeAPPLE",
-                 symbol_prefix);
+    if(!disp->VertexAttrib1svNV) {
+        void ** procp = (void **) &disp->VertexAttrib1svNV;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib1svNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BindFragDataLocationEXT) {
-        void **procp = (void **) &disp->BindFragDataLocationEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sBindFragDataLocationEXT",
-                 symbol_prefix);
+    if(!disp->VertexAttrib2dNV) {
+        void ** procp = (void **) &disp->VertexAttrib2dNV;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib2dNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BindFragDataLocationEXT) {
-        void **procp = (void **) &disp->BindFragDataLocationEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sBindFragDataLocation",
-                 symbol_prefix);
+    if(!disp->VertexAttrib2dvNV) {
+        void ** procp = (void **) &disp->VertexAttrib2dvNV;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib2dvNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetFragDataLocationEXT) {
-        void **procp = (void **) &disp->GetFragDataLocationEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sGetFragDataLocationEXT",
-                 symbol_prefix);
+    if(!disp->VertexAttrib2fNV) {
+        void ** procp = (void **) &disp->VertexAttrib2fNV;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib2fNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetFragDataLocationEXT) {
-        void **procp = (void **) &disp->GetFragDataLocationEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sGetFragDataLocation",
-                 symbol_prefix);
+    if(!disp->VertexAttrib2fvNV) {
+        void ** procp = (void **) &disp->VertexAttrib2fvNV;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib2fvNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetUniformuivEXT) {
-        void **procp = (void **) &disp->GetUniformuivEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sGetUniformuivEXT", symbol_prefix);
+    if(!disp->VertexAttrib2sNV) {
+        void ** procp = (void **) &disp->VertexAttrib2sNV;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib2sNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetUniformuivEXT) {
-        void **procp = (void **) &disp->GetUniformuivEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sGetUniformuiv", symbol_prefix);
+    if(!disp->VertexAttrib2svNV) {
+        void ** procp = (void **) &disp->VertexAttrib2svNV;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib2svNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetVertexAttribIivEXT) {
-        void **procp = (void **) &disp->GetVertexAttribIivEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sGetVertexAttribIivEXT",
-                 symbol_prefix);
+    if(!disp->VertexAttrib3dNV) {
+        void ** procp = (void **) &disp->VertexAttrib3dNV;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib3dNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetVertexAttribIivEXT) {
-        void **procp = (void **) &disp->GetVertexAttribIivEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sGetVertexAttribIiv",
-                 symbol_prefix);
+    if(!disp->VertexAttrib3dvNV) {
+        void ** procp = (void **) &disp->VertexAttrib3dvNV;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib3dvNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetVertexAttribIuivEXT) {
-        void **procp = (void **) &disp->GetVertexAttribIuivEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sGetVertexAttribIuivEXT",
-                 symbol_prefix);
+    if(!disp->VertexAttrib3fNV) {
+        void ** procp = (void **) &disp->VertexAttrib3fNV;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib3fNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetVertexAttribIuivEXT) {
-        void **procp = (void **) &disp->GetVertexAttribIuivEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sGetVertexAttribIuiv",
-                 symbol_prefix);
+    if(!disp->VertexAttrib3fvNV) {
+        void ** procp = (void **) &disp->VertexAttrib3fvNV;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib3fvNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Uniform1uiEXT) {
-        void **procp = (void **) &disp->Uniform1uiEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sUniform1uiEXT", symbol_prefix);
+    if(!disp->VertexAttrib3sNV) {
+        void ** procp = (void **) &disp->VertexAttrib3sNV;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib3sNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Uniform1uiEXT) {
-        void **procp = (void **) &disp->Uniform1uiEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sUniform1ui", symbol_prefix);
+    if(!disp->VertexAttrib3svNV) {
+        void ** procp = (void **) &disp->VertexAttrib3svNV;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib3svNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Uniform1uivEXT) {
-        void **procp = (void **) &disp->Uniform1uivEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sUniform1uivEXT", symbol_prefix);
+    if(!disp->VertexAttrib4dNV) {
+        void ** procp = (void **) &disp->VertexAttrib4dNV;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4dNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Uniform1uivEXT) {
-        void **procp = (void **) &disp->Uniform1uivEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sUniform1uiv", symbol_prefix);
+    if(!disp->VertexAttrib4dvNV) {
+        void ** procp = (void **) &disp->VertexAttrib4dvNV;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4dvNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Uniform2uiEXT) {
-        void **procp = (void **) &disp->Uniform2uiEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sUniform2uiEXT", symbol_prefix);
+    if(!disp->VertexAttrib4fNV) {
+        void ** procp = (void **) &disp->VertexAttrib4fNV;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4fNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Uniform2uiEXT) {
-        void **procp = (void **) &disp->Uniform2uiEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sUniform2ui", symbol_prefix);
+    if(!disp->VertexAttrib4fvNV) {
+        void ** procp = (void **) &disp->VertexAttrib4fvNV;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4fvNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Uniform2uivEXT) {
-        void **procp = (void **) &disp->Uniform2uivEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sUniform2uivEXT", symbol_prefix);
+    if(!disp->VertexAttrib4sNV) {
+        void ** procp = (void **) &disp->VertexAttrib4sNV;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4sNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Uniform2uivEXT) {
-        void **procp = (void **) &disp->Uniform2uivEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sUniform2uiv", symbol_prefix);
+    if(!disp->VertexAttrib4svNV) {
+        void ** procp = (void **) &disp->VertexAttrib4svNV;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4svNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Uniform3uiEXT) {
-        void **procp = (void **) &disp->Uniform3uiEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sUniform3uiEXT", symbol_prefix);
+    if(!disp->VertexAttrib4ubNV) {
+        void ** procp = (void **) &disp->VertexAttrib4ubNV;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4ubNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Uniform3uiEXT) {
-        void **procp = (void **) &disp->Uniform3uiEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sUniform3ui", symbol_prefix);
+    if(!disp->VertexAttrib4ubvNV) {
+        void ** procp = (void **) &disp->VertexAttrib4ubvNV;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttrib4ubvNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Uniform3uivEXT) {
-        void **procp = (void **) &disp->Uniform3uivEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sUniform3uivEXT", symbol_prefix);
+    if(!disp->VertexAttribPointerNV) {
+        void ** procp = (void **) &disp->VertexAttribPointerNV;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribPointerNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Uniform3uivEXT) {
-        void **procp = (void **) &disp->Uniform3uivEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sUniform3uiv", symbol_prefix);
+    if(!disp->VertexAttribs1dvNV) {
+        void ** procp = (void **) &disp->VertexAttribs1dvNV;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribs1dvNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Uniform4uiEXT) {
-        void **procp = (void **) &disp->Uniform4uiEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sUniform4uiEXT", symbol_prefix);
+    if(!disp->VertexAttribs1fvNV) {
+        void ** procp = (void **) &disp->VertexAttribs1fvNV;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribs1fvNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Uniform4uiEXT) {
-        void **procp = (void **) &disp->Uniform4uiEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sUniform4ui", symbol_prefix);
+    if(!disp->VertexAttribs1svNV) {
+        void ** procp = (void **) &disp->VertexAttribs1svNV;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribs1svNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Uniform4uivEXT) {
-        void **procp = (void **) &disp->Uniform4uivEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sUniform4uivEXT", symbol_prefix);
+    if(!disp->VertexAttribs2dvNV) {
+        void ** procp = (void **) &disp->VertexAttribs2dvNV;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribs2dvNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->Uniform4uivEXT) {
-        void **procp = (void **) &disp->Uniform4uivEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sUniform4uiv", symbol_prefix);
+    if(!disp->VertexAttribs2fvNV) {
+        void ** procp = (void **) &disp->VertexAttribs2fvNV;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribs2fvNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribI1iEXT) {
-        void **procp = (void **) &disp->VertexAttribI1iEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI1iEXT",
-                 symbol_prefix);
+    if(!disp->VertexAttribs2svNV) {
+        void ** procp = (void **) &disp->VertexAttribs2svNV;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribs2svNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribI1iEXT) {
-        void **procp = (void **) &disp->VertexAttribI1iEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI1i", symbol_prefix);
+    if(!disp->VertexAttribs3dvNV) {
+        void ** procp = (void **) &disp->VertexAttribs3dvNV;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribs3dvNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribI1ivEXT) {
-        void **procp = (void **) &disp->VertexAttribI1ivEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI1ivEXT",
-                 symbol_prefix);
+    if(!disp->VertexAttribs3fvNV) {
+        void ** procp = (void **) &disp->VertexAttribs3fvNV;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribs3fvNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribI1ivEXT) {
-        void **procp = (void **) &disp->VertexAttribI1ivEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI1iv", symbol_prefix);
+    if(!disp->VertexAttribs3svNV) {
+        void ** procp = (void **) &disp->VertexAttribs3svNV;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribs3svNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribI1uiEXT) {
-        void **procp = (void **) &disp->VertexAttribI1uiEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI1uiEXT",
-                 symbol_prefix);
+    if(!disp->VertexAttribs4dvNV) {
+        void ** procp = (void **) &disp->VertexAttribs4dvNV;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribs4dvNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribI1uiEXT) {
-        void **procp = (void **) &disp->VertexAttribI1uiEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI1ui", symbol_prefix);
+    if(!disp->VertexAttribs4fvNV) {
+        void ** procp = (void **) &disp->VertexAttribs4fvNV;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribs4fvNV", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->VertexAttribs4svNV) {
+        void ** procp = (void **) &disp->VertexAttribs4svNV;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribs4svNV", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->VertexAttribs4ubvNV) {
+        void ** procp = (void **) &disp->VertexAttribs4ubvNV;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribs4ubvNV", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->GetTexBumpParameterfvATI) {
+        void ** procp = (void **) &disp->GetTexBumpParameterfvATI;
+        snprintf(symboln, sizeof(symboln), "%sGetTexBumpParameterfvATI", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->GetTexBumpParameterivATI) {
+        void ** procp = (void **) &disp->GetTexBumpParameterivATI;
+        snprintf(symboln, sizeof(symboln), "%sGetTexBumpParameterivATI", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->TexBumpParameterfvATI) {
+        void ** procp = (void **) &disp->TexBumpParameterfvATI;
+        snprintf(symboln, sizeof(symboln), "%sTexBumpParameterfvATI", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->TexBumpParameterivATI) {
+        void ** procp = (void **) &disp->TexBumpParameterivATI;
+        snprintf(symboln, sizeof(symboln), "%sTexBumpParameterivATI", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->AlphaFragmentOp1ATI) {
+        void ** procp = (void **) &disp->AlphaFragmentOp1ATI;
+        snprintf(symboln, sizeof(symboln), "%sAlphaFragmentOp1ATI", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->AlphaFragmentOp2ATI) {
+        void ** procp = (void **) &disp->AlphaFragmentOp2ATI;
+        snprintf(symboln, sizeof(symboln), "%sAlphaFragmentOp2ATI", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->AlphaFragmentOp3ATI) {
+        void ** procp = (void **) &disp->AlphaFragmentOp3ATI;
+        snprintf(symboln, sizeof(symboln), "%sAlphaFragmentOp3ATI", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->BeginFragmentShaderATI) {
+        void ** procp = (void **) &disp->BeginFragmentShaderATI;
+        snprintf(symboln, sizeof(symboln), "%sBeginFragmentShaderATI", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->BindFragmentShaderATI) {
+        void ** procp = (void **) &disp->BindFragmentShaderATI;
+        snprintf(symboln, sizeof(symboln), "%sBindFragmentShaderATI", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->ColorFragmentOp1ATI) {
+        void ** procp = (void **) &disp->ColorFragmentOp1ATI;
+        snprintf(symboln, sizeof(symboln), "%sColorFragmentOp1ATI", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->ColorFragmentOp2ATI) {
+        void ** procp = (void **) &disp->ColorFragmentOp2ATI;
+        snprintf(symboln, sizeof(symboln), "%sColorFragmentOp2ATI", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->ColorFragmentOp3ATI) {
+        void ** procp = (void **) &disp->ColorFragmentOp3ATI;
+        snprintf(symboln, sizeof(symboln), "%sColorFragmentOp3ATI", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->DeleteFragmentShaderATI) {
+        void ** procp = (void **) &disp->DeleteFragmentShaderATI;
+        snprintf(symboln, sizeof(symboln), "%sDeleteFragmentShaderATI", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->EndFragmentShaderATI) {
+        void ** procp = (void **) &disp->EndFragmentShaderATI;
+        snprintf(symboln, sizeof(symboln), "%sEndFragmentShaderATI", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->GenFragmentShadersATI) {
+        void ** procp = (void **) &disp->GenFragmentShadersATI;
+        snprintf(symboln, sizeof(symboln), "%sGenFragmentShadersATI", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->PassTexCoordATI) {
+        void ** procp = (void **) &disp->PassTexCoordATI;
+        snprintf(symboln, sizeof(symboln), "%sPassTexCoordATI", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->SampleMapATI) {
+        void ** procp = (void **) &disp->SampleMapATI;
+        snprintf(symboln, sizeof(symboln), "%sSampleMapATI", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->SetFragmentShaderConstantATI) {
+        void ** procp = (void **) &disp->SetFragmentShaderConstantATI;
+        snprintf(symboln, sizeof(symboln), "%sSetFragmentShaderConstantATI", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->ActiveStencilFaceEXT) {
+        void ** procp = (void **) &disp->ActiveStencilFaceEXT;
+        snprintf(symboln, sizeof(symboln), "%sActiveStencilFaceEXT", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->BindVertexArrayAPPLE) {
+        void ** procp = (void **) &disp->BindVertexArrayAPPLE;
+        snprintf(symboln, sizeof(symboln), "%sBindVertexArrayAPPLE", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->GenVertexArraysAPPLE) {
+        void ** procp = (void **) &disp->GenVertexArraysAPPLE;
+        snprintf(symboln, sizeof(symboln), "%sGenVertexArraysAPPLE", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->GetProgramNamedParameterdvNV) {
+        void ** procp = (void **) &disp->GetProgramNamedParameterdvNV;
+        snprintf(symboln, sizeof(symboln), "%sGetProgramNamedParameterdvNV", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->GetProgramNamedParameterfvNV) {
+        void ** procp = (void **) &disp->GetProgramNamedParameterfvNV;
+        snprintf(symboln, sizeof(symboln), "%sGetProgramNamedParameterfvNV", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->ProgramNamedParameter4dNV) {
+        void ** procp = (void **) &disp->ProgramNamedParameter4dNV;
+        snprintf(symboln, sizeof(symboln), "%sProgramNamedParameter4dNV", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->ProgramNamedParameter4dvNV) {
+        void ** procp = (void **) &disp->ProgramNamedParameter4dvNV;
+        snprintf(symboln, sizeof(symboln), "%sProgramNamedParameter4dvNV", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->ProgramNamedParameter4fNV) {
+        void ** procp = (void **) &disp->ProgramNamedParameter4fNV;
+        snprintf(symboln, sizeof(symboln), "%sProgramNamedParameter4fNV", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->ProgramNamedParameter4fvNV) {
+        void ** procp = (void **) &disp->ProgramNamedParameter4fvNV;
+        snprintf(symboln, sizeof(symboln), "%sProgramNamedParameter4fvNV", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->PrimitiveRestartNV) {
+        void ** procp = (void **) &disp->PrimitiveRestartNV;
+        snprintf(symboln, sizeof(symboln), "%sPrimitiveRestartNV", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->GetTexGenxvOES) {
+        void ** procp = (void **) &disp->GetTexGenxvOES;
+        snprintf(symboln, sizeof(symboln), "%sGetTexGenxvOES", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->TexGenxOES) {
+        void ** procp = (void **) &disp->TexGenxOES;
+        snprintf(symboln, sizeof(symboln), "%sTexGenxOES", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->TexGenxvOES) {
+        void ** procp = (void **) &disp->TexGenxvOES;
+        snprintf(symboln, sizeof(symboln), "%sTexGenxvOES", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->DepthBoundsEXT) {
+        void ** procp = (void **) &disp->DepthBoundsEXT;
+        snprintf(symboln, sizeof(symboln), "%sDepthBoundsEXT", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->BufferParameteriAPPLE) {
+        void ** procp = (void **) &disp->BufferParameteriAPPLE;
+        snprintf(symboln, sizeof(symboln), "%sBufferParameteriAPPLE", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->FlushMappedBufferRangeAPPLE) {
+        void ** procp = (void **) &disp->FlushMappedBufferRangeAPPLE;
+        snprintf(symboln, sizeof(symboln), "%sFlushMappedBufferRangeAPPLE", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->VertexAttribI1iEXT) {
+        void ** procp = (void **) &disp->VertexAttribI1iEXT;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribI1iEXT", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->VertexAttribI1iEXT) {
+        void ** procp = (void **) &disp->VertexAttribI1iEXT;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribI1i", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribI1uivEXT) {
-        void **procp = (void **) &disp->VertexAttribI1uivEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI1uivEXT",
-                 symbol_prefix);
+    if(!disp->VertexAttribI1uiEXT) {
+        void ** procp = (void **) &disp->VertexAttribI1uiEXT;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribI1uiEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribI1uivEXT) {
-        void **procp = (void **) &disp->VertexAttribI1uivEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI1uiv",
-                 symbol_prefix);
+    if(!disp->VertexAttribI1uiEXT) {
+        void ** procp = (void **) &disp->VertexAttribI1uiEXT;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribI1ui", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribI2iEXT) {
-        void **procp = (void **) &disp->VertexAttribI2iEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI2iEXT",
-                 symbol_prefix);
+    if(!disp->VertexAttribI2iEXT) {
+        void ** procp = (void **) &disp->VertexAttribI2iEXT;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribI2iEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribI2iEXT) {
-        void **procp = (void **) &disp->VertexAttribI2iEXT;
 
+    if(!disp->VertexAttribI2iEXT) {
+        void ** procp = (void **) &disp->VertexAttribI2iEXT;
         snprintf(symboln, sizeof(symboln), "%sVertexAttribI2i", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribI2ivEXT) {
-        void **procp = (void **) &disp->VertexAttribI2ivEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI2ivEXT",
-                 symbol_prefix);
+    if(!disp->VertexAttribI2ivEXT) {
+        void ** procp = (void **) &disp->VertexAttribI2ivEXT;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribI2ivEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribI2ivEXT) {
-        void **procp = (void **) &disp->VertexAttribI2ivEXT;
 
+    if(!disp->VertexAttribI2ivEXT) {
+        void ** procp = (void **) &disp->VertexAttribI2ivEXT;
         snprintf(symboln, sizeof(symboln), "%sVertexAttribI2iv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribI2uiEXT) {
-        void **procp = (void **) &disp->VertexAttribI2uiEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI2uiEXT",
-                 symbol_prefix);
+    if(!disp->VertexAttribI2uiEXT) {
+        void ** procp = (void **) &disp->VertexAttribI2uiEXT;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribI2uiEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribI2uiEXT) {
-        void **procp = (void **) &disp->VertexAttribI2uiEXT;
 
+    if(!disp->VertexAttribI2uiEXT) {
+        void ** procp = (void **) &disp->VertexAttribI2uiEXT;
         snprintf(symboln, sizeof(symboln), "%sVertexAttribI2ui", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribI2uivEXT) {
-        void **procp = (void **) &disp->VertexAttribI2uivEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI2uivEXT",
-                 symbol_prefix);
+    if(!disp->VertexAttribI2uivEXT) {
+        void ** procp = (void **) &disp->VertexAttribI2uivEXT;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribI2uivEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribI2uivEXT) {
-        void **procp = (void **) &disp->VertexAttribI2uivEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI2uiv",
-                 symbol_prefix);
+    if(!disp->VertexAttribI2uivEXT) {
+        void ** procp = (void **) &disp->VertexAttribI2uivEXT;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribI2uiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribI3iEXT) {
-        void **procp = (void **) &disp->VertexAttribI3iEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI3iEXT",
-                 symbol_prefix);
+    if(!disp->VertexAttribI3iEXT) {
+        void ** procp = (void **) &disp->VertexAttribI3iEXT;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribI3iEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribI3iEXT) {
-        void **procp = (void **) &disp->VertexAttribI3iEXT;
 
+    if(!disp->VertexAttribI3iEXT) {
+        void ** procp = (void **) &disp->VertexAttribI3iEXT;
         snprintf(symboln, sizeof(symboln), "%sVertexAttribI3i", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribI3ivEXT) {
-        void **procp = (void **) &disp->VertexAttribI3ivEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI3ivEXT",
-                 symbol_prefix);
+    if(!disp->VertexAttribI3ivEXT) {
+        void ** procp = (void **) &disp->VertexAttribI3ivEXT;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribI3ivEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribI3ivEXT) {
-        void **procp = (void **) &disp->VertexAttribI3ivEXT;
 
+    if(!disp->VertexAttribI3ivEXT) {
+        void ** procp = (void **) &disp->VertexAttribI3ivEXT;
         snprintf(symboln, sizeof(symboln), "%sVertexAttribI3iv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribI3uiEXT) {
-        void **procp = (void **) &disp->VertexAttribI3uiEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI3uiEXT",
-                 symbol_prefix);
+    if(!disp->VertexAttribI3uiEXT) {
+        void ** procp = (void **) &disp->VertexAttribI3uiEXT;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribI3uiEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribI3uiEXT) {
-        void **procp = (void **) &disp->VertexAttribI3uiEXT;
 
+    if(!disp->VertexAttribI3uiEXT) {
+        void ** procp = (void **) &disp->VertexAttribI3uiEXT;
         snprintf(symboln, sizeof(symboln), "%sVertexAttribI3ui", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribI3uivEXT) {
-        void **procp = (void **) &disp->VertexAttribI3uivEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI3uivEXT",
-                 symbol_prefix);
+    if(!disp->VertexAttribI3uivEXT) {
+        void ** procp = (void **) &disp->VertexAttribI3uivEXT;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribI3uivEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribI3uivEXT) {
-        void **procp = (void **) &disp->VertexAttribI3uivEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI3uiv",
-                 symbol_prefix);
+    if(!disp->VertexAttribI3uivEXT) {
+        void ** procp = (void **) &disp->VertexAttribI3uivEXT;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribI3uiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribI4bvEXT) {
-        void **procp = (void **) &disp->VertexAttribI4bvEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI4bvEXT",
-                 symbol_prefix);
+    if(!disp->VertexAttribI4iEXT) {
+        void ** procp = (void **) &disp->VertexAttribI4iEXT;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribI4iEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribI4bvEXT) {
-        void **procp = (void **) &disp->VertexAttribI4bvEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI4bv", symbol_prefix);
+    if(!disp->VertexAttribI4iEXT) {
+        void ** procp = (void **) &disp->VertexAttribI4iEXT;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribI4i", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribI4iEXT) {
-        void **procp = (void **) &disp->VertexAttribI4iEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI4iEXT",
-                 symbol_prefix);
+    if(!disp->VertexAttribI4ivEXT) {
+        void ** procp = (void **) &disp->VertexAttribI4ivEXT;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribI4ivEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribI4iEXT) {
-        void **procp = (void **) &disp->VertexAttribI4iEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI4i", symbol_prefix);
+    if(!disp->VertexAttribI4ivEXT) {
+        void ** procp = (void **) &disp->VertexAttribI4ivEXT;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribI4iv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribI4ivEXT) {
-        void **procp = (void **) &disp->VertexAttribI4ivEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI4ivEXT",
-                 symbol_prefix);
+    if(!disp->VertexAttribI4uiEXT) {
+        void ** procp = (void **) &disp->VertexAttribI4uiEXT;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribI4uiEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribI4ivEXT) {
-        void **procp = (void **) &disp->VertexAttribI4ivEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI4iv", symbol_prefix);
+    if(!disp->VertexAttribI4uiEXT) {
+        void ** procp = (void **) &disp->VertexAttribI4uiEXT;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribI4ui", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribI4svEXT) {
-        void **procp = (void **) &disp->VertexAttribI4svEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI4svEXT",
-                 symbol_prefix);
+    if(!disp->VertexAttribI4uivEXT) {
+        void ** procp = (void **) &disp->VertexAttribI4uivEXT;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribI4uivEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribI4svEXT) {
-        void **procp = (void **) &disp->VertexAttribI4svEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI4sv", symbol_prefix);
+    if(!disp->VertexAttribI4uivEXT) {
+        void ** procp = (void **) &disp->VertexAttribI4uivEXT;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribI4uiv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribI4ubvEXT) {
-        void **procp = (void **) &disp->VertexAttribI4ubvEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI4ubvEXT",
-                 symbol_prefix);
+    if(!disp->ClearColorIiEXT) {
+        void ** procp = (void **) &disp->ClearColorIiEXT;
+        snprintf(symboln, sizeof(symboln), "%sClearColorIiEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribI4ubvEXT) {
-        void **procp = (void **) &disp->VertexAttribI4ubvEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI4ubv",
-                 symbol_prefix);
+    if(!disp->ClearColorIuiEXT) {
+        void ** procp = (void **) &disp->ClearColorIuiEXT;
+        snprintf(symboln, sizeof(symboln), "%sClearColorIuiEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribI4uiEXT) {
-        void **procp = (void **) &disp->VertexAttribI4uiEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI4uiEXT",
-                 symbol_prefix);
+    if(!disp->BindBufferOffsetEXT) {
+        void ** procp = (void **) &disp->BindBufferOffsetEXT;
+        snprintf(symboln, sizeof(symboln), "%sBindBufferOffsetEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribI4uiEXT) {
-        void **procp = (void **) &disp->VertexAttribI4uiEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI4ui", symbol_prefix);
+    if(!disp->GetObjectParameterivAPPLE) {
+        void ** procp = (void **) &disp->GetObjectParameterivAPPLE;
+        snprintf(symboln, sizeof(symboln), "%sGetObjectParameterivAPPLE", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribI4uivEXT) {
-        void **procp = (void **) &disp->VertexAttribI4uivEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI4uivEXT",
-                 symbol_prefix);
+    if(!disp->ObjectPurgeableAPPLE) {
+        void ** procp = (void **) &disp->ObjectPurgeableAPPLE;
+        snprintf(symboln, sizeof(symboln), "%sObjectPurgeableAPPLE", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribI4uivEXT) {
-        void **procp = (void **) &disp->VertexAttribI4uivEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI4uiv",
-                 symbol_prefix);
+    if(!disp->ObjectUnpurgeableAPPLE) {
+        void ** procp = (void **) &disp->ObjectUnpurgeableAPPLE;
+        snprintf(symboln, sizeof(symboln), "%sObjectUnpurgeableAPPLE", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribI4usvEXT) {
-        void **procp = (void **) &disp->VertexAttribI4usvEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI4usvEXT",
-                 symbol_prefix);
+    if(!disp->ActiveProgramEXT) {
+        void ** procp = (void **) &disp->ActiveProgramEXT;
+        snprintf(symboln, sizeof(symboln), "%sActiveProgramEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribI4usvEXT) {
-        void **procp = (void **) &disp->VertexAttribI4usvEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribI4usv",
-                 symbol_prefix);
+    if(!disp->CreateShaderProgramEXT) {
+        void ** procp = (void **) &disp->CreateShaderProgramEXT;
+        snprintf(symboln, sizeof(symboln), "%sCreateShaderProgramEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribIPointerEXT) {
-        void **procp = (void **) &disp->VertexAttribIPointerEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribIPointerEXT",
-                 symbol_prefix);
+    if(!disp->UseShaderProgramEXT) {
+        void ** procp = (void **) &disp->UseShaderProgramEXT;
+        snprintf(symboln, sizeof(symboln), "%sUseShaderProgramEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->VertexAttribIPointerEXT) {
-        void **procp = (void **) &disp->VertexAttribIPointerEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribIPointer",
-                 symbol_prefix);
+    if(!disp->TextureBarrierNV) {
+        void ** procp = (void **) &disp->TextureBarrierNV;
+        snprintf(symboln, sizeof(symboln), "%sTextureBarrierNV", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->FramebufferTextureLayerEXT) {
-        void **procp = (void **) &disp->FramebufferTextureLayerEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sFramebufferTextureLayer",
-                 symbol_prefix);
+    if(!disp->StencilFuncSeparateATI) {
+        void ** procp = (void **) &disp->StencilFuncSeparateATI;
+        snprintf(symboln, sizeof(symboln), "%sStencilFuncSeparateATI", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->FramebufferTextureLayerEXT) {
-        void **procp = (void **) &disp->FramebufferTextureLayerEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sFramebufferTextureLayerARB",
-                 symbol_prefix);
+    if(!disp->ProgramEnvParameters4fvEXT) {
+        void ** procp = (void **) &disp->ProgramEnvParameters4fvEXT;
+        snprintf(symboln, sizeof(symboln), "%sProgramEnvParameters4fvEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->FramebufferTextureLayerEXT) {
-        void **procp = (void **) &disp->FramebufferTextureLayerEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sFramebufferTextureLayerEXT",
-                 symbol_prefix);
+    if(!disp->ProgramLocalParameters4fvEXT) {
+        void ** procp = (void **) &disp->ProgramLocalParameters4fvEXT;
+        snprintf(symboln, sizeof(symboln), "%sProgramLocalParameters4fvEXT", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ColorMaskIndexedEXT) {
-        void **procp = (void **) &disp->ColorMaskIndexedEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sColorMaskIndexedEXT",
-                 symbol_prefix);
+    if(!disp->EGLImageTargetRenderbufferStorageOES) {
+        void ** procp = (void **) &disp->EGLImageTargetRenderbufferStorageOES;
+        snprintf(symboln, sizeof(symboln), "%sEGLImageTargetRenderbufferStorageOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ColorMaskIndexedEXT) {
-        void **procp = (void **) &disp->ColorMaskIndexedEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sColorMaski", symbol_prefix);
+    if(!disp->EGLImageTargetTexture2DOES) {
+        void ** procp = (void **) &disp->EGLImageTargetTexture2DOES;
+        snprintf(symboln, sizeof(symboln), "%sEGLImageTargetTexture2DOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DisableIndexedEXT) {
-        void **procp = (void **) &disp->DisableIndexedEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sDisableIndexedEXT",
-                 symbol_prefix);
+    if(!disp->AlphaFuncx) {
+        void ** procp = (void **) &disp->AlphaFuncx;
+        snprintf(symboln, sizeof(symboln), "%sAlphaFuncxOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->DisableIndexedEXT) {
-        void **procp = (void **) &disp->DisableIndexedEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sDisablei", symbol_prefix);
+    if(!disp->AlphaFuncx) {
+        void ** procp = (void **) &disp->AlphaFuncx;
+        snprintf(symboln, sizeof(symboln), "%sAlphaFuncx", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->EnableIndexedEXT) {
-        void **procp = (void **) &disp->EnableIndexedEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sEnableIndexedEXT", symbol_prefix);
+    if(!disp->ClearColorx) {
+        void ** procp = (void **) &disp->ClearColorx;
+        snprintf(symboln, sizeof(symboln), "%sClearColorxOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->EnableIndexedEXT) {
-        void **procp = (void **) &disp->EnableIndexedEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sEnablei", symbol_prefix);
+    if(!disp->ClearColorx) {
+        void ** procp = (void **) &disp->ClearColorx;
+        snprintf(symboln, sizeof(symboln), "%sClearColorx", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetBooleanIndexedvEXT) {
-        void **procp = (void **) &disp->GetBooleanIndexedvEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sGetBooleanIndexedvEXT",
-                 symbol_prefix);
+    if(!disp->ClearDepthx) {
+        void ** procp = (void **) &disp->ClearDepthx;
+        snprintf(symboln, sizeof(symboln), "%sClearDepthxOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetBooleanIndexedvEXT) {
-        void **procp = (void **) &disp->GetBooleanIndexedvEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sGetBooleani_v", symbol_prefix);
+    if(!disp->ClearDepthx) {
+        void ** procp = (void **) &disp->ClearDepthx;
+        snprintf(symboln, sizeof(symboln), "%sClearDepthx", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetIntegerIndexedvEXT) {
-        void **procp = (void **) &disp->GetIntegerIndexedvEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sGetIntegerIndexedvEXT",
-                 symbol_prefix);
+    if(!disp->Color4x) {
+        void ** procp = (void **) &disp->Color4x;
+        snprintf(symboln, sizeof(symboln), "%sColor4xOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetIntegerIndexedvEXT) {
-        void **procp = (void **) &disp->GetIntegerIndexedvEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sGetIntegeri_v", symbol_prefix);
+    if(!disp->Color4x) {
+        void ** procp = (void **) &disp->Color4x;
+        snprintf(symboln, sizeof(symboln), "%sColor4x", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->IsEnabledIndexedEXT) {
-        void **procp = (void **) &disp->IsEnabledIndexedEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sIsEnabledIndexedEXT",
-                 symbol_prefix);
+    if(!disp->DepthRangex) {
+        void ** procp = (void **) &disp->DepthRangex;
+        snprintf(symboln, sizeof(symboln), "%sDepthRangexOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->IsEnabledIndexedEXT) {
-        void **procp = (void **) &disp->IsEnabledIndexedEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sIsEnabledi", symbol_prefix);
+    if(!disp->DepthRangex) {
+        void ** procp = (void **) &disp->DepthRangex;
+        snprintf(symboln, sizeof(symboln), "%sDepthRangex", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ClearColorIiEXT) {
-        void **procp = (void **) &disp->ClearColorIiEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sClearColorIiEXT", symbol_prefix);
+    if(!disp->Fogx) {
+        void ** procp = (void **) &disp->Fogx;
+        snprintf(symboln, sizeof(symboln), "%sFogxOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ClearColorIuiEXT) {
-        void **procp = (void **) &disp->ClearColorIuiEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sClearColorIuiEXT", symbol_prefix);
+    if(!disp->Fogx) {
+        void ** procp = (void **) &disp->Fogx;
+        snprintf(symboln, sizeof(symboln), "%sFogx", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetTexParameterIivEXT) {
-        void **procp = (void **) &disp->GetTexParameterIivEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sGetTexParameterIivEXT",
-                 symbol_prefix);
+    if(!disp->Fogxv) {
+        void ** procp = (void **) &disp->Fogxv;
+        snprintf(symboln, sizeof(symboln), "%sFogxvOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetTexParameterIivEXT) {
-        void **procp = (void **) &disp->GetTexParameterIivEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sGetTexParameterIiv",
-                 symbol_prefix);
+    if(!disp->Fogxv) {
+        void ** procp = (void **) &disp->Fogxv;
+        snprintf(symboln, sizeof(symboln), "%sFogxv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetTexParameterIuivEXT) {
-        void **procp = (void **) &disp->GetTexParameterIuivEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sGetTexParameterIuivEXT",
-                 symbol_prefix);
+    if(!disp->Frustumf) {
+        void ** procp = (void **) &disp->Frustumf;
+        snprintf(symboln, sizeof(symboln), "%sFrustumfOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetTexParameterIuivEXT) {
-        void **procp = (void **) &disp->GetTexParameterIuivEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sGetTexParameterIuiv",
-                 symbol_prefix);
+    if(!disp->Frustumf) {
+        void ** procp = (void **) &disp->Frustumf;
+        snprintf(symboln, sizeof(symboln), "%sFrustumf", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexParameterIivEXT) {
-        void **procp = (void **) &disp->TexParameterIivEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sTexParameterIivEXT",
-                 symbol_prefix);
+    if(!disp->Frustumx) {
+        void ** procp = (void **) &disp->Frustumx;
+        snprintf(symboln, sizeof(symboln), "%sFrustumxOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexParameterIivEXT) {
-        void **procp = (void **) &disp->TexParameterIivEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sTexParameterIiv", symbol_prefix);
+    if(!disp->Frustumx) {
+        void ** procp = (void **) &disp->Frustumx;
+        snprintf(symboln, sizeof(symboln), "%sFrustumx", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexParameterIuivEXT) {
-        void **procp = (void **) &disp->TexParameterIuivEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sTexParameterIuivEXT",
-                 symbol_prefix);
+    if(!disp->LightModelx) {
+        void ** procp = (void **) &disp->LightModelx;
+        snprintf(symboln, sizeof(symboln), "%sLightModelxOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TexParameterIuivEXT) {
-        void **procp = (void **) &disp->TexParameterIuivEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sTexParameterIuiv", symbol_prefix);
+    if(!disp->LightModelx) {
+        void ** procp = (void **) &disp->LightModelx;
+        snprintf(symboln, sizeof(symboln), "%sLightModelx", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BeginConditionalRenderNV) {
-        void **procp = (void **) &disp->BeginConditionalRenderNV;
 
-        snprintf(symboln, sizeof(symboln), "%sBeginConditionalRenderNV",
-                 symbol_prefix);
+    if(!disp->LightModelxv) {
+        void ** procp = (void **) &disp->LightModelxv;
+        snprintf(symboln, sizeof(symboln), "%sLightModelxvOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BeginConditionalRenderNV) {
-        void **procp = (void **) &disp->BeginConditionalRenderNV;
 
-        snprintf(symboln, sizeof(symboln), "%sBeginConditionalRender",
-                 symbol_prefix);
+    if(!disp->LightModelxv) {
+        void ** procp = (void **) &disp->LightModelxv;
+        snprintf(symboln, sizeof(symboln), "%sLightModelxv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->EndConditionalRenderNV) {
-        void **procp = (void **) &disp->EndConditionalRenderNV;
 
-        snprintf(symboln, sizeof(symboln), "%sEndConditionalRenderNV",
-                 symbol_prefix);
+    if(!disp->Lightx) {
+        void ** procp = (void **) &disp->Lightx;
+        snprintf(symboln, sizeof(symboln), "%sLightxOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->EndConditionalRenderNV) {
-        void **procp = (void **) &disp->EndConditionalRenderNV;
 
-        snprintf(symboln, sizeof(symboln), "%sEndConditionalRender",
-                 symbol_prefix);
+    if(!disp->Lightx) {
+        void ** procp = (void **) &disp->Lightx;
+        snprintf(symboln, sizeof(symboln), "%sLightx", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BeginTransformFeedbackEXT) {
-        void **procp = (void **) &disp->BeginTransformFeedbackEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sBeginTransformFeedbackEXT",
-                 symbol_prefix);
+    if(!disp->Lightxv) {
+        void ** procp = (void **) &disp->Lightxv;
+        snprintf(symboln, sizeof(symboln), "%sLightxvOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BeginTransformFeedbackEXT) {
-        void **procp = (void **) &disp->BeginTransformFeedbackEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sBeginTransformFeedback",
-                 symbol_prefix);
+    if(!disp->Lightxv) {
+        void ** procp = (void **) &disp->Lightxv;
+        snprintf(symboln, sizeof(symboln), "%sLightxv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BindBufferBaseEXT) {
-        void **procp = (void **) &disp->BindBufferBaseEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sBindBufferBaseEXT",
-                 symbol_prefix);
+    if(!disp->LineWidthx) {
+        void ** procp = (void **) &disp->LineWidthx;
+        snprintf(symboln, sizeof(symboln), "%sLineWidthxOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BindBufferBaseEXT) {
-        void **procp = (void **) &disp->BindBufferBaseEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sBindBufferBase", symbol_prefix);
+    if(!disp->LineWidthx) {
+        void ** procp = (void **) &disp->LineWidthx;
+        snprintf(symboln, sizeof(symboln), "%sLineWidthx", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BindBufferOffsetEXT) {
-        void **procp = (void **) &disp->BindBufferOffsetEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sBindBufferOffsetEXT",
-                 symbol_prefix);
+    if(!disp->LoadMatrixx) {
+        void ** procp = (void **) &disp->LoadMatrixx;
+        snprintf(symboln, sizeof(symboln), "%sLoadMatrixxOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BindBufferRangeEXT) {
-        void **procp = (void **) &disp->BindBufferRangeEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sBindBufferRangeEXT",
-                 symbol_prefix);
+    if(!disp->LoadMatrixx) {
+        void ** procp = (void **) &disp->LoadMatrixx;
+        snprintf(symboln, sizeof(symboln), "%sLoadMatrixx", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->BindBufferRangeEXT) {
-        void **procp = (void **) &disp->BindBufferRangeEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sBindBufferRange", symbol_prefix);
+    if(!disp->Materialx) {
+        void ** procp = (void **) &disp->Materialx;
+        snprintf(symboln, sizeof(symboln), "%sMaterialxOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->EndTransformFeedbackEXT) {
-        void **procp = (void **) &disp->EndTransformFeedbackEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sEndTransformFeedbackEXT",
-                 symbol_prefix);
+    if(!disp->Materialx) {
+        void ** procp = (void **) &disp->Materialx;
+        snprintf(symboln, sizeof(symboln), "%sMaterialx", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->EndTransformFeedbackEXT) {
-        void **procp = (void **) &disp->EndTransformFeedbackEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sEndTransformFeedback",
-                 symbol_prefix);
+    if(!disp->Materialxv) {
+        void ** procp = (void **) &disp->Materialxv;
+        snprintf(symboln, sizeof(symboln), "%sMaterialxvOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetTransformFeedbackVaryingEXT) {
-        void **procp = (void **) &disp->GetTransformFeedbackVaryingEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sGetTransformFeedbackVaryingEXT",
-                 symbol_prefix);
+    if(!disp->Materialxv) {
+        void ** procp = (void **) &disp->Materialxv;
+        snprintf(symboln, sizeof(symboln), "%sMaterialxv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetTransformFeedbackVaryingEXT) {
-        void **procp = (void **) &disp->GetTransformFeedbackVaryingEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sGetTransformFeedbackVarying",
-                 symbol_prefix);
+    if(!disp->MultMatrixx) {
+        void ** procp = (void **) &disp->MultMatrixx;
+        snprintf(symboln, sizeof(symboln), "%sMultMatrixxOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TransformFeedbackVaryingsEXT) {
-        void **procp = (void **) &disp->TransformFeedbackVaryingsEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sTransformFeedbackVaryingsEXT",
-                 symbol_prefix);
+    if(!disp->MultMatrixx) {
+        void ** procp = (void **) &disp->MultMatrixx;
+        snprintf(symboln, sizeof(symboln), "%sMultMatrixx", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TransformFeedbackVaryingsEXT) {
-        void **procp = (void **) &disp->TransformFeedbackVaryingsEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sTransformFeedbackVaryings",
-                 symbol_prefix);
+    if(!disp->MultiTexCoord4x) {
+        void ** procp = (void **) &disp->MultiTexCoord4x;
+        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord4xOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ProvokingVertexEXT) {
-        void **procp = (void **) &disp->ProvokingVertexEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sProvokingVertexEXT",
-                 symbol_prefix);
+    if(!disp->MultiTexCoord4x) {
+        void ** procp = (void **) &disp->MultiTexCoord4x;
+        snprintf(symboln, sizeof(symboln), "%sMultiTexCoord4x", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ProvokingVertexEXT) {
-        void **procp = (void **) &disp->ProvokingVertexEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sProvokingVertex", symbol_prefix);
+    if(!disp->Normal3x) {
+        void ** procp = (void **) &disp->Normal3x;
+        snprintf(symboln, sizeof(symboln), "%sNormal3xOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetTexParameterPointervAPPLE) {
-        void **procp = (void **) &disp->GetTexParameterPointervAPPLE;
 
-        snprintf(symboln, sizeof(symboln), "%sGetTexParameterPointervAPPLE",
-                 symbol_prefix);
+    if(!disp->Normal3x) {
+        void ** procp = (void **) &disp->Normal3x;
+        snprintf(symboln, sizeof(symboln), "%sNormal3x", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TextureRangeAPPLE) {
-        void **procp = (void **) &disp->TextureRangeAPPLE;
 
-        snprintf(symboln, sizeof(symboln), "%sTextureRangeAPPLE",
-                 symbol_prefix);
+    if(!disp->Orthof) {
+        void ** procp = (void **) &disp->Orthof;
+        snprintf(symboln, sizeof(symboln), "%sOrthofOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetObjectParameterivAPPLE) {
-        void **procp = (void **) &disp->GetObjectParameterivAPPLE;
 
-        snprintf(symboln, sizeof(symboln), "%sGetObjectParameterivAPPLE",
-                 symbol_prefix);
+    if(!disp->Orthof) {
+        void ** procp = (void **) &disp->Orthof;
+        snprintf(symboln, sizeof(symboln), "%sOrthof", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ObjectPurgeableAPPLE) {
-        void **procp = (void **) &disp->ObjectPurgeableAPPLE;
 
-        snprintf(symboln, sizeof(symboln), "%sObjectPurgeableAPPLE",
-                 symbol_prefix);
+    if(!disp->Orthox) {
+        void ** procp = (void **) &disp->Orthox;
+        snprintf(symboln, sizeof(symboln), "%sOrthoxOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ObjectUnpurgeableAPPLE) {
-        void **procp = (void **) &disp->ObjectUnpurgeableAPPLE;
 
-        snprintf(symboln, sizeof(symboln), "%sObjectUnpurgeableAPPLE",
-                 symbol_prefix);
+    if(!disp->Orthox) {
+        void ** procp = (void **) &disp->Orthox;
+        snprintf(symboln, sizeof(symboln), "%sOrthox", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ActiveProgramEXT) {
-        void **procp = (void **) &disp->ActiveProgramEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sActiveProgramEXT", symbol_prefix);
+    if(!disp->PointSizex) {
+        void ** procp = (void **) &disp->PointSizex;
+        snprintf(symboln, sizeof(symboln), "%sPointSizexOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->CreateShaderProgramEXT) {
-        void **procp = (void **) &disp->CreateShaderProgramEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sCreateShaderProgramEXT",
-                 symbol_prefix);
+    if(!disp->PointSizex) {
+        void ** procp = (void **) &disp->PointSizex;
+        snprintf(symboln, sizeof(symboln), "%sPointSizex", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->UseShaderProgramEXT) {
-        void **procp = (void **) &disp->UseShaderProgramEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sUseShaderProgramEXT",
-                 symbol_prefix);
+    if(!disp->PolygonOffsetx) {
+        void ** procp = (void **) &disp->PolygonOffsetx;
+        snprintf(symboln, sizeof(symboln), "%sPolygonOffsetxOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->TextureBarrierNV) {
-        void **procp = (void **) &disp->TextureBarrierNV;
 
-        snprintf(symboln, sizeof(symboln), "%sTextureBarrierNV", symbol_prefix);
+    if(!disp->PolygonOffsetx) {
+        void ** procp = (void **) &disp->PolygonOffsetx;
+        snprintf(symboln, sizeof(symboln), "%sPolygonOffsetx", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->Rotatex) {
+        void ** procp = (void **) &disp->Rotatex;
+        snprintf(symboln, sizeof(symboln), "%sRotatexOES", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->Rotatex) {
+        void ** procp = (void **) &disp->Rotatex;
+        snprintf(symboln, sizeof(symboln), "%sRotatex", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->SampleCoveragex) {
+        void ** procp = (void **) &disp->SampleCoveragex;
+        snprintf(symboln, sizeof(symboln), "%sSampleCoveragexOES", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->SampleCoveragex) {
+        void ** procp = (void **) &disp->SampleCoveragex;
+        snprintf(symboln, sizeof(symboln), "%sSampleCoveragex", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->Scalex) {
+        void ** procp = (void **) &disp->Scalex;
+        snprintf(symboln, sizeof(symboln), "%sScalexOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->StencilFuncSeparateATI) {
-        void **procp = (void **) &disp->StencilFuncSeparateATI;
 
-        snprintf(symboln, sizeof(symboln), "%sStencilFuncSeparateATI",
-                 symbol_prefix);
+    if(!disp->Scalex) {
+        void ** procp = (void **) &disp->Scalex;
+        snprintf(symboln, sizeof(symboln), "%sScalex", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ProgramEnvParameters4fvEXT) {
-        void **procp = (void **) &disp->ProgramEnvParameters4fvEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sProgramEnvParameters4fvEXT",
-                 symbol_prefix);
+    if(!disp->TexEnvx) {
+        void ** procp = (void **) &disp->TexEnvx;
+        snprintf(symboln, sizeof(symboln), "%sTexEnvxOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->ProgramLocalParameters4fvEXT) {
-        void **procp = (void **) &disp->ProgramLocalParameters4fvEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sProgramLocalParameters4fvEXT",
-                 symbol_prefix);
+    if(!disp->TexEnvx) {
+        void ** procp = (void **) &disp->TexEnvx;
+        snprintf(symboln, sizeof(symboln), "%sTexEnvx", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetQueryObjecti64vEXT) {
-        void **procp = (void **) &disp->GetQueryObjecti64vEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sGetQueryObjecti64vEXT",
-                 symbol_prefix);
+    if(!disp->TexEnvxv) {
+        void ** procp = (void **) &disp->TexEnvxv;
+        snprintf(symboln, sizeof(symboln), "%sTexEnvxvOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->GetQueryObjectui64vEXT) {
-        void **procp = (void **) &disp->GetQueryObjectui64vEXT;
 
-        snprintf(symboln, sizeof(symboln), "%sGetQueryObjectui64vEXT",
-                 symbol_prefix);
+    if(!disp->TexEnvxv) {
+        void ** procp = (void **) &disp->TexEnvxv;
+        snprintf(symboln, sizeof(symboln), "%sTexEnvxv", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->EGLImageTargetRenderbufferStorageOES) {
-        void **procp = (void **) &disp->EGLImageTargetRenderbufferStorageOES;
 
-        snprintf(symboln, sizeof(symboln),
-                 "%sEGLImageTargetRenderbufferStorageOES", symbol_prefix);
+    if(!disp->TexParameterx) {
+        void ** procp = (void **) &disp->TexParameterx;
+        snprintf(symboln, sizeof(symboln), "%sTexParameterxOES", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
-    if (!disp->EGLImageTargetTexture2DOES) {
-        void **procp = (void **) &disp->EGLImageTargetTexture2DOES;
 
-        snprintf(symboln, sizeof(symboln), "%sEGLImageTargetTexture2DOES",
-                 symbol_prefix);
+    if(!disp->TexParameterx) {
+        void ** procp = (void **) &disp->TexParameterx;
+        snprintf(symboln, sizeof(symboln), "%sTexParameterx", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
+
+    if(!disp->Translatex) {
+        void ** procp = (void **) &disp->Translatex;
+        snprintf(symboln, sizeof(symboln), "%sTranslatexOES", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->Translatex) {
+        void ** procp = (void **) &disp->Translatex;
+        snprintf(symboln, sizeof(symboln), "%sTranslatex", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->ClipPlanef) {
+        void ** procp = (void **) &disp->ClipPlanef;
+        snprintf(symboln, sizeof(symboln), "%sClipPlanefOES", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->ClipPlanef) {
+        void ** procp = (void **) &disp->ClipPlanef;
+        snprintf(symboln, sizeof(symboln), "%sClipPlanef", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->ClipPlanex) {
+        void ** procp = (void **) &disp->ClipPlanex;
+        snprintf(symboln, sizeof(symboln), "%sClipPlanexOES", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->ClipPlanex) {
+        void ** procp = (void **) &disp->ClipPlanex;
+        snprintf(symboln, sizeof(symboln), "%sClipPlanex", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->GetClipPlanef) {
+        void ** procp = (void **) &disp->GetClipPlanef;
+        snprintf(symboln, sizeof(symboln), "%sGetClipPlanefOES", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->GetClipPlanef) {
+        void ** procp = (void **) &disp->GetClipPlanef;
+        snprintf(symboln, sizeof(symboln), "%sGetClipPlanef", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->GetClipPlanex) {
+        void ** procp = (void **) &disp->GetClipPlanex;
+        snprintf(symboln, sizeof(symboln), "%sGetClipPlanexOES", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->GetClipPlanex) {
+        void ** procp = (void **) &disp->GetClipPlanex;
+        snprintf(symboln, sizeof(symboln), "%sGetClipPlanex", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->GetFixedv) {
+        void ** procp = (void **) &disp->GetFixedv;
+        snprintf(symboln, sizeof(symboln), "%sGetFixedvOES", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->GetFixedv) {
+        void ** procp = (void **) &disp->GetFixedv;
+        snprintf(symboln, sizeof(symboln), "%sGetFixedv", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->GetLightxv) {
+        void ** procp = (void **) &disp->GetLightxv;
+        snprintf(symboln, sizeof(symboln), "%sGetLightxvOES", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->GetLightxv) {
+        void ** procp = (void **) &disp->GetLightxv;
+        snprintf(symboln, sizeof(symboln), "%sGetLightxv", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->GetMaterialxv) {
+        void ** procp = (void **) &disp->GetMaterialxv;
+        snprintf(symboln, sizeof(symboln), "%sGetMaterialxvOES", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->GetMaterialxv) {
+        void ** procp = (void **) &disp->GetMaterialxv;
+        snprintf(symboln, sizeof(symboln), "%sGetMaterialxv", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->GetTexEnvxv) {
+        void ** procp = (void **) &disp->GetTexEnvxv;
+        snprintf(symboln, sizeof(symboln), "%sGetTexEnvxvOES", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->GetTexEnvxv) {
+        void ** procp = (void **) &disp->GetTexEnvxv;
+        snprintf(symboln, sizeof(symboln), "%sGetTexEnvxv", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->GetTexParameterxv) {
+        void ** procp = (void **) &disp->GetTexParameterxv;
+        snprintf(symboln, sizeof(symboln), "%sGetTexParameterxvOES", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->GetTexParameterxv) {
+        void ** procp = (void **) &disp->GetTexParameterxv;
+        snprintf(symboln, sizeof(symboln), "%sGetTexParameterxv", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->PointParameterx) {
+        void ** procp = (void **) &disp->PointParameterx;
+        snprintf(symboln, sizeof(symboln), "%sPointParameterxOES", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->PointParameterx) {
+        void ** procp = (void **) &disp->PointParameterx;
+        snprintf(symboln, sizeof(symboln), "%sPointParameterx", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->PointParameterxv) {
+        void ** procp = (void **) &disp->PointParameterxv;
+        snprintf(symboln, sizeof(symboln), "%sPointParameterxvOES", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->PointParameterxv) {
+        void ** procp = (void **) &disp->PointParameterxv;
+        snprintf(symboln, sizeof(symboln), "%sPointParameterxv", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->TexParameterxv) {
+        void ** procp = (void **) &disp->TexParameterxv;
+        snprintf(symboln, sizeof(symboln), "%sTexParameterxvOES", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->TexParameterxv) {
+        void ** procp = (void **) &disp->TexParameterxv;
+        snprintf(symboln, sizeof(symboln), "%sTexParameterxv", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
     __glapi_gentable_set_remaining_noop(disp);
 
     return disp;
 }
+
diff --git a/xorg-server/glx/glapitable.h b/xorg-server/glx/glapitable.h
index f7e7c6c97..47bb3cb49 100644
--- a/xorg-server/glx/glapitable.h
+++ b/xorg-server/glx/glapitable.h
@@ -1,1016 +1,1074 @@
-/* DO NOT EDIT - This file generated automatically by gl_table.py (from Mesa) script */
-
-/*
- * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
- * (C) Copyright IBM Corporation 2004
- * All Rights Reserved.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sub license,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL, IBM,
- * AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#if !defined( _GLAPI_TABLE_H_ )
-#define _GLAPI_TABLE_H_
-
-#ifndef GLAPIENTRYP
-#ifndef GLAPIENTRY
-#define GLAPIENTRY
-#endif
-
-#define GLAPIENTRYP GLAPIENTRY *
-#endif
-
-struct _glapi_table {
-    void (GLAPIENTRYP NewList) (GLuint list, GLenum mode);      /* 0 */
-    void (GLAPIENTRYP EndList) (void);  /* 1 */
-    void (GLAPIENTRYP CallList) (GLuint list);  /* 2 */
-    void (GLAPIENTRYP CallLists) (GLsizei n, GLenum type, const GLvoid * lists);        /* 3 */
-    void (GLAPIENTRYP DeleteLists) (GLuint list, GLsizei range);        /* 4 */
-     GLuint(GLAPIENTRYP GenLists) (GLsizei range);      /* 5 */
-    void (GLAPIENTRYP ListBase) (GLuint base);  /* 6 */
-    void (GLAPIENTRYP Begin) (GLenum mode);     /* 7 */
-    void (GLAPIENTRYP Bitmap) (GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte * bitmap);      /* 8 */
-    void (GLAPIENTRYP Color3b) (GLbyte red, GLbyte green, GLbyte blue); /* 9 */
-    void (GLAPIENTRYP Color3bv) (const GLbyte * v);     /* 10 */
-    void (GLAPIENTRYP Color3d) (GLdouble red, GLdouble green, GLdouble blue);   /* 11 */
-    void (GLAPIENTRYP Color3dv) (const GLdouble * v);   /* 12 */
-    void (GLAPIENTRYP Color3f) (GLfloat red, GLfloat green, GLfloat blue);      /* 13 */
-    void (GLAPIENTRYP Color3fv) (const GLfloat * v);    /* 14 */
-    void (GLAPIENTRYP Color3i) (GLint red, GLint green, GLint blue);    /* 15 */
-    void (GLAPIENTRYP Color3iv) (const GLint * v);      /* 16 */
-    void (GLAPIENTRYP Color3s) (GLshort red, GLshort green, GLshort blue);      /* 17 */
-    void (GLAPIENTRYP Color3sv) (const GLshort * v);    /* 18 */
-    void (GLAPIENTRYP Color3ub) (GLubyte red, GLubyte green, GLubyte blue);     /* 19 */
-    void (GLAPIENTRYP Color3ubv) (const GLubyte * v);   /* 20 */
-    void (GLAPIENTRYP Color3ui) (GLuint red, GLuint green, GLuint blue);        /* 21 */
-    void (GLAPIENTRYP Color3uiv) (const GLuint * v);    /* 22 */
-    void (GLAPIENTRYP Color3us) (GLushort red, GLushort green, GLushort blue);  /* 23 */
-    void (GLAPIENTRYP Color3usv) (const GLushort * v);  /* 24 */
-    void (GLAPIENTRYP Color4b) (GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha);   /* 25 */
-    void (GLAPIENTRYP Color4bv) (const GLbyte * v);     /* 26 */
-    void (GLAPIENTRYP Color4d) (GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha);   /* 27 */
-    void (GLAPIENTRYP Color4dv) (const GLdouble * v);   /* 28 */
-    void (GLAPIENTRYP Color4f) (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);       /* 29 */
-    void (GLAPIENTRYP Color4fv) (const GLfloat * v);    /* 30 */
-    void (GLAPIENTRYP Color4i) (GLint red, GLint green, GLint blue, GLint alpha);       /* 31 */
-    void (GLAPIENTRYP Color4iv) (const GLint * v);      /* 32 */
-    void (GLAPIENTRYP Color4s) (GLshort red, GLshort green, GLshort blue, GLshort alpha);       /* 33 */
-    void (GLAPIENTRYP Color4sv) (const GLshort * v);    /* 34 */
-    void (GLAPIENTRYP Color4ub) (GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha);      /* 35 */
-    void (GLAPIENTRYP Color4ubv) (const GLubyte * v);   /* 36 */
-    void (GLAPIENTRYP Color4ui) (GLuint red, GLuint green, GLuint blue, GLuint alpha);  /* 37 */
-    void (GLAPIENTRYP Color4uiv) (const GLuint * v);    /* 38 */
-    void (GLAPIENTRYP Color4us) (GLushort red, GLushort green, GLushort blue, GLushort alpha);  /* 39 */
-    void (GLAPIENTRYP Color4usv) (const GLushort * v);  /* 40 */
-    void (GLAPIENTRYP EdgeFlag) (GLboolean flag);       /* 41 */
-    void (GLAPIENTRYP EdgeFlagv) (const GLboolean * flag);      /* 42 */
-    void (GLAPIENTRYP End) (void);      /* 43 */
-    void (GLAPIENTRYP Indexd) (GLdouble c);     /* 44 */
-    void (GLAPIENTRYP Indexdv) (const GLdouble * c);    /* 45 */
-    void (GLAPIENTRYP Indexf) (GLfloat c);      /* 46 */
-    void (GLAPIENTRYP Indexfv) (const GLfloat * c);     /* 47 */
-    void (GLAPIENTRYP Indexi) (GLint c);        /* 48 */
-    void (GLAPIENTRYP Indexiv) (const GLint * c);       /* 49 */
-    void (GLAPIENTRYP Indexs) (GLshort c);      /* 50 */
-    void (GLAPIENTRYP Indexsv) (const GLshort * c);     /* 51 */
-    void (GLAPIENTRYP Normal3b) (GLbyte nx, GLbyte ny, GLbyte nz);      /* 52 */
-    void (GLAPIENTRYP Normal3bv) (const GLbyte * v);    /* 53 */
-    void (GLAPIENTRYP Normal3d) (GLdouble nx, GLdouble ny, GLdouble nz);        /* 54 */
-    void (GLAPIENTRYP Normal3dv) (const GLdouble * v);  /* 55 */
-    void (GLAPIENTRYP Normal3f) (GLfloat nx, GLfloat ny, GLfloat nz);   /* 56 */
-    void (GLAPIENTRYP Normal3fv) (const GLfloat * v);   /* 57 */
-    void (GLAPIENTRYP Normal3i) (GLint nx, GLint ny, GLint nz); /* 58 */
-    void (GLAPIENTRYP Normal3iv) (const GLint * v);     /* 59 */
-    void (GLAPIENTRYP Normal3s) (GLshort nx, GLshort ny, GLshort nz);   /* 60 */
-    void (GLAPIENTRYP Normal3sv) (const GLshort * v);   /* 61 */
-    void (GLAPIENTRYP RasterPos2d) (GLdouble x, GLdouble y);    /* 62 */
-    void (GLAPIENTRYP RasterPos2dv) (const GLdouble * v);       /* 63 */
-    void (GLAPIENTRYP RasterPos2f) (GLfloat x, GLfloat y);      /* 64 */
-    void (GLAPIENTRYP RasterPos2fv) (const GLfloat * v);        /* 65 */
-    void (GLAPIENTRYP RasterPos2i) (GLint x, GLint y);  /* 66 */
-    void (GLAPIENTRYP RasterPos2iv) (const GLint * v);  /* 67 */
-    void (GLAPIENTRYP RasterPos2s) (GLshort x, GLshort y);      /* 68 */
-    void (GLAPIENTRYP RasterPos2sv) (const GLshort * v);        /* 69 */
-    void (GLAPIENTRYP RasterPos3d) (GLdouble x, GLdouble y, GLdouble z);        /* 70 */
-    void (GLAPIENTRYP RasterPos3dv) (const GLdouble * v);       /* 71 */
-    void (GLAPIENTRYP RasterPos3f) (GLfloat x, GLfloat y, GLfloat z);   /* 72 */
-    void (GLAPIENTRYP RasterPos3fv) (const GLfloat * v);        /* 73 */
-    void (GLAPIENTRYP RasterPos3i) (GLint x, GLint y, GLint z); /* 74 */
-    void (GLAPIENTRYP RasterPos3iv) (const GLint * v);  /* 75 */
-    void (GLAPIENTRYP RasterPos3s) (GLshort x, GLshort y, GLshort z);   /* 76 */
-    void (GLAPIENTRYP RasterPos3sv) (const GLshort * v);        /* 77 */
-    void (GLAPIENTRYP RasterPos4d) (GLdouble x, GLdouble y, GLdouble z, GLdouble w);    /* 78 */
-    void (GLAPIENTRYP RasterPos4dv) (const GLdouble * v);       /* 79 */
-    void (GLAPIENTRYP RasterPos4f) (GLfloat x, GLfloat y, GLfloat z, GLfloat w);        /* 80 */
-    void (GLAPIENTRYP RasterPos4fv) (const GLfloat * v);        /* 81 */
-    void (GLAPIENTRYP RasterPos4i) (GLint x, GLint y, GLint z, GLint w);        /* 82 */
-    void (GLAPIENTRYP RasterPos4iv) (const GLint * v);  /* 83 */
-    void (GLAPIENTRYP RasterPos4s) (GLshort x, GLshort y, GLshort z, GLshort w);        /* 84 */
-    void (GLAPIENTRYP RasterPos4sv) (const GLshort * v);        /* 85 */
-    void (GLAPIENTRYP Rectd) (GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2);      /* 86 */
-    void (GLAPIENTRYP Rectdv) (const GLdouble * v1, const GLdouble * v2);       /* 87 */
-    void (GLAPIENTRYP Rectf) (GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2);  /* 88 */
-    void (GLAPIENTRYP Rectfv) (const GLfloat * v1, const GLfloat * v2); /* 89 */
-    void (GLAPIENTRYP Recti) (GLint x1, GLint y1, GLint x2, GLint y2);  /* 90 */
-    void (GLAPIENTRYP Rectiv) (const GLint * v1, const GLint * v2);     /* 91 */
-    void (GLAPIENTRYP Rects) (GLshort x1, GLshort y1, GLshort x2, GLshort y2);  /* 92 */
-    void (GLAPIENTRYP Rectsv) (const GLshort * v1, const GLshort * v2); /* 93 */
-    void (GLAPIENTRYP TexCoord1d) (GLdouble s); /* 94 */
-    void (GLAPIENTRYP TexCoord1dv) (const GLdouble * v);        /* 95 */
-    void (GLAPIENTRYP TexCoord1f) (GLfloat s);  /* 96 */
-    void (GLAPIENTRYP TexCoord1fv) (const GLfloat * v); /* 97 */
-    void (GLAPIENTRYP TexCoord1i) (GLint s);    /* 98 */
-    void (GLAPIENTRYP TexCoord1iv) (const GLint * v);   /* 99 */
-    void (GLAPIENTRYP TexCoord1s) (GLshort s);  /* 100 */
-    void (GLAPIENTRYP TexCoord1sv) (const GLshort * v); /* 101 */
-    void (GLAPIENTRYP TexCoord2d) (GLdouble s, GLdouble t);     /* 102 */
-    void (GLAPIENTRYP TexCoord2dv) (const GLdouble * v);        /* 103 */
-    void (GLAPIENTRYP TexCoord2f) (GLfloat s, GLfloat t);       /* 104 */
-    void (GLAPIENTRYP TexCoord2fv) (const GLfloat * v); /* 105 */
-    void (GLAPIENTRYP TexCoord2i) (GLint s, GLint t);   /* 106 */
-    void (GLAPIENTRYP TexCoord2iv) (const GLint * v);   /* 107 */
-    void (GLAPIENTRYP TexCoord2s) (GLshort s, GLshort t);       /* 108 */
-    void (GLAPIENTRYP TexCoord2sv) (const GLshort * v); /* 109 */
-    void (GLAPIENTRYP TexCoord3d) (GLdouble s, GLdouble t, GLdouble r); /* 110 */
-    void (GLAPIENTRYP TexCoord3dv) (const GLdouble * v);        /* 111 */
-    void (GLAPIENTRYP TexCoord3f) (GLfloat s, GLfloat t, GLfloat r);    /* 112 */
-    void (GLAPIENTRYP TexCoord3fv) (const GLfloat * v); /* 113 */
-    void (GLAPIENTRYP TexCoord3i) (GLint s, GLint t, GLint r);  /* 114 */
-    void (GLAPIENTRYP TexCoord3iv) (const GLint * v);   /* 115 */
-    void (GLAPIENTRYP TexCoord3s) (GLshort s, GLshort t, GLshort r);    /* 116 */
-    void (GLAPIENTRYP TexCoord3sv) (const GLshort * v); /* 117 */
-    void (GLAPIENTRYP TexCoord4d) (GLdouble s, GLdouble t, GLdouble r, GLdouble q);     /* 118 */
-    void (GLAPIENTRYP TexCoord4dv) (const GLdouble * v);        /* 119 */
-    void (GLAPIENTRYP TexCoord4f) (GLfloat s, GLfloat t, GLfloat r, GLfloat q); /* 120 */
-    void (GLAPIENTRYP TexCoord4fv) (const GLfloat * v); /* 121 */
-    void (GLAPIENTRYP TexCoord4i) (GLint s, GLint t, GLint r, GLint q); /* 122 */
-    void (GLAPIENTRYP TexCoord4iv) (const GLint * v);   /* 123 */
-    void (GLAPIENTRYP TexCoord4s) (GLshort s, GLshort t, GLshort r, GLshort q); /* 124 */
-    void (GLAPIENTRYP TexCoord4sv) (const GLshort * v); /* 125 */
-    void (GLAPIENTRYP Vertex2d) (GLdouble x, GLdouble y);       /* 126 */
-    void (GLAPIENTRYP Vertex2dv) (const GLdouble * v);  /* 127 */
-    void (GLAPIENTRYP Vertex2f) (GLfloat x, GLfloat y); /* 128 */
-    void (GLAPIENTRYP Vertex2fv) (const GLfloat * v);   /* 129 */
-    void (GLAPIENTRYP Vertex2i) (GLint x, GLint y);     /* 130 */
-    void (GLAPIENTRYP Vertex2iv) (const GLint * v);     /* 131 */
-    void (GLAPIENTRYP Vertex2s) (GLshort x, GLshort y); /* 132 */
-    void (GLAPIENTRYP Vertex2sv) (const GLshort * v);   /* 133 */
-    void (GLAPIENTRYP Vertex3d) (GLdouble x, GLdouble y, GLdouble z);   /* 134 */
-    void (GLAPIENTRYP Vertex3dv) (const GLdouble * v);  /* 135 */
-    void (GLAPIENTRYP Vertex3f) (GLfloat x, GLfloat y, GLfloat z);      /* 136 */
-    void (GLAPIENTRYP Vertex3fv) (const GLfloat * v);   /* 137 */
-    void (GLAPIENTRYP Vertex3i) (GLint x, GLint y, GLint z);    /* 138 */
-    void (GLAPIENTRYP Vertex3iv) (const GLint * v);     /* 139 */
-    void (GLAPIENTRYP Vertex3s) (GLshort x, GLshort y, GLshort z);      /* 140 */
-    void (GLAPIENTRYP Vertex3sv) (const GLshort * v);   /* 141 */
-    void (GLAPIENTRYP Vertex4d) (GLdouble x, GLdouble y, GLdouble z, GLdouble w);       /* 142 */
-    void (GLAPIENTRYP Vertex4dv) (const GLdouble * v);  /* 143 */
-    void (GLAPIENTRYP Vertex4f) (GLfloat x, GLfloat y, GLfloat z, GLfloat w);   /* 144 */
-    void (GLAPIENTRYP Vertex4fv) (const GLfloat * v);   /* 145 */
-    void (GLAPIENTRYP Vertex4i) (GLint x, GLint y, GLint z, GLint w);   /* 146 */
-    void (GLAPIENTRYP Vertex4iv) (const GLint * v);     /* 147 */
-    void (GLAPIENTRYP Vertex4s) (GLshort x, GLshort y, GLshort z, GLshort w);   /* 148 */
-    void (GLAPIENTRYP Vertex4sv) (const GLshort * v);   /* 149 */
-    void (GLAPIENTRYP ClipPlane) (GLenum plane, const GLdouble * equation);     /* 150 */
-    void (GLAPIENTRYP ColorMaterial) (GLenum face, GLenum mode);        /* 151 */
-    void (GLAPIENTRYP CullFace) (GLenum mode);  /* 152 */
-    void (GLAPIENTRYP Fogf) (GLenum pname, GLfloat param);      /* 153 */
-    void (GLAPIENTRYP Fogfv) (GLenum pname, const GLfloat * params);    /* 154 */
-    void (GLAPIENTRYP Fogi) (GLenum pname, GLint param);        /* 155 */
-    void (GLAPIENTRYP Fogiv) (GLenum pname, const GLint * params);      /* 156 */
-    void (GLAPIENTRYP FrontFace) (GLenum mode); /* 157 */
-    void (GLAPIENTRYP Hint) (GLenum target, GLenum mode);       /* 158 */
-    void (GLAPIENTRYP Lightf) (GLenum light, GLenum pname, GLfloat param);      /* 159 */
-    void (GLAPIENTRYP Lightfv) (GLenum light, GLenum pname, const GLfloat * params);    /* 160 */
-    void (GLAPIENTRYP Lighti) (GLenum light, GLenum pname, GLint param);        /* 161 */
-    void (GLAPIENTRYP Lightiv) (GLenum light, GLenum pname, const GLint * params);      /* 162 */
-    void (GLAPIENTRYP LightModelf) (GLenum pname, GLfloat param);       /* 163 */
-    void (GLAPIENTRYP LightModelfv) (GLenum pname, const GLfloat * params);     /* 164 */
-    void (GLAPIENTRYP LightModeli) (GLenum pname, GLint param); /* 165 */
-    void (GLAPIENTRYP LightModeliv) (GLenum pname, const GLint * params);       /* 166 */
-    void (GLAPIENTRYP LineStipple) (GLint factor, GLushort pattern);    /* 167 */
-    void (GLAPIENTRYP LineWidth) (GLfloat width);       /* 168 */
-    void (GLAPIENTRYP Materialf) (GLenum face, GLenum pname, GLfloat param);    /* 169 */
-    void (GLAPIENTRYP Materialfv) (GLenum face, GLenum pname, const GLfloat * params);  /* 170 */
-    void (GLAPIENTRYP Materiali) (GLenum face, GLenum pname, GLint param);      /* 171 */
-    void (GLAPIENTRYP Materialiv) (GLenum face, GLenum pname, const GLint * params);    /* 172 */
-    void (GLAPIENTRYP PointSize) (GLfloat size);        /* 173 */
-    void (GLAPIENTRYP PolygonMode) (GLenum face, GLenum mode);  /* 174 */
-    void (GLAPIENTRYP PolygonStipple) (const GLubyte * mask);   /* 175 */
-    void (GLAPIENTRYP Scissor) (GLint x, GLint y, GLsizei width, GLsizei height);       /* 176 */
-    void (GLAPIENTRYP ShadeModel) (GLenum mode);        /* 177 */
-    void (GLAPIENTRYP TexParameterf) (GLenum target, GLenum pname, GLfloat param);      /* 178 */
-    void (GLAPIENTRYP TexParameterfv) (GLenum target, GLenum pname, const GLfloat * params);    /* 179 */
-    void (GLAPIENTRYP TexParameteri) (GLenum target, GLenum pname, GLint param);        /* 180 */
-    void (GLAPIENTRYP TexParameteriv) (GLenum target, GLenum pname, const GLint * params);      /* 181 */
-    void (GLAPIENTRYP TexImage1D) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid * pixels);   /* 182 */
-    void (GLAPIENTRYP TexImage2D) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid * pixels);   /* 183 */
-    void (GLAPIENTRYP TexEnvf) (GLenum target, GLenum pname, GLfloat param);    /* 184 */
-    void (GLAPIENTRYP TexEnvfv) (GLenum target, GLenum pname, const GLfloat * params);  /* 185 */
-    void (GLAPIENTRYP TexEnvi) (GLenum target, GLenum pname, GLint param);      /* 186 */
-    void (GLAPIENTRYP TexEnviv) (GLenum target, GLenum pname, const GLint * params);    /* 187 */
-    void (GLAPIENTRYP TexGend) (GLenum coord, GLenum pname, GLdouble param);    /* 188 */
-    void (GLAPIENTRYP TexGendv) (GLenum coord, GLenum pname, const GLdouble * params);  /* 189 */
-    void (GLAPIENTRYP TexGenf) (GLenum coord, GLenum pname, GLfloat param);     /* 190 */
-    void (GLAPIENTRYP TexGenfv) (GLenum coord, GLenum pname, const GLfloat * params);   /* 191 */
-    void (GLAPIENTRYP TexGeni) (GLenum coord, GLenum pname, GLint param);       /* 192 */
-    void (GLAPIENTRYP TexGeniv) (GLenum coord, GLenum pname, const GLint * params);     /* 193 */
-    void (GLAPIENTRYP FeedbackBuffer) (GLsizei size, GLenum type, GLfloat * buffer);    /* 194 */
-    void (GLAPIENTRYP SelectBuffer) (GLsizei size, GLuint * buffer);    /* 195 */
-     GLint(GLAPIENTRYP RenderMode) (GLenum mode);       /* 196 */
-    void (GLAPIENTRYP InitNames) (void);        /* 197 */
-    void (GLAPIENTRYP LoadName) (GLuint name);  /* 198 */
-    void (GLAPIENTRYP PassThrough) (GLfloat token);     /* 199 */
-    void (GLAPIENTRYP PopName) (void);  /* 200 */
-    void (GLAPIENTRYP PushName) (GLuint name);  /* 201 */
-    void (GLAPIENTRYP DrawBuffer) (GLenum mode);        /* 202 */
-    void (GLAPIENTRYP Clear) (GLbitfield mask); /* 203 */
-    void (GLAPIENTRYP ClearAccum) (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);    /* 204 */
-    void (GLAPIENTRYP ClearIndex) (GLfloat c);  /* 205 */
-    void (GLAPIENTRYP ClearColor) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);        /* 206 */
-    void (GLAPIENTRYP ClearStencil) (GLint s);  /* 207 */
-    void (GLAPIENTRYP ClearDepth) (GLclampd depth);     /* 208 */
-    void (GLAPIENTRYP StencilMask) (GLuint mask);       /* 209 */
-    void (GLAPIENTRYP ColorMask) (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);     /* 210 */
-    void (GLAPIENTRYP DepthMask) (GLboolean flag);      /* 211 */
-    void (GLAPIENTRYP IndexMask) (GLuint mask); /* 212 */
-    void (GLAPIENTRYP Accum) (GLenum op, GLfloat value);        /* 213 */
-    void (GLAPIENTRYP Disable) (GLenum cap);    /* 214 */
-    void (GLAPIENTRYP Enable) (GLenum cap);     /* 215 */
-    void (GLAPIENTRYP Finish) (void);   /* 216 */
-    void (GLAPIENTRYP Flush) (void);    /* 217 */
-    void (GLAPIENTRYP PopAttrib) (void);        /* 218 */
-    void (GLAPIENTRYP PushAttrib) (GLbitfield mask);    /* 219 */
-    void (GLAPIENTRYP Map1d) (GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble * points);     /* 220 */
-    void (GLAPIENTRYP Map1f) (GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat * points);        /* 221 */
-    void (GLAPIENTRYP Map2d) (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble * points);    /* 222 */
-    void (GLAPIENTRYP Map2f) (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat * points); /* 223 */
-    void (GLAPIENTRYP MapGrid1d) (GLint un, GLdouble u1, GLdouble u2);  /* 224 */
-    void (GLAPIENTRYP MapGrid1f) (GLint un, GLfloat u1, GLfloat u2);    /* 225 */
-    void (GLAPIENTRYP MapGrid2d) (GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2);      /* 226 */
-    void (GLAPIENTRYP MapGrid2f) (GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2);  /* 227 */
-    void (GLAPIENTRYP EvalCoord1d) (GLdouble u);        /* 228 */
-    void (GLAPIENTRYP EvalCoord1dv) (const GLdouble * u);       /* 229 */
-    void (GLAPIENTRYP EvalCoord1f) (GLfloat u); /* 230 */
-    void (GLAPIENTRYP EvalCoord1fv) (const GLfloat * u);        /* 231 */
-    void (GLAPIENTRYP EvalCoord2d) (GLdouble u, GLdouble v);    /* 232 */
-    void (GLAPIENTRYP EvalCoord2dv) (const GLdouble * u);       /* 233 */
-    void (GLAPIENTRYP EvalCoord2f) (GLfloat u, GLfloat v);      /* 234 */
-    void (GLAPIENTRYP EvalCoord2fv) (const GLfloat * u);        /* 235 */
-    void (GLAPIENTRYP EvalMesh1) (GLenum mode, GLint i1, GLint i2);     /* 236 */
-    void (GLAPIENTRYP EvalPoint1) (GLint i);    /* 237 */
-    void (GLAPIENTRYP EvalMesh2) (GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2); /* 238 */
-    void (GLAPIENTRYP EvalPoint2) (GLint i, GLint j);   /* 239 */
-    void (GLAPIENTRYP AlphaFunc) (GLenum func, GLclampf ref);   /* 240 */
-    void (GLAPIENTRYP BlendFunc) (GLenum sfactor, GLenum dfactor);      /* 241 */
-    void (GLAPIENTRYP LogicOp) (GLenum opcode); /* 242 */
-    void (GLAPIENTRYP StencilFunc) (GLenum func, GLint ref, GLuint mask);       /* 243 */
-    void (GLAPIENTRYP StencilOp) (GLenum fail, GLenum zfail, GLenum zpass);     /* 244 */
-    void (GLAPIENTRYP DepthFunc) (GLenum func); /* 245 */
-    void (GLAPIENTRYP PixelZoom) (GLfloat xfactor, GLfloat yfactor);    /* 246 */
-    void (GLAPIENTRYP PixelTransferf) (GLenum pname, GLfloat param);    /* 247 */
-    void (GLAPIENTRYP PixelTransferi) (GLenum pname, GLint param);      /* 248 */
-    void (GLAPIENTRYP PixelStoref) (GLenum pname, GLfloat param);       /* 249 */
-    void (GLAPIENTRYP PixelStorei) (GLenum pname, GLint param); /* 250 */
-    void (GLAPIENTRYP PixelMapfv) (GLenum map, GLsizei mapsize, const GLfloat * values);        /* 251 */
-    void (GLAPIENTRYP PixelMapuiv) (GLenum map, GLsizei mapsize, const GLuint * values);        /* 252 */
-    void (GLAPIENTRYP PixelMapusv) (GLenum map, GLsizei mapsize, const GLushort * values);      /* 253 */
-    void (GLAPIENTRYP ReadBuffer) (GLenum mode);        /* 254 */
-    void (GLAPIENTRYP CopyPixels) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum type);       /* 255 */
-    void (GLAPIENTRYP ReadPixels) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid * pixels);       /* 256 */
-    void (GLAPIENTRYP DrawPixels) (GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid * pixels);   /* 257 */
-    void (GLAPIENTRYP GetBooleanv) (GLenum pname, GLboolean * params);  /* 258 */
-    void (GLAPIENTRYP GetClipPlane) (GLenum plane, GLdouble * equation);        /* 259 */
-    void (GLAPIENTRYP GetDoublev) (GLenum pname, GLdouble * params);    /* 260 */
-     GLenum(GLAPIENTRYP GetError) (void);       /* 261 */
-    void (GLAPIENTRYP GetFloatv) (GLenum pname, GLfloat * params);      /* 262 */
-    void (GLAPIENTRYP GetIntegerv) (GLenum pname, GLint * params);      /* 263 */
-    void (GLAPIENTRYP GetLightfv) (GLenum light, GLenum pname, GLfloat * params);       /* 264 */
-    void (GLAPIENTRYP GetLightiv) (GLenum light, GLenum pname, GLint * params); /* 265 */
-    void (GLAPIENTRYP GetMapdv) (GLenum target, GLenum query, GLdouble * v);    /* 266 */
-    void (GLAPIENTRYP GetMapfv) (GLenum target, GLenum query, GLfloat * v);     /* 267 */
-    void (GLAPIENTRYP GetMapiv) (GLenum target, GLenum query, GLint * v);       /* 268 */
-    void (GLAPIENTRYP GetMaterialfv) (GLenum face, GLenum pname, GLfloat * params);     /* 269 */
-    void (GLAPIENTRYP GetMaterialiv) (GLenum face, GLenum pname, GLint * params);       /* 270 */
-    void (GLAPIENTRYP GetPixelMapfv) (GLenum map, GLfloat * values);    /* 271 */
-    void (GLAPIENTRYP GetPixelMapuiv) (GLenum map, GLuint * values);    /* 272 */
-    void (GLAPIENTRYP GetPixelMapusv) (GLenum map, GLushort * values);  /* 273 */
-    void (GLAPIENTRYP GetPolygonStipple) (GLubyte * mask);      /* 274 */
-    const GLubyte *(GLAPIENTRYP GetString) (GLenum name);       /* 275 */
-    void (GLAPIENTRYP GetTexEnvfv) (GLenum target, GLenum pname, GLfloat * params);     /* 276 */
-    void (GLAPIENTRYP GetTexEnviv) (GLenum target, GLenum pname, GLint * params);       /* 277 */
-    void (GLAPIENTRYP GetTexGendv) (GLenum coord, GLenum pname, GLdouble * params);     /* 278 */
-    void (GLAPIENTRYP GetTexGenfv) (GLenum coord, GLenum pname, GLfloat * params);      /* 279 */
-    void (GLAPIENTRYP GetTexGeniv) (GLenum coord, GLenum pname, GLint * params);        /* 280 */
-    void (GLAPIENTRYP GetTexImage) (GLenum target, GLint level, GLenum format, GLenum type, GLvoid * pixels);   /* 281 */
-    void (GLAPIENTRYP GetTexParameterfv) (GLenum target, GLenum pname, GLfloat * params);       /* 282 */
-    void (GLAPIENTRYP GetTexParameteriv) (GLenum target, GLenum pname, GLint * params); /* 283 */
-    void (GLAPIENTRYP GetTexLevelParameterfv) (GLenum target, GLint level, GLenum pname, GLfloat * params);     /* 284 */
-    void (GLAPIENTRYP GetTexLevelParameteriv) (GLenum target, GLint level, GLenum pname, GLint * params);       /* 285 */
-     GLboolean(GLAPIENTRYP IsEnabled) (GLenum cap);     /* 286 */
-     GLboolean(GLAPIENTRYP IsList) (GLuint list);       /* 287 */
-    void (GLAPIENTRYP DepthRange) (GLclampd zNear, GLclampd zFar);      /* 288 */
-    void (GLAPIENTRYP Frustum) (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);   /* 289 */
-    void (GLAPIENTRYP LoadIdentity) (void);     /* 290 */
-    void (GLAPIENTRYP LoadMatrixf) (const GLfloat * m); /* 291 */
-    void (GLAPIENTRYP LoadMatrixd) (const GLdouble * m);        /* 292 */
-    void (GLAPIENTRYP MatrixMode) (GLenum mode);        /* 293 */
-    void (GLAPIENTRYP MultMatrixf) (const GLfloat * m); /* 294 */
-    void (GLAPIENTRYP MultMatrixd) (const GLdouble * m);        /* 295 */
-    void (GLAPIENTRYP Ortho) (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);     /* 296 */
-    void (GLAPIENTRYP PopMatrix) (void);        /* 297 */
-    void (GLAPIENTRYP PushMatrix) (void);       /* 298 */
-    void (GLAPIENTRYP Rotated) (GLdouble angle, GLdouble x, GLdouble y, GLdouble z);    /* 299 */
-    void (GLAPIENTRYP Rotatef) (GLfloat angle, GLfloat x, GLfloat y, GLfloat z);        /* 300 */
-    void (GLAPIENTRYP Scaled) (GLdouble x, GLdouble y, GLdouble z);     /* 301 */
-    void (GLAPIENTRYP Scalef) (GLfloat x, GLfloat y, GLfloat z);        /* 302 */
-    void (GLAPIENTRYP Translated) (GLdouble x, GLdouble y, GLdouble z); /* 303 */
-    void (GLAPIENTRYP Translatef) (GLfloat x, GLfloat y, GLfloat z);    /* 304 */
-    void (GLAPIENTRYP Viewport) (GLint x, GLint y, GLsizei width, GLsizei height);      /* 305 */
-    void (GLAPIENTRYP ArrayElement) (GLint i);  /* 306 */
-    void (GLAPIENTRYP BindTexture) (GLenum target, GLuint texture);     /* 307 */
-    void (GLAPIENTRYP ColorPointer) (GLint size, GLenum type, GLsizei stride, const GLvoid * pointer);  /* 308 */
-    void (GLAPIENTRYP DisableClientState) (GLenum array);       /* 309 */
-    void (GLAPIENTRYP DrawArrays) (GLenum mode, GLint first, GLsizei count);    /* 310 */
-    void (GLAPIENTRYP DrawElements) (GLenum mode, GLsizei count, GLenum type, const GLvoid * indices);  /* 311 */
-    void (GLAPIENTRYP EdgeFlagPointer) (GLsizei stride, const GLvoid * pointer);        /* 312 */
-    void (GLAPIENTRYP EnableClientState) (GLenum array);        /* 313 */
-    void (GLAPIENTRYP IndexPointer) (GLenum type, GLsizei stride, const GLvoid * pointer);      /* 314 */
-    void (GLAPIENTRYP Indexub) (GLubyte c);     /* 315 */
-    void (GLAPIENTRYP Indexubv) (const GLubyte * c);    /* 316 */
-    void (GLAPIENTRYP InterleavedArrays) (GLenum format, GLsizei stride, const GLvoid * pointer);       /* 317 */
-    void (GLAPIENTRYP NormalPointer) (GLenum type, GLsizei stride, const GLvoid * pointer);     /* 318 */
-    void (GLAPIENTRYP PolygonOffset) (GLfloat factor, GLfloat units);   /* 319 */
-    void (GLAPIENTRYP TexCoordPointer) (GLint size, GLenum type, GLsizei stride, const GLvoid * pointer);       /* 320 */
-    void (GLAPIENTRYP VertexPointer) (GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 321 */
-     GLboolean(GLAPIENTRYP AreTexturesResident) (GLsizei n, const GLuint * textures, GLboolean * residences);   /* 322 */
-    void (GLAPIENTRYP CopyTexImage1D) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);       /* 323 */
-    void (GLAPIENTRYP CopyTexImage2D) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);       /* 324 */
-    void (GLAPIENTRYP CopyTexSubImage1D) (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);  /* 325 */
-    void (GLAPIENTRYP CopyTexSubImage2D) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);   /* 326 */
-    void (GLAPIENTRYP DeleteTextures) (GLsizei n, const GLuint * textures);     /* 327 */
-    void (GLAPIENTRYP GenTextures) (GLsizei n, GLuint * textures);      /* 328 */
-    void (GLAPIENTRYP GetPointerv) (GLenum pname, GLvoid ** params);    /* 329 */
-     GLboolean(GLAPIENTRYP IsTexture) (GLuint texture); /* 330 */
-    void (GLAPIENTRYP PrioritizeTextures) (GLsizei n, const GLuint * textures, const GLclampf * priorities);    /* 331 */
-    void (GLAPIENTRYP TexSubImage1D) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid * pixels);     /* 332 */
-    void (GLAPIENTRYP TexSubImage2D) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid * pixels);      /* 333 */
-    void (GLAPIENTRYP PopClientAttrib) (void);  /* 334 */
-    void (GLAPIENTRYP PushClientAttrib) (GLbitfield mask);      /* 335 */
-    void (GLAPIENTRYP BlendColor) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);        /* 336 */
-    void (GLAPIENTRYP BlendEquation) (GLenum mode);     /* 337 */
-    void (GLAPIENTRYP DrawRangeElements) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid * indices);   /* 338 */
-    void (GLAPIENTRYP ColorTable) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid * table);      /* 339 */
-    void (GLAPIENTRYP ColorTableParameterfv) (GLenum target, GLenum pname, const GLfloat * params);     /* 340 */
-    void (GLAPIENTRYP ColorTableParameteriv) (GLenum target, GLenum pname, const GLint * params);       /* 341 */
-    void (GLAPIENTRYP CopyColorTable) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);  /* 342 */
-    void (GLAPIENTRYP GetColorTable) (GLenum target, GLenum format, GLenum type, GLvoid * table);       /* 343 */
-    void (GLAPIENTRYP GetColorTableParameterfv) (GLenum target, GLenum pname, GLfloat * params);        /* 344 */
-    void (GLAPIENTRYP GetColorTableParameteriv) (GLenum target, GLenum pname, GLint * params);  /* 345 */
-    void (GLAPIENTRYP ColorSubTable) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid * data);    /* 346 */
-    void (GLAPIENTRYP CopyColorSubTable) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);       /* 347 */
-    void (GLAPIENTRYP ConvolutionFilter1D) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid * image);     /* 348 */
-    void (GLAPIENTRYP ConvolutionFilter2D) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid * image);     /* 349 */
-    void (GLAPIENTRYP ConvolutionParameterf) (GLenum target, GLenum pname, GLfloat params);     /* 350 */
-    void (GLAPIENTRYP ConvolutionParameterfv) (GLenum target, GLenum pname, const GLfloat * params);    /* 351 */
-    void (GLAPIENTRYP ConvolutionParameteri) (GLenum target, GLenum pname, GLint params);       /* 352 */
-    void (GLAPIENTRYP ConvolutionParameteriv) (GLenum target, GLenum pname, const GLint * params);      /* 353 */
-    void (GLAPIENTRYP CopyConvolutionFilter1D) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); /* 354 */
-    void (GLAPIENTRYP CopyConvolutionFilter2D) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height); /* 355 */
-    void (GLAPIENTRYP GetConvolutionFilter) (GLenum target, GLenum format, GLenum type, GLvoid * image);        /* 356 */
-    void (GLAPIENTRYP GetConvolutionParameterfv) (GLenum target, GLenum pname, GLfloat * params);       /* 357 */
-    void (GLAPIENTRYP GetConvolutionParameteriv) (GLenum target, GLenum pname, GLint * params); /* 358 */
-    void (GLAPIENTRYP GetSeparableFilter) (GLenum target, GLenum format, GLenum type, GLvoid * row, GLvoid * column, GLvoid * span);    /* 359 */
-    void (GLAPIENTRYP SeparableFilter2D) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid * row, const GLvoid * column);  /* 360 */
-    void (GLAPIENTRYP GetHistogram) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid * values);      /* 361 */
-    void (GLAPIENTRYP GetHistogramParameterfv) (GLenum target, GLenum pname, GLfloat * params); /* 362 */
-    void (GLAPIENTRYP GetHistogramParameteriv) (GLenum target, GLenum pname, GLint * params);   /* 363 */
-    void (GLAPIENTRYP GetMinmax) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid * values); /* 364 */
-    void (GLAPIENTRYP GetMinmaxParameterfv) (GLenum target, GLenum pname, GLfloat * params);    /* 365 */
-    void (GLAPIENTRYP GetMinmaxParameteriv) (GLenum target, GLenum pname, GLint * params);      /* 366 */
-    void (GLAPIENTRYP Histogram) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink); /* 367 */
-    void (GLAPIENTRYP Minmax) (GLenum target, GLenum internalformat, GLboolean sink);   /* 368 */
-    void (GLAPIENTRYP ResetHistogram) (GLenum target);  /* 369 */
-    void (GLAPIENTRYP ResetMinmax) (GLenum target);     /* 370 */
-    void (GLAPIENTRYP TexImage3D) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid * pixels);    /* 371 */
-    void (GLAPIENTRYP TexSubImage3D) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid * pixels);        /* 372 */
-    void (GLAPIENTRYP CopyTexSubImage3D) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);    /* 373 */
-    void (GLAPIENTRYP ActiveTextureARB) (GLenum texture);       /* 374 */
-    void (GLAPIENTRYP ClientActiveTextureARB) (GLenum texture); /* 375 */
-    void (GLAPIENTRYP MultiTexCoord1dARB) (GLenum target, GLdouble s);  /* 376 */
-    void (GLAPIENTRYP MultiTexCoord1dvARB) (GLenum target, const GLdouble * v); /* 377 */
-    void (GLAPIENTRYP MultiTexCoord1fARB) (GLenum target, GLfloat s);   /* 378 */
-    void (GLAPIENTRYP MultiTexCoord1fvARB) (GLenum target, const GLfloat * v);  /* 379 */
-    void (GLAPIENTRYP MultiTexCoord1iARB) (GLenum target, GLint s);     /* 380 */
-    void (GLAPIENTRYP MultiTexCoord1ivARB) (GLenum target, const GLint * v);    /* 381 */
-    void (GLAPIENTRYP MultiTexCoord1sARB) (GLenum target, GLshort s);   /* 382 */
-    void (GLAPIENTRYP MultiTexCoord1svARB) (GLenum target, const GLshort * v);  /* 383 */
-    void (GLAPIENTRYP MultiTexCoord2dARB) (GLenum target, GLdouble s, GLdouble t);      /* 384 */
-    void (GLAPIENTRYP MultiTexCoord2dvARB) (GLenum target, const GLdouble * v); /* 385 */
-    void (GLAPIENTRYP MultiTexCoord2fARB) (GLenum target, GLfloat s, GLfloat t);        /* 386 */
-    void (GLAPIENTRYP MultiTexCoord2fvARB) (GLenum target, const GLfloat * v);  /* 387 */
-    void (GLAPIENTRYP MultiTexCoord2iARB) (GLenum target, GLint s, GLint t);    /* 388 */
-    void (GLAPIENTRYP MultiTexCoord2ivARB) (GLenum target, const GLint * v);    /* 389 */
-    void (GLAPIENTRYP MultiTexCoord2sARB) (GLenum target, GLshort s, GLshort t);        /* 390 */
-    void (GLAPIENTRYP MultiTexCoord2svARB) (GLenum target, const GLshort * v);  /* 391 */
-    void (GLAPIENTRYP MultiTexCoord3dARB) (GLenum target, GLdouble s, GLdouble t, GLdouble r);  /* 392 */
-    void (GLAPIENTRYP MultiTexCoord3dvARB) (GLenum target, const GLdouble * v); /* 393 */
-    void (GLAPIENTRYP MultiTexCoord3fARB) (GLenum target, GLfloat s, GLfloat t, GLfloat r);     /* 394 */
-    void (GLAPIENTRYP MultiTexCoord3fvARB) (GLenum target, const GLfloat * v);  /* 395 */
-    void (GLAPIENTRYP MultiTexCoord3iARB) (GLenum target, GLint s, GLint t, GLint r);   /* 396 */
-    void (GLAPIENTRYP MultiTexCoord3ivARB) (GLenum target, const GLint * v);    /* 397 */
-    void (GLAPIENTRYP MultiTexCoord3sARB) (GLenum target, GLshort s, GLshort t, GLshort r);     /* 398 */
-    void (GLAPIENTRYP MultiTexCoord3svARB) (GLenum target, const GLshort * v);  /* 399 */
-    void (GLAPIENTRYP MultiTexCoord4dARB) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);      /* 400 */
-    void (GLAPIENTRYP MultiTexCoord4dvARB) (GLenum target, const GLdouble * v); /* 401 */
-    void (GLAPIENTRYP MultiTexCoord4fARB) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);  /* 402 */
-    void (GLAPIENTRYP MultiTexCoord4fvARB) (GLenum target, const GLfloat * v);  /* 403 */
-    void (GLAPIENTRYP MultiTexCoord4iARB) (GLenum target, GLint s, GLint t, GLint r, GLint q);  /* 404 */
-    void (GLAPIENTRYP MultiTexCoord4ivARB) (GLenum target, const GLint * v);    /* 405 */
-    void (GLAPIENTRYP MultiTexCoord4sARB) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);  /* 406 */
-    void (GLAPIENTRYP MultiTexCoord4svARB) (GLenum target, const GLshort * v);  /* 407 */
-    void (GLAPIENTRYP AttachShader) (GLuint program, GLuint shader);    /* 408 */
-     GLuint(GLAPIENTRYP CreateProgram) (void);  /* 409 */
-     GLuint(GLAPIENTRYP CreateShader) (GLenum type);    /* 410 */
-    void (GLAPIENTRYP DeleteProgram) (GLuint program);  /* 411 */
-    void (GLAPIENTRYP DeleteShader) (GLuint program);   /* 412 */
-    void (GLAPIENTRYP DetachShader) (GLuint program, GLuint shader);    /* 413 */
-    void (GLAPIENTRYP GetAttachedShaders) (GLuint program, GLsizei maxCount, GLsizei * count, GLuint * obj);    /* 414 */
-    void (GLAPIENTRYP GetProgramInfoLog) (GLuint program, GLsizei bufSize, GLsizei * length, GLchar * infoLog); /* 415 */
-    void (GLAPIENTRYP GetProgramiv) (GLuint program, GLenum pname, GLint * params);     /* 416 */
-    void (GLAPIENTRYP GetShaderInfoLog) (GLuint shader, GLsizei bufSize, GLsizei * length, GLchar * infoLog);   /* 417 */
-    void (GLAPIENTRYP GetShaderiv) (GLuint shader, GLenum pname, GLint * params);       /* 418 */
-     GLboolean(GLAPIENTRYP IsProgram) (GLuint program); /* 419 */
-     GLboolean(GLAPIENTRYP IsShader) (GLuint shader);   /* 420 */
-    void (GLAPIENTRYP StencilFuncSeparate) (GLenum face, GLenum func, GLint ref, GLuint mask);  /* 421 */
-    void (GLAPIENTRYP StencilMaskSeparate) (GLenum face, GLuint mask);  /* 422 */
-    void (GLAPIENTRYP StencilOpSeparate) (GLenum face, GLenum sfail, GLenum zfail, GLenum zpass);       /* 423 */
-    void (GLAPIENTRYP UniformMatrix2x3fv) (GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);  /* 424 */
-    void (GLAPIENTRYP UniformMatrix2x4fv) (GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);  /* 425 */
-    void (GLAPIENTRYP UniformMatrix3x2fv) (GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);  /* 426 */
-    void (GLAPIENTRYP UniformMatrix3x4fv) (GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);  /* 427 */
-    void (GLAPIENTRYP UniformMatrix4x2fv) (GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);  /* 428 */
-    void (GLAPIENTRYP UniformMatrix4x3fv) (GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);  /* 429 */
-    void (GLAPIENTRYP ClampColor) (GLenum target, GLenum clamp);        /* 430 */
-    void (GLAPIENTRYP ClearBufferfi) (GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil);   /* 431 */
-    void (GLAPIENTRYP ClearBufferfv) (GLenum buffer, GLint drawbuffer, const GLfloat * value);  /* 432 */
-    void (GLAPIENTRYP ClearBufferiv) (GLenum buffer, GLint drawbuffer, const GLint * value);    /* 433 */
-    void (GLAPIENTRYP ClearBufferuiv) (GLenum buffer, GLint drawbuffer, const GLuint * value);  /* 434 */
-    const GLubyte *(GLAPIENTRYP GetStringi) (GLenum name, GLuint index);        /* 435 */
-    void (GLAPIENTRYP TexBuffer) (GLenum target, GLenum internalFormat, GLuint buffer); /* 436 */
-    void (GLAPIENTRYP FramebufferTexture) (GLenum target, GLenum attachment, GLuint texture, GLint level);      /* 437 */
-    void (GLAPIENTRYP GetBufferParameteri64v) (GLenum target, GLenum pname, GLint64 * params);  /* 438 */
-    void (GLAPIENTRYP GetInteger64i_v) (GLenum cap, GLuint index, GLint64 * data);      /* 439 */
-    void (GLAPIENTRYP VertexAttribDivisor) (GLuint index, GLuint divisor);      /* 440 */
-    void (GLAPIENTRYP LoadTransposeMatrixdARB) (const GLdouble * m);    /* 441 */
-    void (GLAPIENTRYP LoadTransposeMatrixfARB) (const GLfloat * m);     /* 442 */
-    void (GLAPIENTRYP MultTransposeMatrixdARB) (const GLdouble * m);    /* 443 */
-    void (GLAPIENTRYP MultTransposeMatrixfARB) (const GLfloat * m);     /* 444 */
-    void (GLAPIENTRYP SampleCoverageARB) (GLclampf value, GLboolean invert);    /* 445 */
-    void (GLAPIENTRYP CompressedTexImage1DARB) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid * data);        /* 446 */
-    void (GLAPIENTRYP CompressedTexImage2DARB) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid * data);        /* 447 */
-    void (GLAPIENTRYP CompressedTexImage3DARB) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid * data); /* 448 */
-    void (GLAPIENTRYP CompressedTexSubImage1DARB) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid * data);    /* 449 */
-    void (GLAPIENTRYP CompressedTexSubImage2DARB) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid * data);     /* 450 */
-    void (GLAPIENTRYP CompressedTexSubImage3DARB) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid * data);       /* 451 */
-    void (GLAPIENTRYP GetCompressedTexImageARB) (GLenum target, GLint level, GLvoid * img);     /* 452 */
-    void (GLAPIENTRYP DisableVertexAttribArrayARB) (GLuint index);      /* 453 */
-    void (GLAPIENTRYP EnableVertexAttribArrayARB) (GLuint index);       /* 454 */
-    void (GLAPIENTRYP GetProgramEnvParameterdvARB) (GLenum target, GLuint index, GLdouble * params);    /* 455 */
-    void (GLAPIENTRYP GetProgramEnvParameterfvARB) (GLenum target, GLuint index, GLfloat * params);     /* 456 */
-    void (GLAPIENTRYP GetProgramLocalParameterdvARB) (GLenum target, GLuint index, GLdouble * params);  /* 457 */
-    void (GLAPIENTRYP GetProgramLocalParameterfvARB) (GLenum target, GLuint index, GLfloat * params);   /* 458 */
-    void (GLAPIENTRYP GetProgramStringARB) (GLenum target, GLenum pname, GLvoid * string);      /* 459 */
-    void (GLAPIENTRYP GetProgramivARB) (GLenum target, GLenum pname, GLint * params);   /* 460 */
-    void (GLAPIENTRYP GetVertexAttribdvARB) (GLuint index, GLenum pname, GLdouble * params);    /* 461 */
-    void (GLAPIENTRYP GetVertexAttribfvARB) (GLuint index, GLenum pname, GLfloat * params);     /* 462 */
-    void (GLAPIENTRYP GetVertexAttribivARB) (GLuint index, GLenum pname, GLint * params);       /* 463 */
-    void (GLAPIENTRYP ProgramEnvParameter4dARB) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);  /* 464 */
-    void (GLAPIENTRYP ProgramEnvParameter4dvARB) (GLenum target, GLuint index, const GLdouble * params);        /* 465 */
-    void (GLAPIENTRYP ProgramEnvParameter4fARB) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);      /* 466 */
-    void (GLAPIENTRYP ProgramEnvParameter4fvARB) (GLenum target, GLuint index, const GLfloat * params); /* 467 */
-    void (GLAPIENTRYP ProgramLocalParameter4dARB) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);        /* 468 */
-    void (GLAPIENTRYP ProgramLocalParameter4dvARB) (GLenum target, GLuint index, const GLdouble * params);      /* 469 */
-    void (GLAPIENTRYP ProgramLocalParameter4fARB) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);    /* 470 */
-    void (GLAPIENTRYP ProgramLocalParameter4fvARB) (GLenum target, GLuint index, const GLfloat * params);       /* 471 */
-    void (GLAPIENTRYP ProgramStringARB) (GLenum target, GLenum format, GLsizei len, const GLvoid * string);     /* 472 */
-    void (GLAPIENTRYP VertexAttrib1dARB) (GLuint index, GLdouble x);    /* 473 */
-    void (GLAPIENTRYP VertexAttrib1dvARB) (GLuint index, const GLdouble * v);   /* 474 */
-    void (GLAPIENTRYP VertexAttrib1fARB) (GLuint index, GLfloat x);     /* 475 */
-    void (GLAPIENTRYP VertexAttrib1fvARB) (GLuint index, const GLfloat * v);    /* 476 */
-    void (GLAPIENTRYP VertexAttrib1sARB) (GLuint index, GLshort x);     /* 477 */
-    void (GLAPIENTRYP VertexAttrib1svARB) (GLuint index, const GLshort * v);    /* 478 */
-    void (GLAPIENTRYP VertexAttrib2dARB) (GLuint index, GLdouble x, GLdouble y);        /* 479 */
-    void (GLAPIENTRYP VertexAttrib2dvARB) (GLuint index, const GLdouble * v);   /* 480 */
-    void (GLAPIENTRYP VertexAttrib2fARB) (GLuint index, GLfloat x, GLfloat y);  /* 481 */
-    void (GLAPIENTRYP VertexAttrib2fvARB) (GLuint index, const GLfloat * v);    /* 482 */
-    void (GLAPIENTRYP VertexAttrib2sARB) (GLuint index, GLshort x, GLshort y);  /* 483 */
-    void (GLAPIENTRYP VertexAttrib2svARB) (GLuint index, const GLshort * v);    /* 484 */
-    void (GLAPIENTRYP VertexAttrib3dARB) (GLuint index, GLdouble x, GLdouble y, GLdouble z);    /* 485 */
-    void (GLAPIENTRYP VertexAttrib3dvARB) (GLuint index, const GLdouble * v);   /* 486 */
-    void (GLAPIENTRYP VertexAttrib3fARB) (GLuint index, GLfloat x, GLfloat y, GLfloat z);       /* 487 */
-    void (GLAPIENTRYP VertexAttrib3fvARB) (GLuint index, const GLfloat * v);    /* 488 */
-    void (GLAPIENTRYP VertexAttrib3sARB) (GLuint index, GLshort x, GLshort y, GLshort z);       /* 489 */
-    void (GLAPIENTRYP VertexAttrib3svARB) (GLuint index, const GLshort * v);    /* 490 */
-    void (GLAPIENTRYP VertexAttrib4NbvARB) (GLuint index, const GLbyte * v);    /* 491 */
-    void (GLAPIENTRYP VertexAttrib4NivARB) (GLuint index, const GLint * v);     /* 492 */
-    void (GLAPIENTRYP VertexAttrib4NsvARB) (GLuint index, const GLshort * v);   /* 493 */
-    void (GLAPIENTRYP VertexAttrib4NubARB) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);  /* 494 */
-    void (GLAPIENTRYP VertexAttrib4NubvARB) (GLuint index, const GLubyte * v);  /* 495 */
-    void (GLAPIENTRYP VertexAttrib4NuivARB) (GLuint index, const GLuint * v);   /* 496 */
-    void (GLAPIENTRYP VertexAttrib4NusvARB) (GLuint index, const GLushort * v); /* 497 */
-    void (GLAPIENTRYP VertexAttrib4bvARB) (GLuint index, const GLbyte * v);     /* 498 */
-    void (GLAPIENTRYP VertexAttrib4dARB) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);        /* 499 */
-    void (GLAPIENTRYP VertexAttrib4dvARB) (GLuint index, const GLdouble * v);   /* 500 */
-    void (GLAPIENTRYP VertexAttrib4fARB) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);    /* 501 */
-    void (GLAPIENTRYP VertexAttrib4fvARB) (GLuint index, const GLfloat * v);    /* 502 */
-    void (GLAPIENTRYP VertexAttrib4ivARB) (GLuint index, const GLint * v);      /* 503 */
-    void (GLAPIENTRYP VertexAttrib4sARB) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);    /* 504 */
-    void (GLAPIENTRYP VertexAttrib4svARB) (GLuint index, const GLshort * v);    /* 505 */
-    void (GLAPIENTRYP VertexAttrib4ubvARB) (GLuint index, const GLubyte * v);   /* 506 */
-    void (GLAPIENTRYP VertexAttrib4uivARB) (GLuint index, const GLuint * v);    /* 507 */
-    void (GLAPIENTRYP VertexAttrib4usvARB) (GLuint index, const GLushort * v);  /* 508 */
-    void (GLAPIENTRYP VertexAttribPointerARB) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid * pointer);    /* 509 */
-    void (GLAPIENTRYP BindBufferARB) (GLenum target, GLuint buffer);    /* 510 */
-    void (GLAPIENTRYP BufferDataARB) (GLenum target, GLsizeiptrARB size, const GLvoid * data, GLenum usage);    /* 511 */
-    void (GLAPIENTRYP BufferSubDataARB) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid * data);   /* 512 */
-    void (GLAPIENTRYP DeleteBuffersARB) (GLsizei n, const GLuint * buffer);     /* 513 */
-    void (GLAPIENTRYP GenBuffersARB) (GLsizei n, GLuint * buffer);      /* 514 */
-    void (GLAPIENTRYP GetBufferParameterivARB) (GLenum target, GLenum pname, GLint * params);   /* 515 */
-    void (GLAPIENTRYP GetBufferPointervARB) (GLenum target, GLenum pname, GLvoid ** params);    /* 516 */
-    void (GLAPIENTRYP GetBufferSubDataARB) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, GLvoid * data);      /* 517 */
-     GLboolean(GLAPIENTRYP IsBufferARB) (GLuint buffer);        /* 518 */
-    GLvoid *(GLAPIENTRYP MapBufferARB) (GLenum target, GLenum access);  /* 519 */
-     GLboolean(GLAPIENTRYP UnmapBufferARB) (GLenum target);     /* 520 */
-    void (GLAPIENTRYP BeginQueryARB) (GLenum target, GLuint id);        /* 521 */
-    void (GLAPIENTRYP DeleteQueriesARB) (GLsizei n, const GLuint * ids);        /* 522 */
-    void (GLAPIENTRYP EndQueryARB) (GLenum target);     /* 523 */
-    void (GLAPIENTRYP GenQueriesARB) (GLsizei n, GLuint * ids); /* 524 */
-    void (GLAPIENTRYP GetQueryObjectivARB) (GLuint id, GLenum pname, GLint * params);   /* 525 */
-    void (GLAPIENTRYP GetQueryObjectuivARB) (GLuint id, GLenum pname, GLuint * params); /* 526 */
-    void (GLAPIENTRYP GetQueryivARB) (GLenum target, GLenum pname, GLint * params);     /* 527 */
-     GLboolean(GLAPIENTRYP IsQueryARB) (GLuint id);     /* 528 */
-    void (GLAPIENTRYP AttachObjectARB) (GLhandleARB containerObj, GLhandleARB obj);     /* 529 */
-    void (GLAPIENTRYP CompileShaderARB) (GLhandleARB shader);   /* 530 */
-     GLhandleARB(GLAPIENTRYP CreateProgramObjectARB) (void);    /* 531 */
-     GLhandleARB(GLAPIENTRYP CreateShaderObjectARB) (GLenum shaderType);        /* 532 */
-    void (GLAPIENTRYP DeleteObjectARB) (GLhandleARB obj);       /* 533 */
-    void (GLAPIENTRYP DetachObjectARB) (GLhandleARB containerObj, GLhandleARB attachedObj);     /* 534 */
-    void (GLAPIENTRYP GetActiveUniformARB) (GLhandleARB program, GLuint index, GLsizei bufSize, GLsizei * length, GLint * size, GLenum * type, GLcharARB * name);       /* 535 */
-    void (GLAPIENTRYP GetAttachedObjectsARB) (GLhandleARB containerObj, GLsizei maxLength, GLsizei * length, GLhandleARB * infoLog);    /* 536 */
-     GLhandleARB(GLAPIENTRYP GetHandleARB) (GLenum pname);      /* 537 */
-    void (GLAPIENTRYP GetInfoLogARB) (GLhandleARB obj, GLsizei maxLength, GLsizei * length, GLcharARB * infoLog);       /* 538 */
-    void (GLAPIENTRYP GetObjectParameterfvARB) (GLhandleARB obj, GLenum pname, GLfloat * params);       /* 539 */
-    void (GLAPIENTRYP GetObjectParameterivARB) (GLhandleARB obj, GLenum pname, GLint * params); /* 540 */
-    void (GLAPIENTRYP GetShaderSourceARB) (GLhandleARB shader, GLsizei bufSize, GLsizei * length, GLcharARB * source);  /* 541 */
-     GLint(GLAPIENTRYP GetUniformLocationARB) (GLhandleARB program, const GLcharARB * name);    /* 542 */
-    void (GLAPIENTRYP GetUniformfvARB) (GLhandleARB program, GLint location, GLfloat * params); /* 543 */
-    void (GLAPIENTRYP GetUniformivARB) (GLhandleARB program, GLint location, GLint * params);   /* 544 */
-    void (GLAPIENTRYP LinkProgramARB) (GLhandleARB program);    /* 545 */
-    void (GLAPIENTRYP ShaderSourceARB) (GLhandleARB shader, GLsizei count, const GLcharARB ** string, const GLint * length);    /* 546 */
-    void (GLAPIENTRYP Uniform1fARB) (GLint location, GLfloat v0);       /* 547 */
-    void (GLAPIENTRYP Uniform1fvARB) (GLint location, GLsizei count, const GLfloat * value);    /* 548 */
-    void (GLAPIENTRYP Uniform1iARB) (GLint location, GLint v0); /* 549 */
-    void (GLAPIENTRYP Uniform1ivARB) (GLint location, GLsizei count, const GLint * value);      /* 550 */
-    void (GLAPIENTRYP Uniform2fARB) (GLint location, GLfloat v0, GLfloat v1);   /* 551 */
-    void (GLAPIENTRYP Uniform2fvARB) (GLint location, GLsizei count, const GLfloat * value);    /* 552 */
-    void (GLAPIENTRYP Uniform2iARB) (GLint location, GLint v0, GLint v1);       /* 553 */
-    void (GLAPIENTRYP Uniform2ivARB) (GLint location, GLsizei count, const GLint * value);      /* 554 */
-    void (GLAPIENTRYP Uniform3fARB) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);       /* 555 */
-    void (GLAPIENTRYP Uniform3fvARB) (GLint location, GLsizei count, const GLfloat * value);    /* 556 */
-    void (GLAPIENTRYP Uniform3iARB) (GLint location, GLint v0, GLint v1, GLint v2);     /* 557 */
-    void (GLAPIENTRYP Uniform3ivARB) (GLint location, GLsizei count, const GLint * value);      /* 558 */
-    void (GLAPIENTRYP Uniform4fARB) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);   /* 559 */
-    void (GLAPIENTRYP Uniform4fvARB) (GLint location, GLsizei count, const GLfloat * value);    /* 560 */
-    void (GLAPIENTRYP Uniform4iARB) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);   /* 561 */
-    void (GLAPIENTRYP Uniform4ivARB) (GLint location, GLsizei count, const GLint * value);      /* 562 */
-    void (GLAPIENTRYP UniformMatrix2fvARB) (GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 563 */
-    void (GLAPIENTRYP UniformMatrix3fvARB) (GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 564 */
-    void (GLAPIENTRYP UniformMatrix4fvARB) (GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 565 */
-    void (GLAPIENTRYP UseProgramObjectARB) (GLhandleARB program);       /* 566 */
-    void (GLAPIENTRYP ValidateProgramARB) (GLhandleARB program);        /* 567 */
-    void (GLAPIENTRYP BindAttribLocationARB) (GLhandleARB program, GLuint index, const GLcharARB * name);       /* 568 */
-    void (GLAPIENTRYP GetActiveAttribARB) (GLhandleARB program, GLuint index, GLsizei bufSize, GLsizei * length, GLint * size, GLenum * type, GLcharARB * name);        /* 569 */
-     GLint(GLAPIENTRYP GetAttribLocationARB) (GLhandleARB program, const GLcharARB * name);     /* 570 */
-    void (GLAPIENTRYP DrawBuffersARB) (GLsizei n, const GLenum * bufs); /* 571 */
-    void (GLAPIENTRYP ClampColorARB) (GLenum target, GLenum clamp);     /* 572 */
-    void (GLAPIENTRYP DrawArraysInstancedARB) (GLenum mode, GLint first, GLsizei count, GLsizei primcount);     /* 573 */
-    void (GLAPIENTRYP DrawElementsInstancedARB) (GLenum mode, GLsizei count, GLenum type, const GLvoid * indices, GLsizei primcount);   /* 574 */
-    void (GLAPIENTRYP RenderbufferStorageMultisample) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);   /* 575 */
-    void (GLAPIENTRYP FramebufferTextureARB) (GLenum target, GLenum attachment, GLuint texture, GLint level);   /* 576 */
-    void (GLAPIENTRYP FramebufferTextureFaceARB) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);  /* 577 */
-    void (GLAPIENTRYP ProgramParameteriARB) (GLuint program, GLenum pname, GLint value);        /* 578 */
-    void (GLAPIENTRYP VertexAttribDivisorARB) (GLuint index, GLuint divisor);   /* 579 */
-    void (GLAPIENTRYP FlushMappedBufferRange) (GLenum target, GLintptr offset, GLsizeiptr length);      /* 580 */
-    GLvoid *(GLAPIENTRYP MapBufferRange) (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);        /* 581 */
-    void (GLAPIENTRYP TexBufferARB) (GLenum target, GLenum internalFormat, GLuint buffer);      /* 582 */
-    void (GLAPIENTRYP BindVertexArray) (GLuint array);  /* 583 */
-    void (GLAPIENTRYP GenVertexArrays) (GLsizei n, GLuint * arrays);    /* 584 */
-    void (GLAPIENTRYP CopyBufferSubData) (GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);   /* 585 */
-     GLenum(GLAPIENTRYP ClientWaitSync) (GLsync sync, GLbitfield flags, GLuint64 timeout);      /* 586 */
-    void (GLAPIENTRYP DeleteSync) (GLsync sync);        /* 587 */
-     GLsync(GLAPIENTRYP FenceSync) (GLenum condition, GLbitfield flags);        /* 588 */
-    void (GLAPIENTRYP GetInteger64v) (GLenum pname, GLint64 * params);  /* 589 */
-    void (GLAPIENTRYP GetSynciv) (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * values);        /* 590 */
-     GLboolean(GLAPIENTRYP IsSync) (GLsync sync);       /* 591 */
-    void (GLAPIENTRYP WaitSync) (GLsync sync, GLbitfield flags, GLuint64 timeout);      /* 592 */
-    void (GLAPIENTRYP DrawElementsBaseVertex) (GLenum mode, GLsizei count, GLenum type, const GLvoid * indices, GLint basevertex);      /* 593 */
-    void (GLAPIENTRYP DrawElementsInstancedBaseVertex) (GLenum mode, GLsizei count, GLenum type, const GLvoid * indices, GLsizei primcount, GLint basevertex);  /* 594 */
-    void (GLAPIENTRYP DrawRangeElementsBaseVertex) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid * indices, GLint basevertex);       /* 595 */
-    void (GLAPIENTRYP MultiDrawElementsBaseVertex) (GLenum mode, const GLsizei * count, GLenum type, const GLvoid ** indices, GLsizei primcount, const GLint * basevertex);     /* 596 */
-    void (GLAPIENTRYP BlendEquationSeparateiARB) (GLuint buf, GLenum modeRGB, GLenum modeA);    /* 597 */
-    void (GLAPIENTRYP BlendEquationiARB) (GLuint buf, GLenum mode);     /* 598 */
-    void (GLAPIENTRYP BlendFuncSeparateiARB) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcA, GLenum dstA);      /* 599 */
-    void (GLAPIENTRYP BlendFunciARB) (GLuint buf, GLenum src, GLenum dst);      /* 600 */
-    void (GLAPIENTRYP BindSampler) (GLuint unit, GLuint sampler);       /* 601 */
-    void (GLAPIENTRYP DeleteSamplers) (GLsizei count, const GLuint * samplers); /* 602 */
-    void (GLAPIENTRYP GenSamplers) (GLsizei count, GLuint * samplers);  /* 603 */
-    void (GLAPIENTRYP GetSamplerParameterIiv) (GLuint sampler, GLenum pname, GLint * params);   /* 604 */
-    void (GLAPIENTRYP GetSamplerParameterIuiv) (GLuint sampler, GLenum pname, GLuint * params); /* 605 */
-    void (GLAPIENTRYP GetSamplerParameterfv) (GLuint sampler, GLenum pname, GLfloat * params);  /* 606 */
-    void (GLAPIENTRYP GetSamplerParameteriv) (GLuint sampler, GLenum pname, GLint * params);    /* 607 */
-     GLboolean(GLAPIENTRYP IsSampler) (GLuint sampler); /* 608 */
-    void (GLAPIENTRYP SamplerParameterIiv) (GLuint sampler, GLenum pname, const GLint * params);        /* 609 */
-    void (GLAPIENTRYP SamplerParameterIuiv) (GLuint sampler, GLenum pname, const GLuint * params);      /* 610 */
-    void (GLAPIENTRYP SamplerParameterf) (GLuint sampler, GLenum pname, GLfloat param); /* 611 */
-    void (GLAPIENTRYP SamplerParameterfv) (GLuint sampler, GLenum pname, const GLfloat * params);       /* 612 */
-    void (GLAPIENTRYP SamplerParameteri) (GLuint sampler, GLenum pname, GLint param);   /* 613 */
-    void (GLAPIENTRYP SamplerParameteriv) (GLuint sampler, GLenum pname, const GLint * params); /* 614 */
-    void (GLAPIENTRYP ColorP3ui) (GLenum type, GLuint color);   /* 615 */
-    void (GLAPIENTRYP ColorP3uiv) (GLenum type, const GLuint * color);  /* 616 */
-    void (GLAPIENTRYP ColorP4ui) (GLenum type, GLuint color);   /* 617 */
-    void (GLAPIENTRYP ColorP4uiv) (GLenum type, const GLuint * color);  /* 618 */
-    void (GLAPIENTRYP MultiTexCoordP1ui) (GLenum texture, GLenum type, GLuint coords);  /* 619 */
-    void (GLAPIENTRYP MultiTexCoordP1uiv) (GLenum texture, GLenum type, const GLuint * coords); /* 620 */
-    void (GLAPIENTRYP MultiTexCoordP2ui) (GLenum texture, GLenum type, GLuint coords);  /* 621 */
-    void (GLAPIENTRYP MultiTexCoordP2uiv) (GLenum texture, GLenum type, const GLuint * coords); /* 622 */
-    void (GLAPIENTRYP MultiTexCoordP3ui) (GLenum texture, GLenum type, GLuint coords);  /* 623 */
-    void (GLAPIENTRYP MultiTexCoordP3uiv) (GLenum texture, GLenum type, const GLuint * coords); /* 624 */
-    void (GLAPIENTRYP MultiTexCoordP4ui) (GLenum texture, GLenum type, GLuint coords);  /* 625 */
-    void (GLAPIENTRYP MultiTexCoordP4uiv) (GLenum texture, GLenum type, const GLuint * coords); /* 626 */
-    void (GLAPIENTRYP NormalP3ui) (GLenum type, GLuint coords); /* 627 */
-    void (GLAPIENTRYP NormalP3uiv) (GLenum type, const GLuint * coords);        /* 628 */
-    void (GLAPIENTRYP SecondaryColorP3ui) (GLenum type, GLuint color);  /* 629 */
-    void (GLAPIENTRYP SecondaryColorP3uiv) (GLenum type, const GLuint * color); /* 630 */
-    void (GLAPIENTRYP TexCoordP1ui) (GLenum type, GLuint coords);       /* 631 */
-    void (GLAPIENTRYP TexCoordP1uiv) (GLenum type, const GLuint * coords);      /* 632 */
-    void (GLAPIENTRYP TexCoordP2ui) (GLenum type, GLuint coords);       /* 633 */
-    void (GLAPIENTRYP TexCoordP2uiv) (GLenum type, const GLuint * coords);      /* 634 */
-    void (GLAPIENTRYP TexCoordP3ui) (GLenum type, GLuint coords);       /* 635 */
-    void (GLAPIENTRYP TexCoordP3uiv) (GLenum type, const GLuint * coords);      /* 636 */
-    void (GLAPIENTRYP TexCoordP4ui) (GLenum type, GLuint coords);       /* 637 */
-    void (GLAPIENTRYP TexCoordP4uiv) (GLenum type, const GLuint * coords);      /* 638 */
-    void (GLAPIENTRYP VertexAttribP1ui) (GLuint index, GLenum type, GLboolean normalized, GLuint value);        /* 639 */
-    void (GLAPIENTRYP VertexAttribP1uiv) (GLuint index, GLenum type, GLboolean normalized, const GLuint * value);       /* 640 */
-    void (GLAPIENTRYP VertexAttribP2ui) (GLuint index, GLenum type, GLboolean normalized, GLuint value);        /* 641 */
-    void (GLAPIENTRYP VertexAttribP2uiv) (GLuint index, GLenum type, GLboolean normalized, const GLuint * value);       /* 642 */
-    void (GLAPIENTRYP VertexAttribP3ui) (GLuint index, GLenum type, GLboolean normalized, GLuint value);        /* 643 */
-    void (GLAPIENTRYP VertexAttribP3uiv) (GLuint index, GLenum type, GLboolean normalized, const GLuint * value);       /* 644 */
-    void (GLAPIENTRYP VertexAttribP4ui) (GLuint index, GLenum type, GLboolean normalized, GLuint value);        /* 645 */
-    void (GLAPIENTRYP VertexAttribP4uiv) (GLuint index, GLenum type, GLboolean normalized, const GLuint * value);       /* 646 */
-    void (GLAPIENTRYP VertexP2ui) (GLenum type, GLuint value);  /* 647 */
-    void (GLAPIENTRYP VertexP2uiv) (GLenum type, const GLuint * value); /* 648 */
-    void (GLAPIENTRYP VertexP3ui) (GLenum type, GLuint value);  /* 649 */
-    void (GLAPIENTRYP VertexP3uiv) (GLenum type, const GLuint * value); /* 650 */
-    void (GLAPIENTRYP VertexP4ui) (GLenum type, GLuint value);  /* 651 */
-    void (GLAPIENTRYP VertexP4uiv) (GLenum type, const GLuint * value); /* 652 */
-    void (GLAPIENTRYP BindTransformFeedback) (GLenum target, GLuint id);        /* 653 */
-    void (GLAPIENTRYP DeleteTransformFeedbacks) (GLsizei n, const GLuint * ids);        /* 654 */
-    void (GLAPIENTRYP DrawTransformFeedback) (GLenum mode, GLuint id);  /* 655 */
-    void (GLAPIENTRYP GenTransformFeedbacks) (GLsizei n, GLuint * ids); /* 656 */
-     GLboolean(GLAPIENTRYP IsTransformFeedback) (GLuint id);    /* 657 */
-    void (GLAPIENTRYP PauseTransformFeedback) (void);   /* 658 */
-    void (GLAPIENTRYP ResumeTransformFeedback) (void);  /* 659 */
-    void (GLAPIENTRYP ClearDepthf) (GLclampf depth);    /* 660 */
-    void (GLAPIENTRYP DepthRangef) (GLclampf zNear, GLclampf zFar);     /* 661 */
-    void (GLAPIENTRYP GetShaderPrecisionFormat) (GLenum shadertype, GLenum precisiontype, GLint * range, GLint * precision);    /* 662 */
-    void (GLAPIENTRYP ReleaseShaderCompiler) (void);    /* 663 */
-    void (GLAPIENTRYP ShaderBinary) (GLsizei n, const GLuint * shaders, GLenum binaryformat, const GLvoid * binary, GLsizei length);    /* 664 */
-     GLenum(GLAPIENTRYP GetGraphicsResetStatusARB) (void);      /* 665 */
-    void (GLAPIENTRYP GetnColorTableARB) (GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid * table);  /* 666 */
-    void (GLAPIENTRYP GetnCompressedTexImageARB) (GLenum target, GLint lod, GLsizei bufSize, GLvoid * img);     /* 667 */
-    void (GLAPIENTRYP GetnConvolutionFilterARB) (GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid * image);   /* 668 */
-    void (GLAPIENTRYP GetnHistogramARB) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid * values); /* 669 */
-    void (GLAPIENTRYP GetnMapdvARB) (GLenum target, GLenum query, GLsizei bufSize, GLdouble * v);       /* 670 */
-    void (GLAPIENTRYP GetnMapfvARB) (GLenum target, GLenum query, GLsizei bufSize, GLfloat * v);        /* 671 */
-    void (GLAPIENTRYP GetnMapivARB) (GLenum target, GLenum query, GLsizei bufSize, GLint * v);  /* 672 */
-    void (GLAPIENTRYP GetnMinmaxARB) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid * values);    /* 673 */
-    void (GLAPIENTRYP GetnPixelMapfvARB) (GLenum map, GLsizei bufSize, GLfloat * values);       /* 674 */
-    void (GLAPIENTRYP GetnPixelMapuivARB) (GLenum map, GLsizei bufSize, GLuint * values);       /* 675 */
-    void (GLAPIENTRYP GetnPixelMapusvARB) (GLenum map, GLsizei bufSize, GLushort * values);     /* 676 */
-    void (GLAPIENTRYP GetnPolygonStippleARB) (GLsizei bufSize, GLubyte * pattern);      /* 677 */
-    void (GLAPIENTRYP GetnSeparableFilterARB) (GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, GLvoid * row, GLsizei columnBufSize, GLvoid * column, GLvoid * span);     /* 678 */
-    void (GLAPIENTRYP GetnTexImageARB) (GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, GLvoid * img); /* 679 */
-    void (GLAPIENTRYP GetnUniformdvARB) (GLhandleARB program, GLint location, GLsizei bufSize, GLdouble * params);      /* 680 */
-    void (GLAPIENTRYP GetnUniformfvARB) (GLhandleARB program, GLint location, GLsizei bufSize, GLfloat * params);       /* 681 */
-    void (GLAPIENTRYP GetnUniformivARB) (GLhandleARB program, GLint location, GLsizei bufSize, GLint * params); /* 682 */
-    void (GLAPIENTRYP GetnUniformuivARB) (GLhandleARB program, GLint location, GLsizei bufSize, GLuint * params);       /* 683 */
-    void (GLAPIENTRYP ReadnPixelsARB) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, GLvoid * data);    /* 684 */
-    void (GLAPIENTRYP TexStorage1D) (GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width);      /* 685 */
-    void (GLAPIENTRYP TexStorage2D) (GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height);      /* 686 */
-    void (GLAPIENTRYP TexStorage3D) (GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth);       /* 687 */
-    void (GLAPIENTRYP TextureStorage1DEXT) (GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width);       /* 688 */
-    void (GLAPIENTRYP TextureStorage2DEXT) (GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height);       /* 689 */
-    void (GLAPIENTRYP TextureStorage3DEXT) (GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth);        /* 690 */
-    void (GLAPIENTRYP PolygonOffsetEXT) (GLfloat factor, GLfloat bias); /* 691 */
-    void (GLAPIENTRYP GetPixelTexGenParameterfvSGIS) (GLenum pname, GLfloat * params);  /* 692 */
-    void (GLAPIENTRYP GetPixelTexGenParameterivSGIS) (GLenum pname, GLint * params);    /* 693 */
-    void (GLAPIENTRYP PixelTexGenParameterfSGIS) (GLenum pname, GLfloat param); /* 694 */
-    void (GLAPIENTRYP PixelTexGenParameterfvSGIS) (GLenum pname, const GLfloat * params);       /* 695 */
-    void (GLAPIENTRYP PixelTexGenParameteriSGIS) (GLenum pname, GLint param);   /* 696 */
-    void (GLAPIENTRYP PixelTexGenParameterivSGIS) (GLenum pname, const GLint * params); /* 697 */
-    void (GLAPIENTRYP SampleMaskSGIS) (GLclampf value, GLboolean invert);       /* 698 */
-    void (GLAPIENTRYP SamplePatternSGIS) (GLenum pattern);      /* 699 */
-    void (GLAPIENTRYP ColorPointerEXT) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer);        /* 700 */
-    void (GLAPIENTRYP EdgeFlagPointerEXT) (GLsizei stride, GLsizei count, const GLboolean * pointer);   /* 701 */
-    void (GLAPIENTRYP IndexPointerEXT) (GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer);    /* 702 */
-    void (GLAPIENTRYP NormalPointerEXT) (GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer);   /* 703 */
-    void (GLAPIENTRYP TexCoordPointerEXT) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer);     /* 704 */
-    void (GLAPIENTRYP VertexPointerEXT) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer);       /* 705 */
-    void (GLAPIENTRYP PointParameterfEXT) (GLenum pname, GLfloat param);        /* 706 */
-    void (GLAPIENTRYP PointParameterfvEXT) (GLenum pname, const GLfloat * params);      /* 707 */
-    void (GLAPIENTRYP LockArraysEXT) (GLint first, GLsizei count);      /* 708 */
-    void (GLAPIENTRYP UnlockArraysEXT) (void);  /* 709 */
-    void (GLAPIENTRYP SecondaryColor3bEXT) (GLbyte red, GLbyte green, GLbyte blue);     /* 710 */
-    void (GLAPIENTRYP SecondaryColor3bvEXT) (const GLbyte * v); /* 711 */
-    void (GLAPIENTRYP SecondaryColor3dEXT) (GLdouble red, GLdouble green, GLdouble blue);       /* 712 */
-    void (GLAPIENTRYP SecondaryColor3dvEXT) (const GLdouble * v);       /* 713 */
-    void (GLAPIENTRYP SecondaryColor3fEXT) (GLfloat red, GLfloat green, GLfloat blue);  /* 714 */
-    void (GLAPIENTRYP SecondaryColor3fvEXT) (const GLfloat * v);        /* 715 */
-    void (GLAPIENTRYP SecondaryColor3iEXT) (GLint red, GLint green, GLint blue);        /* 716 */
-    void (GLAPIENTRYP SecondaryColor3ivEXT) (const GLint * v);  /* 717 */
-    void (GLAPIENTRYP SecondaryColor3sEXT) (GLshort red, GLshort green, GLshort blue);  /* 718 */
-    void (GLAPIENTRYP SecondaryColor3svEXT) (const GLshort * v);        /* 719 */
-    void (GLAPIENTRYP SecondaryColor3ubEXT) (GLubyte red, GLubyte green, GLubyte blue); /* 720 */
-    void (GLAPIENTRYP SecondaryColor3ubvEXT) (const GLubyte * v);       /* 721 */
-    void (GLAPIENTRYP SecondaryColor3uiEXT) (GLuint red, GLuint green, GLuint blue);    /* 722 */
-    void (GLAPIENTRYP SecondaryColor3uivEXT) (const GLuint * v);        /* 723 */
-    void (GLAPIENTRYP SecondaryColor3usEXT) (GLushort red, GLushort green, GLushort blue);      /* 724 */
-    void (GLAPIENTRYP SecondaryColor3usvEXT) (const GLushort * v);      /* 725 */
-    void (GLAPIENTRYP SecondaryColorPointerEXT) (GLint size, GLenum type, GLsizei stride, const GLvoid * pointer);      /* 726 */
-    void (GLAPIENTRYP MultiDrawArraysEXT) (GLenum mode, const GLint * first, const GLsizei * count, GLsizei primcount); /* 727 */
-    void (GLAPIENTRYP MultiDrawElementsEXT) (GLenum mode, const GLsizei * count, GLenum type, const GLvoid ** indices, GLsizei primcount);      /* 728 */
-    void (GLAPIENTRYP FogCoordPointerEXT) (GLenum type, GLsizei stride, const GLvoid * pointer);        /* 729 */
-    void (GLAPIENTRYP FogCoorddEXT) (GLdouble coord);   /* 730 */
-    void (GLAPIENTRYP FogCoorddvEXT) (const GLdouble * coord);  /* 731 */
-    void (GLAPIENTRYP FogCoordfEXT) (GLfloat coord);    /* 732 */
-    void (GLAPIENTRYP FogCoordfvEXT) (const GLfloat * coord);   /* 733 */
-    void (GLAPIENTRYP PixelTexGenSGIX) (GLenum mode);   /* 734 */
-    void (GLAPIENTRYP BlendFuncSeparateEXT) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);   /* 735 */
-    void (GLAPIENTRYP FlushVertexArrayRangeNV) (void);  /* 736 */
-    void (GLAPIENTRYP VertexArrayRangeNV) (GLsizei length, const GLvoid * pointer);     /* 737 */
-    void (GLAPIENTRYP CombinerInputNV) (GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);    /* 738 */
-    void (GLAPIENTRYP CombinerOutputNV) (GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum);        /* 739 */
-    void (GLAPIENTRYP CombinerParameterfNV) (GLenum pname, GLfloat param);      /* 740 */
-    void (GLAPIENTRYP CombinerParameterfvNV) (GLenum pname, const GLfloat * params);    /* 741 */
-    void (GLAPIENTRYP CombinerParameteriNV) (GLenum pname, GLint param);        /* 742 */
-    void (GLAPIENTRYP CombinerParameterivNV) (GLenum pname, const GLint * params);      /* 743 */
-    void (GLAPIENTRYP FinalCombinerInputNV) (GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);     /* 744 */
-    void (GLAPIENTRYP GetCombinerInputParameterfvNV) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat * params);   /* 745 */
-    void (GLAPIENTRYP GetCombinerInputParameterivNV) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint * params);     /* 746 */
-    void (GLAPIENTRYP GetCombinerOutputParameterfvNV) (GLenum stage, GLenum portion, GLenum pname, GLfloat * params);   /* 747 */
-    void (GLAPIENTRYP GetCombinerOutputParameterivNV) (GLenum stage, GLenum portion, GLenum pname, GLint * params);     /* 748 */
-    void (GLAPIENTRYP GetFinalCombinerInputParameterfvNV) (GLenum variable, GLenum pname, GLfloat * params);    /* 749 */
-    void (GLAPIENTRYP GetFinalCombinerInputParameterivNV) (GLenum variable, GLenum pname, GLint * params);      /* 750 */
-    void (GLAPIENTRYP ResizeBuffersMESA) (void);        /* 751 */
-    void (GLAPIENTRYP WindowPos2dMESA) (GLdouble x, GLdouble y);        /* 752 */
-    void (GLAPIENTRYP WindowPos2dvMESA) (const GLdouble * v);   /* 753 */
-    void (GLAPIENTRYP WindowPos2fMESA) (GLfloat x, GLfloat y);  /* 754 */
-    void (GLAPIENTRYP WindowPos2fvMESA) (const GLfloat * v);    /* 755 */
-    void (GLAPIENTRYP WindowPos2iMESA) (GLint x, GLint y);      /* 756 */
-    void (GLAPIENTRYP WindowPos2ivMESA) (const GLint * v);      /* 757 */
-    void (GLAPIENTRYP WindowPos2sMESA) (GLshort x, GLshort y);  /* 758 */
-    void (GLAPIENTRYP WindowPos2svMESA) (const GLshort * v);    /* 759 */
-    void (GLAPIENTRYP WindowPos3dMESA) (GLdouble x, GLdouble y, GLdouble z);    /* 760 */
-    void (GLAPIENTRYP WindowPos3dvMESA) (const GLdouble * v);   /* 761 */
-    void (GLAPIENTRYP WindowPos3fMESA) (GLfloat x, GLfloat y, GLfloat z);       /* 762 */
-    void (GLAPIENTRYP WindowPos3fvMESA) (const GLfloat * v);    /* 763 */
-    void (GLAPIENTRYP WindowPos3iMESA) (GLint x, GLint y, GLint z);     /* 764 */
-    void (GLAPIENTRYP WindowPos3ivMESA) (const GLint * v);      /* 765 */
-    void (GLAPIENTRYP WindowPos3sMESA) (GLshort x, GLshort y, GLshort z);       /* 766 */
-    void (GLAPIENTRYP WindowPos3svMESA) (const GLshort * v);    /* 767 */
-    void (GLAPIENTRYP WindowPos4dMESA) (GLdouble x, GLdouble y, GLdouble z, GLdouble w);        /* 768 */
-    void (GLAPIENTRYP WindowPos4dvMESA) (const GLdouble * v);   /* 769 */
-    void (GLAPIENTRYP WindowPos4fMESA) (GLfloat x, GLfloat y, GLfloat z, GLfloat w);    /* 770 */
-    void (GLAPIENTRYP WindowPos4fvMESA) (const GLfloat * v);    /* 771 */
-    void (GLAPIENTRYP WindowPos4iMESA) (GLint x, GLint y, GLint z, GLint w);    /* 772 */
-    void (GLAPIENTRYP WindowPos4ivMESA) (const GLint * v);      /* 773 */
-    void (GLAPIENTRYP WindowPos4sMESA) (GLshort x, GLshort y, GLshort z, GLshort w);    /* 774 */
-    void (GLAPIENTRYP WindowPos4svMESA) (const GLshort * v);    /* 775 */
-    void (GLAPIENTRYP MultiModeDrawArraysIBM) (const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);   /* 776 */
-    void (GLAPIENTRYP MultiModeDrawElementsIBM) (const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const *indices, GLsizei primcount, GLint modestride);  /* 777 */
-    void (GLAPIENTRYP DeleteFencesNV) (GLsizei n, const GLuint * fences);       /* 778 */
-    void (GLAPIENTRYP FinishFenceNV) (GLuint fence);    /* 779 */
-    void (GLAPIENTRYP GenFencesNV) (GLsizei n, GLuint * fences);        /* 780 */
-    void (GLAPIENTRYP GetFenceivNV) (GLuint fence, GLenum pname, GLint * params);       /* 781 */
-     GLboolean(GLAPIENTRYP IsFenceNV) (GLuint fence);   /* 782 */
-    void (GLAPIENTRYP SetFenceNV) (GLuint fence, GLenum condition);     /* 783 */
-     GLboolean(GLAPIENTRYP TestFenceNV) (GLuint fence); /* 784 */
-     GLboolean(GLAPIENTRYP AreProgramsResidentNV) (GLsizei n, const GLuint * ids, GLboolean * residences);      /* 785 */
-    void (GLAPIENTRYP BindProgramNV) (GLenum target, GLuint program);   /* 786 */
-    void (GLAPIENTRYP DeleteProgramsNV) (GLsizei n, const GLuint * programs);   /* 787 */
-    void (GLAPIENTRYP ExecuteProgramNV) (GLenum target, GLuint id, const GLfloat * params);     /* 788 */
-    void (GLAPIENTRYP GenProgramsNV) (GLsizei n, GLuint * programs);    /* 789 */
-    void (GLAPIENTRYP GetProgramParameterdvNV) (GLenum target, GLuint index, GLenum pname, GLdouble * params);  /* 790 */
-    void (GLAPIENTRYP GetProgramParameterfvNV) (GLenum target, GLuint index, GLenum pname, GLfloat * params);   /* 791 */
-    void (GLAPIENTRYP GetProgramStringNV) (GLuint id, GLenum pname, GLubyte * program); /* 792 */
-    void (GLAPIENTRYP GetProgramivNV) (GLuint id, GLenum pname, GLint * params);        /* 793 */
-    void (GLAPIENTRYP GetTrackMatrixivNV) (GLenum target, GLuint address, GLenum pname, GLint * params);        /* 794 */
-    void (GLAPIENTRYP GetVertexAttribPointervNV) (GLuint index, GLenum pname, GLvoid ** pointer);       /* 795 */
-    void (GLAPIENTRYP GetVertexAttribdvNV) (GLuint index, GLenum pname, GLdouble * params);     /* 796 */
-    void (GLAPIENTRYP GetVertexAttribfvNV) (GLuint index, GLenum pname, GLfloat * params);      /* 797 */
-    void (GLAPIENTRYP GetVertexAttribivNV) (GLuint index, GLenum pname, GLint * params);        /* 798 */
-     GLboolean(GLAPIENTRYP IsProgramNV) (GLuint program);       /* 799 */
-    void (GLAPIENTRYP LoadProgramNV) (GLenum target, GLuint id, GLsizei len, const GLubyte * program);  /* 800 */
-    void (GLAPIENTRYP ProgramParameters4dvNV) (GLenum target, GLuint index, GLsizei num, const GLdouble * params);      /* 801 */
-    void (GLAPIENTRYP ProgramParameters4fvNV) (GLenum target, GLuint index, GLsizei num, const GLfloat * params);       /* 802 */
-    void (GLAPIENTRYP RequestResidentProgramsNV) (GLsizei n, const GLuint * ids);       /* 803 */
-    void (GLAPIENTRYP TrackMatrixNV) (GLenum target, GLuint address, GLenum matrix, GLenum transform);  /* 804 */
-    void (GLAPIENTRYP VertexAttrib1dNV) (GLuint index, GLdouble x);     /* 805 */
-    void (GLAPIENTRYP VertexAttrib1dvNV) (GLuint index, const GLdouble * v);    /* 806 */
-    void (GLAPIENTRYP VertexAttrib1fNV) (GLuint index, GLfloat x);      /* 807 */
-    void (GLAPIENTRYP VertexAttrib1fvNV) (GLuint index, const GLfloat * v);     /* 808 */
-    void (GLAPIENTRYP VertexAttrib1sNV) (GLuint index, GLshort x);      /* 809 */
-    void (GLAPIENTRYP VertexAttrib1svNV) (GLuint index, const GLshort * v);     /* 810 */
-    void (GLAPIENTRYP VertexAttrib2dNV) (GLuint index, GLdouble x, GLdouble y); /* 811 */
-    void (GLAPIENTRYP VertexAttrib2dvNV) (GLuint index, const GLdouble * v);    /* 812 */
-    void (GLAPIENTRYP VertexAttrib2fNV) (GLuint index, GLfloat x, GLfloat y);   /* 813 */
-    void (GLAPIENTRYP VertexAttrib2fvNV) (GLuint index, const GLfloat * v);     /* 814 */
-    void (GLAPIENTRYP VertexAttrib2sNV) (GLuint index, GLshort x, GLshort y);   /* 815 */
-    void (GLAPIENTRYP VertexAttrib2svNV) (GLuint index, const GLshort * v);     /* 816 */
-    void (GLAPIENTRYP VertexAttrib3dNV) (GLuint index, GLdouble x, GLdouble y, GLdouble z);     /* 817 */
-    void (GLAPIENTRYP VertexAttrib3dvNV) (GLuint index, const GLdouble * v);    /* 818 */
-    void (GLAPIENTRYP VertexAttrib3fNV) (GLuint index, GLfloat x, GLfloat y, GLfloat z);        /* 819 */
-    void (GLAPIENTRYP VertexAttrib3fvNV) (GLuint index, const GLfloat * v);     /* 820 */
-    void (GLAPIENTRYP VertexAttrib3sNV) (GLuint index, GLshort x, GLshort y, GLshort z);        /* 821 */
-    void (GLAPIENTRYP VertexAttrib3svNV) (GLuint index, const GLshort * v);     /* 822 */
-    void (GLAPIENTRYP VertexAttrib4dNV) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 823 */
-    void (GLAPIENTRYP VertexAttrib4dvNV) (GLuint index, const GLdouble * v);    /* 824 */
-    void (GLAPIENTRYP VertexAttrib4fNV) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);     /* 825 */
-    void (GLAPIENTRYP VertexAttrib4fvNV) (GLuint index, const GLfloat * v);     /* 826 */
-    void (GLAPIENTRYP VertexAttrib4sNV) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);     /* 827 */
-    void (GLAPIENTRYP VertexAttrib4svNV) (GLuint index, const GLshort * v);     /* 828 */
-    void (GLAPIENTRYP VertexAttrib4ubNV) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);    /* 829 */
-    void (GLAPIENTRYP VertexAttrib4ubvNV) (GLuint index, const GLubyte * v);    /* 830 */
-    void (GLAPIENTRYP VertexAttribPointerNV) (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer);   /* 831 */
-    void (GLAPIENTRYP VertexAttribs1dvNV) (GLuint index, GLsizei n, const GLdouble * v);        /* 832 */
-    void (GLAPIENTRYP VertexAttribs1fvNV) (GLuint index, GLsizei n, const GLfloat * v); /* 833 */
-    void (GLAPIENTRYP VertexAttribs1svNV) (GLuint index, GLsizei n, const GLshort * v); /* 834 */
-    void (GLAPIENTRYP VertexAttribs2dvNV) (GLuint index, GLsizei n, const GLdouble * v);        /* 835 */
-    void (GLAPIENTRYP VertexAttribs2fvNV) (GLuint index, GLsizei n, const GLfloat * v); /* 836 */
-    void (GLAPIENTRYP VertexAttribs2svNV) (GLuint index, GLsizei n, const GLshort * v); /* 837 */
-    void (GLAPIENTRYP VertexAttribs3dvNV) (GLuint index, GLsizei n, const GLdouble * v);        /* 838 */
-    void (GLAPIENTRYP VertexAttribs3fvNV) (GLuint index, GLsizei n, const GLfloat * v); /* 839 */
-    void (GLAPIENTRYP VertexAttribs3svNV) (GLuint index, GLsizei n, const GLshort * v); /* 840 */
-    void (GLAPIENTRYP VertexAttribs4dvNV) (GLuint index, GLsizei n, const GLdouble * v);        /* 841 */
-    void (GLAPIENTRYP VertexAttribs4fvNV) (GLuint index, GLsizei n, const GLfloat * v); /* 842 */
-    void (GLAPIENTRYP VertexAttribs4svNV) (GLuint index, GLsizei n, const GLshort * v); /* 843 */
-    void (GLAPIENTRYP VertexAttribs4ubvNV) (GLuint index, GLsizei n, const GLubyte * v);        /* 844 */
-    void (GLAPIENTRYP GetTexBumpParameterfvATI) (GLenum pname, GLfloat * param);        /* 845 */
-    void (GLAPIENTRYP GetTexBumpParameterivATI) (GLenum pname, GLint * param);  /* 846 */
-    void (GLAPIENTRYP TexBumpParameterfvATI) (GLenum pname, const GLfloat * param);     /* 847 */
-    void (GLAPIENTRYP TexBumpParameterivATI) (GLenum pname, const GLint * param);       /* 848 */
-    void (GLAPIENTRYP AlphaFragmentOp1ATI) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 849 */
-    void (GLAPIENTRYP AlphaFragmentOp2ATI) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);    /* 850 */
-    void (GLAPIENTRYP AlphaFragmentOp3ATI) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);       /* 851 */
-    void (GLAPIENTRYP BeginFragmentShaderATI) (void);   /* 852 */
-    void (GLAPIENTRYP BindFragmentShaderATI) (GLuint id);       /* 853 */
-    void (GLAPIENTRYP ColorFragmentOp1ATI) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 854 */
-    void (GLAPIENTRYP ColorFragmentOp2ATI) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);    /* 855 */
-    void (GLAPIENTRYP ColorFragmentOp3ATI) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);       /* 856 */
-    void (GLAPIENTRYP DeleteFragmentShaderATI) (GLuint id);     /* 857 */
-    void (GLAPIENTRYP EndFragmentShaderATI) (void);     /* 858 */
-     GLuint(GLAPIENTRYP GenFragmentShadersATI) (GLuint range);  /* 859 */
-    void (GLAPIENTRYP PassTexCoordATI) (GLuint dst, GLuint coord, GLenum swizzle);      /* 860 */
-    void (GLAPIENTRYP SampleMapATI) (GLuint dst, GLuint interp, GLenum swizzle);        /* 861 */
-    void (GLAPIENTRYP SetFragmentShaderConstantATI) (GLuint dst, const GLfloat * value);        /* 862 */
-    void (GLAPIENTRYP PointParameteriNV) (GLenum pname, GLint param);   /* 863 */
-    void (GLAPIENTRYP PointParameterivNV) (GLenum pname, const GLint * params); /* 864 */
-    void (GLAPIENTRYP ActiveStencilFaceEXT) (GLenum face);      /* 865 */
-    void (GLAPIENTRYP BindVertexArrayAPPLE) (GLuint array);     /* 866 */
-    void (GLAPIENTRYP DeleteVertexArraysAPPLE) (GLsizei n, const GLuint * arrays);      /* 867 */
-    void (GLAPIENTRYP GenVertexArraysAPPLE) (GLsizei n, GLuint * arrays);       /* 868 */
-     GLboolean(GLAPIENTRYP IsVertexArrayAPPLE) (GLuint array);  /* 869 */
-    void (GLAPIENTRYP GetProgramNamedParameterdvNV) (GLuint id, GLsizei len, const GLubyte * name, GLdouble * params);  /* 870 */
-    void (GLAPIENTRYP GetProgramNamedParameterfvNV) (GLuint id, GLsizei len, const GLubyte * name, GLfloat * params);   /* 871 */
-    void (GLAPIENTRYP ProgramNamedParameter4dNV) (GLuint id, GLsizei len, const GLubyte * name, GLdouble x, GLdouble y, GLdouble z, GLdouble w);        /* 872 */
-    void (GLAPIENTRYP ProgramNamedParameter4dvNV) (GLuint id, GLsizei len, const GLubyte * name, const GLdouble * v);   /* 873 */
-    void (GLAPIENTRYP ProgramNamedParameter4fNV) (GLuint id, GLsizei len, const GLubyte * name, GLfloat x, GLfloat y, GLfloat z, GLfloat w);    /* 874 */
-    void (GLAPIENTRYP ProgramNamedParameter4fvNV) (GLuint id, GLsizei len, const GLubyte * name, const GLfloat * v);    /* 875 */
-    void (GLAPIENTRYP PrimitiveRestartIndexNV) (GLuint index);  /* 876 */
-    void (GLAPIENTRYP PrimitiveRestartNV) (void);       /* 877 */
-    void (GLAPIENTRYP DepthBoundsEXT) (GLclampd zmin, GLclampd zmax);   /* 878 */
-    void (GLAPIENTRYP BlendEquationSeparateEXT) (GLenum modeRGB, GLenum modeA); /* 879 */
-    void (GLAPIENTRYP BindFramebufferEXT) (GLenum target, GLuint framebuffer);  /* 880 */
-    void (GLAPIENTRYP BindRenderbufferEXT) (GLenum target, GLuint renderbuffer);        /* 881 */
-     GLenum(GLAPIENTRYP CheckFramebufferStatusEXT) (GLenum target);     /* 882 */
-    void (GLAPIENTRYP DeleteFramebuffersEXT) (GLsizei n, const GLuint * framebuffers);  /* 883 */
-    void (GLAPIENTRYP DeleteRenderbuffersEXT) (GLsizei n, const GLuint * renderbuffers);        /* 884 */
-    void (GLAPIENTRYP FramebufferRenderbufferEXT) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);   /* 885 */
-    void (GLAPIENTRYP FramebufferTexture1DEXT) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);       /* 886 */
-    void (GLAPIENTRYP FramebufferTexture2DEXT) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);       /* 887 */
-    void (GLAPIENTRYP FramebufferTexture3DEXT) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);        /* 888 */
-    void (GLAPIENTRYP GenFramebuffersEXT) (GLsizei n, GLuint * framebuffers);   /* 889 */
-    void (GLAPIENTRYP GenRenderbuffersEXT) (GLsizei n, GLuint * renderbuffers); /* 890 */
-    void (GLAPIENTRYP GenerateMipmapEXT) (GLenum target);       /* 891 */
-    void (GLAPIENTRYP GetFramebufferAttachmentParameterivEXT) (GLenum target, GLenum attachment, GLenum pname, GLint * params); /* 892 */
-    void (GLAPIENTRYP GetRenderbufferParameterivEXT) (GLenum target, GLenum pname, GLint * params);     /* 893 */
-     GLboolean(GLAPIENTRYP IsFramebufferEXT) (GLuint framebuffer);      /* 894 */
-     GLboolean(GLAPIENTRYP IsRenderbufferEXT) (GLuint renderbuffer);    /* 895 */
-    void (GLAPIENTRYP RenderbufferStorageEXT) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);    /* 896 */
-    void (GLAPIENTRYP BlitFramebufferEXT) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);     /* 897 */
-    void (GLAPIENTRYP BufferParameteriAPPLE) (GLenum target, GLenum pname, GLint param);        /* 898 */
-    void (GLAPIENTRYP FlushMappedBufferRangeAPPLE) (GLenum target, GLintptr offset, GLsizeiptr size);   /* 899 */
-    void (GLAPIENTRYP BindFragDataLocationEXT) (GLuint program, GLuint colorNumber, const GLchar * name);       /* 900 */
-     GLint(GLAPIENTRYP GetFragDataLocationEXT) (GLuint program, const GLchar * name);   /* 901 */
-    void (GLAPIENTRYP GetUniformuivEXT) (GLuint program, GLint location, GLuint * params);      /* 902 */
-    void (GLAPIENTRYP GetVertexAttribIivEXT) (GLuint index, GLenum pname, GLint * params);      /* 903 */
-    void (GLAPIENTRYP GetVertexAttribIuivEXT) (GLuint index, GLenum pname, GLuint * params);    /* 904 */
-    void (GLAPIENTRYP Uniform1uiEXT) (GLint location, GLuint x);        /* 905 */
-    void (GLAPIENTRYP Uniform1uivEXT) (GLint location, GLsizei count, const GLuint * value);    /* 906 */
-    void (GLAPIENTRYP Uniform2uiEXT) (GLint location, GLuint x, GLuint y);      /* 907 */
-    void (GLAPIENTRYP Uniform2uivEXT) (GLint location, GLsizei count, const GLuint * value);    /* 908 */
-    void (GLAPIENTRYP Uniform3uiEXT) (GLint location, GLuint x, GLuint y, GLuint z);    /* 909 */
-    void (GLAPIENTRYP Uniform3uivEXT) (GLint location, GLsizei count, const GLuint * value);    /* 910 */
-    void (GLAPIENTRYP Uniform4uiEXT) (GLint location, GLuint x, GLuint y, GLuint z, GLuint w);  /* 911 */
-    void (GLAPIENTRYP Uniform4uivEXT) (GLint location, GLsizei count, const GLuint * value);    /* 912 */
-    void (GLAPIENTRYP VertexAttribI1iEXT) (GLuint index, GLint x);      /* 913 */
-    void (GLAPIENTRYP VertexAttribI1ivEXT) (GLuint index, const GLint * v);     /* 914 */
-    void (GLAPIENTRYP VertexAttribI1uiEXT) (GLuint index, GLuint x);    /* 915 */
-    void (GLAPIENTRYP VertexAttribI1uivEXT) (GLuint index, const GLuint * v);   /* 916 */
-    void (GLAPIENTRYP VertexAttribI2iEXT) (GLuint index, GLint x, GLint y);     /* 917 */
-    void (GLAPIENTRYP VertexAttribI2ivEXT) (GLuint index, const GLint * v);     /* 918 */
-    void (GLAPIENTRYP VertexAttribI2uiEXT) (GLuint index, GLuint x, GLuint y);  /* 919 */
-    void (GLAPIENTRYP VertexAttribI2uivEXT) (GLuint index, const GLuint * v);   /* 920 */
-    void (GLAPIENTRYP VertexAttribI3iEXT) (GLuint index, GLint x, GLint y, GLint z);    /* 921 */
-    void (GLAPIENTRYP VertexAttribI3ivEXT) (GLuint index, const GLint * v);     /* 922 */
-    void (GLAPIENTRYP VertexAttribI3uiEXT) (GLuint index, GLuint x, GLuint y, GLuint z);        /* 923 */
-    void (GLAPIENTRYP VertexAttribI3uivEXT) (GLuint index, const GLuint * v);   /* 924 */
-    void (GLAPIENTRYP VertexAttribI4bvEXT) (GLuint index, const GLbyte * v);    /* 925 */
-    void (GLAPIENTRYP VertexAttribI4iEXT) (GLuint index, GLint x, GLint y, GLint z, GLint w);   /* 926 */
-    void (GLAPIENTRYP VertexAttribI4ivEXT) (GLuint index, const GLint * v);     /* 927 */
-    void (GLAPIENTRYP VertexAttribI4svEXT) (GLuint index, const GLshort * v);   /* 928 */
-    void (GLAPIENTRYP VertexAttribI4ubvEXT) (GLuint index, const GLubyte * v);  /* 929 */
-    void (GLAPIENTRYP VertexAttribI4uiEXT) (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);      /* 930 */
-    void (GLAPIENTRYP VertexAttribI4uivEXT) (GLuint index, const GLuint * v);   /* 931 */
-    void (GLAPIENTRYP VertexAttribI4usvEXT) (GLuint index, const GLushort * v); /* 932 */
-    void (GLAPIENTRYP VertexAttribIPointerEXT) (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 933 */
-    void (GLAPIENTRYP FramebufferTextureLayerEXT) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); /* 934 */
-    void (GLAPIENTRYP ColorMaskIndexedEXT) (GLuint buf, GLboolean r, GLboolean g, GLboolean b, GLboolean a);    /* 935 */
-    void (GLAPIENTRYP DisableIndexedEXT) (GLenum target, GLuint index); /* 936 */
-    void (GLAPIENTRYP EnableIndexedEXT) (GLenum target, GLuint index);  /* 937 */
-    void (GLAPIENTRYP GetBooleanIndexedvEXT) (GLenum value, GLuint index, GLboolean * data);    /* 938 */
-    void (GLAPIENTRYP GetIntegerIndexedvEXT) (GLenum value, GLuint index, GLint * data);        /* 939 */
-     GLboolean(GLAPIENTRYP IsEnabledIndexedEXT) (GLenum target, GLuint index);  /* 940 */
-    void (GLAPIENTRYP ClearColorIiEXT) (GLint r, GLint g, GLint b, GLint a);    /* 941 */
-    void (GLAPIENTRYP ClearColorIuiEXT) (GLuint r, GLuint g, GLuint b, GLuint a);       /* 942 */
-    void (GLAPIENTRYP GetTexParameterIivEXT) (GLenum target, GLenum pname, GLint * params);     /* 943 */
-    void (GLAPIENTRYP GetTexParameterIuivEXT) (GLenum target, GLenum pname, GLuint * params);   /* 944 */
-    void (GLAPIENTRYP TexParameterIivEXT) (GLenum target, GLenum pname, const GLint * params);  /* 945 */
-    void (GLAPIENTRYP TexParameterIuivEXT) (GLenum target, GLenum pname, const GLuint * params);        /* 946 */
-    void (GLAPIENTRYP BeginConditionalRenderNV) (GLuint query, GLenum mode);    /* 947 */
-    void (GLAPIENTRYP EndConditionalRenderNV) (void);   /* 948 */
-    void (GLAPIENTRYP BeginTransformFeedbackEXT) (GLenum mode); /* 949 */
-    void (GLAPIENTRYP BindBufferBaseEXT) (GLenum target, GLuint index, GLuint buffer);  /* 950 */
-    void (GLAPIENTRYP BindBufferOffsetEXT) (GLenum target, GLuint index, GLuint buffer, GLintptr offset);       /* 951 */
-    void (GLAPIENTRYP BindBufferRangeEXT) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);       /* 952 */
-    void (GLAPIENTRYP EndTransformFeedbackEXT) (void);  /* 953 */
-    void (GLAPIENTRYP GetTransformFeedbackVaryingEXT) (GLuint program, GLuint index, GLsizei bufSize, GLsizei * length, GLsizei * size, GLenum * type, GLchar * name);  /* 954 */
-    void (GLAPIENTRYP TransformFeedbackVaryingsEXT) (GLuint program, GLsizei count, const char **varyings, GLenum bufferMode);  /* 955 */
-    void (GLAPIENTRYP ProvokingVertexEXT) (GLenum mode);        /* 956 */
-    void (GLAPIENTRYP GetTexParameterPointervAPPLE) (GLenum target, GLenum pname, GLvoid ** params);    /* 957 */
-    void (GLAPIENTRYP TextureRangeAPPLE) (GLenum target, GLsizei length, GLvoid * pointer);     /* 958 */
-    void (GLAPIENTRYP GetObjectParameterivAPPLE) (GLenum objectType, GLuint name, GLenum pname, GLint * value); /* 959 */
-     GLenum(GLAPIENTRYP ObjectPurgeableAPPLE) (GLenum objectType, GLuint name, GLenum option);  /* 960 */
-     GLenum(GLAPIENTRYP ObjectUnpurgeableAPPLE) (GLenum objectType, GLuint name, GLenum option);        /* 961 */
-    void (GLAPIENTRYP ActiveProgramEXT) (GLuint program);       /* 962 */
-     GLuint(GLAPIENTRYP CreateShaderProgramEXT) (GLenum type, const GLchar * string);   /* 963 */
-    void (GLAPIENTRYP UseShaderProgramEXT) (GLenum type, GLuint program);       /* 964 */
-    void (GLAPIENTRYP TextureBarrierNV) (void); /* 965 */
-    void (GLAPIENTRYP StencilFuncSeparateATI) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);      /* 966 */
-    void (GLAPIENTRYP ProgramEnvParameters4fvEXT) (GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 967 */
-    void (GLAPIENTRYP ProgramLocalParameters4fvEXT) (GLenum target, GLuint index, GLsizei count, const GLfloat * params);       /* 968 */
-    void (GLAPIENTRYP GetQueryObjecti64vEXT) (GLuint id, GLenum pname, GLint64EXT * params);    /* 969 */
-    void (GLAPIENTRYP GetQueryObjectui64vEXT) (GLuint id, GLenum pname, GLuint64EXT * params);  /* 970 */
-    void (GLAPIENTRYP EGLImageTargetRenderbufferStorageOES) (GLenum target, GLvoid * writeOffset);      /* 971 */
-    void (GLAPIENTRYP EGLImageTargetTexture2DOES) (GLenum target, GLvoid * writeOffset);        /* 972 */
-};
-
-#endif                          /* !defined( _GLAPI_TABLE_H_ ) */
+/* DO NOT EDIT - This file generated automatically by gl_table.py (from Mesa) script */

+

+/*

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

+ * (C) Copyright IBM Corporation 2004

+ * All Rights Reserved.

+ * 

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

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

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

+ * the rights to use, copy, modify, merge, publish, distribute, sub license,

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

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

+ * 

+ * The above copyright notice and this permission notice (including the next

+ * paragraph) shall be included in all copies or substantial portions of the

+ * Software.

+ * 

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

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

+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL

+ * BRIAN PAUL, IBM,

+ * AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

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

+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

+ * SOFTWARE.

+ */

+

+#if !defined( _GLAPI_TABLE_H_ )

+#  define _GLAPI_TABLE_H_

+

+#ifndef GLAPIENTRYP

+# ifndef GLAPIENTRY

+#  define GLAPIENTRY

+# endif

+

+# define GLAPIENTRYP GLAPIENTRY *

+#endif

+

+

+struct _glapi_table

+{

+   void (GLAPIENTRYP NewList)(GLuint list, GLenum mode); /* 0 */

+   void (GLAPIENTRYP EndList)(void); /* 1 */

+   void (GLAPIENTRYP CallList)(GLuint list); /* 2 */

+   void (GLAPIENTRYP CallLists)(GLsizei n, GLenum type, const GLvoid * lists); /* 3 */

+   void (GLAPIENTRYP DeleteLists)(GLuint list, GLsizei range); /* 4 */

+   GLuint (GLAPIENTRYP GenLists)(GLsizei range); /* 5 */

+   void (GLAPIENTRYP ListBase)(GLuint base); /* 6 */

+   void (GLAPIENTRYP Begin)(GLenum mode); /* 7 */

+   void (GLAPIENTRYP Bitmap)(GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte * bitmap); /* 8 */

+   void (GLAPIENTRYP Color3b)(GLbyte red, GLbyte green, GLbyte blue); /* 9 */

+   void (GLAPIENTRYP Color3bv)(const GLbyte * v); /* 10 */

+   void (GLAPIENTRYP Color3d)(GLdouble red, GLdouble green, GLdouble blue); /* 11 */

+   void (GLAPIENTRYP Color3dv)(const GLdouble * v); /* 12 */

+   void (GLAPIENTRYP Color3f)(GLfloat red, GLfloat green, GLfloat blue); /* 13 */

+   void (GLAPIENTRYP Color3fv)(const GLfloat * v); /* 14 */

+   void (GLAPIENTRYP Color3i)(GLint red, GLint green, GLint blue); /* 15 */

+   void (GLAPIENTRYP Color3iv)(const GLint * v); /* 16 */

+   void (GLAPIENTRYP Color3s)(GLshort red, GLshort green, GLshort blue); /* 17 */

+   void (GLAPIENTRYP Color3sv)(const GLshort * v); /* 18 */

+   void (GLAPIENTRYP Color3ub)(GLubyte red, GLubyte green, GLubyte blue); /* 19 */

+   void (GLAPIENTRYP Color3ubv)(const GLubyte * v); /* 20 */

+   void (GLAPIENTRYP Color3ui)(GLuint red, GLuint green, GLuint blue); /* 21 */

+   void (GLAPIENTRYP Color3uiv)(const GLuint * v); /* 22 */

+   void (GLAPIENTRYP Color3us)(GLushort red, GLushort green, GLushort blue); /* 23 */

+   void (GLAPIENTRYP Color3usv)(const GLushort * v); /* 24 */

+   void (GLAPIENTRYP Color4b)(GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha); /* 25 */

+   void (GLAPIENTRYP Color4bv)(const GLbyte * v); /* 26 */

+   void (GLAPIENTRYP Color4d)(GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha); /* 27 */

+   void (GLAPIENTRYP Color4dv)(const GLdouble * v); /* 28 */

+   void (GLAPIENTRYP Color4f)(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha); /* 29 */

+   void (GLAPIENTRYP Color4fv)(const GLfloat * v); /* 30 */

+   void (GLAPIENTRYP Color4i)(GLint red, GLint green, GLint blue, GLint alpha); /* 31 */

+   void (GLAPIENTRYP Color4iv)(const GLint * v); /* 32 */

+   void (GLAPIENTRYP Color4s)(GLshort red, GLshort green, GLshort blue, GLshort alpha); /* 33 */

+   void (GLAPIENTRYP Color4sv)(const GLshort * v); /* 34 */

+   void (GLAPIENTRYP Color4ub)(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha); /* 35 */

+   void (GLAPIENTRYP Color4ubv)(const GLubyte * v); /* 36 */

+   void (GLAPIENTRYP Color4ui)(GLuint red, GLuint green, GLuint blue, GLuint alpha); /* 37 */

+   void (GLAPIENTRYP Color4uiv)(const GLuint * v); /* 38 */

+   void (GLAPIENTRYP Color4us)(GLushort red, GLushort green, GLushort blue, GLushort alpha); /* 39 */

+   void (GLAPIENTRYP Color4usv)(const GLushort * v); /* 40 */

+   void (GLAPIENTRYP EdgeFlag)(GLboolean flag); /* 41 */

+   void (GLAPIENTRYP EdgeFlagv)(const GLboolean * flag); /* 42 */

+   void (GLAPIENTRYP End)(void); /* 43 */

+   void (GLAPIENTRYP Indexd)(GLdouble c); /* 44 */

+   void (GLAPIENTRYP Indexdv)(const GLdouble * c); /* 45 */

+   void (GLAPIENTRYP Indexf)(GLfloat c); /* 46 */

+   void (GLAPIENTRYP Indexfv)(const GLfloat * c); /* 47 */

+   void (GLAPIENTRYP Indexi)(GLint c); /* 48 */

+   void (GLAPIENTRYP Indexiv)(const GLint * c); /* 49 */

+   void (GLAPIENTRYP Indexs)(GLshort c); /* 50 */

+   void (GLAPIENTRYP Indexsv)(const GLshort * c); /* 51 */

+   void (GLAPIENTRYP Normal3b)(GLbyte nx, GLbyte ny, GLbyte nz); /* 52 */

+   void (GLAPIENTRYP Normal3bv)(const GLbyte * v); /* 53 */

+   void (GLAPIENTRYP Normal3d)(GLdouble nx, GLdouble ny, GLdouble nz); /* 54 */

+   void (GLAPIENTRYP Normal3dv)(const GLdouble * v); /* 55 */

+   void (GLAPIENTRYP Normal3f)(GLfloat nx, GLfloat ny, GLfloat nz); /* 56 */

+   void (GLAPIENTRYP Normal3fv)(const GLfloat * v); /* 57 */

+   void (GLAPIENTRYP Normal3i)(GLint nx, GLint ny, GLint nz); /* 58 */

+   void (GLAPIENTRYP Normal3iv)(const GLint * v); /* 59 */

+   void (GLAPIENTRYP Normal3s)(GLshort nx, GLshort ny, GLshort nz); /* 60 */

+   void (GLAPIENTRYP Normal3sv)(const GLshort * v); /* 61 */

+   void (GLAPIENTRYP RasterPos2d)(GLdouble x, GLdouble y); /* 62 */

+   void (GLAPIENTRYP RasterPos2dv)(const GLdouble * v); /* 63 */

+   void (GLAPIENTRYP RasterPos2f)(GLfloat x, GLfloat y); /* 64 */

+   void (GLAPIENTRYP RasterPos2fv)(const GLfloat * v); /* 65 */

+   void (GLAPIENTRYP RasterPos2i)(GLint x, GLint y); /* 66 */

+   void (GLAPIENTRYP RasterPos2iv)(const GLint * v); /* 67 */

+   void (GLAPIENTRYP RasterPos2s)(GLshort x, GLshort y); /* 68 */

+   void (GLAPIENTRYP RasterPos2sv)(const GLshort * v); /* 69 */

+   void (GLAPIENTRYP RasterPos3d)(GLdouble x, GLdouble y, GLdouble z); /* 70 */

+   void (GLAPIENTRYP RasterPos3dv)(const GLdouble * v); /* 71 */

+   void (GLAPIENTRYP RasterPos3f)(GLfloat x, GLfloat y, GLfloat z); /* 72 */

+   void (GLAPIENTRYP RasterPos3fv)(const GLfloat * v); /* 73 */

+   void (GLAPIENTRYP RasterPos3i)(GLint x, GLint y, GLint z); /* 74 */

+   void (GLAPIENTRYP RasterPos3iv)(const GLint * v); /* 75 */

+   void (GLAPIENTRYP RasterPos3s)(GLshort x, GLshort y, GLshort z); /* 76 */

+   void (GLAPIENTRYP RasterPos3sv)(const GLshort * v); /* 77 */

+   void (GLAPIENTRYP RasterPos4d)(GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 78 */

+   void (GLAPIENTRYP RasterPos4dv)(const GLdouble * v); /* 79 */

+   void (GLAPIENTRYP RasterPos4f)(GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 80 */

+   void (GLAPIENTRYP RasterPos4fv)(const GLfloat * v); /* 81 */

+   void (GLAPIENTRYP RasterPos4i)(GLint x, GLint y, GLint z, GLint w); /* 82 */

+   void (GLAPIENTRYP RasterPos4iv)(const GLint * v); /* 83 */

+   void (GLAPIENTRYP RasterPos4s)(GLshort x, GLshort y, GLshort z, GLshort w); /* 84 */

+   void (GLAPIENTRYP RasterPos4sv)(const GLshort * v); /* 85 */

+   void (GLAPIENTRYP Rectd)(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2); /* 86 */

+   void (GLAPIENTRYP Rectdv)(const GLdouble * v1, const GLdouble * v2); /* 87 */

+   void (GLAPIENTRYP Rectf)(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2); /* 88 */

+   void (GLAPIENTRYP Rectfv)(const GLfloat * v1, const GLfloat * v2); /* 89 */

+   void (GLAPIENTRYP Recti)(GLint x1, GLint y1, GLint x2, GLint y2); /* 90 */

+   void (GLAPIENTRYP Rectiv)(const GLint * v1, const GLint * v2); /* 91 */

+   void (GLAPIENTRYP Rects)(GLshort x1, GLshort y1, GLshort x2, GLshort y2); /* 92 */

+   void (GLAPIENTRYP Rectsv)(const GLshort * v1, const GLshort * v2); /* 93 */

+   void (GLAPIENTRYP TexCoord1d)(GLdouble s); /* 94 */

+   void (GLAPIENTRYP TexCoord1dv)(const GLdouble * v); /* 95 */

+   void (GLAPIENTRYP TexCoord1f)(GLfloat s); /* 96 */

+   void (GLAPIENTRYP TexCoord1fv)(const GLfloat * v); /* 97 */

+   void (GLAPIENTRYP TexCoord1i)(GLint s); /* 98 */

+   void (GLAPIENTRYP TexCoord1iv)(const GLint * v); /* 99 */

+   void (GLAPIENTRYP TexCoord1s)(GLshort s); /* 100 */

+   void (GLAPIENTRYP TexCoord1sv)(const GLshort * v); /* 101 */

+   void (GLAPIENTRYP TexCoord2d)(GLdouble s, GLdouble t); /* 102 */

+   void (GLAPIENTRYP TexCoord2dv)(const GLdouble * v); /* 103 */

+   void (GLAPIENTRYP TexCoord2f)(GLfloat s, GLfloat t); /* 104 */

+   void (GLAPIENTRYP TexCoord2fv)(const GLfloat * v); /* 105 */

+   void (GLAPIENTRYP TexCoord2i)(GLint s, GLint t); /* 106 */

+   void (GLAPIENTRYP TexCoord2iv)(const GLint * v); /* 107 */

+   void (GLAPIENTRYP TexCoord2s)(GLshort s, GLshort t); /* 108 */

+   void (GLAPIENTRYP TexCoord2sv)(const GLshort * v); /* 109 */

+   void (GLAPIENTRYP TexCoord3d)(GLdouble s, GLdouble t, GLdouble r); /* 110 */

+   void (GLAPIENTRYP TexCoord3dv)(const GLdouble * v); /* 111 */

+   void (GLAPIENTRYP TexCoord3f)(GLfloat s, GLfloat t, GLfloat r); /* 112 */

+   void (GLAPIENTRYP TexCoord3fv)(const GLfloat * v); /* 113 */

+   void (GLAPIENTRYP TexCoord3i)(GLint s, GLint t, GLint r); /* 114 */

+   void (GLAPIENTRYP TexCoord3iv)(const GLint * v); /* 115 */

+   void (GLAPIENTRYP TexCoord3s)(GLshort s, GLshort t, GLshort r); /* 116 */

+   void (GLAPIENTRYP TexCoord3sv)(const GLshort * v); /* 117 */

+   void (GLAPIENTRYP TexCoord4d)(GLdouble s, GLdouble t, GLdouble r, GLdouble q); /* 118 */

+   void (GLAPIENTRYP TexCoord4dv)(const GLdouble * v); /* 119 */

+   void (GLAPIENTRYP TexCoord4f)(GLfloat s, GLfloat t, GLfloat r, GLfloat q); /* 120 */

+   void (GLAPIENTRYP TexCoord4fv)(const GLfloat * v); /* 121 */

+   void (GLAPIENTRYP TexCoord4i)(GLint s, GLint t, GLint r, GLint q); /* 122 */

+   void (GLAPIENTRYP TexCoord4iv)(const GLint * v); /* 123 */

+   void (GLAPIENTRYP TexCoord4s)(GLshort s, GLshort t, GLshort r, GLshort q); /* 124 */

+   void (GLAPIENTRYP TexCoord4sv)(const GLshort * v); /* 125 */

+   void (GLAPIENTRYP Vertex2d)(GLdouble x, GLdouble y); /* 126 */

+   void (GLAPIENTRYP Vertex2dv)(const GLdouble * v); /* 127 */

+   void (GLAPIENTRYP Vertex2f)(GLfloat x, GLfloat y); /* 128 */

+   void (GLAPIENTRYP Vertex2fv)(const GLfloat * v); /* 129 */

+   void (GLAPIENTRYP Vertex2i)(GLint x, GLint y); /* 130 */

+   void (GLAPIENTRYP Vertex2iv)(const GLint * v); /* 131 */

+   void (GLAPIENTRYP Vertex2s)(GLshort x, GLshort y); /* 132 */

+   void (GLAPIENTRYP Vertex2sv)(const GLshort * v); /* 133 */

+   void (GLAPIENTRYP Vertex3d)(GLdouble x, GLdouble y, GLdouble z); /* 134 */

+   void (GLAPIENTRYP Vertex3dv)(const GLdouble * v); /* 135 */

+   void (GLAPIENTRYP Vertex3f)(GLfloat x, GLfloat y, GLfloat z); /* 136 */

+   void (GLAPIENTRYP Vertex3fv)(const GLfloat * v); /* 137 */

+   void (GLAPIENTRYP Vertex3i)(GLint x, GLint y, GLint z); /* 138 */

+   void (GLAPIENTRYP Vertex3iv)(const GLint * v); /* 139 */

+   void (GLAPIENTRYP Vertex3s)(GLshort x, GLshort y, GLshort z); /* 140 */

+   void (GLAPIENTRYP Vertex3sv)(const GLshort * v); /* 141 */

+   void (GLAPIENTRYP Vertex4d)(GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 142 */

+   void (GLAPIENTRYP Vertex4dv)(const GLdouble * v); /* 143 */

+   void (GLAPIENTRYP Vertex4f)(GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 144 */

+   void (GLAPIENTRYP Vertex4fv)(const GLfloat * v); /* 145 */

+   void (GLAPIENTRYP Vertex4i)(GLint x, GLint y, GLint z, GLint w); /* 146 */

+   void (GLAPIENTRYP Vertex4iv)(const GLint * v); /* 147 */

+   void (GLAPIENTRYP Vertex4s)(GLshort x, GLshort y, GLshort z, GLshort w); /* 148 */

+   void (GLAPIENTRYP Vertex4sv)(const GLshort * v); /* 149 */

+   void (GLAPIENTRYP ClipPlane)(GLenum plane, const GLdouble * equation); /* 150 */

+   void (GLAPIENTRYP ColorMaterial)(GLenum face, GLenum mode); /* 151 */

+   void (GLAPIENTRYP CullFace)(GLenum mode); /* 152 */

+   void (GLAPIENTRYP Fogf)(GLenum pname, GLfloat param); /* 153 */

+   void (GLAPIENTRYP Fogfv)(GLenum pname, const GLfloat * params); /* 154 */

+   void (GLAPIENTRYP Fogi)(GLenum pname, GLint param); /* 155 */

+   void (GLAPIENTRYP Fogiv)(GLenum pname, const GLint * params); /* 156 */

+   void (GLAPIENTRYP FrontFace)(GLenum mode); /* 157 */

+   void (GLAPIENTRYP Hint)(GLenum target, GLenum mode); /* 158 */

+   void (GLAPIENTRYP Lightf)(GLenum light, GLenum pname, GLfloat param); /* 159 */

+   void (GLAPIENTRYP Lightfv)(GLenum light, GLenum pname, const GLfloat * params); /* 160 */

+   void (GLAPIENTRYP Lighti)(GLenum light, GLenum pname, GLint param); /* 161 */

+   void (GLAPIENTRYP Lightiv)(GLenum light, GLenum pname, const GLint * params); /* 162 */

+   void (GLAPIENTRYP LightModelf)(GLenum pname, GLfloat param); /* 163 */

+   void (GLAPIENTRYP LightModelfv)(GLenum pname, const GLfloat * params); /* 164 */

+   void (GLAPIENTRYP LightModeli)(GLenum pname, GLint param); /* 165 */

+   void (GLAPIENTRYP LightModeliv)(GLenum pname, const GLint * params); /* 166 */

+   void (GLAPIENTRYP LineStipple)(GLint factor, GLushort pattern); /* 167 */

+   void (GLAPIENTRYP LineWidth)(GLfloat width); /* 168 */

+   void (GLAPIENTRYP Materialf)(GLenum face, GLenum pname, GLfloat param); /* 169 */

+   void (GLAPIENTRYP Materialfv)(GLenum face, GLenum pname, const GLfloat * params); /* 170 */

+   void (GLAPIENTRYP Materiali)(GLenum face, GLenum pname, GLint param); /* 171 */

+   void (GLAPIENTRYP Materialiv)(GLenum face, GLenum pname, const GLint * params); /* 172 */

+   void (GLAPIENTRYP PointSize)(GLfloat size); /* 173 */

+   void (GLAPIENTRYP PolygonMode)(GLenum face, GLenum mode); /* 174 */

+   void (GLAPIENTRYP PolygonStipple)(const GLubyte * mask); /* 175 */

+   void (GLAPIENTRYP Scissor)(GLint x, GLint y, GLsizei width, GLsizei height); /* 176 */

+   void (GLAPIENTRYP ShadeModel)(GLenum mode); /* 177 */

+   void (GLAPIENTRYP TexParameterf)(GLenum target, GLenum pname, GLfloat param); /* 178 */

+   void (GLAPIENTRYP TexParameterfv)(GLenum target, GLenum pname, const GLfloat * params); /* 179 */

+   void (GLAPIENTRYP TexParameteri)(GLenum target, GLenum pname, GLint param); /* 180 */

+   void (GLAPIENTRYP TexParameteriv)(GLenum target, GLenum pname, const GLint * params); /* 181 */

+   void (GLAPIENTRYP TexImage1D)(GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid * pixels); /* 182 */

+   void (GLAPIENTRYP TexImage2D)(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid * pixels); /* 183 */

+   void (GLAPIENTRYP TexEnvf)(GLenum target, GLenum pname, GLfloat param); /* 184 */

+   void (GLAPIENTRYP TexEnvfv)(GLenum target, GLenum pname, const GLfloat * params); /* 185 */

+   void (GLAPIENTRYP TexEnvi)(GLenum target, GLenum pname, GLint param); /* 186 */

+   void (GLAPIENTRYP TexEnviv)(GLenum target, GLenum pname, const GLint * params); /* 187 */

+   void (GLAPIENTRYP TexGend)(GLenum coord, GLenum pname, GLdouble param); /* 188 */

+   void (GLAPIENTRYP TexGendv)(GLenum coord, GLenum pname, const GLdouble * params); /* 189 */

+   void (GLAPIENTRYP TexGenf)(GLenum coord, GLenum pname, GLfloat param); /* 190 */

+   void (GLAPIENTRYP TexGenfv)(GLenum coord, GLenum pname, const GLfloat * params); /* 191 */

+   void (GLAPIENTRYP TexGeni)(GLenum coord, GLenum pname, GLint param); /* 192 */

+   void (GLAPIENTRYP TexGeniv)(GLenum coord, GLenum pname, const GLint * params); /* 193 */

+   void (GLAPIENTRYP FeedbackBuffer)(GLsizei size, GLenum type, GLfloat * buffer); /* 194 */

+   void (GLAPIENTRYP SelectBuffer)(GLsizei size, GLuint * buffer); /* 195 */

+   GLint (GLAPIENTRYP RenderMode)(GLenum mode); /* 196 */

+   void (GLAPIENTRYP InitNames)(void); /* 197 */

+   void (GLAPIENTRYP LoadName)(GLuint name); /* 198 */

+   void (GLAPIENTRYP PassThrough)(GLfloat token); /* 199 */

+   void (GLAPIENTRYP PopName)(void); /* 200 */

+   void (GLAPIENTRYP PushName)(GLuint name); /* 201 */

+   void (GLAPIENTRYP DrawBuffer)(GLenum mode); /* 202 */

+   void (GLAPIENTRYP Clear)(GLbitfield mask); /* 203 */

+   void (GLAPIENTRYP ClearAccum)(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha); /* 204 */

+   void (GLAPIENTRYP ClearIndex)(GLfloat c); /* 205 */

+   void (GLAPIENTRYP ClearColor)(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); /* 206 */

+   void (GLAPIENTRYP ClearStencil)(GLint s); /* 207 */

+   void (GLAPIENTRYP ClearDepth)(GLclampd depth); /* 208 */

+   void (GLAPIENTRYP StencilMask)(GLuint mask); /* 209 */

+   void (GLAPIENTRYP ColorMask)(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha); /* 210 */

+   void (GLAPIENTRYP DepthMask)(GLboolean flag); /* 211 */

+   void (GLAPIENTRYP IndexMask)(GLuint mask); /* 212 */

+   void (GLAPIENTRYP Accum)(GLenum op, GLfloat value); /* 213 */

+   void (GLAPIENTRYP Disable)(GLenum cap); /* 214 */

+   void (GLAPIENTRYP Enable)(GLenum cap); /* 215 */

+   void (GLAPIENTRYP Finish)(void); /* 216 */

+   void (GLAPIENTRYP Flush)(void); /* 217 */

+   void (GLAPIENTRYP PopAttrib)(void); /* 218 */

+   void (GLAPIENTRYP PushAttrib)(GLbitfield mask); /* 219 */

+   void (GLAPIENTRYP Map1d)(GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble * points); /* 220 */

+   void (GLAPIENTRYP Map1f)(GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat * points); /* 221 */

+   void (GLAPIENTRYP Map2d)(GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble * points); /* 222 */

+   void (GLAPIENTRYP Map2f)(GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat * points); /* 223 */

+   void (GLAPIENTRYP MapGrid1d)(GLint un, GLdouble u1, GLdouble u2); /* 224 */

+   void (GLAPIENTRYP MapGrid1f)(GLint un, GLfloat u1, GLfloat u2); /* 225 */

+   void (GLAPIENTRYP MapGrid2d)(GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2); /* 226 */

+   void (GLAPIENTRYP MapGrid2f)(GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2); /* 227 */

+   void (GLAPIENTRYP EvalCoord1d)(GLdouble u); /* 228 */

+   void (GLAPIENTRYP EvalCoord1dv)(const GLdouble * u); /* 229 */

+   void (GLAPIENTRYP EvalCoord1f)(GLfloat u); /* 230 */

+   void (GLAPIENTRYP EvalCoord1fv)(const GLfloat * u); /* 231 */

+   void (GLAPIENTRYP EvalCoord2d)(GLdouble u, GLdouble v); /* 232 */

+   void (GLAPIENTRYP EvalCoord2dv)(const GLdouble * u); /* 233 */

+   void (GLAPIENTRYP EvalCoord2f)(GLfloat u, GLfloat v); /* 234 */

+   void (GLAPIENTRYP EvalCoord2fv)(const GLfloat * u); /* 235 */

+   void (GLAPIENTRYP EvalMesh1)(GLenum mode, GLint i1, GLint i2); /* 236 */

+   void (GLAPIENTRYP EvalPoint1)(GLint i); /* 237 */

+   void (GLAPIENTRYP EvalMesh2)(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2); /* 238 */

+   void (GLAPIENTRYP EvalPoint2)(GLint i, GLint j); /* 239 */

+   void (GLAPIENTRYP AlphaFunc)(GLenum func, GLclampf ref); /* 240 */

+   void (GLAPIENTRYP BlendFunc)(GLenum sfactor, GLenum dfactor); /* 241 */

+   void (GLAPIENTRYP LogicOp)(GLenum opcode); /* 242 */

+   void (GLAPIENTRYP StencilFunc)(GLenum func, GLint ref, GLuint mask); /* 243 */

+   void (GLAPIENTRYP StencilOp)(GLenum fail, GLenum zfail, GLenum zpass); /* 244 */

+   void (GLAPIENTRYP DepthFunc)(GLenum func); /* 245 */

+   void (GLAPIENTRYP PixelZoom)(GLfloat xfactor, GLfloat yfactor); /* 246 */

+   void (GLAPIENTRYP PixelTransferf)(GLenum pname, GLfloat param); /* 247 */

+   void (GLAPIENTRYP PixelTransferi)(GLenum pname, GLint param); /* 248 */

+   void (GLAPIENTRYP PixelStoref)(GLenum pname, GLfloat param); /* 249 */

+   void (GLAPIENTRYP PixelStorei)(GLenum pname, GLint param); /* 250 */

+   void (GLAPIENTRYP PixelMapfv)(GLenum map, GLsizei mapsize, const GLfloat * values); /* 251 */

+   void (GLAPIENTRYP PixelMapuiv)(GLenum map, GLsizei mapsize, const GLuint * values); /* 252 */

+   void (GLAPIENTRYP PixelMapusv)(GLenum map, GLsizei mapsize, const GLushort * values); /* 253 */

+   void (GLAPIENTRYP ReadBuffer)(GLenum mode); /* 254 */

+   void (GLAPIENTRYP CopyPixels)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum type); /* 255 */

+   void (GLAPIENTRYP ReadPixels)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid * pixels); /* 256 */

+   void (GLAPIENTRYP DrawPixels)(GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid * pixels); /* 257 */

+   void (GLAPIENTRYP GetBooleanv)(GLenum pname, GLboolean * params); /* 258 */

+   void (GLAPIENTRYP GetClipPlane)(GLenum plane, GLdouble * equation); /* 259 */

+   void (GLAPIENTRYP GetDoublev)(GLenum pname, GLdouble * params); /* 260 */

+   GLenum (GLAPIENTRYP GetError)(void); /* 261 */

+   void (GLAPIENTRYP GetFloatv)(GLenum pname, GLfloat * params); /* 262 */

+   void (GLAPIENTRYP GetIntegerv)(GLenum pname, GLint * params); /* 263 */

+   void (GLAPIENTRYP GetLightfv)(GLenum light, GLenum pname, GLfloat * params); /* 264 */

+   void (GLAPIENTRYP GetLightiv)(GLenum light, GLenum pname, GLint * params); /* 265 */

+   void (GLAPIENTRYP GetMapdv)(GLenum target, GLenum query, GLdouble * v); /* 266 */

+   void (GLAPIENTRYP GetMapfv)(GLenum target, GLenum query, GLfloat * v); /* 267 */

+   void (GLAPIENTRYP GetMapiv)(GLenum target, GLenum query, GLint * v); /* 268 */

+   void (GLAPIENTRYP GetMaterialfv)(GLenum face, GLenum pname, GLfloat * params); /* 269 */

+   void (GLAPIENTRYP GetMaterialiv)(GLenum face, GLenum pname, GLint * params); /* 270 */

+   void (GLAPIENTRYP GetPixelMapfv)(GLenum map, GLfloat * values); /* 271 */

+   void (GLAPIENTRYP GetPixelMapuiv)(GLenum map, GLuint * values); /* 272 */

+   void (GLAPIENTRYP GetPixelMapusv)(GLenum map, GLushort * values); /* 273 */

+   void (GLAPIENTRYP GetPolygonStipple)(GLubyte * mask); /* 274 */

+   const GLubyte * (GLAPIENTRYP GetString)(GLenum name); /* 275 */

+   void (GLAPIENTRYP GetTexEnvfv)(GLenum target, GLenum pname, GLfloat * params); /* 276 */

+   void (GLAPIENTRYP GetTexEnviv)(GLenum target, GLenum pname, GLint * params); /* 277 */

+   void (GLAPIENTRYP GetTexGendv)(GLenum coord, GLenum pname, GLdouble * params); /* 278 */

+   void (GLAPIENTRYP GetTexGenfv)(GLenum coord, GLenum pname, GLfloat * params); /* 279 */

+   void (GLAPIENTRYP GetTexGeniv)(GLenum coord, GLenum pname, GLint * params); /* 280 */

+   void (GLAPIENTRYP GetTexImage)(GLenum target, GLint level, GLenum format, GLenum type, GLvoid * pixels); /* 281 */

+   void (GLAPIENTRYP GetTexParameterfv)(GLenum target, GLenum pname, GLfloat * params); /* 282 */

+   void (GLAPIENTRYP GetTexParameteriv)(GLenum target, GLenum pname, GLint * params); /* 283 */

+   void (GLAPIENTRYP GetTexLevelParameterfv)(GLenum target, GLint level, GLenum pname, GLfloat * params); /* 284 */

+   void (GLAPIENTRYP GetTexLevelParameteriv)(GLenum target, GLint level, GLenum pname, GLint * params); /* 285 */

+   GLboolean (GLAPIENTRYP IsEnabled)(GLenum cap); /* 286 */

+   GLboolean (GLAPIENTRYP IsList)(GLuint list); /* 287 */

+   void (GLAPIENTRYP DepthRange)(GLclampd zNear, GLclampd zFar); /* 288 */

+   void (GLAPIENTRYP Frustum)(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar); /* 289 */

+   void (GLAPIENTRYP LoadIdentity)(void); /* 290 */

+   void (GLAPIENTRYP LoadMatrixf)(const GLfloat * m); /* 291 */

+   void (GLAPIENTRYP LoadMatrixd)(const GLdouble * m); /* 292 */

+   void (GLAPIENTRYP MatrixMode)(GLenum mode); /* 293 */

+   void (GLAPIENTRYP MultMatrixf)(const GLfloat * m); /* 294 */

+   void (GLAPIENTRYP MultMatrixd)(const GLdouble * m); /* 295 */

+   void (GLAPIENTRYP Ortho)(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar); /* 296 */

+   void (GLAPIENTRYP PopMatrix)(void); /* 297 */

+   void (GLAPIENTRYP PushMatrix)(void); /* 298 */

+   void (GLAPIENTRYP Rotated)(GLdouble angle, GLdouble x, GLdouble y, GLdouble z); /* 299 */

+   void (GLAPIENTRYP Rotatef)(GLfloat angle, GLfloat x, GLfloat y, GLfloat z); /* 300 */

+   void (GLAPIENTRYP Scaled)(GLdouble x, GLdouble y, GLdouble z); /* 301 */

+   void (GLAPIENTRYP Scalef)(GLfloat x, GLfloat y, GLfloat z); /* 302 */

+   void (GLAPIENTRYP Translated)(GLdouble x, GLdouble y, GLdouble z); /* 303 */

+   void (GLAPIENTRYP Translatef)(GLfloat x, GLfloat y, GLfloat z); /* 304 */

+   void (GLAPIENTRYP Viewport)(GLint x, GLint y, GLsizei width, GLsizei height); /* 305 */

+   void (GLAPIENTRYP ArrayElement)(GLint i); /* 306 */

+   void (GLAPIENTRYP BindTexture)(GLenum target, GLuint texture); /* 307 */

+   void (GLAPIENTRYP ColorPointer)(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 308 */

+   void (GLAPIENTRYP DisableClientState)(GLenum array); /* 309 */

+   void (GLAPIENTRYP DrawArrays)(GLenum mode, GLint first, GLsizei count); /* 310 */

+   void (GLAPIENTRYP DrawElements)(GLenum mode, GLsizei count, GLenum type, const GLvoid * indices); /* 311 */

+   void (GLAPIENTRYP EdgeFlagPointer)(GLsizei stride, const GLvoid * pointer); /* 312 */

+   void (GLAPIENTRYP EnableClientState)(GLenum array); /* 313 */

+   void (GLAPIENTRYP IndexPointer)(GLenum type, GLsizei stride, const GLvoid * pointer); /* 314 */

+   void (GLAPIENTRYP Indexub)(GLubyte c); /* 315 */

+   void (GLAPIENTRYP Indexubv)(const GLubyte * c); /* 316 */

+   void (GLAPIENTRYP InterleavedArrays)(GLenum format, GLsizei stride, const GLvoid * pointer); /* 317 */

+   void (GLAPIENTRYP NormalPointer)(GLenum type, GLsizei stride, const GLvoid * pointer); /* 318 */

+   void (GLAPIENTRYP PolygonOffset)(GLfloat factor, GLfloat units); /* 319 */

+   void (GLAPIENTRYP TexCoordPointer)(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 320 */

+   void (GLAPIENTRYP VertexPointer)(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 321 */

+   GLboolean (GLAPIENTRYP AreTexturesResident)(GLsizei n, const GLuint * textures, GLboolean * residences); /* 322 */

+   void (GLAPIENTRYP CopyTexImage1D)(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border); /* 323 */

+   void (GLAPIENTRYP CopyTexImage2D)(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border); /* 324 */

+   void (GLAPIENTRYP CopyTexSubImage1D)(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width); /* 325 */

+   void (GLAPIENTRYP CopyTexSubImage2D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); /* 326 */

+   void (GLAPIENTRYP DeleteTextures)(GLsizei n, const GLuint * textures); /* 327 */

+   void (GLAPIENTRYP GenTextures)(GLsizei n, GLuint * textures); /* 328 */

+   void (GLAPIENTRYP GetPointerv)(GLenum pname, GLvoid ** params); /* 329 */

+   GLboolean (GLAPIENTRYP IsTexture)(GLuint texture); /* 330 */

+   void (GLAPIENTRYP PrioritizeTextures)(GLsizei n, const GLuint * textures, const GLclampf * priorities); /* 331 */

+   void (GLAPIENTRYP TexSubImage1D)(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid * pixels); /* 332 */

+   void (GLAPIENTRYP TexSubImage2D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid * pixels); /* 333 */

+   void (GLAPIENTRYP PopClientAttrib)(void); /* 334 */

+   void (GLAPIENTRYP PushClientAttrib)(GLbitfield mask); /* 335 */

+   void (GLAPIENTRYP BlendColor)(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); /* 336 */

+   void (GLAPIENTRYP BlendEquation)(GLenum mode); /* 337 */

+   void (GLAPIENTRYP DrawRangeElements)(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid * indices); /* 338 */

+   void (GLAPIENTRYP ColorTable)(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid * table); /* 339 */

+   void (GLAPIENTRYP ColorTableParameterfv)(GLenum target, GLenum pname, const GLfloat * params); /* 340 */

+   void (GLAPIENTRYP ColorTableParameteriv)(GLenum target, GLenum pname, const GLint * params); /* 341 */

+   void (GLAPIENTRYP CopyColorTable)(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); /* 342 */

+   void (GLAPIENTRYP GetColorTable)(GLenum target, GLenum format, GLenum type, GLvoid * table); /* 343 */

+   void (GLAPIENTRYP GetColorTableParameterfv)(GLenum target, GLenum pname, GLfloat * params); /* 344 */

+   void (GLAPIENTRYP GetColorTableParameteriv)(GLenum target, GLenum pname, GLint * params); /* 345 */

+   void (GLAPIENTRYP ColorSubTable)(GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid * data); /* 346 */

+   void (GLAPIENTRYP CopyColorSubTable)(GLenum target, GLsizei start, GLint x, GLint y, GLsizei width); /* 347 */

+   void (GLAPIENTRYP ConvolutionFilter1D)(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid * image); /* 348 */

+   void (GLAPIENTRYP ConvolutionFilter2D)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid * image); /* 349 */

+   void (GLAPIENTRYP ConvolutionParameterf)(GLenum target, GLenum pname, GLfloat params); /* 350 */

+   void (GLAPIENTRYP ConvolutionParameterfv)(GLenum target, GLenum pname, const GLfloat * params); /* 351 */

+   void (GLAPIENTRYP ConvolutionParameteri)(GLenum target, GLenum pname, GLint params); /* 352 */

+   void (GLAPIENTRYP ConvolutionParameteriv)(GLenum target, GLenum pname, const GLint * params); /* 353 */

+   void (GLAPIENTRYP CopyConvolutionFilter1D)(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); /* 354 */

+   void (GLAPIENTRYP CopyConvolutionFilter2D)(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height); /* 355 */

+   void (GLAPIENTRYP GetConvolutionFilter)(GLenum target, GLenum format, GLenum type, GLvoid * image); /* 356 */

+   void (GLAPIENTRYP GetConvolutionParameterfv)(GLenum target, GLenum pname, GLfloat * params); /* 357 */

+   void (GLAPIENTRYP GetConvolutionParameteriv)(GLenum target, GLenum pname, GLint * params); /* 358 */

+   void (GLAPIENTRYP GetSeparableFilter)(GLenum target, GLenum format, GLenum type, GLvoid * row, GLvoid * column, GLvoid * span); /* 359 */

+   void (GLAPIENTRYP SeparableFilter2D)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid * row, const GLvoid * column); /* 360 */

+   void (GLAPIENTRYP GetHistogram)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid * values); /* 361 */

+   void (GLAPIENTRYP GetHistogramParameterfv)(GLenum target, GLenum pname, GLfloat * params); /* 362 */

+   void (GLAPIENTRYP GetHistogramParameteriv)(GLenum target, GLenum pname, GLint * params); /* 363 */

+   void (GLAPIENTRYP GetMinmax)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid * values); /* 364 */

+   void (GLAPIENTRYP GetMinmaxParameterfv)(GLenum target, GLenum pname, GLfloat * params); /* 365 */

+   void (GLAPIENTRYP GetMinmaxParameteriv)(GLenum target, GLenum pname, GLint * params); /* 366 */

+   void (GLAPIENTRYP Histogram)(GLenum target, GLsizei width, GLenum internalformat, GLboolean sink); /* 367 */

+   void (GLAPIENTRYP Minmax)(GLenum target, GLenum internalformat, GLboolean sink); /* 368 */

+   void (GLAPIENTRYP ResetHistogram)(GLenum target); /* 369 */

+   void (GLAPIENTRYP ResetMinmax)(GLenum target); /* 370 */

+   void (GLAPIENTRYP TexImage3D)(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid * pixels); /* 371 */

+   void (GLAPIENTRYP TexSubImage3D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid * pixels); /* 372 */

+   void (GLAPIENTRYP CopyTexSubImage3D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); /* 373 */

+   void (GLAPIENTRYP ActiveTexture)(GLenum texture); /* 374 */

+   void (GLAPIENTRYP ClientActiveTexture)(GLenum texture); /* 375 */

+   void (GLAPIENTRYP MultiTexCoord1d)(GLenum target, GLdouble s); /* 376 */

+   void (GLAPIENTRYP MultiTexCoord1dv)(GLenum target, const GLdouble * v); /* 377 */

+   void (GLAPIENTRYP MultiTexCoord1fARB)(GLenum target, GLfloat s); /* 378 */

+   void (GLAPIENTRYP MultiTexCoord1fvARB)(GLenum target, const GLfloat * v); /* 379 */

+   void (GLAPIENTRYP MultiTexCoord1i)(GLenum target, GLint s); /* 380 */

+   void (GLAPIENTRYP MultiTexCoord1iv)(GLenum target, const GLint * v); /* 381 */

+   void (GLAPIENTRYP MultiTexCoord1s)(GLenum target, GLshort s); /* 382 */

+   void (GLAPIENTRYP MultiTexCoord1sv)(GLenum target, const GLshort * v); /* 383 */

+   void (GLAPIENTRYP MultiTexCoord2d)(GLenum target, GLdouble s, GLdouble t); /* 384 */

+   void (GLAPIENTRYP MultiTexCoord2dv)(GLenum target, const GLdouble * v); /* 385 */

+   void (GLAPIENTRYP MultiTexCoord2fARB)(GLenum target, GLfloat s, GLfloat t); /* 386 */

+   void (GLAPIENTRYP MultiTexCoord2fvARB)(GLenum target, const GLfloat * v); /* 387 */

+   void (GLAPIENTRYP MultiTexCoord2i)(GLenum target, GLint s, GLint t); /* 388 */

+   void (GLAPIENTRYP MultiTexCoord2iv)(GLenum target, const GLint * v); /* 389 */

+   void (GLAPIENTRYP MultiTexCoord2s)(GLenum target, GLshort s, GLshort t); /* 390 */

+   void (GLAPIENTRYP MultiTexCoord2sv)(GLenum target, const GLshort * v); /* 391 */

+   void (GLAPIENTRYP MultiTexCoord3d)(GLenum target, GLdouble s, GLdouble t, GLdouble r); /* 392 */

+   void (GLAPIENTRYP MultiTexCoord3dv)(GLenum target, const GLdouble * v); /* 393 */

+   void (GLAPIENTRYP MultiTexCoord3fARB)(GLenum target, GLfloat s, GLfloat t, GLfloat r); /* 394 */

+   void (GLAPIENTRYP MultiTexCoord3fvARB)(GLenum target, const GLfloat * v); /* 395 */

+   void (GLAPIENTRYP MultiTexCoord3i)(GLenum target, GLint s, GLint t, GLint r); /* 396 */

+   void (GLAPIENTRYP MultiTexCoord3iv)(GLenum target, const GLint * v); /* 397 */

+   void (GLAPIENTRYP MultiTexCoord3s)(GLenum target, GLshort s, GLshort t, GLshort r); /* 398 */

+   void (GLAPIENTRYP MultiTexCoord3sv)(GLenum target, const GLshort * v); /* 399 */

+   void (GLAPIENTRYP MultiTexCoord4d)(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q); /* 400 */

+   void (GLAPIENTRYP MultiTexCoord4dv)(GLenum target, const GLdouble * v); /* 401 */

+   void (GLAPIENTRYP MultiTexCoord4fARB)(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q); /* 402 */

+   void (GLAPIENTRYP MultiTexCoord4fvARB)(GLenum target, const GLfloat * v); /* 403 */

+   void (GLAPIENTRYP MultiTexCoord4i)(GLenum target, GLint s, GLint t, GLint r, GLint q); /* 404 */

+   void (GLAPIENTRYP MultiTexCoord4iv)(GLenum target, const GLint * v); /* 405 */

+   void (GLAPIENTRYP MultiTexCoord4s)(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q); /* 406 */

+   void (GLAPIENTRYP MultiTexCoord4sv)(GLenum target, const GLshort * v); /* 407 */

+#if !defined HAVE_SHARED_GLAPI

+   void (GLAPIENTRYP CompressedTexImage1D)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid * data); /* 408 */

+   void (GLAPIENTRYP CompressedTexImage2D)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid * data); /* 409 */

+   void (GLAPIENTRYP CompressedTexImage3D)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid * data); /* 410 */

+   void (GLAPIENTRYP CompressedTexSubImage1D)(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid * data); /* 411 */

+   void (GLAPIENTRYP CompressedTexSubImage2D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid * data); /* 412 */

+   void (GLAPIENTRYP CompressedTexSubImage3D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid * data); /* 413 */

+   void (GLAPIENTRYP GetCompressedTexImage)(GLenum target, GLint level, GLvoid * img); /* 414 */

+   void (GLAPIENTRYP LoadTransposeMatrixd)(const GLdouble * m); /* 415 */

+   void (GLAPIENTRYP LoadTransposeMatrixf)(const GLfloat * m); /* 416 */

+   void (GLAPIENTRYP MultTransposeMatrixd)(const GLdouble * m); /* 417 */

+   void (GLAPIENTRYP MultTransposeMatrixf)(const GLfloat * m); /* 418 */

+   void (GLAPIENTRYP SampleCoverage)(GLclampf value, GLboolean invert); /* 419 */

+   void (GLAPIENTRYP BlendFuncSeparate)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); /* 420 */

+   void (GLAPIENTRYP FogCoordPointer)(GLenum type, GLsizei stride, const GLvoid * pointer); /* 421 */

+   void (GLAPIENTRYP FogCoordd)(GLdouble coord); /* 422 */

+   void (GLAPIENTRYP FogCoorddv)(const GLdouble * coord); /* 423 */

+   void (GLAPIENTRYP MultiDrawArrays)(GLenum mode, const GLint * first, const GLsizei * count, GLsizei primcount); /* 424 */

+   void (GLAPIENTRYP PointParameterf)(GLenum pname, GLfloat param); /* 425 */

+   void (GLAPIENTRYP PointParameterfv)(GLenum pname, const GLfloat * params); /* 426 */

+   void (GLAPIENTRYP PointParameteri)(GLenum pname, GLint param); /* 427 */

+   void (GLAPIENTRYP PointParameteriv)(GLenum pname, const GLint * params); /* 428 */

+   void (GLAPIENTRYP SecondaryColor3b)(GLbyte red, GLbyte green, GLbyte blue); /* 429 */

+   void (GLAPIENTRYP SecondaryColor3bv)(const GLbyte * v); /* 430 */

+   void (GLAPIENTRYP SecondaryColor3d)(GLdouble red, GLdouble green, GLdouble blue); /* 431 */

+   void (GLAPIENTRYP SecondaryColor3dv)(const GLdouble * v); /* 432 */

+   void (GLAPIENTRYP SecondaryColor3i)(GLint red, GLint green, GLint blue); /* 433 */

+   void (GLAPIENTRYP SecondaryColor3iv)(const GLint * v); /* 434 */

+   void (GLAPIENTRYP SecondaryColor3s)(GLshort red, GLshort green, GLshort blue); /* 435 */

+   void (GLAPIENTRYP SecondaryColor3sv)(const GLshort * v); /* 436 */

+   void (GLAPIENTRYP SecondaryColor3ub)(GLubyte red, GLubyte green, GLubyte blue); /* 437 */

+   void (GLAPIENTRYP SecondaryColor3ubv)(const GLubyte * v); /* 438 */

+   void (GLAPIENTRYP SecondaryColor3ui)(GLuint red, GLuint green, GLuint blue); /* 439 */

+   void (GLAPIENTRYP SecondaryColor3uiv)(const GLuint * v); /* 440 */

+   void (GLAPIENTRYP SecondaryColor3us)(GLushort red, GLushort green, GLushort blue); /* 441 */

+   void (GLAPIENTRYP SecondaryColor3usv)(const GLushort * v); /* 442 */

+   void (GLAPIENTRYP SecondaryColorPointer)(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 443 */

+   void (GLAPIENTRYP WindowPos2d)(GLdouble x, GLdouble y); /* 444 */

+   void (GLAPIENTRYP WindowPos2dv)(const GLdouble * v); /* 445 */

+   void (GLAPIENTRYP WindowPos2f)(GLfloat x, GLfloat y); /* 446 */

+   void (GLAPIENTRYP WindowPos2fv)(const GLfloat * v); /* 447 */

+   void (GLAPIENTRYP WindowPos2i)(GLint x, GLint y); /* 448 */

+   void (GLAPIENTRYP WindowPos2iv)(const GLint * v); /* 449 */

+   void (GLAPIENTRYP WindowPos2s)(GLshort x, GLshort y); /* 450 */

+   void (GLAPIENTRYP WindowPos2sv)(const GLshort * v); /* 451 */

+   void (GLAPIENTRYP WindowPos3d)(GLdouble x, GLdouble y, GLdouble z); /* 452 */

+   void (GLAPIENTRYP WindowPos3dv)(const GLdouble * v); /* 453 */

+   void (GLAPIENTRYP WindowPos3f)(GLfloat x, GLfloat y, GLfloat z); /* 454 */

+   void (GLAPIENTRYP WindowPos3fv)(const GLfloat * v); /* 455 */

+   void (GLAPIENTRYP WindowPos3i)(GLint x, GLint y, GLint z); /* 456 */

+   void (GLAPIENTRYP WindowPos3iv)(const GLint * v); /* 457 */

+   void (GLAPIENTRYP WindowPos3s)(GLshort x, GLshort y, GLshort z); /* 458 */

+   void (GLAPIENTRYP WindowPos3sv)(const GLshort * v); /* 459 */

+   void (GLAPIENTRYP BeginQuery)(GLenum target, GLuint id); /* 460 */

+   void (GLAPIENTRYP BindBuffer)(GLenum target, GLuint buffer); /* 461 */

+   void (GLAPIENTRYP BufferData)(GLenum target, GLsizeiptr size, const GLvoid * data, GLenum usage); /* 462 */

+   void (GLAPIENTRYP BufferSubData)(GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid * data); /* 463 */

+   void (GLAPIENTRYP DeleteBuffers)(GLsizei n, const GLuint * buffer); /* 464 */

+   void (GLAPIENTRYP DeleteQueries)(GLsizei n, const GLuint * ids); /* 465 */

+   void (GLAPIENTRYP EndQuery)(GLenum target); /* 466 */

+   void (GLAPIENTRYP GenBuffers)(GLsizei n, GLuint * buffer); /* 467 */

+   void (GLAPIENTRYP GenQueries)(GLsizei n, GLuint * ids); /* 468 */

+   void (GLAPIENTRYP GetBufferParameteriv)(GLenum target, GLenum pname, GLint * params); /* 469 */

+   void (GLAPIENTRYP GetBufferPointerv)(GLenum target, GLenum pname, GLvoid ** params); /* 470 */

+   void (GLAPIENTRYP GetBufferSubData)(GLenum target, GLintptr offset, GLsizeiptr size, GLvoid * data); /* 471 */

+   void (GLAPIENTRYP GetQueryObjectiv)(GLuint id, GLenum pname, GLint * params); /* 472 */

+   void (GLAPIENTRYP GetQueryObjectuiv)(GLuint id, GLenum pname, GLuint * params); /* 473 */

+   void (GLAPIENTRYP GetQueryiv)(GLenum target, GLenum pname, GLint * params); /* 474 */

+   GLboolean (GLAPIENTRYP IsBuffer)(GLuint buffer); /* 475 */

+   GLboolean (GLAPIENTRYP IsQuery)(GLuint id); /* 476 */

+   GLvoid * (GLAPIENTRYP MapBuffer)(GLenum target, GLenum access); /* 477 */

+   GLboolean (GLAPIENTRYP UnmapBuffer)(GLenum target); /* 478 */

+   void (GLAPIENTRYP AttachShader)(GLuint program, GLuint shader); /* 479 */

+   void (GLAPIENTRYP BindAttribLocation)(GLuint program, GLuint index, const GLchar * name); /* 480 */

+   void (GLAPIENTRYP BlendEquationSeparate)(GLenum modeRGB, GLenum modeA); /* 481 */

+   void (GLAPIENTRYP CompileShader)(GLuint shader); /* 482 */

+   GLuint (GLAPIENTRYP CreateProgram)(void); /* 483 */

+   GLuint (GLAPIENTRYP CreateShader)(GLenum type); /* 484 */

+   void (GLAPIENTRYP DeleteProgram)(GLuint program); /* 485 */

+   void (GLAPIENTRYP DeleteShader)(GLuint program); /* 486 */

+   void (GLAPIENTRYP DetachShader)(GLuint program, GLuint shader); /* 487 */

+   void (GLAPIENTRYP DisableVertexAttribArray)(GLuint index); /* 488 */

+   void (GLAPIENTRYP DrawBuffers)(GLsizei n, const GLenum * bufs); /* 489 */

+   void (GLAPIENTRYP EnableVertexAttribArray)(GLuint index); /* 490 */

+   void (GLAPIENTRYP GetActiveAttrib)(GLuint program, GLuint index, GLsizei  bufSize, GLsizei * length, GLint * size, GLenum * type, GLchar * name); /* 491 */

+   void (GLAPIENTRYP GetActiveUniform)(GLuint program, GLuint index, GLsizei bufSize, GLsizei * length, GLint * size, GLenum * type, GLchar * name); /* 492 */

+   void (GLAPIENTRYP GetAttachedShaders)(GLuint program, GLsizei maxCount, GLsizei * count, GLuint * obj); /* 493 */

+   GLint (GLAPIENTRYP GetAttribLocation)(GLuint program, const GLchar * name); /* 494 */

+   void (GLAPIENTRYP GetProgramInfoLog)(GLuint program, GLsizei bufSize, GLsizei * length, GLchar * infoLog); /* 495 */

+   void (GLAPIENTRYP GetProgramiv)(GLuint program, GLenum pname, GLint * params); /* 496 */

+   void (GLAPIENTRYP GetShaderInfoLog)(GLuint shader, GLsizei bufSize, GLsizei * length, GLchar * infoLog); /* 497 */

+   void (GLAPIENTRYP GetShaderSource)(GLuint shader, GLsizei bufSize, GLsizei * length, GLchar * source); /* 498 */

+   void (GLAPIENTRYP GetShaderiv)(GLuint shader, GLenum pname, GLint * params); /* 499 */

+   GLint (GLAPIENTRYP GetUniformLocation)(GLuint program, const GLchar * name); /* 500 */

+   void (GLAPIENTRYP GetUniformfv)(GLuint program, GLint location, GLfloat * params); /* 501 */

+   void (GLAPIENTRYP GetUniformiv)(GLuint program, GLint location, GLint * params); /* 502 */

+   void (GLAPIENTRYP GetVertexAttribPointerv)(GLuint index, GLenum pname, GLvoid ** pointer); /* 503 */

+   void (GLAPIENTRYP GetVertexAttribdv)(GLuint index, GLenum pname, GLdouble * params); /* 504 */

+   void (GLAPIENTRYP GetVertexAttribfv)(GLuint index, GLenum pname, GLfloat * params); /* 505 */

+   void (GLAPIENTRYP GetVertexAttribiv)(GLuint index, GLenum pname, GLint * params); /* 506 */

+   GLboolean (GLAPIENTRYP IsProgram)(GLuint program); /* 507 */

+   GLboolean (GLAPIENTRYP IsShader)(GLuint shader); /* 508 */

+   void (GLAPIENTRYP LinkProgram)(GLuint program); /* 509 */

+   void (GLAPIENTRYP ShaderSource)(GLuint shader, GLsizei count, const GLchar * const * string, const GLint * length); /* 510 */

+   void (GLAPIENTRYP StencilFuncSeparate)(GLenum face, GLenum func, GLint ref, GLuint mask); /* 511 */

+   void (GLAPIENTRYP StencilMaskSeparate)(GLenum face, GLuint mask); /* 512 */

+   void (GLAPIENTRYP StencilOpSeparate)(GLenum face, GLenum sfail, GLenum zfail, GLenum zpass); /* 513 */

+   void (GLAPIENTRYP Uniform1f)(GLint location, GLfloat v0); /* 514 */

+   void (GLAPIENTRYP Uniform1fv)(GLint location, GLsizei count, const GLfloat * value); /* 515 */

+   void (GLAPIENTRYP Uniform1i)(GLint location, GLint v0); /* 516 */

+   void (GLAPIENTRYP Uniform1iv)(GLint location, GLsizei count, const GLint * value); /* 517 */

+   void (GLAPIENTRYP Uniform2f)(GLint location, GLfloat v0, GLfloat v1); /* 518 */

+   void (GLAPIENTRYP Uniform2fv)(GLint location, GLsizei count, const GLfloat * value); /* 519 */

+   void (GLAPIENTRYP Uniform2i)(GLint location, GLint v0, GLint v1); /* 520 */

+   void (GLAPIENTRYP Uniform2iv)(GLint location, GLsizei count, const GLint * value); /* 521 */

+   void (GLAPIENTRYP Uniform3f)(GLint location, GLfloat v0, GLfloat v1, GLfloat v2); /* 522 */

+   void (GLAPIENTRYP Uniform3fv)(GLint location, GLsizei count, const GLfloat * value); /* 523 */

+   void (GLAPIENTRYP Uniform3i)(GLint location, GLint v0, GLint v1, GLint v2); /* 524 */

+   void (GLAPIENTRYP Uniform3iv)(GLint location, GLsizei count, const GLint * value); /* 525 */

+   void (GLAPIENTRYP Uniform4f)(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); /* 526 */

+   void (GLAPIENTRYP Uniform4fv)(GLint location, GLsizei count, const GLfloat * value); /* 527 */

+   void (GLAPIENTRYP Uniform4i)(GLint location, GLint v0, GLint v1, GLint v2, GLint v3); /* 528 */

+   void (GLAPIENTRYP Uniform4iv)(GLint location, GLsizei count, const GLint * value); /* 529 */

+   void (GLAPIENTRYP UniformMatrix2fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 530 */

+   void (GLAPIENTRYP UniformMatrix3fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 531 */

+   void (GLAPIENTRYP UniformMatrix4fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 532 */

+   void (GLAPIENTRYP UseProgram)(GLuint program); /* 533 */

+   void (GLAPIENTRYP ValidateProgram)(GLuint program); /* 534 */

+   void (GLAPIENTRYP VertexAttrib1d)(GLuint index, GLdouble x); /* 535 */

+   void (GLAPIENTRYP VertexAttrib1dv)(GLuint index, const GLdouble * v); /* 536 */

+   void (GLAPIENTRYP VertexAttrib1s)(GLuint index, GLshort x); /* 537 */

+   void (GLAPIENTRYP VertexAttrib1sv)(GLuint index, const GLshort * v); /* 538 */

+   void (GLAPIENTRYP VertexAttrib2d)(GLuint index, GLdouble x, GLdouble y); /* 539 */

+   void (GLAPIENTRYP VertexAttrib2dv)(GLuint index, const GLdouble * v); /* 540 */

+   void (GLAPIENTRYP VertexAttrib2s)(GLuint index, GLshort x, GLshort y); /* 541 */

+   void (GLAPIENTRYP VertexAttrib2sv)(GLuint index, const GLshort * v); /* 542 */

+   void (GLAPIENTRYP VertexAttrib3d)(GLuint index, GLdouble x, GLdouble y, GLdouble z); /* 543 */

+   void (GLAPIENTRYP VertexAttrib3dv)(GLuint index, const GLdouble * v); /* 544 */

+   void (GLAPIENTRYP VertexAttrib3s)(GLuint index, GLshort x, GLshort y, GLshort z); /* 545 */

+   void (GLAPIENTRYP VertexAttrib3sv)(GLuint index, const GLshort * v); /* 546 */

+   void (GLAPIENTRYP VertexAttrib4Nbv)(GLuint index, const GLbyte * v); /* 547 */

+   void (GLAPIENTRYP VertexAttrib4Niv)(GLuint index, const GLint * v); /* 548 */

+   void (GLAPIENTRYP VertexAttrib4Nsv)(GLuint index, const GLshort * v); /* 549 */

+   void (GLAPIENTRYP VertexAttrib4Nub)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); /* 550 */

+   void (GLAPIENTRYP VertexAttrib4Nubv)(GLuint index, const GLubyte * v); /* 551 */

+   void (GLAPIENTRYP VertexAttrib4Nuiv)(GLuint index, const GLuint * v); /* 552 */

+   void (GLAPIENTRYP VertexAttrib4Nusv)(GLuint index, const GLushort * v); /* 553 */

+   void (GLAPIENTRYP VertexAttrib4bv)(GLuint index, const GLbyte * v); /* 554 */

+   void (GLAPIENTRYP VertexAttrib4d)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 555 */

+   void (GLAPIENTRYP VertexAttrib4dv)(GLuint index, const GLdouble * v); /* 556 */

+   void (GLAPIENTRYP VertexAttrib4iv)(GLuint index, const GLint * v); /* 557 */

+   void (GLAPIENTRYP VertexAttrib4s)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); /* 558 */

+   void (GLAPIENTRYP VertexAttrib4sv)(GLuint index, const GLshort * v); /* 559 */

+   void (GLAPIENTRYP VertexAttrib4ubv)(GLuint index, const GLubyte * v); /* 560 */

+   void (GLAPIENTRYP VertexAttrib4uiv)(GLuint index, const GLuint * v); /* 561 */

+   void (GLAPIENTRYP VertexAttrib4usv)(GLuint index, const GLushort * v); /* 562 */

+   void (GLAPIENTRYP VertexAttribPointer)(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid * pointer); /* 563 */

+   void (GLAPIENTRYP UniformMatrix2x3fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 564 */

+   void (GLAPIENTRYP UniformMatrix2x4fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 565 */

+   void (GLAPIENTRYP UniformMatrix3x2fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 566 */

+   void (GLAPIENTRYP UniformMatrix3x4fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 567 */

+   void (GLAPIENTRYP UniformMatrix4x2fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 568 */

+   void (GLAPIENTRYP UniformMatrix4x3fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 569 */

+   void (GLAPIENTRYP BeginConditionalRender)(GLuint query, GLenum mode); /* 570 */

+   void (GLAPIENTRYP BeginTransformFeedback)(GLenum mode); /* 571 */

+   void (GLAPIENTRYP BindBufferBase)(GLenum target, GLuint index, GLuint buffer); /* 572 */

+   void (GLAPIENTRYP BindBufferRange)(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); /* 573 */

+   void (GLAPIENTRYP BindFragDataLocation)(GLuint program, GLuint colorNumber, const GLchar * name); /* 574 */

+   void (GLAPIENTRYP ClampColor)(GLenum target, GLenum clamp); /* 575 */

+   void (GLAPIENTRYP ClearBufferfi)(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil); /* 576 */

+   void (GLAPIENTRYP ClearBufferfv)(GLenum buffer, GLint drawbuffer, const GLfloat * value); /* 577 */

+   void (GLAPIENTRYP ClearBufferiv)(GLenum buffer, GLint drawbuffer, const GLint * value); /* 578 */

+   void (GLAPIENTRYP ClearBufferuiv)(GLenum buffer, GLint drawbuffer, const GLuint * value); /* 579 */

+   void (GLAPIENTRYP ColorMaski)(GLuint buf, GLboolean r, GLboolean g, GLboolean b, GLboolean a); /* 580 */

+   void (GLAPIENTRYP Disablei)(GLenum target, GLuint index); /* 581 */

+   void (GLAPIENTRYP Enablei)(GLenum target, GLuint index); /* 582 */

+   void (GLAPIENTRYP EndConditionalRender)(void); /* 583 */

+   void (GLAPIENTRYP EndTransformFeedback)(void); /* 584 */

+   void (GLAPIENTRYP GetBooleani_v)(GLenum value, GLuint index, GLboolean * data); /* 585 */

+   GLint (GLAPIENTRYP GetFragDataLocation)(GLuint program, const GLchar * name); /* 586 */

+   void (GLAPIENTRYP GetIntegeri_v)(GLenum value, GLuint index, GLint * data); /* 587 */

+   const GLubyte * (GLAPIENTRYP GetStringi)(GLenum name, GLuint index); /* 588 */

+   void (GLAPIENTRYP GetTexParameterIiv)(GLenum target, GLenum pname, GLint * params); /* 589 */

+   void (GLAPIENTRYP GetTexParameterIuiv)(GLenum target, GLenum pname, GLuint * params); /* 590 */

+   void (GLAPIENTRYP GetTransformFeedbackVarying)(GLuint program, GLuint index, GLsizei bufSize, GLsizei * length, GLsizei * size, GLenum * type, GLchar * name); /* 591 */

+   void (GLAPIENTRYP GetUniformuiv)(GLuint program, GLint location, GLuint * params); /* 592 */

+   void (GLAPIENTRYP GetVertexAttribIiv)(GLuint index, GLenum pname, GLint * params); /* 593 */

+   void (GLAPIENTRYP GetVertexAttribIuiv)(GLuint index, GLenum pname, GLuint * params); /* 594 */

+   GLboolean (GLAPIENTRYP IsEnabledi)(GLenum target, GLuint index); /* 595 */

+   void (GLAPIENTRYP TexParameterIiv)(GLenum target, GLenum pname, const GLint * params); /* 596 */

+   void (GLAPIENTRYP TexParameterIuiv)(GLenum target, GLenum pname, const GLuint * params); /* 597 */

+   void (GLAPIENTRYP TransformFeedbackVaryings)(GLuint program, GLsizei count, const GLchar * const * varyings, GLenum bufferMode); /* 598 */

+   void (GLAPIENTRYP Uniform1ui)(GLint location, GLuint x); /* 599 */

+   void (GLAPIENTRYP Uniform1uiv)(GLint location, GLsizei count, const GLuint * value); /* 600 */

+   void (GLAPIENTRYP Uniform2ui)(GLint location, GLuint x, GLuint y); /* 601 */

+   void (GLAPIENTRYP Uniform2uiv)(GLint location, GLsizei count, const GLuint * value); /* 602 */

+   void (GLAPIENTRYP Uniform3ui)(GLint location, GLuint x, GLuint y, GLuint z); /* 603 */

+   void (GLAPIENTRYP Uniform3uiv)(GLint location, GLsizei count, const GLuint * value); /* 604 */

+   void (GLAPIENTRYP Uniform4ui)(GLint location, GLuint x, GLuint y, GLuint z, GLuint w); /* 605 */

+   void (GLAPIENTRYP Uniform4uiv)(GLint location, GLsizei count, const GLuint * value); /* 606 */

+   void (GLAPIENTRYP VertexAttribI1iv)(GLuint index, const GLint * v); /* 607 */

+   void (GLAPIENTRYP VertexAttribI1uiv)(GLuint index, const GLuint * v); /* 608 */

+   void (GLAPIENTRYP VertexAttribI4bv)(GLuint index, const GLbyte * v); /* 609 */

+   void (GLAPIENTRYP VertexAttribI4sv)(GLuint index, const GLshort * v); /* 610 */

+   void (GLAPIENTRYP VertexAttribI4ubv)(GLuint index, const GLubyte * v); /* 611 */

+   void (GLAPIENTRYP VertexAttribI4usv)(GLuint index, const GLushort * v); /* 612 */

+   void (GLAPIENTRYP VertexAttribIPointer)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 613 */

+   void (GLAPIENTRYP PrimitiveRestartIndex)(GLuint index); /* 614 */

+   void (GLAPIENTRYP TexBuffer)(GLenum target, GLenum internalFormat, GLuint buffer); /* 615 */

+   void (GLAPIENTRYP FramebufferTexture)(GLenum target, GLenum attachment, GLuint texture, GLint level); /* 616 */

+   void (GLAPIENTRYP GetBufferParameteri64v)(GLenum target, GLenum pname, GLint64 * params); /* 617 */

+   void (GLAPIENTRYP GetInteger64i_v)(GLenum cap, GLuint index, GLint64 * data); /* 618 */

+   void (GLAPIENTRYP VertexAttribDivisor)(GLuint index, GLuint divisor); /* 619 */

+   void (GLAPIENTRYP BindProgramARB)(GLenum target, GLuint program); /* 620 */

+   void (GLAPIENTRYP DeleteProgramsARB)(GLsizei n, const GLuint * programs); /* 621 */

+   void (GLAPIENTRYP GenProgramsARB)(GLsizei n, GLuint * programs); /* 622 */

+   void (GLAPIENTRYP GetProgramEnvParameterdvARB)(GLenum target, GLuint index, GLdouble * params); /* 623 */

+   void (GLAPIENTRYP GetProgramEnvParameterfvARB)(GLenum target, GLuint index, GLfloat * params); /* 624 */

+   void (GLAPIENTRYP GetProgramLocalParameterdvARB)(GLenum target, GLuint index, GLdouble * params); /* 625 */

+   void (GLAPIENTRYP GetProgramLocalParameterfvARB)(GLenum target, GLuint index, GLfloat * params); /* 626 */

+   void (GLAPIENTRYP GetProgramStringARB)(GLenum target, GLenum pname, GLvoid * string); /* 627 */

+   void (GLAPIENTRYP GetProgramivARB)(GLenum target, GLenum pname, GLint * params); /* 628 */

+   GLboolean (GLAPIENTRYP IsProgramARB)(GLuint program); /* 629 */

+   void (GLAPIENTRYP ProgramEnvParameter4dARB)(GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 630 */

+   void (GLAPIENTRYP ProgramEnvParameter4dvARB)(GLenum target, GLuint index, const GLdouble * params); /* 631 */

+   void (GLAPIENTRYP ProgramEnvParameter4fARB)(GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 632 */

+   void (GLAPIENTRYP ProgramEnvParameter4fvARB)(GLenum target, GLuint index, const GLfloat * params); /* 633 */

+   void (GLAPIENTRYP ProgramLocalParameter4dARB)(GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 634 */

+   void (GLAPIENTRYP ProgramLocalParameter4dvARB)(GLenum target, GLuint index, const GLdouble * params); /* 635 */

+   void (GLAPIENTRYP ProgramLocalParameter4fARB)(GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 636 */

+   void (GLAPIENTRYP ProgramLocalParameter4fvARB)(GLenum target, GLuint index, const GLfloat * params); /* 637 */

+   void (GLAPIENTRYP ProgramStringARB)(GLenum target, GLenum format, GLsizei len, const GLvoid * string); /* 638 */

+   void (GLAPIENTRYP VertexAttrib1fARB)(GLuint index, GLfloat x); /* 639 */

+   void (GLAPIENTRYP VertexAttrib1fvARB)(GLuint index, const GLfloat * v); /* 640 */

+   void (GLAPIENTRYP VertexAttrib2fARB)(GLuint index, GLfloat x, GLfloat y); /* 641 */

+   void (GLAPIENTRYP VertexAttrib2fvARB)(GLuint index, const GLfloat * v); /* 642 */

+   void (GLAPIENTRYP VertexAttrib3fARB)(GLuint index, GLfloat x, GLfloat y, GLfloat z); /* 643 */

+   void (GLAPIENTRYP VertexAttrib3fvARB)(GLuint index, const GLfloat * v); /* 644 */

+   void (GLAPIENTRYP VertexAttrib4fARB)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 645 */

+   void (GLAPIENTRYP VertexAttrib4fvARB)(GLuint index, const GLfloat * v); /* 646 */

+   void (GLAPIENTRYP AttachObjectARB)(GLhandleARB containerObj, GLhandleARB obj); /* 647 */

+   GLhandleARB (GLAPIENTRYP CreateProgramObjectARB)(void); /* 648 */

+   GLhandleARB (GLAPIENTRYP CreateShaderObjectARB)(GLenum shaderType); /* 649 */

+   void (GLAPIENTRYP DeleteObjectARB)(GLhandleARB obj); /* 650 */

+   void (GLAPIENTRYP DetachObjectARB)(GLhandleARB containerObj, GLhandleARB attachedObj); /* 651 */

+   void (GLAPIENTRYP GetAttachedObjectsARB)(GLhandleARB containerObj, GLsizei maxLength, GLsizei * length, GLhandleARB * infoLog); /* 652 */

+   GLhandleARB (GLAPIENTRYP GetHandleARB)(GLenum pname); /* 653 */

+   void (GLAPIENTRYP GetInfoLogARB)(GLhandleARB obj, GLsizei maxLength, GLsizei * length, GLcharARB * infoLog); /* 654 */

+   void (GLAPIENTRYP GetObjectParameterfvARB)(GLhandleARB obj, GLenum pname, GLfloat * params); /* 655 */

+   void (GLAPIENTRYP GetObjectParameterivARB)(GLhandleARB obj, GLenum pname, GLint * params); /* 656 */

+   void (GLAPIENTRYP DrawArraysInstancedARB)(GLenum mode, GLint first, GLsizei count, GLsizei primcount); /* 657 */

+   void (GLAPIENTRYP DrawElementsInstancedARB)(GLenum mode, GLsizei count, GLenum type, const GLvoid * indices, GLsizei primcount); /* 658 */

+   void (GLAPIENTRYP BindFramebuffer)(GLenum target, GLuint framebuffer); /* 659 */

+   void (GLAPIENTRYP BindRenderbuffer)(GLenum target, GLuint renderbuffer); /* 660 */

+   void (GLAPIENTRYP BlitFramebuffer)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); /* 661 */

+   GLenum (GLAPIENTRYP CheckFramebufferStatus)(GLenum target); /* 662 */

+   void (GLAPIENTRYP DeleteFramebuffers)(GLsizei n, const GLuint * framebuffers); /* 663 */

+   void (GLAPIENTRYP DeleteRenderbuffers)(GLsizei n, const GLuint * renderbuffers); /* 664 */

+   void (GLAPIENTRYP FramebufferRenderbuffer)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); /* 665 */

+   void (GLAPIENTRYP FramebufferTexture1D)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 666 */

+   void (GLAPIENTRYP FramebufferTexture2D)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 667 */

+   void (GLAPIENTRYP FramebufferTexture3D)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); /* 668 */

+   void (GLAPIENTRYP FramebufferTextureLayer)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); /* 669 */

+   void (GLAPIENTRYP GenFramebuffers)(GLsizei n, GLuint * framebuffers); /* 670 */

+   void (GLAPIENTRYP GenRenderbuffers)(GLsizei n, GLuint * renderbuffers); /* 671 */

+   void (GLAPIENTRYP GenerateMipmap)(GLenum target); /* 672 */

+   void (GLAPIENTRYP GetFramebufferAttachmentParameteriv)(GLenum target, GLenum attachment, GLenum pname, GLint * params); /* 673 */

+   void (GLAPIENTRYP GetRenderbufferParameteriv)(GLenum target, GLenum pname, GLint * params); /* 674 */

+   GLboolean (GLAPIENTRYP IsFramebuffer)(GLuint framebuffer); /* 675 */

+   GLboolean (GLAPIENTRYP IsRenderbuffer)(GLuint renderbuffer); /* 676 */

+   void (GLAPIENTRYP RenderbufferStorage)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height); /* 677 */

+   void (GLAPIENTRYP RenderbufferStorageMultisample)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); /* 678 */

+   void (GLAPIENTRYP FramebufferTextureFaceARB)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face); /* 679 */

+   void (GLAPIENTRYP FlushMappedBufferRange)(GLenum target, GLintptr offset, GLsizeiptr length); /* 680 */

+   GLvoid * (GLAPIENTRYP MapBufferRange)(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access); /* 681 */

+   void (GLAPIENTRYP BindVertexArray)(GLuint array); /* 682 */

+   void (GLAPIENTRYP DeleteVertexArrays)(GLsizei n, const GLuint * arrays); /* 683 */

+   void (GLAPIENTRYP GenVertexArrays)(GLsizei n, GLuint * arrays); /* 684 */

+   GLboolean (GLAPIENTRYP IsVertexArray)(GLuint array); /* 685 */

+   void (GLAPIENTRYP GetActiveUniformBlockName)(GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei * length, GLchar * uniformBlockName); /* 686 */

+   void (GLAPIENTRYP GetActiveUniformBlockiv)(GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint * params); /* 687 */

+   void (GLAPIENTRYP GetActiveUniformName)(GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei * length, GLchar * uniformName); /* 688 */

+   void (GLAPIENTRYP GetActiveUniformsiv)(GLuint program, GLsizei uniformCount, const GLuint * uniformIndices, GLenum pname, GLint * params); /* 689 */

+   GLuint (GLAPIENTRYP GetUniformBlockIndex)(GLuint program, const GLchar * uniformBlockName); /* 690 */

+   void (GLAPIENTRYP GetUniformIndices)(GLuint program, GLsizei uniformCount, const GLchar * const * uniformNames, GLuint * uniformIndices); /* 691 */

+   void (GLAPIENTRYP UniformBlockBinding)(GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding); /* 692 */

+   void (GLAPIENTRYP CopyBufferSubData)(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); /* 693 */

+   GLenum (GLAPIENTRYP ClientWaitSync)(GLsync sync, GLbitfield flags, GLuint64 timeout); /* 694 */

+   void (GLAPIENTRYP DeleteSync)(GLsync sync); /* 695 */

+   GLsync (GLAPIENTRYP FenceSync)(GLenum condition, GLbitfield flags); /* 696 */

+   void (GLAPIENTRYP GetInteger64v)(GLenum pname, GLint64 * params); /* 697 */

+   void (GLAPIENTRYP GetSynciv)(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * values); /* 698 */

+   GLboolean (GLAPIENTRYP IsSync)(GLsync sync); /* 699 */

+   void (GLAPIENTRYP WaitSync)(GLsync sync, GLbitfield flags, GLuint64 timeout); /* 700 */

+   void (GLAPIENTRYP DrawElementsBaseVertex)(GLenum mode, GLsizei count, GLenum type, const GLvoid * indices, GLint basevertex); /* 701 */

+   void (GLAPIENTRYP DrawElementsInstancedBaseVertex)(GLenum mode, GLsizei count, GLenum type, const GLvoid * indices, GLsizei primcount, GLint basevertex); /* 702 */

+   void (GLAPIENTRYP DrawRangeElementsBaseVertex)(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid * indices, GLint basevertex); /* 703 */

+   void (GLAPIENTRYP MultiDrawElementsBaseVertex)(GLenum mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, const GLint * basevertex); /* 704 */

+   void (GLAPIENTRYP ProvokingVertex)(GLenum mode); /* 705 */

+   void (GLAPIENTRYP BlendEquationSeparateiARB)(GLuint buf, GLenum modeRGB, GLenum modeA); /* 706 */

+   void (GLAPIENTRYP BlendEquationiARB)(GLuint buf, GLenum mode); /* 707 */

+   void (GLAPIENTRYP BlendFuncSeparateiARB)(GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcA, GLenum dstA); /* 708 */

+   void (GLAPIENTRYP BlendFunciARB)(GLuint buf, GLenum src, GLenum dst); /* 709 */

+   void (GLAPIENTRYP BindFragDataLocationIndexed)(GLuint program, GLuint colorNumber, GLuint index, const GLchar * name); /* 710 */

+   GLint (GLAPIENTRYP GetFragDataIndex)(GLuint program, const GLchar * name); /* 711 */

+   void (GLAPIENTRYP BindSampler)(GLuint unit, GLuint sampler); /* 712 */

+   void (GLAPIENTRYP DeleteSamplers)(GLsizei count, const GLuint * samplers); /* 713 */

+   void (GLAPIENTRYP GenSamplers)(GLsizei count, GLuint * samplers); /* 714 */

+   void (GLAPIENTRYP GetSamplerParameterIiv)(GLuint sampler, GLenum pname, GLint * params); /* 715 */

+   void (GLAPIENTRYP GetSamplerParameterIuiv)(GLuint sampler, GLenum pname, GLuint * params); /* 716 */

+   void (GLAPIENTRYP GetSamplerParameterfv)(GLuint sampler, GLenum pname, GLfloat * params); /* 717 */

+   void (GLAPIENTRYP GetSamplerParameteriv)(GLuint sampler, GLenum pname, GLint * params); /* 718 */

+   GLboolean (GLAPIENTRYP IsSampler)(GLuint sampler); /* 719 */

+   void (GLAPIENTRYP SamplerParameterIiv)(GLuint sampler, GLenum pname, const GLint * params); /* 720 */

+   void (GLAPIENTRYP SamplerParameterIuiv)(GLuint sampler, GLenum pname, const GLuint * params); /* 721 */

+   void (GLAPIENTRYP SamplerParameterf)(GLuint sampler, GLenum pname, GLfloat param); /* 722 */

+   void (GLAPIENTRYP SamplerParameterfv)(GLuint sampler, GLenum pname, const GLfloat * params); /* 723 */

+   void (GLAPIENTRYP SamplerParameteri)(GLuint sampler, GLenum pname, GLint param); /* 724 */

+   void (GLAPIENTRYP SamplerParameteriv)(GLuint sampler, GLenum pname, const GLint * params); /* 725 */

+   void (GLAPIENTRYP GetQueryObjecti64v)(GLuint id, GLenum pname, GLint64 * params); /* 726 */

+   void (GLAPIENTRYP GetQueryObjectui64v)(GLuint id, GLenum pname, GLuint64 * params); /* 727 */

+   void (GLAPIENTRYP QueryCounter)(GLuint id, GLenum target); /* 728 */

+   void (GLAPIENTRYP ColorP3ui)(GLenum type, GLuint color); /* 729 */

+   void (GLAPIENTRYP ColorP3uiv)(GLenum type, const GLuint * color); /* 730 */

+   void (GLAPIENTRYP ColorP4ui)(GLenum type, GLuint color); /* 731 */

+   void (GLAPIENTRYP ColorP4uiv)(GLenum type, const GLuint * color); /* 732 */

+   void (GLAPIENTRYP MultiTexCoordP1ui)(GLenum texture, GLenum type, GLuint coords); /* 733 */

+   void (GLAPIENTRYP MultiTexCoordP1uiv)(GLenum texture, GLenum type, const GLuint * coords); /* 734 */

+   void (GLAPIENTRYP MultiTexCoordP2ui)(GLenum texture, GLenum type, GLuint coords); /* 735 */

+   void (GLAPIENTRYP MultiTexCoordP2uiv)(GLenum texture, GLenum type, const GLuint * coords); /* 736 */

+   void (GLAPIENTRYP MultiTexCoordP3ui)(GLenum texture, GLenum type, GLuint coords); /* 737 */

+   void (GLAPIENTRYP MultiTexCoordP3uiv)(GLenum texture, GLenum type, const GLuint * coords); /* 738 */

+   void (GLAPIENTRYP MultiTexCoordP4ui)(GLenum texture, GLenum type, GLuint coords); /* 739 */

+   void (GLAPIENTRYP MultiTexCoordP4uiv)(GLenum texture, GLenum type, const GLuint * coords); /* 740 */

+   void (GLAPIENTRYP NormalP3ui)(GLenum type, GLuint coords); /* 741 */

+   void (GLAPIENTRYP NormalP3uiv)(GLenum type, const GLuint * coords); /* 742 */

+   void (GLAPIENTRYP SecondaryColorP3ui)(GLenum type, GLuint color); /* 743 */

+   void (GLAPIENTRYP SecondaryColorP3uiv)(GLenum type, const GLuint * color); /* 744 */

+   void (GLAPIENTRYP TexCoordP1ui)(GLenum type, GLuint coords); /* 745 */

+   void (GLAPIENTRYP TexCoordP1uiv)(GLenum type, const GLuint * coords); /* 746 */

+   void (GLAPIENTRYP TexCoordP2ui)(GLenum type, GLuint coords); /* 747 */

+   void (GLAPIENTRYP TexCoordP2uiv)(GLenum type, const GLuint * coords); /* 748 */

+   void (GLAPIENTRYP TexCoordP3ui)(GLenum type, GLuint coords); /* 749 */

+   void (GLAPIENTRYP TexCoordP3uiv)(GLenum type, const GLuint * coords); /* 750 */

+   void (GLAPIENTRYP TexCoordP4ui)(GLenum type, GLuint coords); /* 751 */

+   void (GLAPIENTRYP TexCoordP4uiv)(GLenum type, const GLuint * coords); /* 752 */

+   void (GLAPIENTRYP VertexAttribP1ui)(GLuint index, GLenum type, GLboolean normalized, GLuint value); /* 753 */

+   void (GLAPIENTRYP VertexAttribP1uiv)(GLuint index, GLenum type, GLboolean normalized, const GLuint * value); /* 754 */

+   void (GLAPIENTRYP VertexAttribP2ui)(GLuint index, GLenum type, GLboolean normalized, GLuint value); /* 755 */

+   void (GLAPIENTRYP VertexAttribP2uiv)(GLuint index, GLenum type, GLboolean normalized, const GLuint * value); /* 756 */

+   void (GLAPIENTRYP VertexAttribP3ui)(GLuint index, GLenum type, GLboolean normalized, GLuint value); /* 757 */

+   void (GLAPIENTRYP VertexAttribP3uiv)(GLuint index, GLenum type, GLboolean normalized, const GLuint * value); /* 758 */

+   void (GLAPIENTRYP VertexAttribP4ui)(GLuint index, GLenum type, GLboolean normalized, GLuint value); /* 759 */

+   void (GLAPIENTRYP VertexAttribP4uiv)(GLuint index, GLenum type, GLboolean normalized, const GLuint * value); /* 760 */

+   void (GLAPIENTRYP VertexP2ui)(GLenum type, GLuint value); /* 761 */

+   void (GLAPIENTRYP VertexP2uiv)(GLenum type, const GLuint * value); /* 762 */

+   void (GLAPIENTRYP VertexP3ui)(GLenum type, GLuint value); /* 763 */

+   void (GLAPIENTRYP VertexP3uiv)(GLenum type, const GLuint * value); /* 764 */

+   void (GLAPIENTRYP VertexP4ui)(GLenum type, GLuint value); /* 765 */

+   void (GLAPIENTRYP VertexP4uiv)(GLenum type, const GLuint * value); /* 766 */

+   void (GLAPIENTRYP BindTransformFeedback)(GLenum target, GLuint id); /* 767 */

+   void (GLAPIENTRYP DeleteTransformFeedbacks)(GLsizei n, const GLuint * ids); /* 768 */

+   void (GLAPIENTRYP DrawTransformFeedback)(GLenum mode, GLuint id); /* 769 */

+   void (GLAPIENTRYP GenTransformFeedbacks)(GLsizei n, GLuint * ids); /* 770 */

+   GLboolean (GLAPIENTRYP IsTransformFeedback)(GLuint id); /* 771 */

+   void (GLAPIENTRYP PauseTransformFeedback)(void); /* 772 */

+   void (GLAPIENTRYP ResumeTransformFeedback)(void); /* 773 */

+   void (GLAPIENTRYP BeginQueryIndexed)(GLenum target, GLuint index, GLuint id); /* 774 */

+   void (GLAPIENTRYP DrawTransformFeedbackStream)(GLenum mode, GLuint id, GLuint stream); /* 775 */

+   void (GLAPIENTRYP EndQueryIndexed)(GLenum target, GLuint index); /* 776 */

+   void (GLAPIENTRYP GetQueryIndexediv)(GLenum target, GLuint index, GLenum pname, GLint * params); /* 777 */

+   void (GLAPIENTRYP ClearDepthf)(GLclampf depth); /* 778 */

+   void (GLAPIENTRYP DepthRangef)(GLclampf zNear, GLclampf zFar); /* 779 */

+   void (GLAPIENTRYP GetShaderPrecisionFormat)(GLenum shadertype, GLenum precisiontype, GLint * range, GLint * precision); /* 780 */

+   void (GLAPIENTRYP ReleaseShaderCompiler)(void); /* 781 */

+   void (GLAPIENTRYP ShaderBinary)(GLsizei n, const GLuint * shaders, GLenum binaryformat, const GLvoid * binary, GLsizei length); /* 782 */

+   void (GLAPIENTRYP GetProgramBinary)(GLuint program, GLsizei bufSize, GLsizei * length, GLenum * binaryFormat, GLvoid * binary); /* 783 */

+   void (GLAPIENTRYP ProgramBinary)(GLuint program, GLenum binaryFormat, const GLvoid * binary, GLsizei length); /* 784 */

+   void (GLAPIENTRYP ProgramParameteri)(GLuint program, GLenum pname, GLint value); /* 785 */

+   void (GLAPIENTRYP DebugMessageCallbackARB)(GLDEBUGPROCARB callback, const GLvoid * userParam); /* 786 */

+   void (GLAPIENTRYP DebugMessageControlARB)(GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint * ids, GLboolean enabled); /* 787 */

+   void (GLAPIENTRYP DebugMessageInsertARB)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLcharARB * buf); /* 788 */

+   GLuint (GLAPIENTRYP GetDebugMessageLogARB)(GLuint count, GLsizei bufsize, GLenum * sources, GLenum * types, GLuint * ids, GLenum * severities, GLsizei * lengths, GLcharARB * messageLog); /* 789 */

+   GLenum (GLAPIENTRYP GetGraphicsResetStatusARB)(void); /* 790 */

+   void (GLAPIENTRYP GetnColorTableARB)(GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid * table); /* 791 */

+   void (GLAPIENTRYP GetnCompressedTexImageARB)(GLenum target, GLint lod, GLsizei bufSize, GLvoid * img); /* 792 */

+   void (GLAPIENTRYP GetnConvolutionFilterARB)(GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid * image); /* 793 */

+   void (GLAPIENTRYP GetnHistogramARB)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid * values); /* 794 */

+   void (GLAPIENTRYP GetnMapdvARB)(GLenum target, GLenum query, GLsizei bufSize, GLdouble * v); /* 795 */

+   void (GLAPIENTRYP GetnMapfvARB)(GLenum target, GLenum query, GLsizei bufSize, GLfloat * v); /* 796 */

+   void (GLAPIENTRYP GetnMapivARB)(GLenum target, GLenum query, GLsizei bufSize, GLint * v); /* 797 */

+   void (GLAPIENTRYP GetnMinmaxARB)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid * values); /* 798 */

+   void (GLAPIENTRYP GetnPixelMapfvARB)(GLenum map, GLsizei bufSize, GLfloat * values); /* 799 */

+   void (GLAPIENTRYP GetnPixelMapuivARB)(GLenum map, GLsizei bufSize, GLuint * values); /* 800 */

+   void (GLAPIENTRYP GetnPixelMapusvARB)(GLenum map, GLsizei bufSize, GLushort * values); /* 801 */

+   void (GLAPIENTRYP GetnPolygonStippleARB)(GLsizei bufSize, GLubyte * pattern); /* 802 */

+   void (GLAPIENTRYP GetnSeparableFilterARB)(GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, GLvoid * row, GLsizei columnBufSize, GLvoid * column, GLvoid * span); /* 803 */

+   void (GLAPIENTRYP GetnTexImageARB)(GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, GLvoid * img); /* 804 */

+   void (GLAPIENTRYP GetnUniformdvARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLdouble * params); /* 805 */

+   void (GLAPIENTRYP GetnUniformfvARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLfloat * params); /* 806 */

+   void (GLAPIENTRYP GetnUniformivARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLint * params); /* 807 */

+   void (GLAPIENTRYP GetnUniformuivARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLuint * params); /* 808 */

+   void (GLAPIENTRYP ReadnPixelsARB)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, GLvoid * data); /* 809 */

+   void (GLAPIENTRYP DrawArraysInstancedBaseInstance)(GLenum mode, GLint first, GLsizei count, GLsizei primcount, GLuint baseinstance); /* 810 */

+   void (GLAPIENTRYP DrawElementsInstancedBaseInstance)(GLenum mode, GLsizei count, GLenum type, const GLvoid * indices, GLsizei primcount, GLuint baseinstance); /* 811 */

+   void (GLAPIENTRYP DrawElementsInstancedBaseVertexBaseInstance)(GLenum mode, GLsizei count, GLenum type, const GLvoid * indices, GLsizei primcount, GLint basevertex, GLuint baseinstance); /* 812 */

+   void (GLAPIENTRYP DrawTransformFeedbackInstanced)(GLenum mode, GLuint id, GLsizei primcount); /* 813 */

+   void (GLAPIENTRYP DrawTransformFeedbackStreamInstanced)(GLenum mode, GLuint id, GLuint stream, GLsizei primcount); /* 814 */

+   void (GLAPIENTRYP GetInternalformativ)(GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint * params); /* 815 */

+   void (GLAPIENTRYP TexStorage1D)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width); /* 816 */

+   void (GLAPIENTRYP TexStorage2D)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height); /* 817 */

+   void (GLAPIENTRYP TexStorage3D)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth); /* 818 */

+   void (GLAPIENTRYP TextureStorage1DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width); /* 819 */

+   void (GLAPIENTRYP TextureStorage2DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height); /* 820 */

+   void (GLAPIENTRYP TextureStorage3DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth); /* 821 */

+   void (GLAPIENTRYP TexBufferRange)(GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size); /* 822 */

+   void (GLAPIENTRYP InvalidateBufferData)(GLuint buffer); /* 823 */

+   void (GLAPIENTRYP InvalidateBufferSubData)(GLuint buffer, GLintptr offset, GLsizeiptr length); /* 824 */

+   void (GLAPIENTRYP InvalidateFramebuffer)(GLenum target, GLsizei numAttachments, const GLenum * attachments); /* 825 */

+   void (GLAPIENTRYP InvalidateSubFramebuffer)(GLenum target, GLsizei numAttachments, const GLenum * attachments, GLint x, GLint y, GLsizei width, GLsizei height); /* 826 */

+   void (GLAPIENTRYP InvalidateTexImage)(GLuint texture, GLint level); /* 827 */

+   void (GLAPIENTRYP InvalidateTexSubImage)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth); /* 828 */

+   void (GLAPIENTRYP PolygonOffsetEXT)(GLfloat factor, GLfloat bias); /* 829 */

+   void (GLAPIENTRYP DrawTexfOES)(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height); /* 830 */

+   void (GLAPIENTRYP DrawTexfvOES)(const GLfloat * coords); /* 831 */

+   void (GLAPIENTRYP DrawTexiOES)(GLint x, GLint y, GLint z, GLint width, GLint height); /* 832 */

+   void (GLAPIENTRYP DrawTexivOES)(const GLint * coords); /* 833 */

+   void (GLAPIENTRYP DrawTexsOES)(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height); /* 834 */

+   void (GLAPIENTRYP DrawTexsvOES)(const GLshort * coords); /* 835 */

+   void (GLAPIENTRYP DrawTexxOES)(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height); /* 836 */

+   void (GLAPIENTRYP DrawTexxvOES)(const GLfixed * coords); /* 837 */

+   void (GLAPIENTRYP PointSizePointerOES)(GLenum type, GLsizei stride, const GLvoid * pointer); /* 838 */

+   GLbitfield (GLAPIENTRYP QueryMatrixxOES)(GLfixed * mantissa, GLint * exponent); /* 839 */

+   void (GLAPIENTRYP SampleMaskSGIS)(GLclampf value, GLboolean invert); /* 840 */

+   void (GLAPIENTRYP SamplePatternSGIS)(GLenum pattern); /* 841 */

+   void (GLAPIENTRYP ColorPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 842 */

+   void (GLAPIENTRYP EdgeFlagPointerEXT)(GLsizei stride, GLsizei count, const GLboolean * pointer); /* 843 */

+   void (GLAPIENTRYP IndexPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 844 */

+   void (GLAPIENTRYP NormalPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 845 */

+   void (GLAPIENTRYP TexCoordPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 846 */

+   void (GLAPIENTRYP VertexPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 847 */

+   void (GLAPIENTRYP LockArraysEXT)(GLint first, GLsizei count); /* 848 */

+   void (GLAPIENTRYP UnlockArraysEXT)(void); /* 849 */

+   void (GLAPIENTRYP SecondaryColor3fEXT)(GLfloat red, GLfloat green, GLfloat blue); /* 850 */

+   void (GLAPIENTRYP SecondaryColor3fvEXT)(const GLfloat * v); /* 851 */

+   void (GLAPIENTRYP MultiDrawElementsEXT)(GLenum mode, const GLsizei * count, GLenum type, const GLvoid ** indices, GLsizei primcount); /* 852 */

+   void (GLAPIENTRYP FogCoordfEXT)(GLfloat coord); /* 853 */

+   void (GLAPIENTRYP FogCoordfvEXT)(const GLfloat * coord); /* 854 */

+   void (GLAPIENTRYP ResizeBuffersMESA)(void); /* 855 */

+   void (GLAPIENTRYP WindowPos4dMESA)(GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 856 */

+   void (GLAPIENTRYP WindowPos4dvMESA)(const GLdouble * v); /* 857 */

+   void (GLAPIENTRYP WindowPos4fMESA)(GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 858 */

+   void (GLAPIENTRYP WindowPos4fvMESA)(const GLfloat * v); /* 859 */

+   void (GLAPIENTRYP WindowPos4iMESA)(GLint x, GLint y, GLint z, GLint w); /* 860 */

+   void (GLAPIENTRYP WindowPos4ivMESA)(const GLint * v); /* 861 */

+   void (GLAPIENTRYP WindowPos4sMESA)(GLshort x, GLshort y, GLshort z, GLshort w); /* 862 */

+   void (GLAPIENTRYP WindowPos4svMESA)(const GLshort * v); /* 863 */

+   void (GLAPIENTRYP MultiModeDrawArraysIBM)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride); /* 864 */

+   void (GLAPIENTRYP MultiModeDrawElementsIBM)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride); /* 865 */

+   GLboolean (GLAPIENTRYP AreProgramsResidentNV)(GLsizei n, const GLuint * ids, GLboolean * residences); /* 866 */

+   void (GLAPIENTRYP ExecuteProgramNV)(GLenum target, GLuint id, const GLfloat * params); /* 867 */

+   void (GLAPIENTRYP GetProgramParameterdvNV)(GLenum target, GLuint index, GLenum pname, GLdouble * params); /* 868 */

+   void (GLAPIENTRYP GetProgramParameterfvNV)(GLenum target, GLuint index, GLenum pname, GLfloat * params); /* 869 */

+   void (GLAPIENTRYP GetProgramStringNV)(GLuint id, GLenum pname, GLubyte * program); /* 870 */

+   void (GLAPIENTRYP GetProgramivNV)(GLuint id, GLenum pname, GLint * params); /* 871 */

+   void (GLAPIENTRYP GetTrackMatrixivNV)(GLenum target, GLuint address, GLenum pname, GLint * params); /* 872 */

+   void (GLAPIENTRYP GetVertexAttribdvNV)(GLuint index, GLenum pname, GLdouble * params); /* 873 */

+   void (GLAPIENTRYP GetVertexAttribfvNV)(GLuint index, GLenum pname, GLfloat * params); /* 874 */

+   void (GLAPIENTRYP GetVertexAttribivNV)(GLuint index, GLenum pname, GLint * params); /* 875 */

+   void (GLAPIENTRYP LoadProgramNV)(GLenum target, GLuint id, GLsizei len, const GLubyte * program); /* 876 */

+   void (GLAPIENTRYP ProgramParameters4dvNV)(GLenum target, GLuint index, GLsizei num, const GLdouble * params); /* 877 */

+   void (GLAPIENTRYP ProgramParameters4fvNV)(GLenum target, GLuint index, GLsizei num, const GLfloat * params); /* 878 */

+   void (GLAPIENTRYP RequestResidentProgramsNV)(GLsizei n, const GLuint * ids); /* 879 */

+   void (GLAPIENTRYP TrackMatrixNV)(GLenum target, GLuint address, GLenum matrix, GLenum transform); /* 880 */

+   void (GLAPIENTRYP VertexAttrib1dNV)(GLuint index, GLdouble x); /* 881 */

+   void (GLAPIENTRYP VertexAttrib1dvNV)(GLuint index, const GLdouble * v); /* 882 */

+   void (GLAPIENTRYP VertexAttrib1fNV)(GLuint index, GLfloat x); /* 883 */

+   void (GLAPIENTRYP VertexAttrib1fvNV)(GLuint index, const GLfloat * v); /* 884 */

+   void (GLAPIENTRYP VertexAttrib1sNV)(GLuint index, GLshort x); /* 885 */

+   void (GLAPIENTRYP VertexAttrib1svNV)(GLuint index, const GLshort * v); /* 886 */

+   void (GLAPIENTRYP VertexAttrib2dNV)(GLuint index, GLdouble x, GLdouble y); /* 887 */

+   void (GLAPIENTRYP VertexAttrib2dvNV)(GLuint index, const GLdouble * v); /* 888 */

+   void (GLAPIENTRYP VertexAttrib2fNV)(GLuint index, GLfloat x, GLfloat y); /* 889 */

+   void (GLAPIENTRYP VertexAttrib2fvNV)(GLuint index, const GLfloat * v); /* 890 */

+   void (GLAPIENTRYP VertexAttrib2sNV)(GLuint index, GLshort x, GLshort y); /* 891 */

+   void (GLAPIENTRYP VertexAttrib2svNV)(GLuint index, const GLshort * v); /* 892 */

+   void (GLAPIENTRYP VertexAttrib3dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z); /* 893 */

+   void (GLAPIENTRYP VertexAttrib3dvNV)(GLuint index, const GLdouble * v); /* 894 */

+   void (GLAPIENTRYP VertexAttrib3fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z); /* 895 */

+   void (GLAPIENTRYP VertexAttrib3fvNV)(GLuint index, const GLfloat * v); /* 896 */

+   void (GLAPIENTRYP VertexAttrib3sNV)(GLuint index, GLshort x, GLshort y, GLshort z); /* 897 */

+   void (GLAPIENTRYP VertexAttrib3svNV)(GLuint index, const GLshort * v); /* 898 */

+   void (GLAPIENTRYP VertexAttrib4dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 899 */

+   void (GLAPIENTRYP VertexAttrib4dvNV)(GLuint index, const GLdouble * v); /* 900 */

+   void (GLAPIENTRYP VertexAttrib4fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 901 */

+   void (GLAPIENTRYP VertexAttrib4fvNV)(GLuint index, const GLfloat * v); /* 902 */

+   void (GLAPIENTRYP VertexAttrib4sNV)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); /* 903 */

+   void (GLAPIENTRYP VertexAttrib4svNV)(GLuint index, const GLshort * v); /* 904 */

+   void (GLAPIENTRYP VertexAttrib4ubNV)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); /* 905 */

+   void (GLAPIENTRYP VertexAttrib4ubvNV)(GLuint index, const GLubyte * v); /* 906 */

+   void (GLAPIENTRYP VertexAttribPointerNV)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 907 */

+   void (GLAPIENTRYP VertexAttribs1dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 908 */

+   void (GLAPIENTRYP VertexAttribs1fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 909 */

+   void (GLAPIENTRYP VertexAttribs1svNV)(GLuint index, GLsizei n, const GLshort * v); /* 910 */

+   void (GLAPIENTRYP VertexAttribs2dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 911 */

+   void (GLAPIENTRYP VertexAttribs2fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 912 */

+   void (GLAPIENTRYP VertexAttribs2svNV)(GLuint index, GLsizei n, const GLshort * v); /* 913 */

+   void (GLAPIENTRYP VertexAttribs3dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 914 */

+   void (GLAPIENTRYP VertexAttribs3fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 915 */

+   void (GLAPIENTRYP VertexAttribs3svNV)(GLuint index, GLsizei n, const GLshort * v); /* 916 */

+   void (GLAPIENTRYP VertexAttribs4dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 917 */

+   void (GLAPIENTRYP VertexAttribs4fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 918 */

+   void (GLAPIENTRYP VertexAttribs4svNV)(GLuint index, GLsizei n, const GLshort * v); /* 919 */

+   void (GLAPIENTRYP VertexAttribs4ubvNV)(GLuint index, GLsizei n, const GLubyte * v); /* 920 */

+   void (GLAPIENTRYP GetTexBumpParameterfvATI)(GLenum pname, GLfloat * param); /* 921 */

+   void (GLAPIENTRYP GetTexBumpParameterivATI)(GLenum pname, GLint * param); /* 922 */

+   void (GLAPIENTRYP TexBumpParameterfvATI)(GLenum pname, const GLfloat * param); /* 923 */

+   void (GLAPIENTRYP TexBumpParameterivATI)(GLenum pname, const GLint * param); /* 924 */

+   void (GLAPIENTRYP AlphaFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 925 */

+   void (GLAPIENTRYP AlphaFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 926 */

+   void (GLAPIENTRYP AlphaFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 927 */

+   void (GLAPIENTRYP BeginFragmentShaderATI)(void); /* 928 */

+   void (GLAPIENTRYP BindFragmentShaderATI)(GLuint id); /* 929 */

+   void (GLAPIENTRYP ColorFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 930 */

+   void (GLAPIENTRYP ColorFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 931 */

+   void (GLAPIENTRYP ColorFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 932 */

+   void (GLAPIENTRYP DeleteFragmentShaderATI)(GLuint id); /* 933 */

+   void (GLAPIENTRYP EndFragmentShaderATI)(void); /* 934 */

+   GLuint (GLAPIENTRYP GenFragmentShadersATI)(GLuint range); /* 935 */

+   void (GLAPIENTRYP PassTexCoordATI)(GLuint dst, GLuint coord, GLenum swizzle); /* 936 */

+   void (GLAPIENTRYP SampleMapATI)(GLuint dst, GLuint interp, GLenum swizzle); /* 937 */

+   void (GLAPIENTRYP SetFragmentShaderConstantATI)(GLuint dst, const GLfloat * value); /* 938 */

+   void (GLAPIENTRYP ActiveStencilFaceEXT)(GLenum face); /* 939 */

+   void (GLAPIENTRYP BindVertexArrayAPPLE)(GLuint array); /* 940 */

+   void (GLAPIENTRYP GenVertexArraysAPPLE)(GLsizei n, GLuint * arrays); /* 941 */

+   void (GLAPIENTRYP GetProgramNamedParameterdvNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble * params); /* 942 */

+   void (GLAPIENTRYP GetProgramNamedParameterfvNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat * params); /* 943 */

+   void (GLAPIENTRYP ProgramNamedParameter4dNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 944 */

+   void (GLAPIENTRYP ProgramNamedParameter4dvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLdouble * v); /* 945 */

+   void (GLAPIENTRYP ProgramNamedParameter4fNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 946 */

+   void (GLAPIENTRYP ProgramNamedParameter4fvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLfloat * v); /* 947 */

+   void (GLAPIENTRYP PrimitiveRestartNV)(void); /* 948 */

+   void (GLAPIENTRYP GetTexGenxvOES)(GLenum coord, GLenum pname, GLfixed * params); /* 949 */

+   void (GLAPIENTRYP TexGenxOES)(GLenum coord, GLenum pname, GLint param); /* 950 */

+   void (GLAPIENTRYP TexGenxvOES)(GLenum coord, GLenum pname, const GLfixed * params); /* 951 */

+   void (GLAPIENTRYP DepthBoundsEXT)(GLclampd zmin, GLclampd zmax); /* 952 */

+   void (GLAPIENTRYP BufferParameteriAPPLE)(GLenum target, GLenum pname, GLint param); /* 953 */

+   void (GLAPIENTRYP FlushMappedBufferRangeAPPLE)(GLenum target, GLintptr offset, GLsizeiptr size); /* 954 */

+   void (GLAPIENTRYP VertexAttribI1iEXT)(GLuint index, GLint x); /* 955 */

+   void (GLAPIENTRYP VertexAttribI1uiEXT)(GLuint index, GLuint x); /* 956 */

+   void (GLAPIENTRYP VertexAttribI2iEXT)(GLuint index, GLint x, GLint y); /* 957 */

+   void (GLAPIENTRYP VertexAttribI2ivEXT)(GLuint index, const GLint * v); /* 958 */

+   void (GLAPIENTRYP VertexAttribI2uiEXT)(GLuint index, GLuint x, GLuint y); /* 959 */

+   void (GLAPIENTRYP VertexAttribI2uivEXT)(GLuint index, const GLuint * v); /* 960 */

+   void (GLAPIENTRYP VertexAttribI3iEXT)(GLuint index, GLint x, GLint y, GLint z); /* 961 */

+   void (GLAPIENTRYP VertexAttribI3ivEXT)(GLuint index, const GLint * v); /* 962 */

+   void (GLAPIENTRYP VertexAttribI3uiEXT)(GLuint index, GLuint x, GLuint y, GLuint z); /* 963 */

+   void (GLAPIENTRYP VertexAttribI3uivEXT)(GLuint index, const GLuint * v); /* 964 */

+   void (GLAPIENTRYP VertexAttribI4iEXT)(GLuint index, GLint x, GLint y, GLint z, GLint w); /* 965 */

+   void (GLAPIENTRYP VertexAttribI4ivEXT)(GLuint index, const GLint * v); /* 966 */

+   void (GLAPIENTRYP VertexAttribI4uiEXT)(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); /* 967 */

+   void (GLAPIENTRYP VertexAttribI4uivEXT)(GLuint index, const GLuint * v); /* 968 */

+   void (GLAPIENTRYP ClearColorIiEXT)(GLint r, GLint g, GLint b, GLint a); /* 969 */

+   void (GLAPIENTRYP ClearColorIuiEXT)(GLuint r, GLuint g, GLuint b, GLuint a); /* 970 */

+   void (GLAPIENTRYP BindBufferOffsetEXT)(GLenum target, GLuint index, GLuint buffer, GLintptr offset); /* 971 */

+   void (GLAPIENTRYP GetObjectParameterivAPPLE)(GLenum objectType, GLuint name, GLenum pname, GLint * value); /* 972 */

+   GLenum (GLAPIENTRYP ObjectPurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option); /* 973 */

+   GLenum (GLAPIENTRYP ObjectUnpurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option); /* 974 */

+   void (GLAPIENTRYP ActiveProgramEXT)(GLuint program); /* 975 */

+   GLuint (GLAPIENTRYP CreateShaderProgramEXT)(GLenum type, const GLchar * string); /* 976 */

+   void (GLAPIENTRYP UseShaderProgramEXT)(GLenum type, GLuint program); /* 977 */

+   void (GLAPIENTRYP TextureBarrierNV)(void); /* 978 */

+   void (GLAPIENTRYP StencilFuncSeparateATI)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); /* 979 */

+   void (GLAPIENTRYP ProgramEnvParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 980 */

+   void (GLAPIENTRYP ProgramLocalParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 981 */

+   void (GLAPIENTRYP EGLImageTargetRenderbufferStorageOES)(GLenum target, GLvoid * writeOffset); /* 982 */

+   void (GLAPIENTRYP EGLImageTargetTexture2DOES)(GLenum target, GLvoid * writeOffset); /* 983 */

+   void (GLAPIENTRYP AlphaFuncx)(GLenum func, GLclampx ref); /* 984 */

+   void (GLAPIENTRYP ClearColorx)(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha); /* 985 */

+   void (GLAPIENTRYP ClearDepthx)(GLclampx depth); /* 986 */

+   void (GLAPIENTRYP Color4x)(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha); /* 987 */

+   void (GLAPIENTRYP DepthRangex)(GLclampx zNear, GLclampx zFar); /* 988 */

+   void (GLAPIENTRYP Fogx)(GLenum pname, GLfixed param); /* 989 */

+   void (GLAPIENTRYP Fogxv)(GLenum pname, const GLfixed * params); /* 990 */

+   void (GLAPIENTRYP Frustumf)(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar); /* 991 */

+   void (GLAPIENTRYP Frustumx)(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar); /* 992 */

+   void (GLAPIENTRYP LightModelx)(GLenum pname, GLfixed param); /* 993 */

+   void (GLAPIENTRYP LightModelxv)(GLenum pname, const GLfixed * params); /* 994 */

+   void (GLAPIENTRYP Lightx)(GLenum light, GLenum pname, GLfixed param); /* 995 */

+   void (GLAPIENTRYP Lightxv)(GLenum light, GLenum pname, const GLfixed * params); /* 996 */

+   void (GLAPIENTRYP LineWidthx)(GLfixed width); /* 997 */

+   void (GLAPIENTRYP LoadMatrixx)(const GLfixed * m); /* 998 */

+   void (GLAPIENTRYP Materialx)(GLenum face, GLenum pname, GLfixed param); /* 999 */

+   void (GLAPIENTRYP Materialxv)(GLenum face, GLenum pname, const GLfixed * params); /* 1000 */

+   void (GLAPIENTRYP MultMatrixx)(const GLfixed * m); /* 1001 */

+   void (GLAPIENTRYP MultiTexCoord4x)(GLenum target, GLfixed s, GLfixed t, GLfixed r, GLfixed q); /* 1002 */

+   void (GLAPIENTRYP Normal3x)(GLfixed nx, GLfixed ny, GLfixed nz); /* 1003 */

+   void (GLAPIENTRYP Orthof)(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar); /* 1004 */

+   void (GLAPIENTRYP Orthox)(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar); /* 1005 */

+   void (GLAPIENTRYP PointSizex)(GLfixed size); /* 1006 */

+   void (GLAPIENTRYP PolygonOffsetx)(GLfixed factor, GLfixed units); /* 1007 */

+   void (GLAPIENTRYP Rotatex)(GLfixed angle, GLfixed x, GLfixed y, GLfixed z); /* 1008 */

+   void (GLAPIENTRYP SampleCoveragex)(GLclampx value, GLboolean invert); /* 1009 */

+   void (GLAPIENTRYP Scalex)(GLfixed x, GLfixed y, GLfixed z); /* 1010 */

+   void (GLAPIENTRYP TexEnvx)(GLenum target, GLenum pname, GLfixed param); /* 1011 */

+   void (GLAPIENTRYP TexEnvxv)(GLenum target, GLenum pname, const GLfixed * params); /* 1012 */

+   void (GLAPIENTRYP TexParameterx)(GLenum target, GLenum pname, GLfixed param); /* 1013 */

+   void (GLAPIENTRYP Translatex)(GLfixed x, GLfixed y, GLfixed z); /* 1014 */

+   void (GLAPIENTRYP ClipPlanef)(GLenum plane, const GLfloat * equation); /* 1015 */

+   void (GLAPIENTRYP ClipPlanex)(GLenum plane, const GLfixed * equation); /* 1016 */

+   void (GLAPIENTRYP GetClipPlanef)(GLenum plane, GLfloat * equation); /* 1017 */

+   void (GLAPIENTRYP GetClipPlanex)(GLenum plane, GLfixed * equation); /* 1018 */

+   void (GLAPIENTRYP GetFixedv)(GLenum pname, GLfixed * params); /* 1019 */

+   void (GLAPIENTRYP GetLightxv)(GLenum light, GLenum pname, GLfixed * params); /* 1020 */

+   void (GLAPIENTRYP GetMaterialxv)(GLenum face, GLenum pname, GLfixed * params); /* 1021 */

+   void (GLAPIENTRYP GetTexEnvxv)(GLenum target, GLenum pname, GLfixed * params); /* 1022 */

+   void (GLAPIENTRYP GetTexParameterxv)(GLenum target, GLenum pname, GLfixed * params); /* 1023 */

+   void (GLAPIENTRYP PointParameterx)(GLenum pname, GLfixed param); /* 1024 */

+   void (GLAPIENTRYP PointParameterxv)(GLenum pname, const GLfixed * params); /* 1025 */

+   void (GLAPIENTRYP TexParameterxv)(GLenum target, GLenum pname, const GLfixed * params); /* 1026 */

+#endif /* !defined HAVE_SHARED_GLAPI */

+};

+

+#endif /* !defined( _GLAPI_TABLE_H_ ) */

diff --git a/xorg-server/glx/glheader.h b/xorg-server/glx/glheader.h
new file mode 100644
index 000000000..cb8d6922a
--- /dev/null
+++ b/xorg-server/glx/glheader.h
@@ -0,0 +1,38 @@
+#ifndef __GLHEADER_H__

+#define __GLHEADER_H__

+

+#define STDC_HEADERS 1

+

+#include <X11/Xwinsock.h>

+#include <X11/Xwindows.h>

+#include <assert.h>

+#define strcasecmp _stricmp

+

+#undef MINSHORT

+#undef MAXSHORT

+

+#define MINSHORT -32768

+#define MAXSHORT 32767

+

+#ifndef PUBLIC

+#define PUBLIC

+#endif

+

+#define GL_GLEXT_PROTOTYPES

+#ifdef __cplusplus

+extern "C" {

+#endif

+

+

+/**

+ * GL_FIXED is defined in glext.h version 64 but these typedefs aren't (yet).

+ */

+typedef int GLfixed;

+typedef int GLclampx;

+

+#ifdef __cplusplus

+}

+#endif

+

+#endif

+

diff --git a/xorg-server/glx/glprocs.h b/xorg-server/glx/glprocs.h
index 87063642c..de5af4dc6 100644
--- a/xorg-server/glx/glprocs.h
+++ b/xorg-server/glx/glprocs.h
@@ -26,6 +26,7 @@
  * SOFTWARE.
  */
 
+
 /* This file is only included by glapi.c and is used for
  * the GetProcAddress() function
  */
@@ -39,15 +40,17 @@ typedef struct {
 } glprocs_table_t;
 
 #if   !defined(NEED_FUNCTION_POINTER) && !defined(GLX_INDIRECT_RENDERING)
-#define NAME_FUNC_OFFSET(n,f1,f2,f3,o) { n , o }
+#  define NAME_FUNC_OFFSET(n,f1,f2,f3,o) { n , o }
 #elif  defined(NEED_FUNCTION_POINTER) && !defined(GLX_INDIRECT_RENDERING)
-#define NAME_FUNC_OFFSET(n,f1,f2,f3,o) { n , (_glapi_proc) f1 , o }
+#  define NAME_FUNC_OFFSET(n,f1,f2,f3,o) { n , (_glapi_proc) f1 , o }
 #elif  defined(NEED_FUNCTION_POINTER) &&  defined(GLX_INDIRECT_RENDERING)
-#define NAME_FUNC_OFFSET(n,f1,f2,f3,o) { n , (_glapi_proc) f2 , o }
+#  define NAME_FUNC_OFFSET(n,f1,f2,f3,o) { n , (_glapi_proc) f2 , o }
 #elif !defined(NEED_FUNCTION_POINTER) &&  defined(GLX_INDIRECT_RENDERING)
-#define NAME_FUNC_OFFSET(n,f1,f2,f3,o) { n , (_glapi_proc) f3 , o }
+#  define NAME_FUNC_OFFSET(n,f1,f2,f3,o) { n , (_glapi_proc) f3 , o }
 #endif
 
+
+
 static const char gl_string_table[] =
     "glNewList\0"
     "glEndList\0"
@@ -423,96 +426,262 @@ static const char gl_string_table[] =
     "glTexImage3D\0"
     "glTexSubImage3D\0"
     "glCopyTexSubImage3D\0"
-    "glActiveTextureARB\0"
-    "glClientActiveTextureARB\0"
-    "glMultiTexCoord1dARB\0"
-    "glMultiTexCoord1dvARB\0"
+    "glActiveTexture\0"
+    "glClientActiveTexture\0"
+    "glMultiTexCoord1d\0"
+    "glMultiTexCoord1dv\0"
     "glMultiTexCoord1fARB\0"
     "glMultiTexCoord1fvARB\0"
-    "glMultiTexCoord1iARB\0"
-    "glMultiTexCoord1ivARB\0"
-    "glMultiTexCoord1sARB\0"
-    "glMultiTexCoord1svARB\0"
-    "glMultiTexCoord2dARB\0"
-    "glMultiTexCoord2dvARB\0"
+    "glMultiTexCoord1i\0"
+    "glMultiTexCoord1iv\0"
+    "glMultiTexCoord1s\0"
+    "glMultiTexCoord1sv\0"
+    "glMultiTexCoord2d\0"
+    "glMultiTexCoord2dv\0"
     "glMultiTexCoord2fARB\0"
     "glMultiTexCoord2fvARB\0"
-    "glMultiTexCoord2iARB\0"
-    "glMultiTexCoord2ivARB\0"
-    "glMultiTexCoord2sARB\0"
-    "glMultiTexCoord2svARB\0"
-    "glMultiTexCoord3dARB\0"
-    "glMultiTexCoord3dvARB\0"
+    "glMultiTexCoord2i\0"
+    "glMultiTexCoord2iv\0"
+    "glMultiTexCoord2s\0"
+    "glMultiTexCoord2sv\0"
+    "glMultiTexCoord3d\0"
+    "glMultiTexCoord3dv\0"
     "glMultiTexCoord3fARB\0"
     "glMultiTexCoord3fvARB\0"
-    "glMultiTexCoord3iARB\0"
-    "glMultiTexCoord3ivARB\0"
-    "glMultiTexCoord3sARB\0"
-    "glMultiTexCoord3svARB\0"
-    "glMultiTexCoord4dARB\0"
-    "glMultiTexCoord4dvARB\0"
+    "glMultiTexCoord3i\0"
+    "glMultiTexCoord3iv\0"
+    "glMultiTexCoord3s\0"
+    "glMultiTexCoord3sv\0"
+    "glMultiTexCoord4d\0"
+    "glMultiTexCoord4dv\0"
     "glMultiTexCoord4fARB\0"
     "glMultiTexCoord4fvARB\0"
-    "glMultiTexCoord4iARB\0"
-    "glMultiTexCoord4ivARB\0"
-    "glMultiTexCoord4sARB\0"
-    "glMultiTexCoord4svARB\0"
+    "glMultiTexCoord4i\0"
+    "glMultiTexCoord4iv\0"
+    "glMultiTexCoord4s\0"
+    "glMultiTexCoord4sv\0"
+    "glCompressedTexImage1D\0"
+    "glCompressedTexImage2D\0"
+    "glCompressedTexImage3D\0"
+    "glCompressedTexSubImage1D\0"
+    "glCompressedTexSubImage2D\0"
+    "glCompressedTexSubImage3D\0"
+    "glGetCompressedTexImage\0"
+    "glLoadTransposeMatrixd\0"
+    "glLoadTransposeMatrixf\0"
+    "glMultTransposeMatrixd\0"
+    "glMultTransposeMatrixf\0"
+    "glSampleCoverage\0"
+    "glBlendFuncSeparate\0"
+    "glFogCoordPointer\0"
+    "glFogCoordd\0"
+    "glFogCoorddv\0"
+    "glMultiDrawArrays\0"
+    "glPointParameterf\0"
+    "glPointParameterfv\0"
+    "glPointParameteri\0"
+    "glPointParameteriv\0"
+    "glSecondaryColor3b\0"
+    "glSecondaryColor3bv\0"
+    "glSecondaryColor3d\0"
+    "glSecondaryColor3dv\0"
+    "glSecondaryColor3i\0"
+    "glSecondaryColor3iv\0"
+    "glSecondaryColor3s\0"
+    "glSecondaryColor3sv\0"
+    "glSecondaryColor3ub\0"
+    "glSecondaryColor3ubv\0"
+    "glSecondaryColor3ui\0"
+    "glSecondaryColor3uiv\0"
+    "glSecondaryColor3us\0"
+    "glSecondaryColor3usv\0"
+    "glSecondaryColorPointer\0"
+    "glWindowPos2d\0"
+    "glWindowPos2dv\0"
+    "glWindowPos2f\0"
+    "glWindowPos2fv\0"
+    "glWindowPos2i\0"
+    "glWindowPos2iv\0"
+    "glWindowPos2s\0"
+    "glWindowPos2sv\0"
+    "glWindowPos3d\0"
+    "glWindowPos3dv\0"
+    "glWindowPos3f\0"
+    "glWindowPos3fv\0"
+    "glWindowPos3i\0"
+    "glWindowPos3iv\0"
+    "glWindowPos3s\0"
+    "glWindowPos3sv\0"
+    "glBeginQuery\0"
+    "glBindBuffer\0"
+    "glBufferData\0"
+    "glBufferSubData\0"
+    "glDeleteBuffers\0"
+    "glDeleteQueries\0"
+    "glEndQuery\0"
+    "glGenBuffers\0"
+    "glGenQueries\0"
+    "glGetBufferParameteriv\0"
+    "glGetBufferPointerv\0"
+    "glGetBufferSubData\0"
+    "glGetQueryObjectiv\0"
+    "glGetQueryObjectuiv\0"
+    "glGetQueryiv\0"
+    "glIsBuffer\0"
+    "glIsQuery\0"
+    "glMapBuffer\0"
+    "glUnmapBuffer\0"
     "glAttachShader\0"
+    "glBindAttribLocation\0"
+    "glBlendEquationSeparate\0"
+    "glCompileShader\0"
     "glCreateProgram\0"
     "glCreateShader\0"
     "glDeleteProgram\0"
     "glDeleteShader\0"
     "glDetachShader\0"
+    "glDisableVertexAttribArray\0"
+    "glDrawBuffers\0"
+    "glEnableVertexAttribArray\0"
+    "glGetActiveAttrib\0"
+    "glGetActiveUniform\0"
     "glGetAttachedShaders\0"
+    "glGetAttribLocation\0"
     "glGetProgramInfoLog\0"
     "glGetProgramiv\0"
     "glGetShaderInfoLog\0"
+    "glGetShaderSource\0"
     "glGetShaderiv\0"
+    "glGetUniformLocation\0"
+    "glGetUniformfv\0"
+    "glGetUniformiv\0"
+    "glGetVertexAttribPointerv\0"
+    "glGetVertexAttribdv\0"
+    "glGetVertexAttribfv\0"
+    "glGetVertexAttribiv\0"
     "glIsProgram\0"
     "glIsShader\0"
+    "glLinkProgram\0"
+    "glShaderSource\0"
     "glStencilFuncSeparate\0"
     "glStencilMaskSeparate\0"
     "glStencilOpSeparate\0"
+    "glUniform1f\0"
+    "glUniform1fv\0"
+    "glUniform1i\0"
+    "glUniform1iv\0"
+    "glUniform2f\0"
+    "glUniform2fv\0"
+    "glUniform2i\0"
+    "glUniform2iv\0"
+    "glUniform3f\0"
+    "glUniform3fv\0"
+    "glUniform3i\0"
+    "glUniform3iv\0"
+    "glUniform4f\0"
+    "glUniform4fv\0"
+    "glUniform4i\0"
+    "glUniform4iv\0"
+    "glUniformMatrix2fv\0"
+    "glUniformMatrix3fv\0"
+    "glUniformMatrix4fv\0"
+    "glUseProgram\0"
+    "glValidateProgram\0"
+    "glVertexAttrib1d\0"
+    "glVertexAttrib1dv\0"
+    "glVertexAttrib1s\0"
+    "glVertexAttrib1sv\0"
+    "glVertexAttrib2d\0"
+    "glVertexAttrib2dv\0"
+    "glVertexAttrib2s\0"
+    "glVertexAttrib2sv\0"
+    "glVertexAttrib3d\0"
+    "glVertexAttrib3dv\0"
+    "glVertexAttrib3s\0"
+    "glVertexAttrib3sv\0"
+    "glVertexAttrib4Nbv\0"
+    "glVertexAttrib4Niv\0"
+    "glVertexAttrib4Nsv\0"
+    "glVertexAttrib4Nub\0"
+    "glVertexAttrib4Nubv\0"
+    "glVertexAttrib4Nuiv\0"
+    "glVertexAttrib4Nusv\0"
+    "glVertexAttrib4bv\0"
+    "glVertexAttrib4d\0"
+    "glVertexAttrib4dv\0"
+    "glVertexAttrib4iv\0"
+    "glVertexAttrib4s\0"
+    "glVertexAttrib4sv\0"
+    "glVertexAttrib4ubv\0"
+    "glVertexAttrib4uiv\0"
+    "glVertexAttrib4usv\0"
+    "glVertexAttribPointer\0"
     "glUniformMatrix2x3fv\0"
     "glUniformMatrix2x4fv\0"
     "glUniformMatrix3x2fv\0"
     "glUniformMatrix3x4fv\0"
     "glUniformMatrix4x2fv\0"
     "glUniformMatrix4x3fv\0"
+    "glBeginConditionalRender\0"
+    "glBeginTransformFeedback\0"
+    "glBindBufferBase\0"
+    "glBindBufferRange\0"
+    "glBindFragDataLocation\0"
     "glClampColor\0"
     "glClearBufferfi\0"
     "glClearBufferfv\0"
     "glClearBufferiv\0"
     "glClearBufferuiv\0"
+    "glColorMaski\0"
+    "glDisablei\0"
+    "glEnablei\0"
+    "glEndConditionalRender\0"
+    "glEndTransformFeedback\0"
+    "glGetBooleani_v\0"
+    "glGetFragDataLocation\0"
+    "glGetIntegeri_v\0"
     "glGetStringi\0"
+    "glGetTexParameterIiv\0"
+    "glGetTexParameterIuiv\0"
+    "glGetTransformFeedbackVarying\0"
+    "glGetUniformuiv\0"
+    "glGetVertexAttribIiv\0"
+    "glGetVertexAttribIuiv\0"
+    "glIsEnabledi\0"
+    "glTexParameterIiv\0"
+    "glTexParameterIuiv\0"
+    "glTransformFeedbackVaryings\0"
+    "glUniform1ui\0"
+    "glUniform1uiv\0"
+    "glUniform2ui\0"
+    "glUniform2uiv\0"
+    "glUniform3ui\0"
+    "glUniform3uiv\0"
+    "glUniform4ui\0"
+    "glUniform4uiv\0"
+    "glVertexAttribI1iv\0"
+    "glVertexAttribI1uiv\0"
+    "glVertexAttribI4bv\0"
+    "glVertexAttribI4sv\0"
+    "glVertexAttribI4ubv\0"
+    "glVertexAttribI4usv\0"
+    "glVertexAttribIPointer\0"
+    "glPrimitiveRestartIndex\0"
     "glTexBuffer\0"
     "glFramebufferTexture\0"
     "glGetBufferParameteri64v\0"
     "glGetInteger64i_v\0"
     "glVertexAttribDivisor\0"
-    "glLoadTransposeMatrixdARB\0"
-    "glLoadTransposeMatrixfARB\0"
-    "glMultTransposeMatrixdARB\0"
-    "glMultTransposeMatrixfARB\0"
-    "glSampleCoverageARB\0"
-    "glCompressedTexImage1DARB\0"
-    "glCompressedTexImage2DARB\0"
-    "glCompressedTexImage3DARB\0"
-    "glCompressedTexSubImage1DARB\0"
-    "glCompressedTexSubImage2DARB\0"
-    "glCompressedTexSubImage3DARB\0"
-    "glGetCompressedTexImageARB\0"
-    "glDisableVertexAttribArrayARB\0"
-    "glEnableVertexAttribArrayARB\0"
+    "glBindProgramARB\0"
+    "glDeleteProgramsARB\0"
+    "glGenProgramsARB\0"
     "glGetProgramEnvParameterdvARB\0"
     "glGetProgramEnvParameterfvARB\0"
     "glGetProgramLocalParameterdvARB\0"
     "glGetProgramLocalParameterfvARB\0"
     "glGetProgramStringARB\0"
     "glGetProgramivARB\0"
-    "glGetVertexAttribdvARB\0"
-    "glGetVertexAttribfvARB\0"
-    "glGetVertexAttribivARB\0"
+    "glIsProgramARB\0"
     "glProgramEnvParameter4dARB\0"
     "glProgramEnvParameter4dvARB\0"
     "glProgramEnvParameter4fARB\0"
@@ -522,118 +691,60 @@ static const char gl_string_table[] =
     "glProgramLocalParameter4fARB\0"
     "glProgramLocalParameter4fvARB\0"
     "glProgramStringARB\0"
-    "glVertexAttrib1dARB\0"
-    "glVertexAttrib1dvARB\0"
     "glVertexAttrib1fARB\0"
     "glVertexAttrib1fvARB\0"
-    "glVertexAttrib1sARB\0"
-    "glVertexAttrib1svARB\0"
-    "glVertexAttrib2dARB\0"
-    "glVertexAttrib2dvARB\0"
     "glVertexAttrib2fARB\0"
     "glVertexAttrib2fvARB\0"
-    "glVertexAttrib2sARB\0"
-    "glVertexAttrib2svARB\0"
-    "glVertexAttrib3dARB\0"
-    "glVertexAttrib3dvARB\0"
     "glVertexAttrib3fARB\0"
     "glVertexAttrib3fvARB\0"
-    "glVertexAttrib3sARB\0"
-    "glVertexAttrib3svARB\0"
-    "glVertexAttrib4NbvARB\0"
-    "glVertexAttrib4NivARB\0"
-    "glVertexAttrib4NsvARB\0"
-    "glVertexAttrib4NubARB\0"
-    "glVertexAttrib4NubvARB\0"
-    "glVertexAttrib4NuivARB\0"
-    "glVertexAttrib4NusvARB\0"
-    "glVertexAttrib4bvARB\0"
-    "glVertexAttrib4dARB\0"
-    "glVertexAttrib4dvARB\0"
     "glVertexAttrib4fARB\0"
     "glVertexAttrib4fvARB\0"
-    "glVertexAttrib4ivARB\0"
-    "glVertexAttrib4sARB\0"
-    "glVertexAttrib4svARB\0"
-    "glVertexAttrib4ubvARB\0"
-    "glVertexAttrib4uivARB\0"
-    "glVertexAttrib4usvARB\0"
-    "glVertexAttribPointerARB\0"
-    "glBindBufferARB\0"
-    "glBufferDataARB\0"
-    "glBufferSubDataARB\0"
-    "glDeleteBuffersARB\0"
-    "glGenBuffersARB\0"
-    "glGetBufferParameterivARB\0"
-    "glGetBufferPointervARB\0"
-    "glGetBufferSubDataARB\0"
-    "glIsBufferARB\0"
-    "glMapBufferARB\0"
-    "glUnmapBufferARB\0"
-    "glBeginQueryARB\0"
-    "glDeleteQueriesARB\0"
-    "glEndQueryARB\0"
-    "glGenQueriesARB\0"
-    "glGetQueryObjectivARB\0"
-    "glGetQueryObjectuivARB\0"
-    "glGetQueryivARB\0"
-    "glIsQueryARB\0"
     "glAttachObjectARB\0"
-    "glCompileShaderARB\0"
     "glCreateProgramObjectARB\0"
     "glCreateShaderObjectARB\0"
     "glDeleteObjectARB\0"
     "glDetachObjectARB\0"
-    "glGetActiveUniformARB\0"
     "glGetAttachedObjectsARB\0"
     "glGetHandleARB\0"
     "glGetInfoLogARB\0"
     "glGetObjectParameterfvARB\0"
     "glGetObjectParameterivARB\0"
-    "glGetShaderSourceARB\0"
-    "glGetUniformLocationARB\0"
-    "glGetUniformfvARB\0"
-    "glGetUniformivARB\0"
-    "glLinkProgramARB\0"
-    "glShaderSourceARB\0"
-    "glUniform1fARB\0"
-    "glUniform1fvARB\0"
-    "glUniform1iARB\0"
-    "glUniform1ivARB\0"
-    "glUniform2fARB\0"
-    "glUniform2fvARB\0"
-    "glUniform2iARB\0"
-    "glUniform2ivARB\0"
-    "glUniform3fARB\0"
-    "glUniform3fvARB\0"
-    "glUniform3iARB\0"
-    "glUniform3ivARB\0"
-    "glUniform4fARB\0"
-    "glUniform4fvARB\0"
-    "glUniform4iARB\0"
-    "glUniform4ivARB\0"
-    "glUniformMatrix2fvARB\0"
-    "glUniformMatrix3fvARB\0"
-    "glUniformMatrix4fvARB\0"
-    "glUseProgramObjectARB\0"
-    "glValidateProgramARB\0"
-    "glBindAttribLocationARB\0"
-    "glGetActiveAttribARB\0"
-    "glGetAttribLocationARB\0"
-    "glDrawBuffersARB\0"
-    "glClampColorARB\0"
     "glDrawArraysInstancedARB\0"
     "glDrawElementsInstancedARB\0"
+    "glBindFramebuffer\0"
+    "glBindRenderbuffer\0"
+    "glBlitFramebuffer\0"
+    "glCheckFramebufferStatus\0"
+    "glDeleteFramebuffers\0"
+    "glDeleteRenderbuffers\0"
+    "glFramebufferRenderbuffer\0"
+    "glFramebufferTexture1D\0"
+    "glFramebufferTexture2D\0"
+    "glFramebufferTexture3D\0"
+    "glFramebufferTextureLayer\0"
+    "glGenFramebuffers\0"
+    "glGenRenderbuffers\0"
+    "glGenerateMipmap\0"
+    "glGetFramebufferAttachmentParameteriv\0"
+    "glGetRenderbufferParameteriv\0"
+    "glIsFramebuffer\0"
+    "glIsRenderbuffer\0"
+    "glRenderbufferStorage\0"
     "glRenderbufferStorageMultisample\0"
-    "glFramebufferTextureARB\0"
     "glFramebufferTextureFaceARB\0"
-    "glProgramParameteriARB\0"
-    "glVertexAttribDivisorARB\0"
     "glFlushMappedBufferRange\0"
     "glMapBufferRange\0"
-    "glTexBufferARB\0"
     "glBindVertexArray\0"
+    "glDeleteVertexArrays\0"
     "glGenVertexArrays\0"
+    "glIsVertexArray\0"
+    "glGetActiveUniformBlockName\0"
+    "glGetActiveUniformBlockiv\0"
+    "glGetActiveUniformName\0"
+    "glGetActiveUniformsiv\0"
+    "glGetUniformBlockIndex\0"
+    "glGetUniformIndices\0"
+    "glUniformBlockBinding\0"
     "glCopyBufferSubData\0"
     "glClientWaitSync\0"
     "glDeleteSync\0"
@@ -646,10 +757,13 @@ static const char gl_string_table[] =
     "glDrawElementsInstancedBaseVertex\0"
     "glDrawRangeElementsBaseVertex\0"
     "glMultiDrawElementsBaseVertex\0"
+    "glProvokingVertex\0"
     "glBlendEquationSeparateiARB\0"
     "glBlendEquationiARB\0"
     "glBlendFuncSeparateiARB\0"
     "glBlendFunciARB\0"
+    "glBindFragDataLocationIndexed\0"
+    "glGetFragDataIndex\0"
     "glBindSampler\0"
     "glDeleteSamplers\0"
     "glGenSamplers\0"
@@ -664,6 +778,9 @@ static const char gl_string_table[] =
     "glSamplerParameterfv\0"
     "glSamplerParameteri\0"
     "glSamplerParameteriv\0"
+    "glGetQueryObjecti64v\0"
+    "glGetQueryObjectui64v\0"
+    "glQueryCounter\0"
     "glColorP3ui\0"
     "glColorP3uiv\0"
     "glColorP4ui\0"
@@ -709,11 +826,22 @@ static const char gl_string_table[] =
     "glIsTransformFeedback\0"
     "glPauseTransformFeedback\0"
     "glResumeTransformFeedback\0"
+    "glBeginQueryIndexed\0"
+    "glDrawTransformFeedbackStream\0"
+    "glEndQueryIndexed\0"
+    "glGetQueryIndexediv\0"
     "glClearDepthf\0"
     "glDepthRangef\0"
     "glGetShaderPrecisionFormat\0"
     "glReleaseShaderCompiler\0"
     "glShaderBinary\0"
+    "glGetProgramBinary\0"
+    "glProgramBinary\0"
+    "glProgramParameteri\0"
+    "glDebugMessageCallbackARB\0"
+    "glDebugMessageControlARB\0"
+    "glDebugMessageInsertARB\0"
+    "glGetDebugMessageLogARB\0"
     "glGetGraphicsResetStatusARB\0"
     "glGetnColorTableARB\0"
     "glGetnCompressedTexImageARB\0"
@@ -734,19 +862,36 @@ static const char gl_string_table[] =
     "glGetnUniformivARB\0"
     "glGetnUniformuivARB\0"
     "glReadnPixelsARB\0"
+    "glDrawArraysInstancedBaseInstance\0"
+    "glDrawElementsInstancedBaseInstance\0"
+    "glDrawElementsInstancedBaseVertexBaseInstance\0"
+    "glDrawTransformFeedbackInstanced\0"
+    "glDrawTransformFeedbackStreamInstanced\0"
+    "glGetInternalformativ\0"
     "glTexStorage1D\0"
     "glTexStorage2D\0"
     "glTexStorage3D\0"
     "glTextureStorage1DEXT\0"
     "glTextureStorage2DEXT\0"
     "glTextureStorage3DEXT\0"
+    "glTexBufferRange\0"
+    "glInvalidateBufferData\0"
+    "glInvalidateBufferSubData\0"
+    "glInvalidateFramebuffer\0"
+    "glInvalidateSubFramebuffer\0"
+    "glInvalidateTexImage\0"
+    "glInvalidateTexSubImage\0"
     "glPolygonOffsetEXT\0"
-    "glGetPixelTexGenParameterfvSGIS\0"
-    "glGetPixelTexGenParameterivSGIS\0"
-    "glPixelTexGenParameterfSGIS\0"
-    "glPixelTexGenParameterfvSGIS\0"
-    "glPixelTexGenParameteriSGIS\0"
-    "glPixelTexGenParameterivSGIS\0"
+    "glDrawTexfOES\0"
+    "glDrawTexfvOES\0"
+    "glDrawTexiOES\0"
+    "glDrawTexivOES\0"
+    "glDrawTexsOES\0"
+    "glDrawTexsvOES\0"
+    "glDrawTexxOES\0"
+    "glDrawTexxvOES\0"
+    "glPointSizePointerOES\0"
+    "glQueryMatrixxOES\0"
     "glSampleMaskSGIS\0"
     "glSamplePatternSGIS\0"
     "glColorPointerEXT\0"
@@ -755,68 +900,14 @@ static const char gl_string_table[] =
     "glNormalPointerEXT\0"
     "glTexCoordPointerEXT\0"
     "glVertexPointerEXT\0"
-    "glPointParameterfEXT\0"
-    "glPointParameterfvEXT\0"
     "glLockArraysEXT\0"
     "glUnlockArraysEXT\0"
-    "glSecondaryColor3bEXT\0"
-    "glSecondaryColor3bvEXT\0"
-    "glSecondaryColor3dEXT\0"
-    "glSecondaryColor3dvEXT\0"
     "glSecondaryColor3fEXT\0"
     "glSecondaryColor3fvEXT\0"
-    "glSecondaryColor3iEXT\0"
-    "glSecondaryColor3ivEXT\0"
-    "glSecondaryColor3sEXT\0"
-    "glSecondaryColor3svEXT\0"
-    "glSecondaryColor3ubEXT\0"
-    "glSecondaryColor3ubvEXT\0"
-    "glSecondaryColor3uiEXT\0"
-    "glSecondaryColor3uivEXT\0"
-    "glSecondaryColor3usEXT\0"
-    "glSecondaryColor3usvEXT\0"
-    "glSecondaryColorPointerEXT\0"
-    "glMultiDrawArraysEXT\0"
     "glMultiDrawElementsEXT\0"
-    "glFogCoordPointerEXT\0"
-    "glFogCoorddEXT\0"
-    "glFogCoorddvEXT\0"
     "glFogCoordfEXT\0"
     "glFogCoordfvEXT\0"
-    "glPixelTexGenSGIX\0"
-    "glBlendFuncSeparateEXT\0"
-    "glFlushVertexArrayRangeNV\0"
-    "glVertexArrayRangeNV\0"
-    "glCombinerInputNV\0"
-    "glCombinerOutputNV\0"
-    "glCombinerParameterfNV\0"
-    "glCombinerParameterfvNV\0"
-    "glCombinerParameteriNV\0"
-    "glCombinerParameterivNV\0"
-    "glFinalCombinerInputNV\0"
-    "glGetCombinerInputParameterfvNV\0"
-    "glGetCombinerInputParameterivNV\0"
-    "glGetCombinerOutputParameterfvNV\0"
-    "glGetCombinerOutputParameterivNV\0"
-    "glGetFinalCombinerInputParameterfvNV\0"
-    "glGetFinalCombinerInputParameterivNV\0"
     "glResizeBuffersMESA\0"
-    "glWindowPos2dMESA\0"
-    "glWindowPos2dvMESA\0"
-    "glWindowPos2fMESA\0"
-    "glWindowPos2fvMESA\0"
-    "glWindowPos2iMESA\0"
-    "glWindowPos2ivMESA\0"
-    "glWindowPos2sMESA\0"
-    "glWindowPos2svMESA\0"
-    "glWindowPos3dMESA\0"
-    "glWindowPos3dvMESA\0"
-    "glWindowPos3fMESA\0"
-    "glWindowPos3fvMESA\0"
-    "glWindowPos3iMESA\0"
-    "glWindowPos3ivMESA\0"
-    "glWindowPos3sMESA\0"
-    "glWindowPos3svMESA\0"
     "glWindowPos4dMESA\0"
     "glWindowPos4dvMESA\0"
     "glWindowPos4fMESA\0"
@@ -827,28 +918,16 @@ static const char gl_string_table[] =
     "glWindowPos4svMESA\0"
     "glMultiModeDrawArraysIBM\0"
     "glMultiModeDrawElementsIBM\0"
-    "glDeleteFencesNV\0"
-    "glFinishFenceNV\0"
-    "glGenFencesNV\0"
-    "glGetFenceivNV\0"
-    "glIsFenceNV\0"
-    "glSetFenceNV\0"
-    "glTestFenceNV\0"
     "glAreProgramsResidentNV\0"
-    "glBindProgramNV\0"
-    "glDeleteProgramsNV\0"
     "glExecuteProgramNV\0"
-    "glGenProgramsNV\0"
     "glGetProgramParameterdvNV\0"
     "glGetProgramParameterfvNV\0"
     "glGetProgramStringNV\0"
     "glGetProgramivNV\0"
     "glGetTrackMatrixivNV\0"
-    "glGetVertexAttribPointervNV\0"
     "glGetVertexAttribdvNV\0"
     "glGetVertexAttribfvNV\0"
     "glGetVertexAttribivNV\0"
-    "glIsProgramNV\0"
     "glLoadProgramNV\0"
     "glProgramParameters4dvNV\0"
     "glProgramParameters4fvNV\0"
@@ -912,60 +991,24 @@ static const char gl_string_table[] =
     "glPassTexCoordATI\0"
     "glSampleMapATI\0"
     "glSetFragmentShaderConstantATI\0"
-    "glPointParameteriNV\0"
-    "glPointParameterivNV\0"
     "glActiveStencilFaceEXT\0"
     "glBindVertexArrayAPPLE\0"
-    "glDeleteVertexArraysAPPLE\0"
     "glGenVertexArraysAPPLE\0"
-    "glIsVertexArrayAPPLE\0"
     "glGetProgramNamedParameterdvNV\0"
     "glGetProgramNamedParameterfvNV\0"
     "glProgramNamedParameter4dNV\0"
     "glProgramNamedParameter4dvNV\0"
     "glProgramNamedParameter4fNV\0"
     "glProgramNamedParameter4fvNV\0"
-    "glPrimitiveRestartIndexNV\0"
     "glPrimitiveRestartNV\0"
+    "glGetTexGenxvOES\0"
+    "glTexGenxOES\0"
+    "glTexGenxvOES\0"
     "glDepthBoundsEXT\0"
-    "glBlendEquationSeparateEXT\0"
-    "glBindFramebufferEXT\0"
-    "glBindRenderbufferEXT\0"
-    "glCheckFramebufferStatusEXT\0"
-    "glDeleteFramebuffersEXT\0"
-    "glDeleteRenderbuffersEXT\0"
-    "glFramebufferRenderbufferEXT\0"
-    "glFramebufferTexture1DEXT\0"
-    "glFramebufferTexture2DEXT\0"
-    "glFramebufferTexture3DEXT\0"
-    "glGenFramebuffersEXT\0"
-    "glGenRenderbuffersEXT\0"
-    "glGenerateMipmapEXT\0"
-    "glGetFramebufferAttachmentParameterivEXT\0"
-    "glGetRenderbufferParameterivEXT\0"
-    "glIsFramebufferEXT\0"
-    "glIsRenderbufferEXT\0"
-    "glRenderbufferStorageEXT\0"
-    "glBlitFramebufferEXT\0"
     "glBufferParameteriAPPLE\0"
     "glFlushMappedBufferRangeAPPLE\0"
-    "glBindFragDataLocationEXT\0"
-    "glGetFragDataLocationEXT\0"
-    "glGetUniformuivEXT\0"
-    "glGetVertexAttribIivEXT\0"
-    "glGetVertexAttribIuivEXT\0"
-    "glUniform1uiEXT\0"
-    "glUniform1uivEXT\0"
-    "glUniform2uiEXT\0"
-    "glUniform2uivEXT\0"
-    "glUniform3uiEXT\0"
-    "glUniform3uivEXT\0"
-    "glUniform4uiEXT\0"
-    "glUniform4uivEXT\0"
     "glVertexAttribI1iEXT\0"
-    "glVertexAttribI1ivEXT\0"
     "glVertexAttribI1uiEXT\0"
-    "glVertexAttribI1uivEXT\0"
     "glVertexAttribI2iEXT\0"
     "glVertexAttribI2ivEXT\0"
     "glVertexAttribI2uiEXT\0"
@@ -974,40 +1017,13 @@ static const char gl_string_table[] =
     "glVertexAttribI3ivEXT\0"
     "glVertexAttribI3uiEXT\0"
     "glVertexAttribI3uivEXT\0"
-    "glVertexAttribI4bvEXT\0"
     "glVertexAttribI4iEXT\0"
     "glVertexAttribI4ivEXT\0"
-    "glVertexAttribI4svEXT\0"
-    "glVertexAttribI4ubvEXT\0"
     "glVertexAttribI4uiEXT\0"
     "glVertexAttribI4uivEXT\0"
-    "glVertexAttribI4usvEXT\0"
-    "glVertexAttribIPointerEXT\0"
-    "glFramebufferTextureLayerEXT\0"
-    "glColorMaskIndexedEXT\0"
-    "glDisableIndexedEXT\0"
-    "glEnableIndexedEXT\0"
-    "glGetBooleanIndexedvEXT\0"
-    "glGetIntegerIndexedvEXT\0"
-    "glIsEnabledIndexedEXT\0"
     "glClearColorIiEXT\0"
     "glClearColorIuiEXT\0"
-    "glGetTexParameterIivEXT\0"
-    "glGetTexParameterIuivEXT\0"
-    "glTexParameterIivEXT\0"
-    "glTexParameterIuivEXT\0"
-    "glBeginConditionalRenderNV\0"
-    "glEndConditionalRenderNV\0"
-    "glBeginTransformFeedbackEXT\0"
-    "glBindBufferBaseEXT\0"
     "glBindBufferOffsetEXT\0"
-    "glBindBufferRangeEXT\0"
-    "glEndTransformFeedbackEXT\0"
-    "glGetTransformFeedbackVaryingEXT\0"
-    "glTransformFeedbackVaryingsEXT\0"
-    "glProvokingVertexEXT\0"
-    "glGetTexParameterPointervAPPLE\0"
-    "glTextureRangeAPPLE\0"
     "glGetObjectParameterivAPPLE\0"
     "glObjectPurgeableAPPLE\0"
     "glObjectUnpurgeableAPPLE\0"
@@ -1018,10 +1034,58 @@ static const char gl_string_table[] =
     "glStencilFuncSeparateATI\0"
     "glProgramEnvParameters4fvEXT\0"
     "glProgramLocalParameters4fvEXT\0"
-    "glGetQueryObjecti64vEXT\0"
-    "glGetQueryObjectui64vEXT\0"
     "glEGLImageTargetRenderbufferStorageOES\0"
     "glEGLImageTargetTexture2DOES\0"
+    "glAlphaFuncx\0"
+    "glClearColorx\0"
+    "glClearDepthx\0"
+    "glColor4x\0"
+    "glDepthRangex\0"
+    "glFogx\0"
+    "glFogxv\0"
+    "glFrustumf\0"
+    "glFrustumx\0"
+    "glLightModelx\0"
+    "glLightModelxv\0"
+    "glLightx\0"
+    "glLightxv\0"
+    "glLineWidthx\0"
+    "glLoadMatrixx\0"
+    "glMaterialx\0"
+    "glMaterialxv\0"
+    "glMultMatrixx\0"
+    "glMultiTexCoord4x\0"
+    "glNormal3x\0"
+    "glOrthof\0"
+    "glOrthox\0"
+    "glPointSizex\0"
+    "glPolygonOffsetx\0"
+    "glRotatex\0"
+    "glSampleCoveragex\0"
+    "glScalex\0"
+    "glTexEnvx\0"
+    "glTexEnvxv\0"
+    "glTexParameterx\0"
+    "glTranslatex\0"
+    "glClipPlanef\0"
+    "glClipPlanex\0"
+    "glGetClipPlanef\0"
+    "glGetClipPlanex\0"
+    "glGetFixedv\0"
+    "glGetLightxv\0"
+    "glGetMaterialxv\0"
+    "glGetTexEnvxv\0"
+    "glGetTexParameterxv\0"
+    "glPointParameterx\0"
+    "glPointParameterxv\0"
+    "glTexParameterxv\0"
+    "glTexGenfOES\0"
+    "glTexGenfvOES\0"
+    "glTexGeniOES\0"
+    "glTexGenivOES\0"
+    "glReadBufferNV\0"
+    "glGetTexGenfvOES\0"
+    "glGetTexGenivOES\0"
     "glArrayElementEXT\0"
     "glBindTextureEXT\0"
     "glDrawArraysEXT\0"
@@ -1039,6 +1103,7 @@ static const char gl_string_table[] =
     "glTexSubImage2DEXT\0"
     "glBlendColorEXT\0"
     "glBlendEquationEXT\0"
+    "glBlendEquationOES\0"
     "glDrawRangeElementsEXT\0"
     "glColorTableSGI\0"
     "glColorTableEXT\0"
@@ -1077,278 +1142,347 @@ static const char gl_string_table[] =
     "glResetHistogramEXT\0"
     "glResetMinmaxEXT\0"
     "glTexImage3DEXT\0"
+    "glTexImage3DOES\0"
     "glTexSubImage3DEXT\0"
+    "glTexSubImage3DOES\0"
     "glCopyTexSubImage3DEXT\0"
-    "glActiveTexture\0"
-    "glClientActiveTexture\0"
-    "glMultiTexCoord1d\0"
-    "glMultiTexCoord1dv\0"
+    "glCopyTexSubImage3DOES\0"
+    "glActiveTextureARB\0"
+    "glClientActiveTextureARB\0"
+    "glMultiTexCoord1dARB\0"
+    "glMultiTexCoord1dvARB\0"
     "glMultiTexCoord1f\0"
     "glMultiTexCoord1fv\0"
-    "glMultiTexCoord1i\0"
-    "glMultiTexCoord1iv\0"
-    "glMultiTexCoord1s\0"
-    "glMultiTexCoord1sv\0"
-    "glMultiTexCoord2d\0"
-    "glMultiTexCoord2dv\0"
+    "glMultiTexCoord1iARB\0"
+    "glMultiTexCoord1ivARB\0"
+    "glMultiTexCoord1sARB\0"
+    "glMultiTexCoord1svARB\0"
+    "glMultiTexCoord2dARB\0"
+    "glMultiTexCoord2dvARB\0"
     "glMultiTexCoord2f\0"
     "glMultiTexCoord2fv\0"
-    "glMultiTexCoord2i\0"
-    "glMultiTexCoord2iv\0"
-    "glMultiTexCoord2s\0"
-    "glMultiTexCoord2sv\0"
-    "glMultiTexCoord3d\0"
-    "glMultiTexCoord3dv\0"
+    "glMultiTexCoord2iARB\0"
+    "glMultiTexCoord2ivARB\0"
+    "glMultiTexCoord2sARB\0"
+    "glMultiTexCoord2svARB\0"
+    "glMultiTexCoord3dARB\0"
+    "glMultiTexCoord3dvARB\0"
     "glMultiTexCoord3f\0"
     "glMultiTexCoord3fv\0"
-    "glMultiTexCoord3i\0"
-    "glMultiTexCoord3iv\0"
-    "glMultiTexCoord3s\0"
-    "glMultiTexCoord3sv\0"
-    "glMultiTexCoord4d\0"
-    "glMultiTexCoord4dv\0"
+    "glMultiTexCoord3iARB\0"
+    "glMultiTexCoord3ivARB\0"
+    "glMultiTexCoord3sARB\0"
+    "glMultiTexCoord3svARB\0"
+    "glMultiTexCoord4dARB\0"
+    "glMultiTexCoord4dvARB\0"
     "glMultiTexCoord4f\0"
     "glMultiTexCoord4fv\0"
-    "glMultiTexCoord4i\0"
-    "glMultiTexCoord4iv\0"
-    "glMultiTexCoord4s\0"
-    "glMultiTexCoord4sv\0"
+    "glMultiTexCoord4iARB\0"
+    "glMultiTexCoord4ivARB\0"
+    "glMultiTexCoord4sARB\0"
+    "glMultiTexCoord4svARB\0"
+    "glCompressedTexImage1DARB\0"
+    "glCompressedTexImage2DARB\0"
+    "glCompressedTexImage3DARB\0"
+    "glCompressedTexImage3DOES\0"
+    "glCompressedTexSubImage1DARB\0"
+    "glCompressedTexSubImage2DARB\0"
+    "glCompressedTexSubImage3DARB\0"
+    "glCompressedTexSubImage3DOES\0"
+    "glGetCompressedTexImageARB\0"
+    "glLoadTransposeMatrixdARB\0"
+    "glLoadTransposeMatrixfARB\0"
+    "glMultTransposeMatrixdARB\0"
+    "glMultTransposeMatrixfARB\0"
+    "glSampleCoverageARB\0"
+    "glBlendFuncSeparateEXT\0"
+    "glBlendFuncSeparateINGR\0"
+    "glBlendFuncSeparateOES\0"
+    "glFogCoordPointerEXT\0"
+    "glFogCoorddEXT\0"
+    "glFogCoorddvEXT\0"
+    "glMultiDrawArraysEXT\0"
+    "glPointParameterfARB\0"
+    "glPointParameterfEXT\0"
+    "glPointParameterfSGIS\0"
+    "glPointParameterfvARB\0"
+    "glPointParameterfvEXT\0"
+    "glPointParameterfvSGIS\0"
+    "glPointParameteriNV\0"
+    "glPointParameterivNV\0"
+    "glSecondaryColor3bEXT\0"
+    "glSecondaryColor3bvEXT\0"
+    "glSecondaryColor3dEXT\0"
+    "glSecondaryColor3dvEXT\0"
+    "glSecondaryColor3iEXT\0"
+    "glSecondaryColor3ivEXT\0"
+    "glSecondaryColor3sEXT\0"
+    "glSecondaryColor3svEXT\0"
+    "glSecondaryColor3ubEXT\0"
+    "glSecondaryColor3ubvEXT\0"
+    "glSecondaryColor3uiEXT\0"
+    "glSecondaryColor3uivEXT\0"
+    "glSecondaryColor3usEXT\0"
+    "glSecondaryColor3usvEXT\0"
+    "glSecondaryColorPointerEXT\0"
+    "glWindowPos2dARB\0"
+    "glWindowPos2dMESA\0"
+    "glWindowPos2dvARB\0"
+    "glWindowPos2dvMESA\0"
+    "glWindowPos2fARB\0"
+    "glWindowPos2fMESA\0"
+    "glWindowPos2fvARB\0"
+    "glWindowPos2fvMESA\0"
+    "glWindowPos2iARB\0"
+    "glWindowPos2iMESA\0"
+    "glWindowPos2ivARB\0"
+    "glWindowPos2ivMESA\0"
+    "glWindowPos2sARB\0"
+    "glWindowPos2sMESA\0"
+    "glWindowPos2svARB\0"
+    "glWindowPos2svMESA\0"
+    "glWindowPos3dARB\0"
+    "glWindowPos3dMESA\0"
+    "glWindowPos3dvARB\0"
+    "glWindowPos3dvMESA\0"
+    "glWindowPos3fARB\0"
+    "glWindowPos3fMESA\0"
+    "glWindowPos3fvARB\0"
+    "glWindowPos3fvMESA\0"
+    "glWindowPos3iARB\0"
+    "glWindowPos3iMESA\0"
+    "glWindowPos3ivARB\0"
+    "glWindowPos3ivMESA\0"
+    "glWindowPos3sARB\0"
+    "glWindowPos3sMESA\0"
+    "glWindowPos3svARB\0"
+    "glWindowPos3svMESA\0"
+    "glBeginQueryARB\0"
+    "glBindBufferARB\0"
+    "glBufferDataARB\0"
+    "glBufferSubDataARB\0"
+    "glDeleteBuffersARB\0"
+    "glDeleteQueriesARB\0"
+    "glEndQueryARB\0"
+    "glGenBuffersARB\0"
+    "glGenQueriesARB\0"
+    "glGetBufferParameterivARB\0"
+    "glGetBufferPointervARB\0"
+    "glGetBufferPointervOES\0"
+    "glGetBufferSubDataARB\0"
+    "glGetQueryObjectivARB\0"
+    "glGetQueryObjectuivARB\0"
+    "glGetQueryivARB\0"
+    "glIsBufferARB\0"
+    "glIsQueryARB\0"
+    "glMapBufferARB\0"
+    "glMapBufferOES\0"
+    "glUnmapBufferARB\0"
+    "glUnmapBufferOES\0"
+    "glBindAttribLocationARB\0"
+    "glBlendEquationSeparateEXT\0"
+    "glBlendEquationSeparateATI\0"
+    "glBlendEquationSeparateOES\0"
+    "glCompileShaderARB\0"
+    "glDisableVertexAttribArrayARB\0"
+    "glDrawBuffersARB\0"
+    "glDrawBuffersATI\0"
+    "glDrawBuffersNV\0"
+    "glEnableVertexAttribArrayARB\0"
+    "glGetActiveAttribARB\0"
+    "glGetActiveUniformARB\0"
+    "glGetAttribLocationARB\0"
+    "glGetShaderSourceARB\0"
+    "glGetUniformLocationARB\0"
+    "glGetUniformfvARB\0"
+    "glGetUniformivARB\0"
+    "glGetVertexAttribPointervARB\0"
+    "glGetVertexAttribPointervNV\0"
+    "glGetVertexAttribdvARB\0"
+    "glGetVertexAttribfvARB\0"
+    "glGetVertexAttribivARB\0"
+    "glLinkProgramARB\0"
+    "glShaderSourceARB\0"
     "glStencilOpSeparateATI\0"
-    "glLoadTransposeMatrixd\0"
-    "glLoadTransposeMatrixf\0"
-    "glMultTransposeMatrixd\0"
-    "glMultTransposeMatrixf\0"
-    "glSampleCoverage\0"
-    "glCompressedTexImage1D\0"
-    "glCompressedTexImage2D\0"
-    "glCompressedTexImage3D\0"
-    "glCompressedTexSubImage1D\0"
-    "glCompressedTexSubImage2D\0"
-    "glCompressedTexSubImage3D\0"
-    "glGetCompressedTexImage\0"
-    "glDisableVertexAttribArray\0"
-    "glEnableVertexAttribArray\0"
-    "glGetVertexAttribdv\0"
-    "glGetVertexAttribfv\0"
-    "glGetVertexAttribiv\0"
+    "glUniform1fARB\0"
+    "glUniform1fvARB\0"
+    "glUniform1iARB\0"
+    "glUniform1ivARB\0"
+    "glUniform2fARB\0"
+    "glUniform2fvARB\0"
+    "glUniform2iARB\0"
+    "glUniform2ivARB\0"
+    "glUniform3fARB\0"
+    "glUniform3fvARB\0"
+    "glUniform3iARB\0"
+    "glUniform3ivARB\0"
+    "glUniform4fARB\0"
+    "glUniform4fvARB\0"
+    "glUniform4iARB\0"
+    "glUniform4ivARB\0"
+    "glUniformMatrix2fvARB\0"
+    "glUniformMatrix3fvARB\0"
+    "glUniformMatrix4fvARB\0"
+    "glUseProgramObjectARB\0"
+    "glValidateProgramARB\0"
+    "glVertexAttrib1dARB\0"
+    "glVertexAttrib1dvARB\0"
+    "glVertexAttrib1sARB\0"
+    "glVertexAttrib1svARB\0"
+    "glVertexAttrib2dARB\0"
+    "glVertexAttrib2dvARB\0"
+    "glVertexAttrib2sARB\0"
+    "glVertexAttrib2svARB\0"
+    "glVertexAttrib3dARB\0"
+    "glVertexAttrib3dvARB\0"
+    "glVertexAttrib3sARB\0"
+    "glVertexAttrib3svARB\0"
+    "glVertexAttrib4NbvARB\0"
+    "glVertexAttrib4NivARB\0"
+    "glVertexAttrib4NsvARB\0"
+    "glVertexAttrib4NubARB\0"
+    "glVertexAttrib4NubvARB\0"
+    "glVertexAttrib4NuivARB\0"
+    "glVertexAttrib4NusvARB\0"
+    "glVertexAttrib4bvARB\0"
+    "glVertexAttrib4dARB\0"
+    "glVertexAttrib4dvARB\0"
+    "glVertexAttrib4ivARB\0"
+    "glVertexAttrib4sARB\0"
+    "glVertexAttrib4svARB\0"
+    "glVertexAttrib4ubvARB\0"
+    "glVertexAttrib4uivARB\0"
+    "glVertexAttrib4usvARB\0"
+    "glVertexAttribPointerARB\0"
+    "glBeginConditionalRenderNV\0"
+    "glBeginTransformFeedbackEXT\0"
+    "glBindBufferBaseEXT\0"
+    "glBindBufferRangeEXT\0"
+    "glBindFragDataLocationEXT\0"
+    "glClampColorARB\0"
+    "glColorMaskIndexedEXT\0"
+    "glDisableIndexedEXT\0"
+    "glEnableIndexedEXT\0"
+    "glEndConditionalRenderNV\0"
+    "glEndTransformFeedbackEXT\0"
+    "glGetBooleanIndexedvEXT\0"
+    "glGetFragDataLocationEXT\0"
+    "glGetIntegerIndexedvEXT\0"
+    "glGetTexParameterIivEXT\0"
+    "glGetTexParameterIuivEXT\0"
+    "glGetTransformFeedbackVaryingEXT\0"
+    "glGetUniformuivEXT\0"
+    "glGetVertexAttribIivEXT\0"
+    "glGetVertexAttribIuivEXT\0"
+    "glIsEnabledIndexedEXT\0"
+    "glTexParameterIivEXT\0"
+    "glTexParameterIuivEXT\0"
+    "glTransformFeedbackVaryingsEXT\0"
+    "glUniform1uiEXT\0"
+    "glUniform1uivEXT\0"
+    "glUniform2uiEXT\0"
+    "glUniform2uivEXT\0"
+    "glUniform3uiEXT\0"
+    "glUniform3uivEXT\0"
+    "glUniform4uiEXT\0"
+    "glUniform4uivEXT\0"
+    "glVertexAttribI1ivEXT\0"
+    "glVertexAttribI1uivEXT\0"
+    "glVertexAttribI4bvEXT\0"
+    "glVertexAttribI4svEXT\0"
+    "glVertexAttribI4ubvEXT\0"
+    "glVertexAttribI4usvEXT\0"
+    "glVertexAttribIPointerEXT\0"
+    "glPrimitiveRestartIndexNV\0"
+    "glTexBufferARB\0"
+    "glFramebufferTextureARB\0"
+    "glVertexAttribDivisorARB\0"
+    "glBindProgramNV\0"
+    "glDeleteProgramsNV\0"
+    "glGenProgramsNV\0"
+    "glIsProgramNV\0"
     "glProgramParameter4dNV\0"
     "glProgramParameter4dvNV\0"
     "glProgramParameter4fNV\0"
     "glProgramParameter4fvNV\0"
-    "glVertexAttrib1d\0"
-    "glVertexAttrib1dv\0"
     "glVertexAttrib1f\0"
     "glVertexAttrib1fv\0"
-    "glVertexAttrib1s\0"
-    "glVertexAttrib1sv\0"
-    "glVertexAttrib2d\0"
-    "glVertexAttrib2dv\0"
     "glVertexAttrib2f\0"
     "glVertexAttrib2fv\0"
-    "glVertexAttrib2s\0"
-    "glVertexAttrib2sv\0"
-    "glVertexAttrib3d\0"
-    "glVertexAttrib3dv\0"
     "glVertexAttrib3f\0"
     "glVertexAttrib3fv\0"
-    "glVertexAttrib3s\0"
-    "glVertexAttrib3sv\0"
-    "glVertexAttrib4Nbv\0"
-    "glVertexAttrib4Niv\0"
-    "glVertexAttrib4Nsv\0"
-    "glVertexAttrib4Nub\0"
-    "glVertexAttrib4Nubv\0"
-    "glVertexAttrib4Nuiv\0"
-    "glVertexAttrib4Nusv\0"
-    "glVertexAttrib4bv\0"
-    "glVertexAttrib4d\0"
-    "glVertexAttrib4dv\0"
     "glVertexAttrib4f\0"
     "glVertexAttrib4fv\0"
-    "glVertexAttrib4iv\0"
-    "glVertexAttrib4s\0"
-    "glVertexAttrib4sv\0"
-    "glVertexAttrib4ubv\0"
-    "glVertexAttrib4uiv\0"
-    "glVertexAttrib4usv\0"
-    "glVertexAttribPointer\0"
-    "glBindBuffer\0"
-    "glBufferData\0"
-    "glBufferSubData\0"
-    "glDeleteBuffers\0"
-    "glGenBuffers\0"
-    "glGetBufferParameteriv\0"
-    "glGetBufferPointerv\0"
-    "glGetBufferSubData\0"
-    "glIsBuffer\0"
-    "glMapBuffer\0"
-    "glUnmapBuffer\0"
-    "glBeginQuery\0"
-    "glDeleteQueries\0"
-    "glEndQuery\0"
-    "glGenQueries\0"
-    "glGetQueryObjectiv\0"
-    "glGetQueryObjectuiv\0"
-    "glGetQueryiv\0"
-    "glIsQuery\0"
-    "glCompileShader\0"
-    "glGetActiveUniform\0"
-    "glGetShaderSource\0"
-    "glGetUniformLocation\0"
-    "glGetUniformfv\0"
-    "glGetUniformiv\0"
-    "glLinkProgram\0"
-    "glShaderSource\0"
-    "glUniform1f\0"
-    "glUniform1fv\0"
-    "glUniform1i\0"
-    "glUniform1iv\0"
-    "glUniform2f\0"
-    "glUniform2fv\0"
-    "glUniform2i\0"
-    "glUniform2iv\0"
-    "glUniform3f\0"
-    "glUniform3fv\0"
-    "glUniform3i\0"
-    "glUniform3iv\0"
-    "glUniform4f\0"
-    "glUniform4fv\0"
-    "glUniform4i\0"
-    "glUniform4iv\0"
-    "glUniformMatrix2fv\0"
-    "glUniformMatrix3fv\0"
-    "glUniformMatrix4fv\0"
-    "glUseProgram\0"
-    "glValidateProgram\0"
-    "glBindAttribLocation\0"
-    "glGetActiveAttrib\0"
-    "glGetAttribLocation\0"
-    "glDrawBuffers\0"
-    "glDrawBuffersATI\0"
-    "glDrawBuffersNV\0"
     "glDrawArraysInstancedEXT\0"
     "glDrawArraysInstanced\0"
     "glDrawElementsInstancedEXT\0"
     "glDrawElementsInstanced\0"
+    "glBindFramebufferEXT\0"
+    "glBindFramebufferOES\0"
+    "glBindRenderbufferEXT\0"
+    "glBindRenderbufferOES\0"
+    "glBlitFramebufferEXT\0"
+    "glCheckFramebufferStatusEXT\0"
+    "glCheckFramebufferStatusOES\0"
+    "glDeleteFramebuffersEXT\0"
+    "glDeleteFramebuffersOES\0"
+    "glDeleteRenderbuffersEXT\0"
+    "glDeleteRenderbuffersOES\0"
+    "glFramebufferRenderbufferEXT\0"
+    "glFramebufferRenderbufferOES\0"
+    "glFramebufferTexture1DEXT\0"
+    "glFramebufferTexture2DEXT\0"
+    "glFramebufferTexture2DOES\0"
+    "glFramebufferTexture3DEXT\0"
+    "glFramebufferTexture3DOES\0"
+    "glFramebufferTextureLayerARB\0"
+    "glFramebufferTextureLayerEXT\0"
+    "glGenFramebuffersEXT\0"
+    "glGenFramebuffersOES\0"
+    "glGenRenderbuffersEXT\0"
+    "glGenRenderbuffersOES\0"
+    "glGenerateMipmapEXT\0"
+    "glGenerateMipmapOES\0"
+    "glGetFramebufferAttachmentParameterivEXT\0"
+    "glGetFramebufferAttachmentParameterivOES\0"
+    "glGetRenderbufferParameterivEXT\0"
+    "glGetRenderbufferParameterivOES\0"
+    "glIsFramebufferEXT\0"
+    "glIsFramebufferOES\0"
+    "glIsRenderbufferEXT\0"
+    "glIsRenderbufferOES\0"
+    "glRenderbufferStorageEXT\0"
+    "glRenderbufferStorageOES\0"
     "glRenderbufferStorageMultisampleEXT\0"
+    "glFlushMappedBufferRangeEXT\0"
+    "glMapBufferRangeEXT\0"
+    "glBindVertexArrayOES\0"
+    "glDeleteVertexArraysAPPLE\0"
+    "glDeleteVertexArraysOES\0"
+    "glGenVertexArraysOES\0"
+    "glIsVertexArrayAPPLE\0"
+    "glIsVertexArrayOES\0"
+    "glProvokingVertexEXT\0"
     "glBlendEquationSeparateIndexedAMD\0"
     "glBlendEquationIndexedAMD\0"
     "glBlendFuncSeparateIndexedAMD\0"
     "glBlendFuncIndexedAMD\0"
+    "glGetQueryObjecti64vEXT\0"
+    "glGetQueryObjectui64vEXT\0"
+    "glClearDepthfOES\0"
+    "glDepthRangefOES\0"
+    "glGetProgramBinaryOES\0"
+    "glProgramBinaryOES\0"
+    "glProgramParameteriARB\0"
     "glSampleMaskEXT\0"
     "glSamplePatternEXT\0"
-    "glPointParameterf\0"
-    "glPointParameterfARB\0"
-    "glPointParameterfSGIS\0"
-    "glPointParameterfv\0"
-    "glPointParameterfvARB\0"
-    "glPointParameterfvSGIS\0"
-    "glSecondaryColor3b\0"
-    "glSecondaryColor3bv\0"
-    "glSecondaryColor3d\0"
-    "glSecondaryColor3dv\0"
     "glSecondaryColor3f\0"
     "glSecondaryColor3fv\0"
-    "glSecondaryColor3i\0"
-    "glSecondaryColor3iv\0"
-    "glSecondaryColor3s\0"
-    "glSecondaryColor3sv\0"
-    "glSecondaryColor3ub\0"
-    "glSecondaryColor3ubv\0"
-    "glSecondaryColor3ui\0"
-    "glSecondaryColor3uiv\0"
-    "glSecondaryColor3us\0"
-    "glSecondaryColor3usv\0"
-    "glSecondaryColorPointer\0"
-    "glMultiDrawArrays\0"
     "glMultiDrawElements\0"
-    "glFogCoordPointer\0"
-    "glFogCoordd\0"
-    "glFogCoorddv\0"
     "glFogCoordf\0"
     "glFogCoordfv\0"
-    "glBlendFuncSeparate\0"
-    "glBlendFuncSeparateINGR\0"
-    "glWindowPos2d\0"
-    "glWindowPos2dARB\0"
-    "glWindowPos2dv\0"
-    "glWindowPos2dvARB\0"
-    "glWindowPos2f\0"
-    "glWindowPos2fARB\0"
-    "glWindowPos2fv\0"
-    "glWindowPos2fvARB\0"
-    "glWindowPos2i\0"
-    "glWindowPos2iARB\0"
-    "glWindowPos2iv\0"
-    "glWindowPos2ivARB\0"
-    "glWindowPos2s\0"
-    "glWindowPos2sARB\0"
-    "glWindowPos2sv\0"
-    "glWindowPos2svARB\0"
-    "glWindowPos3d\0"
-    "glWindowPos3dARB\0"
-    "glWindowPos3dv\0"
-    "glWindowPos3dvARB\0"
-    "glWindowPos3f\0"
-    "glWindowPos3fARB\0"
-    "glWindowPos3fv\0"
-    "glWindowPos3fvARB\0"
-    "glWindowPos3i\0"
-    "glWindowPos3iARB\0"
-    "glWindowPos3iv\0"
-    "glWindowPos3ivARB\0"
-    "glWindowPos3s\0"
-    "glWindowPos3sARB\0"
-    "glWindowPos3sv\0"
-    "glWindowPos3svARB\0"
-    "glBindProgramARB\0"
-    "glDeleteProgramsARB\0"
-    "glGenProgramsARB\0"
-    "glGetVertexAttribPointerv\0"
-    "glGetVertexAttribPointervARB\0"
-    "glIsProgramARB\0"
-    "glPointParameteri\0"
-    "glPointParameteriv\0"
-    "glDeleteVertexArrays\0"
-    "glIsVertexArray\0"
-    "glPrimitiveRestartIndex\0"
-    "glBlendEquationSeparate\0"
-    "glBlendEquationSeparateATI\0"
-    "glBindFramebuffer\0"
-    "glBindRenderbuffer\0"
-    "glCheckFramebufferStatus\0"
-    "glDeleteFramebuffers\0"
-    "glDeleteRenderbuffers\0"
-    "glFramebufferRenderbuffer\0"
-    "glFramebufferTexture1D\0"
-    "glFramebufferTexture2D\0"
-    "glFramebufferTexture3D\0"
-    "glGenFramebuffers\0"
-    "glGenRenderbuffers\0"
-    "glGenerateMipmap\0"
-    "glGetFramebufferAttachmentParameteriv\0"
-    "glGetRenderbufferParameteriv\0"
-    "glIsFramebuffer\0"
-    "glIsRenderbuffer\0"
-    "glRenderbufferStorage\0"
-    "glBlitFramebuffer\0"
-    "glBindFragDataLocation\0"
-    "glGetFragDataLocation\0"
-    "glGetUniformuiv\0"
-    "glGetVertexAttribIiv\0"
-    "glGetVertexAttribIuiv\0"
-    "glUniform1ui\0"
-    "glUniform1uiv\0"
-    "glUniform2ui\0"
-    "glUniform2uiv\0"
-    "glUniform3ui\0"
-    "glUniform3uiv\0"
-    "glUniform4ui\0"
-    "glUniform4uiv\0"
     "glVertexAttribI1i\0"
-    "glVertexAttribI1iv\0"
     "glVertexAttribI1ui\0"
-    "glVertexAttribI1uiv\0"
     "glVertexAttribI2i\0"
     "glVertexAttribI2iv\0"
     "glVertexAttribI2ui\0"
@@ -1357,35 +1491,55 @@ static const char gl_string_table[] =
     "glVertexAttribI3iv\0"
     "glVertexAttribI3ui\0"
     "glVertexAttribI3uiv\0"
-    "glVertexAttribI4bv\0"
     "glVertexAttribI4i\0"
     "glVertexAttribI4iv\0"
-    "glVertexAttribI4sv\0"
-    "glVertexAttribI4ubv\0"
     "glVertexAttribI4ui\0"
     "glVertexAttribI4uiv\0"
-    "glVertexAttribI4usv\0"
-    "glVertexAttribIPointer\0"
-    "glFramebufferTextureLayer\0"
-    "glFramebufferTextureLayerARB\0"
-    "glColorMaski\0"
-    "glDisablei\0"
-    "glEnablei\0"
-    "glGetBooleani_v\0"
-    "glGetIntegeri_v\0"
-    "glIsEnabledi\0"
-    "glGetTexParameterIiv\0"
-    "glGetTexParameterIuiv\0"
-    "glTexParameterIiv\0"
-    "glTexParameterIuiv\0"
-    "glBeginConditionalRender\0"
-    "glEndConditionalRender\0"
-    "glBeginTransformFeedback\0"
-    "glBindBufferBase\0"
-    "glBindBufferRange\0"
-    "glEndTransformFeedback\0"
-    "glGetTransformFeedbackVarying\0"
-    "glTransformFeedbackVaryings\0" "glProvokingVertex\0";
+    "glAlphaFuncxOES\0"
+    "glClearColorxOES\0"
+    "glClearDepthxOES\0"
+    "glColor4xOES\0"
+    "glDepthRangexOES\0"
+    "glFogxOES\0"
+    "glFogxvOES\0"
+    "glFrustumfOES\0"
+    "glFrustumxOES\0"
+    "glLightModelxOES\0"
+    "glLightModelxvOES\0"
+    "glLightxOES\0"
+    "glLightxvOES\0"
+    "glLineWidthxOES\0"
+    "glLoadMatrixxOES\0"
+    "glMaterialxOES\0"
+    "glMaterialxvOES\0"
+    "glMultMatrixxOES\0"
+    "glMultiTexCoord4xOES\0"
+    "glNormal3xOES\0"
+    "glOrthofOES\0"
+    "glOrthoxOES\0"
+    "glPointSizexOES\0"
+    "glPolygonOffsetxOES\0"
+    "glRotatexOES\0"
+    "glSampleCoveragexOES\0"
+    "glScalexOES\0"
+    "glTexEnvxOES\0"
+    "glTexEnvxvOES\0"
+    "glTexParameterxOES\0"
+    "glTranslatexOES\0"
+    "glClipPlanefOES\0"
+    "glClipPlanexOES\0"
+    "glGetClipPlanefOES\0"
+    "glGetClipPlanexOES\0"
+    "glGetFixedvOES\0"
+    "glGetLightxvOES\0"
+    "glGetMaterialxvOES\0"
+    "glGetTexEnvxvOES\0"
+    "glGetTexParameterxvOES\0"
+    "glPointParameterxOES\0"
+    "glPointParameterxvOES\0"
+    "glTexParameterxvOES\0"
+    ;
+
 
 #ifdef USE_MGL_NAMESPACE
 #define gl_dispatch_stub_343 mgl_dispatch_stub_343
@@ -1401,2133 +1555,1658 @@ static const char gl_string_table[] =
 #define gl_dispatch_stub_364 mgl_dispatch_stub_364
 #define gl_dispatch_stub_365 mgl_dispatch_stub_365
 #define gl_dispatch_stub_366 mgl_dispatch_stub_366
-#define gl_dispatch_stub_692 mgl_dispatch_stub_692
-#define gl_dispatch_stub_693 mgl_dispatch_stub_693
-#define gl_dispatch_stub_694 mgl_dispatch_stub_694
-#define gl_dispatch_stub_695 mgl_dispatch_stub_695
-#define gl_dispatch_stub_696 mgl_dispatch_stub_696
-#define gl_dispatch_stub_697 mgl_dispatch_stub_697
-#define gl_dispatch_stub_698 mgl_dispatch_stub_698
-#define gl_dispatch_stub_699 mgl_dispatch_stub_699
-#define gl_dispatch_stub_734 mgl_dispatch_stub_734
-#define gl_dispatch_stub_776 mgl_dispatch_stub_776
-#define gl_dispatch_stub_777 mgl_dispatch_stub_777
-#define gl_dispatch_stub_778 mgl_dispatch_stub_778
-#define gl_dispatch_stub_779 mgl_dispatch_stub_779
-#define gl_dispatch_stub_780 mgl_dispatch_stub_780
-#define gl_dispatch_stub_781 mgl_dispatch_stub_781
-#define gl_dispatch_stub_782 mgl_dispatch_stub_782
-#define gl_dispatch_stub_783 mgl_dispatch_stub_783
-#define gl_dispatch_stub_784 mgl_dispatch_stub_784
+#define gl_dispatch_stub_726 mgl_dispatch_stub_726
+#define gl_dispatch_stub_727 mgl_dispatch_stub_727
+#define gl_dispatch_stub_728 mgl_dispatch_stub_728
+#define gl_dispatch_stub_815 mgl_dispatch_stub_815
+#define gl_dispatch_stub_830 mgl_dispatch_stub_830
+#define gl_dispatch_stub_831 mgl_dispatch_stub_831
+#define gl_dispatch_stub_832 mgl_dispatch_stub_832
+#define gl_dispatch_stub_833 mgl_dispatch_stub_833
+#define gl_dispatch_stub_834 mgl_dispatch_stub_834
+#define gl_dispatch_stub_835 mgl_dispatch_stub_835
+#define gl_dispatch_stub_836 mgl_dispatch_stub_836
+#define gl_dispatch_stub_837 mgl_dispatch_stub_837
+#define gl_dispatch_stub_838 mgl_dispatch_stub_838
+#define gl_dispatch_stub_839 mgl_dispatch_stub_839
+#define gl_dispatch_stub_840 mgl_dispatch_stub_840
+#define gl_dispatch_stub_841 mgl_dispatch_stub_841
+#define gl_dispatch_stub_864 mgl_dispatch_stub_864
 #define gl_dispatch_stub_865 mgl_dispatch_stub_865
-#define gl_dispatch_stub_866 mgl_dispatch_stub_866
-#define gl_dispatch_stub_867 mgl_dispatch_stub_867
-#define gl_dispatch_stub_868 mgl_dispatch_stub_868
-#define gl_dispatch_stub_869 mgl_dispatch_stub_869
-#define gl_dispatch_stub_878 mgl_dispatch_stub_878
-#define gl_dispatch_stub_879 mgl_dispatch_stub_879
-#define gl_dispatch_stub_897 mgl_dispatch_stub_897
-#define gl_dispatch_stub_898 mgl_dispatch_stub_898
-#define gl_dispatch_stub_899 mgl_dispatch_stub_899
-#define gl_dispatch_stub_957 mgl_dispatch_stub_957
-#define gl_dispatch_stub_958 mgl_dispatch_stub_958
-#define gl_dispatch_stub_966 mgl_dispatch_stub_966
-#define gl_dispatch_stub_967 mgl_dispatch_stub_967
-#define gl_dispatch_stub_968 mgl_dispatch_stub_968
-#define gl_dispatch_stub_969 mgl_dispatch_stub_969
-#define gl_dispatch_stub_970 mgl_dispatch_stub_970
-#endif                          /* USE_MGL_NAMESPACE */
+#define gl_dispatch_stub_939 mgl_dispatch_stub_939
+#define gl_dispatch_stub_940 mgl_dispatch_stub_940
+#define gl_dispatch_stub_941 mgl_dispatch_stub_941
+#define gl_dispatch_stub_949 mgl_dispatch_stub_949
+#define gl_dispatch_stub_950 mgl_dispatch_stub_950
+#define gl_dispatch_stub_951 mgl_dispatch_stub_951
+#define gl_dispatch_stub_952 mgl_dispatch_stub_952
+#define gl_dispatch_stub_953 mgl_dispatch_stub_953
+#define gl_dispatch_stub_954 mgl_dispatch_stub_954
+#define gl_dispatch_stub_979 mgl_dispatch_stub_979
+#define gl_dispatch_stub_980 mgl_dispatch_stub_980
+#define gl_dispatch_stub_981 mgl_dispatch_stub_981
+#define gl_dispatch_stub_984 mgl_dispatch_stub_984
+#define gl_dispatch_stub_985 mgl_dispatch_stub_985
+#define gl_dispatch_stub_986 mgl_dispatch_stub_986
+#define gl_dispatch_stub_987 mgl_dispatch_stub_987
+#define gl_dispatch_stub_988 mgl_dispatch_stub_988
+#define gl_dispatch_stub_989 mgl_dispatch_stub_989
+#define gl_dispatch_stub_990 mgl_dispatch_stub_990
+#define gl_dispatch_stub_991 mgl_dispatch_stub_991
+#define gl_dispatch_stub_992 mgl_dispatch_stub_992
+#define gl_dispatch_stub_993 mgl_dispatch_stub_993
+#define gl_dispatch_stub_994 mgl_dispatch_stub_994
+#define gl_dispatch_stub_995 mgl_dispatch_stub_995
+#define gl_dispatch_stub_996 mgl_dispatch_stub_996
+#define gl_dispatch_stub_997 mgl_dispatch_stub_997
+#define gl_dispatch_stub_998 mgl_dispatch_stub_998
+#define gl_dispatch_stub_999 mgl_dispatch_stub_999
+#define gl_dispatch_stub_1000 mgl_dispatch_stub_1000
+#define gl_dispatch_stub_1001 mgl_dispatch_stub_1001
+#define gl_dispatch_stub_1002 mgl_dispatch_stub_1002
+#define gl_dispatch_stub_1003 mgl_dispatch_stub_1003
+#define gl_dispatch_stub_1004 mgl_dispatch_stub_1004
+#define gl_dispatch_stub_1005 mgl_dispatch_stub_1005
+#define gl_dispatch_stub_1006 mgl_dispatch_stub_1006
+#define gl_dispatch_stub_1007 mgl_dispatch_stub_1007
+#define gl_dispatch_stub_1008 mgl_dispatch_stub_1008
+#define gl_dispatch_stub_1009 mgl_dispatch_stub_1009
+#define gl_dispatch_stub_1010 mgl_dispatch_stub_1010
+#define gl_dispatch_stub_1011 mgl_dispatch_stub_1011
+#define gl_dispatch_stub_1012 mgl_dispatch_stub_1012
+#define gl_dispatch_stub_1013 mgl_dispatch_stub_1013
+#define gl_dispatch_stub_1014 mgl_dispatch_stub_1014
+#define gl_dispatch_stub_1015 mgl_dispatch_stub_1015
+#define gl_dispatch_stub_1016 mgl_dispatch_stub_1016
+#define gl_dispatch_stub_1017 mgl_dispatch_stub_1017
+#define gl_dispatch_stub_1018 mgl_dispatch_stub_1018
+#define gl_dispatch_stub_1019 mgl_dispatch_stub_1019
+#define gl_dispatch_stub_1020 mgl_dispatch_stub_1020
+#define gl_dispatch_stub_1021 mgl_dispatch_stub_1021
+#define gl_dispatch_stub_1022 mgl_dispatch_stub_1022
+#define gl_dispatch_stub_1023 mgl_dispatch_stub_1023
+#define gl_dispatch_stub_1024 mgl_dispatch_stub_1024
+#define gl_dispatch_stub_1025 mgl_dispatch_stub_1025
+#define gl_dispatch_stub_1026 mgl_dispatch_stub_1026
+#endif /* USE_MGL_NAMESPACE */
+
 
 #if defined(NEED_FUNCTION_POINTER) || defined(GLX_INDIRECT_RENDERING)
-void GLAPIENTRY gl_dispatch_stub_343(GLenum target, GLenum format, GLenum type,
-                                     GLvoid * table);
-void GLAPIENTRY gl_dispatch_stub_344(GLenum target, GLenum pname,
-                                     GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_345(GLenum target, GLenum pname,
-                                     GLint * params);
-void GLAPIENTRY gl_dispatch_stub_356(GLenum target, GLenum format, GLenum type,
-                                     GLvoid * image);
-void GLAPIENTRY gl_dispatch_stub_357(GLenum target, GLenum pname,
-                                     GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_358(GLenum target, GLenum pname,
-                                     GLint * params);
-void GLAPIENTRY gl_dispatch_stub_359(GLenum target, GLenum format, GLenum type,
-                                     GLvoid * row, GLvoid * column,
-                                     GLvoid * span);
-void GLAPIENTRY gl_dispatch_stub_361(GLenum target, GLboolean reset,
-                                     GLenum format, GLenum type,
-                                     GLvoid * values);
-void GLAPIENTRY gl_dispatch_stub_362(GLenum target, GLenum pname,
-                                     GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_363(GLenum target, GLenum pname,
-                                     GLint * params);
-void GLAPIENTRY gl_dispatch_stub_364(GLenum target, GLboolean reset,
-                                     GLenum format, GLenum type,
-                                     GLvoid * values);
-void GLAPIENTRY gl_dispatch_stub_365(GLenum target, GLenum pname,
-                                     GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_366(GLenum target, GLenum pname,
-                                     GLint * params);
-void GLAPIENTRY gl_dispatch_stub_692(GLenum pname, GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_693(GLenum pname, GLint * params);
-void GLAPIENTRY gl_dispatch_stub_694(GLenum pname, GLfloat param);
-void GLAPIENTRY gl_dispatch_stub_695(GLenum pname, const GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_696(GLenum pname, GLint param);
-void GLAPIENTRY gl_dispatch_stub_697(GLenum pname, const GLint * params);
-void GLAPIENTRY gl_dispatch_stub_698(GLclampf value, GLboolean invert);
-void GLAPIENTRY gl_dispatch_stub_699(GLenum pattern);
-void GLAPIENTRY gl_dispatch_stub_734(GLenum mode);
-void GLAPIENTRY gl_dispatch_stub_776(const GLenum * mode, const GLint * first,
-                                     const GLsizei * count, GLsizei primcount,
-                                     GLint modestride);
-void GLAPIENTRY gl_dispatch_stub_777(const GLenum * mode, const GLsizei * count,
-                                     GLenum type, const GLvoid * const *indices,
-                                     GLsizei primcount, GLint modestride);
-void GLAPIENTRY gl_dispatch_stub_778(GLsizei n, const GLuint * fences);
-void GLAPIENTRY gl_dispatch_stub_779(GLuint fence);
-void GLAPIENTRY gl_dispatch_stub_780(GLsizei n, GLuint * fences);
-void GLAPIENTRY gl_dispatch_stub_781(GLuint fence, GLenum pname,
-                                     GLint * params);
-GLboolean GLAPIENTRY gl_dispatch_stub_782(GLuint fence);
-void GLAPIENTRY gl_dispatch_stub_783(GLuint fence, GLenum condition);
-GLboolean GLAPIENTRY gl_dispatch_stub_784(GLuint fence);
-void GLAPIENTRY gl_dispatch_stub_865(GLenum face);
-void GLAPIENTRY gl_dispatch_stub_866(GLuint array);
-void GLAPIENTRY gl_dispatch_stub_867(GLsizei n, const GLuint * arrays);
-void GLAPIENTRY gl_dispatch_stub_868(GLsizei n, GLuint * arrays);
-GLboolean GLAPIENTRY gl_dispatch_stub_869(GLuint array);
-void GLAPIENTRY gl_dispatch_stub_878(GLclampd zmin, GLclampd zmax);
-void GLAPIENTRY gl_dispatch_stub_879(GLenum modeRGB, GLenum modeA);
-void GLAPIENTRY gl_dispatch_stub_897(GLint srcX0, GLint srcY0, GLint srcX1,
-                                     GLint srcY1, GLint dstX0, GLint dstY0,
-                                     GLint dstX1, GLint dstY1, GLbitfield mask,
-                                     GLenum filter);
-void GLAPIENTRY gl_dispatch_stub_898(GLenum target, GLenum pname, GLint param);
-void GLAPIENTRY gl_dispatch_stub_899(GLenum target, GLintptr offset,
-                                     GLsizeiptr size);
-void GLAPIENTRY gl_dispatch_stub_957(GLenum target, GLenum pname,
-                                     GLvoid ** params);
-void GLAPIENTRY gl_dispatch_stub_958(GLenum target, GLsizei length,
-                                     GLvoid * pointer);
-void GLAPIENTRY gl_dispatch_stub_966(GLenum frontfunc, GLenum backfunc,
-                                     GLint ref, GLuint mask);
-void GLAPIENTRY gl_dispatch_stub_967(GLenum target, GLuint index, GLsizei count,
-                                     const GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_968(GLenum target, GLuint index, GLsizei count,
-                                     const GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_969(GLuint id, GLenum pname,
-                                     GLint64EXT * params);
-void GLAPIENTRY gl_dispatch_stub_970(GLuint id, GLenum pname,
-                                     GLuint64EXT * params);
-#endif                          /* defined(NEED_FUNCTION_POINTER) || defined(GLX_INDIRECT_RENDERING) */
+void GLAPIENTRY gl_dispatch_stub_343(GLenum target, GLenum format, GLenum type, GLvoid * table);
+void GLAPIENTRY gl_dispatch_stub_344(GLenum target, GLenum pname, GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_345(GLenum target, GLenum pname, GLint * params);
+void GLAPIENTRY gl_dispatch_stub_356(GLenum target, GLenum format, GLenum type, GLvoid * image);
+void GLAPIENTRY gl_dispatch_stub_357(GLenum target, GLenum pname, GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_358(GLenum target, GLenum pname, GLint * params);
+void GLAPIENTRY gl_dispatch_stub_359(GLenum target, GLenum format, GLenum type, GLvoid * row, GLvoid * column, GLvoid * span);
+void GLAPIENTRY gl_dispatch_stub_361(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid * values);
+void GLAPIENTRY gl_dispatch_stub_362(GLenum target, GLenum pname, GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_363(GLenum target, GLenum pname, GLint * params);
+void GLAPIENTRY gl_dispatch_stub_364(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid * values);
+void GLAPIENTRY gl_dispatch_stub_365(GLenum target, GLenum pname, GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_366(GLenum target, GLenum pname, GLint * params);
+void GLAPIENTRY gl_dispatch_stub_726(GLuint id, GLenum pname, GLint64 * params);
+void GLAPIENTRY gl_dispatch_stub_727(GLuint id, GLenum pname, GLuint64 * params);
+void GLAPIENTRY gl_dispatch_stub_728(GLuint id, GLenum target);
+void GLAPIENTRY gl_dispatch_stub_815(GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint * params);
+void GLAPIENTRY gl_dispatch_stub_830(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height);
+void GLAPIENTRY gl_dispatch_stub_831(const GLfloat * coords);
+void GLAPIENTRY gl_dispatch_stub_832(GLint x, GLint y, GLint z, GLint width, GLint height);
+void GLAPIENTRY gl_dispatch_stub_833(const GLint * coords);
+void GLAPIENTRY gl_dispatch_stub_834(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height);
+void GLAPIENTRY gl_dispatch_stub_835(const GLshort * coords);
+void GLAPIENTRY gl_dispatch_stub_836(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height);
+void GLAPIENTRY gl_dispatch_stub_837(const GLfixed * coords);
+void GLAPIENTRY gl_dispatch_stub_838(GLenum type, GLsizei stride, const GLvoid * pointer);
+GLbitfield GLAPIENTRY gl_dispatch_stub_839(GLfixed * mantissa, GLint * exponent);
+void GLAPIENTRY gl_dispatch_stub_840(GLclampf value, GLboolean invert);
+void GLAPIENTRY gl_dispatch_stub_841(GLenum pattern);
+void GLAPIENTRY gl_dispatch_stub_864(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);
+void GLAPIENTRY gl_dispatch_stub_865(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);
+void GLAPIENTRY gl_dispatch_stub_939(GLenum face);
+void GLAPIENTRY gl_dispatch_stub_940(GLuint array);
+void GLAPIENTRY gl_dispatch_stub_941(GLsizei n, GLuint * arrays);
+void GLAPIENTRY gl_dispatch_stub_949(GLenum coord, GLenum pname, GLfixed * params);
+void GLAPIENTRY gl_dispatch_stub_950(GLenum coord, GLenum pname, GLint param);
+void GLAPIENTRY gl_dispatch_stub_951(GLenum coord, GLenum pname, const GLfixed * params);
+void GLAPIENTRY gl_dispatch_stub_952(GLclampd zmin, GLclampd zmax);
+void GLAPIENTRY gl_dispatch_stub_953(GLenum target, GLenum pname, GLint param);
+void GLAPIENTRY gl_dispatch_stub_954(GLenum target, GLintptr offset, GLsizeiptr size);
+void GLAPIENTRY gl_dispatch_stub_979(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+void GLAPIENTRY gl_dispatch_stub_980(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_981(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_984(GLenum func, GLclampx ref);
+void GLAPIENTRY gl_dispatch_stub_985(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha);
+void GLAPIENTRY gl_dispatch_stub_986(GLclampx depth);
+void GLAPIENTRY gl_dispatch_stub_987(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
+void GLAPIENTRY gl_dispatch_stub_988(GLclampx zNear, GLclampx zFar);
+void GLAPIENTRY gl_dispatch_stub_989(GLenum pname, GLfixed param);
+void GLAPIENTRY gl_dispatch_stub_990(GLenum pname, const GLfixed * params);
+void GLAPIENTRY gl_dispatch_stub_991(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar);
+void GLAPIENTRY gl_dispatch_stub_992(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar);
+void GLAPIENTRY gl_dispatch_stub_993(GLenum pname, GLfixed param);
+void GLAPIENTRY gl_dispatch_stub_994(GLenum pname, const GLfixed * params);
+void GLAPIENTRY gl_dispatch_stub_995(GLenum light, GLenum pname, GLfixed param);
+void GLAPIENTRY gl_dispatch_stub_996(GLenum light, GLenum pname, const GLfixed * params);
+void GLAPIENTRY gl_dispatch_stub_997(GLfixed width);
+void GLAPIENTRY gl_dispatch_stub_998(const GLfixed * m);
+void GLAPIENTRY gl_dispatch_stub_999(GLenum face, GLenum pname, GLfixed param);
+void GLAPIENTRY gl_dispatch_stub_1000(GLenum face, GLenum pname, const GLfixed * params);
+void GLAPIENTRY gl_dispatch_stub_1001(const GLfixed * m);
+void GLAPIENTRY gl_dispatch_stub_1002(GLenum target, GLfixed s, GLfixed t, GLfixed r, GLfixed q);
+void GLAPIENTRY gl_dispatch_stub_1003(GLfixed nx, GLfixed ny, GLfixed nz);
+void GLAPIENTRY gl_dispatch_stub_1004(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar);
+void GLAPIENTRY gl_dispatch_stub_1005(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar);
+void GLAPIENTRY gl_dispatch_stub_1006(GLfixed size);
+void GLAPIENTRY gl_dispatch_stub_1007(GLfixed factor, GLfixed units);
+void GLAPIENTRY gl_dispatch_stub_1008(GLfixed angle, GLfixed x, GLfixed y, GLfixed z);
+void GLAPIENTRY gl_dispatch_stub_1009(GLclampx value, GLboolean invert);
+void GLAPIENTRY gl_dispatch_stub_1010(GLfixed x, GLfixed y, GLfixed z);
+void GLAPIENTRY gl_dispatch_stub_1011(GLenum target, GLenum pname, GLfixed param);
+void GLAPIENTRY gl_dispatch_stub_1012(GLenum target, GLenum pname, const GLfixed * params);
+void GLAPIENTRY gl_dispatch_stub_1013(GLenum target, GLenum pname, GLfixed param);
+void GLAPIENTRY gl_dispatch_stub_1014(GLfixed x, GLfixed y, GLfixed z);
+void GLAPIENTRY gl_dispatch_stub_1015(GLenum plane, const GLfloat * equation);
+void GLAPIENTRY gl_dispatch_stub_1016(GLenum plane, const GLfixed * equation);
+void GLAPIENTRY gl_dispatch_stub_1017(GLenum plane, GLfloat * equation);
+void GLAPIENTRY gl_dispatch_stub_1018(GLenum plane, GLfixed * equation);
+void GLAPIENTRY gl_dispatch_stub_1019(GLenum pname, GLfixed * params);
+void GLAPIENTRY gl_dispatch_stub_1020(GLenum light, GLenum pname, GLfixed * params);
+void GLAPIENTRY gl_dispatch_stub_1021(GLenum face, GLenum pname, GLfixed * params);
+void GLAPIENTRY gl_dispatch_stub_1022(GLenum target, GLenum pname, GLfixed * params);
+void GLAPIENTRY gl_dispatch_stub_1023(GLenum target, GLenum pname, GLfixed * params);
+void GLAPIENTRY gl_dispatch_stub_1024(GLenum pname, GLfixed param);
+void GLAPIENTRY gl_dispatch_stub_1025(GLenum pname, const GLfixed * params);
+void GLAPIENTRY gl_dispatch_stub_1026(GLenum target, GLenum pname, const GLfixed * params);
+#endif /* defined(NEED_FUNCTION_POINTER) || defined(GLX_INDIRECT_RENDERING) */
 
 static const glprocs_table_t static_functions[] = {
-    NAME_FUNC_OFFSET(0, glNewList, glNewList, NULL, 0),
-    NAME_FUNC_OFFSET(10, glEndList, glEndList, NULL, 1),
-    NAME_FUNC_OFFSET(20, glCallList, glCallList, NULL, 2),
-    NAME_FUNC_OFFSET(31, glCallLists, glCallLists, NULL, 3),
-    NAME_FUNC_OFFSET(43, glDeleteLists, glDeleteLists, NULL, 4),
-    NAME_FUNC_OFFSET(57, glGenLists, glGenLists, NULL, 5),
-    NAME_FUNC_OFFSET(68, glListBase, glListBase, NULL, 6),
-    NAME_FUNC_OFFSET(79, glBegin, glBegin, NULL, 7),
-    NAME_FUNC_OFFSET(87, glBitmap, glBitmap, NULL, 8),
-    NAME_FUNC_OFFSET(96, glColor3b, glColor3b, NULL, 9),
-    NAME_FUNC_OFFSET(106, glColor3bv, glColor3bv, NULL, 10),
-    NAME_FUNC_OFFSET(117, glColor3d, glColor3d, NULL, 11),
-    NAME_FUNC_OFFSET(127, glColor3dv, glColor3dv, NULL, 12),
-    NAME_FUNC_OFFSET(138, glColor3f, glColor3f, NULL, 13),
-    NAME_FUNC_OFFSET(148, glColor3fv, glColor3fv, NULL, 14),
-    NAME_FUNC_OFFSET(159, glColor3i, glColor3i, NULL, 15),
-    NAME_FUNC_OFFSET(169, glColor3iv, glColor3iv, NULL, 16),
-    NAME_FUNC_OFFSET(180, glColor3s, glColor3s, NULL, 17),
-    NAME_FUNC_OFFSET(190, glColor3sv, glColor3sv, NULL, 18),
-    NAME_FUNC_OFFSET(201, glColor3ub, glColor3ub, NULL, 19),
-    NAME_FUNC_OFFSET(212, glColor3ubv, glColor3ubv, NULL, 20),
-    NAME_FUNC_OFFSET(224, glColor3ui, glColor3ui, NULL, 21),
-    NAME_FUNC_OFFSET(235, glColor3uiv, glColor3uiv, NULL, 22),
-    NAME_FUNC_OFFSET(247, glColor3us, glColor3us, NULL, 23),
-    NAME_FUNC_OFFSET(258, glColor3usv, glColor3usv, NULL, 24),
-    NAME_FUNC_OFFSET(270, glColor4b, glColor4b, NULL, 25),
-    NAME_FUNC_OFFSET(280, glColor4bv, glColor4bv, NULL, 26),
-    NAME_FUNC_OFFSET(291, glColor4d, glColor4d, NULL, 27),
-    NAME_FUNC_OFFSET(301, glColor4dv, glColor4dv, NULL, 28),
-    NAME_FUNC_OFFSET(312, glColor4f, glColor4f, NULL, 29),
-    NAME_FUNC_OFFSET(322, glColor4fv, glColor4fv, NULL, 30),
-    NAME_FUNC_OFFSET(333, glColor4i, glColor4i, NULL, 31),
-    NAME_FUNC_OFFSET(343, glColor4iv, glColor4iv, NULL, 32),
-    NAME_FUNC_OFFSET(354, glColor4s, glColor4s, NULL, 33),
-    NAME_FUNC_OFFSET(364, glColor4sv, glColor4sv, NULL, 34),
-    NAME_FUNC_OFFSET(375, glColor4ub, glColor4ub, NULL, 35),
-    NAME_FUNC_OFFSET(386, glColor4ubv, glColor4ubv, NULL, 36),
-    NAME_FUNC_OFFSET(398, glColor4ui, glColor4ui, NULL, 37),
-    NAME_FUNC_OFFSET(409, glColor4uiv, glColor4uiv, NULL, 38),
-    NAME_FUNC_OFFSET(421, glColor4us, glColor4us, NULL, 39),
-    NAME_FUNC_OFFSET(432, glColor4usv, glColor4usv, NULL, 40),
-    NAME_FUNC_OFFSET(444, glEdgeFlag, glEdgeFlag, NULL, 41),
-    NAME_FUNC_OFFSET(455, glEdgeFlagv, glEdgeFlagv, NULL, 42),
-    NAME_FUNC_OFFSET(467, glEnd, glEnd, NULL, 43),
-    NAME_FUNC_OFFSET(473, glIndexd, glIndexd, NULL, 44),
-    NAME_FUNC_OFFSET(482, glIndexdv, glIndexdv, NULL, 45),
-    NAME_FUNC_OFFSET(492, glIndexf, glIndexf, NULL, 46),
-    NAME_FUNC_OFFSET(501, glIndexfv, glIndexfv, NULL, 47),
-    NAME_FUNC_OFFSET(511, glIndexi, glIndexi, NULL, 48),
-    NAME_FUNC_OFFSET(520, glIndexiv, glIndexiv, NULL, 49),
-    NAME_FUNC_OFFSET(530, glIndexs, glIndexs, NULL, 50),
-    NAME_FUNC_OFFSET(539, glIndexsv, glIndexsv, NULL, 51),
-    NAME_FUNC_OFFSET(549, glNormal3b, glNormal3b, NULL, 52),
-    NAME_FUNC_OFFSET(560, glNormal3bv, glNormal3bv, NULL, 53),
-    NAME_FUNC_OFFSET(572, glNormal3d, glNormal3d, NULL, 54),
-    NAME_FUNC_OFFSET(583, glNormal3dv, glNormal3dv, NULL, 55),
-    NAME_FUNC_OFFSET(595, glNormal3f, glNormal3f, NULL, 56),
-    NAME_FUNC_OFFSET(606, glNormal3fv, glNormal3fv, NULL, 57),
-    NAME_FUNC_OFFSET(618, glNormal3i, glNormal3i, NULL, 58),
-    NAME_FUNC_OFFSET(629, glNormal3iv, glNormal3iv, NULL, 59),
-    NAME_FUNC_OFFSET(641, glNormal3s, glNormal3s, NULL, 60),
-    NAME_FUNC_OFFSET(652, glNormal3sv, glNormal3sv, NULL, 61),
-    NAME_FUNC_OFFSET(664, glRasterPos2d, glRasterPos2d, NULL, 62),
-    NAME_FUNC_OFFSET(678, glRasterPos2dv, glRasterPos2dv, NULL, 63),
-    NAME_FUNC_OFFSET(693, glRasterPos2f, glRasterPos2f, NULL, 64),
-    NAME_FUNC_OFFSET(707, glRasterPos2fv, glRasterPos2fv, NULL, 65),
-    NAME_FUNC_OFFSET(722, glRasterPos2i, glRasterPos2i, NULL, 66),
-    NAME_FUNC_OFFSET(736, glRasterPos2iv, glRasterPos2iv, NULL, 67),
-    NAME_FUNC_OFFSET(751, glRasterPos2s, glRasterPos2s, NULL, 68),
-    NAME_FUNC_OFFSET(765, glRasterPos2sv, glRasterPos2sv, NULL, 69),
-    NAME_FUNC_OFFSET(780, glRasterPos3d, glRasterPos3d, NULL, 70),
-    NAME_FUNC_OFFSET(794, glRasterPos3dv, glRasterPos3dv, NULL, 71),
-    NAME_FUNC_OFFSET(809, glRasterPos3f, glRasterPos3f, NULL, 72),
-    NAME_FUNC_OFFSET(823, glRasterPos3fv, glRasterPos3fv, NULL, 73),
-    NAME_FUNC_OFFSET(838, glRasterPos3i, glRasterPos3i, NULL, 74),
-    NAME_FUNC_OFFSET(852, glRasterPos3iv, glRasterPos3iv, NULL, 75),
-    NAME_FUNC_OFFSET(867, glRasterPos3s, glRasterPos3s, NULL, 76),
-    NAME_FUNC_OFFSET(881, glRasterPos3sv, glRasterPos3sv, NULL, 77),
-    NAME_FUNC_OFFSET(896, glRasterPos4d, glRasterPos4d, NULL, 78),
-    NAME_FUNC_OFFSET(910, glRasterPos4dv, glRasterPos4dv, NULL, 79),
-    NAME_FUNC_OFFSET(925, glRasterPos4f, glRasterPos4f, NULL, 80),
-    NAME_FUNC_OFFSET(939, glRasterPos4fv, glRasterPos4fv, NULL, 81),
-    NAME_FUNC_OFFSET(954, glRasterPos4i, glRasterPos4i, NULL, 82),
-    NAME_FUNC_OFFSET(968, glRasterPos4iv, glRasterPos4iv, NULL, 83),
-    NAME_FUNC_OFFSET(983, glRasterPos4s, glRasterPos4s, NULL, 84),
-    NAME_FUNC_OFFSET(997, glRasterPos4sv, glRasterPos4sv, NULL, 85),
-    NAME_FUNC_OFFSET(1012, glRectd, glRectd, NULL, 86),
-    NAME_FUNC_OFFSET(1020, glRectdv, glRectdv, NULL, 87),
-    NAME_FUNC_OFFSET(1029, glRectf, glRectf, NULL, 88),
-    NAME_FUNC_OFFSET(1037, glRectfv, glRectfv, NULL, 89),
-    NAME_FUNC_OFFSET(1046, glRecti, glRecti, NULL, 90),
-    NAME_FUNC_OFFSET(1054, glRectiv, glRectiv, NULL, 91),
-    NAME_FUNC_OFFSET(1063, glRects, glRects, NULL, 92),
-    NAME_FUNC_OFFSET(1071, glRectsv, glRectsv, NULL, 93),
-    NAME_FUNC_OFFSET(1080, glTexCoord1d, glTexCoord1d, NULL, 94),
-    NAME_FUNC_OFFSET(1093, glTexCoord1dv, glTexCoord1dv, NULL, 95),
-    NAME_FUNC_OFFSET(1107, glTexCoord1f, glTexCoord1f, NULL, 96),
-    NAME_FUNC_OFFSET(1120, glTexCoord1fv, glTexCoord1fv, NULL, 97),
-    NAME_FUNC_OFFSET(1134, glTexCoord1i, glTexCoord1i, NULL, 98),
-    NAME_FUNC_OFFSET(1147, glTexCoord1iv, glTexCoord1iv, NULL, 99),
-    NAME_FUNC_OFFSET(1161, glTexCoord1s, glTexCoord1s, NULL, 100),
-    NAME_FUNC_OFFSET(1174, glTexCoord1sv, glTexCoord1sv, NULL, 101),
-    NAME_FUNC_OFFSET(1188, glTexCoord2d, glTexCoord2d, NULL, 102),
-    NAME_FUNC_OFFSET(1201, glTexCoord2dv, glTexCoord2dv, NULL, 103),
-    NAME_FUNC_OFFSET(1215, glTexCoord2f, glTexCoord2f, NULL, 104),
-    NAME_FUNC_OFFSET(1228, glTexCoord2fv, glTexCoord2fv, NULL, 105),
-    NAME_FUNC_OFFSET(1242, glTexCoord2i, glTexCoord2i, NULL, 106),
-    NAME_FUNC_OFFSET(1255, glTexCoord2iv, glTexCoord2iv, NULL, 107),
-    NAME_FUNC_OFFSET(1269, glTexCoord2s, glTexCoord2s, NULL, 108),
-    NAME_FUNC_OFFSET(1282, glTexCoord2sv, glTexCoord2sv, NULL, 109),
-    NAME_FUNC_OFFSET(1296, glTexCoord3d, glTexCoord3d, NULL, 110),
-    NAME_FUNC_OFFSET(1309, glTexCoord3dv, glTexCoord3dv, NULL, 111),
-    NAME_FUNC_OFFSET(1323, glTexCoord3f, glTexCoord3f, NULL, 112),
-    NAME_FUNC_OFFSET(1336, glTexCoord3fv, glTexCoord3fv, NULL, 113),
-    NAME_FUNC_OFFSET(1350, glTexCoord3i, glTexCoord3i, NULL, 114),
-    NAME_FUNC_OFFSET(1363, glTexCoord3iv, glTexCoord3iv, NULL, 115),
-    NAME_FUNC_OFFSET(1377, glTexCoord3s, glTexCoord3s, NULL, 116),
-    NAME_FUNC_OFFSET(1390, glTexCoord3sv, glTexCoord3sv, NULL, 117),
-    NAME_FUNC_OFFSET(1404, glTexCoord4d, glTexCoord4d, NULL, 118),
-    NAME_FUNC_OFFSET(1417, glTexCoord4dv, glTexCoord4dv, NULL, 119),
-    NAME_FUNC_OFFSET(1431, glTexCoord4f, glTexCoord4f, NULL, 120),
-    NAME_FUNC_OFFSET(1444, glTexCoord4fv, glTexCoord4fv, NULL, 121),
-    NAME_FUNC_OFFSET(1458, glTexCoord4i, glTexCoord4i, NULL, 122),
-    NAME_FUNC_OFFSET(1471, glTexCoord4iv, glTexCoord4iv, NULL, 123),
-    NAME_FUNC_OFFSET(1485, glTexCoord4s, glTexCoord4s, NULL, 124),
-    NAME_FUNC_OFFSET(1498, glTexCoord4sv, glTexCoord4sv, NULL, 125),
-    NAME_FUNC_OFFSET(1512, glVertex2d, glVertex2d, NULL, 126),
-    NAME_FUNC_OFFSET(1523, glVertex2dv, glVertex2dv, NULL, 127),
-    NAME_FUNC_OFFSET(1535, glVertex2f, glVertex2f, NULL, 128),
-    NAME_FUNC_OFFSET(1546, glVertex2fv, glVertex2fv, NULL, 129),
-    NAME_FUNC_OFFSET(1558, glVertex2i, glVertex2i, NULL, 130),
-    NAME_FUNC_OFFSET(1569, glVertex2iv, glVertex2iv, NULL, 131),
-    NAME_FUNC_OFFSET(1581, glVertex2s, glVertex2s, NULL, 132),
-    NAME_FUNC_OFFSET(1592, glVertex2sv, glVertex2sv, NULL, 133),
-    NAME_FUNC_OFFSET(1604, glVertex3d, glVertex3d, NULL, 134),
-    NAME_FUNC_OFFSET(1615, glVertex3dv, glVertex3dv, NULL, 135),
-    NAME_FUNC_OFFSET(1627, glVertex3f, glVertex3f, NULL, 136),
-    NAME_FUNC_OFFSET(1638, glVertex3fv, glVertex3fv, NULL, 137),
-    NAME_FUNC_OFFSET(1650, glVertex3i, glVertex3i, NULL, 138),
-    NAME_FUNC_OFFSET(1661, glVertex3iv, glVertex3iv, NULL, 139),
-    NAME_FUNC_OFFSET(1673, glVertex3s, glVertex3s, NULL, 140),
-    NAME_FUNC_OFFSET(1684, glVertex3sv, glVertex3sv, NULL, 141),
-    NAME_FUNC_OFFSET(1696, glVertex4d, glVertex4d, NULL, 142),
-    NAME_FUNC_OFFSET(1707, glVertex4dv, glVertex4dv, NULL, 143),
-    NAME_FUNC_OFFSET(1719, glVertex4f, glVertex4f, NULL, 144),
-    NAME_FUNC_OFFSET(1730, glVertex4fv, glVertex4fv, NULL, 145),
-    NAME_FUNC_OFFSET(1742, glVertex4i, glVertex4i, NULL, 146),
-    NAME_FUNC_OFFSET(1753, glVertex4iv, glVertex4iv, NULL, 147),
-    NAME_FUNC_OFFSET(1765, glVertex4s, glVertex4s, NULL, 148),
-    NAME_FUNC_OFFSET(1776, glVertex4sv, glVertex4sv, NULL, 149),
-    NAME_FUNC_OFFSET(1788, glClipPlane, glClipPlane, NULL, 150),
-    NAME_FUNC_OFFSET(1800, glColorMaterial, glColorMaterial, NULL, 151),
-    NAME_FUNC_OFFSET(1816, glCullFace, glCullFace, NULL, 152),
-    NAME_FUNC_OFFSET(1827, glFogf, glFogf, NULL, 153),
-    NAME_FUNC_OFFSET(1834, glFogfv, glFogfv, NULL, 154),
-    NAME_FUNC_OFFSET(1842, glFogi, glFogi, NULL, 155),
-    NAME_FUNC_OFFSET(1849, glFogiv, glFogiv, NULL, 156),
-    NAME_FUNC_OFFSET(1857, glFrontFace, glFrontFace, NULL, 157),
-    NAME_FUNC_OFFSET(1869, glHint, glHint, NULL, 158),
-    NAME_FUNC_OFFSET(1876, glLightf, glLightf, NULL, 159),
-    NAME_FUNC_OFFSET(1885, glLightfv, glLightfv, NULL, 160),
-    NAME_FUNC_OFFSET(1895, glLighti, glLighti, NULL, 161),
-    NAME_FUNC_OFFSET(1904, glLightiv, glLightiv, NULL, 162),
-    NAME_FUNC_OFFSET(1914, glLightModelf, glLightModelf, NULL, 163),
-    NAME_FUNC_OFFSET(1928, glLightModelfv, glLightModelfv, NULL, 164),
-    NAME_FUNC_OFFSET(1943, glLightModeli, glLightModeli, NULL, 165),
-    NAME_FUNC_OFFSET(1957, glLightModeliv, glLightModeliv, NULL, 166),
-    NAME_FUNC_OFFSET(1972, glLineStipple, glLineStipple, NULL, 167),
-    NAME_FUNC_OFFSET(1986, glLineWidth, glLineWidth, NULL, 168),
-    NAME_FUNC_OFFSET(1998, glMaterialf, glMaterialf, NULL, 169),
-    NAME_FUNC_OFFSET(2010, glMaterialfv, glMaterialfv, NULL, 170),
-    NAME_FUNC_OFFSET(2023, glMateriali, glMateriali, NULL, 171),
-    NAME_FUNC_OFFSET(2035, glMaterialiv, glMaterialiv, NULL, 172),
-    NAME_FUNC_OFFSET(2048, glPointSize, glPointSize, NULL, 173),
-    NAME_FUNC_OFFSET(2060, glPolygonMode, glPolygonMode, NULL, 174),
-    NAME_FUNC_OFFSET(2074, glPolygonStipple, glPolygonStipple, NULL, 175),
-    NAME_FUNC_OFFSET(2091, glScissor, glScissor, NULL, 176),
-    NAME_FUNC_OFFSET(2101, glShadeModel, glShadeModel, NULL, 177),
-    NAME_FUNC_OFFSET(2114, glTexParameterf, glTexParameterf, NULL, 178),
-    NAME_FUNC_OFFSET(2130, glTexParameterfv, glTexParameterfv, NULL, 179),
-    NAME_FUNC_OFFSET(2147, glTexParameteri, glTexParameteri, NULL, 180),
-    NAME_FUNC_OFFSET(2163, glTexParameteriv, glTexParameteriv, NULL, 181),
-    NAME_FUNC_OFFSET(2180, glTexImage1D, glTexImage1D, NULL, 182),
-    NAME_FUNC_OFFSET(2193, glTexImage2D, glTexImage2D, NULL, 183),
-    NAME_FUNC_OFFSET(2206, glTexEnvf, glTexEnvf, NULL, 184),
-    NAME_FUNC_OFFSET(2216, glTexEnvfv, glTexEnvfv, NULL, 185),
-    NAME_FUNC_OFFSET(2227, glTexEnvi, glTexEnvi, NULL, 186),
-    NAME_FUNC_OFFSET(2237, glTexEnviv, glTexEnviv, NULL, 187),
-    NAME_FUNC_OFFSET(2248, glTexGend, glTexGend, NULL, 188),
-    NAME_FUNC_OFFSET(2258, glTexGendv, glTexGendv, NULL, 189),
-    NAME_FUNC_OFFSET(2269, glTexGenf, glTexGenf, NULL, 190),
-    NAME_FUNC_OFFSET(2279, glTexGenfv, glTexGenfv, NULL, 191),
-    NAME_FUNC_OFFSET(2290, glTexGeni, glTexGeni, NULL, 192),
-    NAME_FUNC_OFFSET(2300, glTexGeniv, glTexGeniv, NULL, 193),
-    NAME_FUNC_OFFSET(2311, glFeedbackBuffer, glFeedbackBuffer, NULL, 194),
-    NAME_FUNC_OFFSET(2328, glSelectBuffer, glSelectBuffer, NULL, 195),
-    NAME_FUNC_OFFSET(2343, glRenderMode, glRenderMode, NULL, 196),
-    NAME_FUNC_OFFSET(2356, glInitNames, glInitNames, NULL, 197),
-    NAME_FUNC_OFFSET(2368, glLoadName, glLoadName, NULL, 198),
-    NAME_FUNC_OFFSET(2379, glPassThrough, glPassThrough, NULL, 199),
-    NAME_FUNC_OFFSET(2393, glPopName, glPopName, NULL, 200),
-    NAME_FUNC_OFFSET(2403, glPushName, glPushName, NULL, 201),
-    NAME_FUNC_OFFSET(2414, glDrawBuffer, glDrawBuffer, NULL, 202),
-    NAME_FUNC_OFFSET(2427, glClear, glClear, NULL, 203),
-    NAME_FUNC_OFFSET(2435, glClearAccum, glClearAccum, NULL, 204),
-    NAME_FUNC_OFFSET(2448, glClearIndex, glClearIndex, NULL, 205),
-    NAME_FUNC_OFFSET(2461, glClearColor, glClearColor, NULL, 206),
-    NAME_FUNC_OFFSET(2474, glClearStencil, glClearStencil, NULL, 207),
-    NAME_FUNC_OFFSET(2489, glClearDepth, glClearDepth, NULL, 208),
-    NAME_FUNC_OFFSET(2502, glStencilMask, glStencilMask, NULL, 209),
-    NAME_FUNC_OFFSET(2516, glColorMask, glColorMask, NULL, 210),
-    NAME_FUNC_OFFSET(2528, glDepthMask, glDepthMask, NULL, 211),
-    NAME_FUNC_OFFSET(2540, glIndexMask, glIndexMask, NULL, 212),
-    NAME_FUNC_OFFSET(2552, glAccum, glAccum, NULL, 213),
-    NAME_FUNC_OFFSET(2560, glDisable, glDisable, NULL, 214),
-    NAME_FUNC_OFFSET(2570, glEnable, glEnable, NULL, 215),
-    NAME_FUNC_OFFSET(2579, glFinish, glFinish, NULL, 216),
-    NAME_FUNC_OFFSET(2588, glFlush, glFlush, NULL, 217),
-    NAME_FUNC_OFFSET(2596, glPopAttrib, glPopAttrib, NULL, 218),
-    NAME_FUNC_OFFSET(2608, glPushAttrib, glPushAttrib, NULL, 219),
-    NAME_FUNC_OFFSET(2621, glMap1d, glMap1d, NULL, 220),
-    NAME_FUNC_OFFSET(2629, glMap1f, glMap1f, NULL, 221),
-    NAME_FUNC_OFFSET(2637, glMap2d, glMap2d, NULL, 222),
-    NAME_FUNC_OFFSET(2645, glMap2f, glMap2f, NULL, 223),
-    NAME_FUNC_OFFSET(2653, glMapGrid1d, glMapGrid1d, NULL, 224),
-    NAME_FUNC_OFFSET(2665, glMapGrid1f, glMapGrid1f, NULL, 225),
-    NAME_FUNC_OFFSET(2677, glMapGrid2d, glMapGrid2d, NULL, 226),
-    NAME_FUNC_OFFSET(2689, glMapGrid2f, glMapGrid2f, NULL, 227),
-    NAME_FUNC_OFFSET(2701, glEvalCoord1d, glEvalCoord1d, NULL, 228),
-    NAME_FUNC_OFFSET(2715, glEvalCoord1dv, glEvalCoord1dv, NULL, 229),
-    NAME_FUNC_OFFSET(2730, glEvalCoord1f, glEvalCoord1f, NULL, 230),
-    NAME_FUNC_OFFSET(2744, glEvalCoord1fv, glEvalCoord1fv, NULL, 231),
-    NAME_FUNC_OFFSET(2759, glEvalCoord2d, glEvalCoord2d, NULL, 232),
-    NAME_FUNC_OFFSET(2773, glEvalCoord2dv, glEvalCoord2dv, NULL, 233),
-    NAME_FUNC_OFFSET(2788, glEvalCoord2f, glEvalCoord2f, NULL, 234),
-    NAME_FUNC_OFFSET(2802, glEvalCoord2fv, glEvalCoord2fv, NULL, 235),
-    NAME_FUNC_OFFSET(2817, glEvalMesh1, glEvalMesh1, NULL, 236),
-    NAME_FUNC_OFFSET(2829, glEvalPoint1, glEvalPoint1, NULL, 237),
-    NAME_FUNC_OFFSET(2842, glEvalMesh2, glEvalMesh2, NULL, 238),
-    NAME_FUNC_OFFSET(2854, glEvalPoint2, glEvalPoint2, NULL, 239),
-    NAME_FUNC_OFFSET(2867, glAlphaFunc, glAlphaFunc, NULL, 240),
-    NAME_FUNC_OFFSET(2879, glBlendFunc, glBlendFunc, NULL, 241),
-    NAME_FUNC_OFFSET(2891, glLogicOp, glLogicOp, NULL, 242),
-    NAME_FUNC_OFFSET(2901, glStencilFunc, glStencilFunc, NULL, 243),
-    NAME_FUNC_OFFSET(2915, glStencilOp, glStencilOp, NULL, 244),
-    NAME_FUNC_OFFSET(2927, glDepthFunc, glDepthFunc, NULL, 245),
-    NAME_FUNC_OFFSET(2939, glPixelZoom, glPixelZoom, NULL, 246),
-    NAME_FUNC_OFFSET(2951, glPixelTransferf, glPixelTransferf, NULL, 247),
-    NAME_FUNC_OFFSET(2968, glPixelTransferi, glPixelTransferi, NULL, 248),
-    NAME_FUNC_OFFSET(2985, glPixelStoref, glPixelStoref, NULL, 249),
-    NAME_FUNC_OFFSET(2999, glPixelStorei, glPixelStorei, NULL, 250),
-    NAME_FUNC_OFFSET(3013, glPixelMapfv, glPixelMapfv, NULL, 251),
-    NAME_FUNC_OFFSET(3026, glPixelMapuiv, glPixelMapuiv, NULL, 252),
-    NAME_FUNC_OFFSET(3040, glPixelMapusv, glPixelMapusv, NULL, 253),
-    NAME_FUNC_OFFSET(3054, glReadBuffer, glReadBuffer, NULL, 254),
-    NAME_FUNC_OFFSET(3067, glCopyPixels, glCopyPixels, NULL, 255),
-    NAME_FUNC_OFFSET(3080, glReadPixels, glReadPixels, NULL, 256),
-    NAME_FUNC_OFFSET(3093, glDrawPixels, glDrawPixels, NULL, 257),
-    NAME_FUNC_OFFSET(3106, glGetBooleanv, glGetBooleanv, NULL, 258),
-    NAME_FUNC_OFFSET(3120, glGetClipPlane, glGetClipPlane, NULL, 259),
-    NAME_FUNC_OFFSET(3135, glGetDoublev, glGetDoublev, NULL, 260),
-    NAME_FUNC_OFFSET(3148, glGetError, glGetError, NULL, 261),
-    NAME_FUNC_OFFSET(3159, glGetFloatv, glGetFloatv, NULL, 262),
-    NAME_FUNC_OFFSET(3171, glGetIntegerv, glGetIntegerv, NULL, 263),
-    NAME_FUNC_OFFSET(3185, glGetLightfv, glGetLightfv, NULL, 264),
-    NAME_FUNC_OFFSET(3198, glGetLightiv, glGetLightiv, NULL, 265),
-    NAME_FUNC_OFFSET(3211, glGetMapdv, glGetMapdv, NULL, 266),
-    NAME_FUNC_OFFSET(3222, glGetMapfv, glGetMapfv, NULL, 267),
-    NAME_FUNC_OFFSET(3233, glGetMapiv, glGetMapiv, NULL, 268),
-    NAME_FUNC_OFFSET(3244, glGetMaterialfv, glGetMaterialfv, NULL, 269),
-    NAME_FUNC_OFFSET(3260, glGetMaterialiv, glGetMaterialiv, NULL, 270),
-    NAME_FUNC_OFFSET(3276, glGetPixelMapfv, glGetPixelMapfv, NULL, 271),
-    NAME_FUNC_OFFSET(3292, glGetPixelMapuiv, glGetPixelMapuiv, NULL, 272),
-    NAME_FUNC_OFFSET(3309, glGetPixelMapusv, glGetPixelMapusv, NULL, 273),
-    NAME_FUNC_OFFSET(3326, glGetPolygonStipple, glGetPolygonStipple, NULL, 274),
-    NAME_FUNC_OFFSET(3346, glGetString, glGetString, NULL, 275),
-    NAME_FUNC_OFFSET(3358, glGetTexEnvfv, glGetTexEnvfv, NULL, 276),
-    NAME_FUNC_OFFSET(3372, glGetTexEnviv, glGetTexEnviv, NULL, 277),
-    NAME_FUNC_OFFSET(3386, glGetTexGendv, glGetTexGendv, NULL, 278),
-    NAME_FUNC_OFFSET(3400, glGetTexGenfv, glGetTexGenfv, NULL, 279),
-    NAME_FUNC_OFFSET(3414, glGetTexGeniv, glGetTexGeniv, NULL, 280),
-    NAME_FUNC_OFFSET(3428, glGetTexImage, glGetTexImage, NULL, 281),
-    NAME_FUNC_OFFSET(3442, glGetTexParameterfv, glGetTexParameterfv, NULL, 282),
-    NAME_FUNC_OFFSET(3462, glGetTexParameteriv, glGetTexParameteriv, NULL, 283),
-    NAME_FUNC_OFFSET(3482, glGetTexLevelParameterfv, glGetTexLevelParameterfv,
-                     NULL, 284),
-    NAME_FUNC_OFFSET(3507, glGetTexLevelParameteriv, glGetTexLevelParameteriv,
-                     NULL, 285),
-    NAME_FUNC_OFFSET(3532, glIsEnabled, glIsEnabled, NULL, 286),
-    NAME_FUNC_OFFSET(3544, glIsList, glIsList, NULL, 287),
-    NAME_FUNC_OFFSET(3553, glDepthRange, glDepthRange, NULL, 288),
-    NAME_FUNC_OFFSET(3566, glFrustum, glFrustum, NULL, 289),
-    NAME_FUNC_OFFSET(3576, glLoadIdentity, glLoadIdentity, NULL, 290),
-    NAME_FUNC_OFFSET(3591, glLoadMatrixf, glLoadMatrixf, NULL, 291),
-    NAME_FUNC_OFFSET(3605, glLoadMatrixd, glLoadMatrixd, NULL, 292),
-    NAME_FUNC_OFFSET(3619, glMatrixMode, glMatrixMode, NULL, 293),
-    NAME_FUNC_OFFSET(3632, glMultMatrixf, glMultMatrixf, NULL, 294),
-    NAME_FUNC_OFFSET(3646, glMultMatrixd, glMultMatrixd, NULL, 295),
-    NAME_FUNC_OFFSET(3660, glOrtho, glOrtho, NULL, 296),
-    NAME_FUNC_OFFSET(3668, glPopMatrix, glPopMatrix, NULL, 297),
-    NAME_FUNC_OFFSET(3680, glPushMatrix, glPushMatrix, NULL, 298),
-    NAME_FUNC_OFFSET(3693, glRotated, glRotated, NULL, 299),
-    NAME_FUNC_OFFSET(3703, glRotatef, glRotatef, NULL, 300),
-    NAME_FUNC_OFFSET(3713, glScaled, glScaled, NULL, 301),
-    NAME_FUNC_OFFSET(3722, glScalef, glScalef, NULL, 302),
-    NAME_FUNC_OFFSET(3731, glTranslated, glTranslated, NULL, 303),
-    NAME_FUNC_OFFSET(3744, glTranslatef, glTranslatef, NULL, 304),
-    NAME_FUNC_OFFSET(3757, glViewport, glViewport, NULL, 305),
-    NAME_FUNC_OFFSET(3768, glArrayElement, glArrayElement, NULL, 306),
-    NAME_FUNC_OFFSET(3783, glBindTexture, glBindTexture, NULL, 307),
-    NAME_FUNC_OFFSET(3797, glColorPointer, glColorPointer, NULL, 308),
-    NAME_FUNC_OFFSET(3812, glDisableClientState, glDisableClientState, NULL,
-                     309),
-    NAME_FUNC_OFFSET(3833, glDrawArrays, glDrawArrays, NULL, 310),
-    NAME_FUNC_OFFSET(3846, glDrawElements, glDrawElements, NULL, 311),
-    NAME_FUNC_OFFSET(3861, glEdgeFlagPointer, glEdgeFlagPointer, NULL, 312),
-    NAME_FUNC_OFFSET(3879, glEnableClientState, glEnableClientState, NULL, 313),
-    NAME_FUNC_OFFSET(3899, glIndexPointer, glIndexPointer, NULL, 314),
-    NAME_FUNC_OFFSET(3914, glIndexub, glIndexub, NULL, 315),
-    NAME_FUNC_OFFSET(3924, glIndexubv, glIndexubv, NULL, 316),
-    NAME_FUNC_OFFSET(3935, glInterleavedArrays, glInterleavedArrays, NULL, 317),
-    NAME_FUNC_OFFSET(3955, glNormalPointer, glNormalPointer, NULL, 318),
-    NAME_FUNC_OFFSET(3971, glPolygonOffset, glPolygonOffset, NULL, 319),
-    NAME_FUNC_OFFSET(3987, glTexCoordPointer, glTexCoordPointer, NULL, 320),
-    NAME_FUNC_OFFSET(4005, glVertexPointer, glVertexPointer, NULL, 321),
-    NAME_FUNC_OFFSET(4021, glAreTexturesResident, glAreTexturesResident, NULL,
-                     322),
-    NAME_FUNC_OFFSET(4043, glCopyTexImage1D, glCopyTexImage1D, NULL, 323),
-    NAME_FUNC_OFFSET(4060, glCopyTexImage2D, glCopyTexImage2D, NULL, 324),
-    NAME_FUNC_OFFSET(4077, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL, 325),
-    NAME_FUNC_OFFSET(4097, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL, 326),
-    NAME_FUNC_OFFSET(4117, glDeleteTextures, glDeleteTextures, NULL, 327),
-    NAME_FUNC_OFFSET(4134, glGenTextures, glGenTextures, NULL, 328),
-    NAME_FUNC_OFFSET(4148, glGetPointerv, glGetPointerv, NULL, 329),
-    NAME_FUNC_OFFSET(4162, glIsTexture, glIsTexture, NULL, 330),
-    NAME_FUNC_OFFSET(4174, glPrioritizeTextures, glPrioritizeTextures, NULL,
-                     331),
-    NAME_FUNC_OFFSET(4195, glTexSubImage1D, glTexSubImage1D, NULL, 332),
-    NAME_FUNC_OFFSET(4211, glTexSubImage2D, glTexSubImage2D, NULL, 333),
-    NAME_FUNC_OFFSET(4227, glPopClientAttrib, glPopClientAttrib, NULL, 334),
-    NAME_FUNC_OFFSET(4245, glPushClientAttrib, glPushClientAttrib, NULL, 335),
-    NAME_FUNC_OFFSET(4264, glBlendColor, glBlendColor, NULL, 336),
-    NAME_FUNC_OFFSET(4277, glBlendEquation, glBlendEquation, NULL, 337),
-    NAME_FUNC_OFFSET(4293, glDrawRangeElements, glDrawRangeElements, NULL, 338),
-    NAME_FUNC_OFFSET(4313, glColorTable, glColorTable, NULL, 339),
-    NAME_FUNC_OFFSET(4326, glColorTableParameterfv, glColorTableParameterfv,
-                     NULL, 340),
-    NAME_FUNC_OFFSET(4350, glColorTableParameteriv, glColorTableParameteriv,
-                     NULL, 341),
-    NAME_FUNC_OFFSET(4374, glCopyColorTable, glCopyColorTable, NULL, 342),
-    NAME_FUNC_OFFSET(4391, glGetColorTable, glGetColorTable, NULL, 343),
-    NAME_FUNC_OFFSET(4407, glGetColorTableParameterfv,
-                     glGetColorTableParameterfv, NULL, 344),
-    NAME_FUNC_OFFSET(4434, glGetColorTableParameteriv,
-                     glGetColorTableParameteriv, NULL, 345),
-    NAME_FUNC_OFFSET(4461, glColorSubTable, glColorSubTable, NULL, 346),
-    NAME_FUNC_OFFSET(4477, glCopyColorSubTable, glCopyColorSubTable, NULL, 347),
-    NAME_FUNC_OFFSET(4497, glConvolutionFilter1D, glConvolutionFilter1D, NULL,
-                     348),
-    NAME_FUNC_OFFSET(4519, glConvolutionFilter2D, glConvolutionFilter2D, NULL,
-                     349),
-    NAME_FUNC_OFFSET(4541, glConvolutionParameterf, glConvolutionParameterf,
-                     NULL, 350),
-    NAME_FUNC_OFFSET(4565, glConvolutionParameterfv, glConvolutionParameterfv,
-                     NULL, 351),
-    NAME_FUNC_OFFSET(4590, glConvolutionParameteri, glConvolutionParameteri,
-                     NULL, 352),
-    NAME_FUNC_OFFSET(4614, glConvolutionParameteriv, glConvolutionParameteriv,
-                     NULL, 353),
-    NAME_FUNC_OFFSET(4639, glCopyConvolutionFilter1D, glCopyConvolutionFilter1D,
-                     NULL, 354),
-    NAME_FUNC_OFFSET(4665, glCopyConvolutionFilter2D, glCopyConvolutionFilter2D,
-                     NULL, 355),
-    NAME_FUNC_OFFSET(4691, glGetConvolutionFilter, glGetConvolutionFilter, NULL,
-                     356),
-    NAME_FUNC_OFFSET(4714, glGetConvolutionParameterfv,
-                     glGetConvolutionParameterfv, NULL, 357),
-    NAME_FUNC_OFFSET(4742, glGetConvolutionParameteriv,
-                     glGetConvolutionParameteriv, NULL, 358),
-    NAME_FUNC_OFFSET(4770, glGetSeparableFilter, glGetSeparableFilter, NULL,
-                     359),
-    NAME_FUNC_OFFSET(4791, glSeparableFilter2D, glSeparableFilter2D, NULL, 360),
-    NAME_FUNC_OFFSET(4811, glGetHistogram, glGetHistogram, NULL, 361),
-    NAME_FUNC_OFFSET(4826, glGetHistogramParameterfv, glGetHistogramParameterfv,
-                     NULL, 362),
-    NAME_FUNC_OFFSET(4852, glGetHistogramParameteriv, glGetHistogramParameteriv,
-                     NULL, 363),
-    NAME_FUNC_OFFSET(4878, glGetMinmax, glGetMinmax, NULL, 364),
-    NAME_FUNC_OFFSET(4890, glGetMinmaxParameterfv, glGetMinmaxParameterfv, NULL,
-                     365),
-    NAME_FUNC_OFFSET(4913, glGetMinmaxParameteriv, glGetMinmaxParameteriv, NULL,
-                     366),
-    NAME_FUNC_OFFSET(4936, glHistogram, glHistogram, NULL, 367),
-    NAME_FUNC_OFFSET(4948, glMinmax, glMinmax, NULL, 368),
-    NAME_FUNC_OFFSET(4957, glResetHistogram, glResetHistogram, NULL, 369),
-    NAME_FUNC_OFFSET(4974, glResetMinmax, glResetMinmax, NULL, 370),
-    NAME_FUNC_OFFSET(4988, glTexImage3D, glTexImage3D, NULL, 371),
-    NAME_FUNC_OFFSET(5001, glTexSubImage3D, glTexSubImage3D, NULL, 372),
-    NAME_FUNC_OFFSET(5017, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, 373),
-    NAME_FUNC_OFFSET(5037, glActiveTextureARB, glActiveTextureARB, NULL, 374),
-    NAME_FUNC_OFFSET(5056, glClientActiveTextureARB, glClientActiveTextureARB,
-                     NULL, 375),
-    NAME_FUNC_OFFSET(5081, glMultiTexCoord1dARB, glMultiTexCoord1dARB, NULL,
-                     376),
-    NAME_FUNC_OFFSET(5102, glMultiTexCoord1dvARB, glMultiTexCoord1dvARB, NULL,
-                     377),
-    NAME_FUNC_OFFSET(5124, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL,
-                     378),
-    NAME_FUNC_OFFSET(5145, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL,
-                     379),
-    NAME_FUNC_OFFSET(5167, glMultiTexCoord1iARB, glMultiTexCoord1iARB, NULL,
-                     380),
-    NAME_FUNC_OFFSET(5188, glMultiTexCoord1ivARB, glMultiTexCoord1ivARB, NULL,
-                     381),
-    NAME_FUNC_OFFSET(5210, glMultiTexCoord1sARB, glMultiTexCoord1sARB, NULL,
-                     382),
-    NAME_FUNC_OFFSET(5231, glMultiTexCoord1svARB, glMultiTexCoord1svARB, NULL,
-                     383),
-    NAME_FUNC_OFFSET(5253, glMultiTexCoord2dARB, glMultiTexCoord2dARB, NULL,
-                     384),
-    NAME_FUNC_OFFSET(5274, glMultiTexCoord2dvARB, glMultiTexCoord2dvARB, NULL,
-                     385),
-    NAME_FUNC_OFFSET(5296, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL,
-                     386),
-    NAME_FUNC_OFFSET(5317, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL,
-                     387),
-    NAME_FUNC_OFFSET(5339, glMultiTexCoord2iARB, glMultiTexCoord2iARB, NULL,
-                     388),
-    NAME_FUNC_OFFSET(5360, glMultiTexCoord2ivARB, glMultiTexCoord2ivARB, NULL,
-                     389),
-    NAME_FUNC_OFFSET(5382, glMultiTexCoord2sARB, glMultiTexCoord2sARB, NULL,
-                     390),
-    NAME_FUNC_OFFSET(5403, glMultiTexCoord2svARB, glMultiTexCoord2svARB, NULL,
-                     391),
-    NAME_FUNC_OFFSET(5425, glMultiTexCoord3dARB, glMultiTexCoord3dARB, NULL,
-                     392),
-    NAME_FUNC_OFFSET(5446, glMultiTexCoord3dvARB, glMultiTexCoord3dvARB, NULL,
-                     393),
-    NAME_FUNC_OFFSET(5468, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL,
-                     394),
-    NAME_FUNC_OFFSET(5489, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL,
-                     395),
-    NAME_FUNC_OFFSET(5511, glMultiTexCoord3iARB, glMultiTexCoord3iARB, NULL,
-                     396),
-    NAME_FUNC_OFFSET(5532, glMultiTexCoord3ivARB, glMultiTexCoord3ivARB, NULL,
-                     397),
-    NAME_FUNC_OFFSET(5554, glMultiTexCoord3sARB, glMultiTexCoord3sARB, NULL,
-                     398),
-    NAME_FUNC_OFFSET(5575, glMultiTexCoord3svARB, glMultiTexCoord3svARB, NULL,
-                     399),
-    NAME_FUNC_OFFSET(5597, glMultiTexCoord4dARB, glMultiTexCoord4dARB, NULL,
-                     400),
-    NAME_FUNC_OFFSET(5618, glMultiTexCoord4dvARB, glMultiTexCoord4dvARB, NULL,
-                     401),
-    NAME_FUNC_OFFSET(5640, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL,
-                     402),
-    NAME_FUNC_OFFSET(5661, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL,
-                     403),
-    NAME_FUNC_OFFSET(5683, glMultiTexCoord4iARB, glMultiTexCoord4iARB, NULL,
-                     404),
-    NAME_FUNC_OFFSET(5704, glMultiTexCoord4ivARB, glMultiTexCoord4ivARB, NULL,
-                     405),
-    NAME_FUNC_OFFSET(5726, glMultiTexCoord4sARB, glMultiTexCoord4sARB, NULL,
-                     406),
-    NAME_FUNC_OFFSET(5747, glMultiTexCoord4svARB, glMultiTexCoord4svARB, NULL,
-                     407),
-    NAME_FUNC_OFFSET(5769, glAttachShader, glAttachShader, NULL, 408),
-    NAME_FUNC_OFFSET(5784, glCreateProgram, glCreateProgram, NULL, 409),
-    NAME_FUNC_OFFSET(5800, glCreateShader, glCreateShader, NULL, 410),
-    NAME_FUNC_OFFSET(5815, glDeleteProgram, glDeleteProgram, NULL, 411),
-    NAME_FUNC_OFFSET(5831, glDeleteShader, glDeleteShader, NULL, 412),
-    NAME_FUNC_OFFSET(5846, glDetachShader, glDetachShader, NULL, 413),
-    NAME_FUNC_OFFSET(5861, glGetAttachedShaders, glGetAttachedShaders, NULL,
-                     414),
-    NAME_FUNC_OFFSET(5882, glGetProgramInfoLog, glGetProgramInfoLog, NULL, 415),
-    NAME_FUNC_OFFSET(5902, glGetProgramiv, glGetProgramiv, NULL, 416),
-    NAME_FUNC_OFFSET(5917, glGetShaderInfoLog, glGetShaderInfoLog, NULL, 417),
-    NAME_FUNC_OFFSET(5936, glGetShaderiv, glGetShaderiv, NULL, 418),
-    NAME_FUNC_OFFSET(5950, glIsProgram, glIsProgram, NULL, 419),
-    NAME_FUNC_OFFSET(5962, glIsShader, glIsShader, NULL, 420),
-    NAME_FUNC_OFFSET(5973, glStencilFuncSeparate, glStencilFuncSeparate, NULL,
-                     421),
-    NAME_FUNC_OFFSET(5995, glStencilMaskSeparate, glStencilMaskSeparate, NULL,
-                     422),
-    NAME_FUNC_OFFSET(6017, glStencilOpSeparate, glStencilOpSeparate, NULL, 423),
-    NAME_FUNC_OFFSET(6037, glUniformMatrix2x3fv, glUniformMatrix2x3fv, NULL,
-                     424),
-    NAME_FUNC_OFFSET(6058, glUniformMatrix2x4fv, glUniformMatrix2x4fv, NULL,
-                     425),
-    NAME_FUNC_OFFSET(6079, glUniformMatrix3x2fv, glUniformMatrix3x2fv, NULL,
-                     426),
-    NAME_FUNC_OFFSET(6100, glUniformMatrix3x4fv, glUniformMatrix3x4fv, NULL,
-                     427),
-    NAME_FUNC_OFFSET(6121, glUniformMatrix4x2fv, glUniformMatrix4x2fv, NULL,
-                     428),
-    NAME_FUNC_OFFSET(6142, glUniformMatrix4x3fv, glUniformMatrix4x3fv, NULL,
-                     429),
-    NAME_FUNC_OFFSET(6163, glClampColor, glClampColor, NULL, 430),
-    NAME_FUNC_OFFSET(6176, glClearBufferfi, glClearBufferfi, NULL, 431),
-    NAME_FUNC_OFFSET(6192, glClearBufferfv, glClearBufferfv, NULL, 432),
-    NAME_FUNC_OFFSET(6208, glClearBufferiv, glClearBufferiv, NULL, 433),
-    NAME_FUNC_OFFSET(6224, glClearBufferuiv, glClearBufferuiv, NULL, 434),
-    NAME_FUNC_OFFSET(6241, glGetStringi, glGetStringi, NULL, 435),
-    NAME_FUNC_OFFSET(6254, glTexBuffer, glTexBuffer, NULL, 436),
-    NAME_FUNC_OFFSET(6266, glFramebufferTexture, glFramebufferTexture, NULL,
-                     437),
-    NAME_FUNC_OFFSET(6287, glGetBufferParameteri64v, glGetBufferParameteri64v,
-                     NULL, 438),
-    NAME_FUNC_OFFSET(6312, glGetInteger64i_v, glGetInteger64i_v, NULL, 439),
-    NAME_FUNC_OFFSET(6330, glVertexAttribDivisor, glVertexAttribDivisor, NULL,
-                     440),
-    NAME_FUNC_OFFSET(6352, glLoadTransposeMatrixdARB, glLoadTransposeMatrixdARB,
-                     NULL, 441),
-    NAME_FUNC_OFFSET(6378, glLoadTransposeMatrixfARB, glLoadTransposeMatrixfARB,
-                     NULL, 442),
-    NAME_FUNC_OFFSET(6404, glMultTransposeMatrixdARB, glMultTransposeMatrixdARB,
-                     NULL, 443),
-    NAME_FUNC_OFFSET(6430, glMultTransposeMatrixfARB, glMultTransposeMatrixfARB,
-                     NULL, 444),
-    NAME_FUNC_OFFSET(6456, glSampleCoverageARB, glSampleCoverageARB, NULL, 445),
-    NAME_FUNC_OFFSET(6476, glCompressedTexImage1DARB, glCompressedTexImage1DARB,
-                     NULL, 446),
-    NAME_FUNC_OFFSET(6502, glCompressedTexImage2DARB, glCompressedTexImage2DARB,
-                     NULL, 447),
-    NAME_FUNC_OFFSET(6528, glCompressedTexImage3DARB, glCompressedTexImage3DARB,
-                     NULL, 448),
-    NAME_FUNC_OFFSET(6554, glCompressedTexSubImage1DARB,
-                     glCompressedTexSubImage1DARB, NULL, 449),
-    NAME_FUNC_OFFSET(6583, glCompressedTexSubImage2DARB,
-                     glCompressedTexSubImage2DARB, NULL, 450),
-    NAME_FUNC_OFFSET(6612, glCompressedTexSubImage3DARB,
-                     glCompressedTexSubImage3DARB, NULL, 451),
-    NAME_FUNC_OFFSET(6641, glGetCompressedTexImageARB,
-                     glGetCompressedTexImageARB, NULL, 452),
-    NAME_FUNC_OFFSET(6668, glDisableVertexAttribArrayARB,
-                     glDisableVertexAttribArrayARB, NULL, 453),
-    NAME_FUNC_OFFSET(6698, glEnableVertexAttribArrayARB,
-                     glEnableVertexAttribArrayARB, NULL, 454),
-    NAME_FUNC_OFFSET(6727, glGetProgramEnvParameterdvARB,
-                     glGetProgramEnvParameterdvARB, NULL, 455),
-    NAME_FUNC_OFFSET(6757, glGetProgramEnvParameterfvARB,
-                     glGetProgramEnvParameterfvARB, NULL, 456),
-    NAME_FUNC_OFFSET(6787, glGetProgramLocalParameterdvARB,
-                     glGetProgramLocalParameterdvARB, NULL, 457),
-    NAME_FUNC_OFFSET(6819, glGetProgramLocalParameterfvARB,
-                     glGetProgramLocalParameterfvARB, NULL, 458),
-    NAME_FUNC_OFFSET(6851, glGetProgramStringARB, glGetProgramStringARB, NULL,
-                     459),
-    NAME_FUNC_OFFSET(6873, glGetProgramivARB, glGetProgramivARB, NULL, 460),
-    NAME_FUNC_OFFSET(6891, glGetVertexAttribdvARB, glGetVertexAttribdvARB, NULL,
-                     461),
-    NAME_FUNC_OFFSET(6914, glGetVertexAttribfvARB, glGetVertexAttribfvARB, NULL,
-                     462),
-    NAME_FUNC_OFFSET(6937, glGetVertexAttribivARB, glGetVertexAttribivARB, NULL,
-                     463),
-    NAME_FUNC_OFFSET(6960, glProgramEnvParameter4dARB,
-                     glProgramEnvParameter4dARB, NULL, 464),
-    NAME_FUNC_OFFSET(6987, glProgramEnvParameter4dvARB,
-                     glProgramEnvParameter4dvARB, NULL, 465),
-    NAME_FUNC_OFFSET(7015, glProgramEnvParameter4fARB,
-                     glProgramEnvParameter4fARB, NULL, 466),
-    NAME_FUNC_OFFSET(7042, glProgramEnvParameter4fvARB,
-                     glProgramEnvParameter4fvARB, NULL, 467),
-    NAME_FUNC_OFFSET(7070, glProgramLocalParameter4dARB,
-                     glProgramLocalParameter4dARB, NULL, 468),
-    NAME_FUNC_OFFSET(7099, glProgramLocalParameter4dvARB,
-                     glProgramLocalParameter4dvARB, NULL, 469),
-    NAME_FUNC_OFFSET(7129, glProgramLocalParameter4fARB,
-                     glProgramLocalParameter4fARB, NULL, 470),
-    NAME_FUNC_OFFSET(7158, glProgramLocalParameter4fvARB,
-                     glProgramLocalParameter4fvARB, NULL, 471),
-    NAME_FUNC_OFFSET(7188, glProgramStringARB, glProgramStringARB, NULL, 472),
-    NAME_FUNC_OFFSET(7207, glVertexAttrib1dARB, glVertexAttrib1dARB, NULL, 473),
-    NAME_FUNC_OFFSET(7227, glVertexAttrib1dvARB, glVertexAttrib1dvARB, NULL,
-                     474),
-    NAME_FUNC_OFFSET(7248, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, 475),
-    NAME_FUNC_OFFSET(7268, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL,
-                     476),
-    NAME_FUNC_OFFSET(7289, glVertexAttrib1sARB, glVertexAttrib1sARB, NULL, 477),
-    NAME_FUNC_OFFSET(7309, glVertexAttrib1svARB, glVertexAttrib1svARB, NULL,
-                     478),
-    NAME_FUNC_OFFSET(7330, glVertexAttrib2dARB, glVertexAttrib2dARB, NULL, 479),
-    NAME_FUNC_OFFSET(7350, glVertexAttrib2dvARB, glVertexAttrib2dvARB, NULL,
-                     480),
-    NAME_FUNC_OFFSET(7371, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, 481),
-    NAME_FUNC_OFFSET(7391, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL,
-                     482),
-    NAME_FUNC_OFFSET(7412, glVertexAttrib2sARB, glVertexAttrib2sARB, NULL, 483),
-    NAME_FUNC_OFFSET(7432, glVertexAttrib2svARB, glVertexAttrib2svARB, NULL,
-                     484),
-    NAME_FUNC_OFFSET(7453, glVertexAttrib3dARB, glVertexAttrib3dARB, NULL, 485),
-    NAME_FUNC_OFFSET(7473, glVertexAttrib3dvARB, glVertexAttrib3dvARB, NULL,
-                     486),
-    NAME_FUNC_OFFSET(7494, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, 487),
-    NAME_FUNC_OFFSET(7514, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL,
-                     488),
-    NAME_FUNC_OFFSET(7535, glVertexAttrib3sARB, glVertexAttrib3sARB, NULL, 489),
-    NAME_FUNC_OFFSET(7555, glVertexAttrib3svARB, glVertexAttrib3svARB, NULL,
-                     490),
-    NAME_FUNC_OFFSET(7576, glVertexAttrib4NbvARB, glVertexAttrib4NbvARB, NULL,
-                     491),
-    NAME_FUNC_OFFSET(7598, glVertexAttrib4NivARB, glVertexAttrib4NivARB, NULL,
-                     492),
-    NAME_FUNC_OFFSET(7620, glVertexAttrib4NsvARB, glVertexAttrib4NsvARB, NULL,
-                     493),
-    NAME_FUNC_OFFSET(7642, glVertexAttrib4NubARB, glVertexAttrib4NubARB, NULL,
-                     494),
-    NAME_FUNC_OFFSET(7664, glVertexAttrib4NubvARB, glVertexAttrib4NubvARB, NULL,
-                     495),
-    NAME_FUNC_OFFSET(7687, glVertexAttrib4NuivARB, glVertexAttrib4NuivARB, NULL,
-                     496),
-    NAME_FUNC_OFFSET(7710, glVertexAttrib4NusvARB, glVertexAttrib4NusvARB, NULL,
-                     497),
-    NAME_FUNC_OFFSET(7733, glVertexAttrib4bvARB, glVertexAttrib4bvARB, NULL,
-                     498),
-    NAME_FUNC_OFFSET(7754, glVertexAttrib4dARB, glVertexAttrib4dARB, NULL, 499),
-    NAME_FUNC_OFFSET(7774, glVertexAttrib4dvARB, glVertexAttrib4dvARB, NULL,
-                     500),
-    NAME_FUNC_OFFSET(7795, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, 501),
-    NAME_FUNC_OFFSET(7815, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL,
-                     502),
-    NAME_FUNC_OFFSET(7836, glVertexAttrib4ivARB, glVertexAttrib4ivARB, NULL,
-                     503),
-    NAME_FUNC_OFFSET(7857, glVertexAttrib4sARB, glVertexAttrib4sARB, NULL, 504),
-    NAME_FUNC_OFFSET(7877, glVertexAttrib4svARB, glVertexAttrib4svARB, NULL,
-                     505),
-    NAME_FUNC_OFFSET(7898, glVertexAttrib4ubvARB, glVertexAttrib4ubvARB, NULL,
-                     506),
-    NAME_FUNC_OFFSET(7920, glVertexAttrib4uivARB, glVertexAttrib4uivARB, NULL,
-                     507),
-    NAME_FUNC_OFFSET(7942, glVertexAttrib4usvARB, glVertexAttrib4usvARB, NULL,
-                     508),
-    NAME_FUNC_OFFSET(7964, glVertexAttribPointerARB, glVertexAttribPointerARB,
-                     NULL, 509),
-    NAME_FUNC_OFFSET(7989, glBindBufferARB, glBindBufferARB, NULL, 510),
-    NAME_FUNC_OFFSET(8005, glBufferDataARB, glBufferDataARB, NULL, 511),
-    NAME_FUNC_OFFSET(8021, glBufferSubDataARB, glBufferSubDataARB, NULL, 512),
-    NAME_FUNC_OFFSET(8040, glDeleteBuffersARB, glDeleteBuffersARB, NULL, 513),
-    NAME_FUNC_OFFSET(8059, glGenBuffersARB, glGenBuffersARB, NULL, 514),
-    NAME_FUNC_OFFSET(8075, glGetBufferParameterivARB, glGetBufferParameterivARB,
-                     NULL, 515),
-    NAME_FUNC_OFFSET(8101, glGetBufferPointervARB, glGetBufferPointervARB, NULL,
-                     516),
-    NAME_FUNC_OFFSET(8124, glGetBufferSubDataARB, glGetBufferSubDataARB, NULL,
-                     517),
-    NAME_FUNC_OFFSET(8146, glIsBufferARB, glIsBufferARB, NULL, 518),
-    NAME_FUNC_OFFSET(8160, glMapBufferARB, glMapBufferARB, NULL, 519),
-    NAME_FUNC_OFFSET(8175, glUnmapBufferARB, glUnmapBufferARB, NULL, 520),
-    NAME_FUNC_OFFSET(8192, glBeginQueryARB, glBeginQueryARB, NULL, 521),
-    NAME_FUNC_OFFSET(8208, glDeleteQueriesARB, glDeleteQueriesARB, NULL, 522),
-    NAME_FUNC_OFFSET(8227, glEndQueryARB, glEndQueryARB, NULL, 523),
-    NAME_FUNC_OFFSET(8241, glGenQueriesARB, glGenQueriesARB, NULL, 524),
-    NAME_FUNC_OFFSET(8257, glGetQueryObjectivARB, glGetQueryObjectivARB, NULL,
-                     525),
-    NAME_FUNC_OFFSET(8279, glGetQueryObjectuivARB, glGetQueryObjectuivARB, NULL,
-                     526),
-    NAME_FUNC_OFFSET(8302, glGetQueryivARB, glGetQueryivARB, NULL, 527),
-    NAME_FUNC_OFFSET(8318, glIsQueryARB, glIsQueryARB, NULL, 528),
-    NAME_FUNC_OFFSET(8331, glAttachObjectARB, glAttachObjectARB, NULL, 529),
-    NAME_FUNC_OFFSET(8349, glCompileShaderARB, glCompileShaderARB, NULL, 530),
-    NAME_FUNC_OFFSET(8368, glCreateProgramObjectARB, glCreateProgramObjectARB,
-                     NULL, 531),
-    NAME_FUNC_OFFSET(8393, glCreateShaderObjectARB, glCreateShaderObjectARB,
-                     NULL, 532),
-    NAME_FUNC_OFFSET(8417, glDeleteObjectARB, glDeleteObjectARB, NULL, 533),
-    NAME_FUNC_OFFSET(8435, glDetachObjectARB, glDetachObjectARB, NULL, 534),
-    NAME_FUNC_OFFSET(8453, glGetActiveUniformARB, glGetActiveUniformARB, NULL,
-                     535),
-    NAME_FUNC_OFFSET(8475, glGetAttachedObjectsARB, glGetAttachedObjectsARB,
-                     NULL, 536),
-    NAME_FUNC_OFFSET(8499, glGetHandleARB, glGetHandleARB, NULL, 537),
-    NAME_FUNC_OFFSET(8514, glGetInfoLogARB, glGetInfoLogARB, NULL, 538),
-    NAME_FUNC_OFFSET(8530, glGetObjectParameterfvARB, glGetObjectParameterfvARB,
-                     NULL, 539),
-    NAME_FUNC_OFFSET(8556, glGetObjectParameterivARB, glGetObjectParameterivARB,
-                     NULL, 540),
-    NAME_FUNC_OFFSET(8582, glGetShaderSourceARB, glGetShaderSourceARB, NULL,
-                     541),
-    NAME_FUNC_OFFSET(8603, glGetUniformLocationARB, glGetUniformLocationARB,
-                     NULL, 542),
-    NAME_FUNC_OFFSET(8627, glGetUniformfvARB, glGetUniformfvARB, NULL, 543),
-    NAME_FUNC_OFFSET(8645, glGetUniformivARB, glGetUniformivARB, NULL, 544),
-    NAME_FUNC_OFFSET(8663, glLinkProgramARB, glLinkProgramARB, NULL, 545),
-    NAME_FUNC_OFFSET(8680, glShaderSourceARB, glShaderSourceARB, NULL, 546),
-    NAME_FUNC_OFFSET(8698, glUniform1fARB, glUniform1fARB, NULL, 547),
-    NAME_FUNC_OFFSET(8713, glUniform1fvARB, glUniform1fvARB, NULL, 548),
-    NAME_FUNC_OFFSET(8729, glUniform1iARB, glUniform1iARB, NULL, 549),
-    NAME_FUNC_OFFSET(8744, glUniform1ivARB, glUniform1ivARB, NULL, 550),
-    NAME_FUNC_OFFSET(8760, glUniform2fARB, glUniform2fARB, NULL, 551),
-    NAME_FUNC_OFFSET(8775, glUniform2fvARB, glUniform2fvARB, NULL, 552),
-    NAME_FUNC_OFFSET(8791, glUniform2iARB, glUniform2iARB, NULL, 553),
-    NAME_FUNC_OFFSET(8806, glUniform2ivARB, glUniform2ivARB, NULL, 554),
-    NAME_FUNC_OFFSET(8822, glUniform3fARB, glUniform3fARB, NULL, 555),
-    NAME_FUNC_OFFSET(8837, glUniform3fvARB, glUniform3fvARB, NULL, 556),
-    NAME_FUNC_OFFSET(8853, glUniform3iARB, glUniform3iARB, NULL, 557),
-    NAME_FUNC_OFFSET(8868, glUniform3ivARB, glUniform3ivARB, NULL, 558),
-    NAME_FUNC_OFFSET(8884, glUniform4fARB, glUniform4fARB, NULL, 559),
-    NAME_FUNC_OFFSET(8899, glUniform4fvARB, glUniform4fvARB, NULL, 560),
-    NAME_FUNC_OFFSET(8915, glUniform4iARB, glUniform4iARB, NULL, 561),
-    NAME_FUNC_OFFSET(8930, glUniform4ivARB, glUniform4ivARB, NULL, 562),
-    NAME_FUNC_OFFSET(8946, glUniformMatrix2fvARB, glUniformMatrix2fvARB, NULL,
-                     563),
-    NAME_FUNC_OFFSET(8968, glUniformMatrix3fvARB, glUniformMatrix3fvARB, NULL,
-                     564),
-    NAME_FUNC_OFFSET(8990, glUniformMatrix4fvARB, glUniformMatrix4fvARB, NULL,
-                     565),
-    NAME_FUNC_OFFSET(9012, glUseProgramObjectARB, glUseProgramObjectARB, NULL,
-                     566),
-    NAME_FUNC_OFFSET(9034, glValidateProgramARB, glValidateProgramARB, NULL,
-                     567),
-    NAME_FUNC_OFFSET(9055, glBindAttribLocationARB, glBindAttribLocationARB,
-                     NULL, 568),
-    NAME_FUNC_OFFSET(9079, glGetActiveAttribARB, glGetActiveAttribARB, NULL,
-                     569),
-    NAME_FUNC_OFFSET(9100, glGetAttribLocationARB, glGetAttribLocationARB, NULL,
-                     570),
-    NAME_FUNC_OFFSET(9123, glDrawBuffersARB, glDrawBuffersARB, NULL, 571),
-    NAME_FUNC_OFFSET(9140, glClampColorARB, glClampColorARB, NULL, 572),
-    NAME_FUNC_OFFSET(9156, glDrawArraysInstancedARB, glDrawArraysInstancedARB,
-                     NULL, 573),
-    NAME_FUNC_OFFSET(9181, glDrawElementsInstancedARB,
-                     glDrawElementsInstancedARB, NULL, 574),
-    NAME_FUNC_OFFSET(9208, glRenderbufferStorageMultisample,
-                     glRenderbufferStorageMultisample, NULL, 575),
-    NAME_FUNC_OFFSET(9241, glFramebufferTextureARB, glFramebufferTextureARB,
-                     NULL, 576),
-    NAME_FUNC_OFFSET(9265, glFramebufferTextureFaceARB,
-                     glFramebufferTextureFaceARB, NULL, 577),
-    NAME_FUNC_OFFSET(9293, glProgramParameteriARB, glProgramParameteriARB, NULL,
-                     578),
-    NAME_FUNC_OFFSET(9316, glVertexAttribDivisorARB, glVertexAttribDivisorARB,
-                     NULL, 579),
-    NAME_FUNC_OFFSET(9341, glFlushMappedBufferRange, glFlushMappedBufferRange,
-                     NULL, 580),
-    NAME_FUNC_OFFSET(9366, glMapBufferRange, glMapBufferRange, NULL, 581),
-    NAME_FUNC_OFFSET(9383, glTexBufferARB, glTexBufferARB, NULL, 582),
-    NAME_FUNC_OFFSET(9398, glBindVertexArray, glBindVertexArray, NULL, 583),
-    NAME_FUNC_OFFSET(9416, glGenVertexArrays, glGenVertexArrays, NULL, 584),
-    NAME_FUNC_OFFSET(9434, glCopyBufferSubData, glCopyBufferSubData, NULL, 585),
-    NAME_FUNC_OFFSET(9454, glClientWaitSync, glClientWaitSync, NULL, 586),
-    NAME_FUNC_OFFSET(9471, glDeleteSync, glDeleteSync, NULL, 587),
-    NAME_FUNC_OFFSET(9484, glFenceSync, glFenceSync, NULL, 588),
-    NAME_FUNC_OFFSET(9496, glGetInteger64v, glGetInteger64v, NULL, 589),
-    NAME_FUNC_OFFSET(9512, glGetSynciv, glGetSynciv, NULL, 590),
-    NAME_FUNC_OFFSET(9524, glIsSync, glIsSync, NULL, 591),
-    NAME_FUNC_OFFSET(9533, glWaitSync, glWaitSync, NULL, 592),
-    NAME_FUNC_OFFSET(9544, glDrawElementsBaseVertex, glDrawElementsBaseVertex,
-                     NULL, 593),
-    NAME_FUNC_OFFSET(9569, glDrawElementsInstancedBaseVertex,
-                     glDrawElementsInstancedBaseVertex, NULL, 594),
-    NAME_FUNC_OFFSET(9603, glDrawRangeElementsBaseVertex,
-                     glDrawRangeElementsBaseVertex, NULL, 595),
-    NAME_FUNC_OFFSET(9633, glMultiDrawElementsBaseVertex,
-                     glMultiDrawElementsBaseVertex, NULL, 596),
-    NAME_FUNC_OFFSET(9663, glBlendEquationSeparateiARB,
-                     glBlendEquationSeparateiARB, NULL, 597),
-    NAME_FUNC_OFFSET(9691, glBlendEquationiARB, glBlendEquationiARB, NULL, 598),
-    NAME_FUNC_OFFSET(9711, glBlendFuncSeparateiARB, glBlendFuncSeparateiARB,
-                     NULL, 599),
-    NAME_FUNC_OFFSET(9735, glBlendFunciARB, glBlendFunciARB, NULL, 600),
-    NAME_FUNC_OFFSET(9751, glBindSampler, glBindSampler, NULL, 601),
-    NAME_FUNC_OFFSET(9765, glDeleteSamplers, glDeleteSamplers, NULL, 602),
-    NAME_FUNC_OFFSET(9782, glGenSamplers, glGenSamplers, NULL, 603),
-    NAME_FUNC_OFFSET(9796, glGetSamplerParameterIiv, glGetSamplerParameterIiv,
-                     NULL, 604),
-    NAME_FUNC_OFFSET(9821, glGetSamplerParameterIuiv, glGetSamplerParameterIuiv,
-                     NULL, 605),
-    NAME_FUNC_OFFSET(9847, glGetSamplerParameterfv, glGetSamplerParameterfv,
-                     NULL, 606),
-    NAME_FUNC_OFFSET(9871, glGetSamplerParameteriv, glGetSamplerParameteriv,
-                     NULL, 607),
-    NAME_FUNC_OFFSET(9895, glIsSampler, glIsSampler, NULL, 608),
-    NAME_FUNC_OFFSET(9907, glSamplerParameterIiv, glSamplerParameterIiv, NULL,
-                     609),
-    NAME_FUNC_OFFSET(9929, glSamplerParameterIuiv, glSamplerParameterIuiv, NULL,
-                     610),
-    NAME_FUNC_OFFSET(9952, glSamplerParameterf, glSamplerParameterf, NULL, 611),
-    NAME_FUNC_OFFSET(9972, glSamplerParameterfv, glSamplerParameterfv, NULL,
-                     612),
-    NAME_FUNC_OFFSET(9993, glSamplerParameteri, glSamplerParameteri, NULL, 613),
-    NAME_FUNC_OFFSET(10013, glSamplerParameteriv, glSamplerParameteriv, NULL,
-                     614),
-    NAME_FUNC_OFFSET(10034, glColorP3ui, glColorP3ui, NULL, 615),
-    NAME_FUNC_OFFSET(10046, glColorP3uiv, glColorP3uiv, NULL, 616),
-    NAME_FUNC_OFFSET(10059, glColorP4ui, glColorP4ui, NULL, 617),
-    NAME_FUNC_OFFSET(10071, glColorP4uiv, glColorP4uiv, NULL, 618),
-    NAME_FUNC_OFFSET(10084, glMultiTexCoordP1ui, glMultiTexCoordP1ui, NULL,
-                     619),
-    NAME_FUNC_OFFSET(10104, glMultiTexCoordP1uiv, glMultiTexCoordP1uiv, NULL,
-                     620),
-    NAME_FUNC_OFFSET(10125, glMultiTexCoordP2ui, glMultiTexCoordP2ui, NULL,
-                     621),
-    NAME_FUNC_OFFSET(10145, glMultiTexCoordP2uiv, glMultiTexCoordP2uiv, NULL,
-                     622),
-    NAME_FUNC_OFFSET(10166, glMultiTexCoordP3ui, glMultiTexCoordP3ui, NULL,
-                     623),
-    NAME_FUNC_OFFSET(10186, glMultiTexCoordP3uiv, glMultiTexCoordP3uiv, NULL,
-                     624),
-    NAME_FUNC_OFFSET(10207, glMultiTexCoordP4ui, glMultiTexCoordP4ui, NULL,
-                     625),
-    NAME_FUNC_OFFSET(10227, glMultiTexCoordP4uiv, glMultiTexCoordP4uiv, NULL,
-                     626),
-    NAME_FUNC_OFFSET(10248, glNormalP3ui, glNormalP3ui, NULL, 627),
-    NAME_FUNC_OFFSET(10261, glNormalP3uiv, glNormalP3uiv, NULL, 628),
-    NAME_FUNC_OFFSET(10275, glSecondaryColorP3ui, glSecondaryColorP3ui, NULL,
-                     629),
-    NAME_FUNC_OFFSET(10296, glSecondaryColorP3uiv, glSecondaryColorP3uiv, NULL,
-                     630),
-    NAME_FUNC_OFFSET(10318, glTexCoordP1ui, glTexCoordP1ui, NULL, 631),
-    NAME_FUNC_OFFSET(10333, glTexCoordP1uiv, glTexCoordP1uiv, NULL, 632),
-    NAME_FUNC_OFFSET(10349, glTexCoordP2ui, glTexCoordP2ui, NULL, 633),
-    NAME_FUNC_OFFSET(10364, glTexCoordP2uiv, glTexCoordP2uiv, NULL, 634),
-    NAME_FUNC_OFFSET(10380, glTexCoordP3ui, glTexCoordP3ui, NULL, 635),
-    NAME_FUNC_OFFSET(10395, glTexCoordP3uiv, glTexCoordP3uiv, NULL, 636),
-    NAME_FUNC_OFFSET(10411, glTexCoordP4ui, glTexCoordP4ui, NULL, 637),
-    NAME_FUNC_OFFSET(10426, glTexCoordP4uiv, glTexCoordP4uiv, NULL, 638),
-    NAME_FUNC_OFFSET(10442, glVertexAttribP1ui, glVertexAttribP1ui, NULL, 639),
-    NAME_FUNC_OFFSET(10461, glVertexAttribP1uiv, glVertexAttribP1uiv, NULL,
-                     640),
-    NAME_FUNC_OFFSET(10481, glVertexAttribP2ui, glVertexAttribP2ui, NULL, 641),
-    NAME_FUNC_OFFSET(10500, glVertexAttribP2uiv, glVertexAttribP2uiv, NULL,
-                     642),
-    NAME_FUNC_OFFSET(10520, glVertexAttribP3ui, glVertexAttribP3ui, NULL, 643),
-    NAME_FUNC_OFFSET(10539, glVertexAttribP3uiv, glVertexAttribP3uiv, NULL,
-                     644),
-    NAME_FUNC_OFFSET(10559, glVertexAttribP4ui, glVertexAttribP4ui, NULL, 645),
-    NAME_FUNC_OFFSET(10578, glVertexAttribP4uiv, glVertexAttribP4uiv, NULL,
-                     646),
-    NAME_FUNC_OFFSET(10598, glVertexP2ui, glVertexP2ui, NULL, 647),
-    NAME_FUNC_OFFSET(10611, glVertexP2uiv, glVertexP2uiv, NULL, 648),
-    NAME_FUNC_OFFSET(10625, glVertexP3ui, glVertexP3ui, NULL, 649),
-    NAME_FUNC_OFFSET(10638, glVertexP3uiv, glVertexP3uiv, NULL, 650),
-    NAME_FUNC_OFFSET(10652, glVertexP4ui, glVertexP4ui, NULL, 651),
-    NAME_FUNC_OFFSET(10665, glVertexP4uiv, glVertexP4uiv, NULL, 652),
-    NAME_FUNC_OFFSET(10679, glBindTransformFeedback, glBindTransformFeedback,
-                     NULL, 653),
-    NAME_FUNC_OFFSET(10703, glDeleteTransformFeedbacks,
-                     glDeleteTransformFeedbacks, NULL, 654),
-    NAME_FUNC_OFFSET(10730, glDrawTransformFeedback, glDrawTransformFeedback,
-                     NULL, 655),
-    NAME_FUNC_OFFSET(10754, glGenTransformFeedbacks, glGenTransformFeedbacks,
-                     NULL, 656),
-    NAME_FUNC_OFFSET(10778, glIsTransformFeedback, glIsTransformFeedback, NULL,
-                     657),
-    NAME_FUNC_OFFSET(10800, glPauseTransformFeedback, glPauseTransformFeedback,
-                     NULL, 658),
-    NAME_FUNC_OFFSET(10825, glResumeTransformFeedback,
-                     glResumeTransformFeedback, NULL, 659),
-    NAME_FUNC_OFFSET(10851, glClearDepthf, glClearDepthf, NULL, 660),
-    NAME_FUNC_OFFSET(10865, glDepthRangef, glDepthRangef, NULL, 661),
-    NAME_FUNC_OFFSET(10879, glGetShaderPrecisionFormat,
-                     glGetShaderPrecisionFormat, NULL, 662),
-    NAME_FUNC_OFFSET(10906, glReleaseShaderCompiler, glReleaseShaderCompiler,
-                     NULL, 663),
-    NAME_FUNC_OFFSET(10930, glShaderBinary, glShaderBinary, NULL, 664),
-    NAME_FUNC_OFFSET(10945, glGetGraphicsResetStatusARB,
-                     glGetGraphicsResetStatusARB, NULL, 665),
-    NAME_FUNC_OFFSET(10973, glGetnColorTableARB, glGetnColorTableARB, NULL,
-                     666),
-    NAME_FUNC_OFFSET(10993, glGetnCompressedTexImageARB,
-                     glGetnCompressedTexImageARB, NULL, 667),
-    NAME_FUNC_OFFSET(11021, glGetnConvolutionFilterARB,
-                     glGetnConvolutionFilterARB, NULL, 668),
-    NAME_FUNC_OFFSET(11048, glGetnHistogramARB, glGetnHistogramARB, NULL, 669),
-    NAME_FUNC_OFFSET(11067, glGetnMapdvARB, glGetnMapdvARB, NULL, 670),
-    NAME_FUNC_OFFSET(11082, glGetnMapfvARB, glGetnMapfvARB, NULL, 671),
-    NAME_FUNC_OFFSET(11097, glGetnMapivARB, glGetnMapivARB, NULL, 672),
-    NAME_FUNC_OFFSET(11112, glGetnMinmaxARB, glGetnMinmaxARB, NULL, 673),
-    NAME_FUNC_OFFSET(11128, glGetnPixelMapfvARB, glGetnPixelMapfvARB, NULL,
-                     674),
-    NAME_FUNC_OFFSET(11148, glGetnPixelMapuivARB, glGetnPixelMapuivARB, NULL,
-                     675),
-    NAME_FUNC_OFFSET(11169, glGetnPixelMapusvARB, glGetnPixelMapusvARB, NULL,
-                     676),
-    NAME_FUNC_OFFSET(11190, glGetnPolygonStippleARB, glGetnPolygonStippleARB,
-                     NULL, 677),
-    NAME_FUNC_OFFSET(11214, glGetnSeparableFilterARB, glGetnSeparableFilterARB,
-                     NULL, 678),
-    NAME_FUNC_OFFSET(11239, glGetnTexImageARB, glGetnTexImageARB, NULL, 679),
-    NAME_FUNC_OFFSET(11257, glGetnUniformdvARB, glGetnUniformdvARB, NULL, 680),
-    NAME_FUNC_OFFSET(11276, glGetnUniformfvARB, glGetnUniformfvARB, NULL, 681),
-    NAME_FUNC_OFFSET(11295, glGetnUniformivARB, glGetnUniformivARB, NULL, 682),
-    NAME_FUNC_OFFSET(11314, glGetnUniformuivARB, glGetnUniformuivARB, NULL,
-                     683),
-    NAME_FUNC_OFFSET(11334, glReadnPixelsARB, glReadnPixelsARB, NULL, 684),
-    NAME_FUNC_OFFSET(11351, glTexStorage1D, glTexStorage1D, NULL, 685),
-    NAME_FUNC_OFFSET(11366, glTexStorage2D, glTexStorage2D, NULL, 686),
-    NAME_FUNC_OFFSET(11381, glTexStorage3D, glTexStorage3D, NULL, 687),
-    NAME_FUNC_OFFSET(11396, glTextureStorage1DEXT, glTextureStorage1DEXT, NULL,
-                     688),
-    NAME_FUNC_OFFSET(11418, glTextureStorage2DEXT, glTextureStorage2DEXT, NULL,
-                     689),
-    NAME_FUNC_OFFSET(11440, glTextureStorage3DEXT, glTextureStorage3DEXT, NULL,
-                     690),
-    NAME_FUNC_OFFSET(11462, glPolygonOffsetEXT, glPolygonOffsetEXT, NULL, 691),
-    NAME_FUNC_OFFSET(11481, gl_dispatch_stub_692, gl_dispatch_stub_692, NULL,
-                     692),
-    NAME_FUNC_OFFSET(11513, gl_dispatch_stub_693, gl_dispatch_stub_693, NULL,
-                     693),
-    NAME_FUNC_OFFSET(11545, gl_dispatch_stub_694, gl_dispatch_stub_694, NULL,
-                     694),
-    NAME_FUNC_OFFSET(11573, gl_dispatch_stub_695, gl_dispatch_stub_695, NULL,
-                     695),
-    NAME_FUNC_OFFSET(11602, gl_dispatch_stub_696, gl_dispatch_stub_696, NULL,
-                     696),
-    NAME_FUNC_OFFSET(11630, gl_dispatch_stub_697, gl_dispatch_stub_697, NULL,
-                     697),
-    NAME_FUNC_OFFSET(11659, gl_dispatch_stub_698, gl_dispatch_stub_698, NULL,
-                     698),
-    NAME_FUNC_OFFSET(11676, gl_dispatch_stub_699, gl_dispatch_stub_699, NULL,
-                     699),
-    NAME_FUNC_OFFSET(11696, glColorPointerEXT, glColorPointerEXT, NULL, 700),
-    NAME_FUNC_OFFSET(11714, glEdgeFlagPointerEXT, glEdgeFlagPointerEXT, NULL,
-                     701),
-    NAME_FUNC_OFFSET(11735, glIndexPointerEXT, glIndexPointerEXT, NULL, 702),
-    NAME_FUNC_OFFSET(11753, glNormalPointerEXT, glNormalPointerEXT, NULL, 703),
-    NAME_FUNC_OFFSET(11772, glTexCoordPointerEXT, glTexCoordPointerEXT, NULL,
-                     704),
-    NAME_FUNC_OFFSET(11793, glVertexPointerEXT, glVertexPointerEXT, NULL, 705),
-    NAME_FUNC_OFFSET(11812, glPointParameterfEXT, glPointParameterfEXT, NULL,
-                     706),
-    NAME_FUNC_OFFSET(11833, glPointParameterfvEXT, glPointParameterfvEXT, NULL,
-                     707),
-    NAME_FUNC_OFFSET(11855, glLockArraysEXT, glLockArraysEXT, NULL, 708),
-    NAME_FUNC_OFFSET(11871, glUnlockArraysEXT, glUnlockArraysEXT, NULL, 709),
-    NAME_FUNC_OFFSET(11889, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL,
-                     710),
-    NAME_FUNC_OFFSET(11911, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT,
-                     NULL, 711),
-    NAME_FUNC_OFFSET(11934, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL,
-                     712),
-    NAME_FUNC_OFFSET(11956, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT,
-                     NULL, 713),
-    NAME_FUNC_OFFSET(11979, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL,
-                     714),
-    NAME_FUNC_OFFSET(12001, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT,
-                     NULL, 715),
-    NAME_FUNC_OFFSET(12024, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL,
-                     716),
-    NAME_FUNC_OFFSET(12046, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT,
-                     NULL, 717),
-    NAME_FUNC_OFFSET(12069, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL,
-                     718),
-    NAME_FUNC_OFFSET(12091, glSecondaryColor3svEXT, glSecondaryColor3svEXT,
-                     NULL, 719),
-    NAME_FUNC_OFFSET(12114, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT,
-                     NULL, 720),
-    NAME_FUNC_OFFSET(12137, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT,
-                     NULL, 721),
-    NAME_FUNC_OFFSET(12161, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT,
-                     NULL, 722),
-    NAME_FUNC_OFFSET(12184, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT,
-                     NULL, 723),
-    NAME_FUNC_OFFSET(12208, glSecondaryColor3usEXT, glSecondaryColor3usEXT,
-                     NULL, 724),
-    NAME_FUNC_OFFSET(12231, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT,
-                     NULL, 725),
-    NAME_FUNC_OFFSET(12255, glSecondaryColorPointerEXT,
-                     glSecondaryColorPointerEXT, NULL, 726),
-    NAME_FUNC_OFFSET(12282, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL,
-                     727),
-    NAME_FUNC_OFFSET(12303, glMultiDrawElementsEXT, glMultiDrawElementsEXT,
-                     NULL, 728),
-    NAME_FUNC_OFFSET(12326, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL,
-                     729),
-    NAME_FUNC_OFFSET(12347, glFogCoorddEXT, glFogCoorddEXT, NULL, 730),
-    NAME_FUNC_OFFSET(12362, glFogCoorddvEXT, glFogCoorddvEXT, NULL, 731),
-    NAME_FUNC_OFFSET(12378, glFogCoordfEXT, glFogCoordfEXT, NULL, 732),
-    NAME_FUNC_OFFSET(12393, glFogCoordfvEXT, glFogCoordfvEXT, NULL, 733),
-    NAME_FUNC_OFFSET(12409, gl_dispatch_stub_734, gl_dispatch_stub_734, NULL,
-                     734),
-    NAME_FUNC_OFFSET(12427, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT,
-                     NULL, 735),
-    NAME_FUNC_OFFSET(12450, glFlushVertexArrayRangeNV,
-                     glFlushVertexArrayRangeNV, NULL, 736),
-    NAME_FUNC_OFFSET(12476, glVertexArrayRangeNV, glVertexArrayRangeNV, NULL,
-                     737),
-    NAME_FUNC_OFFSET(12497, glCombinerInputNV, glCombinerInputNV, NULL, 738),
-    NAME_FUNC_OFFSET(12515, glCombinerOutputNV, glCombinerOutputNV, NULL, 739),
-    NAME_FUNC_OFFSET(12534, glCombinerParameterfNV, glCombinerParameterfNV,
-                     NULL, 740),
-    NAME_FUNC_OFFSET(12557, glCombinerParameterfvNV, glCombinerParameterfvNV,
-                     NULL, 741),
-    NAME_FUNC_OFFSET(12581, glCombinerParameteriNV, glCombinerParameteriNV,
-                     NULL, 742),
-    NAME_FUNC_OFFSET(12604, glCombinerParameterivNV, glCombinerParameterivNV,
-                     NULL, 743),
-    NAME_FUNC_OFFSET(12628, glFinalCombinerInputNV, glFinalCombinerInputNV,
-                     NULL, 744),
-    NAME_FUNC_OFFSET(12651, glGetCombinerInputParameterfvNV,
-                     glGetCombinerInputParameterfvNV, NULL, 745),
-    NAME_FUNC_OFFSET(12683, glGetCombinerInputParameterivNV,
-                     glGetCombinerInputParameterivNV, NULL, 746),
-    NAME_FUNC_OFFSET(12715, glGetCombinerOutputParameterfvNV,
-                     glGetCombinerOutputParameterfvNV, NULL, 747),
-    NAME_FUNC_OFFSET(12748, glGetCombinerOutputParameterivNV,
-                     glGetCombinerOutputParameterivNV, NULL, 748),
-    NAME_FUNC_OFFSET(12781, glGetFinalCombinerInputParameterfvNV,
-                     glGetFinalCombinerInputParameterfvNV, NULL, 749),
-    NAME_FUNC_OFFSET(12818, glGetFinalCombinerInputParameterivNV,
-                     glGetFinalCombinerInputParameterivNV, NULL, 750),
-    NAME_FUNC_OFFSET(12855, glResizeBuffersMESA, glResizeBuffersMESA, NULL,
-                     751),
-    NAME_FUNC_OFFSET(12875, glWindowPos2dMESA, glWindowPos2dMESA, NULL, 752),
-    NAME_FUNC_OFFSET(12893, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, 753),
-    NAME_FUNC_OFFSET(12912, glWindowPos2fMESA, glWindowPos2fMESA, NULL, 754),
-    NAME_FUNC_OFFSET(12930, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, 755),
-    NAME_FUNC_OFFSET(12949, glWindowPos2iMESA, glWindowPos2iMESA, NULL, 756),
-    NAME_FUNC_OFFSET(12967, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, 757),
-    NAME_FUNC_OFFSET(12986, glWindowPos2sMESA, glWindowPos2sMESA, NULL, 758),
-    NAME_FUNC_OFFSET(13004, glWindowPos2svMESA, glWindowPos2svMESA, NULL, 759),
-    NAME_FUNC_OFFSET(13023, glWindowPos3dMESA, glWindowPos3dMESA, NULL, 760),
-    NAME_FUNC_OFFSET(13041, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, 761),
-    NAME_FUNC_OFFSET(13060, glWindowPos3fMESA, glWindowPos3fMESA, NULL, 762),
-    NAME_FUNC_OFFSET(13078, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, 763),
-    NAME_FUNC_OFFSET(13097, glWindowPos3iMESA, glWindowPos3iMESA, NULL, 764),
-    NAME_FUNC_OFFSET(13115, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, 765),
-    NAME_FUNC_OFFSET(13134, glWindowPos3sMESA, glWindowPos3sMESA, NULL, 766),
-    NAME_FUNC_OFFSET(13152, glWindowPos3svMESA, glWindowPos3svMESA, NULL, 767),
-    NAME_FUNC_OFFSET(13171, glWindowPos4dMESA, glWindowPos4dMESA, NULL, 768),
-    NAME_FUNC_OFFSET(13189, glWindowPos4dvMESA, glWindowPos4dvMESA, NULL, 769),
-    NAME_FUNC_OFFSET(13208, glWindowPos4fMESA, glWindowPos4fMESA, NULL, 770),
-    NAME_FUNC_OFFSET(13226, glWindowPos4fvMESA, glWindowPos4fvMESA, NULL, 771),
-    NAME_FUNC_OFFSET(13245, glWindowPos4iMESA, glWindowPos4iMESA, NULL, 772),
-    NAME_FUNC_OFFSET(13263, glWindowPos4ivMESA, glWindowPos4ivMESA, NULL, 773),
-    NAME_FUNC_OFFSET(13282, glWindowPos4sMESA, glWindowPos4sMESA, NULL, 774),
-    NAME_FUNC_OFFSET(13300, glWindowPos4svMESA, glWindowPos4svMESA, NULL, 775),
-    NAME_FUNC_OFFSET(13319, gl_dispatch_stub_776, gl_dispatch_stub_776, NULL,
-                     776),
-    NAME_FUNC_OFFSET(13344, gl_dispatch_stub_777, gl_dispatch_stub_777, NULL,
-                     777),
-    NAME_FUNC_OFFSET(13371, gl_dispatch_stub_778, gl_dispatch_stub_778, NULL,
-                     778),
-    NAME_FUNC_OFFSET(13388, gl_dispatch_stub_779, gl_dispatch_stub_779, NULL,
-                     779),
-    NAME_FUNC_OFFSET(13404, gl_dispatch_stub_780, gl_dispatch_stub_780, NULL,
-                     780),
-    NAME_FUNC_OFFSET(13418, gl_dispatch_stub_781, gl_dispatch_stub_781, NULL,
-                     781),
-    NAME_FUNC_OFFSET(13433, gl_dispatch_stub_782, gl_dispatch_stub_782, NULL,
-                     782),
-    NAME_FUNC_OFFSET(13445, gl_dispatch_stub_783, gl_dispatch_stub_783, NULL,
-                     783),
-    NAME_FUNC_OFFSET(13458, gl_dispatch_stub_784, gl_dispatch_stub_784, NULL,
-                     784),
-    NAME_FUNC_OFFSET(13472, glAreProgramsResidentNV, glAreProgramsResidentNV,
-                     NULL, 785),
-    NAME_FUNC_OFFSET(13496, glBindProgramNV, glBindProgramNV, NULL, 786),
-    NAME_FUNC_OFFSET(13512, glDeleteProgramsNV, glDeleteProgramsNV, NULL, 787),
-    NAME_FUNC_OFFSET(13531, glExecuteProgramNV, glExecuteProgramNV, NULL, 788),
-    NAME_FUNC_OFFSET(13550, glGenProgramsNV, glGenProgramsNV, NULL, 789),
-    NAME_FUNC_OFFSET(13566, glGetProgramParameterdvNV,
-                     glGetProgramParameterdvNV, NULL, 790),
-    NAME_FUNC_OFFSET(13592, glGetProgramParameterfvNV,
-                     glGetProgramParameterfvNV, NULL, 791),
-    NAME_FUNC_OFFSET(13618, glGetProgramStringNV, glGetProgramStringNV, NULL,
-                     792),
-    NAME_FUNC_OFFSET(13639, glGetProgramivNV, glGetProgramivNV, NULL, 793),
-    NAME_FUNC_OFFSET(13656, glGetTrackMatrixivNV, glGetTrackMatrixivNV, NULL,
-                     794),
-    NAME_FUNC_OFFSET(13677, glGetVertexAttribPointervNV,
-                     glGetVertexAttribPointervNV, NULL, 795),
-    NAME_FUNC_OFFSET(13705, glGetVertexAttribdvNV, glGetVertexAttribdvNV, NULL,
-                     796),
-    NAME_FUNC_OFFSET(13727, glGetVertexAttribfvNV, glGetVertexAttribfvNV, NULL,
-                     797),
-    NAME_FUNC_OFFSET(13749, glGetVertexAttribivNV, glGetVertexAttribivNV, NULL,
-                     798),
-    NAME_FUNC_OFFSET(13771, glIsProgramNV, glIsProgramNV, NULL, 799),
-    NAME_FUNC_OFFSET(13785, glLoadProgramNV, glLoadProgramNV, NULL, 800),
-    NAME_FUNC_OFFSET(13801, glProgramParameters4dvNV, glProgramParameters4dvNV,
-                     NULL, 801),
-    NAME_FUNC_OFFSET(13826, glProgramParameters4fvNV, glProgramParameters4fvNV,
-                     NULL, 802),
-    NAME_FUNC_OFFSET(13851, glRequestResidentProgramsNV,
-                     glRequestResidentProgramsNV, NULL, 803),
-    NAME_FUNC_OFFSET(13879, glTrackMatrixNV, glTrackMatrixNV, NULL, 804),
-    NAME_FUNC_OFFSET(13895, glVertexAttrib1dNV, glVertexAttrib1dNV, NULL, 805),
-    NAME_FUNC_OFFSET(13914, glVertexAttrib1dvNV, glVertexAttrib1dvNV, NULL,
-                     806),
-    NAME_FUNC_OFFSET(13934, glVertexAttrib1fNV, glVertexAttrib1fNV, NULL, 807),
-    NAME_FUNC_OFFSET(13953, glVertexAttrib1fvNV, glVertexAttrib1fvNV, NULL,
-                     808),
-    NAME_FUNC_OFFSET(13973, glVertexAttrib1sNV, glVertexAttrib1sNV, NULL, 809),
-    NAME_FUNC_OFFSET(13992, glVertexAttrib1svNV, glVertexAttrib1svNV, NULL,
-                     810),
-    NAME_FUNC_OFFSET(14012, glVertexAttrib2dNV, glVertexAttrib2dNV, NULL, 811),
-    NAME_FUNC_OFFSET(14031, glVertexAttrib2dvNV, glVertexAttrib2dvNV, NULL,
-                     812),
-    NAME_FUNC_OFFSET(14051, glVertexAttrib2fNV, glVertexAttrib2fNV, NULL, 813),
-    NAME_FUNC_OFFSET(14070, glVertexAttrib2fvNV, glVertexAttrib2fvNV, NULL,
-                     814),
-    NAME_FUNC_OFFSET(14090, glVertexAttrib2sNV, glVertexAttrib2sNV, NULL, 815),
-    NAME_FUNC_OFFSET(14109, glVertexAttrib2svNV, glVertexAttrib2svNV, NULL,
-                     816),
-    NAME_FUNC_OFFSET(14129, glVertexAttrib3dNV, glVertexAttrib3dNV, NULL, 817),
-    NAME_FUNC_OFFSET(14148, glVertexAttrib3dvNV, glVertexAttrib3dvNV, NULL,
-                     818),
-    NAME_FUNC_OFFSET(14168, glVertexAttrib3fNV, glVertexAttrib3fNV, NULL, 819),
-    NAME_FUNC_OFFSET(14187, glVertexAttrib3fvNV, glVertexAttrib3fvNV, NULL,
-                     820),
-    NAME_FUNC_OFFSET(14207, glVertexAttrib3sNV, glVertexAttrib3sNV, NULL, 821),
-    NAME_FUNC_OFFSET(14226, glVertexAttrib3svNV, glVertexAttrib3svNV, NULL,
-                     822),
-    NAME_FUNC_OFFSET(14246, glVertexAttrib4dNV, glVertexAttrib4dNV, NULL, 823),
-    NAME_FUNC_OFFSET(14265, glVertexAttrib4dvNV, glVertexAttrib4dvNV, NULL,
-                     824),
-    NAME_FUNC_OFFSET(14285, glVertexAttrib4fNV, glVertexAttrib4fNV, NULL, 825),
-    NAME_FUNC_OFFSET(14304, glVertexAttrib4fvNV, glVertexAttrib4fvNV, NULL,
-                     826),
-    NAME_FUNC_OFFSET(14324, glVertexAttrib4sNV, glVertexAttrib4sNV, NULL, 827),
-    NAME_FUNC_OFFSET(14343, glVertexAttrib4svNV, glVertexAttrib4svNV, NULL,
-                     828),
-    NAME_FUNC_OFFSET(14363, glVertexAttrib4ubNV, glVertexAttrib4ubNV, NULL,
-                     829),
-    NAME_FUNC_OFFSET(14383, glVertexAttrib4ubvNV, glVertexAttrib4ubvNV, NULL,
-                     830),
-    NAME_FUNC_OFFSET(14404, glVertexAttribPointerNV, glVertexAttribPointerNV,
-                     NULL, 831),
-    NAME_FUNC_OFFSET(14428, glVertexAttribs1dvNV, glVertexAttribs1dvNV, NULL,
-                     832),
-    NAME_FUNC_OFFSET(14449, glVertexAttribs1fvNV, glVertexAttribs1fvNV, NULL,
-                     833),
-    NAME_FUNC_OFFSET(14470, glVertexAttribs1svNV, glVertexAttribs1svNV, NULL,
-                     834),
-    NAME_FUNC_OFFSET(14491, glVertexAttribs2dvNV, glVertexAttribs2dvNV, NULL,
-                     835),
-    NAME_FUNC_OFFSET(14512, glVertexAttribs2fvNV, glVertexAttribs2fvNV, NULL,
-                     836),
-    NAME_FUNC_OFFSET(14533, glVertexAttribs2svNV, glVertexAttribs2svNV, NULL,
-                     837),
-    NAME_FUNC_OFFSET(14554, glVertexAttribs3dvNV, glVertexAttribs3dvNV, NULL,
-                     838),
-    NAME_FUNC_OFFSET(14575, glVertexAttribs3fvNV, glVertexAttribs3fvNV, NULL,
-                     839),
-    NAME_FUNC_OFFSET(14596, glVertexAttribs3svNV, glVertexAttribs3svNV, NULL,
-                     840),
-    NAME_FUNC_OFFSET(14617, glVertexAttribs4dvNV, glVertexAttribs4dvNV, NULL,
-                     841),
-    NAME_FUNC_OFFSET(14638, glVertexAttribs4fvNV, glVertexAttribs4fvNV, NULL,
-                     842),
-    NAME_FUNC_OFFSET(14659, glVertexAttribs4svNV, glVertexAttribs4svNV, NULL,
-                     843),
-    NAME_FUNC_OFFSET(14680, glVertexAttribs4ubvNV, glVertexAttribs4ubvNV, NULL,
-                     844),
-    NAME_FUNC_OFFSET(14702, glGetTexBumpParameterfvATI,
-                     glGetTexBumpParameterfvATI, NULL, 845),
-    NAME_FUNC_OFFSET(14729, glGetTexBumpParameterivATI,
-                     glGetTexBumpParameterivATI, NULL, 846),
-    NAME_FUNC_OFFSET(14756, glTexBumpParameterfvATI, glTexBumpParameterfvATI,
-                     NULL, 847),
-    NAME_FUNC_OFFSET(14780, glTexBumpParameterivATI, glTexBumpParameterivATI,
-                     NULL, 848),
-    NAME_FUNC_OFFSET(14804, glAlphaFragmentOp1ATI, glAlphaFragmentOp1ATI, NULL,
-                     849),
-    NAME_FUNC_OFFSET(14826, glAlphaFragmentOp2ATI, glAlphaFragmentOp2ATI, NULL,
-                     850),
-    NAME_FUNC_OFFSET(14848, glAlphaFragmentOp3ATI, glAlphaFragmentOp3ATI, NULL,
-                     851),
-    NAME_FUNC_OFFSET(14870, glBeginFragmentShaderATI, glBeginFragmentShaderATI,
-                     NULL, 852),
-    NAME_FUNC_OFFSET(14895, glBindFragmentShaderATI, glBindFragmentShaderATI,
-                     NULL, 853),
-    NAME_FUNC_OFFSET(14919, glColorFragmentOp1ATI, glColorFragmentOp1ATI, NULL,
-                     854),
-    NAME_FUNC_OFFSET(14941, glColorFragmentOp2ATI, glColorFragmentOp2ATI, NULL,
-                     855),
-    NAME_FUNC_OFFSET(14963, glColorFragmentOp3ATI, glColorFragmentOp3ATI, NULL,
-                     856),
-    NAME_FUNC_OFFSET(14985, glDeleteFragmentShaderATI,
-                     glDeleteFragmentShaderATI, NULL, 857),
-    NAME_FUNC_OFFSET(15011, glEndFragmentShaderATI, glEndFragmentShaderATI,
-                     NULL, 858),
-    NAME_FUNC_OFFSET(15034, glGenFragmentShadersATI, glGenFragmentShadersATI,
-                     NULL, 859),
-    NAME_FUNC_OFFSET(15058, glPassTexCoordATI, glPassTexCoordATI, NULL, 860),
-    NAME_FUNC_OFFSET(15076, glSampleMapATI, glSampleMapATI, NULL, 861),
-    NAME_FUNC_OFFSET(15091, glSetFragmentShaderConstantATI,
-                     glSetFragmentShaderConstantATI, NULL, 862),
-    NAME_FUNC_OFFSET(15122, glPointParameteriNV, glPointParameteriNV, NULL,
-                     863),
-    NAME_FUNC_OFFSET(15142, glPointParameterivNV, glPointParameterivNV, NULL,
-                     864),
-    NAME_FUNC_OFFSET(15163, gl_dispatch_stub_865, gl_dispatch_stub_865, NULL,
-                     865),
-    NAME_FUNC_OFFSET(15186, gl_dispatch_stub_866, gl_dispatch_stub_866, NULL,
-                     866),
-    NAME_FUNC_OFFSET(15209, gl_dispatch_stub_867, gl_dispatch_stub_867, NULL,
-                     867),
-    NAME_FUNC_OFFSET(15235, gl_dispatch_stub_868, gl_dispatch_stub_868, NULL,
-                     868),
-    NAME_FUNC_OFFSET(15258, gl_dispatch_stub_869, gl_dispatch_stub_869, NULL,
-                     869),
-    NAME_FUNC_OFFSET(15279, glGetProgramNamedParameterdvNV,
-                     glGetProgramNamedParameterdvNV, NULL, 870),
-    NAME_FUNC_OFFSET(15310, glGetProgramNamedParameterfvNV,
-                     glGetProgramNamedParameterfvNV, NULL, 871),
-    NAME_FUNC_OFFSET(15341, glProgramNamedParameter4dNV,
-                     glProgramNamedParameter4dNV, NULL, 872),
-    NAME_FUNC_OFFSET(15369, glProgramNamedParameter4dvNV,
-                     glProgramNamedParameter4dvNV, NULL, 873),
-    NAME_FUNC_OFFSET(15398, glProgramNamedParameter4fNV,
-                     glProgramNamedParameter4fNV, NULL, 874),
-    NAME_FUNC_OFFSET(15426, glProgramNamedParameter4fvNV,
-                     glProgramNamedParameter4fvNV, NULL, 875),
-    NAME_FUNC_OFFSET(15455, glPrimitiveRestartIndexNV,
-                     glPrimitiveRestartIndexNV, NULL, 876),
-    NAME_FUNC_OFFSET(15481, glPrimitiveRestartNV, glPrimitiveRestartNV, NULL,
-                     877),
-    NAME_FUNC_OFFSET(15502, gl_dispatch_stub_878, gl_dispatch_stub_878, NULL,
-                     878),
-    NAME_FUNC_OFFSET(15519, gl_dispatch_stub_879, gl_dispatch_stub_879, NULL,
-                     879),
-    NAME_FUNC_OFFSET(15546, glBindFramebufferEXT, glBindFramebufferEXT, NULL,
-                     880),
-    NAME_FUNC_OFFSET(15567, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL,
-                     881),
-    NAME_FUNC_OFFSET(15589, glCheckFramebufferStatusEXT,
-                     glCheckFramebufferStatusEXT, NULL, 882),
-    NAME_FUNC_OFFSET(15617, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT,
-                     NULL, 883),
-    NAME_FUNC_OFFSET(15641, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT,
-                     NULL, 884),
-    NAME_FUNC_OFFSET(15666, glFramebufferRenderbufferEXT,
-                     glFramebufferRenderbufferEXT, NULL, 885),
-    NAME_FUNC_OFFSET(15695, glFramebufferTexture1DEXT,
-                     glFramebufferTexture1DEXT, NULL, 886),
-    NAME_FUNC_OFFSET(15721, glFramebufferTexture2DEXT,
-                     glFramebufferTexture2DEXT, NULL, 887),
-    NAME_FUNC_OFFSET(15747, glFramebufferTexture3DEXT,
-                     glFramebufferTexture3DEXT, NULL, 888),
-    NAME_FUNC_OFFSET(15773, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL,
-                     889),
-    NAME_FUNC_OFFSET(15794, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL,
-                     890),
-    NAME_FUNC_OFFSET(15816, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL,
-                     891),
-    NAME_FUNC_OFFSET(15836, glGetFramebufferAttachmentParameterivEXT,
-                     glGetFramebufferAttachmentParameterivEXT, NULL, 892),
-    NAME_FUNC_OFFSET(15877, glGetRenderbufferParameterivEXT,
-                     glGetRenderbufferParameterivEXT, NULL, 893),
-    NAME_FUNC_OFFSET(15909, glIsFramebufferEXT, glIsFramebufferEXT, NULL, 894),
-    NAME_FUNC_OFFSET(15928, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL,
-                     895),
-    NAME_FUNC_OFFSET(15948, glRenderbufferStorageEXT, glRenderbufferStorageEXT,
-                     NULL, 896),
-    NAME_FUNC_OFFSET(15973, gl_dispatch_stub_897, gl_dispatch_stub_897, NULL,
-                     897),
-    NAME_FUNC_OFFSET(15994, gl_dispatch_stub_898, gl_dispatch_stub_898, NULL,
-                     898),
-    NAME_FUNC_OFFSET(16018, gl_dispatch_stub_899, gl_dispatch_stub_899, NULL,
-                     899),
-    NAME_FUNC_OFFSET(16048, glBindFragDataLocationEXT,
-                     glBindFragDataLocationEXT, NULL, 900),
-    NAME_FUNC_OFFSET(16074, glGetFragDataLocationEXT, glGetFragDataLocationEXT,
-                     NULL, 901),
-    NAME_FUNC_OFFSET(16099, glGetUniformuivEXT, glGetUniformuivEXT, NULL, 902),
-    NAME_FUNC_OFFSET(16118, glGetVertexAttribIivEXT, glGetVertexAttribIivEXT,
-                     NULL, 903),
-    NAME_FUNC_OFFSET(16142, glGetVertexAttribIuivEXT, glGetVertexAttribIuivEXT,
-                     NULL, 904),
-    NAME_FUNC_OFFSET(16167, glUniform1uiEXT, glUniform1uiEXT, NULL, 905),
-    NAME_FUNC_OFFSET(16183, glUniform1uivEXT, glUniform1uivEXT, NULL, 906),
-    NAME_FUNC_OFFSET(16200, glUniform2uiEXT, glUniform2uiEXT, NULL, 907),
-    NAME_FUNC_OFFSET(16216, glUniform2uivEXT, glUniform2uivEXT, NULL, 908),
-    NAME_FUNC_OFFSET(16233, glUniform3uiEXT, glUniform3uiEXT, NULL, 909),
-    NAME_FUNC_OFFSET(16249, glUniform3uivEXT, glUniform3uivEXT, NULL, 910),
-    NAME_FUNC_OFFSET(16266, glUniform4uiEXT, glUniform4uiEXT, NULL, 911),
-    NAME_FUNC_OFFSET(16282, glUniform4uivEXT, glUniform4uivEXT, NULL, 912),
-    NAME_FUNC_OFFSET(16299, glVertexAttribI1iEXT, glVertexAttribI1iEXT, NULL,
-                     913),
-    NAME_FUNC_OFFSET(16320, glVertexAttribI1ivEXT, glVertexAttribI1ivEXT, NULL,
-                     914),
-    NAME_FUNC_OFFSET(16342, glVertexAttribI1uiEXT, glVertexAttribI1uiEXT, NULL,
-                     915),
-    NAME_FUNC_OFFSET(16364, glVertexAttribI1uivEXT, glVertexAttribI1uivEXT,
-                     NULL, 916),
-    NAME_FUNC_OFFSET(16387, glVertexAttribI2iEXT, glVertexAttribI2iEXT, NULL,
-                     917),
-    NAME_FUNC_OFFSET(16408, glVertexAttribI2ivEXT, glVertexAttribI2ivEXT, NULL,
-                     918),
-    NAME_FUNC_OFFSET(16430, glVertexAttribI2uiEXT, glVertexAttribI2uiEXT, NULL,
-                     919),
-    NAME_FUNC_OFFSET(16452, glVertexAttribI2uivEXT, glVertexAttribI2uivEXT,
-                     NULL, 920),
-    NAME_FUNC_OFFSET(16475, glVertexAttribI3iEXT, glVertexAttribI3iEXT, NULL,
-                     921),
-    NAME_FUNC_OFFSET(16496, glVertexAttribI3ivEXT, glVertexAttribI3ivEXT, NULL,
-                     922),
-    NAME_FUNC_OFFSET(16518, glVertexAttribI3uiEXT, glVertexAttribI3uiEXT, NULL,
-                     923),
-    NAME_FUNC_OFFSET(16540, glVertexAttribI3uivEXT, glVertexAttribI3uivEXT,
-                     NULL, 924),
-    NAME_FUNC_OFFSET(16563, glVertexAttribI4bvEXT, glVertexAttribI4bvEXT, NULL,
-                     925),
-    NAME_FUNC_OFFSET(16585, glVertexAttribI4iEXT, glVertexAttribI4iEXT, NULL,
-                     926),
-    NAME_FUNC_OFFSET(16606, glVertexAttribI4ivEXT, glVertexAttribI4ivEXT, NULL,
-                     927),
-    NAME_FUNC_OFFSET(16628, glVertexAttribI4svEXT, glVertexAttribI4svEXT, NULL,
-                     928),
-    NAME_FUNC_OFFSET(16650, glVertexAttribI4ubvEXT, glVertexAttribI4ubvEXT,
-                     NULL, 929),
-    NAME_FUNC_OFFSET(16673, glVertexAttribI4uiEXT, glVertexAttribI4uiEXT, NULL,
-                     930),
-    NAME_FUNC_OFFSET(16695, glVertexAttribI4uivEXT, glVertexAttribI4uivEXT,
-                     NULL, 931),
-    NAME_FUNC_OFFSET(16718, glVertexAttribI4usvEXT, glVertexAttribI4usvEXT,
-                     NULL, 932),
-    NAME_FUNC_OFFSET(16741, glVertexAttribIPointerEXT,
-                     glVertexAttribIPointerEXT, NULL, 933),
-    NAME_FUNC_OFFSET(16767, glFramebufferTextureLayerEXT,
-                     glFramebufferTextureLayerEXT, NULL, 934),
-    NAME_FUNC_OFFSET(16796, glColorMaskIndexedEXT, glColorMaskIndexedEXT, NULL,
-                     935),
-    NAME_FUNC_OFFSET(16818, glDisableIndexedEXT, glDisableIndexedEXT, NULL,
-                     936),
-    NAME_FUNC_OFFSET(16838, glEnableIndexedEXT, glEnableIndexedEXT, NULL, 937),
-    NAME_FUNC_OFFSET(16857, glGetBooleanIndexedvEXT, glGetBooleanIndexedvEXT,
-                     NULL, 938),
-    NAME_FUNC_OFFSET(16881, glGetIntegerIndexedvEXT, glGetIntegerIndexedvEXT,
-                     NULL, 939),
-    NAME_FUNC_OFFSET(16905, glIsEnabledIndexedEXT, glIsEnabledIndexedEXT, NULL,
-                     940),
-    NAME_FUNC_OFFSET(16927, glClearColorIiEXT, glClearColorIiEXT, NULL, 941),
-    NAME_FUNC_OFFSET(16945, glClearColorIuiEXT, glClearColorIuiEXT, NULL, 942),
-    NAME_FUNC_OFFSET(16964, glGetTexParameterIivEXT, glGetTexParameterIivEXT,
-                     NULL, 943),
-    NAME_FUNC_OFFSET(16988, glGetTexParameterIuivEXT, glGetTexParameterIuivEXT,
-                     NULL, 944),
-    NAME_FUNC_OFFSET(17013, glTexParameterIivEXT, glTexParameterIivEXT, NULL,
-                     945),
-    NAME_FUNC_OFFSET(17034, glTexParameterIuivEXT, glTexParameterIuivEXT, NULL,
-                     946),
-    NAME_FUNC_OFFSET(17056, glBeginConditionalRenderNV,
-                     glBeginConditionalRenderNV, NULL, 947),
-    NAME_FUNC_OFFSET(17083, glEndConditionalRenderNV, glEndConditionalRenderNV,
-                     NULL, 948),
-    NAME_FUNC_OFFSET(17108, glBeginTransformFeedbackEXT,
-                     glBeginTransformFeedbackEXT, NULL, 949),
-    NAME_FUNC_OFFSET(17136, glBindBufferBaseEXT, glBindBufferBaseEXT, NULL,
-                     950),
-    NAME_FUNC_OFFSET(17156, glBindBufferOffsetEXT, glBindBufferOffsetEXT, NULL,
-                     951),
-    NAME_FUNC_OFFSET(17178, glBindBufferRangeEXT, glBindBufferRangeEXT, NULL,
-                     952),
-    NAME_FUNC_OFFSET(17199, glEndTransformFeedbackEXT,
-                     glEndTransformFeedbackEXT, NULL, 953),
-    NAME_FUNC_OFFSET(17225, glGetTransformFeedbackVaryingEXT,
-                     glGetTransformFeedbackVaryingEXT, NULL, 954),
-    NAME_FUNC_OFFSET(17258, glTransformFeedbackVaryingsEXT,
-                     glTransformFeedbackVaryingsEXT, NULL, 955),
-    NAME_FUNC_OFFSET(17289, glProvokingVertexEXT, glProvokingVertexEXT, NULL,
-                     956),
-    NAME_FUNC_OFFSET(17310, gl_dispatch_stub_957, gl_dispatch_stub_957, NULL,
-                     957),
-    NAME_FUNC_OFFSET(17341, gl_dispatch_stub_958, gl_dispatch_stub_958, NULL,
-                     958),
-    NAME_FUNC_OFFSET(17361, glGetObjectParameterivAPPLE,
-                     glGetObjectParameterivAPPLE, NULL, 959),
-    NAME_FUNC_OFFSET(17389, glObjectPurgeableAPPLE, glObjectPurgeableAPPLE,
-                     NULL, 960),
-    NAME_FUNC_OFFSET(17412, glObjectUnpurgeableAPPLE, glObjectUnpurgeableAPPLE,
-                     NULL, 961),
-    NAME_FUNC_OFFSET(17437, glActiveProgramEXT, glActiveProgramEXT, NULL, 962),
-    NAME_FUNC_OFFSET(17456, glCreateShaderProgramEXT, glCreateShaderProgramEXT,
-                     NULL, 963),
-    NAME_FUNC_OFFSET(17481, glUseShaderProgramEXT, glUseShaderProgramEXT, NULL,
-                     964),
-    NAME_FUNC_OFFSET(17503, glTextureBarrierNV, glTextureBarrierNV, NULL, 965),
-    NAME_FUNC_OFFSET(17522, gl_dispatch_stub_966, gl_dispatch_stub_966, NULL,
-                     966),
-    NAME_FUNC_OFFSET(17547, gl_dispatch_stub_967, gl_dispatch_stub_967, NULL,
-                     967),
-    NAME_FUNC_OFFSET(17576, gl_dispatch_stub_968, gl_dispatch_stub_968, NULL,
-                     968),
-    NAME_FUNC_OFFSET(17607, gl_dispatch_stub_969, gl_dispatch_stub_969, NULL,
-                     969),
-    NAME_FUNC_OFFSET(17631, gl_dispatch_stub_970, gl_dispatch_stub_970, NULL,
-                     970),
-    NAME_FUNC_OFFSET(17656, glEGLImageTargetRenderbufferStorageOES,
-                     glEGLImageTargetRenderbufferStorageOES, NULL, 971),
-    NAME_FUNC_OFFSET(17695, glEGLImageTargetTexture2DOES,
-                     glEGLImageTargetTexture2DOES, NULL, 972),
-    NAME_FUNC_OFFSET(17724, glArrayElement, glArrayElement, NULL, 306),
-    NAME_FUNC_OFFSET(17742, glBindTexture, glBindTexture, NULL, 307),
-    NAME_FUNC_OFFSET(17759, glDrawArrays, glDrawArrays, NULL, 310),
-    NAME_FUNC_OFFSET(17775, glAreTexturesResident, glAreTexturesResidentEXT,
-                     glAreTexturesResidentEXT, 322),
-    NAME_FUNC_OFFSET(17800, glCopyTexImage1D, glCopyTexImage1D, NULL, 323),
-    NAME_FUNC_OFFSET(17820, glCopyTexImage2D, glCopyTexImage2D, NULL, 324),
-    NAME_FUNC_OFFSET(17840, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL,
-                     325),
-    NAME_FUNC_OFFSET(17863, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL,
-                     326),
-    NAME_FUNC_OFFSET(17886, glDeleteTextures, glDeleteTexturesEXT,
-                     glDeleteTexturesEXT, 327),
-    NAME_FUNC_OFFSET(17906, glGenTextures, glGenTexturesEXT, glGenTexturesEXT,
-                     328),
-    NAME_FUNC_OFFSET(17923, glGetPointerv, glGetPointerv, NULL, 329),
-    NAME_FUNC_OFFSET(17940, glIsTexture, glIsTextureEXT, glIsTextureEXT, 330),
-    NAME_FUNC_OFFSET(17955, glPrioritizeTextures, glPrioritizeTextures, NULL,
-                     331),
-    NAME_FUNC_OFFSET(17979, glTexSubImage1D, glTexSubImage1D, NULL, 332),
-    NAME_FUNC_OFFSET(17998, glTexSubImage2D, glTexSubImage2D, NULL, 333),
-    NAME_FUNC_OFFSET(18017, glBlendColor, glBlendColor, NULL, 336),
-    NAME_FUNC_OFFSET(18033, glBlendEquation, glBlendEquation, NULL, 337),
-    NAME_FUNC_OFFSET(18052, glDrawRangeElements, glDrawRangeElements, NULL,
-                     338),
-    NAME_FUNC_OFFSET(18075, glColorTable, glColorTable, NULL, 339),
-    NAME_FUNC_OFFSET(18091, glColorTable, glColorTable, NULL, 339),
-    NAME_FUNC_OFFSET(18107, glColorTableParameterfv, glColorTableParameterfv,
-                     NULL, 340),
-    NAME_FUNC_OFFSET(18134, glColorTableParameteriv, glColorTableParameteriv,
-                     NULL, 341),
-    NAME_FUNC_OFFSET(18161, glCopyColorTable, glCopyColorTable, NULL, 342),
-    NAME_FUNC_OFFSET(18181, glGetColorTable, glGetColorTableEXT,
-                     glGetColorTableEXT, 343),
-    NAME_FUNC_OFFSET(18200, glGetColorTable, glGetColorTableEXT,
-                     glGetColorTableEXT, 343),
-    NAME_FUNC_OFFSET(18219, glGetColorTableParameterfv,
-                     glGetColorTableParameterfvEXT,
-                     glGetColorTableParameterfvEXT, 344),
-    NAME_FUNC_OFFSET(18249, glGetColorTableParameterfv,
-                     glGetColorTableParameterfvEXT,
-                     glGetColorTableParameterfvEXT, 344),
-    NAME_FUNC_OFFSET(18279, glGetColorTableParameteriv,
-                     glGetColorTableParameterivEXT,
-                     glGetColorTableParameterivEXT, 345),
-    NAME_FUNC_OFFSET(18309, glGetColorTableParameteriv,
-                     glGetColorTableParameterivEXT,
-                     glGetColorTableParameterivEXT, 345),
-    NAME_FUNC_OFFSET(18339, glColorSubTable, glColorSubTable, NULL, 346),
-    NAME_FUNC_OFFSET(18358, glCopyColorSubTable, glCopyColorSubTable, NULL,
-                     347),
-    NAME_FUNC_OFFSET(18381, glConvolutionFilter1D, glConvolutionFilter1D, NULL,
-                     348),
-    NAME_FUNC_OFFSET(18406, glConvolutionFilter2D, glConvolutionFilter2D, NULL,
-                     349),
-    NAME_FUNC_OFFSET(18431, glConvolutionParameterf, glConvolutionParameterf,
-                     NULL, 350),
-    NAME_FUNC_OFFSET(18458, glConvolutionParameterfv, glConvolutionParameterfv,
-                     NULL, 351),
-    NAME_FUNC_OFFSET(18486, glConvolutionParameteri, glConvolutionParameteri,
-                     NULL, 352),
-    NAME_FUNC_OFFSET(18513, glConvolutionParameteriv, glConvolutionParameteriv,
-                     NULL, 353),
-    NAME_FUNC_OFFSET(18541, glCopyConvolutionFilter1D,
-                     glCopyConvolutionFilter1D, NULL, 354),
-    NAME_FUNC_OFFSET(18570, glCopyConvolutionFilter2D,
-                     glCopyConvolutionFilter2D, NULL, 355),
-    NAME_FUNC_OFFSET(18599, glGetConvolutionFilter, gl_dispatch_stub_356,
-                     gl_dispatch_stub_356, 356),
-    NAME_FUNC_OFFSET(18625, glGetConvolutionParameterfv, gl_dispatch_stub_357,
-                     gl_dispatch_stub_357, 357),
-    NAME_FUNC_OFFSET(18656, glGetConvolutionParameteriv, gl_dispatch_stub_358,
-                     gl_dispatch_stub_358, 358),
-    NAME_FUNC_OFFSET(18687, glGetSeparableFilter, gl_dispatch_stub_359,
-                     gl_dispatch_stub_359, 359),
-    NAME_FUNC_OFFSET(18711, glSeparableFilter2D, glSeparableFilter2D, NULL,
-                     360),
-    NAME_FUNC_OFFSET(18734, glGetHistogram, gl_dispatch_stub_361,
-                     gl_dispatch_stub_361, 361),
-    NAME_FUNC_OFFSET(18752, glGetHistogramParameterfv, gl_dispatch_stub_362,
-                     gl_dispatch_stub_362, 362),
-    NAME_FUNC_OFFSET(18781, glGetHistogramParameteriv, gl_dispatch_stub_363,
-                     gl_dispatch_stub_363, 363),
-    NAME_FUNC_OFFSET(18810, glGetMinmax, gl_dispatch_stub_364,
-                     gl_dispatch_stub_364, 364),
-    NAME_FUNC_OFFSET(18825, glGetMinmaxParameterfv, gl_dispatch_stub_365,
-                     gl_dispatch_stub_365, 365),
-    NAME_FUNC_OFFSET(18851, glGetMinmaxParameteriv, gl_dispatch_stub_366,
-                     gl_dispatch_stub_366, 366),
-    NAME_FUNC_OFFSET(18877, glHistogram, glHistogram, NULL, 367),
-    NAME_FUNC_OFFSET(18892, glMinmax, glMinmax, NULL, 368),
-    NAME_FUNC_OFFSET(18904, glResetHistogram, glResetHistogram, NULL, 369),
-    NAME_FUNC_OFFSET(18924, glResetMinmax, glResetMinmax, NULL, 370),
-    NAME_FUNC_OFFSET(18941, glTexImage3D, glTexImage3D, NULL, 371),
-    NAME_FUNC_OFFSET(18957, glTexSubImage3D, glTexSubImage3D, NULL, 372),
-    NAME_FUNC_OFFSET(18976, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL,
-                     373),
-    NAME_FUNC_OFFSET(18999, glActiveTextureARB, glActiveTextureARB, NULL, 374),
-    NAME_FUNC_OFFSET(19015, glClientActiveTextureARB, glClientActiveTextureARB,
-                     NULL, 375),
-    NAME_FUNC_OFFSET(19037, glMultiTexCoord1dARB, glMultiTexCoord1dARB, NULL,
-                     376),
-    NAME_FUNC_OFFSET(19055, glMultiTexCoord1dvARB, glMultiTexCoord1dvARB, NULL,
-                     377),
-    NAME_FUNC_OFFSET(19074, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL,
-                     378),
-    NAME_FUNC_OFFSET(19092, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL,
-                     379),
-    NAME_FUNC_OFFSET(19111, glMultiTexCoord1iARB, glMultiTexCoord1iARB, NULL,
-                     380),
-    NAME_FUNC_OFFSET(19129, glMultiTexCoord1ivARB, glMultiTexCoord1ivARB, NULL,
-                     381),
-    NAME_FUNC_OFFSET(19148, glMultiTexCoord1sARB, glMultiTexCoord1sARB, NULL,
-                     382),
-    NAME_FUNC_OFFSET(19166, glMultiTexCoord1svARB, glMultiTexCoord1svARB, NULL,
-                     383),
-    NAME_FUNC_OFFSET(19185, glMultiTexCoord2dARB, glMultiTexCoord2dARB, NULL,
-                     384),
-    NAME_FUNC_OFFSET(19203, glMultiTexCoord2dvARB, glMultiTexCoord2dvARB, NULL,
-                     385),
-    NAME_FUNC_OFFSET(19222, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL,
-                     386),
-    NAME_FUNC_OFFSET(19240, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL,
-                     387),
-    NAME_FUNC_OFFSET(19259, glMultiTexCoord2iARB, glMultiTexCoord2iARB, NULL,
-                     388),
-    NAME_FUNC_OFFSET(19277, glMultiTexCoord2ivARB, glMultiTexCoord2ivARB, NULL,
-                     389),
-    NAME_FUNC_OFFSET(19296, glMultiTexCoord2sARB, glMultiTexCoord2sARB, NULL,
-                     390),
-    NAME_FUNC_OFFSET(19314, glMultiTexCoord2svARB, glMultiTexCoord2svARB, NULL,
-                     391),
-    NAME_FUNC_OFFSET(19333, glMultiTexCoord3dARB, glMultiTexCoord3dARB, NULL,
-                     392),
-    NAME_FUNC_OFFSET(19351, glMultiTexCoord3dvARB, glMultiTexCoord3dvARB, NULL,
-                     393),
-    NAME_FUNC_OFFSET(19370, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL,
-                     394),
-    NAME_FUNC_OFFSET(19388, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL,
-                     395),
-    NAME_FUNC_OFFSET(19407, glMultiTexCoord3iARB, glMultiTexCoord3iARB, NULL,
-                     396),
-    NAME_FUNC_OFFSET(19425, glMultiTexCoord3ivARB, glMultiTexCoord3ivARB, NULL,
-                     397),
-    NAME_FUNC_OFFSET(19444, glMultiTexCoord3sARB, glMultiTexCoord3sARB, NULL,
-                     398),
-    NAME_FUNC_OFFSET(19462, glMultiTexCoord3svARB, glMultiTexCoord3svARB, NULL,
-                     399),
-    NAME_FUNC_OFFSET(19481, glMultiTexCoord4dARB, glMultiTexCoord4dARB, NULL,
-                     400),
-    NAME_FUNC_OFFSET(19499, glMultiTexCoord4dvARB, glMultiTexCoord4dvARB, NULL,
-                     401),
-    NAME_FUNC_OFFSET(19518, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL,
-                     402),
-    NAME_FUNC_OFFSET(19536, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL,
-                     403),
-    NAME_FUNC_OFFSET(19555, glMultiTexCoord4iARB, glMultiTexCoord4iARB, NULL,
-                     404),
-    NAME_FUNC_OFFSET(19573, glMultiTexCoord4ivARB, glMultiTexCoord4ivARB, NULL,
-                     405),
-    NAME_FUNC_OFFSET(19592, glMultiTexCoord4sARB, glMultiTexCoord4sARB, NULL,
-                     406),
-    NAME_FUNC_OFFSET(19610, glMultiTexCoord4svARB, glMultiTexCoord4svARB, NULL,
-                     407),
-    NAME_FUNC_OFFSET(19629, glStencilOpSeparate, glStencilOpSeparate, NULL,
-                     423),
-    NAME_FUNC_OFFSET(19652, glLoadTransposeMatrixdARB,
-                     glLoadTransposeMatrixdARB, NULL, 441),
-    NAME_FUNC_OFFSET(19675, glLoadTransposeMatrixfARB,
-                     glLoadTransposeMatrixfARB, NULL, 442),
-    NAME_FUNC_OFFSET(19698, glMultTransposeMatrixdARB,
-                     glMultTransposeMatrixdARB, NULL, 443),
-    NAME_FUNC_OFFSET(19721, glMultTransposeMatrixfARB,
-                     glMultTransposeMatrixfARB, NULL, 444),
-    NAME_FUNC_OFFSET(19744, glSampleCoverageARB, glSampleCoverageARB, NULL,
-                     445),
-    NAME_FUNC_OFFSET(19761, glCompressedTexImage1DARB,
-                     glCompressedTexImage1DARB, NULL, 446),
-    NAME_FUNC_OFFSET(19784, glCompressedTexImage2DARB,
-                     glCompressedTexImage2DARB, NULL, 447),
-    NAME_FUNC_OFFSET(19807, glCompressedTexImage3DARB,
-                     glCompressedTexImage3DARB, NULL, 448),
-    NAME_FUNC_OFFSET(19830, glCompressedTexSubImage1DARB,
-                     glCompressedTexSubImage1DARB, NULL, 449),
-    NAME_FUNC_OFFSET(19856, glCompressedTexSubImage2DARB,
-                     glCompressedTexSubImage2DARB, NULL, 450),
-    NAME_FUNC_OFFSET(19882, glCompressedTexSubImage3DARB,
-                     glCompressedTexSubImage3DARB, NULL, 451),
-    NAME_FUNC_OFFSET(19908, glGetCompressedTexImageARB,
-                     glGetCompressedTexImageARB, NULL, 452),
-    NAME_FUNC_OFFSET(19932, glDisableVertexAttribArrayARB,
-                     glDisableVertexAttribArrayARB, NULL, 453),
-    NAME_FUNC_OFFSET(19959, glEnableVertexAttribArrayARB,
-                     glEnableVertexAttribArrayARB, NULL, 454),
-    NAME_FUNC_OFFSET(19985, glGetVertexAttribdvARB, glGetVertexAttribdvARB,
-                     NULL, 461),
-    NAME_FUNC_OFFSET(20005, glGetVertexAttribfvARB, glGetVertexAttribfvARB,
-                     NULL, 462),
-    NAME_FUNC_OFFSET(20025, glGetVertexAttribivARB, glGetVertexAttribivARB,
-                     NULL, 463),
-    NAME_FUNC_OFFSET(20045, glProgramEnvParameter4dARB,
-                     glProgramEnvParameter4dARB, NULL, 464),
-    NAME_FUNC_OFFSET(20068, glProgramEnvParameter4dvARB,
-                     glProgramEnvParameter4dvARB, NULL, 465),
-    NAME_FUNC_OFFSET(20092, glProgramEnvParameter4fARB,
-                     glProgramEnvParameter4fARB, NULL, 466),
-    NAME_FUNC_OFFSET(20115, glProgramEnvParameter4fvARB,
-                     glProgramEnvParameter4fvARB, NULL, 467),
-    NAME_FUNC_OFFSET(20139, glVertexAttrib1dARB, glVertexAttrib1dARB, NULL,
-                     473),
-    NAME_FUNC_OFFSET(20156, glVertexAttrib1dvARB, glVertexAttrib1dvARB, NULL,
-                     474),
-    NAME_FUNC_OFFSET(20174, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL,
-                     475),
-    NAME_FUNC_OFFSET(20191, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL,
-                     476),
-    NAME_FUNC_OFFSET(20209, glVertexAttrib1sARB, glVertexAttrib1sARB, NULL,
-                     477),
-    NAME_FUNC_OFFSET(20226, glVertexAttrib1svARB, glVertexAttrib1svARB, NULL,
-                     478),
-    NAME_FUNC_OFFSET(20244, glVertexAttrib2dARB, glVertexAttrib2dARB, NULL,
-                     479),
-    NAME_FUNC_OFFSET(20261, glVertexAttrib2dvARB, glVertexAttrib2dvARB, NULL,
-                     480),
-    NAME_FUNC_OFFSET(20279, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL,
-                     481),
-    NAME_FUNC_OFFSET(20296, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL,
-                     482),
-    NAME_FUNC_OFFSET(20314, glVertexAttrib2sARB, glVertexAttrib2sARB, NULL,
-                     483),
-    NAME_FUNC_OFFSET(20331, glVertexAttrib2svARB, glVertexAttrib2svARB, NULL,
-                     484),
-    NAME_FUNC_OFFSET(20349, glVertexAttrib3dARB, glVertexAttrib3dARB, NULL,
-                     485),
-    NAME_FUNC_OFFSET(20366, glVertexAttrib3dvARB, glVertexAttrib3dvARB, NULL,
-                     486),
-    NAME_FUNC_OFFSET(20384, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL,
-                     487),
-    NAME_FUNC_OFFSET(20401, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL,
-                     488),
-    NAME_FUNC_OFFSET(20419, glVertexAttrib3sARB, glVertexAttrib3sARB, NULL,
-                     489),
-    NAME_FUNC_OFFSET(20436, glVertexAttrib3svARB, glVertexAttrib3svARB, NULL,
-                     490),
-    NAME_FUNC_OFFSET(20454, glVertexAttrib4NbvARB, glVertexAttrib4NbvARB, NULL,
-                     491),
-    NAME_FUNC_OFFSET(20473, glVertexAttrib4NivARB, glVertexAttrib4NivARB, NULL,
-                     492),
-    NAME_FUNC_OFFSET(20492, glVertexAttrib4NsvARB, glVertexAttrib4NsvARB, NULL,
-                     493),
-    NAME_FUNC_OFFSET(20511, glVertexAttrib4NubARB, glVertexAttrib4NubARB, NULL,
-                     494),
-    NAME_FUNC_OFFSET(20530, glVertexAttrib4NubvARB, glVertexAttrib4NubvARB,
-                     NULL, 495),
-    NAME_FUNC_OFFSET(20550, glVertexAttrib4NuivARB, glVertexAttrib4NuivARB,
-                     NULL, 496),
-    NAME_FUNC_OFFSET(20570, glVertexAttrib4NusvARB, glVertexAttrib4NusvARB,
-                     NULL, 497),
-    NAME_FUNC_OFFSET(20590, glVertexAttrib4bvARB, glVertexAttrib4bvARB, NULL,
-                     498),
-    NAME_FUNC_OFFSET(20608, glVertexAttrib4dARB, glVertexAttrib4dARB, NULL,
-                     499),
-    NAME_FUNC_OFFSET(20625, glVertexAttrib4dvARB, glVertexAttrib4dvARB, NULL,
-                     500),
-    NAME_FUNC_OFFSET(20643, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL,
-                     501),
-    NAME_FUNC_OFFSET(20660, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL,
-                     502),
-    NAME_FUNC_OFFSET(20678, glVertexAttrib4ivARB, glVertexAttrib4ivARB, NULL,
-                     503),
-    NAME_FUNC_OFFSET(20696, glVertexAttrib4sARB, glVertexAttrib4sARB, NULL,
-                     504),
-    NAME_FUNC_OFFSET(20713, glVertexAttrib4svARB, glVertexAttrib4svARB, NULL,
-                     505),
-    NAME_FUNC_OFFSET(20731, glVertexAttrib4ubvARB, glVertexAttrib4ubvARB, NULL,
-                     506),
-    NAME_FUNC_OFFSET(20750, glVertexAttrib4uivARB, glVertexAttrib4uivARB, NULL,
-                     507),
-    NAME_FUNC_OFFSET(20769, glVertexAttrib4usvARB, glVertexAttrib4usvARB, NULL,
-                     508),
-    NAME_FUNC_OFFSET(20788, glVertexAttribPointerARB, glVertexAttribPointerARB,
-                     NULL, 509),
-    NAME_FUNC_OFFSET(20810, glBindBufferARB, glBindBufferARB, NULL, 510),
-    NAME_FUNC_OFFSET(20823, glBufferDataARB, glBufferDataARB, NULL, 511),
-    NAME_FUNC_OFFSET(20836, glBufferSubDataARB, glBufferSubDataARB, NULL, 512),
-    NAME_FUNC_OFFSET(20852, glDeleteBuffersARB, glDeleteBuffersARB, NULL, 513),
-    NAME_FUNC_OFFSET(20868, glGenBuffersARB, glGenBuffersARB, NULL, 514),
-    NAME_FUNC_OFFSET(20881, glGetBufferParameterivARB,
-                     glGetBufferParameterivARB, NULL, 515),
-    NAME_FUNC_OFFSET(20904, glGetBufferPointervARB, glGetBufferPointervARB,
-                     NULL, 516),
-    NAME_FUNC_OFFSET(20924, glGetBufferSubDataARB, glGetBufferSubDataARB, NULL,
-                     517),
-    NAME_FUNC_OFFSET(20943, glIsBufferARB, glIsBufferARB, NULL, 518),
-    NAME_FUNC_OFFSET(20954, glMapBufferARB, glMapBufferARB, NULL, 519),
-    NAME_FUNC_OFFSET(20966, glUnmapBufferARB, glUnmapBufferARB, NULL, 520),
-    NAME_FUNC_OFFSET(20980, glBeginQueryARB, glBeginQueryARB, NULL, 521),
-    NAME_FUNC_OFFSET(20993, glDeleteQueriesARB, glDeleteQueriesARB, NULL, 522),
-    NAME_FUNC_OFFSET(21009, glEndQueryARB, glEndQueryARB, NULL, 523),
-    NAME_FUNC_OFFSET(21020, glGenQueriesARB, glGenQueriesARB, NULL, 524),
-    NAME_FUNC_OFFSET(21033, glGetQueryObjectivARB, glGetQueryObjectivARB, NULL,
-                     525),
-    NAME_FUNC_OFFSET(21052, glGetQueryObjectuivARB, glGetQueryObjectuivARB,
-                     NULL, 526),
-    NAME_FUNC_OFFSET(21072, glGetQueryivARB, glGetQueryivARB, NULL, 527),
-    NAME_FUNC_OFFSET(21085, glIsQueryARB, glIsQueryARB, NULL, 528),
-    NAME_FUNC_OFFSET(21095, glCompileShaderARB, glCompileShaderARB, NULL, 530),
-    NAME_FUNC_OFFSET(21111, glGetActiveUniformARB, glGetActiveUniformARB, NULL,
-                     535),
-    NAME_FUNC_OFFSET(21130, glGetShaderSourceARB, glGetShaderSourceARB, NULL,
-                     541),
-    NAME_FUNC_OFFSET(21148, glGetUniformLocationARB, glGetUniformLocationARB,
-                     NULL, 542),
-    NAME_FUNC_OFFSET(21169, glGetUniformfvARB, glGetUniformfvARB, NULL, 543),
-    NAME_FUNC_OFFSET(21184, glGetUniformivARB, glGetUniformivARB, NULL, 544),
-    NAME_FUNC_OFFSET(21199, glLinkProgramARB, glLinkProgramARB, NULL, 545),
-    NAME_FUNC_OFFSET(21213, glShaderSourceARB, glShaderSourceARB, NULL, 546),
-    NAME_FUNC_OFFSET(21228, glUniform1fARB, glUniform1fARB, NULL, 547),
-    NAME_FUNC_OFFSET(21240, glUniform1fvARB, glUniform1fvARB, NULL, 548),
-    NAME_FUNC_OFFSET(21253, glUniform1iARB, glUniform1iARB, NULL, 549),
-    NAME_FUNC_OFFSET(21265, glUniform1ivARB, glUniform1ivARB, NULL, 550),
-    NAME_FUNC_OFFSET(21278, glUniform2fARB, glUniform2fARB, NULL, 551),
-    NAME_FUNC_OFFSET(21290, glUniform2fvARB, glUniform2fvARB, NULL, 552),
-    NAME_FUNC_OFFSET(21303, glUniform2iARB, glUniform2iARB, NULL, 553),
-    NAME_FUNC_OFFSET(21315, glUniform2ivARB, glUniform2ivARB, NULL, 554),
-    NAME_FUNC_OFFSET(21328, glUniform3fARB, glUniform3fARB, NULL, 555),
-    NAME_FUNC_OFFSET(21340, glUniform3fvARB, glUniform3fvARB, NULL, 556),
-    NAME_FUNC_OFFSET(21353, glUniform3iARB, glUniform3iARB, NULL, 557),
-    NAME_FUNC_OFFSET(21365, glUniform3ivARB, glUniform3ivARB, NULL, 558),
-    NAME_FUNC_OFFSET(21378, glUniform4fARB, glUniform4fARB, NULL, 559),
-    NAME_FUNC_OFFSET(21390, glUniform4fvARB, glUniform4fvARB, NULL, 560),
-    NAME_FUNC_OFFSET(21403, glUniform4iARB, glUniform4iARB, NULL, 561),
-    NAME_FUNC_OFFSET(21415, glUniform4ivARB, glUniform4ivARB, NULL, 562),
-    NAME_FUNC_OFFSET(21428, glUniformMatrix2fvARB, glUniformMatrix2fvARB, NULL,
-                     563),
-    NAME_FUNC_OFFSET(21447, glUniformMatrix3fvARB, glUniformMatrix3fvARB, NULL,
-                     564),
-    NAME_FUNC_OFFSET(21466, glUniformMatrix4fvARB, glUniformMatrix4fvARB, NULL,
-                     565),
-    NAME_FUNC_OFFSET(21485, glUseProgramObjectARB, glUseProgramObjectARB, NULL,
-                     566),
-    NAME_FUNC_OFFSET(21498, glValidateProgramARB, glValidateProgramARB, NULL,
-                     567),
-    NAME_FUNC_OFFSET(21516, glBindAttribLocationARB, glBindAttribLocationARB,
-                     NULL, 568),
-    NAME_FUNC_OFFSET(21537, glGetActiveAttribARB, glGetActiveAttribARB, NULL,
-                     569),
-    NAME_FUNC_OFFSET(21555, glGetAttribLocationARB, glGetAttribLocationARB,
-                     NULL, 570),
-    NAME_FUNC_OFFSET(21575, glDrawBuffersARB, glDrawBuffersARB, NULL, 571),
-    NAME_FUNC_OFFSET(21589, glDrawBuffersARB, glDrawBuffersARB, NULL, 571),
-    NAME_FUNC_OFFSET(21606, glDrawBuffersARB, glDrawBuffersARB, NULL, 571),
-    NAME_FUNC_OFFSET(21622, glDrawArraysInstancedARB, glDrawArraysInstancedARB,
-                     NULL, 573),
-    NAME_FUNC_OFFSET(21647, glDrawArraysInstancedARB, glDrawArraysInstancedARB,
-                     NULL, 573),
-    NAME_FUNC_OFFSET(21669, glDrawElementsInstancedARB,
-                     glDrawElementsInstancedARB, NULL, 574),
-    NAME_FUNC_OFFSET(21696, glDrawElementsInstancedARB,
-                     glDrawElementsInstancedARB, NULL, 574),
-    NAME_FUNC_OFFSET(21720, glRenderbufferStorageMultisample,
-                     glRenderbufferStorageMultisample, NULL, 575),
-    NAME_FUNC_OFFSET(21756, glBlendEquationSeparateiARB,
-                     glBlendEquationSeparateiARB, NULL, 597),
-    NAME_FUNC_OFFSET(21790, glBlendEquationiARB, glBlendEquationiARB, NULL,
-                     598),
-    NAME_FUNC_OFFSET(21816, glBlendFuncSeparateiARB, glBlendFuncSeparateiARB,
-                     NULL, 599),
-    NAME_FUNC_OFFSET(21846, glBlendFunciARB, glBlendFunciARB, NULL, 600),
-    NAME_FUNC_OFFSET(21868, gl_dispatch_stub_698, gl_dispatch_stub_698, NULL,
-                     698),
-    NAME_FUNC_OFFSET(21884, gl_dispatch_stub_699, gl_dispatch_stub_699, NULL,
-                     699),
-    NAME_FUNC_OFFSET(21903, glPointParameterfEXT, glPointParameterfEXT, NULL,
-                     706),
-    NAME_FUNC_OFFSET(21921, glPointParameterfEXT, glPointParameterfEXT, NULL,
-                     706),
-    NAME_FUNC_OFFSET(21942, glPointParameterfEXT, glPointParameterfEXT, NULL,
-                     706),
-    NAME_FUNC_OFFSET(21964, glPointParameterfvEXT, glPointParameterfvEXT, NULL,
-                     707),
-    NAME_FUNC_OFFSET(21983, glPointParameterfvEXT, glPointParameterfvEXT, NULL,
-                     707),
-    NAME_FUNC_OFFSET(22005, glPointParameterfvEXT, glPointParameterfvEXT, NULL,
-                     707),
-    NAME_FUNC_OFFSET(22028, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL,
-                     710),
-    NAME_FUNC_OFFSET(22047, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT,
-                     NULL, 711),
-    NAME_FUNC_OFFSET(22067, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL,
-                     712),
-    NAME_FUNC_OFFSET(22086, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT,
-                     NULL, 713),
-    NAME_FUNC_OFFSET(22106, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL,
-                     714),
-    NAME_FUNC_OFFSET(22125, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT,
-                     NULL, 715),
-    NAME_FUNC_OFFSET(22145, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL,
-                     716),
-    NAME_FUNC_OFFSET(22164, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT,
-                     NULL, 717),
-    NAME_FUNC_OFFSET(22184, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL,
-                     718),
-    NAME_FUNC_OFFSET(22203, glSecondaryColor3svEXT, glSecondaryColor3svEXT,
-                     NULL, 719),
-    NAME_FUNC_OFFSET(22223, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT,
-                     NULL, 720),
-    NAME_FUNC_OFFSET(22243, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT,
-                     NULL, 721),
-    NAME_FUNC_OFFSET(22264, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT,
-                     NULL, 722),
-    NAME_FUNC_OFFSET(22284, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT,
-                     NULL, 723),
-    NAME_FUNC_OFFSET(22305, glSecondaryColor3usEXT, glSecondaryColor3usEXT,
-                     NULL, 724),
-    NAME_FUNC_OFFSET(22325, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT,
-                     NULL, 725),
-    NAME_FUNC_OFFSET(22346, glSecondaryColorPointerEXT,
-                     glSecondaryColorPointerEXT, NULL, 726),
-    NAME_FUNC_OFFSET(22370, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL,
-                     727),
-    NAME_FUNC_OFFSET(22388, glMultiDrawElementsEXT, glMultiDrawElementsEXT,
-                     NULL, 728),
-    NAME_FUNC_OFFSET(22408, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL,
-                     729),
-    NAME_FUNC_OFFSET(22426, glFogCoorddEXT, glFogCoorddEXT, NULL, 730),
-    NAME_FUNC_OFFSET(22438, glFogCoorddvEXT, glFogCoorddvEXT, NULL, 731),
-    NAME_FUNC_OFFSET(22451, glFogCoordfEXT, glFogCoordfEXT, NULL, 732),
-    NAME_FUNC_OFFSET(22463, glFogCoordfvEXT, glFogCoordfvEXT, NULL, 733),
-    NAME_FUNC_OFFSET(22476, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT,
-                     NULL, 735),
-    NAME_FUNC_OFFSET(22496, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT,
-                     NULL, 735),
-    NAME_FUNC_OFFSET(22520, glWindowPos2dMESA, glWindowPos2dMESA, NULL, 752),
-    NAME_FUNC_OFFSET(22534, glWindowPos2dMESA, glWindowPos2dMESA, NULL, 752),
-    NAME_FUNC_OFFSET(22551, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, 753),
-    NAME_FUNC_OFFSET(22566, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, 753),
-    NAME_FUNC_OFFSET(22584, glWindowPos2fMESA, glWindowPos2fMESA, NULL, 754),
-    NAME_FUNC_OFFSET(22598, glWindowPos2fMESA, glWindowPos2fMESA, NULL, 754),
-    NAME_FUNC_OFFSET(22615, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, 755),
-    NAME_FUNC_OFFSET(22630, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, 755),
-    NAME_FUNC_OFFSET(22648, glWindowPos2iMESA, glWindowPos2iMESA, NULL, 756),
-    NAME_FUNC_OFFSET(22662, glWindowPos2iMESA, glWindowPos2iMESA, NULL, 756),
-    NAME_FUNC_OFFSET(22679, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, 757),
-    NAME_FUNC_OFFSET(22694, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, 757),
-    NAME_FUNC_OFFSET(22712, glWindowPos2sMESA, glWindowPos2sMESA, NULL, 758),
-    NAME_FUNC_OFFSET(22726, glWindowPos2sMESA, glWindowPos2sMESA, NULL, 758),
-    NAME_FUNC_OFFSET(22743, glWindowPos2svMESA, glWindowPos2svMESA, NULL, 759),
-    NAME_FUNC_OFFSET(22758, glWindowPos2svMESA, glWindowPos2svMESA, NULL, 759),
-    NAME_FUNC_OFFSET(22776, glWindowPos3dMESA, glWindowPos3dMESA, NULL, 760),
-    NAME_FUNC_OFFSET(22790, glWindowPos3dMESA, glWindowPos3dMESA, NULL, 760),
-    NAME_FUNC_OFFSET(22807, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, 761),
-    NAME_FUNC_OFFSET(22822, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, 761),
-    NAME_FUNC_OFFSET(22840, glWindowPos3fMESA, glWindowPos3fMESA, NULL, 762),
-    NAME_FUNC_OFFSET(22854, glWindowPos3fMESA, glWindowPos3fMESA, NULL, 762),
-    NAME_FUNC_OFFSET(22871, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, 763),
-    NAME_FUNC_OFFSET(22886, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, 763),
-    NAME_FUNC_OFFSET(22904, glWindowPos3iMESA, glWindowPos3iMESA, NULL, 764),
-    NAME_FUNC_OFFSET(22918, glWindowPos3iMESA, glWindowPos3iMESA, NULL, 764),
-    NAME_FUNC_OFFSET(22935, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, 765),
-    NAME_FUNC_OFFSET(22950, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, 765),
-    NAME_FUNC_OFFSET(22968, glWindowPos3sMESA, glWindowPos3sMESA, NULL, 766),
-    NAME_FUNC_OFFSET(22982, glWindowPos3sMESA, glWindowPos3sMESA, NULL, 766),
-    NAME_FUNC_OFFSET(22999, glWindowPos3svMESA, glWindowPos3svMESA, NULL, 767),
-    NAME_FUNC_OFFSET(23014, glWindowPos3svMESA, glWindowPos3svMESA, NULL, 767),
-    NAME_FUNC_OFFSET(23032, glBindProgramNV, glBindProgramNV, NULL, 786),
-    NAME_FUNC_OFFSET(23049, glDeleteProgramsNV, glDeleteProgramsNV, NULL, 787),
-    NAME_FUNC_OFFSET(23069, glGenProgramsNV, glGenProgramsNV, NULL, 789),
-    NAME_FUNC_OFFSET(23086, glGetVertexAttribPointervNV,
-                     glGetVertexAttribPointervNV, NULL, 795),
-    NAME_FUNC_OFFSET(23112, glGetVertexAttribPointervNV,
-                     glGetVertexAttribPointervNV, NULL, 795),
-    NAME_FUNC_OFFSET(23141, glIsProgramNV, glIsProgramNV, NULL, 799),
-    NAME_FUNC_OFFSET(23156, glPointParameteriNV, glPointParameteriNV, NULL,
-                     863),
-    NAME_FUNC_OFFSET(23174, glPointParameterivNV, glPointParameterivNV, NULL,
-                     864),
-    NAME_FUNC_OFFSET(23193, gl_dispatch_stub_867, gl_dispatch_stub_867, NULL,
-                     867),
-    NAME_FUNC_OFFSET(23214, gl_dispatch_stub_869, gl_dispatch_stub_869, NULL,
-                     869),
-    NAME_FUNC_OFFSET(23230, glPrimitiveRestartIndexNV,
-                     glPrimitiveRestartIndexNV, NULL, 876),
-    NAME_FUNC_OFFSET(23254, gl_dispatch_stub_879, gl_dispatch_stub_879, NULL,
-                     879),
-    NAME_FUNC_OFFSET(23278, gl_dispatch_stub_879, gl_dispatch_stub_879, NULL,
-                     879),
-    NAME_FUNC_OFFSET(23305, glBindFramebufferEXT, glBindFramebufferEXT, NULL,
-                     880),
-    NAME_FUNC_OFFSET(23323, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL,
-                     881),
-    NAME_FUNC_OFFSET(23342, glCheckFramebufferStatusEXT,
-                     glCheckFramebufferStatusEXT, NULL, 882),
-    NAME_FUNC_OFFSET(23367, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT,
-                     NULL, 883),
-    NAME_FUNC_OFFSET(23388, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT,
-                     NULL, 884),
-    NAME_FUNC_OFFSET(23410, glFramebufferRenderbufferEXT,
-                     glFramebufferRenderbufferEXT, NULL, 885),
-    NAME_FUNC_OFFSET(23436, glFramebufferTexture1DEXT,
-                     glFramebufferTexture1DEXT, NULL, 886),
-    NAME_FUNC_OFFSET(23459, glFramebufferTexture2DEXT,
-                     glFramebufferTexture2DEXT, NULL, 887),
-    NAME_FUNC_OFFSET(23482, glFramebufferTexture3DEXT,
-                     glFramebufferTexture3DEXT, NULL, 888),
-    NAME_FUNC_OFFSET(23505, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL,
-                     889),
-    NAME_FUNC_OFFSET(23523, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL,
-                     890),
-    NAME_FUNC_OFFSET(23542, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL,
-                     891),
-    NAME_FUNC_OFFSET(23559, glGetFramebufferAttachmentParameterivEXT,
-                     glGetFramebufferAttachmentParameterivEXT, NULL, 892),
-    NAME_FUNC_OFFSET(23597, glGetRenderbufferParameterivEXT,
-                     glGetRenderbufferParameterivEXT, NULL, 893),
-    NAME_FUNC_OFFSET(23626, glIsFramebufferEXT, glIsFramebufferEXT, NULL, 894),
-    NAME_FUNC_OFFSET(23642, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL,
-                     895),
-    NAME_FUNC_OFFSET(23659, glRenderbufferStorageEXT, glRenderbufferStorageEXT,
-                     NULL, 896),
-    NAME_FUNC_OFFSET(23681, gl_dispatch_stub_897, gl_dispatch_stub_897, NULL,
-                     897),
-    NAME_FUNC_OFFSET(23699, glBindFragDataLocationEXT,
-                     glBindFragDataLocationEXT, NULL, 900),
-    NAME_FUNC_OFFSET(23722, glGetFragDataLocationEXT, glGetFragDataLocationEXT,
-                     NULL, 901),
-    NAME_FUNC_OFFSET(23744, glGetUniformuivEXT, glGetUniformuivEXT, NULL, 902),
-    NAME_FUNC_OFFSET(23760, glGetVertexAttribIivEXT, glGetVertexAttribIivEXT,
-                     NULL, 903),
-    NAME_FUNC_OFFSET(23781, glGetVertexAttribIuivEXT, glGetVertexAttribIuivEXT,
-                     NULL, 904),
-    NAME_FUNC_OFFSET(23803, glUniform1uiEXT, glUniform1uiEXT, NULL, 905),
-    NAME_FUNC_OFFSET(23816, glUniform1uivEXT, glUniform1uivEXT, NULL, 906),
-    NAME_FUNC_OFFSET(23830, glUniform2uiEXT, glUniform2uiEXT, NULL, 907),
-    NAME_FUNC_OFFSET(23843, glUniform2uivEXT, glUniform2uivEXT, NULL, 908),
-    NAME_FUNC_OFFSET(23857, glUniform3uiEXT, glUniform3uiEXT, NULL, 909),
-    NAME_FUNC_OFFSET(23870, glUniform3uivEXT, glUniform3uivEXT, NULL, 910),
-    NAME_FUNC_OFFSET(23884, glUniform4uiEXT, glUniform4uiEXT, NULL, 911),
-    NAME_FUNC_OFFSET(23897, glUniform4uivEXT, glUniform4uivEXT, NULL, 912),
-    NAME_FUNC_OFFSET(23911, glVertexAttribI1iEXT, glVertexAttribI1iEXT, NULL,
-                     913),
-    NAME_FUNC_OFFSET(23929, glVertexAttribI1ivEXT, glVertexAttribI1ivEXT, NULL,
-                     914),
-    NAME_FUNC_OFFSET(23948, glVertexAttribI1uiEXT, glVertexAttribI1uiEXT, NULL,
-                     915),
-    NAME_FUNC_OFFSET(23967, glVertexAttribI1uivEXT, glVertexAttribI1uivEXT,
-                     NULL, 916),
-    NAME_FUNC_OFFSET(23987, glVertexAttribI2iEXT, glVertexAttribI2iEXT, NULL,
-                     917),
-    NAME_FUNC_OFFSET(24005, glVertexAttribI2ivEXT, glVertexAttribI2ivEXT, NULL,
-                     918),
-    NAME_FUNC_OFFSET(24024, glVertexAttribI2uiEXT, glVertexAttribI2uiEXT, NULL,
-                     919),
-    NAME_FUNC_OFFSET(24043, glVertexAttribI2uivEXT, glVertexAttribI2uivEXT,
-                     NULL, 920),
-    NAME_FUNC_OFFSET(24063, glVertexAttribI3iEXT, glVertexAttribI3iEXT, NULL,
-                     921),
-    NAME_FUNC_OFFSET(24081, glVertexAttribI3ivEXT, glVertexAttribI3ivEXT, NULL,
-                     922),
-    NAME_FUNC_OFFSET(24100, glVertexAttribI3uiEXT, glVertexAttribI3uiEXT, NULL,
-                     923),
-    NAME_FUNC_OFFSET(24119, glVertexAttribI3uivEXT, glVertexAttribI3uivEXT,
-                     NULL, 924),
-    NAME_FUNC_OFFSET(24139, glVertexAttribI4bvEXT, glVertexAttribI4bvEXT, NULL,
-                     925),
-    NAME_FUNC_OFFSET(24158, glVertexAttribI4iEXT, glVertexAttribI4iEXT, NULL,
-                     926),
-    NAME_FUNC_OFFSET(24176, glVertexAttribI4ivEXT, glVertexAttribI4ivEXT, NULL,
-                     927),
-    NAME_FUNC_OFFSET(24195, glVertexAttribI4svEXT, glVertexAttribI4svEXT, NULL,
-                     928),
-    NAME_FUNC_OFFSET(24214, glVertexAttribI4ubvEXT, glVertexAttribI4ubvEXT,
-                     NULL, 929),
-    NAME_FUNC_OFFSET(24234, glVertexAttribI4uiEXT, glVertexAttribI4uiEXT, NULL,
-                     930),
-    NAME_FUNC_OFFSET(24253, glVertexAttribI4uivEXT, glVertexAttribI4uivEXT,
-                     NULL, 931),
-    NAME_FUNC_OFFSET(24273, glVertexAttribI4usvEXT, glVertexAttribI4usvEXT,
-                     NULL, 932),
-    NAME_FUNC_OFFSET(24293, glVertexAttribIPointerEXT,
-                     glVertexAttribIPointerEXT, NULL, 933),
-    NAME_FUNC_OFFSET(24316, glFramebufferTextureLayerEXT,
-                     glFramebufferTextureLayerEXT, NULL, 934),
-    NAME_FUNC_OFFSET(24342, glFramebufferTextureLayerEXT,
-                     glFramebufferTextureLayerEXT, NULL, 934),
-    NAME_FUNC_OFFSET(24371, glColorMaskIndexedEXT, glColorMaskIndexedEXT, NULL,
-                     935),
-    NAME_FUNC_OFFSET(24384, glDisableIndexedEXT, glDisableIndexedEXT, NULL,
-                     936),
-    NAME_FUNC_OFFSET(24395, glEnableIndexedEXT, glEnableIndexedEXT, NULL, 937),
-    NAME_FUNC_OFFSET(24405, glGetBooleanIndexedvEXT, glGetBooleanIndexedvEXT,
-                     NULL, 938),
-    NAME_FUNC_OFFSET(24421, glGetIntegerIndexedvEXT, glGetIntegerIndexedvEXT,
-                     NULL, 939),
-    NAME_FUNC_OFFSET(24437, glIsEnabledIndexedEXT, glIsEnabledIndexedEXT, NULL,
-                     940),
-    NAME_FUNC_OFFSET(24450, glGetTexParameterIivEXT, glGetTexParameterIivEXT,
-                     NULL, 943),
-    NAME_FUNC_OFFSET(24471, glGetTexParameterIuivEXT, glGetTexParameterIuivEXT,
-                     NULL, 944),
-    NAME_FUNC_OFFSET(24493, glTexParameterIivEXT, glTexParameterIivEXT, NULL,
-                     945),
-    NAME_FUNC_OFFSET(24511, glTexParameterIuivEXT, glTexParameterIuivEXT, NULL,
-                     946),
-    NAME_FUNC_OFFSET(24530, glBeginConditionalRenderNV,
-                     glBeginConditionalRenderNV, NULL, 947),
-    NAME_FUNC_OFFSET(24555, glEndConditionalRenderNV, glEndConditionalRenderNV,
-                     NULL, 948),
-    NAME_FUNC_OFFSET(24578, glBeginTransformFeedbackEXT,
-                     glBeginTransformFeedbackEXT, NULL, 949),
-    NAME_FUNC_OFFSET(24603, glBindBufferBaseEXT, glBindBufferBaseEXT, NULL,
-                     950),
-    NAME_FUNC_OFFSET(24620, glBindBufferRangeEXT, glBindBufferRangeEXT, NULL,
-                     952),
-    NAME_FUNC_OFFSET(24638, glEndTransformFeedbackEXT,
-                     glEndTransformFeedbackEXT, NULL, 953),
-    NAME_FUNC_OFFSET(24661, glGetTransformFeedbackVaryingEXT,
-                     glGetTransformFeedbackVaryingEXT, NULL, 954),
-    NAME_FUNC_OFFSET(24691, glTransformFeedbackVaryingsEXT,
-                     glTransformFeedbackVaryingsEXT, NULL, 955),
-    NAME_FUNC_OFFSET(24719, glProvokingVertexEXT, glProvokingVertexEXT, NULL,
-                     956),
+    NAME_FUNC_OFFSET(    0, glNewList, glNewList, NULL, 0),
+    NAME_FUNC_OFFSET(   10, glEndList, glEndList, NULL, 1),
+    NAME_FUNC_OFFSET(   20, glCallList, glCallList, NULL, 2),
+    NAME_FUNC_OFFSET(   31, glCallLists, glCallLists, NULL, 3),
+    NAME_FUNC_OFFSET(   43, glDeleteLists, glDeleteLists, NULL, 4),
+    NAME_FUNC_OFFSET(   57, glGenLists, glGenLists, NULL, 5),
+    NAME_FUNC_OFFSET(   68, glListBase, glListBase, NULL, 6),
+    NAME_FUNC_OFFSET(   79, glBegin, glBegin, NULL, 7),
+    NAME_FUNC_OFFSET(   87, glBitmap, glBitmap, NULL, 8),
+    NAME_FUNC_OFFSET(   96, glColor3b, glColor3b, NULL, 9),
+    NAME_FUNC_OFFSET(  106, glColor3bv, glColor3bv, NULL, 10),
+    NAME_FUNC_OFFSET(  117, glColor3d, glColor3d, NULL, 11),
+    NAME_FUNC_OFFSET(  127, glColor3dv, glColor3dv, NULL, 12),
+    NAME_FUNC_OFFSET(  138, glColor3f, glColor3f, NULL, 13),
+    NAME_FUNC_OFFSET(  148, glColor3fv, glColor3fv, NULL, 14),
+    NAME_FUNC_OFFSET(  159, glColor3i, glColor3i, NULL, 15),
+    NAME_FUNC_OFFSET(  169, glColor3iv, glColor3iv, NULL, 16),
+    NAME_FUNC_OFFSET(  180, glColor3s, glColor3s, NULL, 17),
+    NAME_FUNC_OFFSET(  190, glColor3sv, glColor3sv, NULL, 18),
+    NAME_FUNC_OFFSET(  201, glColor3ub, glColor3ub, NULL, 19),
+    NAME_FUNC_OFFSET(  212, glColor3ubv, glColor3ubv, NULL, 20),
+    NAME_FUNC_OFFSET(  224, glColor3ui, glColor3ui, NULL, 21),
+    NAME_FUNC_OFFSET(  235, glColor3uiv, glColor3uiv, NULL, 22),
+    NAME_FUNC_OFFSET(  247, glColor3us, glColor3us, NULL, 23),
+    NAME_FUNC_OFFSET(  258, glColor3usv, glColor3usv, NULL, 24),
+    NAME_FUNC_OFFSET(  270, glColor4b, glColor4b, NULL, 25),
+    NAME_FUNC_OFFSET(  280, glColor4bv, glColor4bv, NULL, 26),
+    NAME_FUNC_OFFSET(  291, glColor4d, glColor4d, NULL, 27),
+    NAME_FUNC_OFFSET(  301, glColor4dv, glColor4dv, NULL, 28),
+    NAME_FUNC_OFFSET(  312, glColor4f, glColor4f, NULL, 29),
+    NAME_FUNC_OFFSET(  322, glColor4fv, glColor4fv, NULL, 30),
+    NAME_FUNC_OFFSET(  333, glColor4i, glColor4i, NULL, 31),
+    NAME_FUNC_OFFSET(  343, glColor4iv, glColor4iv, NULL, 32),
+    NAME_FUNC_OFFSET(  354, glColor4s, glColor4s, NULL, 33),
+    NAME_FUNC_OFFSET(  364, glColor4sv, glColor4sv, NULL, 34),
+    NAME_FUNC_OFFSET(  375, glColor4ub, glColor4ub, NULL, 35),
+    NAME_FUNC_OFFSET(  386, glColor4ubv, glColor4ubv, NULL, 36),
+    NAME_FUNC_OFFSET(  398, glColor4ui, glColor4ui, NULL, 37),
+    NAME_FUNC_OFFSET(  409, glColor4uiv, glColor4uiv, NULL, 38),
+    NAME_FUNC_OFFSET(  421, glColor4us, glColor4us, NULL, 39),
+    NAME_FUNC_OFFSET(  432, glColor4usv, glColor4usv, NULL, 40),
+    NAME_FUNC_OFFSET(  444, glEdgeFlag, glEdgeFlag, NULL, 41),
+    NAME_FUNC_OFFSET(  455, glEdgeFlagv, glEdgeFlagv, NULL, 42),
+    NAME_FUNC_OFFSET(  467, glEnd, glEnd, NULL, 43),
+    NAME_FUNC_OFFSET(  473, glIndexd, glIndexd, NULL, 44),
+    NAME_FUNC_OFFSET(  482, glIndexdv, glIndexdv, NULL, 45),
+    NAME_FUNC_OFFSET(  492, glIndexf, glIndexf, NULL, 46),
+    NAME_FUNC_OFFSET(  501, glIndexfv, glIndexfv, NULL, 47),
+    NAME_FUNC_OFFSET(  511, glIndexi, glIndexi, NULL, 48),
+    NAME_FUNC_OFFSET(  520, glIndexiv, glIndexiv, NULL, 49),
+    NAME_FUNC_OFFSET(  530, glIndexs, glIndexs, NULL, 50),
+    NAME_FUNC_OFFSET(  539, glIndexsv, glIndexsv, NULL, 51),
+    NAME_FUNC_OFFSET(  549, glNormal3b, glNormal3b, NULL, 52),
+    NAME_FUNC_OFFSET(  560, glNormal3bv, glNormal3bv, NULL, 53),
+    NAME_FUNC_OFFSET(  572, glNormal3d, glNormal3d, NULL, 54),
+    NAME_FUNC_OFFSET(  583, glNormal3dv, glNormal3dv, NULL, 55),
+    NAME_FUNC_OFFSET(  595, glNormal3f, glNormal3f, NULL, 56),
+    NAME_FUNC_OFFSET(  606, glNormal3fv, glNormal3fv, NULL, 57),
+    NAME_FUNC_OFFSET(  618, glNormal3i, glNormal3i, NULL, 58),
+    NAME_FUNC_OFFSET(  629, glNormal3iv, glNormal3iv, NULL, 59),
+    NAME_FUNC_OFFSET(  641, glNormal3s, glNormal3s, NULL, 60),
+    NAME_FUNC_OFFSET(  652, glNormal3sv, glNormal3sv, NULL, 61),
+    NAME_FUNC_OFFSET(  664, glRasterPos2d, glRasterPos2d, NULL, 62),
+    NAME_FUNC_OFFSET(  678, glRasterPos2dv, glRasterPos2dv, NULL, 63),
+    NAME_FUNC_OFFSET(  693, glRasterPos2f, glRasterPos2f, NULL, 64),
+    NAME_FUNC_OFFSET(  707, glRasterPos2fv, glRasterPos2fv, NULL, 65),
+    NAME_FUNC_OFFSET(  722, glRasterPos2i, glRasterPos2i, NULL, 66),
+    NAME_FUNC_OFFSET(  736, glRasterPos2iv, glRasterPos2iv, NULL, 67),
+    NAME_FUNC_OFFSET(  751, glRasterPos2s, glRasterPos2s, NULL, 68),
+    NAME_FUNC_OFFSET(  765, glRasterPos2sv, glRasterPos2sv, NULL, 69),
+    NAME_FUNC_OFFSET(  780, glRasterPos3d, glRasterPos3d, NULL, 70),
+    NAME_FUNC_OFFSET(  794, glRasterPos3dv, glRasterPos3dv, NULL, 71),
+    NAME_FUNC_OFFSET(  809, glRasterPos3f, glRasterPos3f, NULL, 72),
+    NAME_FUNC_OFFSET(  823, glRasterPos3fv, glRasterPos3fv, NULL, 73),
+    NAME_FUNC_OFFSET(  838, glRasterPos3i, glRasterPos3i, NULL, 74),
+    NAME_FUNC_OFFSET(  852, glRasterPos3iv, glRasterPos3iv, NULL, 75),
+    NAME_FUNC_OFFSET(  867, glRasterPos3s, glRasterPos3s, NULL, 76),
+    NAME_FUNC_OFFSET(  881, glRasterPos3sv, glRasterPos3sv, NULL, 77),
+    NAME_FUNC_OFFSET(  896, glRasterPos4d, glRasterPos4d, NULL, 78),
+    NAME_FUNC_OFFSET(  910, glRasterPos4dv, glRasterPos4dv, NULL, 79),
+    NAME_FUNC_OFFSET(  925, glRasterPos4f, glRasterPos4f, NULL, 80),
+    NAME_FUNC_OFFSET(  939, glRasterPos4fv, glRasterPos4fv, NULL, 81),
+    NAME_FUNC_OFFSET(  954, glRasterPos4i, glRasterPos4i, NULL, 82),
+    NAME_FUNC_OFFSET(  968, glRasterPos4iv, glRasterPos4iv, NULL, 83),
+    NAME_FUNC_OFFSET(  983, glRasterPos4s, glRasterPos4s, NULL, 84),
+    NAME_FUNC_OFFSET(  997, glRasterPos4sv, glRasterPos4sv, NULL, 85),
+    NAME_FUNC_OFFSET( 1012, glRectd, glRectd, NULL, 86),
+    NAME_FUNC_OFFSET( 1020, glRectdv, glRectdv, NULL, 87),
+    NAME_FUNC_OFFSET( 1029, glRectf, glRectf, NULL, 88),
+    NAME_FUNC_OFFSET( 1037, glRectfv, glRectfv, NULL, 89),
+    NAME_FUNC_OFFSET( 1046, glRecti, glRecti, NULL, 90),
+    NAME_FUNC_OFFSET( 1054, glRectiv, glRectiv, NULL, 91),
+    NAME_FUNC_OFFSET( 1063, glRects, glRects, NULL, 92),
+    NAME_FUNC_OFFSET( 1071, glRectsv, glRectsv, NULL, 93),
+    NAME_FUNC_OFFSET( 1080, glTexCoord1d, glTexCoord1d, NULL, 94),
+    NAME_FUNC_OFFSET( 1093, glTexCoord1dv, glTexCoord1dv, NULL, 95),
+    NAME_FUNC_OFFSET( 1107, glTexCoord1f, glTexCoord1f, NULL, 96),
+    NAME_FUNC_OFFSET( 1120, glTexCoord1fv, glTexCoord1fv, NULL, 97),
+    NAME_FUNC_OFFSET( 1134, glTexCoord1i, glTexCoord1i, NULL, 98),
+    NAME_FUNC_OFFSET( 1147, glTexCoord1iv, glTexCoord1iv, NULL, 99),
+    NAME_FUNC_OFFSET( 1161, glTexCoord1s, glTexCoord1s, NULL, 100),
+    NAME_FUNC_OFFSET( 1174, glTexCoord1sv, glTexCoord1sv, NULL, 101),
+    NAME_FUNC_OFFSET( 1188, glTexCoord2d, glTexCoord2d, NULL, 102),
+    NAME_FUNC_OFFSET( 1201, glTexCoord2dv, glTexCoord2dv, NULL, 103),
+    NAME_FUNC_OFFSET( 1215, glTexCoord2f, glTexCoord2f, NULL, 104),
+    NAME_FUNC_OFFSET( 1228, glTexCoord2fv, glTexCoord2fv, NULL, 105),
+    NAME_FUNC_OFFSET( 1242, glTexCoord2i, glTexCoord2i, NULL, 106),
+    NAME_FUNC_OFFSET( 1255, glTexCoord2iv, glTexCoord2iv, NULL, 107),
+    NAME_FUNC_OFFSET( 1269, glTexCoord2s, glTexCoord2s, NULL, 108),
+    NAME_FUNC_OFFSET( 1282, glTexCoord2sv, glTexCoord2sv, NULL, 109),
+    NAME_FUNC_OFFSET( 1296, glTexCoord3d, glTexCoord3d, NULL, 110),
+    NAME_FUNC_OFFSET( 1309, glTexCoord3dv, glTexCoord3dv, NULL, 111),
+    NAME_FUNC_OFFSET( 1323, glTexCoord3f, glTexCoord3f, NULL, 112),
+    NAME_FUNC_OFFSET( 1336, glTexCoord3fv, glTexCoord3fv, NULL, 113),
+    NAME_FUNC_OFFSET( 1350, glTexCoord3i, glTexCoord3i, NULL, 114),
+    NAME_FUNC_OFFSET( 1363, glTexCoord3iv, glTexCoord3iv, NULL, 115),
+    NAME_FUNC_OFFSET( 1377, glTexCoord3s, glTexCoord3s, NULL, 116),
+    NAME_FUNC_OFFSET( 1390, glTexCoord3sv, glTexCoord3sv, NULL, 117),
+    NAME_FUNC_OFFSET( 1404, glTexCoord4d, glTexCoord4d, NULL, 118),
+    NAME_FUNC_OFFSET( 1417, glTexCoord4dv, glTexCoord4dv, NULL, 119),
+    NAME_FUNC_OFFSET( 1431, glTexCoord4f, glTexCoord4f, NULL, 120),
+    NAME_FUNC_OFFSET( 1444, glTexCoord4fv, glTexCoord4fv, NULL, 121),
+    NAME_FUNC_OFFSET( 1458, glTexCoord4i, glTexCoord4i, NULL, 122),
+    NAME_FUNC_OFFSET( 1471, glTexCoord4iv, glTexCoord4iv, NULL, 123),
+    NAME_FUNC_OFFSET( 1485, glTexCoord4s, glTexCoord4s, NULL, 124),
+    NAME_FUNC_OFFSET( 1498, glTexCoord4sv, glTexCoord4sv, NULL, 125),
+    NAME_FUNC_OFFSET( 1512, glVertex2d, glVertex2d, NULL, 126),
+    NAME_FUNC_OFFSET( 1523, glVertex2dv, glVertex2dv, NULL, 127),
+    NAME_FUNC_OFFSET( 1535, glVertex2f, glVertex2f, NULL, 128),
+    NAME_FUNC_OFFSET( 1546, glVertex2fv, glVertex2fv, NULL, 129),
+    NAME_FUNC_OFFSET( 1558, glVertex2i, glVertex2i, NULL, 130),
+    NAME_FUNC_OFFSET( 1569, glVertex2iv, glVertex2iv, NULL, 131),
+    NAME_FUNC_OFFSET( 1581, glVertex2s, glVertex2s, NULL, 132),
+    NAME_FUNC_OFFSET( 1592, glVertex2sv, glVertex2sv, NULL, 133),
+    NAME_FUNC_OFFSET( 1604, glVertex3d, glVertex3d, NULL, 134),
+    NAME_FUNC_OFFSET( 1615, glVertex3dv, glVertex3dv, NULL, 135),
+    NAME_FUNC_OFFSET( 1627, glVertex3f, glVertex3f, NULL, 136),
+    NAME_FUNC_OFFSET( 1638, glVertex3fv, glVertex3fv, NULL, 137),
+    NAME_FUNC_OFFSET( 1650, glVertex3i, glVertex3i, NULL, 138),
+    NAME_FUNC_OFFSET( 1661, glVertex3iv, glVertex3iv, NULL, 139),
+    NAME_FUNC_OFFSET( 1673, glVertex3s, glVertex3s, NULL, 140),
+    NAME_FUNC_OFFSET( 1684, glVertex3sv, glVertex3sv, NULL, 141),
+    NAME_FUNC_OFFSET( 1696, glVertex4d, glVertex4d, NULL, 142),
+    NAME_FUNC_OFFSET( 1707, glVertex4dv, glVertex4dv, NULL, 143),
+    NAME_FUNC_OFFSET( 1719, glVertex4f, glVertex4f, NULL, 144),
+    NAME_FUNC_OFFSET( 1730, glVertex4fv, glVertex4fv, NULL, 145),
+    NAME_FUNC_OFFSET( 1742, glVertex4i, glVertex4i, NULL, 146),
+    NAME_FUNC_OFFSET( 1753, glVertex4iv, glVertex4iv, NULL, 147),
+    NAME_FUNC_OFFSET( 1765, glVertex4s, glVertex4s, NULL, 148),
+    NAME_FUNC_OFFSET( 1776, glVertex4sv, glVertex4sv, NULL, 149),
+    NAME_FUNC_OFFSET( 1788, glClipPlane, glClipPlane, NULL, 150),
+    NAME_FUNC_OFFSET( 1800, glColorMaterial, glColorMaterial, NULL, 151),
+    NAME_FUNC_OFFSET( 1816, glCullFace, glCullFace, NULL, 152),
+    NAME_FUNC_OFFSET( 1827, glFogf, glFogf, NULL, 153),
+    NAME_FUNC_OFFSET( 1834, glFogfv, glFogfv, NULL, 154),
+    NAME_FUNC_OFFSET( 1842, glFogi, glFogi, NULL, 155),
+    NAME_FUNC_OFFSET( 1849, glFogiv, glFogiv, NULL, 156),
+    NAME_FUNC_OFFSET( 1857, glFrontFace, glFrontFace, NULL, 157),
+    NAME_FUNC_OFFSET( 1869, glHint, glHint, NULL, 158),
+    NAME_FUNC_OFFSET( 1876, glLightf, glLightf, NULL, 159),
+    NAME_FUNC_OFFSET( 1885, glLightfv, glLightfv, NULL, 160),
+    NAME_FUNC_OFFSET( 1895, glLighti, glLighti, NULL, 161),
+    NAME_FUNC_OFFSET( 1904, glLightiv, glLightiv, NULL, 162),
+    NAME_FUNC_OFFSET( 1914, glLightModelf, glLightModelf, NULL, 163),
+    NAME_FUNC_OFFSET( 1928, glLightModelfv, glLightModelfv, NULL, 164),
+    NAME_FUNC_OFFSET( 1943, glLightModeli, glLightModeli, NULL, 165),
+    NAME_FUNC_OFFSET( 1957, glLightModeliv, glLightModeliv, NULL, 166),
+    NAME_FUNC_OFFSET( 1972, glLineStipple, glLineStipple, NULL, 167),
+    NAME_FUNC_OFFSET( 1986, glLineWidth, glLineWidth, NULL, 168),
+    NAME_FUNC_OFFSET( 1998, glMaterialf, glMaterialf, NULL, 169),
+    NAME_FUNC_OFFSET( 2010, glMaterialfv, glMaterialfv, NULL, 170),
+    NAME_FUNC_OFFSET( 2023, glMateriali, glMateriali, NULL, 171),
+    NAME_FUNC_OFFSET( 2035, glMaterialiv, glMaterialiv, NULL, 172),
+    NAME_FUNC_OFFSET( 2048, glPointSize, glPointSize, NULL, 173),
+    NAME_FUNC_OFFSET( 2060, glPolygonMode, glPolygonMode, NULL, 174),
+    NAME_FUNC_OFFSET( 2074, glPolygonStipple, glPolygonStipple, NULL, 175),
+    NAME_FUNC_OFFSET( 2091, glScissor, glScissor, NULL, 176),
+    NAME_FUNC_OFFSET( 2101, glShadeModel, glShadeModel, NULL, 177),
+    NAME_FUNC_OFFSET( 2114, glTexParameterf, glTexParameterf, NULL, 178),
+    NAME_FUNC_OFFSET( 2130, glTexParameterfv, glTexParameterfv, NULL, 179),
+    NAME_FUNC_OFFSET( 2147, glTexParameteri, glTexParameteri, NULL, 180),
+    NAME_FUNC_OFFSET( 2163, glTexParameteriv, glTexParameteriv, NULL, 181),
+    NAME_FUNC_OFFSET( 2180, glTexImage1D, glTexImage1D, NULL, 182),
+    NAME_FUNC_OFFSET( 2193, glTexImage2D, glTexImage2D, NULL, 183),
+    NAME_FUNC_OFFSET( 2206, glTexEnvf, glTexEnvf, NULL, 184),
+    NAME_FUNC_OFFSET( 2216, glTexEnvfv, glTexEnvfv, NULL, 185),
+    NAME_FUNC_OFFSET( 2227, glTexEnvi, glTexEnvi, NULL, 186),
+    NAME_FUNC_OFFSET( 2237, glTexEnviv, glTexEnviv, NULL, 187),
+    NAME_FUNC_OFFSET( 2248, glTexGend, glTexGend, NULL, 188),
+    NAME_FUNC_OFFSET( 2258, glTexGendv, glTexGendv, NULL, 189),
+    NAME_FUNC_OFFSET( 2269, glTexGenf, glTexGenf, NULL, 190),
+    NAME_FUNC_OFFSET( 2279, glTexGenfv, glTexGenfv, NULL, 191),
+    NAME_FUNC_OFFSET( 2290, glTexGeni, glTexGeni, NULL, 192),
+    NAME_FUNC_OFFSET( 2300, glTexGeniv, glTexGeniv, NULL, 193),
+    NAME_FUNC_OFFSET( 2311, glFeedbackBuffer, glFeedbackBuffer, NULL, 194),
+    NAME_FUNC_OFFSET( 2328, glSelectBuffer, glSelectBuffer, NULL, 195),
+    NAME_FUNC_OFFSET( 2343, glRenderMode, glRenderMode, NULL, 196),
+    NAME_FUNC_OFFSET( 2356, glInitNames, glInitNames, NULL, 197),
+    NAME_FUNC_OFFSET( 2368, glLoadName, glLoadName, NULL, 198),
+    NAME_FUNC_OFFSET( 2379, glPassThrough, glPassThrough, NULL, 199),
+    NAME_FUNC_OFFSET( 2393, glPopName, glPopName, NULL, 200),
+    NAME_FUNC_OFFSET( 2403, glPushName, glPushName, NULL, 201),
+    NAME_FUNC_OFFSET( 2414, glDrawBuffer, glDrawBuffer, NULL, 202),
+    NAME_FUNC_OFFSET( 2427, glClear, glClear, NULL, 203),
+    NAME_FUNC_OFFSET( 2435, glClearAccum, glClearAccum, NULL, 204),
+    NAME_FUNC_OFFSET( 2448, glClearIndex, glClearIndex, NULL, 205),
+    NAME_FUNC_OFFSET( 2461, glClearColor, glClearColor, NULL, 206),
+    NAME_FUNC_OFFSET( 2474, glClearStencil, glClearStencil, NULL, 207),
+    NAME_FUNC_OFFSET( 2489, glClearDepth, glClearDepth, NULL, 208),
+    NAME_FUNC_OFFSET( 2502, glStencilMask, glStencilMask, NULL, 209),
+    NAME_FUNC_OFFSET( 2516, glColorMask, glColorMask, NULL, 210),
+    NAME_FUNC_OFFSET( 2528, glDepthMask, glDepthMask, NULL, 211),
+    NAME_FUNC_OFFSET( 2540, glIndexMask, glIndexMask, NULL, 212),
+    NAME_FUNC_OFFSET( 2552, glAccum, glAccum, NULL, 213),
+    NAME_FUNC_OFFSET( 2560, glDisable, glDisable, NULL, 214),
+    NAME_FUNC_OFFSET( 2570, glEnable, glEnable, NULL, 215),
+    NAME_FUNC_OFFSET( 2579, glFinish, glFinish, NULL, 216),
+    NAME_FUNC_OFFSET( 2588, glFlush, glFlush, NULL, 217),
+    NAME_FUNC_OFFSET( 2596, glPopAttrib, glPopAttrib, NULL, 218),
+    NAME_FUNC_OFFSET( 2608, glPushAttrib, glPushAttrib, NULL, 219),
+    NAME_FUNC_OFFSET( 2621, glMap1d, glMap1d, NULL, 220),
+    NAME_FUNC_OFFSET( 2629, glMap1f, glMap1f, NULL, 221),
+    NAME_FUNC_OFFSET( 2637, glMap2d, glMap2d, NULL, 222),
+    NAME_FUNC_OFFSET( 2645, glMap2f, glMap2f, NULL, 223),
+    NAME_FUNC_OFFSET( 2653, glMapGrid1d, glMapGrid1d, NULL, 224),
+    NAME_FUNC_OFFSET( 2665, glMapGrid1f, glMapGrid1f, NULL, 225),
+    NAME_FUNC_OFFSET( 2677, glMapGrid2d, glMapGrid2d, NULL, 226),
+    NAME_FUNC_OFFSET( 2689, glMapGrid2f, glMapGrid2f, NULL, 227),
+    NAME_FUNC_OFFSET( 2701, glEvalCoord1d, glEvalCoord1d, NULL, 228),
+    NAME_FUNC_OFFSET( 2715, glEvalCoord1dv, glEvalCoord1dv, NULL, 229),
+    NAME_FUNC_OFFSET( 2730, glEvalCoord1f, glEvalCoord1f, NULL, 230),
+    NAME_FUNC_OFFSET( 2744, glEvalCoord1fv, glEvalCoord1fv, NULL, 231),
+    NAME_FUNC_OFFSET( 2759, glEvalCoord2d, glEvalCoord2d, NULL, 232),
+    NAME_FUNC_OFFSET( 2773, glEvalCoord2dv, glEvalCoord2dv, NULL, 233),
+    NAME_FUNC_OFFSET( 2788, glEvalCoord2f, glEvalCoord2f, NULL, 234),
+    NAME_FUNC_OFFSET( 2802, glEvalCoord2fv, glEvalCoord2fv, NULL, 235),
+    NAME_FUNC_OFFSET( 2817, glEvalMesh1, glEvalMesh1, NULL, 236),
+    NAME_FUNC_OFFSET( 2829, glEvalPoint1, glEvalPoint1, NULL, 237),
+    NAME_FUNC_OFFSET( 2842, glEvalMesh2, glEvalMesh2, NULL, 238),
+    NAME_FUNC_OFFSET( 2854, glEvalPoint2, glEvalPoint2, NULL, 239),
+    NAME_FUNC_OFFSET( 2867, glAlphaFunc, glAlphaFunc, NULL, 240),
+    NAME_FUNC_OFFSET( 2879, glBlendFunc, glBlendFunc, NULL, 241),
+    NAME_FUNC_OFFSET( 2891, glLogicOp, glLogicOp, NULL, 242),
+    NAME_FUNC_OFFSET( 2901, glStencilFunc, glStencilFunc, NULL, 243),
+    NAME_FUNC_OFFSET( 2915, glStencilOp, glStencilOp, NULL, 244),
+    NAME_FUNC_OFFSET( 2927, glDepthFunc, glDepthFunc, NULL, 245),
+    NAME_FUNC_OFFSET( 2939, glPixelZoom, glPixelZoom, NULL, 246),
+    NAME_FUNC_OFFSET( 2951, glPixelTransferf, glPixelTransferf, NULL, 247),
+    NAME_FUNC_OFFSET( 2968, glPixelTransferi, glPixelTransferi, NULL, 248),
+    NAME_FUNC_OFFSET( 2985, glPixelStoref, glPixelStoref, NULL, 249),
+    NAME_FUNC_OFFSET( 2999, glPixelStorei, glPixelStorei, NULL, 250),
+    NAME_FUNC_OFFSET( 3013, glPixelMapfv, glPixelMapfv, NULL, 251),
+    NAME_FUNC_OFFSET( 3026, glPixelMapuiv, glPixelMapuiv, NULL, 252),
+    NAME_FUNC_OFFSET( 3040, glPixelMapusv, glPixelMapusv, NULL, 253),
+    NAME_FUNC_OFFSET( 3054, glReadBuffer, glReadBuffer, NULL, 254),
+    NAME_FUNC_OFFSET( 3067, glCopyPixels, glCopyPixels, NULL, 255),
+    NAME_FUNC_OFFSET( 3080, glReadPixels, glReadPixels, NULL, 256),
+    NAME_FUNC_OFFSET( 3093, glDrawPixels, glDrawPixels, NULL, 257),
+    NAME_FUNC_OFFSET( 3106, glGetBooleanv, glGetBooleanv, NULL, 258),
+    NAME_FUNC_OFFSET( 3120, glGetClipPlane, glGetClipPlane, NULL, 259),
+    NAME_FUNC_OFFSET( 3135, glGetDoublev, glGetDoublev, NULL, 260),
+    NAME_FUNC_OFFSET( 3148, glGetError, glGetError, NULL, 261),
+    NAME_FUNC_OFFSET( 3159, glGetFloatv, glGetFloatv, NULL, 262),
+    NAME_FUNC_OFFSET( 3171, glGetIntegerv, glGetIntegerv, NULL, 263),
+    NAME_FUNC_OFFSET( 3185, glGetLightfv, glGetLightfv, NULL, 264),
+    NAME_FUNC_OFFSET( 3198, glGetLightiv, glGetLightiv, NULL, 265),
+    NAME_FUNC_OFFSET( 3211, glGetMapdv, glGetMapdv, NULL, 266),
+    NAME_FUNC_OFFSET( 3222, glGetMapfv, glGetMapfv, NULL, 267),
+    NAME_FUNC_OFFSET( 3233, glGetMapiv, glGetMapiv, NULL, 268),
+    NAME_FUNC_OFFSET( 3244, glGetMaterialfv, glGetMaterialfv, NULL, 269),
+    NAME_FUNC_OFFSET( 3260, glGetMaterialiv, glGetMaterialiv, NULL, 270),
+    NAME_FUNC_OFFSET( 3276, glGetPixelMapfv, glGetPixelMapfv, NULL, 271),
+    NAME_FUNC_OFFSET( 3292, glGetPixelMapuiv, glGetPixelMapuiv, NULL, 272),
+    NAME_FUNC_OFFSET( 3309, glGetPixelMapusv, glGetPixelMapusv, NULL, 273),
+    NAME_FUNC_OFFSET( 3326, glGetPolygonStipple, glGetPolygonStipple, NULL, 274),
+    NAME_FUNC_OFFSET( 3346, glGetString, glGetString, NULL, 275),
+    NAME_FUNC_OFFSET( 3358, glGetTexEnvfv, glGetTexEnvfv, NULL, 276),
+    NAME_FUNC_OFFSET( 3372, glGetTexEnviv, glGetTexEnviv, NULL, 277),
+    NAME_FUNC_OFFSET( 3386, glGetTexGendv, glGetTexGendv, NULL, 278),
+    NAME_FUNC_OFFSET( 3400, glGetTexGenfv, glGetTexGenfv, NULL, 279),
+    NAME_FUNC_OFFSET( 3414, glGetTexGeniv, glGetTexGeniv, NULL, 280),
+    NAME_FUNC_OFFSET( 3428, glGetTexImage, glGetTexImage, NULL, 281),
+    NAME_FUNC_OFFSET( 3442, glGetTexParameterfv, glGetTexParameterfv, NULL, 282),
+    NAME_FUNC_OFFSET( 3462, glGetTexParameteriv, glGetTexParameteriv, NULL, 283),
+    NAME_FUNC_OFFSET( 3482, glGetTexLevelParameterfv, glGetTexLevelParameterfv, NULL, 284),
+    NAME_FUNC_OFFSET( 3507, glGetTexLevelParameteriv, glGetTexLevelParameteriv, NULL, 285),
+    NAME_FUNC_OFFSET( 3532, glIsEnabled, glIsEnabled, NULL, 286),
+    NAME_FUNC_OFFSET( 3544, glIsList, glIsList, NULL, 287),
+    NAME_FUNC_OFFSET( 3553, glDepthRange, glDepthRange, NULL, 288),
+    NAME_FUNC_OFFSET( 3566, glFrustum, glFrustum, NULL, 289),
+    NAME_FUNC_OFFSET( 3576, glLoadIdentity, glLoadIdentity, NULL, 290),
+    NAME_FUNC_OFFSET( 3591, glLoadMatrixf, glLoadMatrixf, NULL, 291),
+    NAME_FUNC_OFFSET( 3605, glLoadMatrixd, glLoadMatrixd, NULL, 292),
+    NAME_FUNC_OFFSET( 3619, glMatrixMode, glMatrixMode, NULL, 293),
+    NAME_FUNC_OFFSET( 3632, glMultMatrixf, glMultMatrixf, NULL, 294),
+    NAME_FUNC_OFFSET( 3646, glMultMatrixd, glMultMatrixd, NULL, 295),
+    NAME_FUNC_OFFSET( 3660, glOrtho, glOrtho, NULL, 296),
+    NAME_FUNC_OFFSET( 3668, glPopMatrix, glPopMatrix, NULL, 297),
+    NAME_FUNC_OFFSET( 3680, glPushMatrix, glPushMatrix, NULL, 298),
+    NAME_FUNC_OFFSET( 3693, glRotated, glRotated, NULL, 299),
+    NAME_FUNC_OFFSET( 3703, glRotatef, glRotatef, NULL, 300),
+    NAME_FUNC_OFFSET( 3713, glScaled, glScaled, NULL, 301),
+    NAME_FUNC_OFFSET( 3722, glScalef, glScalef, NULL, 302),
+    NAME_FUNC_OFFSET( 3731, glTranslated, glTranslated, NULL, 303),
+    NAME_FUNC_OFFSET( 3744, glTranslatef, glTranslatef, NULL, 304),
+    NAME_FUNC_OFFSET( 3757, glViewport, glViewport, NULL, 305),
+    NAME_FUNC_OFFSET( 3768, glArrayElement, glArrayElement, NULL, 306),
+    NAME_FUNC_OFFSET( 3783, glBindTexture, glBindTexture, NULL, 307),
+    NAME_FUNC_OFFSET( 3797, glColorPointer, glColorPointer, NULL, 308),
+    NAME_FUNC_OFFSET( 3812, glDisableClientState, glDisableClientState, NULL, 309),
+    NAME_FUNC_OFFSET( 3833, glDrawArrays, glDrawArrays, NULL, 310),
+    NAME_FUNC_OFFSET( 3846, glDrawElements, glDrawElements, NULL, 311),
+    NAME_FUNC_OFFSET( 3861, glEdgeFlagPointer, glEdgeFlagPointer, NULL, 312),
+    NAME_FUNC_OFFSET( 3879, glEnableClientState, glEnableClientState, NULL, 313),
+    NAME_FUNC_OFFSET( 3899, glIndexPointer, glIndexPointer, NULL, 314),
+    NAME_FUNC_OFFSET( 3914, glIndexub, glIndexub, NULL, 315),
+    NAME_FUNC_OFFSET( 3924, glIndexubv, glIndexubv, NULL, 316),
+    NAME_FUNC_OFFSET( 3935, glInterleavedArrays, glInterleavedArrays, NULL, 317),
+    NAME_FUNC_OFFSET( 3955, glNormalPointer, glNormalPointer, NULL, 318),
+    NAME_FUNC_OFFSET( 3971, glPolygonOffset, glPolygonOffset, NULL, 319),
+    NAME_FUNC_OFFSET( 3987, glTexCoordPointer, glTexCoordPointer, NULL, 320),
+    NAME_FUNC_OFFSET( 4005, glVertexPointer, glVertexPointer, NULL, 321),
+    NAME_FUNC_OFFSET( 4021, glAreTexturesResident, glAreTexturesResident, NULL, 322),
+    NAME_FUNC_OFFSET( 4043, glCopyTexImage1D, glCopyTexImage1D, NULL, 323),
+    NAME_FUNC_OFFSET( 4060, glCopyTexImage2D, glCopyTexImage2D, NULL, 324),
+    NAME_FUNC_OFFSET( 4077, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL, 325),
+    NAME_FUNC_OFFSET( 4097, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL, 326),
+    NAME_FUNC_OFFSET( 4117, glDeleteTextures, glDeleteTextures, NULL, 327),
+    NAME_FUNC_OFFSET( 4134, glGenTextures, glGenTextures, NULL, 328),
+    NAME_FUNC_OFFSET( 4148, glGetPointerv, glGetPointerv, NULL, 329),
+    NAME_FUNC_OFFSET( 4162, glIsTexture, glIsTexture, NULL, 330),
+    NAME_FUNC_OFFSET( 4174, glPrioritizeTextures, glPrioritizeTextures, NULL, 331),
+    NAME_FUNC_OFFSET( 4195, glTexSubImage1D, glTexSubImage1D, NULL, 332),
+    NAME_FUNC_OFFSET( 4211, glTexSubImage2D, glTexSubImage2D, NULL, 333),
+    NAME_FUNC_OFFSET( 4227, glPopClientAttrib, glPopClientAttrib, NULL, 334),
+    NAME_FUNC_OFFSET( 4245, glPushClientAttrib, glPushClientAttrib, NULL, 335),
+    NAME_FUNC_OFFSET( 4264, glBlendColor, glBlendColor, NULL, 336),
+    NAME_FUNC_OFFSET( 4277, glBlendEquation, glBlendEquation, NULL, 337),
+    NAME_FUNC_OFFSET( 4293, glDrawRangeElements, glDrawRangeElements, NULL, 338),
+    NAME_FUNC_OFFSET( 4313, glColorTable, glColorTable, NULL, 339),
+    NAME_FUNC_OFFSET( 4326, glColorTableParameterfv, glColorTableParameterfv, NULL, 340),
+    NAME_FUNC_OFFSET( 4350, glColorTableParameteriv, glColorTableParameteriv, NULL, 341),
+    NAME_FUNC_OFFSET( 4374, glCopyColorTable, glCopyColorTable, NULL, 342),
+    NAME_FUNC_OFFSET( 4391, glGetColorTable, glGetColorTable, NULL, 343),
+    NAME_FUNC_OFFSET( 4407, glGetColorTableParameterfv, glGetColorTableParameterfv, NULL, 344),
+    NAME_FUNC_OFFSET( 4434, glGetColorTableParameteriv, glGetColorTableParameteriv, NULL, 345),
+    NAME_FUNC_OFFSET( 4461, glColorSubTable, glColorSubTable, NULL, 346),
+    NAME_FUNC_OFFSET( 4477, glCopyColorSubTable, glCopyColorSubTable, NULL, 347),
+    NAME_FUNC_OFFSET( 4497, glConvolutionFilter1D, glConvolutionFilter1D, NULL, 348),
+    NAME_FUNC_OFFSET( 4519, glConvolutionFilter2D, glConvolutionFilter2D, NULL, 349),
+    NAME_FUNC_OFFSET( 4541, glConvolutionParameterf, glConvolutionParameterf, NULL, 350),
+    NAME_FUNC_OFFSET( 4565, glConvolutionParameterfv, glConvolutionParameterfv, NULL, 351),
+    NAME_FUNC_OFFSET( 4590, glConvolutionParameteri, glConvolutionParameteri, NULL, 352),
+    NAME_FUNC_OFFSET( 4614, glConvolutionParameteriv, glConvolutionParameteriv, NULL, 353),
+    NAME_FUNC_OFFSET( 4639, glCopyConvolutionFilter1D, glCopyConvolutionFilter1D, NULL, 354),
+    NAME_FUNC_OFFSET( 4665, glCopyConvolutionFilter2D, glCopyConvolutionFilter2D, NULL, 355),
+    NAME_FUNC_OFFSET( 4691, glGetConvolutionFilter, glGetConvolutionFilter, NULL, 356),
+    NAME_FUNC_OFFSET( 4714, glGetConvolutionParameterfv, glGetConvolutionParameterfv, NULL, 357),
+    NAME_FUNC_OFFSET( 4742, glGetConvolutionParameteriv, glGetConvolutionParameteriv, NULL, 358),
+    NAME_FUNC_OFFSET( 4770, glGetSeparableFilter, glGetSeparableFilter, NULL, 359),
+    NAME_FUNC_OFFSET( 4791, glSeparableFilter2D, glSeparableFilter2D, NULL, 360),
+    NAME_FUNC_OFFSET( 4811, glGetHistogram, glGetHistogram, NULL, 361),
+    NAME_FUNC_OFFSET( 4826, glGetHistogramParameterfv, glGetHistogramParameterfv, NULL, 362),
+    NAME_FUNC_OFFSET( 4852, glGetHistogramParameteriv, glGetHistogramParameteriv, NULL, 363),
+    NAME_FUNC_OFFSET( 4878, glGetMinmax, glGetMinmax, NULL, 364),
+    NAME_FUNC_OFFSET( 4890, glGetMinmaxParameterfv, glGetMinmaxParameterfv, NULL, 365),
+    NAME_FUNC_OFFSET( 4913, glGetMinmaxParameteriv, glGetMinmaxParameteriv, NULL, 366),
+    NAME_FUNC_OFFSET( 4936, glHistogram, glHistogram, NULL, 367),
+    NAME_FUNC_OFFSET( 4948, glMinmax, glMinmax, NULL, 368),
+    NAME_FUNC_OFFSET( 4957, glResetHistogram, glResetHistogram, NULL, 369),
+    NAME_FUNC_OFFSET( 4974, glResetMinmax, glResetMinmax, NULL, 370),
+    NAME_FUNC_OFFSET( 4988, glTexImage3D, glTexImage3D, NULL, 371),
+    NAME_FUNC_OFFSET( 5001, glTexSubImage3D, glTexSubImage3D, NULL, 372),
+    NAME_FUNC_OFFSET( 5017, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, 373),
+    NAME_FUNC_OFFSET( 5037, glActiveTexture, glActiveTexture, NULL, 374),
+    NAME_FUNC_OFFSET( 5053, glClientActiveTexture, glClientActiveTexture, NULL, 375),
+    NAME_FUNC_OFFSET( 5075, glMultiTexCoord1d, glMultiTexCoord1d, NULL, 376),
+    NAME_FUNC_OFFSET( 5093, glMultiTexCoord1dv, glMultiTexCoord1dv, NULL, 377),
+    NAME_FUNC_OFFSET( 5112, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL, 378),
+    NAME_FUNC_OFFSET( 5133, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL, 379),
+    NAME_FUNC_OFFSET( 5155, glMultiTexCoord1i, glMultiTexCoord1i, NULL, 380),
+    NAME_FUNC_OFFSET( 5173, glMultiTexCoord1iv, glMultiTexCoord1iv, NULL, 381),
+    NAME_FUNC_OFFSET( 5192, glMultiTexCoord1s, glMultiTexCoord1s, NULL, 382),
+    NAME_FUNC_OFFSET( 5210, glMultiTexCoord1sv, glMultiTexCoord1sv, NULL, 383),
+    NAME_FUNC_OFFSET( 5229, glMultiTexCoord2d, glMultiTexCoord2d, NULL, 384),
+    NAME_FUNC_OFFSET( 5247, glMultiTexCoord2dv, glMultiTexCoord2dv, NULL, 385),
+    NAME_FUNC_OFFSET( 5266, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL, 386),
+    NAME_FUNC_OFFSET( 5287, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL, 387),
+    NAME_FUNC_OFFSET( 5309, glMultiTexCoord2i, glMultiTexCoord2i, NULL, 388),
+    NAME_FUNC_OFFSET( 5327, glMultiTexCoord2iv, glMultiTexCoord2iv, NULL, 389),
+    NAME_FUNC_OFFSET( 5346, glMultiTexCoord2s, glMultiTexCoord2s, NULL, 390),
+    NAME_FUNC_OFFSET( 5364, glMultiTexCoord2sv, glMultiTexCoord2sv, NULL, 391),
+    NAME_FUNC_OFFSET( 5383, glMultiTexCoord3d, glMultiTexCoord3d, NULL, 392),
+    NAME_FUNC_OFFSET( 5401, glMultiTexCoord3dv, glMultiTexCoord3dv, NULL, 393),
+    NAME_FUNC_OFFSET( 5420, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL, 394),
+    NAME_FUNC_OFFSET( 5441, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL, 395),
+    NAME_FUNC_OFFSET( 5463, glMultiTexCoord3i, glMultiTexCoord3i, NULL, 396),
+    NAME_FUNC_OFFSET( 5481, glMultiTexCoord3iv, glMultiTexCoord3iv, NULL, 397),
+    NAME_FUNC_OFFSET( 5500, glMultiTexCoord3s, glMultiTexCoord3s, NULL, 398),
+    NAME_FUNC_OFFSET( 5518, glMultiTexCoord3sv, glMultiTexCoord3sv, NULL, 399),
+    NAME_FUNC_OFFSET( 5537, glMultiTexCoord4d, glMultiTexCoord4d, NULL, 400),
+    NAME_FUNC_OFFSET( 5555, glMultiTexCoord4dv, glMultiTexCoord4dv, NULL, 401),
+    NAME_FUNC_OFFSET( 5574, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL, 402),
+    NAME_FUNC_OFFSET( 5595, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL, 403),
+    NAME_FUNC_OFFSET( 5617, glMultiTexCoord4i, glMultiTexCoord4i, NULL, 404),
+    NAME_FUNC_OFFSET( 5635, glMultiTexCoord4iv, glMultiTexCoord4iv, NULL, 405),
+    NAME_FUNC_OFFSET( 5654, glMultiTexCoord4s, glMultiTexCoord4s, NULL, 406),
+    NAME_FUNC_OFFSET( 5672, glMultiTexCoord4sv, glMultiTexCoord4sv, NULL, 407),
+    NAME_FUNC_OFFSET( 5691, glCompressedTexImage1D, glCompressedTexImage1D, NULL, 408),
+    NAME_FUNC_OFFSET( 5714, glCompressedTexImage2D, glCompressedTexImage2D, NULL, 409),
+    NAME_FUNC_OFFSET( 5737, glCompressedTexImage3D, glCompressedTexImage3D, NULL, 410),
+    NAME_FUNC_OFFSET( 5760, glCompressedTexSubImage1D, glCompressedTexSubImage1D, NULL, 411),
+    NAME_FUNC_OFFSET( 5786, glCompressedTexSubImage2D, glCompressedTexSubImage2D, NULL, 412),
+    NAME_FUNC_OFFSET( 5812, glCompressedTexSubImage3D, glCompressedTexSubImage3D, NULL, 413),
+    NAME_FUNC_OFFSET( 5838, glGetCompressedTexImage, glGetCompressedTexImage, NULL, 414),
+    NAME_FUNC_OFFSET( 5862, glLoadTransposeMatrixd, glLoadTransposeMatrixd, NULL, 415),
+    NAME_FUNC_OFFSET( 5885, glLoadTransposeMatrixf, glLoadTransposeMatrixf, NULL, 416),
+    NAME_FUNC_OFFSET( 5908, glMultTransposeMatrixd, glMultTransposeMatrixd, NULL, 417),
+    NAME_FUNC_OFFSET( 5931, glMultTransposeMatrixf, glMultTransposeMatrixf, NULL, 418),
+    NAME_FUNC_OFFSET( 5954, glSampleCoverage, glSampleCoverage, NULL, 419),
+    NAME_FUNC_OFFSET( 5971, glBlendFuncSeparate, glBlendFuncSeparate, NULL, 420),
+    NAME_FUNC_OFFSET( 5991, glFogCoordPointer, glFogCoordPointer, NULL, 421),
+    NAME_FUNC_OFFSET( 6009, glFogCoordd, glFogCoordd, NULL, 422),
+    NAME_FUNC_OFFSET( 6021, glFogCoorddv, glFogCoorddv, NULL, 423),
+    NAME_FUNC_OFFSET( 6034, glMultiDrawArrays, glMultiDrawArrays, NULL, 424),
+    NAME_FUNC_OFFSET( 6052, glPointParameterf, glPointParameterf, NULL, 425),
+    NAME_FUNC_OFFSET( 6070, glPointParameterfv, glPointParameterfv, NULL, 426),
+    NAME_FUNC_OFFSET( 6089, glPointParameteri, glPointParameteri, NULL, 427),
+    NAME_FUNC_OFFSET( 6107, glPointParameteriv, glPointParameteriv, NULL, 428),
+    NAME_FUNC_OFFSET( 6126, glSecondaryColor3b, glSecondaryColor3b, NULL, 429),
+    NAME_FUNC_OFFSET( 6145, glSecondaryColor3bv, glSecondaryColor3bv, NULL, 430),
+    NAME_FUNC_OFFSET( 6165, glSecondaryColor3d, glSecondaryColor3d, NULL, 431),
+    NAME_FUNC_OFFSET( 6184, glSecondaryColor3dv, glSecondaryColor3dv, NULL, 432),
+    NAME_FUNC_OFFSET( 6204, glSecondaryColor3i, glSecondaryColor3i, NULL, 433),
+    NAME_FUNC_OFFSET( 6223, glSecondaryColor3iv, glSecondaryColor3iv, NULL, 434),
+    NAME_FUNC_OFFSET( 6243, glSecondaryColor3s, glSecondaryColor3s, NULL, 435),
+    NAME_FUNC_OFFSET( 6262, glSecondaryColor3sv, glSecondaryColor3sv, NULL, 436),
+    NAME_FUNC_OFFSET( 6282, glSecondaryColor3ub, glSecondaryColor3ub, NULL, 437),
+    NAME_FUNC_OFFSET( 6302, glSecondaryColor3ubv, glSecondaryColor3ubv, NULL, 438),
+    NAME_FUNC_OFFSET( 6323, glSecondaryColor3ui, glSecondaryColor3ui, NULL, 439),
+    NAME_FUNC_OFFSET( 6343, glSecondaryColor3uiv, glSecondaryColor3uiv, NULL, 440),
+    NAME_FUNC_OFFSET( 6364, glSecondaryColor3us, glSecondaryColor3us, NULL, 441),
+    NAME_FUNC_OFFSET( 6384, glSecondaryColor3usv, glSecondaryColor3usv, NULL, 442),
+    NAME_FUNC_OFFSET( 6405, glSecondaryColorPointer, glSecondaryColorPointer, NULL, 443),
+    NAME_FUNC_OFFSET( 6429, glWindowPos2d, glWindowPos2d, NULL, 444),
+    NAME_FUNC_OFFSET( 6443, glWindowPos2dv, glWindowPos2dv, NULL, 445),
+    NAME_FUNC_OFFSET( 6458, glWindowPos2f, glWindowPos2f, NULL, 446),
+    NAME_FUNC_OFFSET( 6472, glWindowPos2fv, glWindowPos2fv, NULL, 447),
+    NAME_FUNC_OFFSET( 6487, glWindowPos2i, glWindowPos2i, NULL, 448),
+    NAME_FUNC_OFFSET( 6501, glWindowPos2iv, glWindowPos2iv, NULL, 449),
+    NAME_FUNC_OFFSET( 6516, glWindowPos2s, glWindowPos2s, NULL, 450),
+    NAME_FUNC_OFFSET( 6530, glWindowPos2sv, glWindowPos2sv, NULL, 451),
+    NAME_FUNC_OFFSET( 6545, glWindowPos3d, glWindowPos3d, NULL, 452),
+    NAME_FUNC_OFFSET( 6559, glWindowPos3dv, glWindowPos3dv, NULL, 453),
+    NAME_FUNC_OFFSET( 6574, glWindowPos3f, glWindowPos3f, NULL, 454),
+    NAME_FUNC_OFFSET( 6588, glWindowPos3fv, glWindowPos3fv, NULL, 455),
+    NAME_FUNC_OFFSET( 6603, glWindowPos3i, glWindowPos3i, NULL, 456),
+    NAME_FUNC_OFFSET( 6617, glWindowPos3iv, glWindowPos3iv, NULL, 457),
+    NAME_FUNC_OFFSET( 6632, glWindowPos3s, glWindowPos3s, NULL, 458),
+    NAME_FUNC_OFFSET( 6646, glWindowPos3sv, glWindowPos3sv, NULL, 459),
+    NAME_FUNC_OFFSET( 6661, glBeginQuery, glBeginQuery, NULL, 460),
+    NAME_FUNC_OFFSET( 6674, glBindBuffer, glBindBuffer, NULL, 461),
+    NAME_FUNC_OFFSET( 6687, glBufferData, glBufferData, NULL, 462),
+    NAME_FUNC_OFFSET( 6700, glBufferSubData, glBufferSubData, NULL, 463),
+    NAME_FUNC_OFFSET( 6716, glDeleteBuffers, glDeleteBuffers, NULL, 464),
+    NAME_FUNC_OFFSET( 6732, glDeleteQueries, glDeleteQueries, NULL, 465),
+    NAME_FUNC_OFFSET( 6748, glEndQuery, glEndQuery, NULL, 466),
+    NAME_FUNC_OFFSET( 6759, glGenBuffers, glGenBuffers, NULL, 467),
+    NAME_FUNC_OFFSET( 6772, glGenQueries, glGenQueries, NULL, 468),
+    NAME_FUNC_OFFSET( 6785, glGetBufferParameteriv, glGetBufferParameteriv, NULL, 469),
+    NAME_FUNC_OFFSET( 6808, glGetBufferPointerv, glGetBufferPointerv, NULL, 470),
+    NAME_FUNC_OFFSET( 6828, glGetBufferSubData, glGetBufferSubData, NULL, 471),
+    NAME_FUNC_OFFSET( 6847, glGetQueryObjectiv, glGetQueryObjectiv, NULL, 472),
+    NAME_FUNC_OFFSET( 6866, glGetQueryObjectuiv, glGetQueryObjectuiv, NULL, 473),
+    NAME_FUNC_OFFSET( 6886, glGetQueryiv, glGetQueryiv, NULL, 474),
+    NAME_FUNC_OFFSET( 6899, glIsBuffer, glIsBuffer, NULL, 475),
+    NAME_FUNC_OFFSET( 6910, glIsQuery, glIsQuery, NULL, 476),
+    NAME_FUNC_OFFSET( 6920, glMapBuffer, glMapBuffer, NULL, 477),
+    NAME_FUNC_OFFSET( 6932, glUnmapBuffer, glUnmapBuffer, NULL, 478),
+    NAME_FUNC_OFFSET( 6946, glAttachShader, glAttachShader, NULL, 479),
+    NAME_FUNC_OFFSET( 6961, glBindAttribLocation, glBindAttribLocation, NULL, 480),
+    NAME_FUNC_OFFSET( 6982, glBlendEquationSeparate, glBlendEquationSeparate, NULL, 481),
+    NAME_FUNC_OFFSET( 7006, glCompileShader, glCompileShader, NULL, 482),
+    NAME_FUNC_OFFSET( 7022, glCreateProgram, glCreateProgram, NULL, 483),
+    NAME_FUNC_OFFSET( 7038, glCreateShader, glCreateShader, NULL, 484),
+    NAME_FUNC_OFFSET( 7053, glDeleteProgram, glDeleteProgram, NULL, 485),
+    NAME_FUNC_OFFSET( 7069, glDeleteShader, glDeleteShader, NULL, 486),
+    NAME_FUNC_OFFSET( 7084, glDetachShader, glDetachShader, NULL, 487),
+    NAME_FUNC_OFFSET( 7099, glDisableVertexAttribArray, glDisableVertexAttribArray, NULL, 488),
+    NAME_FUNC_OFFSET( 7126, glDrawBuffers, glDrawBuffers, NULL, 489),
+    NAME_FUNC_OFFSET( 7140, glEnableVertexAttribArray, glEnableVertexAttribArray, NULL, 490),
+    NAME_FUNC_OFFSET( 7166, glGetActiveAttrib, glGetActiveAttrib, NULL, 491),
+    NAME_FUNC_OFFSET( 7184, glGetActiveUniform, glGetActiveUniform, NULL, 492),
+    NAME_FUNC_OFFSET( 7203, glGetAttachedShaders, glGetAttachedShaders, NULL, 493),
+    NAME_FUNC_OFFSET( 7224, glGetAttribLocation, glGetAttribLocation, NULL, 494),
+    NAME_FUNC_OFFSET( 7244, glGetProgramInfoLog, glGetProgramInfoLog, NULL, 495),
+    NAME_FUNC_OFFSET( 7264, glGetProgramiv, glGetProgramiv, NULL, 496),
+    NAME_FUNC_OFFSET( 7279, glGetShaderInfoLog, glGetShaderInfoLog, NULL, 497),
+    NAME_FUNC_OFFSET( 7298, glGetShaderSource, glGetShaderSource, NULL, 498),
+    NAME_FUNC_OFFSET( 7316, glGetShaderiv, glGetShaderiv, NULL, 499),
+    NAME_FUNC_OFFSET( 7330, glGetUniformLocation, glGetUniformLocation, NULL, 500),
+    NAME_FUNC_OFFSET( 7351, glGetUniformfv, glGetUniformfv, NULL, 501),
+    NAME_FUNC_OFFSET( 7366, glGetUniformiv, glGetUniformiv, NULL, 502),
+    NAME_FUNC_OFFSET( 7381, glGetVertexAttribPointerv, glGetVertexAttribPointerv, NULL, 503),
+    NAME_FUNC_OFFSET( 7407, glGetVertexAttribdv, glGetVertexAttribdv, NULL, 504),
+    NAME_FUNC_OFFSET( 7427, glGetVertexAttribfv, glGetVertexAttribfv, NULL, 505),
+    NAME_FUNC_OFFSET( 7447, glGetVertexAttribiv, glGetVertexAttribiv, NULL, 506),
+    NAME_FUNC_OFFSET( 7467, glIsProgram, glIsProgram, NULL, 507),
+    NAME_FUNC_OFFSET( 7479, glIsShader, glIsShader, NULL, 508),
+    NAME_FUNC_OFFSET( 7490, glLinkProgram, glLinkProgram, NULL, 509),
+    NAME_FUNC_OFFSET( 7504, glShaderSource, glShaderSource, NULL, 510),
+    NAME_FUNC_OFFSET( 7519, glStencilFuncSeparate, glStencilFuncSeparate, NULL, 511),
+    NAME_FUNC_OFFSET( 7541, glStencilMaskSeparate, glStencilMaskSeparate, NULL, 512),
+    NAME_FUNC_OFFSET( 7563, glStencilOpSeparate, glStencilOpSeparate, NULL, 513),
+    NAME_FUNC_OFFSET( 7583, glUniform1f, glUniform1f, NULL, 514),
+    NAME_FUNC_OFFSET( 7595, glUniform1fv, glUniform1fv, NULL, 515),
+    NAME_FUNC_OFFSET( 7608, glUniform1i, glUniform1i, NULL, 516),
+    NAME_FUNC_OFFSET( 7620, glUniform1iv, glUniform1iv, NULL, 517),
+    NAME_FUNC_OFFSET( 7633, glUniform2f, glUniform2f, NULL, 518),
+    NAME_FUNC_OFFSET( 7645, glUniform2fv, glUniform2fv, NULL, 519),
+    NAME_FUNC_OFFSET( 7658, glUniform2i, glUniform2i, NULL, 520),
+    NAME_FUNC_OFFSET( 7670, glUniform2iv, glUniform2iv, NULL, 521),
+    NAME_FUNC_OFFSET( 7683, glUniform3f, glUniform3f, NULL, 522),
+    NAME_FUNC_OFFSET( 7695, glUniform3fv, glUniform3fv, NULL, 523),
+    NAME_FUNC_OFFSET( 7708, glUniform3i, glUniform3i, NULL, 524),
+    NAME_FUNC_OFFSET( 7720, glUniform3iv, glUniform3iv, NULL, 525),
+    NAME_FUNC_OFFSET( 7733, glUniform4f, glUniform4f, NULL, 526),
+    NAME_FUNC_OFFSET( 7745, glUniform4fv, glUniform4fv, NULL, 527),
+    NAME_FUNC_OFFSET( 7758, glUniform4i, glUniform4i, NULL, 528),
+    NAME_FUNC_OFFSET( 7770, glUniform4iv, glUniform4iv, NULL, 529),
+    NAME_FUNC_OFFSET( 7783, glUniformMatrix2fv, glUniformMatrix2fv, NULL, 530),
+    NAME_FUNC_OFFSET( 7802, glUniformMatrix3fv, glUniformMatrix3fv, NULL, 531),
+    NAME_FUNC_OFFSET( 7821, glUniformMatrix4fv, glUniformMatrix4fv, NULL, 532),
+    NAME_FUNC_OFFSET( 7840, glUseProgram, glUseProgram, NULL, 533),
+    NAME_FUNC_OFFSET( 7853, glValidateProgram, glValidateProgram, NULL, 534),
+    NAME_FUNC_OFFSET( 7871, glVertexAttrib1d, glVertexAttrib1d, NULL, 535),
+    NAME_FUNC_OFFSET( 7888, glVertexAttrib1dv, glVertexAttrib1dv, NULL, 536),
+    NAME_FUNC_OFFSET( 7906, glVertexAttrib1s, glVertexAttrib1s, NULL, 537),
+    NAME_FUNC_OFFSET( 7923, glVertexAttrib1sv, glVertexAttrib1sv, NULL, 538),
+    NAME_FUNC_OFFSET( 7941, glVertexAttrib2d, glVertexAttrib2d, NULL, 539),
+    NAME_FUNC_OFFSET( 7958, glVertexAttrib2dv, glVertexAttrib2dv, NULL, 540),
+    NAME_FUNC_OFFSET( 7976, glVertexAttrib2s, glVertexAttrib2s, NULL, 541),
+    NAME_FUNC_OFFSET( 7993, glVertexAttrib2sv, glVertexAttrib2sv, NULL, 542),
+    NAME_FUNC_OFFSET( 8011, glVertexAttrib3d, glVertexAttrib3d, NULL, 543),
+    NAME_FUNC_OFFSET( 8028, glVertexAttrib3dv, glVertexAttrib3dv, NULL, 544),
+    NAME_FUNC_OFFSET( 8046, glVertexAttrib3s, glVertexAttrib3s, NULL, 545),
+    NAME_FUNC_OFFSET( 8063, glVertexAttrib3sv, glVertexAttrib3sv, NULL, 546),
+    NAME_FUNC_OFFSET( 8081, glVertexAttrib4Nbv, glVertexAttrib4Nbv, NULL, 547),
+    NAME_FUNC_OFFSET( 8100, glVertexAttrib4Niv, glVertexAttrib4Niv, NULL, 548),
+    NAME_FUNC_OFFSET( 8119, glVertexAttrib4Nsv, glVertexAttrib4Nsv, NULL, 549),
+    NAME_FUNC_OFFSET( 8138, glVertexAttrib4Nub, glVertexAttrib4Nub, NULL, 550),
+    NAME_FUNC_OFFSET( 8157, glVertexAttrib4Nubv, glVertexAttrib4Nubv, NULL, 551),
+    NAME_FUNC_OFFSET( 8177, glVertexAttrib4Nuiv, glVertexAttrib4Nuiv, NULL, 552),
+    NAME_FUNC_OFFSET( 8197, glVertexAttrib4Nusv, glVertexAttrib4Nusv, NULL, 553),
+    NAME_FUNC_OFFSET( 8217, glVertexAttrib4bv, glVertexAttrib4bv, NULL, 554),
+    NAME_FUNC_OFFSET( 8235, glVertexAttrib4d, glVertexAttrib4d, NULL, 555),
+    NAME_FUNC_OFFSET( 8252, glVertexAttrib4dv, glVertexAttrib4dv, NULL, 556),
+    NAME_FUNC_OFFSET( 8270, glVertexAttrib4iv, glVertexAttrib4iv, NULL, 557),
+    NAME_FUNC_OFFSET( 8288, glVertexAttrib4s, glVertexAttrib4s, NULL, 558),
+    NAME_FUNC_OFFSET( 8305, glVertexAttrib4sv, glVertexAttrib4sv, NULL, 559),
+    NAME_FUNC_OFFSET( 8323, glVertexAttrib4ubv, glVertexAttrib4ubv, NULL, 560),
+    NAME_FUNC_OFFSET( 8342, glVertexAttrib4uiv, glVertexAttrib4uiv, NULL, 561),
+    NAME_FUNC_OFFSET( 8361, glVertexAttrib4usv, glVertexAttrib4usv, NULL, 562),
+    NAME_FUNC_OFFSET( 8380, glVertexAttribPointer, glVertexAttribPointer, NULL, 563),
+    NAME_FUNC_OFFSET( 8402, glUniformMatrix2x3fv, glUniformMatrix2x3fv, NULL, 564),
+    NAME_FUNC_OFFSET( 8423, glUniformMatrix2x4fv, glUniformMatrix2x4fv, NULL, 565),
+    NAME_FUNC_OFFSET( 8444, glUniformMatrix3x2fv, glUniformMatrix3x2fv, NULL, 566),
+    NAME_FUNC_OFFSET( 8465, glUniformMatrix3x4fv, glUniformMatrix3x4fv, NULL, 567),
+    NAME_FUNC_OFFSET( 8486, glUniformMatrix4x2fv, glUniformMatrix4x2fv, NULL, 568),
+    NAME_FUNC_OFFSET( 8507, glUniformMatrix4x3fv, glUniformMatrix4x3fv, NULL, 569),
+    NAME_FUNC_OFFSET( 8528, glBeginConditionalRender, glBeginConditionalRender, NULL, 570),
+    NAME_FUNC_OFFSET( 8553, glBeginTransformFeedback, glBeginTransformFeedback, NULL, 571),
+    NAME_FUNC_OFFSET( 8578, glBindBufferBase, glBindBufferBase, NULL, 572),
+    NAME_FUNC_OFFSET( 8595, glBindBufferRange, glBindBufferRange, NULL, 573),
+    NAME_FUNC_OFFSET( 8613, glBindFragDataLocation, glBindFragDataLocation, NULL, 574),
+    NAME_FUNC_OFFSET( 8636, glClampColor, glClampColor, NULL, 575),
+    NAME_FUNC_OFFSET( 8649, glClearBufferfi, glClearBufferfi, NULL, 576),
+    NAME_FUNC_OFFSET( 8665, glClearBufferfv, glClearBufferfv, NULL, 577),
+    NAME_FUNC_OFFSET( 8681, glClearBufferiv, glClearBufferiv, NULL, 578),
+    NAME_FUNC_OFFSET( 8697, glClearBufferuiv, glClearBufferuiv, NULL, 579),
+    NAME_FUNC_OFFSET( 8714, glColorMaski, glColorMaski, NULL, 580),
+    NAME_FUNC_OFFSET( 8727, glDisablei, glDisablei, NULL, 581),
+    NAME_FUNC_OFFSET( 8738, glEnablei, glEnablei, NULL, 582),
+    NAME_FUNC_OFFSET( 8748, glEndConditionalRender, glEndConditionalRender, NULL, 583),
+    NAME_FUNC_OFFSET( 8771, glEndTransformFeedback, glEndTransformFeedback, NULL, 584),
+    NAME_FUNC_OFFSET( 8794, glGetBooleani_v, glGetBooleani_v, NULL, 585),
+    NAME_FUNC_OFFSET( 8810, glGetFragDataLocation, glGetFragDataLocation, NULL, 586),
+    NAME_FUNC_OFFSET( 8832, glGetIntegeri_v, glGetIntegeri_v, NULL, 587),
+    NAME_FUNC_OFFSET( 8848, glGetStringi, glGetStringi, NULL, 588),
+    NAME_FUNC_OFFSET( 8861, glGetTexParameterIiv, glGetTexParameterIiv, NULL, 589),
+    NAME_FUNC_OFFSET( 8882, glGetTexParameterIuiv, glGetTexParameterIuiv, NULL, 590),
+    NAME_FUNC_OFFSET( 8904, glGetTransformFeedbackVarying, glGetTransformFeedbackVarying, NULL, 591),
+    NAME_FUNC_OFFSET( 8934, glGetUniformuiv, glGetUniformuiv, NULL, 592),
+    NAME_FUNC_OFFSET( 8950, glGetVertexAttribIiv, glGetVertexAttribIiv, NULL, 593),
+    NAME_FUNC_OFFSET( 8971, glGetVertexAttribIuiv, glGetVertexAttribIuiv, NULL, 594),
+    NAME_FUNC_OFFSET( 8993, glIsEnabledi, glIsEnabledi, NULL, 595),
+    NAME_FUNC_OFFSET( 9006, glTexParameterIiv, glTexParameterIiv, NULL, 596),
+    NAME_FUNC_OFFSET( 9024, glTexParameterIuiv, glTexParameterIuiv, NULL, 597),
+    NAME_FUNC_OFFSET( 9043, glTransformFeedbackVaryings, glTransformFeedbackVaryings, NULL, 598),
+    NAME_FUNC_OFFSET( 9071, glUniform1ui, glUniform1ui, NULL, 599),
+    NAME_FUNC_OFFSET( 9084, glUniform1uiv, glUniform1uiv, NULL, 600),
+    NAME_FUNC_OFFSET( 9098, glUniform2ui, glUniform2ui, NULL, 601),
+    NAME_FUNC_OFFSET( 9111, glUniform2uiv, glUniform2uiv, NULL, 602),
+    NAME_FUNC_OFFSET( 9125, glUniform3ui, glUniform3ui, NULL, 603),
+    NAME_FUNC_OFFSET( 9138, glUniform3uiv, glUniform3uiv, NULL, 604),
+    NAME_FUNC_OFFSET( 9152, glUniform4ui, glUniform4ui, NULL, 605),
+    NAME_FUNC_OFFSET( 9165, glUniform4uiv, glUniform4uiv, NULL, 606),
+    NAME_FUNC_OFFSET( 9179, glVertexAttribI1iv, glVertexAttribI1iv, NULL, 607),
+    NAME_FUNC_OFFSET( 9198, glVertexAttribI1uiv, glVertexAttribI1uiv, NULL, 608),
+    NAME_FUNC_OFFSET( 9218, glVertexAttribI4bv, glVertexAttribI4bv, NULL, 609),
+    NAME_FUNC_OFFSET( 9237, glVertexAttribI4sv, glVertexAttribI4sv, NULL, 610),
+    NAME_FUNC_OFFSET( 9256, glVertexAttribI4ubv, glVertexAttribI4ubv, NULL, 611),
+    NAME_FUNC_OFFSET( 9276, glVertexAttribI4usv, glVertexAttribI4usv, NULL, 612),
+    NAME_FUNC_OFFSET( 9296, glVertexAttribIPointer, glVertexAttribIPointer, NULL, 613),
+    NAME_FUNC_OFFSET( 9319, glPrimitiveRestartIndex, glPrimitiveRestartIndex, NULL, 614),
+    NAME_FUNC_OFFSET( 9343, glTexBuffer, glTexBuffer, NULL, 615),
+    NAME_FUNC_OFFSET( 9355, glFramebufferTexture, glFramebufferTexture, NULL, 616),
+    NAME_FUNC_OFFSET( 9376, glGetBufferParameteri64v, glGetBufferParameteri64v, NULL, 617),
+    NAME_FUNC_OFFSET( 9401, glGetInteger64i_v, glGetInteger64i_v, NULL, 618),
+    NAME_FUNC_OFFSET( 9419, glVertexAttribDivisor, glVertexAttribDivisor, NULL, 619),
+    NAME_FUNC_OFFSET( 9441, glBindProgramARB, glBindProgramARB, NULL, 620),
+    NAME_FUNC_OFFSET( 9458, glDeleteProgramsARB, glDeleteProgramsARB, NULL, 621),
+    NAME_FUNC_OFFSET( 9478, glGenProgramsARB, glGenProgramsARB, NULL, 622),
+    NAME_FUNC_OFFSET( 9495, glGetProgramEnvParameterdvARB, glGetProgramEnvParameterdvARB, NULL, 623),
+    NAME_FUNC_OFFSET( 9525, glGetProgramEnvParameterfvARB, glGetProgramEnvParameterfvARB, NULL, 624),
+    NAME_FUNC_OFFSET( 9555, glGetProgramLocalParameterdvARB, glGetProgramLocalParameterdvARB, NULL, 625),
+    NAME_FUNC_OFFSET( 9587, glGetProgramLocalParameterfvARB, glGetProgramLocalParameterfvARB, NULL, 626),
+    NAME_FUNC_OFFSET( 9619, glGetProgramStringARB, glGetProgramStringARB, NULL, 627),
+    NAME_FUNC_OFFSET( 9641, glGetProgramivARB, glGetProgramivARB, NULL, 628),
+    NAME_FUNC_OFFSET( 9659, glIsProgramARB, glIsProgramARB, NULL, 629),
+    NAME_FUNC_OFFSET( 9674, glProgramEnvParameter4dARB, glProgramEnvParameter4dARB, NULL, 630),
+    NAME_FUNC_OFFSET( 9701, glProgramEnvParameter4dvARB, glProgramEnvParameter4dvARB, NULL, 631),
+    NAME_FUNC_OFFSET( 9729, glProgramEnvParameter4fARB, glProgramEnvParameter4fARB, NULL, 632),
+    NAME_FUNC_OFFSET( 9756, glProgramEnvParameter4fvARB, glProgramEnvParameter4fvARB, NULL, 633),
+    NAME_FUNC_OFFSET( 9784, glProgramLocalParameter4dARB, glProgramLocalParameter4dARB, NULL, 634),
+    NAME_FUNC_OFFSET( 9813, glProgramLocalParameter4dvARB, glProgramLocalParameter4dvARB, NULL, 635),
+    NAME_FUNC_OFFSET( 9843, glProgramLocalParameter4fARB, glProgramLocalParameter4fARB, NULL, 636),
+    NAME_FUNC_OFFSET( 9872, glProgramLocalParameter4fvARB, glProgramLocalParameter4fvARB, NULL, 637),
+    NAME_FUNC_OFFSET( 9902, glProgramStringARB, glProgramStringARB, NULL, 638),
+    NAME_FUNC_OFFSET( 9921, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, 639),
+    NAME_FUNC_OFFSET( 9941, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL, 640),
+    NAME_FUNC_OFFSET( 9962, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, 641),
+    NAME_FUNC_OFFSET( 9982, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL, 642),
+    NAME_FUNC_OFFSET(10003, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, 643),
+    NAME_FUNC_OFFSET(10023, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL, 644),
+    NAME_FUNC_OFFSET(10044, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, 645),
+    NAME_FUNC_OFFSET(10064, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, 646),
+    NAME_FUNC_OFFSET(10085, glAttachObjectARB, glAttachObjectARB, NULL, 647),
+    NAME_FUNC_OFFSET(10103, glCreateProgramObjectARB, glCreateProgramObjectARB, NULL, 648),
+    NAME_FUNC_OFFSET(10128, glCreateShaderObjectARB, glCreateShaderObjectARB, NULL, 649),
+    NAME_FUNC_OFFSET(10152, glDeleteObjectARB, glDeleteObjectARB, NULL, 650),
+    NAME_FUNC_OFFSET(10170, glDetachObjectARB, glDetachObjectARB, NULL, 651),
+    NAME_FUNC_OFFSET(10188, glGetAttachedObjectsARB, glGetAttachedObjectsARB, NULL, 652),
+    NAME_FUNC_OFFSET(10212, glGetHandleARB, glGetHandleARB, NULL, 653),
+    NAME_FUNC_OFFSET(10227, glGetInfoLogARB, glGetInfoLogARB, NULL, 654),
+    NAME_FUNC_OFFSET(10243, glGetObjectParameterfvARB, glGetObjectParameterfvARB, NULL, 655),
+    NAME_FUNC_OFFSET(10269, glGetObjectParameterivARB, glGetObjectParameterivARB, NULL, 656),
+    NAME_FUNC_OFFSET(10295, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 657),
+    NAME_FUNC_OFFSET(10320, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 658),
+    NAME_FUNC_OFFSET(10347, glBindFramebuffer, glBindFramebuffer, NULL, 659),
+    NAME_FUNC_OFFSET(10365, glBindRenderbuffer, glBindRenderbuffer, NULL, 660),
+    NAME_FUNC_OFFSET(10384, glBlitFramebuffer, glBlitFramebuffer, NULL, 661),
+    NAME_FUNC_OFFSET(10402, glCheckFramebufferStatus, glCheckFramebufferStatus, NULL, 662),
+    NAME_FUNC_OFFSET(10427, glDeleteFramebuffers, glDeleteFramebuffers, NULL, 663),
+    NAME_FUNC_OFFSET(10448, glDeleteRenderbuffers, glDeleteRenderbuffers, NULL, 664),
+    NAME_FUNC_OFFSET(10470, glFramebufferRenderbuffer, glFramebufferRenderbuffer, NULL, 665),
+    NAME_FUNC_OFFSET(10496, glFramebufferTexture1D, glFramebufferTexture1D, NULL, 666),
+    NAME_FUNC_OFFSET(10519, glFramebufferTexture2D, glFramebufferTexture2D, NULL, 667),
+    NAME_FUNC_OFFSET(10542, glFramebufferTexture3D, glFramebufferTexture3D, NULL, 668),
+    NAME_FUNC_OFFSET(10565, glFramebufferTextureLayer, glFramebufferTextureLayer, NULL, 669),
+    NAME_FUNC_OFFSET(10591, glGenFramebuffers, glGenFramebuffers, NULL, 670),
+    NAME_FUNC_OFFSET(10609, glGenRenderbuffers, glGenRenderbuffers, NULL, 671),
+    NAME_FUNC_OFFSET(10628, glGenerateMipmap, glGenerateMipmap, NULL, 672),
+    NAME_FUNC_OFFSET(10645, glGetFramebufferAttachmentParameteriv, glGetFramebufferAttachmentParameteriv, NULL, 673),
+    NAME_FUNC_OFFSET(10683, glGetRenderbufferParameteriv, glGetRenderbufferParameteriv, NULL, 674),
+    NAME_FUNC_OFFSET(10712, glIsFramebuffer, glIsFramebuffer, NULL, 675),
+    NAME_FUNC_OFFSET(10728, glIsRenderbuffer, glIsRenderbuffer, NULL, 676),
+    NAME_FUNC_OFFSET(10745, glRenderbufferStorage, glRenderbufferStorage, NULL, 677),
+    NAME_FUNC_OFFSET(10767, glRenderbufferStorageMultisample, glRenderbufferStorageMultisample, NULL, 678),
+    NAME_FUNC_OFFSET(10800, glFramebufferTextureFaceARB, glFramebufferTextureFaceARB, NULL, 679),
+    NAME_FUNC_OFFSET(10828, glFlushMappedBufferRange, glFlushMappedBufferRange, NULL, 680),
+    NAME_FUNC_OFFSET(10853, glMapBufferRange, glMapBufferRange, NULL, 681),
+    NAME_FUNC_OFFSET(10870, glBindVertexArray, glBindVertexArray, NULL, 682),
+    NAME_FUNC_OFFSET(10888, glDeleteVertexArrays, glDeleteVertexArrays, NULL, 683),
+    NAME_FUNC_OFFSET(10909, glGenVertexArrays, glGenVertexArrays, NULL, 684),
+    NAME_FUNC_OFFSET(10927, glIsVertexArray, glIsVertexArray, NULL, 685),
+    NAME_FUNC_OFFSET(10943, glGetActiveUniformBlockName, glGetActiveUniformBlockName, NULL, 686),
+    NAME_FUNC_OFFSET(10971, glGetActiveUniformBlockiv, glGetActiveUniformBlockiv, NULL, 687),
+    NAME_FUNC_OFFSET(10997, glGetActiveUniformName, glGetActiveUniformName, NULL, 688),
+    NAME_FUNC_OFFSET(11020, glGetActiveUniformsiv, glGetActiveUniformsiv, NULL, 689),
+    NAME_FUNC_OFFSET(11042, glGetUniformBlockIndex, glGetUniformBlockIndex, NULL, 690),
+    NAME_FUNC_OFFSET(11065, glGetUniformIndices, glGetUniformIndices, NULL, 691),
+    NAME_FUNC_OFFSET(11085, glUniformBlockBinding, glUniformBlockBinding, NULL, 692),
+    NAME_FUNC_OFFSET(11107, glCopyBufferSubData, glCopyBufferSubData, NULL, 693),
+    NAME_FUNC_OFFSET(11127, glClientWaitSync, glClientWaitSync, NULL, 694),
+    NAME_FUNC_OFFSET(11144, glDeleteSync, glDeleteSync, NULL, 695),
+    NAME_FUNC_OFFSET(11157, glFenceSync, glFenceSync, NULL, 696),
+    NAME_FUNC_OFFSET(11169, glGetInteger64v, glGetInteger64v, NULL, 697),
+    NAME_FUNC_OFFSET(11185, glGetSynciv, glGetSynciv, NULL, 698),
+    NAME_FUNC_OFFSET(11197, glIsSync, glIsSync, NULL, 699),
+    NAME_FUNC_OFFSET(11206, glWaitSync, glWaitSync, NULL, 700),
+    NAME_FUNC_OFFSET(11217, glDrawElementsBaseVertex, glDrawElementsBaseVertex, NULL, 701),
+    NAME_FUNC_OFFSET(11242, glDrawElementsInstancedBaseVertex, glDrawElementsInstancedBaseVertex, NULL, 702),
+    NAME_FUNC_OFFSET(11276, glDrawRangeElementsBaseVertex, glDrawRangeElementsBaseVertex, NULL, 703),
+    NAME_FUNC_OFFSET(11306, glMultiDrawElementsBaseVertex, glMultiDrawElementsBaseVertex, NULL, 704),
+    NAME_FUNC_OFFSET(11336, glProvokingVertex, glProvokingVertex, NULL, 705),
+    NAME_FUNC_OFFSET(11354, glBlendEquationSeparateiARB, glBlendEquationSeparateiARB, NULL, 706),
+    NAME_FUNC_OFFSET(11382, glBlendEquationiARB, glBlendEquationiARB, NULL, 707),
+    NAME_FUNC_OFFSET(11402, glBlendFuncSeparateiARB, glBlendFuncSeparateiARB, NULL, 708),
+    NAME_FUNC_OFFSET(11426, glBlendFunciARB, glBlendFunciARB, NULL, 709),
+    NAME_FUNC_OFFSET(11442, glBindFragDataLocationIndexed, glBindFragDataLocationIndexed, NULL, 710),
+    NAME_FUNC_OFFSET(11472, glGetFragDataIndex, glGetFragDataIndex, NULL, 711),
+    NAME_FUNC_OFFSET(11491, glBindSampler, glBindSampler, NULL, 712),
+    NAME_FUNC_OFFSET(11505, glDeleteSamplers, glDeleteSamplers, NULL, 713),
+    NAME_FUNC_OFFSET(11522, glGenSamplers, glGenSamplers, NULL, 714),
+    NAME_FUNC_OFFSET(11536, glGetSamplerParameterIiv, glGetSamplerParameterIiv, NULL, 715),
+    NAME_FUNC_OFFSET(11561, glGetSamplerParameterIuiv, glGetSamplerParameterIuiv, NULL, 716),
+    NAME_FUNC_OFFSET(11587, glGetSamplerParameterfv, glGetSamplerParameterfv, NULL, 717),
+    NAME_FUNC_OFFSET(11611, glGetSamplerParameteriv, glGetSamplerParameteriv, NULL, 718),
+    NAME_FUNC_OFFSET(11635, glIsSampler, glIsSampler, NULL, 719),
+    NAME_FUNC_OFFSET(11647, glSamplerParameterIiv, glSamplerParameterIiv, NULL, 720),
+    NAME_FUNC_OFFSET(11669, glSamplerParameterIuiv, glSamplerParameterIuiv, NULL, 721),
+    NAME_FUNC_OFFSET(11692, glSamplerParameterf, glSamplerParameterf, NULL, 722),
+    NAME_FUNC_OFFSET(11712, glSamplerParameterfv, glSamplerParameterfv, NULL, 723),
+    NAME_FUNC_OFFSET(11733, glSamplerParameteri, glSamplerParameteri, NULL, 724),
+    NAME_FUNC_OFFSET(11753, glSamplerParameteriv, glSamplerParameteriv, NULL, 725),
+    NAME_FUNC_OFFSET(11774, gl_dispatch_stub_726, gl_dispatch_stub_726, NULL, 726),
+    NAME_FUNC_OFFSET(11795, gl_dispatch_stub_727, gl_dispatch_stub_727, NULL, 727),
+    NAME_FUNC_OFFSET(11817, gl_dispatch_stub_728, gl_dispatch_stub_728, NULL, 728),
+    NAME_FUNC_OFFSET(11832, glColorP3ui, glColorP3ui, NULL, 729),
+    NAME_FUNC_OFFSET(11844, glColorP3uiv, glColorP3uiv, NULL, 730),
+    NAME_FUNC_OFFSET(11857, glColorP4ui, glColorP4ui, NULL, 731),
+    NAME_FUNC_OFFSET(11869, glColorP4uiv, glColorP4uiv, NULL, 732),
+    NAME_FUNC_OFFSET(11882, glMultiTexCoordP1ui, glMultiTexCoordP1ui, NULL, 733),
+    NAME_FUNC_OFFSET(11902, glMultiTexCoordP1uiv, glMultiTexCoordP1uiv, NULL, 734),
+    NAME_FUNC_OFFSET(11923, glMultiTexCoordP2ui, glMultiTexCoordP2ui, NULL, 735),
+    NAME_FUNC_OFFSET(11943, glMultiTexCoordP2uiv, glMultiTexCoordP2uiv, NULL, 736),
+    NAME_FUNC_OFFSET(11964, glMultiTexCoordP3ui, glMultiTexCoordP3ui, NULL, 737),
+    NAME_FUNC_OFFSET(11984, glMultiTexCoordP3uiv, glMultiTexCoordP3uiv, NULL, 738),
+    NAME_FUNC_OFFSET(12005, glMultiTexCoordP4ui, glMultiTexCoordP4ui, NULL, 739),
+    NAME_FUNC_OFFSET(12025, glMultiTexCoordP4uiv, glMultiTexCoordP4uiv, NULL, 740),
+    NAME_FUNC_OFFSET(12046, glNormalP3ui, glNormalP3ui, NULL, 741),
+    NAME_FUNC_OFFSET(12059, glNormalP3uiv, glNormalP3uiv, NULL, 742),
+    NAME_FUNC_OFFSET(12073, glSecondaryColorP3ui, glSecondaryColorP3ui, NULL, 743),
+    NAME_FUNC_OFFSET(12094, glSecondaryColorP3uiv, glSecondaryColorP3uiv, NULL, 744),
+    NAME_FUNC_OFFSET(12116, glTexCoordP1ui, glTexCoordP1ui, NULL, 745),
+    NAME_FUNC_OFFSET(12131, glTexCoordP1uiv, glTexCoordP1uiv, NULL, 746),
+    NAME_FUNC_OFFSET(12147, glTexCoordP2ui, glTexCoordP2ui, NULL, 747),
+    NAME_FUNC_OFFSET(12162, glTexCoordP2uiv, glTexCoordP2uiv, NULL, 748),
+    NAME_FUNC_OFFSET(12178, glTexCoordP3ui, glTexCoordP3ui, NULL, 749),
+    NAME_FUNC_OFFSET(12193, glTexCoordP3uiv, glTexCoordP3uiv, NULL, 750),
+    NAME_FUNC_OFFSET(12209, glTexCoordP4ui, glTexCoordP4ui, NULL, 751),
+    NAME_FUNC_OFFSET(12224, glTexCoordP4uiv, glTexCoordP4uiv, NULL, 752),
+    NAME_FUNC_OFFSET(12240, glVertexAttribP1ui, glVertexAttribP1ui, NULL, 753),
+    NAME_FUNC_OFFSET(12259, glVertexAttribP1uiv, glVertexAttribP1uiv, NULL, 754),
+    NAME_FUNC_OFFSET(12279, glVertexAttribP2ui, glVertexAttribP2ui, NULL, 755),
+    NAME_FUNC_OFFSET(12298, glVertexAttribP2uiv, glVertexAttribP2uiv, NULL, 756),
+    NAME_FUNC_OFFSET(12318, glVertexAttribP3ui, glVertexAttribP3ui, NULL, 757),
+    NAME_FUNC_OFFSET(12337, glVertexAttribP3uiv, glVertexAttribP3uiv, NULL, 758),
+    NAME_FUNC_OFFSET(12357, glVertexAttribP4ui, glVertexAttribP4ui, NULL, 759),
+    NAME_FUNC_OFFSET(12376, glVertexAttribP4uiv, glVertexAttribP4uiv, NULL, 760),
+    NAME_FUNC_OFFSET(12396, glVertexP2ui, glVertexP2ui, NULL, 761),
+    NAME_FUNC_OFFSET(12409, glVertexP2uiv, glVertexP2uiv, NULL, 762),
+    NAME_FUNC_OFFSET(12423, glVertexP3ui, glVertexP3ui, NULL, 763),
+    NAME_FUNC_OFFSET(12436, glVertexP3uiv, glVertexP3uiv, NULL, 764),
+    NAME_FUNC_OFFSET(12450, glVertexP4ui, glVertexP4ui, NULL, 765),
+    NAME_FUNC_OFFSET(12463, glVertexP4uiv, glVertexP4uiv, NULL, 766),
+    NAME_FUNC_OFFSET(12477, glBindTransformFeedback, glBindTransformFeedback, NULL, 767),
+    NAME_FUNC_OFFSET(12501, glDeleteTransformFeedbacks, glDeleteTransformFeedbacks, NULL, 768),
+    NAME_FUNC_OFFSET(12528, glDrawTransformFeedback, glDrawTransformFeedback, NULL, 769),
+    NAME_FUNC_OFFSET(12552, glGenTransformFeedbacks, glGenTransformFeedbacks, NULL, 770),
+    NAME_FUNC_OFFSET(12576, glIsTransformFeedback, glIsTransformFeedback, NULL, 771),
+    NAME_FUNC_OFFSET(12598, glPauseTransformFeedback, glPauseTransformFeedback, NULL, 772),
+    NAME_FUNC_OFFSET(12623, glResumeTransformFeedback, glResumeTransformFeedback, NULL, 773),
+    NAME_FUNC_OFFSET(12649, glBeginQueryIndexed, glBeginQueryIndexed, NULL, 774),
+    NAME_FUNC_OFFSET(12669, glDrawTransformFeedbackStream, glDrawTransformFeedbackStream, NULL, 775),
+    NAME_FUNC_OFFSET(12699, glEndQueryIndexed, glEndQueryIndexed, NULL, 776),
+    NAME_FUNC_OFFSET(12717, glGetQueryIndexediv, glGetQueryIndexediv, NULL, 777),
+    NAME_FUNC_OFFSET(12737, glClearDepthf, glClearDepthf, NULL, 778),
+    NAME_FUNC_OFFSET(12751, glDepthRangef, glDepthRangef, NULL, 779),
+    NAME_FUNC_OFFSET(12765, glGetShaderPrecisionFormat, glGetShaderPrecisionFormat, NULL, 780),
+    NAME_FUNC_OFFSET(12792, glReleaseShaderCompiler, glReleaseShaderCompiler, NULL, 781),
+    NAME_FUNC_OFFSET(12816, glShaderBinary, glShaderBinary, NULL, 782),
+    NAME_FUNC_OFFSET(12831, glGetProgramBinary, glGetProgramBinary, NULL, 783),
+    NAME_FUNC_OFFSET(12850, glProgramBinary, glProgramBinary, NULL, 784),
+    NAME_FUNC_OFFSET(12866, glProgramParameteri, glProgramParameteri, NULL, 785),
+    NAME_FUNC_OFFSET(12886, glDebugMessageCallbackARB, glDebugMessageCallbackARB, NULL, 786),
+    NAME_FUNC_OFFSET(12912, glDebugMessageControlARB, glDebugMessageControlARB, NULL, 787),
+    NAME_FUNC_OFFSET(12937, glDebugMessageInsertARB, glDebugMessageInsertARB, NULL, 788),
+    NAME_FUNC_OFFSET(12961, glGetDebugMessageLogARB, glGetDebugMessageLogARB, NULL, 789),
+    NAME_FUNC_OFFSET(12985, glGetGraphicsResetStatusARB, glGetGraphicsResetStatusARB, NULL, 790),
+    NAME_FUNC_OFFSET(13013, glGetnColorTableARB, glGetnColorTableARB, NULL, 791),
+    NAME_FUNC_OFFSET(13033, glGetnCompressedTexImageARB, glGetnCompressedTexImageARB, NULL, 792),
+    NAME_FUNC_OFFSET(13061, glGetnConvolutionFilterARB, glGetnConvolutionFilterARB, NULL, 793),
+    NAME_FUNC_OFFSET(13088, glGetnHistogramARB, glGetnHistogramARB, NULL, 794),
+    NAME_FUNC_OFFSET(13107, glGetnMapdvARB, glGetnMapdvARB, NULL, 795),
+    NAME_FUNC_OFFSET(13122, glGetnMapfvARB, glGetnMapfvARB, NULL, 796),
+    NAME_FUNC_OFFSET(13137, glGetnMapivARB, glGetnMapivARB, NULL, 797),
+    NAME_FUNC_OFFSET(13152, glGetnMinmaxARB, glGetnMinmaxARB, NULL, 798),
+    NAME_FUNC_OFFSET(13168, glGetnPixelMapfvARB, glGetnPixelMapfvARB, NULL, 799),
+    NAME_FUNC_OFFSET(13188, glGetnPixelMapuivARB, glGetnPixelMapuivARB, NULL, 800),
+    NAME_FUNC_OFFSET(13209, glGetnPixelMapusvARB, glGetnPixelMapusvARB, NULL, 801),
+    NAME_FUNC_OFFSET(13230, glGetnPolygonStippleARB, glGetnPolygonStippleARB, NULL, 802),
+    NAME_FUNC_OFFSET(13254, glGetnSeparableFilterARB, glGetnSeparableFilterARB, NULL, 803),
+    NAME_FUNC_OFFSET(13279, glGetnTexImageARB, glGetnTexImageARB, NULL, 804),
+    NAME_FUNC_OFFSET(13297, glGetnUniformdvARB, glGetnUniformdvARB, NULL, 805),
+    NAME_FUNC_OFFSET(13316, glGetnUniformfvARB, glGetnUniformfvARB, NULL, 806),
+    NAME_FUNC_OFFSET(13335, glGetnUniformivARB, glGetnUniformivARB, NULL, 807),
+    NAME_FUNC_OFFSET(13354, glGetnUniformuivARB, glGetnUniformuivARB, NULL, 808),
+    NAME_FUNC_OFFSET(13374, glReadnPixelsARB, glReadnPixelsARB, NULL, 809),
+    NAME_FUNC_OFFSET(13391, glDrawArraysInstancedBaseInstance, glDrawArraysInstancedBaseInstance, NULL, 810),
+    NAME_FUNC_OFFSET(13425, glDrawElementsInstancedBaseInstance, glDrawElementsInstancedBaseInstance, NULL, 811),
+    NAME_FUNC_OFFSET(13461, glDrawElementsInstancedBaseVertexBaseInstance, glDrawElementsInstancedBaseVertexBaseInstance, NULL, 812),
+    NAME_FUNC_OFFSET(13507, glDrawTransformFeedbackInstanced, glDrawTransformFeedbackInstanced, NULL, 813),
+    NAME_FUNC_OFFSET(13540, glDrawTransformFeedbackStreamInstanced, glDrawTransformFeedbackStreamInstanced, NULL, 814),
+    NAME_FUNC_OFFSET(13579, gl_dispatch_stub_815, gl_dispatch_stub_815, NULL, 815),
+    NAME_FUNC_OFFSET(13601, glTexStorage1D, glTexStorage1D, NULL, 816),
+    NAME_FUNC_OFFSET(13616, glTexStorage2D, glTexStorage2D, NULL, 817),
+    NAME_FUNC_OFFSET(13631, glTexStorage3D, glTexStorage3D, NULL, 818),
+    NAME_FUNC_OFFSET(13646, glTextureStorage1DEXT, glTextureStorage1DEXT, NULL, 819),
+    NAME_FUNC_OFFSET(13668, glTextureStorage2DEXT, glTextureStorage2DEXT, NULL, 820),
+    NAME_FUNC_OFFSET(13690, glTextureStorage3DEXT, glTextureStorage3DEXT, NULL, 821),
+    NAME_FUNC_OFFSET(13712, glTexBufferRange, glTexBufferRange, NULL, 822),
+    NAME_FUNC_OFFSET(13729, glInvalidateBufferData, glInvalidateBufferData, NULL, 823),
+    NAME_FUNC_OFFSET(13752, glInvalidateBufferSubData, glInvalidateBufferSubData, NULL, 824),
+    NAME_FUNC_OFFSET(13778, glInvalidateFramebuffer, glInvalidateFramebuffer, NULL, 825),
+    NAME_FUNC_OFFSET(13802, glInvalidateSubFramebuffer, glInvalidateSubFramebuffer, NULL, 826),
+    NAME_FUNC_OFFSET(13829, glInvalidateTexImage, glInvalidateTexImage, NULL, 827),
+    NAME_FUNC_OFFSET(13850, glInvalidateTexSubImage, glInvalidateTexSubImage, NULL, 828),
+    NAME_FUNC_OFFSET(13874, glPolygonOffsetEXT, glPolygonOffsetEXT, NULL, 829),
+    NAME_FUNC_OFFSET(13893, gl_dispatch_stub_830, gl_dispatch_stub_830, NULL, 830),
+    NAME_FUNC_OFFSET(13907, gl_dispatch_stub_831, gl_dispatch_stub_831, NULL, 831),
+    NAME_FUNC_OFFSET(13922, gl_dispatch_stub_832, gl_dispatch_stub_832, NULL, 832),
+    NAME_FUNC_OFFSET(13936, gl_dispatch_stub_833, gl_dispatch_stub_833, NULL, 833),
+    NAME_FUNC_OFFSET(13951, gl_dispatch_stub_834, gl_dispatch_stub_834, NULL, 834),
+    NAME_FUNC_OFFSET(13965, gl_dispatch_stub_835, gl_dispatch_stub_835, NULL, 835),
+    NAME_FUNC_OFFSET(13980, gl_dispatch_stub_836, gl_dispatch_stub_836, NULL, 836),
+    NAME_FUNC_OFFSET(13994, gl_dispatch_stub_837, gl_dispatch_stub_837, NULL, 837),
+    NAME_FUNC_OFFSET(14009, gl_dispatch_stub_838, gl_dispatch_stub_838, NULL, 838),
+    NAME_FUNC_OFFSET(14031, gl_dispatch_stub_839, gl_dispatch_stub_839, NULL, 839),
+    NAME_FUNC_OFFSET(14049, gl_dispatch_stub_840, gl_dispatch_stub_840, NULL, 840),
+    NAME_FUNC_OFFSET(14066, gl_dispatch_stub_841, gl_dispatch_stub_841, NULL, 841),
+    NAME_FUNC_OFFSET(14086, glColorPointerEXT, glColorPointerEXT, NULL, 842),
+    NAME_FUNC_OFFSET(14104, glEdgeFlagPointerEXT, glEdgeFlagPointerEXT, NULL, 843),
+    NAME_FUNC_OFFSET(14125, glIndexPointerEXT, glIndexPointerEXT, NULL, 844),
+    NAME_FUNC_OFFSET(14143, glNormalPointerEXT, glNormalPointerEXT, NULL, 845),
+    NAME_FUNC_OFFSET(14162, glTexCoordPointerEXT, glTexCoordPointerEXT, NULL, 846),
+    NAME_FUNC_OFFSET(14183, glVertexPointerEXT, glVertexPointerEXT, NULL, 847),
+    NAME_FUNC_OFFSET(14202, glLockArraysEXT, glLockArraysEXT, NULL, 848),
+    NAME_FUNC_OFFSET(14218, glUnlockArraysEXT, glUnlockArraysEXT, NULL, 849),
+    NAME_FUNC_OFFSET(14236, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, 850),
+    NAME_FUNC_OFFSET(14258, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, 851),
+    NAME_FUNC_OFFSET(14281, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, 852),
+    NAME_FUNC_OFFSET(14304, glFogCoordfEXT, glFogCoordfEXT, NULL, 853),
+    NAME_FUNC_OFFSET(14319, glFogCoordfvEXT, glFogCoordfvEXT, NULL, 854),
+    NAME_FUNC_OFFSET(14335, glResizeBuffersMESA, glResizeBuffersMESA, NULL, 855),
+    NAME_FUNC_OFFSET(14355, glWindowPos4dMESA, glWindowPos4dMESA, NULL, 856),
+    NAME_FUNC_OFFSET(14373, glWindowPos4dvMESA, glWindowPos4dvMESA, NULL, 857),
+    NAME_FUNC_OFFSET(14392, glWindowPos4fMESA, glWindowPos4fMESA, NULL, 858),
+    NAME_FUNC_OFFSET(14410, glWindowPos4fvMESA, glWindowPos4fvMESA, NULL, 859),
+    NAME_FUNC_OFFSET(14429, glWindowPos4iMESA, glWindowPos4iMESA, NULL, 860),
+    NAME_FUNC_OFFSET(14447, glWindowPos4ivMESA, glWindowPos4ivMESA, NULL, 861),
+    NAME_FUNC_OFFSET(14466, glWindowPos4sMESA, glWindowPos4sMESA, NULL, 862),
+    NAME_FUNC_OFFSET(14484, glWindowPos4svMESA, glWindowPos4svMESA, NULL, 863),
+    NAME_FUNC_OFFSET(14503, gl_dispatch_stub_864, gl_dispatch_stub_864, NULL, 864),
+    NAME_FUNC_OFFSET(14528, gl_dispatch_stub_865, gl_dispatch_stub_865, NULL, 865),
+    NAME_FUNC_OFFSET(14555, glAreProgramsResidentNV, glAreProgramsResidentNV, NULL, 866),
+    NAME_FUNC_OFFSET(14579, glExecuteProgramNV, glExecuteProgramNV, NULL, 867),
+    NAME_FUNC_OFFSET(14598, glGetProgramParameterdvNV, glGetProgramParameterdvNV, NULL, 868),
+    NAME_FUNC_OFFSET(14624, glGetProgramParameterfvNV, glGetProgramParameterfvNV, NULL, 869),
+    NAME_FUNC_OFFSET(14650, glGetProgramStringNV, glGetProgramStringNV, NULL, 870),
+    NAME_FUNC_OFFSET(14671, glGetProgramivNV, glGetProgramivNV, NULL, 871),
+    NAME_FUNC_OFFSET(14688, glGetTrackMatrixivNV, glGetTrackMatrixivNV, NULL, 872),
+    NAME_FUNC_OFFSET(14709, glGetVertexAttribdvNV, glGetVertexAttribdvNV, NULL, 873),
+    NAME_FUNC_OFFSET(14731, glGetVertexAttribfvNV, glGetVertexAttribfvNV, NULL, 874),
+    NAME_FUNC_OFFSET(14753, glGetVertexAttribivNV, glGetVertexAttribivNV, NULL, 875),
+    NAME_FUNC_OFFSET(14775, glLoadProgramNV, glLoadProgramNV, NULL, 876),
+    NAME_FUNC_OFFSET(14791, glProgramParameters4dvNV, glProgramParameters4dvNV, NULL, 877),
+    NAME_FUNC_OFFSET(14816, glProgramParameters4fvNV, glProgramParameters4fvNV, NULL, 878),
+    NAME_FUNC_OFFSET(14841, glRequestResidentProgramsNV, glRequestResidentProgramsNV, NULL, 879),
+    NAME_FUNC_OFFSET(14869, glTrackMatrixNV, glTrackMatrixNV, NULL, 880),
+    NAME_FUNC_OFFSET(14885, glVertexAttrib1dNV, glVertexAttrib1dNV, NULL, 881),
+    NAME_FUNC_OFFSET(14904, glVertexAttrib1dvNV, glVertexAttrib1dvNV, NULL, 882),
+    NAME_FUNC_OFFSET(14924, glVertexAttrib1fNV, glVertexAttrib1fNV, NULL, 883),
+    NAME_FUNC_OFFSET(14943, glVertexAttrib1fvNV, glVertexAttrib1fvNV, NULL, 884),
+    NAME_FUNC_OFFSET(14963, glVertexAttrib1sNV, glVertexAttrib1sNV, NULL, 885),
+    NAME_FUNC_OFFSET(14982, glVertexAttrib1svNV, glVertexAttrib1svNV, NULL, 886),
+    NAME_FUNC_OFFSET(15002, glVertexAttrib2dNV, glVertexAttrib2dNV, NULL, 887),
+    NAME_FUNC_OFFSET(15021, glVertexAttrib2dvNV, glVertexAttrib2dvNV, NULL, 888),
+    NAME_FUNC_OFFSET(15041, glVertexAttrib2fNV, glVertexAttrib2fNV, NULL, 889),
+    NAME_FUNC_OFFSET(15060, glVertexAttrib2fvNV, glVertexAttrib2fvNV, NULL, 890),
+    NAME_FUNC_OFFSET(15080, glVertexAttrib2sNV, glVertexAttrib2sNV, NULL, 891),
+    NAME_FUNC_OFFSET(15099, glVertexAttrib2svNV, glVertexAttrib2svNV, NULL, 892),
+    NAME_FUNC_OFFSET(15119, glVertexAttrib3dNV, glVertexAttrib3dNV, NULL, 893),
+    NAME_FUNC_OFFSET(15138, glVertexAttrib3dvNV, glVertexAttrib3dvNV, NULL, 894),
+    NAME_FUNC_OFFSET(15158, glVertexAttrib3fNV, glVertexAttrib3fNV, NULL, 895),
+    NAME_FUNC_OFFSET(15177, glVertexAttrib3fvNV, glVertexAttrib3fvNV, NULL, 896),
+    NAME_FUNC_OFFSET(15197, glVertexAttrib3sNV, glVertexAttrib3sNV, NULL, 897),
+    NAME_FUNC_OFFSET(15216, glVertexAttrib3svNV, glVertexAttrib3svNV, NULL, 898),
+    NAME_FUNC_OFFSET(15236, glVertexAttrib4dNV, glVertexAttrib4dNV, NULL, 899),
+    NAME_FUNC_OFFSET(15255, glVertexAttrib4dvNV, glVertexAttrib4dvNV, NULL, 900),
+    NAME_FUNC_OFFSET(15275, glVertexAttrib4fNV, glVertexAttrib4fNV, NULL, 901),
+    NAME_FUNC_OFFSET(15294, glVertexAttrib4fvNV, glVertexAttrib4fvNV, NULL, 902),
+    NAME_FUNC_OFFSET(15314, glVertexAttrib4sNV, glVertexAttrib4sNV, NULL, 903),
+    NAME_FUNC_OFFSET(15333, glVertexAttrib4svNV, glVertexAttrib4svNV, NULL, 904),
+    NAME_FUNC_OFFSET(15353, glVertexAttrib4ubNV, glVertexAttrib4ubNV, NULL, 905),
+    NAME_FUNC_OFFSET(15373, glVertexAttrib4ubvNV, glVertexAttrib4ubvNV, NULL, 906),
+    NAME_FUNC_OFFSET(15394, glVertexAttribPointerNV, glVertexAttribPointerNV, NULL, 907),
+    NAME_FUNC_OFFSET(15418, glVertexAttribs1dvNV, glVertexAttribs1dvNV, NULL, 908),
+    NAME_FUNC_OFFSET(15439, glVertexAttribs1fvNV, glVertexAttribs1fvNV, NULL, 909),
+    NAME_FUNC_OFFSET(15460, glVertexAttribs1svNV, glVertexAttribs1svNV, NULL, 910),
+    NAME_FUNC_OFFSET(15481, glVertexAttribs2dvNV, glVertexAttribs2dvNV, NULL, 911),
+    NAME_FUNC_OFFSET(15502, glVertexAttribs2fvNV, glVertexAttribs2fvNV, NULL, 912),
+    NAME_FUNC_OFFSET(15523, glVertexAttribs2svNV, glVertexAttribs2svNV, NULL, 913),
+    NAME_FUNC_OFFSET(15544, glVertexAttribs3dvNV, glVertexAttribs3dvNV, NULL, 914),
+    NAME_FUNC_OFFSET(15565, glVertexAttribs3fvNV, glVertexAttribs3fvNV, NULL, 915),
+    NAME_FUNC_OFFSET(15586, glVertexAttribs3svNV, glVertexAttribs3svNV, NULL, 916),
+    NAME_FUNC_OFFSET(15607, glVertexAttribs4dvNV, glVertexAttribs4dvNV, NULL, 917),
+    NAME_FUNC_OFFSET(15628, glVertexAttribs4fvNV, glVertexAttribs4fvNV, NULL, 918),
+    NAME_FUNC_OFFSET(15649, glVertexAttribs4svNV, glVertexAttribs4svNV, NULL, 919),
+    NAME_FUNC_OFFSET(15670, glVertexAttribs4ubvNV, glVertexAttribs4ubvNV, NULL, 920),
+    NAME_FUNC_OFFSET(15692, glGetTexBumpParameterfvATI, glGetTexBumpParameterfvATI, NULL, 921),
+    NAME_FUNC_OFFSET(15719, glGetTexBumpParameterivATI, glGetTexBumpParameterivATI, NULL, 922),
+    NAME_FUNC_OFFSET(15746, glTexBumpParameterfvATI, glTexBumpParameterfvATI, NULL, 923),
+    NAME_FUNC_OFFSET(15770, glTexBumpParameterivATI, glTexBumpParameterivATI, NULL, 924),
+    NAME_FUNC_OFFSET(15794, glAlphaFragmentOp1ATI, glAlphaFragmentOp1ATI, NULL, 925),
+    NAME_FUNC_OFFSET(15816, glAlphaFragmentOp2ATI, glAlphaFragmentOp2ATI, NULL, 926),
+    NAME_FUNC_OFFSET(15838, glAlphaFragmentOp3ATI, glAlphaFragmentOp3ATI, NULL, 927),
+    NAME_FUNC_OFFSET(15860, glBeginFragmentShaderATI, glBeginFragmentShaderATI, NULL, 928),
+    NAME_FUNC_OFFSET(15885, glBindFragmentShaderATI, glBindFragmentShaderATI, NULL, 929),
+    NAME_FUNC_OFFSET(15909, glColorFragmentOp1ATI, glColorFragmentOp1ATI, NULL, 930),
+    NAME_FUNC_OFFSET(15931, glColorFragmentOp2ATI, glColorFragmentOp2ATI, NULL, 931),
+    NAME_FUNC_OFFSET(15953, glColorFragmentOp3ATI, glColorFragmentOp3ATI, NULL, 932),
+    NAME_FUNC_OFFSET(15975, glDeleteFragmentShaderATI, glDeleteFragmentShaderATI, NULL, 933),
+    NAME_FUNC_OFFSET(16001, glEndFragmentShaderATI, glEndFragmentShaderATI, NULL, 934),
+    NAME_FUNC_OFFSET(16024, glGenFragmentShadersATI, glGenFragmentShadersATI, NULL, 935),
+    NAME_FUNC_OFFSET(16048, glPassTexCoordATI, glPassTexCoordATI, NULL, 936),
+    NAME_FUNC_OFFSET(16066, glSampleMapATI, glSampleMapATI, NULL, 937),
+    NAME_FUNC_OFFSET(16081, glSetFragmentShaderConstantATI, glSetFragmentShaderConstantATI, NULL, 938),
+    NAME_FUNC_OFFSET(16112, gl_dispatch_stub_939, gl_dispatch_stub_939, NULL, 939),
+    NAME_FUNC_OFFSET(16135, gl_dispatch_stub_940, gl_dispatch_stub_940, NULL, 940),
+    NAME_FUNC_OFFSET(16158, gl_dispatch_stub_941, gl_dispatch_stub_941, NULL, 941),
+    NAME_FUNC_OFFSET(16181, glGetProgramNamedParameterdvNV, glGetProgramNamedParameterdvNV, NULL, 942),
+    NAME_FUNC_OFFSET(16212, glGetProgramNamedParameterfvNV, glGetProgramNamedParameterfvNV, NULL, 943),
+    NAME_FUNC_OFFSET(16243, glProgramNamedParameter4dNV, glProgramNamedParameter4dNV, NULL, 944),
+    NAME_FUNC_OFFSET(16271, glProgramNamedParameter4dvNV, glProgramNamedParameter4dvNV, NULL, 945),
+    NAME_FUNC_OFFSET(16300, glProgramNamedParameter4fNV, glProgramNamedParameter4fNV, NULL, 946),
+    NAME_FUNC_OFFSET(16328, glProgramNamedParameter4fvNV, glProgramNamedParameter4fvNV, NULL, 947),
+    NAME_FUNC_OFFSET(16357, glPrimitiveRestartNV, glPrimitiveRestartNV, NULL, 948),
+    NAME_FUNC_OFFSET(16378, gl_dispatch_stub_949, gl_dispatch_stub_949, NULL, 949),
+    NAME_FUNC_OFFSET(16395, gl_dispatch_stub_950, gl_dispatch_stub_950, NULL, 950),
+    NAME_FUNC_OFFSET(16408, gl_dispatch_stub_951, gl_dispatch_stub_951, NULL, 951),
+    NAME_FUNC_OFFSET(16422, gl_dispatch_stub_952, gl_dispatch_stub_952, NULL, 952),
+    NAME_FUNC_OFFSET(16439, gl_dispatch_stub_953, gl_dispatch_stub_953, NULL, 953),
+    NAME_FUNC_OFFSET(16463, gl_dispatch_stub_954, gl_dispatch_stub_954, NULL, 954),
+    NAME_FUNC_OFFSET(16493, glVertexAttribI1iEXT, glVertexAttribI1iEXT, NULL, 955),
+    NAME_FUNC_OFFSET(16514, glVertexAttribI1uiEXT, glVertexAttribI1uiEXT, NULL, 956),
+    NAME_FUNC_OFFSET(16536, glVertexAttribI2iEXT, glVertexAttribI2iEXT, NULL, 957),
+    NAME_FUNC_OFFSET(16557, glVertexAttribI2ivEXT, glVertexAttribI2ivEXT, NULL, 958),
+    NAME_FUNC_OFFSET(16579, glVertexAttribI2uiEXT, glVertexAttribI2uiEXT, NULL, 959),
+    NAME_FUNC_OFFSET(16601, glVertexAttribI2uivEXT, glVertexAttribI2uivEXT, NULL, 960),
+    NAME_FUNC_OFFSET(16624, glVertexAttribI3iEXT, glVertexAttribI3iEXT, NULL, 961),
+    NAME_FUNC_OFFSET(16645, glVertexAttribI3ivEXT, glVertexAttribI3ivEXT, NULL, 962),
+    NAME_FUNC_OFFSET(16667, glVertexAttribI3uiEXT, glVertexAttribI3uiEXT, NULL, 963),
+    NAME_FUNC_OFFSET(16689, glVertexAttribI3uivEXT, glVertexAttribI3uivEXT, NULL, 964),
+    NAME_FUNC_OFFSET(16712, glVertexAttribI4iEXT, glVertexAttribI4iEXT, NULL, 965),
+    NAME_FUNC_OFFSET(16733, glVertexAttribI4ivEXT, glVertexAttribI4ivEXT, NULL, 966),
+    NAME_FUNC_OFFSET(16755, glVertexAttribI4uiEXT, glVertexAttribI4uiEXT, NULL, 967),
+    NAME_FUNC_OFFSET(16777, glVertexAttribI4uivEXT, glVertexAttribI4uivEXT, NULL, 968),
+    NAME_FUNC_OFFSET(16800, glClearColorIiEXT, glClearColorIiEXT, NULL, 969),
+    NAME_FUNC_OFFSET(16818, glClearColorIuiEXT, glClearColorIuiEXT, NULL, 970),
+    NAME_FUNC_OFFSET(16837, glBindBufferOffsetEXT, glBindBufferOffsetEXT, NULL, 971),
+    NAME_FUNC_OFFSET(16859, glGetObjectParameterivAPPLE, glGetObjectParameterivAPPLE, NULL, 972),
+    NAME_FUNC_OFFSET(16887, glObjectPurgeableAPPLE, glObjectPurgeableAPPLE, NULL, 973),
+    NAME_FUNC_OFFSET(16910, glObjectUnpurgeableAPPLE, glObjectUnpurgeableAPPLE, NULL, 974),
+    NAME_FUNC_OFFSET(16935, glActiveProgramEXT, glActiveProgramEXT, NULL, 975),
+    NAME_FUNC_OFFSET(16954, glCreateShaderProgramEXT, glCreateShaderProgramEXT, NULL, 976),
+    NAME_FUNC_OFFSET(16979, glUseShaderProgramEXT, glUseShaderProgramEXT, NULL, 977),
+    NAME_FUNC_OFFSET(17001, glTextureBarrierNV, glTextureBarrierNV, NULL, 978),
+    NAME_FUNC_OFFSET(17020, gl_dispatch_stub_979, gl_dispatch_stub_979, NULL, 979),
+    NAME_FUNC_OFFSET(17045, gl_dispatch_stub_980, gl_dispatch_stub_980, NULL, 980),
+    NAME_FUNC_OFFSET(17074, gl_dispatch_stub_981, gl_dispatch_stub_981, NULL, 981),
+    NAME_FUNC_OFFSET(17105, glEGLImageTargetRenderbufferStorageOES, glEGLImageTargetRenderbufferStorageOES, NULL, 982),
+    NAME_FUNC_OFFSET(17144, glEGLImageTargetTexture2DOES, glEGLImageTargetTexture2DOES, NULL, 983),
+    NAME_FUNC_OFFSET(17173, gl_dispatch_stub_984, gl_dispatch_stub_984, NULL, 984),
+    NAME_FUNC_OFFSET(17186, gl_dispatch_stub_985, gl_dispatch_stub_985, NULL, 985),
+    NAME_FUNC_OFFSET(17200, gl_dispatch_stub_986, gl_dispatch_stub_986, NULL, 986),
+    NAME_FUNC_OFFSET(17214, gl_dispatch_stub_987, gl_dispatch_stub_987, NULL, 987),
+    NAME_FUNC_OFFSET(17224, gl_dispatch_stub_988, gl_dispatch_stub_988, NULL, 988),
+    NAME_FUNC_OFFSET(17238, gl_dispatch_stub_989, gl_dispatch_stub_989, NULL, 989),
+    NAME_FUNC_OFFSET(17245, gl_dispatch_stub_990, gl_dispatch_stub_990, NULL, 990),
+    NAME_FUNC_OFFSET(17253, gl_dispatch_stub_991, gl_dispatch_stub_991, NULL, 991),
+    NAME_FUNC_OFFSET(17264, gl_dispatch_stub_992, gl_dispatch_stub_992, NULL, 992),
+    NAME_FUNC_OFFSET(17275, gl_dispatch_stub_993, gl_dispatch_stub_993, NULL, 993),
+    NAME_FUNC_OFFSET(17289, gl_dispatch_stub_994, gl_dispatch_stub_994, NULL, 994),
+    NAME_FUNC_OFFSET(17304, gl_dispatch_stub_995, gl_dispatch_stub_995, NULL, 995),
+    NAME_FUNC_OFFSET(17313, gl_dispatch_stub_996, gl_dispatch_stub_996, NULL, 996),
+    NAME_FUNC_OFFSET(17323, gl_dispatch_stub_997, gl_dispatch_stub_997, NULL, 997),
+    NAME_FUNC_OFFSET(17336, gl_dispatch_stub_998, gl_dispatch_stub_998, NULL, 998),
+    NAME_FUNC_OFFSET(17350, gl_dispatch_stub_999, gl_dispatch_stub_999, NULL, 999),
+    NAME_FUNC_OFFSET(17362, gl_dispatch_stub_1000, gl_dispatch_stub_1000, NULL, 1000),
+    NAME_FUNC_OFFSET(17375, gl_dispatch_stub_1001, gl_dispatch_stub_1001, NULL, 1001),
+    NAME_FUNC_OFFSET(17389, gl_dispatch_stub_1002, gl_dispatch_stub_1002, NULL, 1002),
+    NAME_FUNC_OFFSET(17407, gl_dispatch_stub_1003, gl_dispatch_stub_1003, NULL, 1003),
+    NAME_FUNC_OFFSET(17418, gl_dispatch_stub_1004, gl_dispatch_stub_1004, NULL, 1004),
+    NAME_FUNC_OFFSET(17427, gl_dispatch_stub_1005, gl_dispatch_stub_1005, NULL, 1005),
+    NAME_FUNC_OFFSET(17436, gl_dispatch_stub_1006, gl_dispatch_stub_1006, NULL, 1006),
+    NAME_FUNC_OFFSET(17449, gl_dispatch_stub_1007, gl_dispatch_stub_1007, NULL, 1007),
+    NAME_FUNC_OFFSET(17466, gl_dispatch_stub_1008, gl_dispatch_stub_1008, NULL, 1008),
+    NAME_FUNC_OFFSET(17476, gl_dispatch_stub_1009, gl_dispatch_stub_1009, NULL, 1009),
+    NAME_FUNC_OFFSET(17494, gl_dispatch_stub_1010, gl_dispatch_stub_1010, NULL, 1010),
+    NAME_FUNC_OFFSET(17503, gl_dispatch_stub_1011, gl_dispatch_stub_1011, NULL, 1011),
+    NAME_FUNC_OFFSET(17513, gl_dispatch_stub_1012, gl_dispatch_stub_1012, NULL, 1012),
+    NAME_FUNC_OFFSET(17524, gl_dispatch_stub_1013, gl_dispatch_stub_1013, NULL, 1013),
+    NAME_FUNC_OFFSET(17540, gl_dispatch_stub_1014, gl_dispatch_stub_1014, NULL, 1014),
+    NAME_FUNC_OFFSET(17553, gl_dispatch_stub_1015, gl_dispatch_stub_1015, NULL, 1015),
+    NAME_FUNC_OFFSET(17566, gl_dispatch_stub_1016, gl_dispatch_stub_1016, NULL, 1016),
+    NAME_FUNC_OFFSET(17579, gl_dispatch_stub_1017, gl_dispatch_stub_1017, NULL, 1017),
+    NAME_FUNC_OFFSET(17595, gl_dispatch_stub_1018, gl_dispatch_stub_1018, NULL, 1018),
+    NAME_FUNC_OFFSET(17611, gl_dispatch_stub_1019, gl_dispatch_stub_1019, NULL, 1019),
+    NAME_FUNC_OFFSET(17623, gl_dispatch_stub_1020, gl_dispatch_stub_1020, NULL, 1020),
+    NAME_FUNC_OFFSET(17636, gl_dispatch_stub_1021, gl_dispatch_stub_1021, NULL, 1021),
+    NAME_FUNC_OFFSET(17652, gl_dispatch_stub_1022, gl_dispatch_stub_1022, NULL, 1022),
+    NAME_FUNC_OFFSET(17666, gl_dispatch_stub_1023, gl_dispatch_stub_1023, NULL, 1023),
+    NAME_FUNC_OFFSET(17686, gl_dispatch_stub_1024, gl_dispatch_stub_1024, NULL, 1024),
+    NAME_FUNC_OFFSET(17704, gl_dispatch_stub_1025, gl_dispatch_stub_1025, NULL, 1025),
+    NAME_FUNC_OFFSET(17723, gl_dispatch_stub_1026, gl_dispatch_stub_1026, NULL, 1026),
+    NAME_FUNC_OFFSET(17740, glTexGenf, glTexGenf, NULL, 190),
+    NAME_FUNC_OFFSET(17753, glTexGenfv, glTexGenfv, NULL, 191),
+    NAME_FUNC_OFFSET(17767, glTexGeni, glTexGeni, NULL, 192),
+    NAME_FUNC_OFFSET(17780, glTexGeniv, glTexGeniv, NULL, 193),
+    NAME_FUNC_OFFSET(17794, glReadBuffer, glReadBuffer, NULL, 254),
+    NAME_FUNC_OFFSET(17809, glGetTexGenfv, glGetTexGenfv, NULL, 279),
+    NAME_FUNC_OFFSET(17826, glGetTexGeniv, glGetTexGeniv, NULL, 280),
+    NAME_FUNC_OFFSET(17843, glArrayElement, glArrayElement, NULL, 306),
+    NAME_FUNC_OFFSET(17861, glBindTexture, glBindTexture, NULL, 307),
+    NAME_FUNC_OFFSET(17878, glDrawArrays, glDrawArrays, NULL, 310),
+    NAME_FUNC_OFFSET(17894, glAreTexturesResident, glAreTexturesResidentEXT, glAreTexturesResidentEXT, 322),
+    NAME_FUNC_OFFSET(17919, glCopyTexImage1D, glCopyTexImage1D, NULL, 323),
+    NAME_FUNC_OFFSET(17939, glCopyTexImage2D, glCopyTexImage2D, NULL, 324),
+    NAME_FUNC_OFFSET(17959, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL, 325),
+    NAME_FUNC_OFFSET(17982, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL, 326),
+    NAME_FUNC_OFFSET(18005, glDeleteTextures, glDeleteTexturesEXT, glDeleteTexturesEXT, 327),
+    NAME_FUNC_OFFSET(18025, glGenTextures, glGenTexturesEXT, glGenTexturesEXT, 328),
+    NAME_FUNC_OFFSET(18042, glGetPointerv, glGetPointerv, NULL, 329),
+    NAME_FUNC_OFFSET(18059, glIsTexture, glIsTextureEXT, glIsTextureEXT, 330),
+    NAME_FUNC_OFFSET(18074, glPrioritizeTextures, glPrioritizeTextures, NULL, 331),
+    NAME_FUNC_OFFSET(18098, glTexSubImage1D, glTexSubImage1D, NULL, 332),
+    NAME_FUNC_OFFSET(18117, glTexSubImage2D, glTexSubImage2D, NULL, 333),
+    NAME_FUNC_OFFSET(18136, glBlendColor, glBlendColor, NULL, 336),
+    NAME_FUNC_OFFSET(18152, glBlendEquation, glBlendEquation, NULL, 337),
+    NAME_FUNC_OFFSET(18171, glBlendEquation, glBlendEquation, NULL, 337),
+    NAME_FUNC_OFFSET(18190, glDrawRangeElements, glDrawRangeElements, NULL, 338),
+    NAME_FUNC_OFFSET(18213, glColorTable, glColorTable, NULL, 339),
+    NAME_FUNC_OFFSET(18229, glColorTable, glColorTable, NULL, 339),
+    NAME_FUNC_OFFSET(18245, glColorTableParameterfv, glColorTableParameterfv, NULL, 340),
+    NAME_FUNC_OFFSET(18272, glColorTableParameteriv, glColorTableParameteriv, NULL, 341),
+    NAME_FUNC_OFFSET(18299, glCopyColorTable, glCopyColorTable, NULL, 342),
+    NAME_FUNC_OFFSET(18319, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, 343),
+    NAME_FUNC_OFFSET(18338, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, 343),
+    NAME_FUNC_OFFSET(18357, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, 344),
+    NAME_FUNC_OFFSET(18387, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, 344),
+    NAME_FUNC_OFFSET(18417, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, 345),
+    NAME_FUNC_OFFSET(18447, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, 345),
+    NAME_FUNC_OFFSET(18477, glColorSubTable, glColorSubTable, NULL, 346),
+    NAME_FUNC_OFFSET(18496, glCopyColorSubTable, glCopyColorSubTable, NULL, 347),
+    NAME_FUNC_OFFSET(18519, glConvolutionFilter1D, glConvolutionFilter1D, NULL, 348),
+    NAME_FUNC_OFFSET(18544, glConvolutionFilter2D, glConvolutionFilter2D, NULL, 349),
+    NAME_FUNC_OFFSET(18569, glConvolutionParameterf, glConvolutionParameterf, NULL, 350),
+    NAME_FUNC_OFFSET(18596, glConvolutionParameterfv, glConvolutionParameterfv, NULL, 351),
+    NAME_FUNC_OFFSET(18624, glConvolutionParameteri, glConvolutionParameteri, NULL, 352),
+    NAME_FUNC_OFFSET(18651, glConvolutionParameteriv, glConvolutionParameteriv, NULL, 353),
+    NAME_FUNC_OFFSET(18679, glCopyConvolutionFilter1D, glCopyConvolutionFilter1D, NULL, 354),
+    NAME_FUNC_OFFSET(18708, glCopyConvolutionFilter2D, glCopyConvolutionFilter2D, NULL, 355),
+    NAME_FUNC_OFFSET(18737, glGetConvolutionFilter, gl_dispatch_stub_356, gl_dispatch_stub_356, 356),
+    NAME_FUNC_OFFSET(18763, glGetConvolutionParameterfv, gl_dispatch_stub_357, gl_dispatch_stub_357, 357),
+    NAME_FUNC_OFFSET(18794, glGetConvolutionParameteriv, gl_dispatch_stub_358, gl_dispatch_stub_358, 358),
+    NAME_FUNC_OFFSET(18825, glGetSeparableFilter, gl_dispatch_stub_359, gl_dispatch_stub_359, 359),
+    NAME_FUNC_OFFSET(18849, glSeparableFilter2D, glSeparableFilter2D, NULL, 360),
+    NAME_FUNC_OFFSET(18872, glGetHistogram, gl_dispatch_stub_361, gl_dispatch_stub_361, 361),
+    NAME_FUNC_OFFSET(18890, glGetHistogramParameterfv, gl_dispatch_stub_362, gl_dispatch_stub_362, 362),
+    NAME_FUNC_OFFSET(18919, glGetHistogramParameteriv, gl_dispatch_stub_363, gl_dispatch_stub_363, 363),
+    NAME_FUNC_OFFSET(18948, glGetMinmax, gl_dispatch_stub_364, gl_dispatch_stub_364, 364),
+    NAME_FUNC_OFFSET(18963, glGetMinmaxParameterfv, gl_dispatch_stub_365, gl_dispatch_stub_365, 365),
+    NAME_FUNC_OFFSET(18989, glGetMinmaxParameteriv, gl_dispatch_stub_366, gl_dispatch_stub_366, 366),
+    NAME_FUNC_OFFSET(19015, glHistogram, glHistogram, NULL, 367),
+    NAME_FUNC_OFFSET(19030, glMinmax, glMinmax, NULL, 368),
+    NAME_FUNC_OFFSET(19042, glResetHistogram, glResetHistogram, NULL, 369),
+    NAME_FUNC_OFFSET(19062, glResetMinmax, glResetMinmax, NULL, 370),
+    NAME_FUNC_OFFSET(19079, glTexImage3D, glTexImage3D, NULL, 371),
+    NAME_FUNC_OFFSET(19095, glTexImage3D, glTexImage3D, NULL, 371),
+    NAME_FUNC_OFFSET(19111, glTexSubImage3D, glTexSubImage3D, NULL, 372),
+    NAME_FUNC_OFFSET(19130, glTexSubImage3D, glTexSubImage3D, NULL, 372),
+    NAME_FUNC_OFFSET(19149, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, 373),
+    NAME_FUNC_OFFSET(19172, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, 373),
+    NAME_FUNC_OFFSET(19195, glActiveTexture, glActiveTexture, NULL, 374),
+    NAME_FUNC_OFFSET(19214, glClientActiveTexture, glClientActiveTexture, NULL, 375),
+    NAME_FUNC_OFFSET(19239, glMultiTexCoord1d, glMultiTexCoord1d, NULL, 376),
+    NAME_FUNC_OFFSET(19260, glMultiTexCoord1dv, glMultiTexCoord1dv, NULL, 377),
+    NAME_FUNC_OFFSET(19282, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL, 378),
+    NAME_FUNC_OFFSET(19300, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL, 379),
+    NAME_FUNC_OFFSET(19319, glMultiTexCoord1i, glMultiTexCoord1i, NULL, 380),
+    NAME_FUNC_OFFSET(19340, glMultiTexCoord1iv, glMultiTexCoord1iv, NULL, 381),
+    NAME_FUNC_OFFSET(19362, glMultiTexCoord1s, glMultiTexCoord1s, NULL, 382),
+    NAME_FUNC_OFFSET(19383, glMultiTexCoord1sv, glMultiTexCoord1sv, NULL, 383),
+    NAME_FUNC_OFFSET(19405, glMultiTexCoord2d, glMultiTexCoord2d, NULL, 384),
+    NAME_FUNC_OFFSET(19426, glMultiTexCoord2dv, glMultiTexCoord2dv, NULL, 385),
+    NAME_FUNC_OFFSET(19448, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL, 386),
+    NAME_FUNC_OFFSET(19466, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL, 387),
+    NAME_FUNC_OFFSET(19485, glMultiTexCoord2i, glMultiTexCoord2i, NULL, 388),
+    NAME_FUNC_OFFSET(19506, glMultiTexCoord2iv, glMultiTexCoord2iv, NULL, 389),
+    NAME_FUNC_OFFSET(19528, glMultiTexCoord2s, glMultiTexCoord2s, NULL, 390),
+    NAME_FUNC_OFFSET(19549, glMultiTexCoord2sv, glMultiTexCoord2sv, NULL, 391),
+    NAME_FUNC_OFFSET(19571, glMultiTexCoord3d, glMultiTexCoord3d, NULL, 392),
+    NAME_FUNC_OFFSET(19592, glMultiTexCoord3dv, glMultiTexCoord3dv, NULL, 393),
+    NAME_FUNC_OFFSET(19614, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL, 394),
+    NAME_FUNC_OFFSET(19632, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL, 395),
+    NAME_FUNC_OFFSET(19651, glMultiTexCoord3i, glMultiTexCoord3i, NULL, 396),
+    NAME_FUNC_OFFSET(19672, glMultiTexCoord3iv, glMultiTexCoord3iv, NULL, 397),
+    NAME_FUNC_OFFSET(19694, glMultiTexCoord3s, glMultiTexCoord3s, NULL, 398),
+    NAME_FUNC_OFFSET(19715, glMultiTexCoord3sv, glMultiTexCoord3sv, NULL, 399),
+    NAME_FUNC_OFFSET(19737, glMultiTexCoord4d, glMultiTexCoord4d, NULL, 400),
+    NAME_FUNC_OFFSET(19758, glMultiTexCoord4dv, glMultiTexCoord4dv, NULL, 401),
+    NAME_FUNC_OFFSET(19780, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL, 402),
+    NAME_FUNC_OFFSET(19798, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL, 403),
+    NAME_FUNC_OFFSET(19817, glMultiTexCoord4i, glMultiTexCoord4i, NULL, 404),
+    NAME_FUNC_OFFSET(19838, glMultiTexCoord4iv, glMultiTexCoord4iv, NULL, 405),
+    NAME_FUNC_OFFSET(19860, glMultiTexCoord4s, glMultiTexCoord4s, NULL, 406),
+    NAME_FUNC_OFFSET(19881, glMultiTexCoord4sv, glMultiTexCoord4sv, NULL, 407),
+    NAME_FUNC_OFFSET(19903, glCompressedTexImage1D, glCompressedTexImage1D, NULL, 408),
+    NAME_FUNC_OFFSET(19929, glCompressedTexImage2D, glCompressedTexImage2D, NULL, 409),
+    NAME_FUNC_OFFSET(19955, glCompressedTexImage3D, glCompressedTexImage3D, NULL, 410),
+    NAME_FUNC_OFFSET(19981, glCompressedTexImage3D, glCompressedTexImage3D, NULL, 410),
+    NAME_FUNC_OFFSET(20007, glCompressedTexSubImage1D, glCompressedTexSubImage1D, NULL, 411),
+    NAME_FUNC_OFFSET(20036, glCompressedTexSubImage2D, glCompressedTexSubImage2D, NULL, 412),
+    NAME_FUNC_OFFSET(20065, glCompressedTexSubImage3D, glCompressedTexSubImage3D, NULL, 413),
+    NAME_FUNC_OFFSET(20094, glCompressedTexSubImage3D, glCompressedTexSubImage3D, NULL, 413),
+    NAME_FUNC_OFFSET(20123, glGetCompressedTexImage, glGetCompressedTexImage, NULL, 414),
+    NAME_FUNC_OFFSET(20150, glLoadTransposeMatrixd, glLoadTransposeMatrixd, NULL, 415),
+    NAME_FUNC_OFFSET(20176, glLoadTransposeMatrixf, glLoadTransposeMatrixf, NULL, 416),
+    NAME_FUNC_OFFSET(20202, glMultTransposeMatrixd, glMultTransposeMatrixd, NULL, 417),
+    NAME_FUNC_OFFSET(20228, glMultTransposeMatrixf, glMultTransposeMatrixf, NULL, 418),
+    NAME_FUNC_OFFSET(20254, glSampleCoverage, glSampleCoverage, NULL, 419),
+    NAME_FUNC_OFFSET(20274, glBlendFuncSeparate, glBlendFuncSeparate, NULL, 420),
+    NAME_FUNC_OFFSET(20297, glBlendFuncSeparate, glBlendFuncSeparate, NULL, 420),
+    NAME_FUNC_OFFSET(20321, glBlendFuncSeparate, glBlendFuncSeparate, NULL, 420),
+    NAME_FUNC_OFFSET(20344, glFogCoordPointer, glFogCoordPointer, NULL, 421),
+    NAME_FUNC_OFFSET(20365, glFogCoordd, glFogCoordd, NULL, 422),
+    NAME_FUNC_OFFSET(20380, glFogCoorddv, glFogCoorddv, NULL, 423),
+    NAME_FUNC_OFFSET(20396, glMultiDrawArrays, glMultiDrawArrays, NULL, 424),
+    NAME_FUNC_OFFSET(20417, glPointParameterf, glPointParameterf, NULL, 425),
+    NAME_FUNC_OFFSET(20438, glPointParameterf, glPointParameterf, NULL, 425),
+    NAME_FUNC_OFFSET(20459, glPointParameterf, glPointParameterf, NULL, 425),
+    NAME_FUNC_OFFSET(20481, glPointParameterfv, glPointParameterfv, NULL, 426),
+    NAME_FUNC_OFFSET(20503, glPointParameterfv, glPointParameterfv, NULL, 426),
+    NAME_FUNC_OFFSET(20525, glPointParameterfv, glPointParameterfv, NULL, 426),
+    NAME_FUNC_OFFSET(20548, glPointParameteri, glPointParameteri, NULL, 427),
+    NAME_FUNC_OFFSET(20568, glPointParameteriv, glPointParameteriv, NULL, 428),
+    NAME_FUNC_OFFSET(20589, glSecondaryColor3b, glSecondaryColor3b, NULL, 429),
+    NAME_FUNC_OFFSET(20611, glSecondaryColor3bv, glSecondaryColor3bv, NULL, 430),
+    NAME_FUNC_OFFSET(20634, glSecondaryColor3d, glSecondaryColor3d, NULL, 431),
+    NAME_FUNC_OFFSET(20656, glSecondaryColor3dv, glSecondaryColor3dv, NULL, 432),
+    NAME_FUNC_OFFSET(20679, glSecondaryColor3i, glSecondaryColor3i, NULL, 433),
+    NAME_FUNC_OFFSET(20701, glSecondaryColor3iv, glSecondaryColor3iv, NULL, 434),
+    NAME_FUNC_OFFSET(20724, glSecondaryColor3s, glSecondaryColor3s, NULL, 435),
+    NAME_FUNC_OFFSET(20746, glSecondaryColor3sv, glSecondaryColor3sv, NULL, 436),
+    NAME_FUNC_OFFSET(20769, glSecondaryColor3ub, glSecondaryColor3ub, NULL, 437),
+    NAME_FUNC_OFFSET(20792, glSecondaryColor3ubv, glSecondaryColor3ubv, NULL, 438),
+    NAME_FUNC_OFFSET(20816, glSecondaryColor3ui, glSecondaryColor3ui, NULL, 439),
+    NAME_FUNC_OFFSET(20839, glSecondaryColor3uiv, glSecondaryColor3uiv, NULL, 440),
+    NAME_FUNC_OFFSET(20863, glSecondaryColor3us, glSecondaryColor3us, NULL, 441),
+    NAME_FUNC_OFFSET(20886, glSecondaryColor3usv, glSecondaryColor3usv, NULL, 442),
+    NAME_FUNC_OFFSET(20910, glSecondaryColorPointer, glSecondaryColorPointer, NULL, 443),
+    NAME_FUNC_OFFSET(20937, glWindowPos2d, glWindowPos2d, NULL, 444),
+    NAME_FUNC_OFFSET(20954, glWindowPos2d, glWindowPos2d, NULL, 444),
+    NAME_FUNC_OFFSET(20972, glWindowPos2dv, glWindowPos2dv, NULL, 445),
+    NAME_FUNC_OFFSET(20990, glWindowPos2dv, glWindowPos2dv, NULL, 445),
+    NAME_FUNC_OFFSET(21009, glWindowPos2f, glWindowPos2f, NULL, 446),
+    NAME_FUNC_OFFSET(21026, glWindowPos2f, glWindowPos2f, NULL, 446),
+    NAME_FUNC_OFFSET(21044, glWindowPos2fv, glWindowPos2fv, NULL, 447),
+    NAME_FUNC_OFFSET(21062, glWindowPos2fv, glWindowPos2fv, NULL, 447),
+    NAME_FUNC_OFFSET(21081, glWindowPos2i, glWindowPos2i, NULL, 448),
+    NAME_FUNC_OFFSET(21098, glWindowPos2i, glWindowPos2i, NULL, 448),
+    NAME_FUNC_OFFSET(21116, glWindowPos2iv, glWindowPos2iv, NULL, 449),
+    NAME_FUNC_OFFSET(21134, glWindowPos2iv, glWindowPos2iv, NULL, 449),
+    NAME_FUNC_OFFSET(21153, glWindowPos2s, glWindowPos2s, NULL, 450),
+    NAME_FUNC_OFFSET(21170, glWindowPos2s, glWindowPos2s, NULL, 450),
+    NAME_FUNC_OFFSET(21188, glWindowPos2sv, glWindowPos2sv, NULL, 451),
+    NAME_FUNC_OFFSET(21206, glWindowPos2sv, glWindowPos2sv, NULL, 451),
+    NAME_FUNC_OFFSET(21225, glWindowPos3d, glWindowPos3d, NULL, 452),
+    NAME_FUNC_OFFSET(21242, glWindowPos3d, glWindowPos3d, NULL, 452),
+    NAME_FUNC_OFFSET(21260, glWindowPos3dv, glWindowPos3dv, NULL, 453),
+    NAME_FUNC_OFFSET(21278, glWindowPos3dv, glWindowPos3dv, NULL, 453),
+    NAME_FUNC_OFFSET(21297, glWindowPos3f, glWindowPos3f, NULL, 454),
+    NAME_FUNC_OFFSET(21314, glWindowPos3f, glWindowPos3f, NULL, 454),
+    NAME_FUNC_OFFSET(21332, glWindowPos3fv, glWindowPos3fv, NULL, 455),
+    NAME_FUNC_OFFSET(21350, glWindowPos3fv, glWindowPos3fv, NULL, 455),
+    NAME_FUNC_OFFSET(21369, glWindowPos3i, glWindowPos3i, NULL, 456),
+    NAME_FUNC_OFFSET(21386, glWindowPos3i, glWindowPos3i, NULL, 456),
+    NAME_FUNC_OFFSET(21404, glWindowPos3iv, glWindowPos3iv, NULL, 457),
+    NAME_FUNC_OFFSET(21422, glWindowPos3iv, glWindowPos3iv, NULL, 457),
+    NAME_FUNC_OFFSET(21441, glWindowPos3s, glWindowPos3s, NULL, 458),
+    NAME_FUNC_OFFSET(21458, glWindowPos3s, glWindowPos3s, NULL, 458),
+    NAME_FUNC_OFFSET(21476, glWindowPos3sv, glWindowPos3sv, NULL, 459),
+    NAME_FUNC_OFFSET(21494, glWindowPos3sv, glWindowPos3sv, NULL, 459),
+    NAME_FUNC_OFFSET(21513, glBeginQuery, glBeginQuery, NULL, 460),
+    NAME_FUNC_OFFSET(21529, glBindBuffer, glBindBuffer, NULL, 461),
+    NAME_FUNC_OFFSET(21545, glBufferData, glBufferData, NULL, 462),
+    NAME_FUNC_OFFSET(21561, glBufferSubData, glBufferSubData, NULL, 463),
+    NAME_FUNC_OFFSET(21580, glDeleteBuffers, glDeleteBuffers, NULL, 464),
+    NAME_FUNC_OFFSET(21599, glDeleteQueries, glDeleteQueries, NULL, 465),
+    NAME_FUNC_OFFSET(21618, glEndQuery, glEndQuery, NULL, 466),
+    NAME_FUNC_OFFSET(21632, glGenBuffers, glGenBuffers, NULL, 467),
+    NAME_FUNC_OFFSET(21648, glGenQueries, glGenQueries, NULL, 468),
+    NAME_FUNC_OFFSET(21664, glGetBufferParameteriv, glGetBufferParameteriv, NULL, 469),
+    NAME_FUNC_OFFSET(21690, glGetBufferPointerv, glGetBufferPointerv, NULL, 470),
+    NAME_FUNC_OFFSET(21713, glGetBufferPointerv, glGetBufferPointerv, NULL, 470),
+    NAME_FUNC_OFFSET(21736, glGetBufferSubData, glGetBufferSubData, NULL, 471),
+    NAME_FUNC_OFFSET(21758, glGetQueryObjectiv, glGetQueryObjectiv, NULL, 472),
+    NAME_FUNC_OFFSET(21780, glGetQueryObjectuiv, glGetQueryObjectuiv, NULL, 473),
+    NAME_FUNC_OFFSET(21803, glGetQueryiv, glGetQueryiv, NULL, 474),
+    NAME_FUNC_OFFSET(21819, glIsBuffer, glIsBuffer, NULL, 475),
+    NAME_FUNC_OFFSET(21833, glIsQuery, glIsQuery, NULL, 476),
+    NAME_FUNC_OFFSET(21846, glMapBuffer, glMapBuffer, NULL, 477),
+    NAME_FUNC_OFFSET(21861, glMapBuffer, glMapBuffer, NULL, 477),
+    NAME_FUNC_OFFSET(21876, glUnmapBuffer, glUnmapBuffer, NULL, 478),
+    NAME_FUNC_OFFSET(21893, glUnmapBuffer, glUnmapBuffer, NULL, 478),
+    NAME_FUNC_OFFSET(21910, glBindAttribLocation, glBindAttribLocation, NULL, 480),
+    NAME_FUNC_OFFSET(21934, glBlendEquationSeparate, glBlendEquationSeparate, NULL, 481),
+    NAME_FUNC_OFFSET(21961, glBlendEquationSeparate, glBlendEquationSeparate, NULL, 481),
+    NAME_FUNC_OFFSET(21988, glBlendEquationSeparate, glBlendEquationSeparate, NULL, 481),
+    NAME_FUNC_OFFSET(22015, glCompileShader, glCompileShader, NULL, 482),
+    NAME_FUNC_OFFSET(22034, glDisableVertexAttribArray, glDisableVertexAttribArray, NULL, 488),
+    NAME_FUNC_OFFSET(22064, glDrawBuffers, glDrawBuffers, NULL, 489),
+    NAME_FUNC_OFFSET(22081, glDrawBuffers, glDrawBuffers, NULL, 489),
+    NAME_FUNC_OFFSET(22098, glDrawBuffers, glDrawBuffers, NULL, 489),
+    NAME_FUNC_OFFSET(22114, glEnableVertexAttribArray, glEnableVertexAttribArray, NULL, 490),
+    NAME_FUNC_OFFSET(22143, glGetActiveAttrib, glGetActiveAttrib, NULL, 491),
+    NAME_FUNC_OFFSET(22164, glGetActiveUniform, glGetActiveUniform, NULL, 492),
+    NAME_FUNC_OFFSET(22186, glGetAttribLocation, glGetAttribLocation, NULL, 494),
+    NAME_FUNC_OFFSET(22209, glGetShaderSource, glGetShaderSource, NULL, 498),
+    NAME_FUNC_OFFSET(22230, glGetUniformLocation, glGetUniformLocation, NULL, 500),
+    NAME_FUNC_OFFSET(22254, glGetUniformfv, glGetUniformfv, NULL, 501),
+    NAME_FUNC_OFFSET(22272, glGetUniformiv, glGetUniformiv, NULL, 502),
+    NAME_FUNC_OFFSET(22290, glGetVertexAttribPointerv, glGetVertexAttribPointerv, NULL, 503),
+    NAME_FUNC_OFFSET(22319, glGetVertexAttribPointerv, glGetVertexAttribPointerv, NULL, 503),
+    NAME_FUNC_OFFSET(22347, glGetVertexAttribdv, glGetVertexAttribdv, NULL, 504),
+    NAME_FUNC_OFFSET(22370, glGetVertexAttribfv, glGetVertexAttribfv, NULL, 505),
+    NAME_FUNC_OFFSET(22393, glGetVertexAttribiv, glGetVertexAttribiv, NULL, 506),
+    NAME_FUNC_OFFSET(22416, glLinkProgram, glLinkProgram, NULL, 509),
+    NAME_FUNC_OFFSET(22433, glShaderSource, glShaderSource, NULL, 510),
+    NAME_FUNC_OFFSET(22451, glStencilOpSeparate, glStencilOpSeparate, NULL, 513),
+    NAME_FUNC_OFFSET(22474, glUniform1f, glUniform1f, NULL, 514),
+    NAME_FUNC_OFFSET(22489, glUniform1fv, glUniform1fv, NULL, 515),
+    NAME_FUNC_OFFSET(22505, glUniform1i, glUniform1i, NULL, 516),
+    NAME_FUNC_OFFSET(22520, glUniform1iv, glUniform1iv, NULL, 517),
+    NAME_FUNC_OFFSET(22536, glUniform2f, glUniform2f, NULL, 518),
+    NAME_FUNC_OFFSET(22551, glUniform2fv, glUniform2fv, NULL, 519),
+    NAME_FUNC_OFFSET(22567, glUniform2i, glUniform2i, NULL, 520),
+    NAME_FUNC_OFFSET(22582, glUniform2iv, glUniform2iv, NULL, 521),
+    NAME_FUNC_OFFSET(22598, glUniform3f, glUniform3f, NULL, 522),
+    NAME_FUNC_OFFSET(22613, glUniform3fv, glUniform3fv, NULL, 523),
+    NAME_FUNC_OFFSET(22629, glUniform3i, glUniform3i, NULL, 524),
+    NAME_FUNC_OFFSET(22644, glUniform3iv, glUniform3iv, NULL, 525),
+    NAME_FUNC_OFFSET(22660, glUniform4f, glUniform4f, NULL, 526),
+    NAME_FUNC_OFFSET(22675, glUniform4fv, glUniform4fv, NULL, 527),
+    NAME_FUNC_OFFSET(22691, glUniform4i, glUniform4i, NULL, 528),
+    NAME_FUNC_OFFSET(22706, glUniform4iv, glUniform4iv, NULL, 529),
+    NAME_FUNC_OFFSET(22722, glUniformMatrix2fv, glUniformMatrix2fv, NULL, 530),
+    NAME_FUNC_OFFSET(22744, glUniformMatrix3fv, glUniformMatrix3fv, NULL, 531),
+    NAME_FUNC_OFFSET(22766, glUniformMatrix4fv, glUniformMatrix4fv, NULL, 532),
+    NAME_FUNC_OFFSET(22788, glUseProgram, glUseProgram, NULL, 533),
+    NAME_FUNC_OFFSET(22810, glValidateProgram, glValidateProgram, NULL, 534),
+    NAME_FUNC_OFFSET(22831, glVertexAttrib1d, glVertexAttrib1d, NULL, 535),
+    NAME_FUNC_OFFSET(22851, glVertexAttrib1dv, glVertexAttrib1dv, NULL, 536),
+    NAME_FUNC_OFFSET(22872, glVertexAttrib1s, glVertexAttrib1s, NULL, 537),
+    NAME_FUNC_OFFSET(22892, glVertexAttrib1sv, glVertexAttrib1sv, NULL, 538),
+    NAME_FUNC_OFFSET(22913, glVertexAttrib2d, glVertexAttrib2d, NULL, 539),
+    NAME_FUNC_OFFSET(22933, glVertexAttrib2dv, glVertexAttrib2dv, NULL, 540),
+    NAME_FUNC_OFFSET(22954, glVertexAttrib2s, glVertexAttrib2s, NULL, 541),
+    NAME_FUNC_OFFSET(22974, glVertexAttrib2sv, glVertexAttrib2sv, NULL, 542),
+    NAME_FUNC_OFFSET(22995, glVertexAttrib3d, glVertexAttrib3d, NULL, 543),
+    NAME_FUNC_OFFSET(23015, glVertexAttrib3dv, glVertexAttrib3dv, NULL, 544),
+    NAME_FUNC_OFFSET(23036, glVertexAttrib3s, glVertexAttrib3s, NULL, 545),
+    NAME_FUNC_OFFSET(23056, glVertexAttrib3sv, glVertexAttrib3sv, NULL, 546),
+    NAME_FUNC_OFFSET(23077, glVertexAttrib4Nbv, glVertexAttrib4Nbv, NULL, 547),
+    NAME_FUNC_OFFSET(23099, glVertexAttrib4Niv, glVertexAttrib4Niv, NULL, 548),
+    NAME_FUNC_OFFSET(23121, glVertexAttrib4Nsv, glVertexAttrib4Nsv, NULL, 549),
+    NAME_FUNC_OFFSET(23143, glVertexAttrib4Nub, glVertexAttrib4Nub, NULL, 550),
+    NAME_FUNC_OFFSET(23165, glVertexAttrib4Nubv, glVertexAttrib4Nubv, NULL, 551),
+    NAME_FUNC_OFFSET(23188, glVertexAttrib4Nuiv, glVertexAttrib4Nuiv, NULL, 552),
+    NAME_FUNC_OFFSET(23211, glVertexAttrib4Nusv, glVertexAttrib4Nusv, NULL, 553),
+    NAME_FUNC_OFFSET(23234, glVertexAttrib4bv, glVertexAttrib4bv, NULL, 554),
+    NAME_FUNC_OFFSET(23255, glVertexAttrib4d, glVertexAttrib4d, NULL, 555),
+    NAME_FUNC_OFFSET(23275, glVertexAttrib4dv, glVertexAttrib4dv, NULL, 556),
+    NAME_FUNC_OFFSET(23296, glVertexAttrib4iv, glVertexAttrib4iv, NULL, 557),
+    NAME_FUNC_OFFSET(23317, glVertexAttrib4s, glVertexAttrib4s, NULL, 558),
+    NAME_FUNC_OFFSET(23337, glVertexAttrib4sv, glVertexAttrib4sv, NULL, 559),
+    NAME_FUNC_OFFSET(23358, glVertexAttrib4ubv, glVertexAttrib4ubv, NULL, 560),
+    NAME_FUNC_OFFSET(23380, glVertexAttrib4uiv, glVertexAttrib4uiv, NULL, 561),
+    NAME_FUNC_OFFSET(23402, glVertexAttrib4usv, glVertexAttrib4usv, NULL, 562),
+    NAME_FUNC_OFFSET(23424, glVertexAttribPointer, glVertexAttribPointer, NULL, 563),
+    NAME_FUNC_OFFSET(23449, glBeginConditionalRender, glBeginConditionalRender, NULL, 570),
+    NAME_FUNC_OFFSET(23476, glBeginTransformFeedback, glBeginTransformFeedback, NULL, 571),
+    NAME_FUNC_OFFSET(23504, glBindBufferBase, glBindBufferBase, NULL, 572),
+    NAME_FUNC_OFFSET(23524, glBindBufferRange, glBindBufferRange, NULL, 573),
+    NAME_FUNC_OFFSET(23545, glBindFragDataLocation, glBindFragDataLocation, NULL, 574),
+    NAME_FUNC_OFFSET(23571, glClampColor, glClampColor, NULL, 575),
+    NAME_FUNC_OFFSET(23587, glColorMaski, glColorMaski, NULL, 580),
+    NAME_FUNC_OFFSET(23609, glDisablei, glDisablei, NULL, 581),
+    NAME_FUNC_OFFSET(23629, glEnablei, glEnablei, NULL, 582),
+    NAME_FUNC_OFFSET(23648, glEndConditionalRender, glEndConditionalRender, NULL, 583),
+    NAME_FUNC_OFFSET(23673, glEndTransformFeedback, glEndTransformFeedback, NULL, 584),
+    NAME_FUNC_OFFSET(23699, glGetBooleani_v, glGetBooleani_v, NULL, 585),
+    NAME_FUNC_OFFSET(23723, glGetFragDataLocation, glGetFragDataLocation, NULL, 586),
+    NAME_FUNC_OFFSET(23748, glGetIntegeri_v, glGetIntegeri_v, NULL, 587),
+    NAME_FUNC_OFFSET(23772, glGetTexParameterIiv, glGetTexParameterIiv, NULL, 589),
+    NAME_FUNC_OFFSET(23796, glGetTexParameterIuiv, glGetTexParameterIuiv, NULL, 590),
+    NAME_FUNC_OFFSET(23821, glGetTransformFeedbackVarying, glGetTransformFeedbackVarying, NULL, 591),
+    NAME_FUNC_OFFSET(23854, glGetUniformuiv, glGetUniformuiv, NULL, 592),
+    NAME_FUNC_OFFSET(23873, glGetVertexAttribIiv, glGetVertexAttribIiv, NULL, 593),
+    NAME_FUNC_OFFSET(23897, glGetVertexAttribIuiv, glGetVertexAttribIuiv, NULL, 594),
+    NAME_FUNC_OFFSET(23922, glIsEnabledi, glIsEnabledi, NULL, 595),
+    NAME_FUNC_OFFSET(23944, glTexParameterIiv, glTexParameterIiv, NULL, 596),
+    NAME_FUNC_OFFSET(23965, glTexParameterIuiv, glTexParameterIuiv, NULL, 597),
+    NAME_FUNC_OFFSET(23987, glTransformFeedbackVaryings, glTransformFeedbackVaryings, NULL, 598),
+    NAME_FUNC_OFFSET(24018, glUniform1ui, glUniform1ui, NULL, 599),
+    NAME_FUNC_OFFSET(24034, glUniform1uiv, glUniform1uiv, NULL, 600),
+    NAME_FUNC_OFFSET(24051, glUniform2ui, glUniform2ui, NULL, 601),
+    NAME_FUNC_OFFSET(24067, glUniform2uiv, glUniform2uiv, NULL, 602),
+    NAME_FUNC_OFFSET(24084, glUniform3ui, glUniform3ui, NULL, 603),
+    NAME_FUNC_OFFSET(24100, glUniform3uiv, glUniform3uiv, NULL, 604),
+    NAME_FUNC_OFFSET(24117, glUniform4ui, glUniform4ui, NULL, 605),
+    NAME_FUNC_OFFSET(24133, glUniform4uiv, glUniform4uiv, NULL, 606),
+    NAME_FUNC_OFFSET(24150, glVertexAttribI1iv, glVertexAttribI1iv, NULL, 607),
+    NAME_FUNC_OFFSET(24172, glVertexAttribI1uiv, glVertexAttribI1uiv, NULL, 608),
+    NAME_FUNC_OFFSET(24195, glVertexAttribI4bv, glVertexAttribI4bv, NULL, 609),
+    NAME_FUNC_OFFSET(24217, glVertexAttribI4sv, glVertexAttribI4sv, NULL, 610),
+    NAME_FUNC_OFFSET(24239, glVertexAttribI4ubv, glVertexAttribI4ubv, NULL, 611),
+    NAME_FUNC_OFFSET(24262, glVertexAttribI4usv, glVertexAttribI4usv, NULL, 612),
+    NAME_FUNC_OFFSET(24285, glVertexAttribIPointer, glVertexAttribIPointer, NULL, 613),
+    NAME_FUNC_OFFSET(24311, glPrimitiveRestartIndex, glPrimitiveRestartIndex, NULL, 614),
+    NAME_FUNC_OFFSET(24337, glTexBuffer, glTexBuffer, NULL, 615),
+    NAME_FUNC_OFFSET(24352, glFramebufferTexture, glFramebufferTexture, NULL, 616),
+    NAME_FUNC_OFFSET(24376, glVertexAttribDivisor, glVertexAttribDivisor, NULL, 619),
+    NAME_FUNC_OFFSET(24401, glBindProgramARB, glBindProgramARB, NULL, 620),
+    NAME_FUNC_OFFSET(24417, glDeleteProgramsARB, glDeleteProgramsARB, NULL, 621),
+    NAME_FUNC_OFFSET(24436, glGenProgramsARB, glGenProgramsARB, NULL, 622),
+    NAME_FUNC_OFFSET(24452, glIsProgramARB, glIsProgramARB, NULL, 629),
+    NAME_FUNC_OFFSET(24466, glProgramEnvParameter4dARB, glProgramEnvParameter4dARB, NULL, 630),
+    NAME_FUNC_OFFSET(24489, glProgramEnvParameter4dvARB, glProgramEnvParameter4dvARB, NULL, 631),
+    NAME_FUNC_OFFSET(24513, glProgramEnvParameter4fARB, glProgramEnvParameter4fARB, NULL, 632),
+    NAME_FUNC_OFFSET(24536, glProgramEnvParameter4fvARB, glProgramEnvParameter4fvARB, NULL, 633),
+    NAME_FUNC_OFFSET(24560, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, 639),
+    NAME_FUNC_OFFSET(24577, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL, 640),
+    NAME_FUNC_OFFSET(24595, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, 641),
+    NAME_FUNC_OFFSET(24612, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL, 642),
+    NAME_FUNC_OFFSET(24630, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, 643),
+    NAME_FUNC_OFFSET(24647, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL, 644),
+    NAME_FUNC_OFFSET(24665, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, 645),
+    NAME_FUNC_OFFSET(24682, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, 646),
+    NAME_FUNC_OFFSET(24700, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 657),
+    NAME_FUNC_OFFSET(24725, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 657),
+    NAME_FUNC_OFFSET(24747, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 658),
+    NAME_FUNC_OFFSET(24774, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 658),
+    NAME_FUNC_OFFSET(24798, glBindFramebuffer, glBindFramebuffer, NULL, 659),
+    NAME_FUNC_OFFSET(24819, glBindFramebuffer, glBindFramebuffer, NULL, 659),
+    NAME_FUNC_OFFSET(24840, glBindRenderbuffer, glBindRenderbuffer, NULL, 660),
+    NAME_FUNC_OFFSET(24862, glBindRenderbuffer, glBindRenderbuffer, NULL, 660),
+    NAME_FUNC_OFFSET(24884, glBlitFramebuffer, glBlitFramebuffer, NULL, 661),
+    NAME_FUNC_OFFSET(24905, glCheckFramebufferStatus, glCheckFramebufferStatus, NULL, 662),
+    NAME_FUNC_OFFSET(24933, glCheckFramebufferStatus, glCheckFramebufferStatus, NULL, 662),
+    NAME_FUNC_OFFSET(24961, glDeleteFramebuffers, glDeleteFramebuffers, NULL, 663),
+    NAME_FUNC_OFFSET(24985, glDeleteFramebuffers, glDeleteFramebuffers, NULL, 663),
+    NAME_FUNC_OFFSET(25009, glDeleteRenderbuffers, glDeleteRenderbuffers, NULL, 664),
+    NAME_FUNC_OFFSET(25034, glDeleteRenderbuffers, glDeleteRenderbuffers, NULL, 664),
+    NAME_FUNC_OFFSET(25059, glFramebufferRenderbuffer, glFramebufferRenderbuffer, NULL, 665),
+    NAME_FUNC_OFFSET(25088, glFramebufferRenderbuffer, glFramebufferRenderbuffer, NULL, 665),
+    NAME_FUNC_OFFSET(25117, glFramebufferTexture1D, glFramebufferTexture1D, NULL, 666),
+    NAME_FUNC_OFFSET(25143, glFramebufferTexture2D, glFramebufferTexture2D, NULL, 667),
+    NAME_FUNC_OFFSET(25169, glFramebufferTexture2D, glFramebufferTexture2D, NULL, 667),
+    NAME_FUNC_OFFSET(25195, glFramebufferTexture3D, glFramebufferTexture3D, NULL, 668),
+    NAME_FUNC_OFFSET(25221, glFramebufferTexture3D, glFramebufferTexture3D, NULL, 668),
+    NAME_FUNC_OFFSET(25247, glFramebufferTextureLayer, glFramebufferTextureLayer, NULL, 669),
+    NAME_FUNC_OFFSET(25276, glFramebufferTextureLayer, glFramebufferTextureLayer, NULL, 669),
+    NAME_FUNC_OFFSET(25305, glGenFramebuffers, glGenFramebuffers, NULL, 670),
+    NAME_FUNC_OFFSET(25326, glGenFramebuffers, glGenFramebuffers, NULL, 670),
+    NAME_FUNC_OFFSET(25347, glGenRenderbuffers, glGenRenderbuffers, NULL, 671),
+    NAME_FUNC_OFFSET(25369, glGenRenderbuffers, glGenRenderbuffers, NULL, 671),
+    NAME_FUNC_OFFSET(25391, glGenerateMipmap, glGenerateMipmap, NULL, 672),
+    NAME_FUNC_OFFSET(25411, glGenerateMipmap, glGenerateMipmap, NULL, 672),
+    NAME_FUNC_OFFSET(25431, glGetFramebufferAttachmentParameteriv, glGetFramebufferAttachmentParameteriv, NULL, 673),
+    NAME_FUNC_OFFSET(25472, glGetFramebufferAttachmentParameteriv, glGetFramebufferAttachmentParameteriv, NULL, 673),
+    NAME_FUNC_OFFSET(25513, glGetRenderbufferParameteriv, glGetRenderbufferParameteriv, NULL, 674),
+    NAME_FUNC_OFFSET(25545, glGetRenderbufferParameteriv, glGetRenderbufferParameteriv, NULL, 674),
+    NAME_FUNC_OFFSET(25577, glIsFramebuffer, glIsFramebuffer, NULL, 675),
+    NAME_FUNC_OFFSET(25596, glIsFramebuffer, glIsFramebuffer, NULL, 675),
+    NAME_FUNC_OFFSET(25615, glIsRenderbuffer, glIsRenderbuffer, NULL, 676),
+    NAME_FUNC_OFFSET(25635, glIsRenderbuffer, glIsRenderbuffer, NULL, 676),
+    NAME_FUNC_OFFSET(25655, glRenderbufferStorage, glRenderbufferStorage, NULL, 677),
+    NAME_FUNC_OFFSET(25680, glRenderbufferStorage, glRenderbufferStorage, NULL, 677),
+    NAME_FUNC_OFFSET(25705, glRenderbufferStorageMultisample, glRenderbufferStorageMultisample, NULL, 678),
+    NAME_FUNC_OFFSET(25741, glFlushMappedBufferRange, glFlushMappedBufferRange, NULL, 680),
+    NAME_FUNC_OFFSET(25769, glMapBufferRange, glMapBufferRange, NULL, 681),
+    NAME_FUNC_OFFSET(25789, glBindVertexArray, glBindVertexArray, NULL, 682),
+    NAME_FUNC_OFFSET(25810, glDeleteVertexArrays, glDeleteVertexArrays, NULL, 683),
+    NAME_FUNC_OFFSET(25836, glDeleteVertexArrays, glDeleteVertexArrays, NULL, 683),
+    NAME_FUNC_OFFSET(25860, glGenVertexArrays, glGenVertexArrays, NULL, 684),
+    NAME_FUNC_OFFSET(25881, glIsVertexArray, glIsVertexArray, NULL, 685),
+    NAME_FUNC_OFFSET(25902, glIsVertexArray, glIsVertexArray, NULL, 685),
+    NAME_FUNC_OFFSET(25921, glProvokingVertex, glProvokingVertex, NULL, 705),
+    NAME_FUNC_OFFSET(25942, glBlendEquationSeparateiARB, glBlendEquationSeparateiARB, NULL, 706),
+    NAME_FUNC_OFFSET(25976, glBlendEquationiARB, glBlendEquationiARB, NULL, 707),
+    NAME_FUNC_OFFSET(26002, glBlendFuncSeparateiARB, glBlendFuncSeparateiARB, NULL, 708),
+    NAME_FUNC_OFFSET(26032, glBlendFunciARB, glBlendFunciARB, NULL, 709),
+    NAME_FUNC_OFFSET(26054, gl_dispatch_stub_726, gl_dispatch_stub_726, NULL, 726),
+    NAME_FUNC_OFFSET(26078, gl_dispatch_stub_727, gl_dispatch_stub_727, NULL, 727),
+    NAME_FUNC_OFFSET(26103, glClearDepthf, glClearDepthf, NULL, 778),
+    NAME_FUNC_OFFSET(26120, glDepthRangef, glDepthRangef, NULL, 779),
+    NAME_FUNC_OFFSET(26137, glGetProgramBinary, glGetProgramBinary, NULL, 783),
+    NAME_FUNC_OFFSET(26159, glProgramBinary, glProgramBinary, NULL, 784),
+    NAME_FUNC_OFFSET(26178, glProgramParameteri, glProgramParameteri, NULL, 785),
+    NAME_FUNC_OFFSET(26201, gl_dispatch_stub_840, gl_dispatch_stub_840, NULL, 840),
+    NAME_FUNC_OFFSET(26217, gl_dispatch_stub_841, gl_dispatch_stub_841, NULL, 841),
+    NAME_FUNC_OFFSET(26236, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, 850),
+    NAME_FUNC_OFFSET(26255, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, 851),
+    NAME_FUNC_OFFSET(26275, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, 852),
+    NAME_FUNC_OFFSET(26295, glFogCoordfEXT, glFogCoordfEXT, NULL, 853),
+    NAME_FUNC_OFFSET(26307, glFogCoordfvEXT, glFogCoordfvEXT, NULL, 854),
+    NAME_FUNC_OFFSET(26320, glVertexAttribI1iEXT, glVertexAttribI1iEXT, NULL, 955),
+    NAME_FUNC_OFFSET(26338, glVertexAttribI1uiEXT, glVertexAttribI1uiEXT, NULL, 956),
+    NAME_FUNC_OFFSET(26357, glVertexAttribI2iEXT, glVertexAttribI2iEXT, NULL, 957),
+    NAME_FUNC_OFFSET(26375, glVertexAttribI2ivEXT, glVertexAttribI2ivEXT, NULL, 958),
+    NAME_FUNC_OFFSET(26394, glVertexAttribI2uiEXT, glVertexAttribI2uiEXT, NULL, 959),
+    NAME_FUNC_OFFSET(26413, glVertexAttribI2uivEXT, glVertexAttribI2uivEXT, NULL, 960),
+    NAME_FUNC_OFFSET(26433, glVertexAttribI3iEXT, glVertexAttribI3iEXT, NULL, 961),
+    NAME_FUNC_OFFSET(26451, glVertexAttribI3ivEXT, glVertexAttribI3ivEXT, NULL, 962),
+    NAME_FUNC_OFFSET(26470, glVertexAttribI3uiEXT, glVertexAttribI3uiEXT, NULL, 963),
+    NAME_FUNC_OFFSET(26489, glVertexAttribI3uivEXT, glVertexAttribI3uivEXT, NULL, 964),
+    NAME_FUNC_OFFSET(26509, glVertexAttribI4iEXT, glVertexAttribI4iEXT, NULL, 965),
+    NAME_FUNC_OFFSET(26527, glVertexAttribI4ivEXT, glVertexAttribI4ivEXT, NULL, 966),
+    NAME_FUNC_OFFSET(26546, glVertexAttribI4uiEXT, glVertexAttribI4uiEXT, NULL, 967),
+    NAME_FUNC_OFFSET(26565, glVertexAttribI4uivEXT, glVertexAttribI4uivEXT, NULL, 968),
+    NAME_FUNC_OFFSET(26585, gl_dispatch_stub_984, gl_dispatch_stub_984, NULL, 984),
+    NAME_FUNC_OFFSET(26601, gl_dispatch_stub_985, gl_dispatch_stub_985, NULL, 985),
+    NAME_FUNC_OFFSET(26618, gl_dispatch_stub_986, gl_dispatch_stub_986, NULL, 986),
+    NAME_FUNC_OFFSET(26635, gl_dispatch_stub_987, gl_dispatch_stub_987, NULL, 987),
+    NAME_FUNC_OFFSET(26648, gl_dispatch_stub_988, gl_dispatch_stub_988, NULL, 988),
+    NAME_FUNC_OFFSET(26665, gl_dispatch_stub_989, gl_dispatch_stub_989, NULL, 989),
+    NAME_FUNC_OFFSET(26675, gl_dispatch_stub_990, gl_dispatch_stub_990, NULL, 990),
+    NAME_FUNC_OFFSET(26686, gl_dispatch_stub_991, gl_dispatch_stub_991, NULL, 991),
+    NAME_FUNC_OFFSET(26700, gl_dispatch_stub_992, gl_dispatch_stub_992, NULL, 992),
+    NAME_FUNC_OFFSET(26714, gl_dispatch_stub_993, gl_dispatch_stub_993, NULL, 993),
+    NAME_FUNC_OFFSET(26731, gl_dispatch_stub_994, gl_dispatch_stub_994, NULL, 994),
+    NAME_FUNC_OFFSET(26749, gl_dispatch_stub_995, gl_dispatch_stub_995, NULL, 995),
+    NAME_FUNC_OFFSET(26761, gl_dispatch_stub_996, gl_dispatch_stub_996, NULL, 996),
+    NAME_FUNC_OFFSET(26774, gl_dispatch_stub_997, gl_dispatch_stub_997, NULL, 997),
+    NAME_FUNC_OFFSET(26790, gl_dispatch_stub_998, gl_dispatch_stub_998, NULL, 998),
+    NAME_FUNC_OFFSET(26807, gl_dispatch_stub_999, gl_dispatch_stub_999, NULL, 999),
+    NAME_FUNC_OFFSET(26822, gl_dispatch_stub_1000, gl_dispatch_stub_1000, NULL, 1000),
+    NAME_FUNC_OFFSET(26838, gl_dispatch_stub_1001, gl_dispatch_stub_1001, NULL, 1001),
+    NAME_FUNC_OFFSET(26855, gl_dispatch_stub_1002, gl_dispatch_stub_1002, NULL, 1002),
+    NAME_FUNC_OFFSET(26876, gl_dispatch_stub_1003, gl_dispatch_stub_1003, NULL, 1003),
+    NAME_FUNC_OFFSET(26890, gl_dispatch_stub_1004, gl_dispatch_stub_1004, NULL, 1004),
+    NAME_FUNC_OFFSET(26902, gl_dispatch_stub_1005, gl_dispatch_stub_1005, NULL, 1005),
+    NAME_FUNC_OFFSET(26914, gl_dispatch_stub_1006, gl_dispatch_stub_1006, NULL, 1006),
+    NAME_FUNC_OFFSET(26930, gl_dispatch_stub_1007, gl_dispatch_stub_1007, NULL, 1007),
+    NAME_FUNC_OFFSET(26950, gl_dispatch_stub_1008, gl_dispatch_stub_1008, NULL, 1008),
+    NAME_FUNC_OFFSET(26963, gl_dispatch_stub_1009, gl_dispatch_stub_1009, NULL, 1009),
+    NAME_FUNC_OFFSET(26984, gl_dispatch_stub_1010, gl_dispatch_stub_1010, NULL, 1010),
+    NAME_FUNC_OFFSET(26996, gl_dispatch_stub_1011, gl_dispatch_stub_1011, NULL, 1011),
+    NAME_FUNC_OFFSET(27009, gl_dispatch_stub_1012, gl_dispatch_stub_1012, NULL, 1012),
+    NAME_FUNC_OFFSET(27023, gl_dispatch_stub_1013, gl_dispatch_stub_1013, NULL, 1013),
+    NAME_FUNC_OFFSET(27042, gl_dispatch_stub_1014, gl_dispatch_stub_1014, NULL, 1014),
+    NAME_FUNC_OFFSET(27058, gl_dispatch_stub_1015, gl_dispatch_stub_1015, NULL, 1015),
+    NAME_FUNC_OFFSET(27074, gl_dispatch_stub_1016, gl_dispatch_stub_1016, NULL, 1016),
+    NAME_FUNC_OFFSET(27090, gl_dispatch_stub_1017, gl_dispatch_stub_1017, NULL, 1017),
+    NAME_FUNC_OFFSET(27109, gl_dispatch_stub_1018, gl_dispatch_stub_1018, NULL, 1018),
+    NAME_FUNC_OFFSET(27128, gl_dispatch_stub_1019, gl_dispatch_stub_1019, NULL, 1019),
+    NAME_FUNC_OFFSET(27143, gl_dispatch_stub_1020, gl_dispatch_stub_1020, NULL, 1020),
+    NAME_FUNC_OFFSET(27159, gl_dispatch_stub_1021, gl_dispatch_stub_1021, NULL, 1021),
+    NAME_FUNC_OFFSET(27178, gl_dispatch_stub_1022, gl_dispatch_stub_1022, NULL, 1022),
+    NAME_FUNC_OFFSET(27195, gl_dispatch_stub_1023, gl_dispatch_stub_1023, NULL, 1023),
+    NAME_FUNC_OFFSET(27218, gl_dispatch_stub_1024, gl_dispatch_stub_1024, NULL, 1024),
+    NAME_FUNC_OFFSET(27239, gl_dispatch_stub_1025, gl_dispatch_stub_1025, NULL, 1025),
+    NAME_FUNC_OFFSET(27261, gl_dispatch_stub_1026, gl_dispatch_stub_1026, NULL, 1026),
     NAME_FUNC_OFFSET(-1, NULL, NULL, NULL, 0)
 };
 
diff --git a/xorg-server/glx/glxcmds.c b/xorg-server/glx/glxcmds.c
index c1f4e22f8..900349a60 100644
--- a/xorg-server/glx/glxcmds.c
+++ b/xorg-server/glx/glxcmds.c
@@ -31,6 +31,7 @@
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
+#include "glheader.h"
 
 #include <string.h>
 #include <assert.h>
@@ -215,6 +216,12 @@ __glXdirectContextCreate(__GLXscreen * screen,
     return context;
 }
 
+void FlushContext(__GLXcontext *cx)
+{
+    CALL_Flush( GET_DISPATCH(), () );
+    cx->hasUnflushedCommands = GL_FALSE;
+}
+
 /**
  * Create a GL context with the given properties.  This routine is used
  * to implement \c glXCreateContext, \c glXCreateNewContext, and
@@ -500,7 +507,7 @@ __glXGetDrawable(__GLXcontext * glxc, GLXDrawable drawId, ClientPtr client,
         return NULL;
     }
 
-    if (pDraw->pScreen != glxc->pGlxScreen->pScreen) {
+    if (!glxc || pDraw->pScreen != glxc->pGlxScreen->pScreen) {
         client->errorValue = pDraw->pScreen->myNum;
         *error = BadMatch;
         return NULL;
@@ -513,6 +520,12 @@ __glXGetDrawable(__GLXcontext * glxc, GLXDrawable drawId, ClientPtr client,
                                                 pDraw, drawId,
                                                 GLX_DRAWABLE_WINDOW,
                                                 drawId, glxc->config);
+    if (!pGlxDraw)
+    {
+        client->errorValue = drawId;
+        *error = BadMatch;
+        return NULL;
+    }
 
     /* since we are creating the drawablePrivate, drawId should be new */
     if (!AddResource(drawId, __glXDrawableRes, pGlxDraw)) {
@@ -651,12 +664,12 @@ DoMakeCurrent(__GLXclientState * cl,
 
     StopUsingContext(prevglxc);
 
-    reply = (xGLXMakeCurrentReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .contextTag = 0
-    };
+
+    reply.type = X_Reply;
+    reply.sequenceNumber = client->sequence;
+    reply.length = 0;
+    reply.contextTag = 0;
+
 
     if (glxc) {
         StartUsingContext(cl, glxc);
@@ -722,12 +735,12 @@ __glXDisp_IsDirect(__GLXclientState * cl, GLbyte * pc)
     if (!validGlxContext(cl->client, req->context, DixReadAccess, &glxc, &err))
         return err;
 
-    reply = (xGLXIsDirectReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .isDirect = glxc->isDirect
-    };
+
+    reply.type = X_Reply;
+    reply.sequenceNumber = client->sequence;
+    reply.length = 0;
+    reply.isDirect = glxc->isDirect;
+
 
     if (client->swapped) {
         __glXSwapIsDirectReply(client, &reply);
@@ -759,13 +772,13 @@ __glXDisp_QueryVersion(__GLXclientState * cl, GLbyte * pc)
      ** client if it wants to work with older clients; however, in this
      ** implementation the server just returns its version number.
      */
-    reply = (xGLXQueryVersionReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .majorVersion = glxMajorVersion,
-        .minorVersion = glxMinorVersion
-    };
+
+    reply.type = X_Reply;
+    reply.sequenceNumber = client->sequence;
+    reply.length = 0;
+    reply.majorVersion = glxMajorVersion;
+    reply.minorVersion = glxMinorVersion;
+
 
     if (client->swapped) {
         __glXSwapQueryVersionReply(client, &reply);
@@ -939,14 +952,14 @@ __glXDisp_GetVisualConfigs(__GLXclientState * cl, GLbyte * pc)
     if (!validGlxScreen(cl->client, req->screen, &pGlxScreen, &err))
         return err;
 
-    reply = (xGLXGetVisualConfigsReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = (pGlxScreen->numVisuals *
+
+    reply.type = X_Reply;
+    reply.sequenceNumber = client->sequence;
+    reply.length = (pGlxScreen->numVisuals *
                    __GLX_SIZE_CARD32 * GLX_VIS_CONFIG_TOTAL) >> 2,
-        .numVisuals = pGlxScreen->numVisuals,
-        .numProps = GLX_VIS_CONFIG_TOTAL
-    };
+    reply.numVisuals = pGlxScreen->numVisuals;
+    reply.numProps = GLX_VIS_CONFIG_TOTAL;
+
 
     if (client->swapped) {
         __GLX_SWAP_SHORT(&reply.sequenceNumber);
@@ -1045,13 +1058,13 @@ DoGetFBConfigs(__GLXclientState * cl, unsigned screen)
     if (!validGlxScreen(cl->client, screen, &pGlxScreen, &err))
         return err;
 
-    reply = (xGLXGetFBConfigsReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = __GLX_FBCONFIG_ATTRIBS_LENGTH * pGlxScreen->numFBConfigs,
-        .numFBConfigs = pGlxScreen->numFBConfigs,
-        .numAttribs = __GLX_TOTAL_FBCONFIG_ATTRIBS
-    };
+
+    reply.type = X_Reply;
+    reply.sequenceNumber = client->sequence;
+    reply.length = __GLX_FBCONFIG_ATTRIBS_LENGTH * pGlxScreen->numFBConfigs;
+    reply.numFBConfigs = pGlxScreen->numFBConfigs;
+    reply.numAttribs = __GLX_TOTAL_FBCONFIG_ATTRIBS;
+
 
     if (client->swapped) {
         __GLX_SWAP_SHORT(&reply.sequenceNumber);
@@ -1671,12 +1684,12 @@ DoQueryContext(__GLXclientState * cl, GLXContextID gcId)
         return err;
 
     nProps = 3;
-    reply = (xGLXQueryContextInfoEXTReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = nProps << 1,
-        .n = nProps
-    };
+
+    reply.type = X_Reply;
+    reply.sequenceNumber = client->sequence;
+    reply.length = nProps << 1;
+    reply.n = nProps;
+
 
     nReplyBytes = reply.length << 2;
     sendBuf = (int *) malloc((size_t) nReplyBytes);
@@ -1880,12 +1893,12 @@ DoGetDrawableAttributes(__GLXclientState * cl, XID drawId)
         return error;
 
     numAttribs = 3;
-    reply = (xGLXGetDrawableAttributesReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = numAttribs << 1,
-        .numAttribs = numAttribs
-    };
+
+    reply.type = X_Reply;
+    reply.sequenceNumber = client->sequence;
+    reply.length = numAttribs << 1;
+    reply.numAttribs = numAttribs;
+
 
     attributes[0] = GLX_TEXTURE_TARGET_EXT;
     attributes[1] = pGlxDraw->target == GL_TEXTURE_2D ? GLX_TEXTURE_2D_EXT :
@@ -2321,12 +2334,12 @@ __glXDisp_QueryExtensionsString(__GLXclientState * cl, GLbyte * pc)
 
     n = strlen(pGlxScreen->GLXextensions) + 1;
     length = __GLX_PAD(n) >> 2;
-    reply = (xGLXQueryExtensionsStringReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = length,
-        .n = n
-    };
+
+    reply.type = X_Reply;
+    reply.sequenceNumber = client->sequence;
+    reply.length = length;
+    reply.n = n;
+
 
     /* Allocate buffer to make sure it's a multiple of 4 bytes big. */
     buf = calloc(length, 4);
@@ -2384,12 +2397,12 @@ __glXDisp_QueryServerString(__GLXclientState * cl, GLbyte * pc)
 
     n = strlen(ptr) + 1;
     length = __GLX_PAD(n) >> 2;
-    reply = (xGLXQueryServerStringReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = length,
-        .n = n
-    };
+
+    reply.type = X_Reply;
+    reply.sequenceNumber = client->sequence;
+    reply.length = length;
+    reply.n = n;
+
 
     buf = calloc(length, 4);
     if (buf == NULL) {
diff --git a/xorg-server/glx/glxcmdsswap.c b/xorg-server/glx/glxcmdsswap.c
index 43f88d335..f4ee1cee5 100644
--- a/xorg-server/glx/glxcmdsswap.c
+++ b/xorg-server/glx/glxcmdsswap.c
@@ -31,6 +31,7 @@
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
+#include "glheader.h"
 
 #include <string.h>
 #include "glxserver.h"
@@ -40,6 +41,7 @@
 #include <pixmapstr.h>
 #include <windowstr.h>
 #include "glxext.h"
+#include "GL/gl.h"
 #include "glapitable.h"
 #include "glapi.h"
 #include "glthread.h"
diff --git a/xorg-server/glx/glxdri.c b/xorg-server/glx/glxdri.c
index da4646845..9355394c5 100644
--- a/xorg-server/glx/glxdri.c
+++ b/xorg-server/glx/glxdri.c
@@ -29,10 +29,13 @@
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
+#ifndef _MSC_VER
 #include <sys/time.h>
 #include <dlfcn.h>
 
 #include <drm.h>
+#endif
+
 #include <GL/gl.h>
 #include <GL/internal/dri_interface.h>
 #include <GL/glxtokens.h>
diff --git a/xorg-server/glx/glxdricommon.c b/xorg-server/glx/glxdricommon.c
index c90f38098..43b5e5b5f 100644
--- a/xorg-server/glx/glxdricommon.c
+++ b/xorg-server/glx/glxdricommon.c
@@ -25,6 +25,10 @@
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#else
+
+#include "glheader.h"
+
 #endif
 
 #include <stdint.h>
@@ -40,6 +44,10 @@
 #include "glxscreens.h"
 #include "glxdricommon.h"
 
+#ifdef _MSC_VER
+#define dlerror() "Getting loadlibrary error string not implemented"
+#endif
+
 static int
 getUST(int64_t * ust)
 {
@@ -48,6 +56,9 @@ getUST(int64_t * ust)
     if (ust == NULL)
         return -EFAULT;
 
+#ifdef _MSC_VER
+    __asm int 3;
+#else
     if (gettimeofday(&tv, NULL) == 0) {
         ust[0] = (tv.tv_sec * 1000000) + tv.tv_usec;
         return 0;
@@ -55,6 +66,7 @@ getUST(int64_t * ust)
     else {
         return -errno;
     }
+    #endif
 }
 
 const __DRIsystemTimeExtension systemTimeExtension = {
@@ -219,17 +231,29 @@ glxProbeDriver(const char *driverName,
     char filename[PATH_MAX];
     const __DRIextension **extensions;
 
+#ifdef _MSC_VER
+#define DLLNAME "%s%s_dri.dll"
+    snprintf(filename, sizeof filename, DLLNAME,
+             dri_driver_path, driverName);
+
+    driver = LoadLibrary(filename);
+#else
     snprintf(filename, sizeof filename, "%s/%s_dri.so",
              dri_driver_path, driverName);
 
     driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL);
+#endif
     if (driver == NULL) {
         LogMessage(X_ERROR, "AIGLX error: dlopen of %s failed (%s)\n",
                    filename, dlerror());
         goto cleanup_failure;
     }
 
+#ifdef _MSC_VER
+    extensions = (const __DRIextension **)GetProcAddress(driver, __DRI_DRIVER_EXTENSIONS);
+#else
     extensions = dlsym(driver, __DRI_DRIVER_EXTENSIONS);
+#endif
     if (extensions == NULL) {
         LogMessage(X_ERROR, "AIGLX error: %s exports no extensions (%s)\n",
                    driverName, dlerror());
@@ -258,7 +282,11 @@ glxProbeDriver(const char *driverName,
 
  cleanup_failure:
     if (driver)
+#ifdef _MSC_VER
+    FreeLibrary(driver);
+#else
         dlclose(driver);
+#endif
     *coreExt = *renderExt = NULL;
     return NULL;
 }
diff --git a/xorg-server/glx/glxdriswrast.c b/xorg-server/glx/glxdriswrast.c
index b47839868..7b1c67732 100644
--- a/xorg-server/glx/glxdriswrast.c
+++ b/xorg-server/glx/glxdriswrast.c
@@ -27,6 +27,7 @@
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
+#include "glheader.h"
 
 #include <stdint.h>
 #include <stdio.h>
@@ -54,13 +55,6 @@
 #include "dispatch.h"
 #include "extension_string.h"
 
-/* RTLD_LOCAL is not defined on Cygwin */
-#ifdef __CYGWIN__
-#ifndef RTLD_LOCAL
-#define RTLD_LOCAL 0
-#endif
-#endif
-
 typedef struct __GLXDRIscreen __GLXDRIscreen;
 typedef struct __GLXDRIcontext __GLXDRIcontext;
 typedef struct __GLXDRIdrawable __GLXDRIdrawable;
@@ -241,14 +235,18 @@ __glXDRIscreenDestroy(__GLXscreen * baseScreen)
 
     (*screen->core->destroyScreen) (screen->driScreen);
 
+#ifdef _MSC_VER
+    FreeLibrary(screen->driver);
+#else
     dlclose(screen->driver);
+#endif
 
     __glXScreenDestroy(baseScreen);
 
     if (screen->driConfigs) {
         for (i = 0; screen->driConfigs[i] != NULL; i++)
             free((__DRIconfig **) screen->driConfigs[i]);
-        free(screen->driConfigs);
+        free((void*)screen->driConfigs);
     }
 
     free(screen);
@@ -337,6 +335,13 @@ __glXDRIscreenCreateDrawable(ClientPtr client,
     private->driDrawable =
         (*driScreen->swrast->createNewDrawable) (driScreen->driScreen,
                                                  config->driConfig, private);
+    if (!private->driDrawable)
+    {
+        FreeGC(private->gc, (GContext)0);
+        FreeGC(private->swapgc, (GContext)0);
+        free(private);
+        return NULL;
+    }
 
     return &private->base;
 }
@@ -429,11 +434,18 @@ initializeExtensions(__GLXDRIscreen * screen)
     }
 }
 
+extern Bool g_fswrastwgl;
+
 static __GLXscreen *
 __glXDRIscreenProbe(ScreenPtr pScreen)
 {
-    const char *driverName = "swrast";
+    const char *driverName;
     __GLXDRIscreen *screen;
+    
+    if (g_fswrastwgl)
+      driverName = "swrastwgl";
+    else
+      driverName = "swrast";
 
     screen = calloc(1, sizeof *screen);
     if (screen == NULL)
@@ -482,7 +494,11 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
 
  handle_error:
     if (screen->driver)
+#ifdef _MSC_VER
+        FreeLibrary(screen->driver);
+#else
         dlclose(screen->driver);
+#endif
 
     free(screen);
 
diff --git a/xorg-server/glx/glxext.c b/xorg-server/glx/glxext.c
index bc7fe8217..01597849e 100644
--- a/xorg-server/glx/glxext.c
+++ b/xorg-server/glx/glxext.c
@@ -30,6 +30,10 @@
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#else
+
+#include "glheader.h"
+
 #endif
 
 #include <string.h>
@@ -46,6 +50,9 @@
 #include "glxext.h"
 #include "indirect_table.h"
 #include "indirect_util.h"
+#include "glapi.h"
+
+extern void FlushContext(__GLXcontext *cx);
 
 /*
 ** The last context used by the server.  It is the context that is current
@@ -139,6 +146,8 @@ DrawableGone(__GLXdrawable * glxPriv, XID xid)
     for (c = glxAllContexts; c; c = next) {
         next = c->next;
         if (c->isCurrent && (c->drawPriv == glxPriv || c->readPriv == glxPriv)) {
+            if (GET_DISPATCH()) FlushContext(c); /* Only flush if we still have a context */
+
             (*c->loseCurrent) (c);
             c->isCurrent = GL_FALSE;
             if (c == __glXLastContext)
@@ -326,7 +335,7 @@ GlxExtensionInit(void)
     int i;
     __GLXprovider *p, **stack;
     Bool glx_provided = False;
-
+    
     if (serverGeneration == 1) {
         for (stack = &__glXProviderStack; *stack; stack = &(*stack)->next)
             ;
@@ -439,7 +448,7 @@ __glXForceCurrent(__GLXclientState * cl, GLXContextTag tag, int *error)
     if (cx->wait && (*cx->wait) (cx, cl, error))
         return NULL;
 
-    if (cx == __glXLastContext) {
+    if (cx == __glXLastContext && GET_DISPATCH()) {
         /* No need to re-bind */
         return cx;
     }
diff --git a/xorg-server/glx/glxext.h b/xorg-server/glx/glxext.h
index 9b0978b93..37291ae7c 100644
--- a/xorg-server/glx/glxext.h
+++ b/xorg-server/glx/glxext.h
@@ -35,11 +35,17 @@
  * Silicon Graphics, Inc.
  */
 
+#ifdef INSERVER
+#define SERVEXTERN _declspec(dllimport)
+#else
+#define SERVEXTERN _declspec(dllexport)
+#endif
+
 extern GLboolean __glXFreeContext(__GLXcontext * glxc);
 extern void __glXFlushContextCache(void);
 
 extern Bool __glXAddContext(__GLXcontext * cx);
-extern void __glXErrorCallBack(GLenum code);
+SERVEXTERN void __glXErrorCallBack(GLenum code);
 extern void __glXClearErrorOccured(void);
 extern GLboolean __glXErrorOccured(void);
 extern void __glXResetLargeCommandStatus(__GLXclientState *);
diff --git a/xorg-server/glx/glxscreens.c b/xorg-server/glx/glxscreens.c
index 61d590cc8..2d9178121 100644
--- a/xorg-server/glx/glxscreens.c
+++ b/xorg-server/glx/glxscreens.c
@@ -30,6 +30,10 @@
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#else
+
+#include "glheader.h"
+
 #endif
 
 #include <GL/glxtokens.h>
diff --git a/xorg-server/glx/glxserver.h b/xorg-server/glx/glxserver.h
index 1021aec80..707578a13 100644
--- a/xorg-server/glx/glxserver.h
+++ b/xorg-server/glx/glxserver.h
@@ -47,6 +47,7 @@
 #include <scrnintstr.h>
 
 #include <GL/gl.h>
+#include <GL/glext.h>
 #include <GL/glxproto.h>
 
 /*
diff --git a/xorg-server/glx/indirect_dispatch.c b/xorg-server/glx/indirect_dispatch.c
index 0a7623cf2..9b6be81ed 100644
--- a/xorg-server/glx/indirect_dispatch.c
+++ b/xorg-server/glx/indirect_dispatch.c
@@ -25,6 +25,11 @@
  * SOFTWARE.
  */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+#include "glheader.h"
+
 #include <X11/Xmd.h>
 #include <GL/gl.h>
 #include <GL/glxproto.h>
@@ -47,94 +52,94 @@ typedef struct {
     __GLX_PIXEL_3D_HDR;
 } __GLXpixel3DHeader;
 
-extern GLboolean __glXErrorOccured(void);
-extern void __glXClearErrorOccured(void);
+extern GLboolean __glXErrorOccured( void );
+extern void __glXClearErrorOccured( void );
 
-static const unsigned dummy_answer[2] = { 0, 0 };
+static const unsigned dummy_answer[2] = {0, 0};
 
-int
-__glXDisp_NewList(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_NewList(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        CALL_NewList(GET_DISPATCH(), (*(GLuint *) (pc + 0), *(GLenum *) (pc + 4)
-                     ));
+    if ( cx != NULL ) {
+        CALL_NewList( GET_DISPATCH(), (
+            *(GLuint   *)(pc +  0),
+            *(GLenum   *)(pc +  4)
+        ) );
         error = Success;
     }
 
     return error;
 }
 
-int
-__glXDisp_EndList(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_EndList(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        CALL_EndList(GET_DISPATCH(), ());
+    if ( cx != NULL ) {
+        CALL_EndList( GET_DISPATCH(), () );
         error = Success;
     }
 
     return error;
 }
 
-void
-__glXDisp_CallList(GLbyte * pc)
+void __glXDisp_CallList(GLbyte * pc)
 {
-    CALL_CallList(GET_DISPATCH(), (*(GLuint *) (pc + 0)
-                  ));
+    CALL_CallList( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_CallLists(GLbyte * pc)
+void __glXDisp_CallLists(GLbyte * pc)
 {
-    const GLsizei n = *(GLsizei *) (pc + 0);
-    const GLenum type = *(GLenum *) (pc + 4);
-    const GLvoid *lists = (const GLvoid *) (pc + 8);
+    const GLsizei n = *(GLsizei  *)(pc +  0);
+    const GLenum type = *(GLenum   *)(pc +  4);
+    const GLvoid * lists =  (const GLvoid *)(pc +  8);
 
-    lists = (const GLvoid *) (pc + 8);
-
-    CALL_CallLists(GET_DISPATCH(), (n, type, lists));
+    CALL_CallLists( GET_DISPATCH(), (
+        n,
+        type,
+        lists
+    ) );
 }
 
-int
-__glXDisp_DeleteLists(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_DeleteLists(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        CALL_DeleteLists(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                          *(GLsizei *) (pc + 4)
-                         ));
+    if ( cx != NULL ) {
+        CALL_DeleteLists( GET_DISPATCH(), (
+            *(GLuint   *)(pc +  0),
+            *(GLsizei  *)(pc +  4)
+        ) );
         error = Success;
     }
 
     return error;
 }
 
-int
-__glXDisp_GenLists(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GenLists(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
+    if ( cx != NULL ) {
         GLuint retval;
-
-        retval = CALL_GenLists(GET_DISPATCH(), (*(GLsizei *) (pc + 0)
-                               ));
+        retval = CALL_GenLists( GET_DISPATCH(), (
+            *(GLsizei  *)(pc +  0)
+        ) );
         __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
         error = Success;
     }
@@ -142,1596 +147,1648 @@ __glXDisp_GenLists(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-void
-__glXDisp_ListBase(GLbyte * pc)
+void __glXDisp_ListBase(GLbyte * pc)
 {
-    CALL_ListBase(GET_DISPATCH(), (*(GLuint *) (pc + 0)
-                  ));
+    CALL_ListBase( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_Begin(GLbyte * pc)
+void __glXDisp_Begin(GLbyte * pc)
 {
-    CALL_Begin(GET_DISPATCH(), (*(GLenum *) (pc + 0)
-               ));
+    CALL_Begin( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_Bitmap(GLbyte * pc)
+void __glXDisp_Bitmap(GLbyte * pc)
 {
-    const GLubyte *const bitmap = (const GLubyte *) ((pc + 44));
-    __GLXpixelHeader *const hdr = (__GLXpixelHeader *) (pc);
+    const GLubyte * const bitmap = (const GLubyte *) (pc + 44);
+    __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment));
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST,    hdr->lsbFirst) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,   (GLint) hdr->rowLength) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,    (GLint) hdr->skipRows) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,  (GLint) hdr->skipPixels) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT,    (GLint) hdr->alignment) );
 
-    CALL_Bitmap(GET_DISPATCH(), (*(GLsizei *) (pc + 20),
-                                 *(GLsizei *) (pc + 24),
-                                 *(GLfloat *) (pc + 28),
-                                 *(GLfloat *) (pc + 32),
-                                 *(GLfloat *) (pc + 36),
-                                 *(GLfloat *) (pc + 40), bitmap));
+    CALL_Bitmap( GET_DISPATCH(), (
+        *(GLsizei  *)(pc + 20),
+        *(GLsizei  *)(pc + 24),
+        *(GLfloat  *)(pc + 28),
+        *(GLfloat  *)(pc + 32),
+        *(GLfloat  *)(pc + 36),
+        *(GLfloat  *)(pc + 40),
+        bitmap
+    ) );
 }
 
-void
-__glXDisp_Color3bv(GLbyte * pc)
+void __glXDisp_Color3bv(GLbyte * pc)
 {
-    CALL_Color3bv(GET_DISPATCH(), ((const GLbyte *) (pc + 0)
-                  ));
+    CALL_Color3bv( GET_DISPATCH(), (
+         (const GLbyte *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_Color3dv(GLbyte * pc)
+void __glXDisp_Color3dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 24);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 24);
         pc -= 4;
     }
 #endif
 
-    CALL_Color3dv(GET_DISPATCH(), ((const GLdouble *) (pc + 0)
-                  ));
+    CALL_Color3dv( GET_DISPATCH(), (
+         (const GLdouble *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_Color3fv(GLbyte * pc)
+void __glXDisp_Color3fv(GLbyte * pc)
 {
-    CALL_Color3fv(GET_DISPATCH(), ((const GLfloat *) (pc + 0)
-                  ));
+    CALL_Color3fv( GET_DISPATCH(), (
+         (const GLfloat *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_Color3iv(GLbyte * pc)
+void __glXDisp_Color3iv(GLbyte * pc)
 {
-    CALL_Color3iv(GET_DISPATCH(), ((const GLint *) (pc + 0)
-                  ));
+    CALL_Color3iv( GET_DISPATCH(), (
+         (const GLint *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_Color3sv(GLbyte * pc)
+void __glXDisp_Color3sv(GLbyte * pc)
 {
-    CALL_Color3sv(GET_DISPATCH(), ((const GLshort *) (pc + 0)
-                  ));
+    CALL_Color3sv( GET_DISPATCH(), (
+         (const GLshort *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_Color3ubv(GLbyte * pc)
+void __glXDisp_Color3ubv(GLbyte * pc)
 {
-    CALL_Color3ubv(GET_DISPATCH(), ((const GLubyte *) (pc + 0)
-                   ));
+    CALL_Color3ubv( GET_DISPATCH(), (
+         (const GLubyte *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_Color3uiv(GLbyte * pc)
+void __glXDisp_Color3uiv(GLbyte * pc)
 {
-    CALL_Color3uiv(GET_DISPATCH(), ((const GLuint *) (pc + 0)
-                   ));
+    CALL_Color3uiv( GET_DISPATCH(), (
+         (const GLuint *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_Color3usv(GLbyte * pc)
+void __glXDisp_Color3usv(GLbyte * pc)
 {
-    CALL_Color3usv(GET_DISPATCH(), ((const GLushort *) (pc + 0)
-                   ));
+    CALL_Color3usv( GET_DISPATCH(), (
+         (const GLushort *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_Color4bv(GLbyte * pc)
+void __glXDisp_Color4bv(GLbyte * pc)
 {
-    CALL_Color4bv(GET_DISPATCH(), ((const GLbyte *) (pc + 0)
-                  ));
+    CALL_Color4bv( GET_DISPATCH(), (
+         (const GLbyte *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_Color4dv(GLbyte * pc)
+void __glXDisp_Color4dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 32);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 32);
         pc -= 4;
     }
 #endif
 
-    CALL_Color4dv(GET_DISPATCH(), ((const GLdouble *) (pc + 0)
-                  ));
+    CALL_Color4dv( GET_DISPATCH(), (
+         (const GLdouble *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_Color4fv(GLbyte * pc)
+void __glXDisp_Color4fv(GLbyte * pc)
 {
-    CALL_Color4fv(GET_DISPATCH(), ((const GLfloat *) (pc + 0)
-                  ));
+    CALL_Color4fv( GET_DISPATCH(), (
+         (const GLfloat *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_Color4iv(GLbyte * pc)
+void __glXDisp_Color4iv(GLbyte * pc)
 {
-    CALL_Color4iv(GET_DISPATCH(), ((const GLint *) (pc + 0)
-                  ));
+    CALL_Color4iv( GET_DISPATCH(), (
+         (const GLint *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_Color4sv(GLbyte * pc)
+void __glXDisp_Color4sv(GLbyte * pc)
 {
-    CALL_Color4sv(GET_DISPATCH(), ((const GLshort *) (pc + 0)
-                  ));
+    CALL_Color4sv( GET_DISPATCH(), (
+         (const GLshort *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_Color4ubv(GLbyte * pc)
+void __glXDisp_Color4ubv(GLbyte * pc)
 {
-    CALL_Color4ubv(GET_DISPATCH(), ((const GLubyte *) (pc + 0)
-                   ));
+    CALL_Color4ubv( GET_DISPATCH(), (
+         (const GLubyte *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_Color4uiv(GLbyte * pc)
+void __glXDisp_Color4uiv(GLbyte * pc)
 {
-    CALL_Color4uiv(GET_DISPATCH(), ((const GLuint *) (pc + 0)
-                   ));
+    CALL_Color4uiv( GET_DISPATCH(), (
+         (const GLuint *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_Color4usv(GLbyte * pc)
+void __glXDisp_Color4usv(GLbyte * pc)
 {
-    CALL_Color4usv(GET_DISPATCH(), ((const GLushort *) (pc + 0)
-                   ));
+    CALL_Color4usv( GET_DISPATCH(), (
+         (const GLushort *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_EdgeFlagv(GLbyte * pc)
+void __glXDisp_EdgeFlagv(GLbyte * pc)
 {
-    CALL_EdgeFlagv(GET_DISPATCH(), ((const GLboolean *) (pc + 0)
-                   ));
+    CALL_EdgeFlagv( GET_DISPATCH(), (
+         (const GLboolean *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_End(GLbyte * pc)
+void __glXDisp_End(GLbyte * pc)
 {
-    CALL_End(GET_DISPATCH(), ());
+    CALL_End( GET_DISPATCH(), () );
 }
 
-void
-__glXDisp_Indexdv(GLbyte * pc)
+void __glXDisp_Indexdv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 8);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 8);
         pc -= 4;
     }
 #endif
 
-    CALL_Indexdv(GET_DISPATCH(), ((const GLdouble *) (pc + 0)
-                 ));
+    CALL_Indexdv( GET_DISPATCH(), (
+         (const GLdouble *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_Indexfv(GLbyte * pc)
+void __glXDisp_Indexfv(GLbyte * pc)
 {
-    CALL_Indexfv(GET_DISPATCH(), ((const GLfloat *) (pc + 0)
-                 ));
+    CALL_Indexfv( GET_DISPATCH(), (
+         (const GLfloat *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_Indexiv(GLbyte * pc)
+void __glXDisp_Indexiv(GLbyte * pc)
 {
-    CALL_Indexiv(GET_DISPATCH(), ((const GLint *) (pc + 0)
-                 ));
+    CALL_Indexiv( GET_DISPATCH(), (
+         (const GLint *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_Indexsv(GLbyte * pc)
+void __glXDisp_Indexsv(GLbyte * pc)
 {
-    CALL_Indexsv(GET_DISPATCH(), ((const GLshort *) (pc + 0)
-                 ));
+    CALL_Indexsv( GET_DISPATCH(), (
+         (const GLshort *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_Normal3bv(GLbyte * pc)
+void __glXDisp_Normal3bv(GLbyte * pc)
 {
-    CALL_Normal3bv(GET_DISPATCH(), ((const GLbyte *) (pc + 0)
-                   ));
+    CALL_Normal3bv( GET_DISPATCH(), (
+         (const GLbyte *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_Normal3dv(GLbyte * pc)
+void __glXDisp_Normal3dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 24);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 24);
         pc -= 4;
     }
 #endif
 
-    CALL_Normal3dv(GET_DISPATCH(), ((const GLdouble *) (pc + 0)
-                   ));
+    CALL_Normal3dv( GET_DISPATCH(), (
+         (const GLdouble *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_Normal3fv(GLbyte * pc)
+void __glXDisp_Normal3fv(GLbyte * pc)
 {
-    CALL_Normal3fv(GET_DISPATCH(), ((const GLfloat *) (pc + 0)
-                   ));
+    CALL_Normal3fv( GET_DISPATCH(), (
+         (const GLfloat *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_Normal3iv(GLbyte * pc)
+void __glXDisp_Normal3iv(GLbyte * pc)
 {
-    CALL_Normal3iv(GET_DISPATCH(), ((const GLint *) (pc + 0)
-                   ));
+    CALL_Normal3iv( GET_DISPATCH(), (
+         (const GLint *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_Normal3sv(GLbyte * pc)
+void __glXDisp_Normal3sv(GLbyte * pc)
 {
-    CALL_Normal3sv(GET_DISPATCH(), ((const GLshort *) (pc + 0)
-                   ));
+    CALL_Normal3sv( GET_DISPATCH(), (
+         (const GLshort *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_RasterPos2dv(GLbyte * pc)
+void __glXDisp_RasterPos2dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 16);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 16);
         pc -= 4;
     }
 #endif
 
-    CALL_RasterPos2dv(GET_DISPATCH(), ((const GLdouble *) (pc + 0)
-                      ));
+    CALL_RasterPos2dv( GET_DISPATCH(), (
+         (const GLdouble *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_RasterPos2fv(GLbyte * pc)
+void __glXDisp_RasterPos2fv(GLbyte * pc)
 {
-    CALL_RasterPos2fv(GET_DISPATCH(), ((const GLfloat *) (pc + 0)
-                      ));
+    CALL_RasterPos2fv( GET_DISPATCH(), (
+         (const GLfloat *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_RasterPos2iv(GLbyte * pc)
+void __glXDisp_RasterPos2iv(GLbyte * pc)
 {
-    CALL_RasterPos2iv(GET_DISPATCH(), ((const GLint *) (pc + 0)
-                      ));
+    CALL_RasterPos2iv( GET_DISPATCH(), (
+         (const GLint *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_RasterPos2sv(GLbyte * pc)
+void __glXDisp_RasterPos2sv(GLbyte * pc)
 {
-    CALL_RasterPos2sv(GET_DISPATCH(), ((const GLshort *) (pc + 0)
-                      ));
+    CALL_RasterPos2sv( GET_DISPATCH(), (
+         (const GLshort *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_RasterPos3dv(GLbyte * pc)
+void __glXDisp_RasterPos3dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 24);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 24);
         pc -= 4;
     }
 #endif
 
-    CALL_RasterPos3dv(GET_DISPATCH(), ((const GLdouble *) (pc + 0)
-                      ));
+    CALL_RasterPos3dv( GET_DISPATCH(), (
+         (const GLdouble *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_RasterPos3fv(GLbyte * pc)
+void __glXDisp_RasterPos3fv(GLbyte * pc)
 {
-    CALL_RasterPos3fv(GET_DISPATCH(), ((const GLfloat *) (pc + 0)
-                      ));
+    CALL_RasterPos3fv( GET_DISPATCH(), (
+         (const GLfloat *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_RasterPos3iv(GLbyte * pc)
+void __glXDisp_RasterPos3iv(GLbyte * pc)
 {
-    CALL_RasterPos3iv(GET_DISPATCH(), ((const GLint *) (pc + 0)
-                      ));
+    CALL_RasterPos3iv( GET_DISPATCH(), (
+         (const GLint *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_RasterPos3sv(GLbyte * pc)
+void __glXDisp_RasterPos3sv(GLbyte * pc)
 {
-    CALL_RasterPos3sv(GET_DISPATCH(), ((const GLshort *) (pc + 0)
-                      ));
+    CALL_RasterPos3sv( GET_DISPATCH(), (
+         (const GLshort *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_RasterPos4dv(GLbyte * pc)
+void __glXDisp_RasterPos4dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 32);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 32);
         pc -= 4;
     }
 #endif
 
-    CALL_RasterPos4dv(GET_DISPATCH(), ((const GLdouble *) (pc + 0)
-                      ));
+    CALL_RasterPos4dv( GET_DISPATCH(), (
+         (const GLdouble *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_RasterPos4fv(GLbyte * pc)
+void __glXDisp_RasterPos4fv(GLbyte * pc)
 {
-    CALL_RasterPos4fv(GET_DISPATCH(), ((const GLfloat *) (pc + 0)
-                      ));
+    CALL_RasterPos4fv( GET_DISPATCH(), (
+         (const GLfloat *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_RasterPos4iv(GLbyte * pc)
+void __glXDisp_RasterPos4iv(GLbyte * pc)
 {
-    CALL_RasterPos4iv(GET_DISPATCH(), ((const GLint *) (pc + 0)
-                      ));
+    CALL_RasterPos4iv( GET_DISPATCH(), (
+         (const GLint *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_RasterPos4sv(GLbyte * pc)
+void __glXDisp_RasterPos4sv(GLbyte * pc)
 {
-    CALL_RasterPos4sv(GET_DISPATCH(), ((const GLshort *) (pc + 0)
-                      ));
+    CALL_RasterPos4sv( GET_DISPATCH(), (
+         (const GLshort *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_Rectdv(GLbyte * pc)
+void __glXDisp_Rectdv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 32);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 32);
         pc -= 4;
     }
 #endif
 
-    CALL_Rectdv(GET_DISPATCH(), ((const GLdouble *) (pc + 0),
-                                 (const GLdouble *) (pc + 16)
-                ));
+    CALL_Rectdv( GET_DISPATCH(), (
+         (const GLdouble *)(pc +  0),
+         (const GLdouble *)(pc + 16)
+    ) );
 }
 
-void
-__glXDisp_Rectfv(GLbyte * pc)
+void __glXDisp_Rectfv(GLbyte * pc)
 {
-    CALL_Rectfv(GET_DISPATCH(), ((const GLfloat *) (pc + 0),
-                                 (const GLfloat *) (pc + 8)
-                ));
+    CALL_Rectfv( GET_DISPATCH(), (
+         (const GLfloat *)(pc +  0),
+         (const GLfloat *)(pc +  8)
+    ) );
 }
 
-void
-__glXDisp_Rectiv(GLbyte * pc)
+void __glXDisp_Rectiv(GLbyte * pc)
 {
-    CALL_Rectiv(GET_DISPATCH(), ((const GLint *) (pc + 0),
-                                 (const GLint *) (pc + 8)
-                ));
+    CALL_Rectiv( GET_DISPATCH(), (
+         (const GLint *)(pc +  0),
+         (const GLint *)(pc +  8)
+    ) );
 }
 
-void
-__glXDisp_Rectsv(GLbyte * pc)
+void __glXDisp_Rectsv(GLbyte * pc)
 {
-    CALL_Rectsv(GET_DISPATCH(), ((const GLshort *) (pc + 0),
-                                 (const GLshort *) (pc + 4)
-                ));
+    CALL_Rectsv( GET_DISPATCH(), (
+         (const GLshort *)(pc +  0),
+         (const GLshort *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_TexCoord1dv(GLbyte * pc)
+void __glXDisp_TexCoord1dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 8);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 8);
         pc -= 4;
     }
 #endif
 
-    CALL_TexCoord1dv(GET_DISPATCH(), ((const GLdouble *) (pc + 0)
-                     ));
+    CALL_TexCoord1dv( GET_DISPATCH(), (
+         (const GLdouble *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_TexCoord1fv(GLbyte * pc)
+void __glXDisp_TexCoord1fv(GLbyte * pc)
 {
-    CALL_TexCoord1fv(GET_DISPATCH(), ((const GLfloat *) (pc + 0)
-                     ));
+    CALL_TexCoord1fv( GET_DISPATCH(), (
+         (const GLfloat *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_TexCoord1iv(GLbyte * pc)
+void __glXDisp_TexCoord1iv(GLbyte * pc)
 {
-    CALL_TexCoord1iv(GET_DISPATCH(), ((const GLint *) (pc + 0)
-                     ));
+    CALL_TexCoord1iv( GET_DISPATCH(), (
+         (const GLint *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_TexCoord1sv(GLbyte * pc)
+void __glXDisp_TexCoord1sv(GLbyte * pc)
 {
-    CALL_TexCoord1sv(GET_DISPATCH(), ((const GLshort *) (pc + 0)
-                     ));
+    CALL_TexCoord1sv( GET_DISPATCH(), (
+         (const GLshort *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_TexCoord2dv(GLbyte * pc)
+void __glXDisp_TexCoord2dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 16);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 16);
         pc -= 4;
     }
 #endif
 
-    CALL_TexCoord2dv(GET_DISPATCH(), ((const GLdouble *) (pc + 0)
-                     ));
+    CALL_TexCoord2dv( GET_DISPATCH(), (
+         (const GLdouble *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_TexCoord2fv(GLbyte * pc)
+void __glXDisp_TexCoord2fv(GLbyte * pc)
 {
-    CALL_TexCoord2fv(GET_DISPATCH(), ((const GLfloat *) (pc + 0)
-                     ));
+    CALL_TexCoord2fv( GET_DISPATCH(), (
+         (const GLfloat *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_TexCoord2iv(GLbyte * pc)
+void __glXDisp_TexCoord2iv(GLbyte * pc)
 {
-    CALL_TexCoord2iv(GET_DISPATCH(), ((const GLint *) (pc + 0)
-                     ));
+    CALL_TexCoord2iv( GET_DISPATCH(), (
+         (const GLint *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_TexCoord2sv(GLbyte * pc)
+void __glXDisp_TexCoord2sv(GLbyte * pc)
 {
-    CALL_TexCoord2sv(GET_DISPATCH(), ((const GLshort *) (pc + 0)
-                     ));
+    CALL_TexCoord2sv( GET_DISPATCH(), (
+         (const GLshort *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_TexCoord3dv(GLbyte * pc)
+void __glXDisp_TexCoord3dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 24);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 24);
         pc -= 4;
     }
 #endif
 
-    CALL_TexCoord3dv(GET_DISPATCH(), ((const GLdouble *) (pc + 0)
-                     ));
+    CALL_TexCoord3dv( GET_DISPATCH(), (
+         (const GLdouble *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_TexCoord3fv(GLbyte * pc)
+void __glXDisp_TexCoord3fv(GLbyte * pc)
 {
-    CALL_TexCoord3fv(GET_DISPATCH(), ((const GLfloat *) (pc + 0)
-                     ));
+    CALL_TexCoord3fv( GET_DISPATCH(), (
+         (const GLfloat *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_TexCoord3iv(GLbyte * pc)
+void __glXDisp_TexCoord3iv(GLbyte * pc)
 {
-    CALL_TexCoord3iv(GET_DISPATCH(), ((const GLint *) (pc + 0)
-                     ));
+    CALL_TexCoord3iv( GET_DISPATCH(), (
+         (const GLint *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_TexCoord3sv(GLbyte * pc)
+void __glXDisp_TexCoord3sv(GLbyte * pc)
 {
-    CALL_TexCoord3sv(GET_DISPATCH(), ((const GLshort *) (pc + 0)
-                     ));
+    CALL_TexCoord3sv( GET_DISPATCH(), (
+         (const GLshort *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_TexCoord4dv(GLbyte * pc)
+void __glXDisp_TexCoord4dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 32);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 32);
         pc -= 4;
     }
 #endif
 
-    CALL_TexCoord4dv(GET_DISPATCH(), ((const GLdouble *) (pc + 0)
-                     ));
+    CALL_TexCoord4dv( GET_DISPATCH(), (
+         (const GLdouble *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_TexCoord4fv(GLbyte * pc)
+void __glXDisp_TexCoord4fv(GLbyte * pc)
 {
-    CALL_TexCoord4fv(GET_DISPATCH(), ((const GLfloat *) (pc + 0)
-                     ));
+    CALL_TexCoord4fv( GET_DISPATCH(), (
+         (const GLfloat *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_TexCoord4iv(GLbyte * pc)
+void __glXDisp_TexCoord4iv(GLbyte * pc)
 {
-    CALL_TexCoord4iv(GET_DISPATCH(), ((const GLint *) (pc + 0)
-                     ));
+    CALL_TexCoord4iv( GET_DISPATCH(), (
+         (const GLint *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_TexCoord4sv(GLbyte * pc)
+void __glXDisp_TexCoord4sv(GLbyte * pc)
 {
-    CALL_TexCoord4sv(GET_DISPATCH(), ((const GLshort *) (pc + 0)
-                     ));
+    CALL_TexCoord4sv( GET_DISPATCH(), (
+         (const GLshort *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_Vertex2dv(GLbyte * pc)
+void __glXDisp_Vertex2dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 16);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 16);
         pc -= 4;
     }
 #endif
 
-    CALL_Vertex2dv(GET_DISPATCH(), ((const GLdouble *) (pc + 0)
-                   ));
+    CALL_Vertex2dv( GET_DISPATCH(), (
+         (const GLdouble *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_Vertex2fv(GLbyte * pc)
+void __glXDisp_Vertex2fv(GLbyte * pc)
 {
-    CALL_Vertex2fv(GET_DISPATCH(), ((const GLfloat *) (pc + 0)
-                   ));
+    CALL_Vertex2fv( GET_DISPATCH(), (
+         (const GLfloat *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_Vertex2iv(GLbyte * pc)
+void __glXDisp_Vertex2iv(GLbyte * pc)
 {
-    CALL_Vertex2iv(GET_DISPATCH(), ((const GLint *) (pc + 0)
-                   ));
+    CALL_Vertex2iv( GET_DISPATCH(), (
+         (const GLint *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_Vertex2sv(GLbyte * pc)
+void __glXDisp_Vertex2sv(GLbyte * pc)
 {
-    CALL_Vertex2sv(GET_DISPATCH(), ((const GLshort *) (pc + 0)
-                   ));
+    CALL_Vertex2sv( GET_DISPATCH(), (
+         (const GLshort *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_Vertex3dv(GLbyte * pc)
+void __glXDisp_Vertex3dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 24);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 24);
         pc -= 4;
     }
 #endif
 
-    CALL_Vertex3dv(GET_DISPATCH(), ((const GLdouble *) (pc + 0)
-                   ));
+    CALL_Vertex3dv( GET_DISPATCH(), (
+         (const GLdouble *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_Vertex3fv(GLbyte * pc)
+void __glXDisp_Vertex3fv(GLbyte * pc)
 {
-    CALL_Vertex3fv(GET_DISPATCH(), ((const GLfloat *) (pc + 0)
-                   ));
+    CALL_Vertex3fv( GET_DISPATCH(), (
+         (const GLfloat *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_Vertex3iv(GLbyte * pc)
+void __glXDisp_Vertex3iv(GLbyte * pc)
 {
-    CALL_Vertex3iv(GET_DISPATCH(), ((const GLint *) (pc + 0)
-                   ));
+    CALL_Vertex3iv( GET_DISPATCH(), (
+         (const GLint *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_Vertex3sv(GLbyte * pc)
+void __glXDisp_Vertex3sv(GLbyte * pc)
 {
-    CALL_Vertex3sv(GET_DISPATCH(), ((const GLshort *) (pc + 0)
-                   ));
+    CALL_Vertex3sv( GET_DISPATCH(), (
+         (const GLshort *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_Vertex4dv(GLbyte * pc)
+void __glXDisp_Vertex4dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 32);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 32);
         pc -= 4;
     }
 #endif
 
-    CALL_Vertex4dv(GET_DISPATCH(), ((const GLdouble *) (pc + 0)
-                   ));
+    CALL_Vertex4dv( GET_DISPATCH(), (
+         (const GLdouble *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_Vertex4fv(GLbyte * pc)
+void __glXDisp_Vertex4fv(GLbyte * pc)
 {
-    CALL_Vertex4fv(GET_DISPATCH(), ((const GLfloat *) (pc + 0)
-                   ));
+    CALL_Vertex4fv( GET_DISPATCH(), (
+         (const GLfloat *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_Vertex4iv(GLbyte * pc)
+void __glXDisp_Vertex4iv(GLbyte * pc)
 {
-    CALL_Vertex4iv(GET_DISPATCH(), ((const GLint *) (pc + 0)
-                   ));
+    CALL_Vertex4iv( GET_DISPATCH(), (
+         (const GLint *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_Vertex4sv(GLbyte * pc)
+void __glXDisp_Vertex4sv(GLbyte * pc)
 {
-    CALL_Vertex4sv(GET_DISPATCH(), ((const GLshort *) (pc + 0)
-                   ));
+    CALL_Vertex4sv( GET_DISPATCH(), (
+         (const GLshort *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_ClipPlane(GLbyte * pc)
+void __glXDisp_ClipPlane(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 36);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 36);
         pc -= 4;
     }
 #endif
 
-    CALL_ClipPlane(GET_DISPATCH(), (*(GLenum *) (pc + 32),
-                                    (const GLdouble *) (pc + 0)
-                   ));
+    CALL_ClipPlane( GET_DISPATCH(), (
+        *(GLenum   *)(pc + 32),
+         (const GLdouble *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_ColorMaterial(GLbyte * pc)
+void __glXDisp_ColorMaterial(GLbyte * pc)
 {
-    CALL_ColorMaterial(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                        *(GLenum *) (pc + 4)
-                       ));
+    CALL_ColorMaterial( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLenum   *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_CullFace(GLbyte * pc)
+void __glXDisp_CullFace(GLbyte * pc)
 {
-    CALL_CullFace(GET_DISPATCH(), (*(GLenum *) (pc + 0)
-                  ));
+    CALL_CullFace( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_Fogf(GLbyte * pc)
+void __glXDisp_Fogf(GLbyte * pc)
 {
-    CALL_Fogf(GET_DISPATCH(), (*(GLenum *) (pc + 0), *(GLfloat *) (pc + 4)
-              ));
+    CALL_Fogf( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLfloat  *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_Fogfv(GLbyte * pc)
+void __glXDisp_Fogfv(GLbyte * pc)
 {
-    const GLenum pname = *(GLenum *) (pc + 0);
-    const GLfloat *params;
+    const GLenum pname = *(GLenum   *)(pc +  0);
+    const GLfloat * params;
 
     params = (const GLfloat *) (pc + 4);
 
-    CALL_Fogfv(GET_DISPATCH(), (pname, params));
+    CALL_Fogfv( GET_DISPATCH(), (
+        pname,
+        params
+    ) );
 }
 
-void
-__glXDisp_Fogi(GLbyte * pc)
+void __glXDisp_Fogi(GLbyte * pc)
 {
-    CALL_Fogi(GET_DISPATCH(), (*(GLenum *) (pc + 0), *(GLint *) (pc + 4)
-              ));
+    CALL_Fogi( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLint    *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_Fogiv(GLbyte * pc)
+void __glXDisp_Fogiv(GLbyte * pc)
 {
-    const GLenum pname = *(GLenum *) (pc + 0);
-    const GLint *params;
+    const GLenum pname = *(GLenum   *)(pc +  0);
+    const GLint * params;
 
     params = (const GLint *) (pc + 4);
 
-    CALL_Fogiv(GET_DISPATCH(), (pname, params));
+    CALL_Fogiv( GET_DISPATCH(), (
+        pname,
+        params
+    ) );
 }
 
-void
-__glXDisp_FrontFace(GLbyte * pc)
+void __glXDisp_FrontFace(GLbyte * pc)
 {
-    CALL_FrontFace(GET_DISPATCH(), (*(GLenum *) (pc + 0)
-                   ));
+    CALL_FrontFace( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_Hint(GLbyte * pc)
+void __glXDisp_Hint(GLbyte * pc)
 {
-    CALL_Hint(GET_DISPATCH(), (*(GLenum *) (pc + 0), *(GLenum *) (pc + 4)
-              ));
+    CALL_Hint( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLenum   *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_Lightf(GLbyte * pc)
+void __glXDisp_Lightf(GLbyte * pc)
 {
-    CALL_Lightf(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                 *(GLenum *) (pc + 4), *(GLfloat *) (pc + 8)
-                ));
+    CALL_Lightf( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLenum   *)(pc +  4),
+        *(GLfloat  *)(pc +  8)
+    ) );
 }
 
-void
-__glXDisp_Lightfv(GLbyte * pc)
+void __glXDisp_Lightfv(GLbyte * pc)
 {
-    const GLenum pname = *(GLenum *) (pc + 4);
-    const GLfloat *params;
+    const GLenum pname = *(GLenum   *)(pc +  4);
+    const GLfloat * params;
 
     params = (const GLfloat *) (pc + 8);
 
-    CALL_Lightfv(GET_DISPATCH(), (*(GLenum *) (pc + 0), pname, params));
+    CALL_Lightfv( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        pname,
+        params
+    ) );
 }
 
-void
-__glXDisp_Lighti(GLbyte * pc)
+void __glXDisp_Lighti(GLbyte * pc)
 {
-    CALL_Lighti(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                 *(GLenum *) (pc + 4), *(GLint *) (pc + 8)
-                ));
+    CALL_Lighti( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLenum   *)(pc +  4),
+        *(GLint    *)(pc +  8)
+    ) );
 }
 
-void
-__glXDisp_Lightiv(GLbyte * pc)
+void __glXDisp_Lightiv(GLbyte * pc)
 {
-    const GLenum pname = *(GLenum *) (pc + 4);
-    const GLint *params;
+    const GLenum pname = *(GLenum   *)(pc +  4);
+    const GLint * params;
 
     params = (const GLint *) (pc + 8);
 
-    CALL_Lightiv(GET_DISPATCH(), (*(GLenum *) (pc + 0), pname, params));
+    CALL_Lightiv( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        pname,
+        params
+    ) );
 }
 
-void
-__glXDisp_LightModelf(GLbyte * pc)
+void __glXDisp_LightModelf(GLbyte * pc)
 {
-    CALL_LightModelf(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                      *(GLfloat *) (pc + 4)
-                     ));
+    CALL_LightModelf( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLfloat  *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_LightModelfv(GLbyte * pc)
+void __glXDisp_LightModelfv(GLbyte * pc)
 {
-    const GLenum pname = *(GLenum *) (pc + 0);
-    const GLfloat *params;
+    const GLenum pname = *(GLenum   *)(pc +  0);
+    const GLfloat * params;
 
     params = (const GLfloat *) (pc + 4);
 
-    CALL_LightModelfv(GET_DISPATCH(), (pname, params));
+    CALL_LightModelfv( GET_DISPATCH(), (
+        pname,
+        params
+    ) );
 }
 
-void
-__glXDisp_LightModeli(GLbyte * pc)
+void __glXDisp_LightModeli(GLbyte * pc)
 {
-    CALL_LightModeli(GET_DISPATCH(), (*(GLenum *) (pc + 0), *(GLint *) (pc + 4)
-                     ));
+    CALL_LightModeli( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLint    *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_LightModeliv(GLbyte * pc)
+void __glXDisp_LightModeliv(GLbyte * pc)
 {
-    const GLenum pname = *(GLenum *) (pc + 0);
-    const GLint *params;
+    const GLenum pname = *(GLenum   *)(pc +  0);
+    const GLint * params;
 
     params = (const GLint *) (pc + 4);
 
-    CALL_LightModeliv(GET_DISPATCH(), (pname, params));
+    CALL_LightModeliv( GET_DISPATCH(), (
+        pname,
+        params
+    ) );
 }
 
-void
-__glXDisp_LineStipple(GLbyte * pc)
+void __glXDisp_LineStipple(GLbyte * pc)
 {
-    CALL_LineStipple(GET_DISPATCH(), (*(GLint *) (pc + 0),
-                                      *(GLushort *) (pc + 4)
-                     ));
+    CALL_LineStipple( GET_DISPATCH(), (
+        *(GLint    *)(pc +  0),
+        *(GLushort *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_LineWidth(GLbyte * pc)
+void __glXDisp_LineWidth(GLbyte * pc)
 {
-    CALL_LineWidth(GET_DISPATCH(), (*(GLfloat *) (pc + 0)
-                   ));
+    CALL_LineWidth( GET_DISPATCH(), (
+        *(GLfloat  *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_Materialf(GLbyte * pc)
+void __glXDisp_Materialf(GLbyte * pc)
 {
-    CALL_Materialf(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                    *(GLenum *) (pc + 4), *(GLfloat *) (pc + 8)
-                   ));
+    CALL_Materialf( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLenum   *)(pc +  4),
+        *(GLfloat  *)(pc +  8)
+    ) );
 }
 
-void
-__glXDisp_Materialfv(GLbyte * pc)
+void __glXDisp_Materialfv(GLbyte * pc)
 {
-    const GLenum pname = *(GLenum *) (pc + 4);
-    const GLfloat *params;
+    const GLenum pname = *(GLenum   *)(pc +  4);
+    const GLfloat * params;
 
     params = (const GLfloat *) (pc + 8);
 
-    CALL_Materialfv(GET_DISPATCH(), (*(GLenum *) (pc + 0), pname, params));
+    CALL_Materialfv( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        pname,
+        params
+    ) );
 }
 
-void
-__glXDisp_Materiali(GLbyte * pc)
+void __glXDisp_Materiali(GLbyte * pc)
 {
-    CALL_Materiali(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                    *(GLenum *) (pc + 4), *(GLint *) (pc + 8)
-                   ));
+    CALL_Materiali( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLenum   *)(pc +  4),
+        *(GLint    *)(pc +  8)
+    ) );
 }
 
-void
-__glXDisp_Materialiv(GLbyte * pc)
+void __glXDisp_Materialiv(GLbyte * pc)
 {
-    const GLenum pname = *(GLenum *) (pc + 4);
-    const GLint *params;
+    const GLenum pname = *(GLenum   *)(pc +  4);
+    const GLint * params;
 
     params = (const GLint *) (pc + 8);
 
-    CALL_Materialiv(GET_DISPATCH(), (*(GLenum *) (pc + 0), pname, params));
+    CALL_Materialiv( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        pname,
+        params
+    ) );
 }
 
-void
-__glXDisp_PointSize(GLbyte * pc)
+void __glXDisp_PointSize(GLbyte * pc)
 {
-    CALL_PointSize(GET_DISPATCH(), (*(GLfloat *) (pc + 0)
-                   ));
+    CALL_PointSize( GET_DISPATCH(), (
+        *(GLfloat  *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_PolygonMode(GLbyte * pc)
+void __glXDisp_PolygonMode(GLbyte * pc)
 {
-    CALL_PolygonMode(GET_DISPATCH(), (*(GLenum *) (pc + 0), *(GLenum *) (pc + 4)
-                     ));
+    CALL_PolygonMode( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLenum   *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_PolygonStipple(GLbyte * pc)
+void __glXDisp_PolygonStipple(GLbyte * pc)
 {
-    const GLubyte *const mask = (const GLubyte *) ((pc + 20));
-    __GLXpixelHeader *const hdr = (__GLXpixelHeader *) (pc);
+    const GLubyte * const mask = (const GLubyte *) (pc + 20);
+    __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment));
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST,    hdr->lsbFirst) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,   (GLint) hdr->rowLength) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,    (GLint) hdr->skipRows) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,  (GLint) hdr->skipPixels) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT,    (GLint) hdr->alignment) );
 
-    CALL_PolygonStipple(GET_DISPATCH(), (mask));
+    CALL_PolygonStipple( GET_DISPATCH(), (
+        mask
+    ) );
 }
 
-void
-__glXDisp_Scissor(GLbyte * pc)
+void __glXDisp_Scissor(GLbyte * pc)
 {
-    CALL_Scissor(GET_DISPATCH(), (*(GLint *) (pc + 0),
-                                  *(GLint *) (pc + 4),
-                                  *(GLsizei *) (pc + 8), *(GLsizei *) (pc + 12)
-                 ));
+    CALL_Scissor( GET_DISPATCH(), (
+        *(GLint    *)(pc +  0),
+        *(GLint    *)(pc +  4),
+        *(GLsizei  *)(pc +  8),
+        *(GLsizei  *)(pc + 12)
+    ) );
 }
 
-void
-__glXDisp_ShadeModel(GLbyte * pc)
+void __glXDisp_ShadeModel(GLbyte * pc)
 {
-    CALL_ShadeModel(GET_DISPATCH(), (*(GLenum *) (pc + 0)
-                    ));
+    CALL_ShadeModel( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_TexParameterf(GLbyte * pc)
+void __glXDisp_TexParameterf(GLbyte * pc)
 {
-    CALL_TexParameterf(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                        *(GLenum *) (pc + 4),
-                                        *(GLfloat *) (pc + 8)
-                       ));
+    CALL_TexParameterf( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLenum   *)(pc +  4),
+        *(GLfloat  *)(pc +  8)
+    ) );
 }
 
-void
-__glXDisp_TexParameterfv(GLbyte * pc)
+void __glXDisp_TexParameterfv(GLbyte * pc)
 {
-    const GLenum pname = *(GLenum *) (pc + 4);
-    const GLfloat *params;
+    const GLenum pname = *(GLenum   *)(pc +  4);
+    const GLfloat * params;
 
     params = (const GLfloat *) (pc + 8);
 
-    CALL_TexParameterfv(GET_DISPATCH(), (*(GLenum *) (pc + 0), pname, params));
+    CALL_TexParameterfv( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        pname,
+        params
+    ) );
 }
 
-void
-__glXDisp_TexParameteri(GLbyte * pc)
+void __glXDisp_TexParameteri(GLbyte * pc)
 {
-    CALL_TexParameteri(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                        *(GLenum *) (pc + 4),
-                                        *(GLint *) (pc + 8)
-                       ));
+    CALL_TexParameteri( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLenum   *)(pc +  4),
+        *(GLint    *)(pc +  8)
+    ) );
 }
 
-void
-__glXDisp_TexParameteriv(GLbyte * pc)
+void __glXDisp_TexParameteriv(GLbyte * pc)
 {
-    const GLenum pname = *(GLenum *) (pc + 4);
-    const GLint *params;
+    const GLenum pname = *(GLenum   *)(pc +  4);
+    const GLint * params;
 
     params = (const GLint *) (pc + 8);
 
-    CALL_TexParameteriv(GET_DISPATCH(), (*(GLenum *) (pc + 0), pname, params));
+    CALL_TexParameteriv( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        pname,
+        params
+    ) );
 }
 
-void
-__glXDisp_TexImage1D(GLbyte * pc)
+void __glXDisp_TexImage1D(GLbyte * pc)
 {
-    const GLvoid *const pixels = (const GLvoid *) ((pc + 52));
-    __GLXpixelHeader *const hdr = (__GLXpixelHeader *) (pc);
+    const GLvoid * const pixels = (const GLvoid *) (pc + 52);
+    __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment));
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES,   hdr->swapBytes) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST,    hdr->lsbFirst) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,   (GLint) hdr->rowLength) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,    (GLint) hdr->skipRows) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,  (GLint) hdr->skipPixels) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT,    (GLint) hdr->alignment) );
 
-    CALL_TexImage1D(GET_DISPATCH(), (*(GLenum *) (pc + 20),
-                                     *(GLint *) (pc + 24),
-                                     *(GLint *) (pc + 28),
-                                     *(GLsizei *) (pc + 32),
-                                     *(GLint *) (pc + 40),
-                                     *(GLenum *) (pc + 44),
-                                     *(GLenum *) (pc + 48), pixels));
+    CALL_TexImage1D( GET_DISPATCH(), (
+        *(GLenum   *)(pc + 20),
+        *(GLint    *)(pc + 24),
+        *(GLint    *)(pc + 28),
+        *(GLsizei  *)(pc + 32),
+        *(GLint    *)(pc + 40),
+        *(GLenum   *)(pc + 44),
+        *(GLenum   *)(pc + 48),
+        pixels
+    ) );
 }
 
-void
-__glXDisp_TexImage2D(GLbyte * pc)
+void __glXDisp_TexImage2D(GLbyte * pc)
 {
-    const GLvoid *const pixels = (const GLvoid *) ((pc + 52));
-    __GLXpixelHeader *const hdr = (__GLXpixelHeader *) (pc);
+    const GLvoid * const pixels = (const GLvoid *) (pc + 52);
+    __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment));
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES,   hdr->swapBytes) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST,    hdr->lsbFirst) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,   (GLint) hdr->rowLength) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,    (GLint) hdr->skipRows) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,  (GLint) hdr->skipPixels) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT,    (GLint) hdr->alignment) );
 
-    CALL_TexImage2D(GET_DISPATCH(), (*(GLenum *) (pc + 20),
-                                     *(GLint *) (pc + 24),
-                                     *(GLint *) (pc + 28),
-                                     *(GLsizei *) (pc + 32),
-                                     *(GLsizei *) (pc + 36),
-                                     *(GLint *) (pc + 40),
-                                     *(GLenum *) (pc + 44),
-                                     *(GLenum *) (pc + 48), pixels));
+    CALL_TexImage2D( GET_DISPATCH(), (
+        *(GLenum   *)(pc + 20),
+        *(GLint    *)(pc + 24),
+        *(GLint    *)(pc + 28),
+        *(GLsizei  *)(pc + 32),
+        *(GLsizei  *)(pc + 36),
+        *(GLint    *)(pc + 40),
+        *(GLenum   *)(pc + 44),
+        *(GLenum   *)(pc + 48),
+        pixels
+    ) );
 }
 
-void
-__glXDisp_TexEnvf(GLbyte * pc)
+void __glXDisp_TexEnvf(GLbyte * pc)
 {
-    CALL_TexEnvf(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                  *(GLenum *) (pc + 4), *(GLfloat *) (pc + 8)
-                 ));
+    CALL_TexEnvf( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLenum   *)(pc +  4),
+        *(GLfloat  *)(pc +  8)
+    ) );
 }
 
-void
-__glXDisp_TexEnvfv(GLbyte * pc)
+void __glXDisp_TexEnvfv(GLbyte * pc)
 {
-    const GLenum pname = *(GLenum *) (pc + 4);
-    const GLfloat *params;
+    const GLenum pname = *(GLenum   *)(pc +  4);
+    const GLfloat * params;
 
     params = (const GLfloat *) (pc + 8);
 
-    CALL_TexEnvfv(GET_DISPATCH(), (*(GLenum *) (pc + 0), pname, params));
+    CALL_TexEnvfv( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        pname,
+        params
+    ) );
 }
 
-void
-__glXDisp_TexEnvi(GLbyte * pc)
+void __glXDisp_TexEnvi(GLbyte * pc)
 {
-    CALL_TexEnvi(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                  *(GLenum *) (pc + 4), *(GLint *) (pc + 8)
-                 ));
+    CALL_TexEnvi( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLenum   *)(pc +  4),
+        *(GLint    *)(pc +  8)
+    ) );
 }
 
-void
-__glXDisp_TexEnviv(GLbyte * pc)
+void __glXDisp_TexEnviv(GLbyte * pc)
 {
-    const GLenum pname = *(GLenum *) (pc + 4);
-    const GLint *params;
+    const GLenum pname = *(GLenum   *)(pc +  4);
+    const GLint * params;
 
     params = (const GLint *) (pc + 8);
 
-    CALL_TexEnviv(GET_DISPATCH(), (*(GLenum *) (pc + 0), pname, params));
+    CALL_TexEnviv( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        pname,
+        params
+    ) );
 }
 
-void
-__glXDisp_TexGend(GLbyte * pc)
+void __glXDisp_TexGend(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 16);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 16);
         pc -= 4;
     }
 #endif
 
-    CALL_TexGend(GET_DISPATCH(), (*(GLenum *) (pc + 8),
-                                  *(GLenum *) (pc + 12), *(GLdouble *) (pc + 0)
-                 ));
+    CALL_TexGend( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  8),
+        *(GLenum   *)(pc + 12),
+        *(GLdouble *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_TexGendv(GLbyte * pc)
+void __glXDisp_TexGendv(GLbyte * pc)
 {
-    const GLenum pname = *(GLenum *) (pc + 4);
-    const GLdouble *params;
+    const GLenum pname = *(GLenum   *)(pc +  4);
+    const GLdouble * params;
 
 #ifdef __GLX_ALIGN64
     const GLuint compsize = __glTexGendv_size(pname);
     const GLuint cmdlen = 12 + __GLX_PAD((compsize * 8)) - 4;
-
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, cmdlen);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, cmdlen);
         pc -= 4;
     }
 #endif
 
     params = (const GLdouble *) (pc + 8);
 
-    CALL_TexGendv(GET_DISPATCH(), (*(GLenum *) (pc + 0), pname, params));
+    CALL_TexGendv( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        pname,
+        params
+    ) );
 }
 
-void
-__glXDisp_TexGenf(GLbyte * pc)
+void __glXDisp_TexGenf(GLbyte * pc)
 {
-    CALL_TexGenf(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                  *(GLenum *) (pc + 4), *(GLfloat *) (pc + 8)
-                 ));
+    CALL_TexGenf( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLenum   *)(pc +  4),
+        *(GLfloat  *)(pc +  8)
+    ) );
 }
 
-void
-__glXDisp_TexGenfv(GLbyte * pc)
+void __glXDisp_TexGenfv(GLbyte * pc)
 {
-    const GLenum pname = *(GLenum *) (pc + 4);
-    const GLfloat *params;
+    const GLenum pname = *(GLenum   *)(pc +  4);
+    const GLfloat * params;
 
     params = (const GLfloat *) (pc + 8);
 
-    CALL_TexGenfv(GET_DISPATCH(), (*(GLenum *) (pc + 0), pname, params));
+    CALL_TexGenfv( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        pname,
+        params
+    ) );
 }
 
-void
-__glXDisp_TexGeni(GLbyte * pc)
+void __glXDisp_TexGeni(GLbyte * pc)
 {
-    CALL_TexGeni(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                  *(GLenum *) (pc + 4), *(GLint *) (pc + 8)
-                 ));
+    CALL_TexGeni( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLenum   *)(pc +  4),
+        *(GLint    *)(pc +  8)
+    ) );
 }
 
-void
-__glXDisp_TexGeniv(GLbyte * pc)
+void __glXDisp_TexGeniv(GLbyte * pc)
 {
-    const GLenum pname = *(GLenum *) (pc + 4);
-    const GLint *params;
+    const GLenum pname = *(GLenum   *)(pc +  4);
+    const GLint * params;
 
     params = (const GLint *) (pc + 8);
 
-    CALL_TexGeniv(GET_DISPATCH(), (*(GLenum *) (pc + 0), pname, params));
+    CALL_TexGeniv( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        pname,
+        params
+    ) );
 }
 
-void
-__glXDisp_InitNames(GLbyte * pc)
+void __glXDisp_InitNames(GLbyte * pc)
 {
-    CALL_InitNames(GET_DISPATCH(), ());
+    CALL_InitNames( GET_DISPATCH(), () );
 }
 
-void
-__glXDisp_LoadName(GLbyte * pc)
+void __glXDisp_LoadName(GLbyte * pc)
 {
-    CALL_LoadName(GET_DISPATCH(), (*(GLuint *) (pc + 0)
-                  ));
+    CALL_LoadName( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_PassThrough(GLbyte * pc)
+void __glXDisp_PassThrough(GLbyte * pc)
 {
-    CALL_PassThrough(GET_DISPATCH(), (*(GLfloat *) (pc + 0)
-                     ));
+    CALL_PassThrough( GET_DISPATCH(), (
+        *(GLfloat  *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_PopName(GLbyte * pc)
+void __glXDisp_PopName(GLbyte * pc)
 {
-    CALL_PopName(GET_DISPATCH(), ());
+    CALL_PopName( GET_DISPATCH(), () );
 }
 
-void
-__glXDisp_PushName(GLbyte * pc)
+void __glXDisp_PushName(GLbyte * pc)
 {
-    CALL_PushName(GET_DISPATCH(), (*(GLuint *) (pc + 0)
-                  ));
+    CALL_PushName( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_DrawBuffer(GLbyte * pc)
+void __glXDisp_DrawBuffer(GLbyte * pc)
 {
-    CALL_DrawBuffer(GET_DISPATCH(), (*(GLenum *) (pc + 0)
-                    ));
+    CALL_DrawBuffer( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_Clear(GLbyte * pc)
+void __glXDisp_Clear(GLbyte * pc)
 {
-    CALL_Clear(GET_DISPATCH(), (*(GLbitfield *) (pc + 0)
-               ));
+    CALL_Clear( GET_DISPATCH(), (
+        *(GLbitfield *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_ClearAccum(GLbyte * pc)
+void __glXDisp_ClearAccum(GLbyte * pc)
 {
-    CALL_ClearAccum(GET_DISPATCH(), (*(GLfloat *) (pc + 0),
-                                     *(GLfloat *) (pc + 4),
-                                     *(GLfloat *) (pc + 8),
-                                     *(GLfloat *) (pc + 12)
-                    ));
+    CALL_ClearAccum( GET_DISPATCH(), (
+        *(GLfloat  *)(pc +  0),
+        *(GLfloat  *)(pc +  4),
+        *(GLfloat  *)(pc +  8),
+        *(GLfloat  *)(pc + 12)
+    ) );
 }
 
-void
-__glXDisp_ClearIndex(GLbyte * pc)
+void __glXDisp_ClearIndex(GLbyte * pc)
 {
-    CALL_ClearIndex(GET_DISPATCH(), (*(GLfloat *) (pc + 0)
-                    ));
+    CALL_ClearIndex( GET_DISPATCH(), (
+        *(GLfloat  *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_ClearColor(GLbyte * pc)
+void __glXDisp_ClearColor(GLbyte * pc)
 {
-    CALL_ClearColor(GET_DISPATCH(), (*(GLclampf *) (pc + 0),
-                                     *(GLclampf *) (pc + 4),
-                                     *(GLclampf *) (pc + 8),
-                                     *(GLclampf *) (pc + 12)
-                    ));
+    CALL_ClearColor( GET_DISPATCH(), (
+        *(GLclampf *)(pc +  0),
+        *(GLclampf *)(pc +  4),
+        *(GLclampf *)(pc +  8),
+        *(GLclampf *)(pc + 12)
+    ) );
 }
 
-void
-__glXDisp_ClearStencil(GLbyte * pc)
+void __glXDisp_ClearStencil(GLbyte * pc)
 {
-    CALL_ClearStencil(GET_DISPATCH(), (*(GLint *) (pc + 0)
-                      ));
+    CALL_ClearStencil( GET_DISPATCH(), (
+        *(GLint    *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_ClearDepth(GLbyte * pc)
+void __glXDisp_ClearDepth(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 8);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 8);
         pc -= 4;
     }
 #endif
 
-    CALL_ClearDepth(GET_DISPATCH(), (*(GLclampd *) (pc + 0)
-                    ));
+    CALL_ClearDepth( GET_DISPATCH(), (
+        *(GLclampd *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_StencilMask(GLbyte * pc)
+void __glXDisp_StencilMask(GLbyte * pc)
 {
-    CALL_StencilMask(GET_DISPATCH(), (*(GLuint *) (pc + 0)
-                     ));
+    CALL_StencilMask( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_ColorMask(GLbyte * pc)
+void __glXDisp_ColorMask(GLbyte * pc)
 {
-    CALL_ColorMask(GET_DISPATCH(), (*(GLboolean *) (pc + 0),
-                                    *(GLboolean *) (pc + 1),
-                                    *(GLboolean *) (pc + 2),
-                                    *(GLboolean *) (pc + 3)
-                   ));
+    CALL_ColorMask( GET_DISPATCH(), (
+        *(GLboolean *)(pc +  0),
+        *(GLboolean *)(pc +  1),
+        *(GLboolean *)(pc +  2),
+        *(GLboolean *)(pc +  3)
+    ) );
 }
 
-void
-__glXDisp_DepthMask(GLbyte * pc)
+void __glXDisp_DepthMask(GLbyte * pc)
 {
-    CALL_DepthMask(GET_DISPATCH(), (*(GLboolean *) (pc + 0)
-                   ));
+    CALL_DepthMask( GET_DISPATCH(), (
+        *(GLboolean *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_IndexMask(GLbyte * pc)
+void __glXDisp_IndexMask(GLbyte * pc)
 {
-    CALL_IndexMask(GET_DISPATCH(), (*(GLuint *) (pc + 0)
-                   ));
+    CALL_IndexMask( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_Accum(GLbyte * pc)
+void __glXDisp_Accum(GLbyte * pc)
 {
-    CALL_Accum(GET_DISPATCH(), (*(GLenum *) (pc + 0), *(GLfloat *) (pc + 4)
-               ));
+    CALL_Accum( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLfloat  *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_Disable(GLbyte * pc)
+void __glXDisp_Disable(GLbyte * pc)
 {
-    CALL_Disable(GET_DISPATCH(), (*(GLenum *) (pc + 0)
-                 ));
+    CALL_Disable( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_Enable(GLbyte * pc)
+void __glXDisp_Enable(GLbyte * pc)
 {
-    CALL_Enable(GET_DISPATCH(), (*(GLenum *) (pc + 0)
-                ));
+    CALL_Enable( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_PopAttrib(GLbyte * pc)
+void __glXDisp_PopAttrib(GLbyte * pc)
 {
-    CALL_PopAttrib(GET_DISPATCH(), ());
+    CALL_PopAttrib( GET_DISPATCH(), () );
 }
 
-void
-__glXDisp_PushAttrib(GLbyte * pc)
+void __glXDisp_PushAttrib(GLbyte * pc)
 {
-    CALL_PushAttrib(GET_DISPATCH(), (*(GLbitfield *) (pc + 0)
-                    ));
+    CALL_PushAttrib( GET_DISPATCH(), (
+        *(GLbitfield *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_MapGrid1d(GLbyte * pc)
+void __glXDisp_MapGrid1d(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 20);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 20);
         pc -= 4;
     }
 #endif
 
-    CALL_MapGrid1d(GET_DISPATCH(), (*(GLint *) (pc + 16),
-                                    *(GLdouble *) (pc + 0),
-                                    *(GLdouble *) (pc + 8)
-                   ));
+    CALL_MapGrid1d( GET_DISPATCH(), (
+        *(GLint    *)(pc + 16),
+        *(GLdouble *)(pc +  0),
+        *(GLdouble *)(pc +  8)
+    ) );
 }
 
-void
-__glXDisp_MapGrid1f(GLbyte * pc)
+void __glXDisp_MapGrid1f(GLbyte * pc)
 {
-    CALL_MapGrid1f(GET_DISPATCH(), (*(GLint *) (pc + 0),
-                                    *(GLfloat *) (pc + 4), *(GLfloat *) (pc + 8)
-                   ));
+    CALL_MapGrid1f( GET_DISPATCH(), (
+        *(GLint    *)(pc +  0),
+        *(GLfloat  *)(pc +  4),
+        *(GLfloat  *)(pc +  8)
+    ) );
 }
 
-void
-__glXDisp_MapGrid2d(GLbyte * pc)
+void __glXDisp_MapGrid2d(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 40);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 40);
         pc -= 4;
     }
 #endif
 
-    CALL_MapGrid2d(GET_DISPATCH(), (*(GLint *) (pc + 32),
-                                    *(GLdouble *) (pc + 0),
-                                    *(GLdouble *) (pc + 8),
-                                    *(GLint *) (pc + 36),
-                                    *(GLdouble *) (pc + 16),
-                                    *(GLdouble *) (pc + 24)
-                   ));
+    CALL_MapGrid2d( GET_DISPATCH(), (
+        *(GLint    *)(pc + 32),
+        *(GLdouble *)(pc +  0),
+        *(GLdouble *)(pc +  8),
+        *(GLint    *)(pc + 36),
+        *(GLdouble *)(pc + 16),
+        *(GLdouble *)(pc + 24)
+    ) );
 }
 
-void
-__glXDisp_MapGrid2f(GLbyte * pc)
+void __glXDisp_MapGrid2f(GLbyte * pc)
 {
-    CALL_MapGrid2f(GET_DISPATCH(), (*(GLint *) (pc + 0),
-                                    *(GLfloat *) (pc + 4),
-                                    *(GLfloat *) (pc + 8),
-                                    *(GLint *) (pc + 12),
-                                    *(GLfloat *) (pc + 16),
-                                    *(GLfloat *) (pc + 20)
-                   ));
+    CALL_MapGrid2f( GET_DISPATCH(), (
+        *(GLint    *)(pc +  0),
+        *(GLfloat  *)(pc +  4),
+        *(GLfloat  *)(pc +  8),
+        *(GLint    *)(pc + 12),
+        *(GLfloat  *)(pc + 16),
+        *(GLfloat  *)(pc + 20)
+    ) );
 }
 
-void
-__glXDisp_EvalCoord1dv(GLbyte * pc)
+void __glXDisp_EvalCoord1dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 8);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 8);
         pc -= 4;
     }
 #endif
 
-    CALL_EvalCoord1dv(GET_DISPATCH(), ((const GLdouble *) (pc + 0)
-                      ));
+    CALL_EvalCoord1dv( GET_DISPATCH(), (
+         (const GLdouble *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_EvalCoord1fv(GLbyte * pc)
+void __glXDisp_EvalCoord1fv(GLbyte * pc)
 {
-    CALL_EvalCoord1fv(GET_DISPATCH(), ((const GLfloat *) (pc + 0)
-                      ));
+    CALL_EvalCoord1fv( GET_DISPATCH(), (
+         (const GLfloat *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_EvalCoord2dv(GLbyte * pc)
+void __glXDisp_EvalCoord2dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 16);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 16);
         pc -= 4;
     }
 #endif
 
-    CALL_EvalCoord2dv(GET_DISPATCH(), ((const GLdouble *) (pc + 0)
-                      ));
+    CALL_EvalCoord2dv( GET_DISPATCH(), (
+         (const GLdouble *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_EvalCoord2fv(GLbyte * pc)
+void __glXDisp_EvalCoord2fv(GLbyte * pc)
 {
-    CALL_EvalCoord2fv(GET_DISPATCH(), ((const GLfloat *) (pc + 0)
-                      ));
+    CALL_EvalCoord2fv( GET_DISPATCH(), (
+         (const GLfloat *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_EvalMesh1(GLbyte * pc)
+void __glXDisp_EvalMesh1(GLbyte * pc)
 {
-    CALL_EvalMesh1(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                    *(GLint *) (pc + 4), *(GLint *) (pc + 8)
-                   ));
+    CALL_EvalMesh1( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLint    *)(pc +  4),
+        *(GLint    *)(pc +  8)
+    ) );
 }
 
-void
-__glXDisp_EvalPoint1(GLbyte * pc)
+void __glXDisp_EvalPoint1(GLbyte * pc)
 {
-    CALL_EvalPoint1(GET_DISPATCH(), (*(GLint *) (pc + 0)
-                    ));
+    CALL_EvalPoint1( GET_DISPATCH(), (
+        *(GLint    *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_EvalMesh2(GLbyte * pc)
+void __glXDisp_EvalMesh2(GLbyte * pc)
 {
-    CALL_EvalMesh2(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                    *(GLint *) (pc + 4),
-                                    *(GLint *) (pc + 8),
-                                    *(GLint *) (pc + 12), *(GLint *) (pc + 16)
-                   ));
+    CALL_EvalMesh2( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLint    *)(pc +  4),
+        *(GLint    *)(pc +  8),
+        *(GLint    *)(pc + 12),
+        *(GLint    *)(pc + 16)
+    ) );
 }
 
-void
-__glXDisp_EvalPoint2(GLbyte * pc)
+void __glXDisp_EvalPoint2(GLbyte * pc)
 {
-    CALL_EvalPoint2(GET_DISPATCH(), (*(GLint *) (pc + 0), *(GLint *) (pc + 4)
-                    ));
+    CALL_EvalPoint2( GET_DISPATCH(), (
+        *(GLint    *)(pc +  0),
+        *(GLint    *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_AlphaFunc(GLbyte * pc)
+void __glXDisp_AlphaFunc(GLbyte * pc)
 {
-    CALL_AlphaFunc(GET_DISPATCH(), (*(GLenum *) (pc + 0), *(GLclampf *) (pc + 4)
-                   ));
+    CALL_AlphaFunc( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLclampf *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_BlendFunc(GLbyte * pc)
+void __glXDisp_BlendFunc(GLbyte * pc)
 {
-    CALL_BlendFunc(GET_DISPATCH(), (*(GLenum *) (pc + 0), *(GLenum *) (pc + 4)
-                   ));
+    CALL_BlendFunc( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLenum   *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_LogicOp(GLbyte * pc)
+void __glXDisp_LogicOp(GLbyte * pc)
 {
-    CALL_LogicOp(GET_DISPATCH(), (*(GLenum *) (pc + 0)
-                 ));
+    CALL_LogicOp( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_StencilFunc(GLbyte * pc)
+void __glXDisp_StencilFunc(GLbyte * pc)
 {
-    CALL_StencilFunc(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                      *(GLint *) (pc + 4), *(GLuint *) (pc + 8)
-                     ));
+    CALL_StencilFunc( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLint    *)(pc +  4),
+        *(GLuint   *)(pc +  8)
+    ) );
 }
 
-void
-__glXDisp_StencilOp(GLbyte * pc)
+void __glXDisp_StencilOp(GLbyte * pc)
 {
-    CALL_StencilOp(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                    *(GLenum *) (pc + 4), *(GLenum *) (pc + 8)
-                   ));
+    CALL_StencilOp( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLenum   *)(pc +  4),
+        *(GLenum   *)(pc +  8)
+    ) );
 }
 
-void
-__glXDisp_DepthFunc(GLbyte * pc)
+void __glXDisp_DepthFunc(GLbyte * pc)
 {
-    CALL_DepthFunc(GET_DISPATCH(), (*(GLenum *) (pc + 0)
-                   ));
+    CALL_DepthFunc( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_PixelZoom(GLbyte * pc)
+void __glXDisp_PixelZoom(GLbyte * pc)
 {
-    CALL_PixelZoom(GET_DISPATCH(), (*(GLfloat *) (pc + 0), *(GLfloat *) (pc + 4)
-                   ));
+    CALL_PixelZoom( GET_DISPATCH(), (
+        *(GLfloat  *)(pc +  0),
+        *(GLfloat  *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_PixelTransferf(GLbyte * pc)
+void __glXDisp_PixelTransferf(GLbyte * pc)
 {
-    CALL_PixelTransferf(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                         *(GLfloat *) (pc + 4)
-                        ));
+    CALL_PixelTransferf( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLfloat  *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_PixelTransferi(GLbyte * pc)
+void __glXDisp_PixelTransferi(GLbyte * pc)
 {
-    CALL_PixelTransferi(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                         *(GLint *) (pc + 4)
-                        ));
+    CALL_PixelTransferi( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLint    *)(pc +  4)
+    ) );
 }
 
-int
-__glXDisp_PixelStoref(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_PixelStoref(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        CALL_PixelStoref(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                          *(GLfloat *) (pc + 4)
-                         ));
+    if ( cx != NULL ) {
+        CALL_PixelStoref( GET_DISPATCH(), (
+            *(GLenum   *)(pc +  0),
+            *(GLfloat  *)(pc +  4)
+        ) );
         error = Success;
     }
 
     return error;
 }
 
-int
-__glXDisp_PixelStorei(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_PixelStorei(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        CALL_PixelStorei(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                          *(GLint *) (pc + 4)
-                         ));
+    if ( cx != NULL ) {
+        CALL_PixelStorei( GET_DISPATCH(), (
+            *(GLenum   *)(pc +  0),
+            *(GLint    *)(pc +  4)
+        ) );
         error = Success;
     }
 
     return error;
 }
 
-void
-__glXDisp_PixelMapfv(GLbyte * pc)
+void __glXDisp_PixelMapfv(GLbyte * pc)
 {
-    const GLsizei mapsize = *(GLsizei *) (pc + 4);
+    const GLsizei mapsize = *(GLsizei  *)(pc +  4);
 
-    CALL_PixelMapfv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                     mapsize, (const GLfloat *) (pc + 8)
-                    ));
+    CALL_PixelMapfv( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        mapsize,
+         (const GLfloat *)(pc +  8)
+    ) );
 }
 
-void
-__glXDisp_PixelMapuiv(GLbyte * pc)
+void __glXDisp_PixelMapuiv(GLbyte * pc)
 {
-    const GLsizei mapsize = *(GLsizei *) (pc + 4);
+    const GLsizei mapsize = *(GLsizei  *)(pc +  4);
 
-    CALL_PixelMapuiv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                      mapsize, (const GLuint *) (pc + 8)
-                     ));
+    CALL_PixelMapuiv( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        mapsize,
+         (const GLuint *)(pc +  8)
+    ) );
 }
 
-void
-__glXDisp_PixelMapusv(GLbyte * pc)
+void __glXDisp_PixelMapusv(GLbyte * pc)
 {
-    const GLsizei mapsize = *(GLsizei *) (pc + 4);
+    const GLsizei mapsize = *(GLsizei  *)(pc +  4);
 
-    CALL_PixelMapusv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                      mapsize, (const GLushort *) (pc + 8)
-                     ));
+    CALL_PixelMapusv( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        mapsize,
+         (const GLushort *)(pc +  8)
+    ) );
 }
 
-void
-__glXDisp_ReadBuffer(GLbyte * pc)
+void __glXDisp_ReadBuffer(GLbyte * pc)
 {
-    CALL_ReadBuffer(GET_DISPATCH(), (*(GLenum *) (pc + 0)
-                    ));
+    CALL_ReadBuffer( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_CopyPixels(GLbyte * pc)
+void __glXDisp_CopyPixels(GLbyte * pc)
 {
-    CALL_CopyPixels(GET_DISPATCH(), (*(GLint *) (pc + 0),
-                                     *(GLint *) (pc + 4),
-                                     *(GLsizei *) (pc + 8),
-                                     *(GLsizei *) (pc + 12),
-                                     *(GLenum *) (pc + 16)
-                    ));
+    CALL_CopyPixels( GET_DISPATCH(), (
+        *(GLint    *)(pc +  0),
+        *(GLint    *)(pc +  4),
+        *(GLsizei  *)(pc +  8),
+        *(GLsizei  *)(pc + 12),
+        *(GLenum   *)(pc + 16)
+    ) );
 }
 
-void
-__glXDisp_DrawPixels(GLbyte * pc)
+void __glXDisp_DrawPixels(GLbyte * pc)
 {
-    const GLvoid *const pixels = (const GLvoid *) ((pc + 36));
-    __GLXpixelHeader *const hdr = (__GLXpixelHeader *) (pc);
+    const GLvoid * const pixels = (const GLvoid *) (pc + 36);
+    __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment));
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES,   hdr->swapBytes) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST,    hdr->lsbFirst) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,   (GLint) hdr->rowLength) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,    (GLint) hdr->skipRows) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,  (GLint) hdr->skipPixels) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT,    (GLint) hdr->alignment) );
 
-    CALL_DrawPixels(GET_DISPATCH(), (*(GLsizei *) (pc + 20),
-                                     *(GLsizei *) (pc + 24),
-                                     *(GLenum *) (pc + 28),
-                                     *(GLenum *) (pc + 32), pixels));
+    CALL_DrawPixels( GET_DISPATCH(), (
+        *(GLsizei  *)(pc + 20),
+        *(GLsizei  *)(pc + 24),
+        *(GLenum   *)(pc + 28),
+        *(GLenum   *)(pc + 32),
+        pixels
+    ) );
 }
 
-int
-__glXDisp_GetBooleanv(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetBooleanv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = *(GLenum *) (pc + 0);
+    if ( cx != NULL ) {
+        const GLenum pname = *(GLenum   *)(pc +  0);
 
         const GLuint compsize = __glGetBooleanv_size(pname);
         GLboolean answerBuffer[200];
-        GLboolean *params =
-            __glXGetAnswerBuffer(cl, compsize, answerBuffer,
-                                 sizeof(answerBuffer), 1);
+        GLboolean * params = __glXGetAnswerBuffer(cl, compsize, answerBuffer, sizeof(answerBuffer), 1);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetBooleanv(GET_DISPATCH(), (pname, params));
+        CALL_GetBooleanv( GET_DISPATCH(), (
+            pname,
+            params
+        ) );
         __glXSendReply(cl->client, params, compsize, 1, GL_FALSE, 0);
         error = Success;
     }
@@ -1739,18 +1796,19 @@ __glXDisp_GetBooleanv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_GetClipPlane(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetClipPlane(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
+    if ( cx != NULL ) {
         GLdouble equation[4];
-
-        CALL_GetClipPlane(GET_DISPATCH(), (*(GLenum *) (pc + 0), equation));
+        CALL_GetClipPlane( GET_DISPATCH(), (
+            *(GLenum   *)(pc +  0),
+            equation
+        ) );
         __glXSendReply(cl->client, equation, 4, 8, GL_TRUE, 0);
         error = Success;
     }
@@ -1758,28 +1816,27 @@ __glXDisp_GetClipPlane(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_GetDoublev(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetDoublev(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = *(GLenum *) (pc + 0);
+    if ( cx != NULL ) {
+        const GLenum pname = *(GLenum   *)(pc +  0);
 
         const GLuint compsize = __glGetDoublev_size(pname);
         GLdouble answerBuffer[200];
-        GLdouble *params =
-            __glXGetAnswerBuffer(cl, compsize * 8, answerBuffer,
-                                 sizeof(answerBuffer), 8);
+        GLdouble * params = __glXGetAnswerBuffer(cl, compsize * 8, answerBuffer, sizeof(answerBuffer), 8);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetDoublev(GET_DISPATCH(), (pname, params));
+        CALL_GetDoublev( GET_DISPATCH(), (
+            pname,
+            params
+        ) );
         __glXSendReply(cl->client, params, compsize, 8, GL_FALSE, 0);
         error = Success;
     }
@@ -1787,18 +1844,16 @@ __glXDisp_GetDoublev(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_GetError(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetError(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
+    if ( cx != NULL ) {
         GLenum retval;
-
-        retval = CALL_GetError(GET_DISPATCH(), ());
+        retval = CALL_GetError( GET_DISPATCH(), () );
         __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
         error = Success;
     }
@@ -1806,28 +1861,27 @@ __glXDisp_GetError(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_GetFloatv(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetFloatv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = *(GLenum *) (pc + 0);
+    if ( cx != NULL ) {
+        const GLenum pname = *(GLenum   *)(pc +  0);
 
         const GLuint compsize = __glGetFloatv_size(pname);
         GLfloat answerBuffer[200];
-        GLfloat *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetFloatv(GET_DISPATCH(), (pname, params));
+        CALL_GetFloatv( GET_DISPATCH(), (
+            pname,
+            params
+        ) );
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -1835,28 +1889,27 @@ __glXDisp_GetFloatv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_GetIntegerv(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetIntegerv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = *(GLenum *) (pc + 0);
+    if ( cx != NULL ) {
+        const GLenum pname = *(GLenum   *)(pc +  0);
 
         const GLuint compsize = __glGetIntegerv_size(pname);
         GLint answerBuffer[200];
-        GLint *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetIntegerv(GET_DISPATCH(), (pname, params));
+        CALL_GetIntegerv( GET_DISPATCH(), (
+            pname,
+            params
+        ) );
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -1864,28 +1917,28 @@ __glXDisp_GetIntegerv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_GetLightfv(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetLightfv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = *(GLenum *) (pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname = *(GLenum   *)(pc +  4);
 
         const GLuint compsize = __glGetLightfv_size(pname);
         GLfloat answerBuffer[200];
-        GLfloat *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetLightfv(GET_DISPATCH(), (*(GLenum *) (pc + 0), pname, params));
+        CALL_GetLightfv( GET_DISPATCH(), (
+            *(GLenum   *)(pc +  0),
+            pname,
+            params
+        ) );
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -1893,28 +1946,28 @@ __glXDisp_GetLightfv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_GetLightiv(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetLightiv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = *(GLenum *) (pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname = *(GLenum   *)(pc +  4);
 
         const GLuint compsize = __glGetLightiv_size(pname);
         GLint answerBuffer[200];
-        GLint *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetLightiv(GET_DISPATCH(), (*(GLenum *) (pc + 0), pname, params));
+        CALL_GetLightiv( GET_DISPATCH(), (
+            *(GLenum   *)(pc +  0),
+            pname,
+            params
+        ) );
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -1922,29 +1975,29 @@ __glXDisp_GetLightiv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_GetMapdv(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetMapdv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum target = *(GLenum *) (pc + 0);
-        const GLenum query = *(GLenum *) (pc + 4);
+    if ( cx != NULL ) {
+        const GLenum target = *(GLenum   *)(pc +  0);
+        const GLenum query = *(GLenum   *)(pc +  4);
 
-        const GLuint compsize = __glGetMapdv_size(target, query);
+        const GLuint compsize = __glGetMapdv_size(target,query);
         GLdouble answerBuffer[200];
-        GLdouble *v =
-            __glXGetAnswerBuffer(cl, compsize * 8, answerBuffer,
-                                 sizeof(answerBuffer), 8);
+        GLdouble * v = __glXGetAnswerBuffer(cl, compsize * 8, answerBuffer, sizeof(answerBuffer), 8);
 
-        if (v == NULL)
-            return BadAlloc;
+        if (v == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetMapdv(GET_DISPATCH(), (target, query, v));
+        CALL_GetMapdv( GET_DISPATCH(), (
+            target,
+            query,
+            v
+        ) );
         __glXSendReply(cl->client, v, compsize, 8, GL_FALSE, 0);
         error = Success;
     }
@@ -1952,29 +2005,29 @@ __glXDisp_GetMapdv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_GetMapfv(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetMapfv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum target = *(GLenum *) (pc + 0);
-        const GLenum query = *(GLenum *) (pc + 4);
+    if ( cx != NULL ) {
+        const GLenum target = *(GLenum   *)(pc +  0);
+        const GLenum query = *(GLenum   *)(pc +  4);
 
-        const GLuint compsize = __glGetMapfv_size(target, query);
+        const GLuint compsize = __glGetMapfv_size(target,query);
         GLfloat answerBuffer[200];
-        GLfloat *v =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLfloat * v = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (v == NULL)
-            return BadAlloc;
+        if (v == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetMapfv(GET_DISPATCH(), (target, query, v));
+        CALL_GetMapfv( GET_DISPATCH(), (
+            target,
+            query,
+            v
+        ) );
         __glXSendReply(cl->client, v, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -1982,29 +2035,29 @@ __glXDisp_GetMapfv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_GetMapiv(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetMapiv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum target = *(GLenum *) (pc + 0);
-        const GLenum query = *(GLenum *) (pc + 4);
+    if ( cx != NULL ) {
+        const GLenum target = *(GLenum   *)(pc +  0);
+        const GLenum query = *(GLenum   *)(pc +  4);
 
-        const GLuint compsize = __glGetMapiv_size(target, query);
+        const GLuint compsize = __glGetMapiv_size(target,query);
         GLint answerBuffer[200];
-        GLint *v =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLint * v = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (v == NULL)
-            return BadAlloc;
+        if (v == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetMapiv(GET_DISPATCH(), (target, query, v));
+        CALL_GetMapiv( GET_DISPATCH(), (
+            target,
+            query,
+            v
+        ) );
         __glXSendReply(cl->client, v, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -2012,29 +2065,28 @@ __glXDisp_GetMapiv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_GetMaterialfv(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetMaterialfv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = *(GLenum *) (pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname = *(GLenum   *)(pc +  4);
 
         const GLuint compsize = __glGetMaterialfv_size(pname);
         GLfloat answerBuffer[200];
-        GLfloat *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetMaterialfv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                            pname, params));
+        CALL_GetMaterialfv( GET_DISPATCH(), (
+            *(GLenum   *)(pc +  0),
+            pname,
+            params
+        ) );
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -2042,29 +2094,28 @@ __glXDisp_GetMaterialfv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_GetMaterialiv(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetMaterialiv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = *(GLenum *) (pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname = *(GLenum   *)(pc +  4);
 
         const GLuint compsize = __glGetMaterialiv_size(pname);
         GLint answerBuffer[200];
-        GLint *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetMaterialiv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                            pname, params));
+        CALL_GetMaterialiv( GET_DISPATCH(), (
+            *(GLenum   *)(pc +  0),
+            pname,
+            params
+        ) );
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -2072,28 +2123,27 @@ __glXDisp_GetMaterialiv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_GetPixelMapfv(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetPixelMapfv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum map = *(GLenum *) (pc + 0);
+    if ( cx != NULL ) {
+        const GLenum map = *(GLenum   *)(pc +  0);
 
         const GLuint compsize = __glGetPixelMapfv_size(map);
         GLfloat answerBuffer[200];
-        GLfloat *values =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLfloat * values = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (values == NULL)
-            return BadAlloc;
+        if (values == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetPixelMapfv(GET_DISPATCH(), (map, values));
+        CALL_GetPixelMapfv( GET_DISPATCH(), (
+            map,
+            values
+        ) );
         __glXSendReply(cl->client, values, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -2101,28 +2151,27 @@ __glXDisp_GetPixelMapfv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_GetPixelMapuiv(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetPixelMapuiv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum map = *(GLenum *) (pc + 0);
+    if ( cx != NULL ) {
+        const GLenum map = *(GLenum   *)(pc +  0);
 
         const GLuint compsize = __glGetPixelMapuiv_size(map);
         GLuint answerBuffer[200];
-        GLuint *values =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLuint * values = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (values == NULL)
-            return BadAlloc;
+        if (values == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetPixelMapuiv(GET_DISPATCH(), (map, values));
+        CALL_GetPixelMapuiv( GET_DISPATCH(), (
+            map,
+            values
+        ) );
         __glXSendReply(cl->client, values, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -2130,28 +2179,27 @@ __glXDisp_GetPixelMapuiv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_GetPixelMapusv(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetPixelMapusv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum map = *(GLenum *) (pc + 0);
+    if ( cx != NULL ) {
+        const GLenum map = *(GLenum   *)(pc +  0);
 
         const GLuint compsize = __glGetPixelMapusv_size(map);
         GLushort answerBuffer[200];
-        GLushort *values =
-            __glXGetAnswerBuffer(cl, compsize * 2, answerBuffer,
-                                 sizeof(answerBuffer), 2);
+        GLushort * values = __glXGetAnswerBuffer(cl, compsize * 2, answerBuffer, sizeof(answerBuffer), 2);
 
-        if (values == NULL)
-            return BadAlloc;
+        if (values == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetPixelMapusv(GET_DISPATCH(), (map, values));
+        CALL_GetPixelMapusv( GET_DISPATCH(), (
+            map,
+            values
+        ) );
         __glXSendReply(cl->client, values, compsize, 2, GL_FALSE, 0);
         error = Success;
     }
@@ -2159,28 +2207,28 @@ __glXDisp_GetPixelMapusv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_GetTexEnvfv(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetTexEnvfv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = *(GLenum *) (pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname = *(GLenum   *)(pc +  4);
 
         const GLuint compsize = __glGetTexEnvfv_size(pname);
         GLfloat answerBuffer[200];
-        GLfloat *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetTexEnvfv(GET_DISPATCH(), (*(GLenum *) (pc + 0), pname, params));
+        CALL_GetTexEnvfv( GET_DISPATCH(), (
+            *(GLenum   *)(pc +  0),
+            pname,
+            params
+        ) );
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -2188,28 +2236,28 @@ __glXDisp_GetTexEnvfv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_GetTexEnviv(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetTexEnviv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = *(GLenum *) (pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname = *(GLenum   *)(pc +  4);
 
         const GLuint compsize = __glGetTexEnviv_size(pname);
         GLint answerBuffer[200];
-        GLint *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetTexEnviv(GET_DISPATCH(), (*(GLenum *) (pc + 0), pname, params));
+        CALL_GetTexEnviv( GET_DISPATCH(), (
+            *(GLenum   *)(pc +  0),
+            pname,
+            params
+        ) );
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -2217,28 +2265,28 @@ __glXDisp_GetTexEnviv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_GetTexGendv(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetTexGendv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = *(GLenum *) (pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname = *(GLenum   *)(pc +  4);
 
         const GLuint compsize = __glGetTexGendv_size(pname);
         GLdouble answerBuffer[200];
-        GLdouble *params =
-            __glXGetAnswerBuffer(cl, compsize * 8, answerBuffer,
-                                 sizeof(answerBuffer), 8);
+        GLdouble * params = __glXGetAnswerBuffer(cl, compsize * 8, answerBuffer, sizeof(answerBuffer), 8);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetTexGendv(GET_DISPATCH(), (*(GLenum *) (pc + 0), pname, params));
+        CALL_GetTexGendv( GET_DISPATCH(), (
+            *(GLenum   *)(pc +  0),
+            pname,
+            params
+        ) );
         __glXSendReply(cl->client, params, compsize, 8, GL_FALSE, 0);
         error = Success;
     }
@@ -2246,28 +2294,28 @@ __glXDisp_GetTexGendv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_GetTexGenfv(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetTexGenfv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = *(GLenum *) (pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname = *(GLenum   *)(pc +  4);
 
         const GLuint compsize = __glGetTexGenfv_size(pname);
         GLfloat answerBuffer[200];
-        GLfloat *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetTexGenfv(GET_DISPATCH(), (*(GLenum *) (pc + 0), pname, params));
+        CALL_GetTexGenfv( GET_DISPATCH(), (
+            *(GLenum   *)(pc +  0),
+            pname,
+            params
+        ) );
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -2275,28 +2323,28 @@ __glXDisp_GetTexGenfv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_GetTexGeniv(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetTexGeniv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = *(GLenum *) (pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname = *(GLenum   *)(pc +  4);
 
         const GLuint compsize = __glGetTexGeniv_size(pname);
         GLint answerBuffer[200];
-        GLint *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetTexGeniv(GET_DISPATCH(), (*(GLenum *) (pc + 0), pname, params));
+        CALL_GetTexGeniv( GET_DISPATCH(), (
+            *(GLenum   *)(pc +  0),
+            pname,
+            params
+        ) );
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -2304,29 +2352,28 @@ __glXDisp_GetTexGeniv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_GetTexParameterfv(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetTexParameterfv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = *(GLenum *) (pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname = *(GLenum   *)(pc +  4);
 
         const GLuint compsize = __glGetTexParameterfv_size(pname);
         GLfloat answerBuffer[200];
-        GLfloat *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetTexParameterfv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                pname, params));
+        CALL_GetTexParameterfv( GET_DISPATCH(), (
+            *(GLenum   *)(pc +  0),
+            pname,
+            params
+        ) );
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -2334,29 +2381,28 @@ __glXDisp_GetTexParameterfv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_GetTexParameteriv(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetTexParameteriv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = *(GLenum *) (pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname = *(GLenum   *)(pc +  4);
 
         const GLuint compsize = __glGetTexParameteriv_size(pname);
         GLint answerBuffer[200];
-        GLint *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetTexParameteriv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                pname, params));
+        CALL_GetTexParameteriv( GET_DISPATCH(), (
+            *(GLenum   *)(pc +  0),
+            pname,
+            params
+        ) );
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -2364,30 +2410,29 @@ __glXDisp_GetTexParameteriv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_GetTexLevelParameterfv(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetTexLevelParameterfv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = *(GLenum *) (pc + 8);
+    if ( cx != NULL ) {
+        const GLenum pname = *(GLenum   *)(pc +  8);
 
         const GLuint compsize = __glGetTexLevelParameterfv_size(pname);
         GLfloat answerBuffer[200];
-        GLfloat *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetTexLevelParameterfv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                     *(GLint *) (pc + 4),
-                                                     pname, params));
+        CALL_GetTexLevelParameterfv( GET_DISPATCH(), (
+            *(GLenum   *)(pc +  0),
+            *(GLint    *)(pc +  4),
+            pname,
+            params
+        ) );
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -2395,30 +2440,29 @@ __glXDisp_GetTexLevelParameterfv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_GetTexLevelParameteriv(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetTexLevelParameteriv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = *(GLenum *) (pc + 8);
+    if ( cx != NULL ) {
+        const GLenum pname = *(GLenum   *)(pc +  8);
 
         const GLuint compsize = __glGetTexLevelParameteriv_size(pname);
         GLint answerBuffer[200];
-        GLint *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetTexLevelParameteriv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                     *(GLint *) (pc + 4),
-                                                     pname, params));
+        CALL_GetTexLevelParameteriv( GET_DISPATCH(), (
+            *(GLenum   *)(pc +  0),
+            *(GLint    *)(pc +  4),
+            pname,
+            params
+        ) );
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -2426,19 +2470,18 @@ __glXDisp_GetTexLevelParameteriv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_IsEnabled(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_IsEnabled(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
+    if ( cx != NULL ) {
         GLboolean retval;
-
-        retval = CALL_IsEnabled(GET_DISPATCH(), (*(GLenum *) (pc + 0)
-                                ));
+        retval = CALL_IsEnabled( GET_DISPATCH(), (
+            *(GLenum   *)(pc +  0)
+        ) );
         __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
         error = Success;
     }
@@ -2446,19 +2489,18 @@ __glXDisp_IsEnabled(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_IsList(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_IsList(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
+    if ( cx != NULL ) {
         GLboolean retval;
-
-        retval = CALL_IsList(GET_DISPATCH(), (*(GLuint *) (pc + 0)
-                             ));
+        retval = CALL_IsList( GET_DISPATCH(), (
+            *(GLuint   *)(pc +  0)
+        ) );
         __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
         error = Success;
     }
@@ -2466,249 +2508,251 @@ __glXDisp_IsList(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-void
-__glXDisp_DepthRange(GLbyte * pc)
+void __glXDisp_DepthRange(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 16);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 16);
         pc -= 4;
     }
 #endif
 
-    CALL_DepthRange(GET_DISPATCH(), (*(GLclampd *) (pc + 0),
-                                     *(GLclampd *) (pc + 8)
-                    ));
+    CALL_DepthRange( GET_DISPATCH(), (
+        *(GLclampd *)(pc +  0),
+        *(GLclampd *)(pc +  8)
+    ) );
 }
 
-void
-__glXDisp_Frustum(GLbyte * pc)
+void __glXDisp_Frustum(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 48);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 48);
         pc -= 4;
     }
 #endif
 
-    CALL_Frustum(GET_DISPATCH(), (*(GLdouble *) (pc + 0),
-                                  *(GLdouble *) (pc + 8),
-                                  *(GLdouble *) (pc + 16),
-                                  *(GLdouble *) (pc + 24),
-                                  *(GLdouble *) (pc + 32),
-                                  *(GLdouble *) (pc + 40)
-                 ));
+    CALL_Frustum( GET_DISPATCH(), (
+        *(GLdouble *)(pc +  0),
+        *(GLdouble *)(pc +  8),
+        *(GLdouble *)(pc + 16),
+        *(GLdouble *)(pc + 24),
+        *(GLdouble *)(pc + 32),
+        *(GLdouble *)(pc + 40)
+    ) );
 }
 
-void
-__glXDisp_LoadIdentity(GLbyte * pc)
+void __glXDisp_LoadIdentity(GLbyte * pc)
 {
-    CALL_LoadIdentity(GET_DISPATCH(), ());
+    CALL_LoadIdentity( GET_DISPATCH(), () );
 }
 
-void
-__glXDisp_LoadMatrixf(GLbyte * pc)
+void __glXDisp_LoadMatrixf(GLbyte * pc)
 {
-    CALL_LoadMatrixf(GET_DISPATCH(), ((const GLfloat *) (pc + 0)
-                     ));
+    CALL_LoadMatrixf( GET_DISPATCH(), (
+         (const GLfloat *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_LoadMatrixd(GLbyte * pc)
+void __glXDisp_LoadMatrixd(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 128);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 128);
         pc -= 4;
     }
 #endif
 
-    CALL_LoadMatrixd(GET_DISPATCH(), ((const GLdouble *) (pc + 0)
-                     ));
+    CALL_LoadMatrixd( GET_DISPATCH(), (
+         (const GLdouble *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_MatrixMode(GLbyte * pc)
+void __glXDisp_MatrixMode(GLbyte * pc)
 {
-    CALL_MatrixMode(GET_DISPATCH(), (*(GLenum *) (pc + 0)
-                    ));
+    CALL_MatrixMode( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_MultMatrixf(GLbyte * pc)
+void __glXDisp_MultMatrixf(GLbyte * pc)
 {
-    CALL_MultMatrixf(GET_DISPATCH(), ((const GLfloat *) (pc + 0)
-                     ));
+    CALL_MultMatrixf( GET_DISPATCH(), (
+         (const GLfloat *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_MultMatrixd(GLbyte * pc)
+void __glXDisp_MultMatrixd(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 128);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 128);
         pc -= 4;
     }
 #endif
 
-    CALL_MultMatrixd(GET_DISPATCH(), ((const GLdouble *) (pc + 0)
-                     ));
+    CALL_MultMatrixd( GET_DISPATCH(), (
+         (const GLdouble *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_Ortho(GLbyte * pc)
+void __glXDisp_Ortho(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 48);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 48);
         pc -= 4;
     }
 #endif
 
-    CALL_Ortho(GET_DISPATCH(), (*(GLdouble *) (pc + 0),
-                                *(GLdouble *) (pc + 8),
-                                *(GLdouble *) (pc + 16),
-                                *(GLdouble *) (pc + 24),
-                                *(GLdouble *) (pc + 32), *(GLdouble *) (pc + 40)
-               ));
+    CALL_Ortho( GET_DISPATCH(), (
+        *(GLdouble *)(pc +  0),
+        *(GLdouble *)(pc +  8),
+        *(GLdouble *)(pc + 16),
+        *(GLdouble *)(pc + 24),
+        *(GLdouble *)(pc + 32),
+        *(GLdouble *)(pc + 40)
+    ) );
 }
 
-void
-__glXDisp_PopMatrix(GLbyte * pc)
+void __glXDisp_PopMatrix(GLbyte * pc)
 {
-    CALL_PopMatrix(GET_DISPATCH(), ());
+    CALL_PopMatrix( GET_DISPATCH(), () );
 }
 
-void
-__glXDisp_PushMatrix(GLbyte * pc)
+void __glXDisp_PushMatrix(GLbyte * pc)
 {
-    CALL_PushMatrix(GET_DISPATCH(), ());
+    CALL_PushMatrix( GET_DISPATCH(), () );
 }
 
-void
-__glXDisp_Rotated(GLbyte * pc)
+void __glXDisp_Rotated(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 32);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 32);
         pc -= 4;
     }
 #endif
 
-    CALL_Rotated(GET_DISPATCH(), (*(GLdouble *) (pc + 0),
-                                  *(GLdouble *) (pc + 8),
-                                  *(GLdouble *) (pc + 16),
-                                  *(GLdouble *) (pc + 24)
-                 ));
+    CALL_Rotated( GET_DISPATCH(), (
+        *(GLdouble *)(pc +  0),
+        *(GLdouble *)(pc +  8),
+        *(GLdouble *)(pc + 16),
+        *(GLdouble *)(pc + 24)
+    ) );
 }
 
-void
-__glXDisp_Rotatef(GLbyte * pc)
+void __glXDisp_Rotatef(GLbyte * pc)
 {
-    CALL_Rotatef(GET_DISPATCH(), (*(GLfloat *) (pc + 0),
-                                  *(GLfloat *) (pc + 4),
-                                  *(GLfloat *) (pc + 8), *(GLfloat *) (pc + 12)
-                 ));
+    CALL_Rotatef( GET_DISPATCH(), (
+        *(GLfloat  *)(pc +  0),
+        *(GLfloat  *)(pc +  4),
+        *(GLfloat  *)(pc +  8),
+        *(GLfloat  *)(pc + 12)
+    ) );
 }
 
-void
-__glXDisp_Scaled(GLbyte * pc)
+void __glXDisp_Scaled(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 24);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 24);
         pc -= 4;
     }
 #endif
 
-    CALL_Scaled(GET_DISPATCH(), (*(GLdouble *) (pc + 0),
-                                 *(GLdouble *) (pc + 8), *(GLdouble *) (pc + 16)
-                ));
+    CALL_Scaled( GET_DISPATCH(), (
+        *(GLdouble *)(pc +  0),
+        *(GLdouble *)(pc +  8),
+        *(GLdouble *)(pc + 16)
+    ) );
 }
 
-void
-__glXDisp_Scalef(GLbyte * pc)
+void __glXDisp_Scalef(GLbyte * pc)
 {
-    CALL_Scalef(GET_DISPATCH(), (*(GLfloat *) (pc + 0),
-                                 *(GLfloat *) (pc + 4), *(GLfloat *) (pc + 8)
-                ));
+    CALL_Scalef( GET_DISPATCH(), (
+        *(GLfloat  *)(pc +  0),
+        *(GLfloat  *)(pc +  4),
+        *(GLfloat  *)(pc +  8)
+    ) );
 }
 
-void
-__glXDisp_Translated(GLbyte * pc)
+void __glXDisp_Translated(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 24);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 24);
         pc -= 4;
     }
 #endif
 
-    CALL_Translated(GET_DISPATCH(), (*(GLdouble *) (pc + 0),
-                                     *(GLdouble *) (pc + 8),
-                                     *(GLdouble *) (pc + 16)
-                    ));
+    CALL_Translated( GET_DISPATCH(), (
+        *(GLdouble *)(pc +  0),
+        *(GLdouble *)(pc +  8),
+        *(GLdouble *)(pc + 16)
+    ) );
 }
 
-void
-__glXDisp_Translatef(GLbyte * pc)
+void __glXDisp_Translatef(GLbyte * pc)
 {
-    CALL_Translatef(GET_DISPATCH(), (*(GLfloat *) (pc + 0),
-                                     *(GLfloat *) (pc + 4),
-                                     *(GLfloat *) (pc + 8)
-                    ));
+    CALL_Translatef( GET_DISPATCH(), (
+        *(GLfloat  *)(pc +  0),
+        *(GLfloat  *)(pc +  4),
+        *(GLfloat  *)(pc +  8)
+    ) );
 }
 
-void
-__glXDisp_Viewport(GLbyte * pc)
+void __glXDisp_Viewport(GLbyte * pc)
 {
-    CALL_Viewport(GET_DISPATCH(), (*(GLint *) (pc + 0),
-                                   *(GLint *) (pc + 4),
-                                   *(GLsizei *) (pc + 8), *(GLsizei *) (pc + 12)
-                  ));
+    CALL_Viewport( GET_DISPATCH(), (
+        *(GLint    *)(pc +  0),
+        *(GLint    *)(pc +  4),
+        *(GLsizei  *)(pc +  8),
+        *(GLsizei  *)(pc + 12)
+    ) );
 }
 
-void
-__glXDisp_BindTexture(GLbyte * pc)
+void __glXDisp_BindTexture(GLbyte * pc)
 {
-    CALL_BindTexture(GET_DISPATCH(), (*(GLenum *) (pc + 0), *(GLuint *) (pc + 4)
-                     ));
+    CALL_BindTexture( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLuint   *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_Indexubv(GLbyte * pc)
+void __glXDisp_Indexubv(GLbyte * pc)
 {
-    CALL_Indexubv(GET_DISPATCH(), ((const GLubyte *) (pc + 0)
-                  ));
+    CALL_Indexubv( GET_DISPATCH(), (
+         (const GLubyte *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_PolygonOffset(GLbyte * pc)
+void __glXDisp_PolygonOffset(GLbyte * pc)
 {
-    CALL_PolygonOffset(GET_DISPATCH(), (*(GLfloat *) (pc + 0),
-                                        *(GLfloat *) (pc + 4)
-                       ));
+    CALL_PolygonOffset( GET_DISPATCH(), (
+        *(GLfloat  *)(pc +  0),
+        *(GLfloat  *)(pc +  4)
+    ) );
 }
 
-int
-__glXDisp_AreTexturesResident(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_AreTexturesResident(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLsizei n = *(GLsizei *) (pc + 0);
+    if ( cx != NULL ) {
+        const GLsizei n = *(GLsizei  *)(pc +  0);
 
         GLboolean retval;
         GLboolean answerBuffer[200];
-        GLboolean *residences =
-            __glXGetAnswerBuffer(cl, n, answerBuffer, sizeof(answerBuffer), 1);
-        retval =
-            CALL_AreTexturesResident(GET_DISPATCH(),
-                                     (n, (const GLuint *) (pc + 4),
-                                      residences));
+        GLboolean * residences = __glXGetAnswerBuffer(cl, n, answerBuffer, sizeof(answerBuffer), 1);
+        retval = CALL_AreTexturesResident( GET_DISPATCH(), (
+            n,
+             (const GLuint *)(pc +  4),
+            residences
+        ) );
         __glXSendReply(cl->client, residences, n, 1, GL_TRUE, retval);
         error = Success;
     }
@@ -2716,25 +2760,24 @@ __glXDisp_AreTexturesResident(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_AreTexturesResidentEXT(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_AreTexturesResidentEXT(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLsizei n = *(GLsizei *) (pc + 0);
+    if ( cx != NULL ) {
+        const GLsizei n = *(GLsizei  *)(pc +  0);
 
         GLboolean retval;
         GLboolean answerBuffer[200];
-        GLboolean *residences =
-            __glXGetAnswerBuffer(cl, n, answerBuffer, sizeof(answerBuffer), 1);
-        retval =
-            CALL_AreTexturesResident(GET_DISPATCH(),
-                                     (n, (const GLuint *) (pc + 4),
-                                      residences));
+        GLboolean * residences = __glXGetAnswerBuffer(cl, n, answerBuffer, sizeof(answerBuffer), 1);
+        retval = CALL_AreTexturesResident( GET_DISPATCH(), (
+            n,
+             (const GLuint *)(pc +  4),
+            residences
+        ) );
         __glXSendReply(cl->client, residences, n, 1, GL_TRUE, retval);
         error = Success;
     }
@@ -2742,113 +2785,115 @@ __glXDisp_AreTexturesResidentEXT(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-void
-__glXDisp_CopyTexImage1D(GLbyte * pc)
+void __glXDisp_CopyTexImage1D(GLbyte * pc)
 {
-    CALL_CopyTexImage1D(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                         *(GLint *) (pc + 4),
-                                         *(GLenum *) (pc + 8),
-                                         *(GLint *) (pc + 12),
-                                         *(GLint *) (pc + 16),
-                                         *(GLsizei *) (pc + 20),
-                                         *(GLint *) (pc + 24)
-                        ));
+    CALL_CopyTexImage1D( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLint    *)(pc +  4),
+        *(GLenum   *)(pc +  8),
+        *(GLint    *)(pc + 12),
+        *(GLint    *)(pc + 16),
+        *(GLsizei  *)(pc + 20),
+        *(GLint    *)(pc + 24)
+    ) );
 }
 
-void
-__glXDisp_CopyTexImage2D(GLbyte * pc)
+void __glXDisp_CopyTexImage2D(GLbyte * pc)
 {
-    CALL_CopyTexImage2D(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                         *(GLint *) (pc + 4),
-                                         *(GLenum *) (pc + 8),
-                                         *(GLint *) (pc + 12),
-                                         *(GLint *) (pc + 16),
-                                         *(GLsizei *) (pc + 20),
-                                         *(GLsizei *) (pc + 24),
-                                         *(GLint *) (pc + 28)
-                        ));
+    CALL_CopyTexImage2D( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLint    *)(pc +  4),
+        *(GLenum   *)(pc +  8),
+        *(GLint    *)(pc + 12),
+        *(GLint    *)(pc + 16),
+        *(GLsizei  *)(pc + 20),
+        *(GLsizei  *)(pc + 24),
+        *(GLint    *)(pc + 28)
+    ) );
 }
 
-void
-__glXDisp_CopyTexSubImage1D(GLbyte * pc)
+void __glXDisp_CopyTexSubImage1D(GLbyte * pc)
 {
-    CALL_CopyTexSubImage1D(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                            *(GLint *) (pc + 4),
-                                            *(GLint *) (pc + 8),
-                                            *(GLint *) (pc + 12),
-                                            *(GLint *) (pc + 16),
-                                            *(GLsizei *) (pc + 20)
-                           ));
+    CALL_CopyTexSubImage1D( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLint    *)(pc +  4),
+        *(GLint    *)(pc +  8),
+        *(GLint    *)(pc + 12),
+        *(GLint    *)(pc + 16),
+        *(GLsizei  *)(pc + 20)
+    ) );
 }
 
-void
-__glXDisp_CopyTexSubImage2D(GLbyte * pc)
+void __glXDisp_CopyTexSubImage2D(GLbyte * pc)
 {
-    CALL_CopyTexSubImage2D(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                            *(GLint *) (pc + 4),
-                                            *(GLint *) (pc + 8),
-                                            *(GLint *) (pc + 12),
-                                            *(GLint *) (pc + 16),
-                                            *(GLint *) (pc + 20),
-                                            *(GLsizei *) (pc + 24),
-                                            *(GLsizei *) (pc + 28)
-                           ));
+    CALL_CopyTexSubImage2D( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLint    *)(pc +  4),
+        *(GLint    *)(pc +  8),
+        *(GLint    *)(pc + 12),
+        *(GLint    *)(pc + 16),
+        *(GLint    *)(pc + 20),
+        *(GLsizei  *)(pc + 24),
+        *(GLsizei  *)(pc + 28)
+    ) );
 }
 
-int
-__glXDisp_DeleteTextures(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_DeleteTextures(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLsizei n = *(GLsizei *) (pc + 0);
+    if ( cx != NULL ) {
+        const GLsizei n = *(GLsizei  *)(pc +  0);
 
-        CALL_DeleteTextures(GET_DISPATCH(), (n, (const GLuint *) (pc + 4)
-                            ));
+        CALL_DeleteTextures( GET_DISPATCH(), (
+            n,
+             (const GLuint *)(pc +  4)
+        ) );
         error = Success;
     }
 
     return error;
 }
 
-int
-__glXDisp_DeleteTexturesEXT(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_DeleteTexturesEXT(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLsizei n = *(GLsizei *) (pc + 0);
+    if ( cx != NULL ) {
+        const GLsizei n = *(GLsizei  *)(pc +  0);
 
-        CALL_DeleteTextures(GET_DISPATCH(), (n, (const GLuint *) (pc + 4)
-                            ));
+        CALL_DeleteTextures( GET_DISPATCH(), (
+            n,
+             (const GLuint *)(pc +  4)
+        ) );
         error = Success;
     }
 
     return error;
 }
 
-int
-__glXDisp_GenTextures(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GenTextures(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLsizei n = *(GLsizei *) (pc + 0);
+    if ( cx != NULL ) {
+        const GLsizei n = *(GLsizei  *)(pc +  0);
 
         GLuint answerBuffer[200];
-        GLuint *textures =
-            __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer),
-                                 4);
-        CALL_GenTextures(GET_DISPATCH(), (n, textures));
+        GLuint * textures = __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer), 4);
+        CALL_GenTextures( GET_DISPATCH(), (
+            n,
+            textures
+        ) );
         __glXSendReply(cl->client, textures, n, 4, GL_TRUE, 0);
         error = Success;
     }
@@ -2856,22 +2901,22 @@ __glXDisp_GenTextures(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_GenTexturesEXT(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GenTexturesEXT(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLsizei n = *(GLsizei *) (pc + 0);
+    if ( cx != NULL ) {
+        const GLsizei n = *(GLsizei  *)(pc +  0);
 
         GLuint answerBuffer[200];
-        GLuint *textures =
-            __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer),
-                                 4);
-        CALL_GenTextures(GET_DISPATCH(), (n, textures));
+        GLuint * textures = __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer), 4);
+        CALL_GenTextures( GET_DISPATCH(), (
+            n,
+            textures
+        ) );
         __glXSendReply(cl->client, textures, n, 4, GL_TRUE, 0);
         error = Success;
     }
@@ -2879,19 +2924,18 @@ __glXDisp_GenTexturesEXT(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_IsTexture(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_IsTexture(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
+    if ( cx != NULL ) {
         GLboolean retval;
-
-        retval = CALL_IsTexture(GET_DISPATCH(), (*(GLuint *) (pc + 0)
-                                ));
+        retval = CALL_IsTexture( GET_DISPATCH(), (
+            *(GLuint   *)(pc +  0)
+        ) );
         __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
         error = Success;
     }
@@ -2899,19 +2943,18 @@ __glXDisp_IsTexture(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_IsTextureEXT(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_IsTextureEXT(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
+    if ( cx != NULL ) {
         GLboolean retval;
-
-        retval = CALL_IsTexture(GET_DISPATCH(), (*(GLuint *) (pc + 0)
-                                ));
+        retval = CALL_IsTexture( GET_DISPATCH(), (
+            *(GLuint   *)(pc +  0)
+        ) );
         __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
         error = Success;
     }
@@ -2919,168 +2962,165 @@ __glXDisp_IsTextureEXT(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-void
-__glXDisp_PrioritizeTextures(GLbyte * pc)
+void __glXDisp_PrioritizeTextures(GLbyte * pc)
 {
-    const GLsizei n = *(GLsizei *) (pc + 0);
+    const GLsizei n = *(GLsizei  *)(pc +  0);
 
-    CALL_PrioritizeTextures(GET_DISPATCH(), (n,
-                                             (const GLuint *) (pc + 4),
-                                             (const GLclampf *) (pc + 4)
-                            ));
+    CALL_PrioritizeTextures( GET_DISPATCH(), (
+        n,
+         (const GLuint *)(pc +  4),
+         (const GLclampf *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_TexSubImage1D(GLbyte * pc)
+void __glXDisp_TexSubImage1D(GLbyte * pc)
 {
-    const GLvoid *const pixels = (const GLvoid *) ((pc + 56));
-    __GLXpixelHeader *const hdr = (__GLXpixelHeader *) (pc);
+    const GLvoid * const pixels = (const GLvoid *) (pc + 56);
+    __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment));
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES,   hdr->swapBytes) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST,    hdr->lsbFirst) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,   (GLint) hdr->rowLength) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,    (GLint) hdr->skipRows) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,  (GLint) hdr->skipPixels) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT,    (GLint) hdr->alignment) );
 
-    CALL_TexSubImage1D(GET_DISPATCH(), (*(GLenum *) (pc + 20),
-                                        *(GLint *) (pc + 24),
-                                        *(GLint *) (pc + 28),
-                                        *(GLsizei *) (pc + 36),
-                                        *(GLenum *) (pc + 44),
-                                        *(GLenum *) (pc + 48), pixels));
+    CALL_TexSubImage1D( GET_DISPATCH(), (
+        *(GLenum   *)(pc + 20),
+        *(GLint    *)(pc + 24),
+        *(GLint    *)(pc + 28),
+        *(GLsizei  *)(pc + 36),
+        *(GLenum   *)(pc + 44),
+        *(GLenum   *)(pc + 48),
+        pixels
+    ) );
 }
 
-void
-__glXDisp_TexSubImage2D(GLbyte * pc)
+void __glXDisp_TexSubImage2D(GLbyte * pc)
 {
-    const GLvoid *const pixels = (const GLvoid *) ((pc + 56));
-    __GLXpixelHeader *const hdr = (__GLXpixelHeader *) (pc);
+    const GLvoid * const pixels = (const GLvoid *) (pc + 56);
+    __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment));
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES,   hdr->swapBytes) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST,    hdr->lsbFirst) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,   (GLint) hdr->rowLength) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,    (GLint) hdr->skipRows) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,  (GLint) hdr->skipPixels) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT,    (GLint) hdr->alignment) );
 
-    CALL_TexSubImage2D(GET_DISPATCH(), (*(GLenum *) (pc + 20),
-                                        *(GLint *) (pc + 24),
-                                        *(GLint *) (pc + 28),
-                                        *(GLint *) (pc + 32),
-                                        *(GLsizei *) (pc + 36),
-                                        *(GLsizei *) (pc + 40),
-                                        *(GLenum *) (pc + 44),
-                                        *(GLenum *) (pc + 48), pixels));
+    CALL_TexSubImage2D( GET_DISPATCH(), (
+        *(GLenum   *)(pc + 20),
+        *(GLint    *)(pc + 24),
+        *(GLint    *)(pc + 28),
+        *(GLint    *)(pc + 32),
+        *(GLsizei  *)(pc + 36),
+        *(GLsizei  *)(pc + 40),
+        *(GLenum   *)(pc + 44),
+        *(GLenum   *)(pc + 48),
+        pixels
+    ) );
 }
 
-void
-__glXDisp_BlendColor(GLbyte * pc)
+void __glXDisp_BlendColor(GLbyte * pc)
 {
-    CALL_BlendColor(GET_DISPATCH(), (*(GLclampf *) (pc + 0),
-                                     *(GLclampf *) (pc + 4),
-                                     *(GLclampf *) (pc + 8),
-                                     *(GLclampf *) (pc + 12)
-                    ));
+    CALL_BlendColor( GET_DISPATCH(), (
+        *(GLclampf *)(pc +  0),
+        *(GLclampf *)(pc +  4),
+        *(GLclampf *)(pc +  8),
+        *(GLclampf *)(pc + 12)
+    ) );
 }
 
-void
-__glXDisp_BlendEquation(GLbyte * pc)
+void __glXDisp_BlendEquation(GLbyte * pc)
 {
-    CALL_BlendEquation(GET_DISPATCH(), (*(GLenum *) (pc + 0)
-                       ));
+    CALL_BlendEquation( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_ColorTable(GLbyte * pc)
+void __glXDisp_ColorTable(GLbyte * pc)
 {
-    const GLvoid *const table = (const GLvoid *) ((pc + 40));
-    __GLXpixelHeader *const hdr = (__GLXpixelHeader *) (pc);
+    const GLvoid * const table = (const GLvoid *) (pc + 40);
+    __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment));
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES,   hdr->swapBytes) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST,    hdr->lsbFirst) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,   (GLint) hdr->rowLength) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,    (GLint) hdr->skipRows) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,  (GLint) hdr->skipPixels) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT,    (GLint) hdr->alignment) );
 
-    CALL_ColorTable(GET_DISPATCH(), (*(GLenum *) (pc + 20),
-                                     *(GLenum *) (pc + 24),
-                                     *(GLsizei *) (pc + 28),
-                                     *(GLenum *) (pc + 32),
-                                     *(GLenum *) (pc + 36), table));
+    CALL_ColorTable( GET_DISPATCH(), (
+        *(GLenum   *)(pc + 20),
+        *(GLenum   *)(pc + 24),
+        *(GLsizei  *)(pc + 28),
+        *(GLenum   *)(pc + 32),
+        *(GLenum   *)(pc + 36),
+        table
+    ) );
 }
 
-void
-__glXDisp_ColorTableParameterfv(GLbyte * pc)
-{
-    const GLenum pname = *(GLenum *) (pc + 4);
-    const GLfloat *params;
+void __glXDisp_ColorTableParameterfv(GLbyte * pc)
+{
+    const GLenum pname = *(GLenum   *)(pc +  4);
+    const GLfloat * params;
 
     params = (const GLfloat *) (pc + 8);
 
-    CALL_ColorTableParameterfv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                pname, params));
+    CALL_ColorTableParameterfv( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        pname,
+        params
+    ) );
 }
 
-void
-__glXDisp_ColorTableParameteriv(GLbyte * pc)
+void __glXDisp_ColorTableParameteriv(GLbyte * pc)
 {
-    const GLenum pname = *(GLenum *) (pc + 4);
-    const GLint *params;
+    const GLenum pname = *(GLenum   *)(pc +  4);
+    const GLint * params;
 
     params = (const GLint *) (pc + 8);
 
-    CALL_ColorTableParameteriv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                pname, params));
+    CALL_ColorTableParameteriv( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        pname,
+        params
+    ) );
 }
 
-void
-__glXDisp_CopyColorTable(GLbyte * pc)
+void __glXDisp_CopyColorTable(GLbyte * pc)
 {
-    CALL_CopyColorTable(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                         *(GLenum *) (pc + 4),
-                                         *(GLint *) (pc + 8),
-                                         *(GLint *) (pc + 12),
-                                         *(GLsizei *) (pc + 16)
-                        ));
+    CALL_CopyColorTable( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLenum   *)(pc +  4),
+        *(GLint    *)(pc +  8),
+        *(GLint    *)(pc + 12),
+        *(GLsizei  *)(pc + 16)
+    ) );
 }
 
-int
-__glXDisp_GetColorTableParameterfv(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetColorTableParameterfv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = *(GLenum *) (pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname = *(GLenum   *)(pc +  4);
 
         const GLuint compsize = __glGetColorTableParameterfv_size(pname);
         GLfloat answerBuffer[200];
-        GLfloat *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetColorTableParameterfv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                       pname, params));
+        CALL_GetColorTableParameterfv( GET_DISPATCH(), (
+            *(GLenum   *)(pc +  0),
+            pname,
+            params
+        ) );
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -3088,29 +3128,28 @@ __glXDisp_GetColorTableParameterfv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_GetColorTableParameterfvSGI(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetColorTableParameterfvSGI(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = *(GLenum *) (pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname = *(GLenum   *)(pc +  4);
 
         const GLuint compsize = __glGetColorTableParameterfv_size(pname);
         GLfloat answerBuffer[200];
-        GLfloat *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetColorTableParameterfv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                       pname, params));
+        CALL_GetColorTableParameterfv( GET_DISPATCH(), (
+            *(GLenum   *)(pc +  0),
+            pname,
+            params
+        ) );
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -3118,29 +3157,28 @@ __glXDisp_GetColorTableParameterfvSGI(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_GetColorTableParameteriv(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetColorTableParameteriv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = *(GLenum *) (pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname = *(GLenum   *)(pc +  4);
 
         const GLuint compsize = __glGetColorTableParameteriv_size(pname);
         GLint answerBuffer[200];
-        GLint *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetColorTableParameteriv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                       pname, params));
+        CALL_GetColorTableParameteriv( GET_DISPATCH(), (
+            *(GLenum   *)(pc +  0),
+            pname,
+            params
+        ) );
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -3148,29 +3186,28 @@ __glXDisp_GetColorTableParameteriv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_GetColorTableParameterivSGI(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetColorTableParameterivSGI(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = *(GLenum *) (pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname = *(GLenum   *)(pc +  4);
 
         const GLuint compsize = __glGetColorTableParameteriv_size(pname);
         GLint answerBuffer[200];
-        GLint *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetColorTableParameteriv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                       pname, params));
+        CALL_GetColorTableParameteriv( GET_DISPATCH(), (
+            *(GLenum   *)(pc +  0),
+            pname,
+            params
+        ) );
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -3178,178 +3215,175 @@ __glXDisp_GetColorTableParameterivSGI(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-void
-__glXDisp_ColorSubTable(GLbyte * pc)
+void __glXDisp_ColorSubTable(GLbyte * pc)
 {
-    const GLvoid *const data = (const GLvoid *) ((pc + 40));
-    __GLXpixelHeader *const hdr = (__GLXpixelHeader *) (pc);
+    const GLvoid * const data = (const GLvoid *) (pc + 40);
+    __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment));
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES,   hdr->swapBytes) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST,    hdr->lsbFirst) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,   (GLint) hdr->rowLength) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,    (GLint) hdr->skipRows) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,  (GLint) hdr->skipPixels) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT,    (GLint) hdr->alignment) );
 
-    CALL_ColorSubTable(GET_DISPATCH(), (*(GLenum *) (pc + 20),
-                                        *(GLsizei *) (pc + 24),
-                                        *(GLsizei *) (pc + 28),
-                                        *(GLenum *) (pc + 32),
-                                        *(GLenum *) (pc + 36), data));
+    CALL_ColorSubTable( GET_DISPATCH(), (
+        *(GLenum   *)(pc + 20),
+        *(GLsizei  *)(pc + 24),
+        *(GLsizei  *)(pc + 28),
+        *(GLenum   *)(pc + 32),
+        *(GLenum   *)(pc + 36),
+        data
+    ) );
 }
 
-void
-__glXDisp_CopyColorSubTable(GLbyte * pc)
+void __glXDisp_CopyColorSubTable(GLbyte * pc)
 {
-    CALL_CopyColorSubTable(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                            *(GLsizei *) (pc + 4),
-                                            *(GLint *) (pc + 8),
-                                            *(GLint *) (pc + 12),
-                                            *(GLsizei *) (pc + 16)
-                           ));
+    CALL_CopyColorSubTable( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLsizei  *)(pc +  4),
+        *(GLint    *)(pc +  8),
+        *(GLint    *)(pc + 12),
+        *(GLsizei  *)(pc + 16)
+    ) );
 }
 
-void
-__glXDisp_ConvolutionFilter1D(GLbyte * pc)
+void __glXDisp_ConvolutionFilter1D(GLbyte * pc)
 {
-    const GLvoid *const image = (const GLvoid *) ((pc + 44));
-    __GLXpixelHeader *const hdr = (__GLXpixelHeader *) (pc);
+    const GLvoid * const image = (const GLvoid *) (pc + 44);
+    __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment));
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES,   hdr->swapBytes) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST,    hdr->lsbFirst) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,   (GLint) hdr->rowLength) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,    (GLint) hdr->skipRows) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,  (GLint) hdr->skipPixels) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT,    (GLint) hdr->alignment) );
 
-    CALL_ConvolutionFilter1D(GET_DISPATCH(), (*(GLenum *) (pc + 20),
-                                              *(GLenum *) (pc + 24),
-                                              *(GLsizei *) (pc + 28),
-                                              *(GLenum *) (pc + 36),
-                                              *(GLenum *) (pc + 40), image));
+    CALL_ConvolutionFilter1D( GET_DISPATCH(), (
+        *(GLenum   *)(pc + 20),
+        *(GLenum   *)(pc + 24),
+        *(GLsizei  *)(pc + 28),
+        *(GLenum   *)(pc + 36),
+        *(GLenum   *)(pc + 40),
+        image
+    ) );
 }
 
-void
-__glXDisp_ConvolutionFilter2D(GLbyte * pc)
+void __glXDisp_ConvolutionFilter2D(GLbyte * pc)
 {
-    const GLvoid *const image = (const GLvoid *) ((pc + 44));
-    __GLXpixelHeader *const hdr = (__GLXpixelHeader *) (pc);
+    const GLvoid * const image = (const GLvoid *) (pc + 44);
+    __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment));
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES,   hdr->swapBytes) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST,    hdr->lsbFirst) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,   (GLint) hdr->rowLength) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,    (GLint) hdr->skipRows) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,  (GLint) hdr->skipPixels) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT,    (GLint) hdr->alignment) );
 
-    CALL_ConvolutionFilter2D(GET_DISPATCH(), (*(GLenum *) (pc + 20),
-                                              *(GLenum *) (pc + 24),
-                                              *(GLsizei *) (pc + 28),
-                                              *(GLsizei *) (pc + 32),
-                                              *(GLenum *) (pc + 36),
-                                              *(GLenum *) (pc + 40), image));
+    CALL_ConvolutionFilter2D( GET_DISPATCH(), (
+        *(GLenum   *)(pc + 20),
+        *(GLenum   *)(pc + 24),
+        *(GLsizei  *)(pc + 28),
+        *(GLsizei  *)(pc + 32),
+        *(GLenum   *)(pc + 36),
+        *(GLenum   *)(pc + 40),
+        image
+    ) );
 }
 
-void
-__glXDisp_ConvolutionParameterf(GLbyte * pc)
+void __glXDisp_ConvolutionParameterf(GLbyte * pc)
 {
-    CALL_ConvolutionParameterf(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                *(GLenum *) (pc + 4),
-                                                *(GLfloat *) (pc + 8)
-                               ));
+    CALL_ConvolutionParameterf( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLenum   *)(pc +  4),
+        *(GLfloat  *)(pc +  8)
+    ) );
 }
 
-void
-__glXDisp_ConvolutionParameterfv(GLbyte * pc)
+void __glXDisp_ConvolutionParameterfv(GLbyte * pc)
 {
-    const GLenum pname = *(GLenum *) (pc + 4);
-    const GLfloat *params;
+    const GLenum pname = *(GLenum   *)(pc +  4);
+    const GLfloat * params;
 
     params = (const GLfloat *) (pc + 8);
 
-    CALL_ConvolutionParameterfv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                 pname, params));
+    CALL_ConvolutionParameterfv( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        pname,
+        params
+    ) );
 }
 
-void
-__glXDisp_ConvolutionParameteri(GLbyte * pc)
+void __glXDisp_ConvolutionParameteri(GLbyte * pc)
 {
-    CALL_ConvolutionParameteri(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                *(GLenum *) (pc + 4),
-                                                *(GLint *) (pc + 8)
-                               ));
+    CALL_ConvolutionParameteri( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLenum   *)(pc +  4),
+        *(GLint    *)(pc +  8)
+    ) );
 }
 
-void
-__glXDisp_ConvolutionParameteriv(GLbyte * pc)
+void __glXDisp_ConvolutionParameteriv(GLbyte * pc)
 {
-    const GLenum pname = *(GLenum *) (pc + 4);
-    const GLint *params;
+    const GLenum pname = *(GLenum   *)(pc +  4);
+    const GLint * params;
 
     params = (const GLint *) (pc + 8);
 
-    CALL_ConvolutionParameteriv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                 pname, params));
+    CALL_ConvolutionParameteriv( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        pname,
+        params
+    ) );
 }
 
-void
-__glXDisp_CopyConvolutionFilter1D(GLbyte * pc)
+void __glXDisp_CopyConvolutionFilter1D(GLbyte * pc)
 {
-    CALL_CopyConvolutionFilter1D(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                  *(GLenum *) (pc + 4),
-                                                  *(GLint *) (pc + 8),
-                                                  *(GLint *) (pc + 12),
-                                                  *(GLsizei *) (pc + 16)
-                                 ));
+    CALL_CopyConvolutionFilter1D( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLenum   *)(pc +  4),
+        *(GLint    *)(pc +  8),
+        *(GLint    *)(pc + 12),
+        *(GLsizei  *)(pc + 16)
+    ) );
 }
 
-void
-__glXDisp_CopyConvolutionFilter2D(GLbyte * pc)
+void __glXDisp_CopyConvolutionFilter2D(GLbyte * pc)
 {
-    CALL_CopyConvolutionFilter2D(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                  *(GLenum *) (pc + 4),
-                                                  *(GLint *) (pc + 8),
-                                                  *(GLint *) (pc + 12),
-                                                  *(GLsizei *) (pc + 16),
-                                                  *(GLsizei *) (pc + 20)
-                                 ));
+    CALL_CopyConvolutionFilter2D( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLenum   *)(pc +  4),
+        *(GLint    *)(pc +  8),
+        *(GLint    *)(pc + 12),
+        *(GLsizei  *)(pc + 16),
+        *(GLsizei  *)(pc + 20)
+    ) );
 }
 
-int
-__glXDisp_GetConvolutionParameterfv(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetConvolutionParameterfv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = *(GLenum *) (pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname = *(GLenum   *)(pc +  4);
 
         const GLuint compsize = __glGetConvolutionParameterfv_size(pname);
         GLfloat answerBuffer[200];
-        GLfloat *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetConvolutionParameterfv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                        pname, params));
+        CALL_GetConvolutionParameterfv( GET_DISPATCH(), (
+            *(GLenum   *)(pc +  0),
+            pname,
+            params
+        ) );
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -3357,29 +3391,28 @@ __glXDisp_GetConvolutionParameterfv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_GetConvolutionParameterfvEXT(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetConvolutionParameterfvEXT(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = *(GLenum *) (pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname = *(GLenum   *)(pc +  4);
 
         const GLuint compsize = __glGetConvolutionParameterfv_size(pname);
         GLfloat answerBuffer[200];
-        GLfloat *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetConvolutionParameterfv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                        pname, params));
+        CALL_GetConvolutionParameterfv( GET_DISPATCH(), (
+            *(GLenum   *)(pc +  0),
+            pname,
+            params
+        ) );
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -3387,29 +3420,28 @@ __glXDisp_GetConvolutionParameterfvEXT(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_GetConvolutionParameteriv(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetConvolutionParameteriv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = *(GLenum *) (pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname = *(GLenum   *)(pc +  4);
 
         const GLuint compsize = __glGetConvolutionParameteriv_size(pname);
         GLint answerBuffer[200];
-        GLint *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetConvolutionParameteriv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                        pname, params));
+        CALL_GetConvolutionParameteriv( GET_DISPATCH(), (
+            *(GLenum   *)(pc +  0),
+            pname,
+            params
+        ) );
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -3417,29 +3449,28 @@ __glXDisp_GetConvolutionParameteriv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_GetConvolutionParameterivEXT(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetConvolutionParameterivEXT(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = *(GLenum *) (pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname = *(GLenum   *)(pc +  4);
 
         const GLuint compsize = __glGetConvolutionParameteriv_size(pname);
         GLint answerBuffer[200];
-        GLint *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetConvolutionParameteriv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                        pname, params));
+        CALL_GetConvolutionParameteriv( GET_DISPATCH(), (
+            *(GLenum   *)(pc +  0),
+            pname,
+            params
+        ) );
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -3447,29 +3478,28 @@ __glXDisp_GetConvolutionParameterivEXT(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_GetHistogramParameterfv(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetHistogramParameterfv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = *(GLenum *) (pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname = *(GLenum   *)(pc +  4);
 
         const GLuint compsize = __glGetHistogramParameterfv_size(pname);
         GLfloat answerBuffer[200];
-        GLfloat *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetHistogramParameterfv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                      pname, params));
+        CALL_GetHistogramParameterfv( GET_DISPATCH(), (
+            *(GLenum   *)(pc +  0),
+            pname,
+            params
+        ) );
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -3477,29 +3507,28 @@ __glXDisp_GetHistogramParameterfv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_GetHistogramParameterfvEXT(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetHistogramParameterfvEXT(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = *(GLenum *) (pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname = *(GLenum   *)(pc +  4);
 
         const GLuint compsize = __glGetHistogramParameterfv_size(pname);
         GLfloat answerBuffer[200];
-        GLfloat *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetHistogramParameterfv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                      pname, params));
+        CALL_GetHistogramParameterfv( GET_DISPATCH(), (
+            *(GLenum   *)(pc +  0),
+            pname,
+            params
+        ) );
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -3507,29 +3536,28 @@ __glXDisp_GetHistogramParameterfvEXT(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_GetHistogramParameteriv(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetHistogramParameteriv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = *(GLenum *) (pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname = *(GLenum   *)(pc +  4);
 
         const GLuint compsize = __glGetHistogramParameteriv_size(pname);
         GLint answerBuffer[200];
-        GLint *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetHistogramParameteriv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                      pname, params));
+        CALL_GetHistogramParameteriv( GET_DISPATCH(), (
+            *(GLenum   *)(pc +  0),
+            pname,
+            params
+        ) );
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -3537,29 +3565,28 @@ __glXDisp_GetHistogramParameteriv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_GetHistogramParameterivEXT(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetHistogramParameterivEXT(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = *(GLenum *) (pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname = *(GLenum   *)(pc +  4);
 
         const GLuint compsize = __glGetHistogramParameteriv_size(pname);
         GLint answerBuffer[200];
-        GLint *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetHistogramParameteriv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                      pname, params));
+        CALL_GetHistogramParameteriv( GET_DISPATCH(), (
+            *(GLenum   *)(pc +  0),
+            pname,
+            params
+        ) );
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -3567,29 +3594,28 @@ __glXDisp_GetHistogramParameterivEXT(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_GetMinmaxParameterfv(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetMinmaxParameterfv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = *(GLenum *) (pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname = *(GLenum   *)(pc +  4);
 
         const GLuint compsize = __glGetMinmaxParameterfv_size(pname);
         GLfloat answerBuffer[200];
-        GLfloat *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetMinmaxParameterfv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                   pname, params));
+        CALL_GetMinmaxParameterfv( GET_DISPATCH(), (
+            *(GLenum   *)(pc +  0),
+            pname,
+            params
+        ) );
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -3597,29 +3623,28 @@ __glXDisp_GetMinmaxParameterfv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_GetMinmaxParameterfvEXT(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetMinmaxParameterfvEXT(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = *(GLenum *) (pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname = *(GLenum   *)(pc +  4);
 
         const GLuint compsize = __glGetMinmaxParameterfv_size(pname);
         GLfloat answerBuffer[200];
-        GLfloat *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetMinmaxParameterfv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                   pname, params));
+        CALL_GetMinmaxParameterfv( GET_DISPATCH(), (
+            *(GLenum   *)(pc +  0),
+            pname,
+            params
+        ) );
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -3627,29 +3652,28 @@ __glXDisp_GetMinmaxParameterfvEXT(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_GetMinmaxParameteriv(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetMinmaxParameteriv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = *(GLenum *) (pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname = *(GLenum   *)(pc +  4);
 
         const GLuint compsize = __glGetMinmaxParameteriv_size(pname);
         GLint answerBuffer[200];
-        GLint *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetMinmaxParameteriv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                   pname, params));
+        CALL_GetMinmaxParameteriv( GET_DISPATCH(), (
+            *(GLenum   *)(pc +  0),
+            pname,
+            params
+        ) );
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -3657,29 +3681,28 @@ __glXDisp_GetMinmaxParameteriv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_GetMinmaxParameterivEXT(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetMinmaxParameterivEXT(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = *(GLenum *) (pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname = *(GLenum   *)(pc +  4);
 
         const GLuint compsize = __glGetMinmaxParameteriv_size(pname);
         GLint answerBuffer[200];
-        GLint *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetMinmaxParameteriv(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                   pname, params));
+        CALL_GetMinmaxParameteriv( GET_DISPATCH(), (
+            *(GLenum   *)(pc +  0),
+            pname,
+            params
+        ) );
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -3687,497 +3710,649 @@ __glXDisp_GetMinmaxParameterivEXT(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-void
-__glXDisp_Histogram(GLbyte * pc)
-{
-    CALL_Histogram(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                    *(GLsizei *) (pc + 4),
-                                    *(GLenum *) (pc + 8),
-                                    *(GLboolean *) (pc + 12)
-                   ));
-}
-
-void
-__glXDisp_Minmax(GLbyte * pc)
-{
-    CALL_Minmax(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                 *(GLenum *) (pc + 4), *(GLboolean *) (pc + 8)
-                ));
-}
-
-void
-__glXDisp_ResetHistogram(GLbyte * pc)
+void __glXDisp_Histogram(GLbyte * pc)
+{
+    CALL_Histogram( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLsizei  *)(pc +  4),
+        *(GLenum   *)(pc +  8),
+        *(GLboolean *)(pc + 12)
+    ) );
+}
+
+void __glXDisp_Minmax(GLbyte * pc)
 {
-    CALL_ResetHistogram(GET_DISPATCH(), (*(GLenum *) (pc + 0)
-                        ));
+    CALL_Minmax( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLenum   *)(pc +  4),
+        *(GLboolean *)(pc +  8)
+    ) );
 }
 
-void
-__glXDisp_ResetMinmax(GLbyte * pc)
+void __glXDisp_ResetHistogram(GLbyte * pc)
 {
-    CALL_ResetMinmax(GET_DISPATCH(), (*(GLenum *) (pc + 0)
-                     ));
+    CALL_ResetHistogram( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_TexImage3D(GLbyte * pc)
+void __glXDisp_ResetMinmax(GLbyte * pc)
 {
-    const CARD32 ptr_is_null = *(CARD32 *) (pc + 76);
-    const GLvoid *const pixels =
-        (const GLvoid *) ((ptr_is_null != 0) ? NULL : (pc + 80));
-    __GLXpixel3DHeader *const hdr = (__GLXpixel3DHeader *) (pc);
+    CALL_ResetMinmax( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0)
+    ) );
+}
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_IMAGE_HEIGHT, (GLint) hdr->imageHeight));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_IMAGES, (GLint) hdr->skipImages));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment));
+void __glXDisp_TexImage3D(GLbyte * pc)
+{
+    const CARD32 ptr_is_null = *(CARD32 *)(pc + 76);
+    const GLvoid * const pixels = (const GLvoid *) ((ptr_is_null != 0) ? NULL : (pc + 80));
+    __GLXpixel3DHeader * const hdr = (__GLXpixel3DHeader *)(pc);
 
-    CALL_TexImage3D(GET_DISPATCH(), (*(GLenum *) (pc + 36),
-                                     *(GLint *) (pc + 40),
-                                     *(GLint *) (pc + 44),
-                                     *(GLsizei *) (pc + 48),
-                                     *(GLsizei *) (pc + 52),
-                                     *(GLsizei *) (pc + 56),
-                                     *(GLint *) (pc + 64),
-                                     *(GLenum *) (pc + 68),
-                                     *(GLenum *) (pc + 72), pixels));
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES,   hdr->swapBytes) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST,    hdr->lsbFirst) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,   (GLint) hdr->rowLength) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_IMAGE_HEIGHT, (GLint) hdr->imageHeight) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,    (GLint) hdr->skipRows) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_IMAGES,  (GLint) hdr->skipImages) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,  (GLint) hdr->skipPixels) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT,    (GLint) hdr->alignment) );
+
+    CALL_TexImage3D( GET_DISPATCH(), (
+        *(GLenum   *)(pc + 36),
+        *(GLint    *)(pc + 40),
+        *(GLint    *)(pc + 44),
+        *(GLsizei  *)(pc + 48),
+        *(GLsizei  *)(pc + 52),
+        *(GLsizei  *)(pc + 56),
+        *(GLint    *)(pc + 64),
+        *(GLenum   *)(pc + 68),
+        *(GLenum   *)(pc + 72),
+        pixels
+    ) );
 }
 
-void
-__glXDisp_TexSubImage3D(GLbyte * pc)
+void __glXDisp_TexSubImage3D(GLbyte * pc)
 {
-    const GLvoid *const pixels = (const GLvoid *) ((pc + 88));
-    __GLXpixel3DHeader *const hdr = (__GLXpixel3DHeader *) (pc);
+    const GLvoid * const pixels = (const GLvoid *) (pc + 88);
+    __GLXpixel3DHeader * const hdr = (__GLXpixel3DHeader *)(pc);
+
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES,   hdr->swapBytes) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST,    hdr->lsbFirst) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,   (GLint) hdr->rowLength) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_IMAGE_HEIGHT, (GLint) hdr->imageHeight) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,    (GLint) hdr->skipRows) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_IMAGES,  (GLint) hdr->skipImages) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,  (GLint) hdr->skipPixels) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT,    (GLint) hdr->alignment) );
+
+    CALL_TexSubImage3D( GET_DISPATCH(), (
+        *(GLenum   *)(pc + 36),
+        *(GLint    *)(pc + 40),
+        *(GLint    *)(pc + 44),
+        *(GLint    *)(pc + 48),
+        *(GLint    *)(pc + 52),
+        *(GLsizei  *)(pc + 60),
+        *(GLsizei  *)(pc + 64),
+        *(GLsizei  *)(pc + 68),
+        *(GLenum   *)(pc + 76),
+        *(GLenum   *)(pc + 80),
+        pixels
+    ) );
+}
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ROW_LENGTH, (GLint) hdr->rowLength));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_IMAGE_HEIGHT, (GLint) hdr->imageHeight));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_ROWS, (GLint) hdr->skipRows));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_IMAGES, (GLint) hdr->skipImages));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_PIXELS, (GLint) hdr->skipPixels));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ALIGNMENT, (GLint) hdr->alignment));
+void __glXDisp_CopyTexSubImage3D(GLbyte * pc)
+{
+    CALL_CopyTexSubImage3D( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLint    *)(pc +  4),
+        *(GLint    *)(pc +  8),
+        *(GLint    *)(pc + 12),
+        *(GLint    *)(pc + 16),
+        *(GLint    *)(pc + 20),
+        *(GLint    *)(pc + 24),
+        *(GLsizei  *)(pc + 28),
+        *(GLsizei  *)(pc + 32)
+    ) );
+}
 
-    CALL_TexSubImage3D(GET_DISPATCH(), (*(GLenum *) (pc + 36),
-                                        *(GLint *) (pc + 40),
-                                        *(GLint *) (pc + 44),
-                                        *(GLint *) (pc + 48),
-                                        *(GLint *) (pc + 52),
-                                        *(GLsizei *) (pc + 60),
-                                        *(GLsizei *) (pc + 64),
-                                        *(GLsizei *) (pc + 68),
-                                        *(GLenum *) (pc + 76),
-                                        *(GLenum *) (pc + 80), pixels));
+void __glXDisp_ActiveTexture(GLbyte * pc)
+{
+    CALL_ActiveTexture( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_CopyTexSubImage3D(GLbyte * pc)
-{
-    CALL_CopyTexSubImage3D(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                            *(GLint *) (pc + 4),
-                                            *(GLint *) (pc + 8),
-                                            *(GLint *) (pc + 12),
-                                            *(GLint *) (pc + 16),
-                                            *(GLint *) (pc + 20),
-                                            *(GLint *) (pc + 24),
-                                            *(GLsizei *) (pc + 28),
-                                            *(GLsizei *) (pc + 32)
-                           ));
-}
-
-void
-__glXDisp_ActiveTextureARB(GLbyte * pc)
-{
-    CALL_ActiveTextureARB(GET_DISPATCH(), (*(GLenum *) (pc + 0)
-                          ));
-}
-
-void
-__glXDisp_MultiTexCoord1dvARB(GLbyte * pc)
+void __glXDisp_MultiTexCoord1dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 12);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 12);
         pc -= 4;
     }
 #endif
 
-    CALL_MultiTexCoord1dvARB(GET_DISPATCH(), (*(GLenum *) (pc + 8),
-                                              (const GLdouble *) (pc + 0)
-                             ));
+    CALL_MultiTexCoord1dv( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  8),
+         (const GLdouble *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_MultiTexCoord1fvARB(GLbyte * pc)
+void __glXDisp_MultiTexCoord1fvARB(GLbyte * pc)
 {
-    CALL_MultiTexCoord1fvARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                              (const GLfloat *) (pc + 4)
-                             ));
+    CALL_MultiTexCoord1fvARB( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+         (const GLfloat *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_MultiTexCoord1ivARB(GLbyte * pc)
+void __glXDisp_MultiTexCoord1iv(GLbyte * pc)
 {
-    CALL_MultiTexCoord1ivARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                              (const GLint *) (pc + 4)
-                             ));
+    CALL_MultiTexCoord1iv( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+         (const GLint *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_MultiTexCoord1svARB(GLbyte * pc)
+void __glXDisp_MultiTexCoord1sv(GLbyte * pc)
 {
-    CALL_MultiTexCoord1svARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                              (const GLshort *) (pc + 4)
-                             ));
+    CALL_MultiTexCoord1sv( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+         (const GLshort *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_MultiTexCoord2dvARB(GLbyte * pc)
+void __glXDisp_MultiTexCoord2dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 20);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 20);
         pc -= 4;
     }
 #endif
 
-    CALL_MultiTexCoord2dvARB(GET_DISPATCH(), (*(GLenum *) (pc + 16),
-                                              (const GLdouble *) (pc + 0)
-                             ));
+    CALL_MultiTexCoord2dv( GET_DISPATCH(), (
+        *(GLenum   *)(pc + 16),
+         (const GLdouble *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_MultiTexCoord2fvARB(GLbyte * pc)
+void __glXDisp_MultiTexCoord2fvARB(GLbyte * pc)
 {
-    CALL_MultiTexCoord2fvARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                              (const GLfloat *) (pc + 4)
-                             ));
+    CALL_MultiTexCoord2fvARB( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+         (const GLfloat *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_MultiTexCoord2ivARB(GLbyte * pc)
+void __glXDisp_MultiTexCoord2iv(GLbyte * pc)
 {
-    CALL_MultiTexCoord2ivARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                              (const GLint *) (pc + 4)
-                             ));
+    CALL_MultiTexCoord2iv( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+         (const GLint *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_MultiTexCoord2svARB(GLbyte * pc)
+void __glXDisp_MultiTexCoord2sv(GLbyte * pc)
 {
-    CALL_MultiTexCoord2svARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                              (const GLshort *) (pc + 4)
-                             ));
+    CALL_MultiTexCoord2sv( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+         (const GLshort *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_MultiTexCoord3dvARB(GLbyte * pc)
+void __glXDisp_MultiTexCoord3dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 28);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 28);
         pc -= 4;
     }
 #endif
 
-    CALL_MultiTexCoord3dvARB(GET_DISPATCH(), (*(GLenum *) (pc + 24),
-                                              (const GLdouble *) (pc + 0)
-                             ));
+    CALL_MultiTexCoord3dv( GET_DISPATCH(), (
+        *(GLenum   *)(pc + 24),
+         (const GLdouble *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_MultiTexCoord3fvARB(GLbyte * pc)
+void __glXDisp_MultiTexCoord3fvARB(GLbyte * pc)
 {
-    CALL_MultiTexCoord3fvARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                              (const GLfloat *) (pc + 4)
-                             ));
+    CALL_MultiTexCoord3fvARB( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+         (const GLfloat *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_MultiTexCoord3ivARB(GLbyte * pc)
+void __glXDisp_MultiTexCoord3iv(GLbyte * pc)
 {
-    CALL_MultiTexCoord3ivARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                              (const GLint *) (pc + 4)
-                             ));
+    CALL_MultiTexCoord3iv( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+         (const GLint *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_MultiTexCoord3svARB(GLbyte * pc)
+void __glXDisp_MultiTexCoord3sv(GLbyte * pc)
 {
-    CALL_MultiTexCoord3svARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                              (const GLshort *) (pc + 4)
-                             ));
+    CALL_MultiTexCoord3sv( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+         (const GLshort *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_MultiTexCoord4dvARB(GLbyte * pc)
+void __glXDisp_MultiTexCoord4dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 36);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 36);
         pc -= 4;
     }
 #endif
 
-    CALL_MultiTexCoord4dvARB(GET_DISPATCH(), (*(GLenum *) (pc + 32),
-                                              (const GLdouble *) (pc + 0)
-                             ));
+    CALL_MultiTexCoord4dv( GET_DISPATCH(), (
+        *(GLenum   *)(pc + 32),
+         (const GLdouble *)(pc +  0)
+    ) );
+}
+
+void __glXDisp_MultiTexCoord4fvARB(GLbyte * pc)
+{
+    CALL_MultiTexCoord4fvARB( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+         (const GLfloat *)(pc +  4)
+    ) );
+}
+
+void __glXDisp_MultiTexCoord4iv(GLbyte * pc)
+{
+    CALL_MultiTexCoord4iv( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+         (const GLint *)(pc +  4)
+    ) );
+}
+
+void __glXDisp_MultiTexCoord4sv(GLbyte * pc)
+{
+    CALL_MultiTexCoord4sv( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+         (const GLshort *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_MultiTexCoord4fvARB(GLbyte * pc)
+void __glXDisp_CompressedTexImage1D(GLbyte * pc)
 {
-    CALL_MultiTexCoord4fvARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                              (const GLfloat *) (pc + 4)
-                             ));
+    const GLsizei imageSize = *(GLsizei  *)(pc + 20);
+
+    CALL_CompressedTexImage1D( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLint    *)(pc +  4),
+        *(GLenum   *)(pc +  8),
+        *(GLsizei  *)(pc + 12),
+        *(GLint    *)(pc + 16),
+        imageSize,
+         (const GLvoid *)(pc + 24)
+    ) );
 }
 
-void
-__glXDisp_MultiTexCoord4ivARB(GLbyte * pc)
+void __glXDisp_CompressedTexImage2D(GLbyte * pc)
 {
-    CALL_MultiTexCoord4ivARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                              (const GLint *) (pc + 4)
-                             ));
+    const GLsizei imageSize = *(GLsizei  *)(pc + 24);
+
+    CALL_CompressedTexImage2D( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLint    *)(pc +  4),
+        *(GLenum   *)(pc +  8),
+        *(GLsizei  *)(pc + 12),
+        *(GLsizei  *)(pc + 16),
+        *(GLint    *)(pc + 20),
+        imageSize,
+         (const GLvoid *)(pc + 28)
+    ) );
 }
 
-void
-__glXDisp_MultiTexCoord4svARB(GLbyte * pc)
+void __glXDisp_CompressedTexImage3D(GLbyte * pc)
 {
-    CALL_MultiTexCoord4svARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                              (const GLshort *) (pc + 4)
-                             ));
+    const GLsizei imageSize = *(GLsizei  *)(pc + 28);
+
+    CALL_CompressedTexImage3D( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLint    *)(pc +  4),
+        *(GLenum   *)(pc +  8),
+        *(GLsizei  *)(pc + 12),
+        *(GLsizei  *)(pc + 16),
+        *(GLsizei  *)(pc + 20),
+        *(GLint    *)(pc + 24),
+        imageSize,
+         (const GLvoid *)(pc + 32)
+    ) );
 }
 
-void
-__glXDisp_SampleCoverageARB(GLbyte * pc)
+void __glXDisp_CompressedTexSubImage1D(GLbyte * pc)
 {
-    CALL_SampleCoverageARB(GET_DISPATCH(), (*(GLclampf *) (pc + 0),
-                                            *(GLboolean *) (pc + 4)
-                           ));
+    const GLsizei imageSize = *(GLsizei  *)(pc + 20);
+
+    CALL_CompressedTexSubImage1D( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLint    *)(pc +  4),
+        *(GLint    *)(pc +  8),
+        *(GLsizei  *)(pc + 12),
+        *(GLenum   *)(pc + 16),
+        imageSize,
+         (const GLvoid *)(pc + 24)
+    ) );
 }
 
-void
-__glXDisp_CompressedTexImage1DARB(GLbyte * pc)
+void __glXDisp_CompressedTexSubImage2D(GLbyte * pc)
 {
-    const GLsizei imageSize = *(GLsizei *) (pc + 20);
+    const GLsizei imageSize = *(GLsizei  *)(pc + 28);
 
-    CALL_CompressedTexImage1DARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                  *(GLint *) (pc + 4),
-                                                  *(GLenum *) (pc + 8),
-                                                  *(GLsizei *) (pc + 12),
-                                                  *(GLint *) (pc + 16),
-                                                  imageSize,
-                                                  (const GLvoid *) (pc + 24)
-                                 ));
+    CALL_CompressedTexSubImage2D( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLint    *)(pc +  4),
+        *(GLint    *)(pc +  8),
+        *(GLint    *)(pc + 12),
+        *(GLsizei  *)(pc + 16),
+        *(GLsizei  *)(pc + 20),
+        *(GLenum   *)(pc + 24),
+        imageSize,
+         (const GLvoid *)(pc + 32)
+    ) );
 }
 
-void
-__glXDisp_CompressedTexImage2DARB(GLbyte * pc)
+void __glXDisp_CompressedTexSubImage3D(GLbyte * pc)
 {
-    const GLsizei imageSize = *(GLsizei *) (pc + 24);
+    const GLsizei imageSize = *(GLsizei  *)(pc + 36);
 
-    CALL_CompressedTexImage2DARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                  *(GLint *) (pc + 4),
-                                                  *(GLenum *) (pc + 8),
-                                                  *(GLsizei *) (pc + 12),
-                                                  *(GLsizei *) (pc + 16),
-                                                  *(GLint *) (pc + 20),
-                                                  imageSize,
-                                                  (const GLvoid *) (pc + 28)
-                                 ));
+    CALL_CompressedTexSubImage3D( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLint    *)(pc +  4),
+        *(GLint    *)(pc +  8),
+        *(GLint    *)(pc + 12),
+        *(GLint    *)(pc + 16),
+        *(GLsizei  *)(pc + 20),
+        *(GLsizei  *)(pc + 24),
+        *(GLsizei  *)(pc + 28),
+        *(GLenum   *)(pc + 32),
+        imageSize,
+         (const GLvoid *)(pc + 40)
+    ) );
 }
 
-void
-__glXDisp_CompressedTexImage3DARB(GLbyte * pc)
+void __glXDisp_SampleCoverage(GLbyte * pc)
 {
-    const GLsizei imageSize = *(GLsizei *) (pc + 28);
+    CALL_SampleCoverage( GET_DISPATCH(), (
+        *(GLclampf *)(pc +  0),
+        *(GLboolean *)(pc +  4)
+    ) );
+}
 
-    CALL_CompressedTexImage3DARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                  *(GLint *) (pc + 4),
-                                                  *(GLenum *) (pc + 8),
-                                                  *(GLsizei *) (pc + 12),
-                                                  *(GLsizei *) (pc + 16),
-                                                  *(GLsizei *) (pc + 20),
-                                                  *(GLint *) (pc + 24),
-                                                  imageSize,
-                                                  (const GLvoid *) (pc + 32)
-                                 ));
+void __glXDisp_BlendFuncSeparate(GLbyte * pc)
+{
+    CALL_BlendFuncSeparate( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLenum   *)(pc +  4),
+        *(GLenum   *)(pc +  8),
+        *(GLenum   *)(pc + 12)
+    ) );
 }
 
-void
-__glXDisp_CompressedTexSubImage1DARB(GLbyte * pc)
+void __glXDisp_FogCoorddv(GLbyte * pc)
 {
-    const GLsizei imageSize = *(GLsizei *) (pc + 20);
+#ifdef __GLX_ALIGN64
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 8);
+        pc -= 4;
+    }
+#endif
+
+    CALL_FogCoorddv( GET_DISPATCH(), (
+         (const GLdouble *)(pc +  0)
+    ) );
+}
 
-    CALL_CompressedTexSubImage1DARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                     *(GLint *) (pc + 4),
-                                                     *(GLint *) (pc + 8),
-                                                     *(GLsizei *) (pc + 12),
-                                                     *(GLenum *) (pc + 16),
-                                                     imageSize,
-                                                     (const GLvoid *) (pc + 24)
-                                    ));
+void __glXDisp_PointParameterf(GLbyte * pc)
+{
+    CALL_PointParameterf( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLfloat  *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_CompressedTexSubImage2DARB(GLbyte * pc)
+void __glXDisp_PointParameterfv(GLbyte * pc)
 {
-    const GLsizei imageSize = *(GLsizei *) (pc + 28);
+    const GLenum pname = *(GLenum   *)(pc +  0);
+    const GLfloat * params;
+
+    params = (const GLfloat *) (pc + 4);
 
-    CALL_CompressedTexSubImage2DARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                     *(GLint *) (pc + 4),
-                                                     *(GLint *) (pc + 8),
-                                                     *(GLint *) (pc + 12),
-                                                     *(GLsizei *) (pc + 16),
-                                                     *(GLsizei *) (pc + 20),
-                                                     *(GLenum *) (pc + 24),
-                                                     imageSize,
-                                                     (const GLvoid *) (pc + 32)
-                                    ));
+    CALL_PointParameterfv( GET_DISPATCH(), (
+        pname,
+        params
+    ) );
 }
 
-void
-__glXDisp_CompressedTexSubImage3DARB(GLbyte * pc)
+void __glXDisp_PointParameteri(GLbyte * pc)
 {
-    const GLsizei imageSize = *(GLsizei *) (pc + 36);
+    CALL_PointParameteri( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLint    *)(pc +  4)
+    ) );
+}
+
+void __glXDisp_PointParameteriv(GLbyte * pc)
+{
+    const GLenum pname = *(GLenum   *)(pc +  0);
+    const GLint * params;
+
+    params = (const GLint *) (pc + 4);
+
+    CALL_PointParameteriv( GET_DISPATCH(), (
+        pname,
+        params
+    ) );
+}
 
-    CALL_CompressedTexSubImage3DARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                     *(GLint *) (pc + 4),
-                                                     *(GLint *) (pc + 8),
-                                                     *(GLint *) (pc + 12),
-                                                     *(GLint *) (pc + 16),
-                                                     *(GLsizei *) (pc + 20),
-                                                     *(GLsizei *) (pc + 24),
-                                                     *(GLsizei *) (pc + 28),
-                                                     *(GLenum *) (pc + 32),
-                                                     imageSize,
-                                                     (const GLvoid *) (pc + 40)
-                                    ));
+void __glXDisp_SecondaryColor3bv(GLbyte * pc)
+{
+    CALL_SecondaryColor3bv( GET_DISPATCH(), (
+         (const GLbyte *)(pc +  0)
+    ) );
 }
 
-int
-__glXDisp_GetProgramEnvParameterdvARB(__GLXclientState * cl, GLbyte * pc)
+void __glXDisp_SecondaryColor3dv(GLbyte * pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+#ifdef __GLX_ALIGN64
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 24);
+        pc -= 4;
+    }
+#endif
+
+    CALL_SecondaryColor3dv( GET_DISPATCH(), (
+         (const GLdouble *)(pc +  0)
+    ) );
+}
+
+void __glXDisp_SecondaryColor3iv(GLbyte * pc)
+{
+    CALL_SecondaryColor3iv( GET_DISPATCH(), (
+         (const GLint *)(pc +  0)
+    ) );
+}
+
+void __glXDisp_SecondaryColor3sv(GLbyte * pc)
+{
+    CALL_SecondaryColor3sv( GET_DISPATCH(), (
+         (const GLshort *)(pc +  0)
+    ) );
+}
+
+void __glXDisp_SecondaryColor3ubv(GLbyte * pc)
+{
+    CALL_SecondaryColor3ubv( GET_DISPATCH(), (
+         (const GLubyte *)(pc +  0)
+    ) );
+}
+
+void __glXDisp_SecondaryColor3uiv(GLbyte * pc)
+{
+    CALL_SecondaryColor3uiv( GET_DISPATCH(), (
+         (const GLuint *)(pc +  0)
+    ) );
+}
+
+void __glXDisp_SecondaryColor3usv(GLbyte * pc)
+{
+    CALL_SecondaryColor3usv( GET_DISPATCH(), (
+         (const GLushort *)(pc +  0)
+    ) );
+}
+
+void __glXDisp_WindowPos3fv(GLbyte * pc)
+{
+    CALL_WindowPos3fv( GET_DISPATCH(), (
+         (const GLfloat *)(pc +  0)
+    ) );
+}
+
+void __glXDisp_BeginQuery(GLbyte * pc)
+{
+    CALL_BeginQuery( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLuint   *)(pc +  4)
+    ) );
+}
+
+int __glXDisp_DeleteQueries(__GLXclientState *cl, GLbyte *pc)
+{
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        GLdouble params[4];
+    pc += __GLX_SINGLE_HDR_SIZE;
+    if ( cx != NULL ) {
+        const GLsizei n = *(GLsizei  *)(pc +  0);
 
-        CALL_GetProgramEnvParameterdvARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                          *(GLuint *) (pc + 4),
-                                                          params));
-        __glXSendReply(cl->client, params, 4, 8, GL_FALSE, 0);
+        CALL_DeleteQueries( GET_DISPATCH(), (
+            n,
+             (const GLuint *)(pc +  4)
+        ) );
         error = Success;
     }
 
     return error;
 }
 
-int
-__glXDisp_GetProgramEnvParameterfvARB(__GLXclientState * cl, GLbyte * pc)
+void __glXDisp_EndQuery(GLbyte * pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    CALL_EndQuery( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0)
+    ) );
+}
+
+int __glXDisp_GenQueries(__GLXclientState *cl, GLbyte *pc)
+{
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        GLfloat params[4];
+    pc += __GLX_SINGLE_HDR_SIZE;
+    if ( cx != NULL ) {
+        const GLsizei n = *(GLsizei  *)(pc +  0);
 
-        CALL_GetProgramEnvParameterfvARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                          *(GLuint *) (pc + 4),
-                                                          params));
-        __glXSendReply(cl->client, params, 4, 4, GL_FALSE, 0);
+        GLuint answerBuffer[200];
+        GLuint * ids = __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer), 4);
+        CALL_GenQueries( GET_DISPATCH(), (
+            n,
+            ids
+        ) );
+        __glXSendReply(cl->client, ids, n, 4, GL_TRUE, 0);
         error = Success;
     }
 
     return error;
 }
 
-int
-__glXDisp_GetProgramLocalParameterdvARB(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetQueryObjectiv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        GLdouble params[4];
+    pc += __GLX_SINGLE_HDR_SIZE;
+    if ( cx != NULL ) {
+        const GLenum pname = *(GLenum   *)(pc +  4);
 
-        CALL_GetProgramLocalParameterdvARB(GET_DISPATCH(),
-                                           (*(GLenum *) (pc + 0),
-                                            *(GLuint *) (pc + 4), params));
-        __glXSendReply(cl->client, params, 4, 8, GL_FALSE, 0);
+        const GLuint compsize = __glGetQueryObjectiv_size(pname);
+        GLint answerBuffer[200];
+        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
+
+        if (params == NULL) return BadAlloc;
+        __glXClearErrorOccured();
+
+        CALL_GetQueryObjectiv( GET_DISPATCH(), (
+            *(GLuint   *)(pc +  0),
+            pname,
+            params
+        ) );
+        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
 
     return error;
 }
 
-int
-__glXDisp_GetProgramLocalParameterfvARB(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetQueryObjectuiv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        GLfloat params[4];
+    pc += __GLX_SINGLE_HDR_SIZE;
+    if ( cx != NULL ) {
+        const GLenum pname = *(GLenum   *)(pc +  4);
 
-        CALL_GetProgramLocalParameterfvARB(GET_DISPATCH(),
-                                           (*(GLenum *) (pc + 0),
-                                            *(GLuint *) (pc + 4), params));
-        __glXSendReply(cl->client, params, 4, 4, GL_FALSE, 0);
+        const GLuint compsize = __glGetQueryObjectuiv_size(pname);
+        GLuint answerBuffer[200];
+        GLuint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
+
+        if (params == NULL) return BadAlloc;
+        __glXClearErrorOccured();
+
+        CALL_GetQueryObjectuiv( GET_DISPATCH(), (
+            *(GLuint   *)(pc +  0),
+            pname,
+            params
+        ) );
+        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
 
     return error;
 }
 
-int
-__glXDisp_GetProgramivARB(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetQueryiv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = *(GLenum *) (pc + 4);
+    pc += __GLX_SINGLE_HDR_SIZE;
+    if ( cx != NULL ) {
+        const GLenum pname = *(GLenum   *)(pc +  4);
 
-        const GLuint compsize = __glGetProgramivARB_size(pname);
+        const GLuint compsize = __glGetQueryiv_size(pname);
         GLint answerBuffer[200];
-        GLint *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetProgramivARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                              pname, params));
+        CALL_GetQueryiv( GET_DISPATCH(), (
+            *(GLenum   *)(pc +  0),
+            pname,
+            params
+        ) );
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -4185,29 +4360,65 @@ __glXDisp_GetProgramivARB(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_GetVertexAttribdvARB(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_IsQuery(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
+
+    pc += __GLX_SINGLE_HDR_SIZE;
+    if ( cx != NULL ) {
+        GLboolean retval;
+        retval = CALL_IsQuery( GET_DISPATCH(), (
+            *(GLuint   *)(pc +  0)
+        ) );
+        __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
+        error = Success;
+    }
+
+    return error;
+}
+
+void __glXDisp_BlendEquationSeparate(GLbyte * pc)
+{
+    CALL_BlendEquationSeparate( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLenum   *)(pc +  4)
+    ) );
+}
+
+void __glXDisp_DrawBuffers(GLbyte * pc)
+{
+    const GLsizei n = *(GLsizei  *)(pc +  0);
+
+    CALL_DrawBuffers( GET_DISPATCH(), (
+        n,
+         (const GLenum *)(pc +  4)
+    ) );
+}
+
+int __glXDisp_GetVertexAttribdv(__GLXclientState *cl, GLbyte *pc)
+{
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
+    int error;
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = *(GLenum *) (pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname = *(GLenum   *)(pc +  4);
 
-        const GLuint compsize = __glGetVertexAttribdvARB_size(pname);
+        const GLuint compsize = __glGetVertexAttribdv_size(pname);
         GLdouble answerBuffer[200];
-        GLdouble *params =
-            __glXGetAnswerBuffer(cl, compsize * 8, answerBuffer,
-                                 sizeof(answerBuffer), 8);
+        GLdouble * params = __glXGetAnswerBuffer(cl, compsize * 8, answerBuffer, sizeof(answerBuffer), 8);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetVertexAttribdvARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                                   pname, params));
+        CALL_GetVertexAttribdv( GET_DISPATCH(), (
+            *(GLuint   *)(pc +  0),
+            pname,
+            params
+        ) );
         __glXSendReply(cl->client, params, compsize, 8, GL_FALSE, 0);
         error = Success;
     }
@@ -4215,29 +4426,28 @@ __glXDisp_GetVertexAttribdvARB(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_GetVertexAttribfvARB(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetVertexAttribfv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = *(GLenum *) (pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname = *(GLenum   *)(pc +  4);
 
-        const GLuint compsize = __glGetVertexAttribfvARB_size(pname);
+        const GLuint compsize = __glGetVertexAttribfv_size(pname);
         GLfloat answerBuffer[200];
-        GLfloat *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetVertexAttribfvARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                                   pname, params));
+        CALL_GetVertexAttribfv( GET_DISPATCH(), (
+            *(GLuint   *)(pc +  0),
+            pname,
+            params
+        ) );
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -4245,29 +4455,28 @@ __glXDisp_GetVertexAttribfvARB(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_GetVertexAttribivARB(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetVertexAttribiv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = *(GLenum *) (pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname = *(GLenum   *)(pc +  4);
 
-        const GLuint compsize = __glGetVertexAttribivARB_size(pname);
+        const GLuint compsize = __glGetVertexAttribiv_size(pname);
         GLint answerBuffer[200];
-        GLint *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetVertexAttribivARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                                   pname, params));
+        CALL_GetVertexAttribiv( GET_DISPATCH(), (
+            *(GLuint   *)(pc +  0),
+            pname,
+            params
+        ) );
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -4275,420 +4484,351 @@ __glXDisp_GetVertexAttribivARB(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-void
-__glXDisp_ProgramEnvParameter4dvARB(GLbyte * pc)
+void __glXDisp_VertexAttrib1dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 40);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 12);
         pc -= 4;
     }
 #endif
 
-    CALL_ProgramEnvParameter4dvARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                    *(GLuint *) (pc + 4),
-                                                    (const GLdouble *) (pc + 8)
-                                   ));
+    CALL_VertexAttrib1dv( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0),
+         (const GLdouble *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_ProgramEnvParameter4fvARB(GLbyte * pc)
+void __glXDisp_VertexAttrib1sv(GLbyte * pc)
 {
-    CALL_ProgramEnvParameter4fvARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                    *(GLuint *) (pc + 4),
-                                                    (const GLfloat *) (pc + 8)
-                                   ));
+    CALL_VertexAttrib1sv( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0),
+         (const GLshort *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_ProgramLocalParameter4dvARB(GLbyte * pc)
+void __glXDisp_VertexAttrib2dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 40);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 20);
         pc -= 4;
     }
 #endif
 
-    CALL_ProgramLocalParameter4dvARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                      *(GLuint *) (pc + 4),
-                                                      (const GLdouble *) (pc +
-                                                                          8)
-                                     ));
+    CALL_VertexAttrib2dv( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0),
+         (const GLdouble *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_ProgramLocalParameter4fvARB(GLbyte * pc)
+void __glXDisp_VertexAttrib2sv(GLbyte * pc)
 {
-    CALL_ProgramLocalParameter4fvARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                      *(GLuint *) (pc + 4),
-                                                      (const GLfloat *) (pc + 8)
-                                     ));
+    CALL_VertexAttrib2sv( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0),
+         (const GLshort *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_ProgramStringARB(GLbyte * pc)
-{
-    const GLsizei len = *(GLsizei *) (pc + 8);
-
-    CALL_ProgramStringARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                           *(GLenum *) (pc + 4),
-                                           len, (const GLvoid *) (pc + 12)
-                          ));
-}
-
-void
-__glXDisp_VertexAttrib1dvARB(GLbyte * pc)
+void __glXDisp_VertexAttrib3dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 12);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 28);
         pc -= 4;
     }
 #endif
 
-    CALL_VertexAttrib1dvARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             (const GLdouble *) (pc + 4)
-                            ));
+    CALL_VertexAttrib3dv( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0),
+         (const GLdouble *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_VertexAttrib1fvARB(GLbyte * pc)
+void __glXDisp_VertexAttrib3sv(GLbyte * pc)
 {
-    CALL_VertexAttrib1fvARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             (const GLfloat *) (pc + 4)
-                            ));
+    CALL_VertexAttrib3sv( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0),
+         (const GLshort *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_VertexAttrib1svARB(GLbyte * pc)
+void __glXDisp_VertexAttrib4Nbv(GLbyte * pc)
 {
-    CALL_VertexAttrib1svARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             (const GLshort *) (pc + 4)
-                            ));
+    CALL_VertexAttrib4Nbv( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0),
+         (const GLbyte *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_VertexAttrib2dvARB(GLbyte * pc)
+void __glXDisp_VertexAttrib4Niv(GLbyte * pc)
 {
-#ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 20);
-        pc -= 4;
-    }
-#endif
-
-    CALL_VertexAttrib2dvARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             (const GLdouble *) (pc + 4)
-                            ));
+    CALL_VertexAttrib4Niv( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0),
+         (const GLint *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_VertexAttrib2fvARB(GLbyte * pc)
+void __glXDisp_VertexAttrib4Nsv(GLbyte * pc)
 {
-    CALL_VertexAttrib2fvARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             (const GLfloat *) (pc + 4)
-                            ));
+    CALL_VertexAttrib4Nsv( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0),
+         (const GLshort *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_VertexAttrib2svARB(GLbyte * pc)
+void __glXDisp_VertexAttrib4Nubv(GLbyte * pc)
 {
-    CALL_VertexAttrib2svARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             (const GLshort *) (pc + 4)
-                            ));
-}
-
-void
-__glXDisp_VertexAttrib3dvARB(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 28);
-        pc -= 4;
-    }
-#endif
-
-    CALL_VertexAttrib3dvARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             (const GLdouble *) (pc + 4)
-                            ));
+    CALL_VertexAttrib4Nubv( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0),
+         (const GLubyte *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_VertexAttrib3fvARB(GLbyte * pc)
+void __glXDisp_VertexAttrib4Nuiv(GLbyte * pc)
 {
-    CALL_VertexAttrib3fvARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             (const GLfloat *) (pc + 4)
-                            ));
+    CALL_VertexAttrib4Nuiv( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0),
+         (const GLuint *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_VertexAttrib3svARB(GLbyte * pc)
+void __glXDisp_VertexAttrib4Nusv(GLbyte * pc)
 {
-    CALL_VertexAttrib3svARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             (const GLshort *) (pc + 4)
-                            ));
+    CALL_VertexAttrib4Nusv( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0),
+         (const GLushort *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_VertexAttrib4NbvARB(GLbyte * pc)
+void __glXDisp_VertexAttrib4bv(GLbyte * pc)
 {
-    CALL_VertexAttrib4NbvARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                              (const GLbyte *) (pc + 4)
-                             ));
+    CALL_VertexAttrib4bv( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0),
+         (const GLbyte *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_VertexAttrib4NivARB(GLbyte * pc)
-{
-    CALL_VertexAttrib4NivARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                              (const GLint *) (pc + 4)
-                             ));
-}
-
-void
-__glXDisp_VertexAttrib4NsvARB(GLbyte * pc)
-{
-    CALL_VertexAttrib4NsvARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                              (const GLshort *) (pc + 4)
-                             ));
-}
-
-void
-__glXDisp_VertexAttrib4NubvARB(GLbyte * pc)
-{
-    CALL_VertexAttrib4NubvARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                               (const GLubyte *) (pc + 4)
-                              ));
-}
-
-void
-__glXDisp_VertexAttrib4NuivARB(GLbyte * pc)
-{
-    CALL_VertexAttrib4NuivARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                               (const GLuint *) (pc + 4)
-                              ));
-}
-
-void
-__glXDisp_VertexAttrib4NusvARB(GLbyte * pc)
-{
-    CALL_VertexAttrib4NusvARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                               (const GLushort *) (pc + 4)
-                              ));
-}
-
-void
-__glXDisp_VertexAttrib4bvARB(GLbyte * pc)
-{
-    CALL_VertexAttrib4bvARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             (const GLbyte *) (pc + 4)
-                            ));
-}
-
-void
-__glXDisp_VertexAttrib4dvARB(GLbyte * pc)
+void __glXDisp_VertexAttrib4dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 36);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 36);
         pc -= 4;
     }
 #endif
 
-    CALL_VertexAttrib4dvARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             (const GLdouble *) (pc + 4)
-                            ));
+    CALL_VertexAttrib4dv( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0),
+         (const GLdouble *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_VertexAttrib4fvARB(GLbyte * pc)
+void __glXDisp_VertexAttrib4iv(GLbyte * pc)
 {
-    CALL_VertexAttrib4fvARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             (const GLfloat *) (pc + 4)
-                            ));
+    CALL_VertexAttrib4iv( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0),
+         (const GLint *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_VertexAttrib4ivARB(GLbyte * pc)
+void __glXDisp_VertexAttrib4sv(GLbyte * pc)
 {
-    CALL_VertexAttrib4ivARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             (const GLint *) (pc + 4)
-                            ));
+    CALL_VertexAttrib4sv( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0),
+         (const GLshort *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_VertexAttrib4svARB(GLbyte * pc)
+void __glXDisp_VertexAttrib4ubv(GLbyte * pc)
 {
-    CALL_VertexAttrib4svARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             (const GLshort *) (pc + 4)
-                            ));
+    CALL_VertexAttrib4ubv( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0),
+         (const GLubyte *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_VertexAttrib4ubvARB(GLbyte * pc)
+void __glXDisp_VertexAttrib4uiv(GLbyte * pc)
 {
-    CALL_VertexAttrib4ubvARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                              (const GLubyte *) (pc + 4)
-                             ));
+    CALL_VertexAttrib4uiv( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0),
+         (const GLuint *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_VertexAttrib4uivARB(GLbyte * pc)
+void __glXDisp_VertexAttrib4usv(GLbyte * pc)
 {
-    CALL_VertexAttrib4uivARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                              (const GLuint *) (pc + 4)
-                             ));
+    CALL_VertexAttrib4usv( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0),
+         (const GLushort *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_VertexAttrib4usvARB(GLbyte * pc)
+void __glXDisp_ClampColor(GLbyte * pc)
 {
-    CALL_VertexAttrib4usvARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                              (const GLushort *) (pc + 4)
-                             ));
+    CALL_ClampColor( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLenum   *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_BeginQueryARB(GLbyte * pc)
+void __glXDisp_BindProgramARB(GLbyte * pc)
 {
-    CALL_BeginQueryARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                        *(GLuint *) (pc + 4)
-                       ));
+    CALL_BindProgramARB( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLuint   *)(pc +  4)
+    ) );
 }
 
-int
-__glXDisp_DeleteQueriesARB(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_DeleteProgramsARB(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLsizei n = *(GLsizei *) (pc + 0);
+    pc += __GLX_VENDPRIV_HDR_SIZE;
+    if ( cx != NULL ) {
+        const GLsizei n = *(GLsizei  *)(pc +  0);
 
-        CALL_DeleteQueriesARB(GET_DISPATCH(), (n, (const GLuint *) (pc + 4)
-                              ));
+        CALL_DeleteProgramsARB( GET_DISPATCH(), (
+            n,
+             (const GLuint *)(pc +  4)
+        ) );
         error = Success;
     }
 
     return error;
 }
 
-void
-__glXDisp_EndQueryARB(GLbyte * pc)
-{
-    CALL_EndQueryARB(GET_DISPATCH(), (*(GLenum *) (pc + 0)
-                     ));
-}
-
-int
-__glXDisp_GenQueriesARB(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GenProgramsARB(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLsizei n = *(GLsizei *) (pc + 0);
+    pc += __GLX_VENDPRIV_HDR_SIZE;
+    if ( cx != NULL ) {
+        const GLsizei n = *(GLsizei  *)(pc +  0);
 
         GLuint answerBuffer[200];
-        GLuint *ids =
-            __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer),
-                                 4);
-        CALL_GenQueriesARB(GET_DISPATCH(), (n, ids));
-        __glXSendReply(cl->client, ids, n, 4, GL_TRUE, 0);
+        GLuint * programs = __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer), 4);
+        CALL_GenProgramsARB( GET_DISPATCH(), (
+            n,
+            programs
+        ) );
+        __glXSendReply(cl->client, programs, n, 4, GL_TRUE, 0);
         error = Success;
     }
 
     return error;
 }
 
-int
-__glXDisp_GetQueryObjectivARB(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetProgramEnvParameterdvARB(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = *(GLenum *) (pc + 4);
+    pc += __GLX_VENDPRIV_HDR_SIZE;
+    if ( cx != NULL ) {
+        GLdouble params[4];
+        CALL_GetProgramEnvParameterdvARB( GET_DISPATCH(), (
+            *(GLenum   *)(pc +  0),
+            *(GLuint   *)(pc +  4),
+            params
+        ) );
+        __glXSendReply(cl->client, params, 4, 8, GL_FALSE, 0);
+        error = Success;
+    }
 
-        const GLuint compsize = __glGetQueryObjectivARB_size(pname);
-        GLint answerBuffer[200];
-        GLint *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+    return error;
+}
 
-        if (params == NULL)
-            return BadAlloc;
-        __glXClearErrorOccured();
+int __glXDisp_GetProgramEnvParameterfvARB(__GLXclientState *cl, GLbyte *pc)
+{
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
+    int error;
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
-        CALL_GetQueryObjectivARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                                  pname, params));
-        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
+    pc += __GLX_VENDPRIV_HDR_SIZE;
+    if ( cx != NULL ) {
+        GLfloat params[4];
+        CALL_GetProgramEnvParameterfvARB( GET_DISPATCH(), (
+            *(GLenum   *)(pc +  0),
+            *(GLuint   *)(pc +  4),
+            params
+        ) );
+        __glXSendReply(cl->client, params, 4, 4, GL_FALSE, 0);
         error = Success;
     }
 
     return error;
 }
 
-int
-__glXDisp_GetQueryObjectuivARB(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetProgramLocalParameterdvARB(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = *(GLenum *) (pc + 4);
+    pc += __GLX_VENDPRIV_HDR_SIZE;
+    if ( cx != NULL ) {
+        GLdouble params[4];
+        CALL_GetProgramLocalParameterdvARB( GET_DISPATCH(), (
+            *(GLenum   *)(pc +  0),
+            *(GLuint   *)(pc +  4),
+            params
+        ) );
+        __glXSendReply(cl->client, params, 4, 8, GL_FALSE, 0);
+        error = Success;
+    }
 
-        const GLuint compsize = __glGetQueryObjectuivARB_size(pname);
-        GLuint answerBuffer[200];
-        GLuint *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+    return error;
+}
 
-        if (params == NULL)
-            return BadAlloc;
-        __glXClearErrorOccured();
+int __glXDisp_GetProgramLocalParameterfvARB(__GLXclientState *cl, GLbyte *pc)
+{
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
+    int error;
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
-        CALL_GetQueryObjectuivARB(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                                   pname, params));
-        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
+    pc += __GLX_VENDPRIV_HDR_SIZE;
+    if ( cx != NULL ) {
+        GLfloat params[4];
+        CALL_GetProgramLocalParameterfvARB( GET_DISPATCH(), (
+            *(GLenum   *)(pc +  0),
+            *(GLuint   *)(pc +  4),
+            params
+        ) );
+        __glXSendReply(cl->client, params, 4, 4, GL_FALSE, 0);
         error = Success;
     }
 
     return error;
 }
 
-int
-__glXDisp_GetQueryivARB(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetProgramivARB(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = *(GLenum *) (pc + 4);
+    pc += __GLX_VENDPRIV_HDR_SIZE;
+    if ( cx != NULL ) {
+        const GLenum pname = *(GLenum   *)(pc +  4);
 
-        const GLuint compsize = __glGetQueryivARB_size(pname);
+        const GLuint compsize = __glGetProgramivARB_size(pname);
         GLint answerBuffer[200];
-        GLint *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetQueryivARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                            pname, params));
+        CALL_GetProgramivARB( GET_DISPATCH(), (
+            *(GLenum   *)(pc +  0),
+            pname,
+            params
+        ) );
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -4696,19 +4836,18 @@ __glXDisp_GetQueryivARB(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_IsQueryARB(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_IsProgramARB(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
+    pc += __GLX_VENDPRIV_HDR_SIZE;
+    if ( cx != NULL ) {
         GLboolean retval;
-
-        retval = CALL_IsQueryARB(GET_DISPATCH(), (*(GLuint *) (pc + 0)
-                                 ));
+        retval = CALL_IsProgramARB( GET_DISPATCH(), (
+            *(GLuint   *)(pc +  0)
+        ) );
         __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
         error = Success;
     }
@@ -4716,269 +4855,459 @@ __glXDisp_IsQueryARB(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-void
-__glXDisp_DrawBuffersARB(GLbyte * pc)
+void __glXDisp_ProgramEnvParameter4dvARB(GLbyte * pc)
+{
+#ifdef __GLX_ALIGN64
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 40);
+        pc -= 4;
+    }
+#endif
+
+    CALL_ProgramEnvParameter4dvARB( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLuint   *)(pc +  4),
+         (const GLdouble *)(pc +  8)
+    ) );
+}
+
+void __glXDisp_ProgramEnvParameter4fvARB(GLbyte * pc)
+{
+    CALL_ProgramEnvParameter4fvARB( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLuint   *)(pc +  4),
+         (const GLfloat *)(pc +  8)
+    ) );
+}
+
+void __glXDisp_ProgramLocalParameter4dvARB(GLbyte * pc)
 {
-    const GLsizei n = *(GLsizei *) (pc + 0);
+#ifdef __GLX_ALIGN64
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 40);
+        pc -= 4;
+    }
+#endif
 
-    CALL_DrawBuffersARB(GET_DISPATCH(), (n, (const GLenum *) (pc + 4)
-                        ));
+    CALL_ProgramLocalParameter4dvARB( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLuint   *)(pc +  4),
+         (const GLdouble *)(pc +  8)
+    ) );
 }
 
-void
-__glXDisp_ClampColorARB(GLbyte * pc)
+void __glXDisp_ProgramLocalParameter4fvARB(GLbyte * pc)
 {
-    CALL_ClampColorARB(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                        *(GLenum *) (pc + 4)
-                       ));
+    CALL_ProgramLocalParameter4fvARB( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLuint   *)(pc +  4),
+         (const GLfloat *)(pc +  8)
+    ) );
 }
 
-void
-__glXDisp_RenderbufferStorageMultisample(GLbyte * pc)
+void __glXDisp_ProgramStringARB(GLbyte * pc)
 {
-    CALL_RenderbufferStorageMultisample(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                         *(GLsizei *) (pc + 4),
-                                                         *(GLenum *) (pc + 8),
-                                                         *(GLsizei *) (pc + 12),
-                                                         *(GLsizei *) (pc + 16)
-                                        ));
+    const GLsizei len = *(GLsizei  *)(pc +  8);
+
+    CALL_ProgramStringARB( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLenum   *)(pc +  4),
+        len,
+         (const GLvoid *)(pc + 12)
+    ) );
 }
 
-void
-__glXDisp_SampleMaskSGIS(GLbyte * pc)
+void __glXDisp_VertexAttrib1fvARB(GLbyte * pc)
 {
-    CALL_SampleMaskSGIS(GET_DISPATCH(), (*(GLclampf *) (pc + 0),
-                                         *(GLboolean *) (pc + 4)
-                        ));
+    CALL_VertexAttrib1fvARB( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0),
+         (const GLfloat *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_SamplePatternSGIS(GLbyte * pc)
+void __glXDisp_VertexAttrib2fvARB(GLbyte * pc)
 {
-    CALL_SamplePatternSGIS(GET_DISPATCH(), (*(GLenum *) (pc + 0)
-                           ));
+    CALL_VertexAttrib2fvARB( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0),
+         (const GLfloat *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_PointParameterfEXT(GLbyte * pc)
+void __glXDisp_VertexAttrib3fvARB(GLbyte * pc)
 {
-    CALL_PointParameterfEXT(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                             *(GLfloat *) (pc + 4)
-                            ));
+    CALL_VertexAttrib3fvARB( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0),
+         (const GLfloat *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_PointParameterfvEXT(GLbyte * pc)
+void __glXDisp_VertexAttrib4fvARB(GLbyte * pc)
 {
-    const GLenum pname = *(GLenum *) (pc + 0);
-    const GLfloat *params;
+    CALL_VertexAttrib4fvARB( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0),
+         (const GLfloat *)(pc +  4)
+    ) );
+}
 
-    params = (const GLfloat *) (pc + 4);
+void __glXDisp_BindFramebuffer(GLbyte * pc)
+{
+    CALL_BindFramebuffer( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLuint   *)(pc +  4)
+    ) );
+}
 
-    CALL_PointParameterfvEXT(GET_DISPATCH(), (pname, params));
+void __glXDisp_BindRenderbuffer(GLbyte * pc)
+{
+    CALL_BindRenderbuffer( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLuint   *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_SecondaryColor3bvEXT(GLbyte * pc)
+void __glXDisp_BlitFramebuffer(GLbyte * pc)
 {
-    CALL_SecondaryColor3bvEXT(GET_DISPATCH(), ((const GLbyte *) (pc + 0)
-                              ));
+    CALL_BlitFramebuffer( GET_DISPATCH(), (
+        *(GLint    *)(pc +  0),
+        *(GLint    *)(pc +  4),
+        *(GLint    *)(pc +  8),
+        *(GLint    *)(pc + 12),
+        *(GLint    *)(pc + 16),
+        *(GLint    *)(pc + 20),
+        *(GLint    *)(pc + 24),
+        *(GLint    *)(pc + 28),
+        *(GLbitfield *)(pc + 32),
+        *(GLenum   *)(pc + 36)
+    ) );
 }
 
-void
-__glXDisp_SecondaryColor3dvEXT(GLbyte * pc)
+int __glXDisp_CheckFramebufferStatus(__GLXclientState *cl, GLbyte *pc)
 {
-#ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 24);
-        pc -= 4;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
+    int error;
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
+
+    pc += __GLX_VENDPRIV_HDR_SIZE;
+    if ( cx != NULL ) {
+        GLenum retval;
+        retval = CALL_CheckFramebufferStatus( GET_DISPATCH(), (
+            *(GLenum   *)(pc +  0)
+        ) );
+        __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
+        error = Success;
     }
-#endif
 
-    CALL_SecondaryColor3dvEXT(GET_DISPATCH(), ((const GLdouble *) (pc + 0)
-                              ));
+    return error;
 }
 
-void
-__glXDisp_SecondaryColor3fvEXT(GLbyte * pc)
+void __glXDisp_DeleteFramebuffers(GLbyte * pc)
 {
-    CALL_SecondaryColor3fvEXT(GET_DISPATCH(), ((const GLfloat *) (pc + 0)
-                              ));
+    const GLsizei n = *(GLsizei  *)(pc +  0);
+
+    CALL_DeleteFramebuffers( GET_DISPATCH(), (
+        n,
+         (const GLuint *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_SecondaryColor3ivEXT(GLbyte * pc)
+void __glXDisp_DeleteRenderbuffers(GLbyte * pc)
 {
-    CALL_SecondaryColor3ivEXT(GET_DISPATCH(), ((const GLint *) (pc + 0)
-                              ));
+    const GLsizei n = *(GLsizei  *)(pc +  0);
+
+    CALL_DeleteRenderbuffers( GET_DISPATCH(), (
+        n,
+         (const GLuint *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_SecondaryColor3svEXT(GLbyte * pc)
+void __glXDisp_FramebufferRenderbuffer(GLbyte * pc)
 {
-    CALL_SecondaryColor3svEXT(GET_DISPATCH(), ((const GLshort *) (pc + 0)
-                              ));
+    CALL_FramebufferRenderbuffer( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLenum   *)(pc +  4),
+        *(GLenum   *)(pc +  8),
+        *(GLuint   *)(pc + 12)
+    ) );
 }
 
-void
-__glXDisp_SecondaryColor3ubvEXT(GLbyte * pc)
+void __glXDisp_FramebufferTexture1D(GLbyte * pc)
 {
-    CALL_SecondaryColor3ubvEXT(GET_DISPATCH(), ((const GLubyte *) (pc + 0)
-                               ));
+    CALL_FramebufferTexture1D( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLenum   *)(pc +  4),
+        *(GLenum   *)(pc +  8),
+        *(GLuint   *)(pc + 12),
+        *(GLint    *)(pc + 16)
+    ) );
 }
 
-void
-__glXDisp_SecondaryColor3uivEXT(GLbyte * pc)
+void __glXDisp_FramebufferTexture2D(GLbyte * pc)
 {
-    CALL_SecondaryColor3uivEXT(GET_DISPATCH(), ((const GLuint *) (pc + 0)
-                               ));
+    CALL_FramebufferTexture2D( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLenum   *)(pc +  4),
+        *(GLenum   *)(pc +  8),
+        *(GLuint   *)(pc + 12),
+        *(GLint    *)(pc + 16)
+    ) );
 }
 
-void
-__glXDisp_SecondaryColor3usvEXT(GLbyte * pc)
+void __glXDisp_FramebufferTexture3D(GLbyte * pc)
 {
-    CALL_SecondaryColor3usvEXT(GET_DISPATCH(), ((const GLushort *) (pc + 0)
-                               ));
+    CALL_FramebufferTexture3D( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLenum   *)(pc +  4),
+        *(GLenum   *)(pc +  8),
+        *(GLuint   *)(pc + 12),
+        *(GLint    *)(pc + 16),
+        *(GLint    *)(pc + 20)
+    ) );
 }
 
-void
-__glXDisp_FogCoorddvEXT(GLbyte * pc)
+void __glXDisp_FramebufferTextureLayer(GLbyte * pc)
 {
-#ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 8);
-        pc -= 4;
+    CALL_FramebufferTextureLayer( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLenum   *)(pc +  4),
+        *(GLuint   *)(pc +  8),
+        *(GLint    *)(pc + 12),
+        *(GLint    *)(pc + 16)
+    ) );
+}
+
+int __glXDisp_GenFramebuffers(__GLXclientState *cl, GLbyte *pc)
+{
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
+    int error;
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
+
+    pc += __GLX_VENDPRIV_HDR_SIZE;
+    if ( cx != NULL ) {
+        const GLsizei n = *(GLsizei  *)(pc +  0);
+
+        GLuint answerBuffer[200];
+        GLuint * framebuffers = __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer), 4);
+        CALL_GenFramebuffers( GET_DISPATCH(), (
+            n,
+            framebuffers
+        ) );
+        __glXSendReply(cl->client, framebuffers, n, 4, GL_TRUE, 0);
+        error = Success;
     }
-#endif
 
-    CALL_FogCoorddvEXT(GET_DISPATCH(), ((const GLdouble *) (pc + 0)
-                       ));
+    return error;
 }
 
-void
-__glXDisp_FogCoordfvEXT(GLbyte * pc)
+int __glXDisp_GenRenderbuffers(__GLXclientState *cl, GLbyte *pc)
 {
-    CALL_FogCoordfvEXT(GET_DISPATCH(), ((const GLfloat *) (pc + 0)
-                       ));
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
+    int error;
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
+
+    pc += __GLX_VENDPRIV_HDR_SIZE;
+    if ( cx != NULL ) {
+        const GLsizei n = *(GLsizei  *)(pc +  0);
+
+        GLuint answerBuffer[200];
+        GLuint * renderbuffers = __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer), 4);
+        CALL_GenRenderbuffers( GET_DISPATCH(), (
+            n,
+            renderbuffers
+        ) );
+        __glXSendReply(cl->client, renderbuffers, n, 4, GL_TRUE, 0);
+        error = Success;
+    }
+
+    return error;
 }
 
-void
-__glXDisp_BlendFuncSeparateEXT(GLbyte * pc)
+void __glXDisp_GenerateMipmap(GLbyte * pc)
 {
-    CALL_BlendFuncSeparateEXT(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                               *(GLenum *) (pc + 4),
-                                               *(GLenum *) (pc + 8),
-                                               *(GLenum *) (pc + 12)
-                              ));
+    CALL_GenerateMipmap( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_WindowPos3fvMESA(GLbyte * pc)
+int __glXDisp_GetFramebufferAttachmentParameteriv(__GLXclientState *cl, GLbyte *pc)
 {
-    CALL_WindowPos3fvMESA(GET_DISPATCH(), ((const GLfloat *) (pc + 0)
-                          ));
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
+    int error;
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
+
+    pc += __GLX_VENDPRIV_HDR_SIZE;
+    if ( cx != NULL ) {
+        GLint params[1];
+        CALL_GetFramebufferAttachmentParameteriv( GET_DISPATCH(), (
+            *(GLenum   *)(pc +  0),
+            *(GLenum   *)(pc +  4),
+            *(GLenum   *)(pc +  8),
+            params
+        ) );
+        __glXSendReply(cl->client, params, 1, 4, GL_FALSE, 0);
+        error = Success;
+    }
+
+    return error;
 }
 
-int
-__glXDisp_AreProgramsResidentNV(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetRenderbufferParameteriv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLsizei n = *(GLsizei *) (pc + 0);
-
-        GLboolean retval;
-        GLboolean answerBuffer[200];
-        GLboolean *residences =
-            __glXGetAnswerBuffer(cl, n, answerBuffer, sizeof(answerBuffer), 1);
-        retval =
-            CALL_AreProgramsResidentNV(GET_DISPATCH(),
-                                       (n, (const GLuint *) (pc + 4),
-                                        residences));
-        __glXSendReply(cl->client, residences, n, 1, GL_FALSE, retval);
+    if ( cx != NULL ) {
+        GLint params[1];
+        CALL_GetRenderbufferParameteriv( GET_DISPATCH(), (
+            *(GLenum   *)(pc +  0),
+            *(GLenum   *)(pc +  4),
+            params
+        ) );
+        __glXSendReply(cl->client, params, 1, 4, GL_FALSE, 0);
         error = Success;
     }
 
     return error;
 }
 
-void
-__glXDisp_BindProgramNV(GLbyte * pc)
+int __glXDisp_IsFramebuffer(__GLXclientState *cl, GLbyte *pc)
 {
-    CALL_BindProgramNV(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                        *(GLuint *) (pc + 4)
-                       ));
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
+    int error;
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
+
+    pc += __GLX_VENDPRIV_HDR_SIZE;
+    if ( cx != NULL ) {
+        GLboolean retval;
+        retval = CALL_IsFramebuffer( GET_DISPATCH(), (
+            *(GLuint   *)(pc +  0)
+        ) );
+        __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
+        error = Success;
+    }
+
+    return error;
 }
 
-int
-__glXDisp_DeleteProgramsNV(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_IsRenderbuffer(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLsizei n = *(GLsizei *) (pc + 0);
-
-        CALL_DeleteProgramsNV(GET_DISPATCH(), (n, (const GLuint *) (pc + 4)
-                              ));
+    if ( cx != NULL ) {
+        GLboolean retval;
+        retval = CALL_IsRenderbuffer( GET_DISPATCH(), (
+            *(GLuint   *)(pc +  0)
+        ) );
+        __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
         error = Success;
     }
 
     return error;
 }
 
-void
-__glXDisp_ExecuteProgramNV(GLbyte * pc)
+void __glXDisp_RenderbufferStorage(GLbyte * pc)
 {
-    CALL_ExecuteProgramNV(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                           *(GLuint *) (pc + 4),
-                                           (const GLfloat *) (pc + 8)
-                          ));
+    CALL_RenderbufferStorage( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLenum   *)(pc +  4),
+        *(GLsizei  *)(pc +  8),
+        *(GLsizei  *)(pc + 12)
+    ) );
 }
 
-int
-__glXDisp_GenProgramsNV(__GLXclientState * cl, GLbyte * pc)
+void __glXDisp_RenderbufferStorageMultisample(GLbyte * pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    CALL_RenderbufferStorageMultisample( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLsizei  *)(pc +  4),
+        *(GLenum   *)(pc +  8),
+        *(GLsizei  *)(pc + 12),
+        *(GLsizei  *)(pc + 16)
+    ) );
+}
+
+void __glXDisp_SampleMaskSGIS(GLbyte * pc)
+{
+    CALL_SampleMaskSGIS( GET_DISPATCH(), (
+        *(GLclampf *)(pc +  0),
+        *(GLboolean *)(pc +  4)
+    ) );
+}
+
+void __glXDisp_SamplePatternSGIS(GLbyte * pc)
+{
+    CALL_SamplePatternSGIS( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0)
+    ) );
+}
+
+void __glXDisp_SecondaryColor3fvEXT(GLbyte * pc)
+{
+    CALL_SecondaryColor3fvEXT( GET_DISPATCH(), (
+         (const GLfloat *)(pc +  0)
+    ) );
+}
+
+void __glXDisp_FogCoordfvEXT(GLbyte * pc)
+{
+    CALL_FogCoordfvEXT( GET_DISPATCH(), (
+         (const GLfloat *)(pc +  0)
+    ) );
+}
+
+int __glXDisp_AreProgramsResidentNV(__GLXclientState *cl, GLbyte *pc)
+{
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLsizei n = *(GLsizei *) (pc + 0);
+    if ( cx != NULL ) {
+        const GLsizei n = *(GLsizei  *)(pc +  0);
 
-        GLuint answerBuffer[200];
-        GLuint *programs =
-            __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer),
-                                 4);
-        CALL_GenProgramsNV(GET_DISPATCH(), (n, programs));
-        __glXSendReply(cl->client, programs, n, 4, GL_TRUE, 0);
+        GLboolean retval;
+        GLboolean answerBuffer[200];
+        GLboolean * residences = __glXGetAnswerBuffer(cl, n, answerBuffer, sizeof(answerBuffer), 1);
+        retval = CALL_AreProgramsResidentNV( GET_DISPATCH(), (
+            n,
+             (const GLuint *)(pc +  4),
+            residences
+        ) );
+        __glXSendReply(cl->client, residences, n, 1, GL_FALSE, retval);
         error = Success;
     }
 
     return error;
 }
 
-int
-__glXDisp_GetProgramParameterdvNV(__GLXclientState * cl, GLbyte * pc)
+void __glXDisp_ExecuteProgramNV(GLbyte * pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    CALL_ExecuteProgramNV( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLuint   *)(pc +  4),
+         (const GLfloat *)(pc +  8)
+    ) );
+}
+
+int __glXDisp_GetProgramParameterdvNV(__GLXclientState *cl, GLbyte *pc)
+{
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
+    if ( cx != NULL ) {
         GLdouble params[4];
-
-        CALL_GetProgramParameterdvNV(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                      *(GLuint *) (pc + 4),
-                                                      *(GLenum *) (pc + 8),
-                                                      params));
+        CALL_GetProgramParameterdvNV( GET_DISPATCH(), (
+            *(GLenum   *)(pc +  0),
+            *(GLuint   *)(pc +  4),
+            *(GLenum   *)(pc +  8),
+            params
+        ) );
         __glXSendReply(cl->client, params, 4, 8, GL_FALSE, 0);
         error = Success;
     }
@@ -4986,21 +5315,21 @@ __glXDisp_GetProgramParameterdvNV(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_GetProgramParameterfvNV(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetProgramParameterfvNV(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
+    if ( cx != NULL ) {
         GLfloat params[4];
-
-        CALL_GetProgramParameterfvNV(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                      *(GLuint *) (pc + 4),
-                                                      *(GLenum *) (pc + 8),
-                                                      params));
+        CALL_GetProgramParameterfvNV( GET_DISPATCH(), (
+            *(GLenum   *)(pc +  0),
+            *(GLuint   *)(pc +  4),
+            *(GLenum   *)(pc +  8),
+            params
+        ) );
         __glXSendReply(cl->client, params, 4, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -5008,29 +5337,28 @@ __glXDisp_GetProgramParameterfvNV(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_GetProgramivNV(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetProgramivNV(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = *(GLenum *) (pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname = *(GLenum   *)(pc +  4);
 
         const GLuint compsize = __glGetProgramivNV_size(pname);
         GLint answerBuffer[200];
-        GLint *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetProgramivNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             pname, params));
+        CALL_GetProgramivNV( GET_DISPATCH(), (
+            *(GLuint   *)(pc +  0),
+            pname,
+            params
+        ) );
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -5038,20 +5366,21 @@ __glXDisp_GetProgramivNV(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_GetTrackMatrixivNV(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetTrackMatrixivNV(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
+    if ( cx != NULL ) {
         GLint params[1];
-
-        CALL_GetTrackMatrixivNV(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                 *(GLuint *) (pc + 4),
-                                                 *(GLenum *) (pc + 8), params));
+        CALL_GetTrackMatrixivNV( GET_DISPATCH(), (
+            *(GLenum   *)(pc +  0),
+            *(GLuint   *)(pc +  4),
+            *(GLenum   *)(pc +  8),
+            params
+        ) );
         __glXSendReply(cl->client, params, 1, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -5059,29 +5388,28 @@ __glXDisp_GetTrackMatrixivNV(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_GetVertexAttribdvNV(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetVertexAttribdvNV(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = *(GLenum *) (pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname = *(GLenum   *)(pc +  4);
 
         const GLuint compsize = __glGetVertexAttribdvNV_size(pname);
         GLdouble answerBuffer[200];
-        GLdouble *params =
-            __glXGetAnswerBuffer(cl, compsize * 8, answerBuffer,
-                                 sizeof(answerBuffer), 8);
+        GLdouble * params = __glXGetAnswerBuffer(cl, compsize * 8, answerBuffer, sizeof(answerBuffer), 8);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetVertexAttribdvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                                  pname, params));
+        CALL_GetVertexAttribdvNV( GET_DISPATCH(), (
+            *(GLuint   *)(pc +  0),
+            pname,
+            params
+        ) );
         __glXSendReply(cl->client, params, compsize, 8, GL_FALSE, 0);
         error = Success;
     }
@@ -5089,29 +5417,28 @@ __glXDisp_GetVertexAttribdvNV(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_GetVertexAttribfvNV(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetVertexAttribfvNV(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = *(GLenum *) (pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname = *(GLenum   *)(pc +  4);
 
         const GLuint compsize = __glGetVertexAttribfvNV_size(pname);
         GLfloat answerBuffer[200];
-        GLfloat *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetVertexAttribfvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                                  pname, params));
+        CALL_GetVertexAttribfvNV( GET_DISPATCH(), (
+            *(GLuint   *)(pc +  0),
+            pname,
+            params
+        ) );
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -5119,29 +5446,28 @@ __glXDisp_GetVertexAttribfvNV(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_GetVertexAttribivNV(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetVertexAttribivNV(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = *(GLenum *) (pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname = *(GLenum   *)(pc +  4);
 
         const GLuint compsize = __glGetVertexAttribivNV_size(pname);
         GLint answerBuffer[200];
-        GLint *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetVertexAttribivNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                                  pname, params));
+        CALL_GetVertexAttribivNV( GET_DISPATCH(), (
+            *(GLuint   *)(pc +  0),
+            pname,
+            params
+        ) );
         __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -5149,432 +5475,401 @@ __glXDisp_GetVertexAttribivNV(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_IsProgramNV(__GLXclientState * cl, GLbyte * pc)
+void __glXDisp_LoadProgramNV(GLbyte * pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    const GLsizei len = *(GLsizei  *)(pc +  8);
 
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        GLboolean retval;
-
-        retval = CALL_IsProgramNV(GET_DISPATCH(), (*(GLuint *) (pc + 0)
-                                  ));
-        __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
-        error = Success;
-    }
-
-    return error;
+    CALL_LoadProgramNV( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLuint   *)(pc +  4),
+        len,
+         (const GLubyte *)(pc + 12)
+    ) );
 }
 
-void
-__glXDisp_LoadProgramNV(GLbyte * pc)
+void __glXDisp_ProgramParameters4dvNV(GLbyte * pc)
 {
-    const GLsizei len = *(GLsizei *) (pc + 8);
-
-    CALL_LoadProgramNV(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                        *(GLuint *) (pc + 4),
-                                        len, (const GLubyte *) (pc + 12)
-                       ));
-}
-
-void
-__glXDisp_ProgramParameters4dvNV(GLbyte * pc)
-{
-    const GLsizei num = *(GLsizei *) (pc + 8);
+    const GLsizei num = *(GLsizei  *)(pc +  8);
 
 #ifdef __GLX_ALIGN64
     const GLuint cmdlen = 16 + __GLX_PAD((num * 32)) - 4;
-
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, cmdlen);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, cmdlen);
         pc -= 4;
     }
 #endif
 
-    CALL_ProgramParameters4dvNV(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                 *(GLuint *) (pc + 4),
-                                                 num,
-                                                 (const GLdouble *) (pc + 12)
-                                ));
+    CALL_ProgramParameters4dvNV( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLuint   *)(pc +  4),
+        num,
+         (const GLdouble *)(pc + 12)
+    ) );
 }
 
-void
-__glXDisp_ProgramParameters4fvNV(GLbyte * pc)
+void __glXDisp_ProgramParameters4fvNV(GLbyte * pc)
 {
-    const GLsizei num = *(GLsizei *) (pc + 8);
+    const GLsizei num = *(GLsizei  *)(pc +  8);
 
-    CALL_ProgramParameters4fvNV(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                 *(GLuint *) (pc + 4),
-                                                 num,
-                                                 (const GLfloat *) (pc + 12)
-                                ));
+    CALL_ProgramParameters4fvNV( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLuint   *)(pc +  4),
+        num,
+         (const GLfloat *)(pc + 12)
+    ) );
 }
 
-void
-__glXDisp_RequestResidentProgramsNV(GLbyte * pc)
+void __glXDisp_RequestResidentProgramsNV(GLbyte * pc)
 {
-    const GLsizei n = *(GLsizei *) (pc + 0);
+    const GLsizei n = *(GLsizei  *)(pc +  0);
 
-    CALL_RequestResidentProgramsNV(GET_DISPATCH(), (n, (const GLuint *) (pc + 4)
-                                   ));
+    CALL_RequestResidentProgramsNV( GET_DISPATCH(), (
+        n,
+         (const GLuint *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_TrackMatrixNV(GLbyte * pc)
+void __glXDisp_TrackMatrixNV(GLbyte * pc)
 {
-    CALL_TrackMatrixNV(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                        *(GLuint *) (pc + 4),
-                                        *(GLenum *) (pc + 8),
-                                        *(GLenum *) (pc + 12)
-                       ));
+    CALL_TrackMatrixNV( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0),
+        *(GLuint   *)(pc +  4),
+        *(GLenum   *)(pc +  8),
+        *(GLenum   *)(pc + 12)
+    ) );
 }
 
-void
-__glXDisp_VertexAttrib1dvNV(GLbyte * pc)
+void __glXDisp_VertexAttrib1dvNV(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 12);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 12);
         pc -= 4;
     }
 #endif
 
-    CALL_VertexAttrib1dvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                            (const GLdouble *) (pc + 4)
-                           ));
+    CALL_VertexAttrib1dvNV( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0),
+         (const GLdouble *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_VertexAttrib1fvNV(GLbyte * pc)
+void __glXDisp_VertexAttrib1fvNV(GLbyte * pc)
 {
-    CALL_VertexAttrib1fvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                            (const GLfloat *) (pc + 4)
-                           ));
+    CALL_VertexAttrib1fvNV( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0),
+         (const GLfloat *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_VertexAttrib1svNV(GLbyte * pc)
+void __glXDisp_VertexAttrib1svNV(GLbyte * pc)
 {
-    CALL_VertexAttrib1svNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                            (const GLshort *) (pc + 4)
-                           ));
+    CALL_VertexAttrib1svNV( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0),
+         (const GLshort *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_VertexAttrib2dvNV(GLbyte * pc)
+void __glXDisp_VertexAttrib2dvNV(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 20);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 20);
         pc -= 4;
     }
 #endif
 
-    CALL_VertexAttrib2dvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                            (const GLdouble *) (pc + 4)
-                           ));
+    CALL_VertexAttrib2dvNV( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0),
+         (const GLdouble *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_VertexAttrib2fvNV(GLbyte * pc)
+void __glXDisp_VertexAttrib2fvNV(GLbyte * pc)
 {
-    CALL_VertexAttrib2fvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                            (const GLfloat *) (pc + 4)
-                           ));
+    CALL_VertexAttrib2fvNV( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0),
+         (const GLfloat *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_VertexAttrib2svNV(GLbyte * pc)
+void __glXDisp_VertexAttrib2svNV(GLbyte * pc)
 {
-    CALL_VertexAttrib2svNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                            (const GLshort *) (pc + 4)
-                           ));
+    CALL_VertexAttrib2svNV( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0),
+         (const GLshort *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_VertexAttrib3dvNV(GLbyte * pc)
+void __glXDisp_VertexAttrib3dvNV(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 28);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 28);
         pc -= 4;
     }
 #endif
 
-    CALL_VertexAttrib3dvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                            (const GLdouble *) (pc + 4)
-                           ));
+    CALL_VertexAttrib3dvNV( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0),
+         (const GLdouble *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_VertexAttrib3fvNV(GLbyte * pc)
+void __glXDisp_VertexAttrib3fvNV(GLbyte * pc)
 {
-    CALL_VertexAttrib3fvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                            (const GLfloat *) (pc + 4)
-                           ));
+    CALL_VertexAttrib3fvNV( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0),
+         (const GLfloat *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_VertexAttrib3svNV(GLbyte * pc)
+void __glXDisp_VertexAttrib3svNV(GLbyte * pc)
 {
-    CALL_VertexAttrib3svNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                            (const GLshort *) (pc + 4)
-                           ));
+    CALL_VertexAttrib3svNV( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0),
+         (const GLshort *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_VertexAttrib4dvNV(GLbyte * pc)
+void __glXDisp_VertexAttrib4dvNV(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 36);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 36);
         pc -= 4;
     }
 #endif
 
-    CALL_VertexAttrib4dvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                            (const GLdouble *) (pc + 4)
-                           ));
+    CALL_VertexAttrib4dvNV( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0),
+         (const GLdouble *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_VertexAttrib4fvNV(GLbyte * pc)
+void __glXDisp_VertexAttrib4fvNV(GLbyte * pc)
 {
-    CALL_VertexAttrib4fvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                            (const GLfloat *) (pc + 4)
-                           ));
+    CALL_VertexAttrib4fvNV( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0),
+         (const GLfloat *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_VertexAttrib4svNV(GLbyte * pc)
+void __glXDisp_VertexAttrib4svNV(GLbyte * pc)
 {
-    CALL_VertexAttrib4svNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                            (const GLshort *) (pc + 4)
-                           ));
+    CALL_VertexAttrib4svNV( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0),
+         (const GLshort *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_VertexAttrib4ubvNV(GLbyte * pc)
+void __glXDisp_VertexAttrib4ubvNV(GLbyte * pc)
 {
-    CALL_VertexAttrib4ubvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             (const GLubyte *) (pc + 4)
-                            ));
+    CALL_VertexAttrib4ubvNV( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0),
+         (const GLubyte *)(pc +  4)
+    ) );
 }
 
-void
-__glXDisp_VertexAttribs1dvNV(GLbyte * pc)
+void __glXDisp_VertexAttribs1dvNV(GLbyte * pc)
 {
-    const GLsizei n = *(GLsizei *) (pc + 4);
+    const GLsizei n = *(GLsizei  *)(pc +  4);
 
 #ifdef __GLX_ALIGN64
     const GLuint cmdlen = 12 + __GLX_PAD((n * 8)) - 4;
-
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, cmdlen);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, cmdlen);
         pc -= 4;
     }
 #endif
 
-    CALL_VertexAttribs1dvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             n, (const GLdouble *) (pc + 8)
-                            ));
+    CALL_VertexAttribs1dvNV( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0),
+        n,
+         (const GLdouble *)(pc +  8)
+    ) );
 }
 
-void
-__glXDisp_VertexAttribs1fvNV(GLbyte * pc)
+void __glXDisp_VertexAttribs1fvNV(GLbyte * pc)
 {
-    const GLsizei n = *(GLsizei *) (pc + 4);
+    const GLsizei n = *(GLsizei  *)(pc +  4);
 
-    CALL_VertexAttribs1fvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             n, (const GLfloat *) (pc + 8)
-                            ));
+    CALL_VertexAttribs1fvNV( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0),
+        n,
+         (const GLfloat *)(pc +  8)
+    ) );
 }
 
-void
-__glXDisp_VertexAttribs1svNV(GLbyte * pc)
+void __glXDisp_VertexAttribs1svNV(GLbyte * pc)
 {
-    const GLsizei n = *(GLsizei *) (pc + 4);
+    const GLsizei n = *(GLsizei  *)(pc +  4);
 
-    CALL_VertexAttribs1svNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             n, (const GLshort *) (pc + 8)
-                            ));
+    CALL_VertexAttribs1svNV( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0),
+        n,
+         (const GLshort *)(pc +  8)
+    ) );
 }
 
-void
-__glXDisp_VertexAttribs2dvNV(GLbyte * pc)
+void __glXDisp_VertexAttribs2dvNV(GLbyte * pc)
 {
-    const GLsizei n = *(GLsizei *) (pc + 4);
+    const GLsizei n = *(GLsizei  *)(pc +  4);
 
 #ifdef __GLX_ALIGN64
     const GLuint cmdlen = 12 + __GLX_PAD((n * 16)) - 4;
-
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, cmdlen);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, cmdlen);
         pc -= 4;
     }
 #endif
 
-    CALL_VertexAttribs2dvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             n, (const GLdouble *) (pc + 8)
-                            ));
+    CALL_VertexAttribs2dvNV( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0),
+        n,
+         (const GLdouble *)(pc +  8)
+    ) );
 }
 
-void
-__glXDisp_VertexAttribs2fvNV(GLbyte * pc)
+void __glXDisp_VertexAttribs2fvNV(GLbyte * pc)
 {
-    const GLsizei n = *(GLsizei *) (pc + 4);
+    const GLsizei n = *(GLsizei  *)(pc +  4);
 
-    CALL_VertexAttribs2fvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             n, (const GLfloat *) (pc + 8)
-                            ));
+    CALL_VertexAttribs2fvNV( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0),
+        n,
+         (const GLfloat *)(pc +  8)
+    ) );
 }
 
-void
-__glXDisp_VertexAttribs2svNV(GLbyte * pc)
+void __glXDisp_VertexAttribs2svNV(GLbyte * pc)
 {
-    const GLsizei n = *(GLsizei *) (pc + 4);
+    const GLsizei n = *(GLsizei  *)(pc +  4);
 
-    CALL_VertexAttribs2svNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             n, (const GLshort *) (pc + 8)
-                            ));
+    CALL_VertexAttribs2svNV( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0),
+        n,
+         (const GLshort *)(pc +  8)
+    ) );
 }
 
-void
-__glXDisp_VertexAttribs3dvNV(GLbyte * pc)
+void __glXDisp_VertexAttribs3dvNV(GLbyte * pc)
 {
-    const GLsizei n = *(GLsizei *) (pc + 4);
+    const GLsizei n = *(GLsizei  *)(pc +  4);
 
 #ifdef __GLX_ALIGN64
     const GLuint cmdlen = 12 + __GLX_PAD((n * 24)) - 4;
-
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, cmdlen);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, cmdlen);
         pc -= 4;
     }
 #endif
 
-    CALL_VertexAttribs3dvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             n, (const GLdouble *) (pc + 8)
-                            ));
+    CALL_VertexAttribs3dvNV( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0),
+        n,
+         (const GLdouble *)(pc +  8)
+    ) );
 }
 
-void
-__glXDisp_VertexAttribs3fvNV(GLbyte * pc)
+void __glXDisp_VertexAttribs3fvNV(GLbyte * pc)
 {
-    const GLsizei n = *(GLsizei *) (pc + 4);
+    const GLsizei n = *(GLsizei  *)(pc +  4);
 
-    CALL_VertexAttribs3fvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             n, (const GLfloat *) (pc + 8)
-                            ));
+    CALL_VertexAttribs3fvNV( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0),
+        n,
+         (const GLfloat *)(pc +  8)
+    ) );
 }
 
-void
-__glXDisp_VertexAttribs3svNV(GLbyte * pc)
+void __glXDisp_VertexAttribs3svNV(GLbyte * pc)
 {
-    const GLsizei n = *(GLsizei *) (pc + 4);
+    const GLsizei n = *(GLsizei  *)(pc +  4);
 
-    CALL_VertexAttribs3svNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             n, (const GLshort *) (pc + 8)
-                            ));
+    CALL_VertexAttribs3svNV( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0),
+        n,
+         (const GLshort *)(pc +  8)
+    ) );
 }
 
-void
-__glXDisp_VertexAttribs4dvNV(GLbyte * pc)
+void __glXDisp_VertexAttribs4dvNV(GLbyte * pc)
 {
-    const GLsizei n = *(GLsizei *) (pc + 4);
+    const GLsizei n = *(GLsizei  *)(pc +  4);
 
 #ifdef __GLX_ALIGN64
     const GLuint cmdlen = 12 + __GLX_PAD((n * 32)) - 4;
-
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, cmdlen);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, cmdlen);
         pc -= 4;
     }
 #endif
 
-    CALL_VertexAttribs4dvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             n, (const GLdouble *) (pc + 8)
-                            ));
+    CALL_VertexAttribs4dvNV( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0),
+        n,
+         (const GLdouble *)(pc +  8)
+    ) );
 }
 
-void
-__glXDisp_VertexAttribs4fvNV(GLbyte * pc)
+void __glXDisp_VertexAttribs4fvNV(GLbyte * pc)
 {
-    const GLsizei n = *(GLsizei *) (pc + 4);
+    const GLsizei n = *(GLsizei  *)(pc +  4);
 
-    CALL_VertexAttribs4fvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             n, (const GLfloat *) (pc + 8)
-                            ));
+    CALL_VertexAttribs4fvNV( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0),
+        n,
+         (const GLfloat *)(pc +  8)
+    ) );
 }
 
-void
-__glXDisp_VertexAttribs4svNV(GLbyte * pc)
+void __glXDisp_VertexAttribs4svNV(GLbyte * pc)
 {
-    const GLsizei n = *(GLsizei *) (pc + 4);
-
-    CALL_VertexAttribs4svNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                             n, (const GLshort *) (pc + 8)
-                            ));
-}
-
-void
-__glXDisp_VertexAttribs4ubvNV(GLbyte * pc)
-{
-    const GLsizei n = *(GLsizei *) (pc + 4);
-
-    CALL_VertexAttribs4ubvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                              n, (const GLubyte *) (pc + 8)
-                             ));
-}
+    const GLsizei n = *(GLsizei  *)(pc +  4);
 
-void
-__glXDisp_PointParameteriNV(GLbyte * pc)
-{
-    CALL_PointParameteriNV(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                            *(GLint *) (pc + 4)
-                           ));
+    CALL_VertexAttribs4svNV( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0),
+        n,
+         (const GLshort *)(pc +  8)
+    ) );
 }
 
-void
-__glXDisp_PointParameterivNV(GLbyte * pc)
+void __glXDisp_VertexAttribs4ubvNV(GLbyte * pc)
 {
-    const GLenum pname = *(GLenum *) (pc + 0);
-    const GLint *params;
-
-    params = (const GLint *) (pc + 4);
+    const GLsizei n = *(GLsizei  *)(pc +  4);
 
-    CALL_PointParameterivNV(GET_DISPATCH(), (pname, params));
+    CALL_VertexAttribs4ubvNV( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0),
+        n,
+         (const GLubyte *)(pc +  8)
+    ) );
 }
 
-void
-__glXDisp_ActiveStencilFaceEXT(GLbyte * pc)
+void __glXDisp_ActiveStencilFaceEXT(GLbyte * pc)
 {
-    CALL_ActiveStencilFaceEXT(GET_DISPATCH(), (*(GLenum *) (pc + 0)
-                              ));
+    CALL_ActiveStencilFaceEXT( GET_DISPATCH(), (
+        *(GLenum   *)(pc +  0)
+    ) );
 }
 
-int
-__glXDisp_GetProgramNamedParameterdvNV(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetProgramNamedParameterdvNV(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLsizei len = *(GLsizei *) (pc + 4);
+    if ( cx != NULL ) {
+        const GLsizei len = *(GLsizei  *)(pc +  4);
 
         GLdouble params[4];
-
-        CALL_GetProgramNamedParameterdvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                                           len,
-                                                           (const GLubyte *) (pc
-                                                                              +
-                                                                              8),
-                                                           params));
+        CALL_GetProgramNamedParameterdvNV( GET_DISPATCH(), (
+            *(GLuint   *)(pc +  0),
+            len,
+             (const GLubyte *)(pc +  8),
+            params
+        ) );
         __glXSendReply(cl->client, params, 4, 8, GL_TRUE, 0);
         error = Success;
     }
@@ -5582,25 +5877,23 @@ __glXDisp_GetProgramNamedParameterdvNV(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDisp_GetProgramNamedParameterfvNV(__GLXclientState * cl, GLbyte * pc)
+int __glXDisp_GetProgramNamedParameterfvNV(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLsizei len = *(GLsizei *) (pc + 4);
+    if ( cx != NULL ) {
+        const GLsizei len = *(GLsizei  *)(pc +  4);
 
         GLfloat params[4];
-
-        CALL_GetProgramNamedParameterfvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                                           len,
-                                                           (const GLubyte *) (pc
-                                                                              +
-                                                                              8),
-                                                           params));
+        CALL_GetProgramNamedParameterfvNV( GET_DISPATCH(), (
+            *(GLuint   *)(pc +  0),
+            len,
+             (const GLubyte *)(pc +  8),
+            params
+        ) );
         __glXSendReply(cl->client, params, 4, 4, GL_TRUE, 0);
         error = Success;
     }
@@ -5608,319 +5901,35 @@ __glXDisp_GetProgramNamedParameterfvNV(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-void
-__glXDisp_ProgramNamedParameter4dvNV(GLbyte * pc)
+void __glXDisp_ProgramNamedParameter4dvNV(GLbyte * pc)
 {
-    const GLsizei len = *(GLsizei *) (pc + 36);
+    const GLsizei len = *(GLsizei  *)(pc + 36);
 
 #ifdef __GLX_ALIGN64
     const GLuint cmdlen = 44 + __GLX_PAD(len) - 4;
-
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, cmdlen);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, cmdlen);
         pc -= 4;
     }
 #endif
 
-    CALL_ProgramNamedParameter4dvNV(GET_DISPATCH(), (*(GLuint *) (pc + 32),
-                                                     len,
-                                                     (const GLubyte *) (pc +
-                                                                        40),
-                                                     (const GLdouble *) (pc + 0)
-                                    ));
+    CALL_ProgramNamedParameter4dvNV( GET_DISPATCH(), (
+        *(GLuint   *)(pc + 32),
+        len,
+         (const GLubyte *)(pc + 40),
+         (const GLdouble *)(pc +  0)
+    ) );
 }
 
-void
-__glXDisp_ProgramNamedParameter4fvNV(GLbyte * pc)
+void __glXDisp_ProgramNamedParameter4fvNV(GLbyte * pc)
 {
-    const GLsizei len = *(GLsizei *) (pc + 4);
-
-    CALL_ProgramNamedParameter4fvNV(GET_DISPATCH(), (*(GLuint *) (pc + 0),
-                                                     len,
-                                                     (const GLubyte *) (pc +
-                                                                        24),
-                                                     (const GLfloat *) (pc + 8)
-                                    ));
-}
+    const GLsizei len = *(GLsizei  *)(pc +  4);
 
-void
-__glXDisp_BlendEquationSeparateEXT(GLbyte * pc)
-{
-    CALL_BlendEquationSeparateEXT(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                   *(GLenum *) (pc + 4)
-                                  ));
-}
-
-void
-__glXDisp_BindFramebufferEXT(GLbyte * pc)
-{
-    CALL_BindFramebufferEXT(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                             *(GLuint *) (pc + 4)
-                            ));
-}
-
-void
-__glXDisp_BindRenderbufferEXT(GLbyte * pc)
-{
-    CALL_BindRenderbufferEXT(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                              *(GLuint *) (pc + 4)
-                             ));
+    CALL_ProgramNamedParameter4fvNV( GET_DISPATCH(), (
+        *(GLuint   *)(pc +  0),
+        len,
+         (const GLubyte *)(pc + 24),
+         (const GLfloat *)(pc +  8)
+    ) );
 }
 
-int
-__glXDisp_CheckFramebufferStatusEXT(__GLXclientState * cl, GLbyte * pc)
-{
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        GLenum retval;
-
-        retval =
-            CALL_CheckFramebufferStatusEXT(GET_DISPATCH(), (*(GLenum *) (pc + 0)
-                                           ));
-        __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
-        error = Success;
-    }
-
-    return error;
-}
-
-void
-__glXDisp_DeleteFramebuffersEXT(GLbyte * pc)
-{
-    const GLsizei n = *(GLsizei *) (pc + 0);
-
-    CALL_DeleteFramebuffersEXT(GET_DISPATCH(), (n, (const GLuint *) (pc + 4)
-                               ));
-}
-
-void
-__glXDisp_DeleteRenderbuffersEXT(GLbyte * pc)
-{
-    const GLsizei n = *(GLsizei *) (pc + 0);
-
-    CALL_DeleteRenderbuffersEXT(GET_DISPATCH(), (n, (const GLuint *) (pc + 4)
-                                ));
-}
-
-void
-__glXDisp_FramebufferRenderbufferEXT(GLbyte * pc)
-{
-    CALL_FramebufferRenderbufferEXT(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                     *(GLenum *) (pc + 4),
-                                                     *(GLenum *) (pc + 8),
-                                                     *(GLuint *) (pc + 12)
-                                    ));
-}
-
-void
-__glXDisp_FramebufferTexture1DEXT(GLbyte * pc)
-{
-    CALL_FramebufferTexture1DEXT(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                  *(GLenum *) (pc + 4),
-                                                  *(GLenum *) (pc + 8),
-                                                  *(GLuint *) (pc + 12),
-                                                  *(GLint *) (pc + 16)
-                                 ));
-}
-
-void
-__glXDisp_FramebufferTexture2DEXT(GLbyte * pc)
-{
-    CALL_FramebufferTexture2DEXT(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                  *(GLenum *) (pc + 4),
-                                                  *(GLenum *) (pc + 8),
-                                                  *(GLuint *) (pc + 12),
-                                                  *(GLint *) (pc + 16)
-                                 ));
-}
-
-void
-__glXDisp_FramebufferTexture3DEXT(GLbyte * pc)
-{
-    CALL_FramebufferTexture3DEXT(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                  *(GLenum *) (pc + 4),
-                                                  *(GLenum *) (pc + 8),
-                                                  *(GLuint *) (pc + 12),
-                                                  *(GLint *) (pc + 16),
-                                                  *(GLint *) (pc + 20)
-                                 ));
-}
-
-int
-__glXDisp_GenFramebuffersEXT(__GLXclientState * cl, GLbyte * pc)
-{
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLsizei n = *(GLsizei *) (pc + 0);
-
-        GLuint answerBuffer[200];
-        GLuint *framebuffers =
-            __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer),
-                                 4);
-        CALL_GenFramebuffersEXT(GET_DISPATCH(), (n, framebuffers));
-        __glXSendReply(cl->client, framebuffers, n, 4, GL_TRUE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int
-__glXDisp_GenRenderbuffersEXT(__GLXclientState * cl, GLbyte * pc)
-{
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLsizei n = *(GLsizei *) (pc + 0);
-
-        GLuint answerBuffer[200];
-        GLuint *renderbuffers =
-            __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer),
-                                 4);
-        CALL_GenRenderbuffersEXT(GET_DISPATCH(), (n, renderbuffers));
-        __glXSendReply(cl->client, renderbuffers, n, 4, GL_TRUE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-void
-__glXDisp_GenerateMipmapEXT(GLbyte * pc)
-{
-    CALL_GenerateMipmapEXT(GET_DISPATCH(), (*(GLenum *) (pc + 0)
-                           ));
-}
-
-int
-__glXDisp_GetFramebufferAttachmentParameterivEXT(__GLXclientState * cl,
-                                                 GLbyte * pc)
-{
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        GLint params[1];
-
-        CALL_GetFramebufferAttachmentParameterivEXT(GET_DISPATCH(),
-                                                    (*(GLenum *) (pc + 0),
-                                                     *(GLenum *) (pc + 4),
-                                                     *(GLenum *) (pc + 8),
-                                                     params));
-        __glXSendReply(cl->client, params, 1, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int
-__glXDisp_GetRenderbufferParameterivEXT(__GLXclientState * cl, GLbyte * pc)
-{
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        GLint params[1];
-
-        CALL_GetRenderbufferParameterivEXT(GET_DISPATCH(),
-                                           (*(GLenum *) (pc + 0),
-                                            *(GLenum *) (pc + 4), params));
-        __glXSendReply(cl->client, params, 1, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int
-__glXDisp_IsFramebufferEXT(__GLXclientState * cl, GLbyte * pc)
-{
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        GLboolean retval;
-
-        retval = CALL_IsFramebufferEXT(GET_DISPATCH(), (*(GLuint *) (pc + 0)
-                                       ));
-        __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
-        error = Success;
-    }
-
-    return error;
-}
-
-int
-__glXDisp_IsRenderbufferEXT(__GLXclientState * cl, GLbyte * pc)
-{
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext *const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        GLboolean retval;
-
-        retval = CALL_IsRenderbufferEXT(GET_DISPATCH(), (*(GLuint *) (pc + 0)
-                                        ));
-        __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
-        error = Success;
-    }
-
-    return error;
-}
-
-void
-__glXDisp_RenderbufferStorageEXT(GLbyte * pc)
-{
-    CALL_RenderbufferStorageEXT(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                 *(GLenum *) (pc + 4),
-                                                 *(GLsizei *) (pc + 8),
-                                                 *(GLsizei *) (pc + 12)
-                                ));
-}
-
-void
-__glXDisp_BlitFramebufferEXT(GLbyte * pc)
-{
-    CALL_BlitFramebufferEXT(GET_DISPATCH(), (*(GLint *) (pc + 0),
-                                             *(GLint *) (pc + 4),
-                                             *(GLint *) (pc + 8),
-                                             *(GLint *) (pc + 12),
-                                             *(GLint *) (pc + 16),
-                                             *(GLint *) (pc + 20),
-                                             *(GLint *) (pc + 24),
-                                             *(GLint *) (pc + 28),
-                                             *(GLbitfield *) (pc + 32),
-                                             *(GLenum *) (pc + 36)
-                            ));
-}
-
-void
-__glXDisp_FramebufferTextureLayerEXT(GLbyte * pc)
-{
-    CALL_FramebufferTextureLayerEXT(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                                     *(GLenum *) (pc + 4),
-                                                     *(GLuint *) (pc + 8),
-                                                     *(GLint *) (pc + 12),
-                                                     *(GLint *) (pc + 16)
-                                    ));
-}
diff --git a/xorg-server/glx/indirect_dispatch.h b/xorg-server/glx/indirect_dispatch.h
index d75dbe062..c98d22f42 100644
--- a/xorg-server/glx/indirect_dispatch.h
+++ b/xorg-server/glx/indirect_dispatch.h
@@ -26,9 +26,9 @@
  */
 
 #if !defined( _INDIRECT_DISPATCH_H_ )
-#define _INDIRECT_DISPATCH_H_
+#  define _INDIRECT_DISPATCH_H_
 
-#include <X11/Xfuncproto.h>
+#  include <X11/Xfuncproto.h>
 
 struct __GLXclientStateRec;
 
@@ -37,210 +37,173 @@ extern _X_HIDDEN void __glXDispSwap_MapGrid1d(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_MapGrid1f(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_MapGrid1f(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_NewList(struct __GLXclientStateRec *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_NewList(struct __GLXclientStateRec *,
-                                           GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_NewList(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_LoadIdentity(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_LoadIdentity(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_SampleCoverageARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_SampleCoverageARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_ConvolutionFilter1D(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_ConvolutionFilter1D(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_BeginQueryARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_BeginQueryARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_RasterPos3dv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_RasterPos3dv(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_PointParameteriNV(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_PointParameteriNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_TexCoord1iv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexCoord1iv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_TexCoord4sv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexCoord4sv(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_ActiveTextureARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_ActiveTextureARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_BlitFramebufferEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_BlitFramebufferEXT(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_TrackMatrixNV(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_TrackMatrixNV(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_VertexAttrib3dv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttrib3dv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_VertexAttrib4ubvNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_VertexAttrib4ubvNV(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GetProgramNamedParameterdvNV(struct
-                                                            __GLXclientStateRec
-                                                            *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetProgramNamedParameterdvNV(struct
-                                                                __GLXclientStateRec
-                                                                *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_GetProgramNamedParameterdvNV(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetProgramNamedParameterdvNV(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_Histogram(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Histogram(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_GetMapfv(struct __GLXclientStateRec *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetMapfv(struct __GLXclientStateRec *,
-                                            GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetMapfv(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_RasterPos4dv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_RasterPos4dv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_PolygonStipple(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_PolygonStipple(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_BlendEquationSeparateEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_BlendEquationSeparateEXT(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GetPixelMapfv(struct __GLXclientStateRec *,
-                                             GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetPixelMapfv(struct __GLXclientStateRec *,
-                                                 GLbyte *);
+extern _X_HIDDEN void __glXDisp_MultiTexCoord1dv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_MultiTexCoord1dv(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_GetPixelMapfv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetPixelMapfv(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_Color3uiv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Color3uiv(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_IsEnabled(struct __GLXclientStateRec *,
-                                         GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_IsEnabled(struct __GLXclientStateRec *,
-                                             GLbyte *);
+extern _X_HIDDEN int __glXDisp_IsEnabled(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_IsEnabled(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_VertexAttrib4svNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_VertexAttrib4svNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_EvalCoord2fv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_EvalCoord2fv(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_DestroyPixmap(struct __GLXclientStateRec *,
-                                             GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_DestroyPixmap(struct __GLXclientStateRec *,
-                                                 GLbyte *);
+extern _X_HIDDEN int __glXDisp_DestroyPixmap(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_DestroyPixmap(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN void __glXDisp_FramebufferTexture1D(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_FramebufferTexture1D(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_GetMapiv(struct __GLXclientStateRec *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetMapiv(struct __GLXclientStateRec *,
-                                            GLbyte *);
-extern _X_HIDDEN int __glXDisp_SwapBuffers(struct __GLXclientStateRec *,
-                                           GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_SwapBuffers(struct __GLXclientStateRec *,
-                                               GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetMapiv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_SwapBuffers(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_SwapBuffers(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_Indexubv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Indexubv(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_Render(struct __GLXclientStateRec *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_Render(struct __GLXclientStateRec *,
-                                          GLbyte *);
-extern _X_HIDDEN int __glXDisp_GetQueryivARB(struct __GLXclientStateRec *,
-                                             GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetQueryivARB(struct __GLXclientStateRec *,
-                                                 GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_Render(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_TexImage3D(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexImage3D(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_MakeContextCurrent(struct __GLXclientStateRec *,
-                                                  GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_MakeContextCurrent(struct __GLXclientStateRec
-                                                      *, GLbyte *);
-extern _X_HIDDEN int __glXDisp_GetFBConfigs(struct __GLXclientStateRec *,
-                                            GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetFBConfigs(struct __GLXclientStateRec *,
-                                                GLbyte *);
+extern _X_HIDDEN int __glXDisp_MakeContextCurrent(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_MakeContextCurrent(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_GetFBConfigs(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetFBConfigs(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN void __glXDisp_VertexAttrib1sv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttrib1sv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Color3ubv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Color3ubv(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GetQueryObjectivARB(struct __GLXclientStateRec *,
-                                                   GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetQueryObjectivARB(struct
-                                                       __GLXclientStateRec *,
-                                                       GLbyte *);
 extern _X_HIDDEN void __glXDisp_Vertex3dv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Vertex3dv(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_CompressedTexSubImage2DARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_CompressedTexSubImage2DARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_VertexAttribs3fvNV(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttribs3fvNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_LightModeliv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_LightModeliv(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_VertexAttrib1svARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttrib1svARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_VertexAttribs1dvNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_VertexAttribs1dvNV(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_GetVertexAttribfv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetVertexAttribfv(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_Normal3bv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Normal3bv(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_VendorPrivate(struct __GLXclientStateRec *,
-                                             GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_VendorPrivate(struct __GLXclientStateRec *,
-                                                 GLbyte *);
-extern _X_HIDDEN void __glXDisp_TexGeniv(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_TexGeniv(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_VertexAttrib1fvNV(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttrib1fvNV(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_VendorPrivate(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_VendorPrivate(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_CreateGLXPixmapWithConfigSGIX(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_CreateGLXPixmapWithConfigSGIX(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_Vertex3iv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Vertex3iv(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_RenderbufferStorage(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_RenderbufferStorage(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_CopyConvolutionFilter1D(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_CopyConvolutionFilter1D(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_GenQueries(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GenQueries(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_BlendColor(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_BlendColor(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_CompressedTexImage3D(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_CompressedTexImage3D(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Scalef(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Scalef(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Normal3iv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Normal3iv(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_SecondaryColor3dv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_SecondaryColor3dv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_PassThrough(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_PassThrough(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_FramebufferTextureLayerEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_FramebufferTextureLayerEXT(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Viewport(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Viewport(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_VertexAttrib4NusvARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttrib4NusvARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_CopyTexSubImage2D(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_CopyTexSubImage2D(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_DepthRange(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_DepthRange(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_GetQueryiv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetQueryiv(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_ResetHistogram(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_ResetHistogram(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GetProgramNamedParameterfvNV(struct
-                                                            __GLXclientStateRec
-                                                            *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetProgramNamedParameterfvNV(struct
-                                                                __GLXclientStateRec
-                                                                *, GLbyte *);
-extern _X_HIDDEN void __glXDisp_PointParameterfEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_PointParameterfEXT(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_GetProgramNamedParameterfvNV(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetProgramNamedParameterfvNV(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN void __glXDisp_CompressedTexSubImage2D(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_CompressedTexSubImage2D(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_SecondaryColor3uiv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_SecondaryColor3uiv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_TexCoord2sv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexCoord2sv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Vertex4dv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Vertex4dv(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_CompressedTexImage3DARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_CompressedTexImage3DARB(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_VertexAttrib4Nbv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttrib4Nbv(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_VertexAttribs2svNV(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttribs2svNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Color3sv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Color3sv(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GetConvolutionParameteriv(struct
-                                                         __GLXclientStateRec *,
-                                                         GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetConvolutionParameteriv(struct
-                                                             __GLXclientStateRec
-                                                             *, GLbyte *);
-extern _X_HIDDEN int __glXDisp_GetConvolutionParameterivEXT(struct
-                                                            __GLXclientStateRec
-                                                            *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetConvolutionParameterivEXT(struct
-                                                                __GLXclientStateRec
-                                                                *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_GetConvolutionParameteriv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetConvolutionParameteriv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_GetConvolutionParameterivEXT(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetConvolutionParameterivEXT(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_Vertex2dv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Vertex2dv(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GetVisualConfigs(struct __GLXclientStateRec *,
-                                                GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetVisualConfigs(struct __GLXclientStateRec
-                                                    *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_GetVisualConfigs(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetVisualConfigs(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN void __glXDisp_DeleteRenderbuffers(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_DeleteRenderbuffers(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_MultiTexCoord1fvARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_MultiTexCoord1fvARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_TexCoord3iv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexCoord3iv(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_CopyContext(struct __GLXclientStateRec *,
-                                           GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_CopyContext(struct __GLXclientStateRec *,
-                                               GLbyte *);
+extern _X_HIDDEN int __glXDisp_CopyContext(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_CopyContext(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN void __glXDisp_VertexAttrib4usv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttrib4usv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Color3fv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Color3fv(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_MultiTexCoord4sv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_MultiTexCoord4sv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_PointSize(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_PointSize(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_PopName(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_PopName(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_VertexAttrib4NbvARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttrib4NbvARB(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_VertexAttrib2dv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttrib2dv(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_VertexAttrib4Nusv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttrib4Nusv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Vertex4sv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Vertex4sv(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GetTexEnvfv(struct __GLXclientStateRec *,
-                                           GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetTexEnvfv(struct __GLXclientStateRec *,
-                                               GLbyte *);
+extern _X_HIDDEN void __glXDisp_ClampColor(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_ClampColor(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_GetTexEnvfv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetTexEnvfv(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_LineStipple(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_LineStipple(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_TexEnvi(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexEnvi(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GetClipPlane(struct __GLXclientStateRec *,
-                                            GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetClipPlane(struct __GLXclientStateRec *,
-                                                GLbyte *);
+extern _X_HIDDEN int __glXDisp_GetClipPlane(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetClipPlane(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_VertexAttribs3dvNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_VertexAttribs3dvNV(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_LightModeli(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_LightModeli(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_VertexAttribs4fvNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_VertexAttribs4fvNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Scaled(GLbyte * pc);
@@ -251,35 +214,26 @@ extern _X_HIDDEN void __glXDisp_AlphaFunc(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_AlphaFunc(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_TexCoord2iv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexCoord2iv(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_CompressedTexImage1DARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_CompressedTexImage1DARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Rotated(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Rotated(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_ReadPixels(struct __GLXclientStateRec *,
-                                          GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_ReadPixels(struct __GLXclientStateRec *,
-                                              GLbyte *);
+extern _X_HIDDEN int __glXDisp_ReadPixels(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_ReadPixels(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_EdgeFlagv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_EdgeFlagv(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_CompressedTexSubImage1D(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_CompressedTexSubImage1D(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_TexParameterf(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexParameterf(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_TexParameteri(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexParameteri(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_DestroyContext(struct __GLXclientStateRec *,
-                                              GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_DestroyContext(struct __GLXclientStateRec *,
-                                                  GLbyte *);
+extern _X_HIDDEN int __glXDisp_DestroyContext(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_DestroyContext(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_DrawPixels(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_DrawPixels(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_MultiTexCoord2svARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_MultiTexCoord2svARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_MultiTexCoord3svARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_MultiTexCoord3svARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_GenerateMipmapEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_GenerateMipmapEXT(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_MultiTexCoord3sv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_MultiTexCoord3sv(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_GenLists(struct __GLXclientStateRec *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GenLists(struct __GLXclientStateRec *,
-                                            GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GenLists(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_MapGrid2d(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_MapGrid2d(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_MapGrid2f(GLbyte * pc);
@@ -300,47 +254,30 @@ extern _X_HIDDEN void __glXDisp_PixelMapfv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_PixelMapfv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Color3usv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Color3usv(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_AreTexturesResident(struct __GLXclientStateRec *,
-                                                   GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_AreTexturesResident(struct
-                                                       __GLXclientStateRec *,
-                                                       GLbyte *);
-extern _X_HIDDEN int __glXDisp_AreTexturesResidentEXT(struct __GLXclientStateRec
-                                                      *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_AreTexturesResidentEXT(struct
-                                                          __GLXclientStateRec *,
-                                                          GLbyte *);
-extern _X_HIDDEN void __glXDisp_PointParameterfvEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_PointParameterfvEXT(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_MultiTexCoord2iv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_MultiTexCoord2iv(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_AreTexturesResident(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_AreTexturesResident(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_AreTexturesResidentEXT(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_AreTexturesResidentEXT(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_Color3bv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Color3bv(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_SecondaryColor3bvEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_SecondaryColor3bvEXT(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GetProgramLocalParameterfvARB(struct
-                                                             __GLXclientStateRec
-                                                             *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetProgramLocalParameterfvARB(struct
-                                                                 __GLXclientStateRec
-                                                                 *, GLbyte *);
-extern _X_HIDDEN void __glXDisp_RenderbufferStorageEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_RenderbufferStorageEXT(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_VertexAttrib2fvARB(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttrib2fvARB(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_GetProgramLocalParameterfvARB(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetProgramLocalParameterfvARB(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_ColorTable(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_ColorTable(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Accum(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Accum(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GetTexImage(struct __GLXclientStateRec *,
-                                           GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetTexImage(struct __GLXclientStateRec *,
-                                               GLbyte *);
+extern _X_HIDDEN int __glXDisp_GetTexImage(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetTexImage(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_ConvolutionFilter2D(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_ConvolutionFilter2D(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_Finish(struct __GLXclientStateRec *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_Finish(struct __GLXclientStateRec *,
-                                          GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_Finish(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_ClearStencil(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_ClearStencil(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_VertexAttrib3dvARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttrib3dvARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_VertexAttribs4ubvNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_VertexAttribs4ubvNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_ConvolutionParameteriv(GLbyte * pc);
@@ -349,6 +286,8 @@ extern _X_HIDDEN void __glXDisp_RasterPos2fv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_RasterPos2fv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_TexCoord1fv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexCoord1fv(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_MultiTexCoord4dv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_MultiTexCoord4dv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_ProgramEnvParameter4fvARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_ProgramEnvParameter4fvARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_RasterPos4fv(GLbyte * pc);
@@ -361,187 +300,134 @@ extern _X_HIDDEN void __glXDisp_PushMatrix(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_PushMatrix(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_ConvolutionParameterfv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_ConvolutionParameterfv(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GetTexGendv(struct __GLXclientStateRec *,
-                                           GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetTexGendv(struct __GLXclientStateRec *,
-                                               GLbyte *);
-extern _X_HIDDEN int __glXDisp_GetVertexAttribfvNV(struct __GLXclientStateRec *,
-                                                   GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetVertexAttribfvNV(struct
-                                                       __GLXclientStateRec *,
-                                                       GLbyte *);
+extern _X_HIDDEN int __glXDisp_GetTexGendv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetTexGendv(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_LoadProgramNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_LoadProgramNV(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_EndList(struct __GLXclientStateRec *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_EndList(struct __GLXclientStateRec *,
-                                           GLbyte *);
-extern _X_HIDDEN void __glXDisp_VertexAttrib4fvNV(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttrib4fvNV(GLbyte * pc);
+extern _X_HIDDEN int __glXDispSwap_EndList(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_EvalCoord1fv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_EvalCoord1fv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_EvalMesh2(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_EvalMesh2(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Vertex4fv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Vertex4fv(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_CheckFramebufferStatusEXT(struct
-                                                         __GLXclientStateRec *,
-                                                         GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_CheckFramebufferStatusEXT(struct
-                                                             __GLXclientStateRec
-                                                             *, GLbyte *);
-extern _X_HIDDEN int __glXDisp_GetVertexAttribivARB(struct __GLXclientStateRec
-                                                    *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetVertexAttribivARB(struct
-                                                        __GLXclientStateRec *,
-                                                        GLbyte *);
-extern _X_HIDDEN int __glXDisp_GetFBConfigsSGIX(struct __GLXclientStateRec *,
-                                                GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetFBConfigsSGIX(struct __GLXclientStateRec
-                                                    *, GLbyte *);
-extern _X_HIDDEN int __glXDisp_CreateNewContext(struct __GLXclientStateRec *,
-                                                GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_CreateNewContext(struct __GLXclientStateRec
-                                                    *, GLbyte *);
-extern _X_HIDDEN int __glXDisp_GetMinmax(struct __GLXclientStateRec *,
-                                         GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetMinmax(struct __GLXclientStateRec *,
-                                             GLbyte *);
-extern _X_HIDDEN int __glXDisp_GetMinmaxEXT(struct __GLXclientStateRec *,
-                                            GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetMinmaxEXT(struct __GLXclientStateRec *,
-                                                GLbyte *);
+extern _X_HIDDEN void __glXDisp_VertexAttribs3fvNV(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttribs3fvNV(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_GetProgramEnvParameterdvARB(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetProgramEnvParameterdvARB(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_GetFBConfigsSGIX(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetFBConfigsSGIX(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN void __glXDisp_BindFramebuffer(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_BindFramebuffer(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_CreateNewContext(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_CreateNewContext(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_GetMinmax(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetMinmax(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_GetMinmaxEXT(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetMinmaxEXT(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN void __glXDisp_BlendFuncSeparate(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_BlendFuncSeparate(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_GetVertexAttribdvNV(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetVertexAttribdvNV(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_Normal3fv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Normal3fv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_ProgramEnvParameter4dvARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_ProgramEnvParameter4dvARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_VertexAttrib4ivARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttrib4ivARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_End(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_End(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_VertexAttribs3svNV(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttribs3svNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_VertexAttribs2dvNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_VertexAttribs2dvNV(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_CreateContextAttribsARB(struct
-                                                       __GLXclientStateRec *,
-                                                       GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_CreateContextAttribsARB(struct
-                                                           __GLXclientStateRec
-                                                           *, GLbyte *);
-extern _X_HIDDEN int __glXDisp_GetProgramParameterfvNV(struct
-                                                       __GLXclientStateRec *,
-                                                       GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetProgramParameterfvNV(struct
-                                                           __GLXclientStateRec
-                                                           *, GLbyte *);
+extern _X_HIDDEN void __glXDisp_MultiTexCoord3fvARB(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_MultiTexCoord3fvARB(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_GetProgramParameterfvNV(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetProgramParameterfvNV(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_BindTexture(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_BindTexture(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_VertexAttrib2sv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttrib2sv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_TexSubImage2D(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexSubImage2D(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_TexGenfv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexGenfv(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_VertexAttrib4bvARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttrib4bvARB(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_CreateContextWithConfigSGIX(struct
-                                                           __GLXclientStateRec
-                                                           *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_CreateContextWithConfigSGIX(struct
-                                                               __GLXclientStateRec
-                                                               *, GLbyte *);
-extern _X_HIDDEN void __glXDisp_FramebufferTexture3DEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_FramebufferTexture3DEXT(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_CopySubBufferMESA(struct __GLXclientStateRec *,
-                                                 GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_CopySubBufferMESA(struct __GLXclientStateRec
-                                                     *, GLbyte *);
+extern _X_HIDDEN void __glXDisp_VertexAttrib4dvNV(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttrib4dvNV(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_GetVertexAttribiv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetVertexAttribiv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN void __glXDisp_DrawBuffers(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_DrawBuffers(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_CreateContextWithConfigSGIX(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_CreateContextWithConfigSGIX(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_CopySubBufferMESA(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_CopySubBufferMESA(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_BlendEquation(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_BlendEquation(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_GetError(struct __GLXclientStateRec *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetError(struct __GLXclientStateRec *,
-                                            GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetError(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_TexCoord3dv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexCoord3dv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Indexdv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Indexdv(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_FramebufferTexture2DEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_FramebufferTexture2DEXT(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_PushName(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_PushName(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_MultiTexCoord2dvARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_MultiTexCoord2dvARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_ProgramNamedParameter4fvNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_ProgramNamedParameter4fvNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_VertexAttrib4fvARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_VertexAttrib4fvARB(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_CreateGLXPbufferSGIX(struct __GLXclientStateRec
-                                                    *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_CreateGLXPbufferSGIX(struct
-                                                        __GLXclientStateRec *,
-                                                        GLbyte *);
-extern _X_HIDDEN void __glXDisp_MultiTexCoord1svARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_MultiTexCoord1svARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_EndQueryARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_EndQueryARB(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_VertexAttrib1dv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttrib1dv(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_CreateGLXPbufferSGIX(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_CreateGLXPbufferSGIX(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_IsRenderbuffer(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_IsRenderbuffer(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_DepthMask(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_DepthMask(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Color4iv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Color4iv(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GetMaterialiv(struct __GLXclientStateRec *,
-                                             GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetMaterialiv(struct __GLXclientStateRec *,
-                                                 GLbyte *);
+extern _X_HIDDEN int __glXDisp_GetMaterialiv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetMaterialiv(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_StencilOp(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_StencilOp(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_Ortho(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_Ortho(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_FramebufferTextureLayer(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_FramebufferTextureLayer(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_TexEnvfv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexEnvfv(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_QueryServerString(struct __GLXclientStateRec *,
-                                                 GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_QueryServerString(struct __GLXclientStateRec
-                                                     *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_QueryServerString(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_QueryServerString(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_LoadMatrixf(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_LoadMatrixf(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Color4bv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Color4bv(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_SecondaryColor3usvEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_SecondaryColor3usvEXT(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_GetCompressedTexImage(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetCompressedTexImage(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_VertexAttrib2fvNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_VertexAttrib2fvNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_ProgramLocalParameter4dvARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_ProgramLocalParameter4dvARB(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_DeleteLists(struct __GLXclientStateRec *,
-                                           GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_DeleteLists(struct __GLXclientStateRec *,
-                                               GLbyte *);
+extern _X_HIDDEN int __glXDisp_DeleteLists(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_DeleteLists(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_LogicOp(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_LogicOp(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_RenderbufferStorageMultisample(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_RenderbufferStorageMultisample(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_TexCoord4fv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexCoord4fv(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_ActiveTexture(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_ActiveTexture(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_SecondaryColor3bv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_SecondaryColor3bv(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_WaitX(struct __GLXclientStateRec *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_WaitX(struct __GLXclientStateRec *,
-                                         GLbyte *);
-extern _X_HIDDEN void __glXDisp_SecondaryColor3uivEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_SecondaryColor3uivEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_FramebufferRenderbufferEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_FramebufferRenderbufferEXT(GLbyte * pc);
+extern _X_HIDDEN int __glXDispSwap_WaitX(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_VertexAttrib1dvNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_VertexAttrib1dvNV(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GenTextures(struct __GLXclientStateRec *,
-                                           GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GenTextures(struct __GLXclientStateRec *,
-                                               GLbyte *);
-extern _X_HIDDEN int __glXDisp_GenTexturesEXT(struct __GLXclientStateRec *,
-                                              GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GenTexturesEXT(struct __GLXclientStateRec *,
-                                                  GLbyte *);
-extern _X_HIDDEN void __glXDisp_FramebufferTexture1DEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_FramebufferTexture1DEXT(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GetDrawableAttributes(struct __GLXclientStateRec
-                                                     *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetDrawableAttributes(struct
-                                                         __GLXclientStateRec *,
-                                                         GLbyte *);
+extern _X_HIDDEN int __glXDisp_GenTextures(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GenTextures(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_GenTexturesEXT(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GenTexturesEXT(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_GetDrawableAttributes(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetDrawableAttributes(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_RasterPos2sv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_RasterPos2sv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Color4ubv(GLbyte * pc);
@@ -550,236 +436,154 @@ extern _X_HIDDEN void __glXDisp_DrawBuffer(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_DrawBuffer(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_TexCoord2fv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexCoord2fv(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_MultiTexCoord4iv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_MultiTexCoord4iv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_TexCoord1sv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexCoord1sv(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_CreateGLXPixmapWithConfigSGIX(struct
-                                                             __GLXclientStateRec
-                                                             *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_CreateGLXPixmapWithConfigSGIX(struct
-                                                                 __GLXclientStateRec
-                                                                 *, GLbyte *);
+extern _X_HIDDEN void __glXDisp_TexGeniv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_TexGeniv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_DepthFunc(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_DepthFunc(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_PixelMapusv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_PixelMapusv(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_PointParameterivNV(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_PointParameterivNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_BlendFunc(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_BlendFunc(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_WaitGL(struct __GLXclientStateRec *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_WaitGL(struct __GLXclientStateRec *,
-                                          GLbyte *);
-extern _X_HIDDEN void __glXDisp_MultiTexCoord3dvARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_MultiTexCoord3dvARB(GLbyte * pc);
+extern _X_HIDDEN int __glXDispSwap_WaitGL(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN void __glXDisp_CompressedTexImage2D(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_CompressedTexImage2D(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_ProgramNamedParameter4dvNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_ProgramNamedParameter4dvNV(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_Flush(struct __GLXclientStateRec *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_Flush(struct __GLXclientStateRec *,
-                                         GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_Flush(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_Color4uiv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Color4uiv(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_MultiTexCoord1sv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_MultiTexCoord1sv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_RasterPos3sv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_RasterPos3sv(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_BindFramebufferEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_BindFramebufferEXT(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_PushAttrib(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_PushAttrib(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_DestroyPbuffer(struct __GLXclientStateRec *,
-                                              GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_DestroyPbuffer(struct __GLXclientStateRec *,
-                                                  GLbyte *);
+extern _X_HIDDEN int __glXDisp_DestroyPbuffer(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_DestroyPbuffer(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_TexParameteriv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexParameteriv(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_WindowPos3fvMESA(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_WindowPos3fvMESA(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_VertexAttrib1svNV(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttrib1svNV(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_QueryExtensionsString(struct __GLXclientStateRec
-                                                     *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_QueryExtensionsString(struct
-                                                         __GLXclientStateRec *,
-                                                         GLbyte *);
+extern _X_HIDDEN int __glXDisp_QueryExtensionsString(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_QueryExtensionsString(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_RasterPos3fv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_RasterPos3fv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_CopyTexSubImage3D(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_CopyTexSubImage3D(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GetColorTable(struct __GLXclientStateRec *,
-                                             GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetColorTable(struct __GLXclientStateRec *,
-                                                 GLbyte *);
-extern _X_HIDDEN int __glXDisp_GetColorTableSGI(struct __GLXclientStateRec *,
-                                                GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetColorTableSGI(struct __GLXclientStateRec
-                                                    *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_GetColorTable(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetColorTable(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_GetColorTableSGI(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetColorTableSGI(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_Indexiv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Indexiv(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_CreateContext(struct __GLXclientStateRec *,
-                                             GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_CreateContext(struct __GLXclientStateRec *,
-                                                 GLbyte *);
+extern _X_HIDDEN int __glXDisp_CreateContext(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_CreateContext(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_CopyColorTable(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_CopyColorTable(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GetHistogramParameterfv(struct
-                                                       __GLXclientStateRec *,
-                                                       GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetHistogramParameterfv(struct
-                                                           __GLXclientStateRec
-                                                           *, GLbyte *);
-extern _X_HIDDEN int __glXDisp_GetHistogramParameterfvEXT(struct
-                                                          __GLXclientStateRec *,
-                                                          GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetHistogramParameterfvEXT(struct
-                                                              __GLXclientStateRec
-                                                              *, GLbyte *);
+extern _X_HIDDEN void __glXDisp_PointParameterfv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_PointParameterfv(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_GetHistogramParameterfv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetHistogramParameterfv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_GetHistogramParameterfvEXT(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetHistogramParameterfvEXT(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_Frustum(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Frustum(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GetString(struct __GLXclientStateRec *,
-                                         GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetString(struct __GLXclientStateRec *,
-                                             GLbyte *);
-extern _X_HIDDEN int __glXDisp_CreateGLXPixmap(struct __GLXclientStateRec *,
-                                               GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_CreateGLXPixmap(struct __GLXclientStateRec *,
-                                                   GLbyte *);
+extern _X_HIDDEN int __glXDisp_GetString(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetString(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_CreateGLXPixmap(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_CreateGLXPixmap(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_TexEnvf(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexEnvf(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GetProgramStringARB(struct __GLXclientStateRec *,
-                                                   GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetProgramStringARB(struct
-                                                       __GLXclientStateRec *,
-                                                       GLbyte *);
-extern _X_HIDDEN void __glXDisp_MultiTexCoord3ivARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_MultiTexCoord3ivARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_VertexAttrib1dvARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttrib1dvARB(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_DeleteTextures(struct __GLXclientStateRec *,
-                                              GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_DeleteTextures(struct __GLXclientStateRec *,
-                                                  GLbyte *);
-extern _X_HIDDEN int __glXDisp_DeleteTexturesEXT(struct __GLXclientStateRec *,
-                                                 GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_DeleteTexturesEXT(struct __GLXclientStateRec
-                                                     *, GLbyte *);
-extern _X_HIDDEN int __glXDisp_GetTexLevelParameteriv(struct __GLXclientStateRec
-                                                      *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetTexLevelParameteriv(struct
-                                                          __GLXclientStateRec *,
-                                                          GLbyte *);
+extern _X_HIDDEN int __glXDisp_GenProgramsARB(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GenProgramsARB(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_DeleteTextures(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_DeleteTextures(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_DeleteTexturesEXT(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_DeleteTexturesEXT(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_GetTexLevelParameteriv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetTexLevelParameteriv(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_ClearAccum(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_ClearAccum(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_QueryVersion(struct __GLXclientStateRec *,
-                                            GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_QueryVersion(struct __GLXclientStateRec *,
-                                                GLbyte *);
-extern _X_HIDDEN int __glXDisp_GetVertexAttribfvARB(struct __GLXclientStateRec
-                                                    *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetVertexAttribfvARB(struct
-                                                        __GLXclientStateRec *,
-                                                        GLbyte *);
-extern _X_HIDDEN void __glXDisp_SecondaryColor3ivEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_SecondaryColor3ivEXT(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_QueryVersion(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_QueryVersion(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_TexCoord4iv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexCoord4iv(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GetDrawableAttributesSGIX(struct
-                                                         __GLXclientStateRec *,
-                                                         GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetDrawableAttributesSGIX(struct
-                                                             __GLXclientStateRec
-                                                             *, GLbyte *);
+extern _X_HIDDEN void __glXDisp_FramebufferTexture3D(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_FramebufferTexture3D(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_GetDrawableAttributesSGIX(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetDrawableAttributesSGIX(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_GetProgramParameterdvNV(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetProgramParameterdvNV(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_ColorTableParameteriv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_ColorTableParameteriv(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_VertexAttrib4ubvARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttrib4ubvARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_CopyTexImage2D(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_CopyTexImage2D(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_MultiTexCoord2dv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_MultiTexCoord2dv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Lightfv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Lightfv(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_GetFramebufferAttachmentParameteriv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetFramebufferAttachmentParameteriv(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_ClearDepth(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_ClearDepth(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_ColorSubTable(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_ColorSubTable(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Color4fv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Color4fv(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_MultiTexCoord4ivARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_MultiTexCoord4ivARB(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_CreatePixmap(struct __GLXclientStateRec *,
-                                            GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_CreatePixmap(struct __GLXclientStateRec *,
-                                                GLbyte *);
+extern _X_HIDDEN int __glXDisp_CreatePixmap(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_CreatePixmap(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_Lightiv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Lightiv(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GetQueryObjectuivARB(struct __GLXclientStateRec
-                                                    *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetQueryObjectuivARB(struct
-                                                        __GLXclientStateRec *,
-                                                        GLbyte *);
-extern _X_HIDDEN int __glXDisp_GetTexParameteriv(struct __GLXclientStateRec *,
-                                                 GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetTexParameteriv(struct __GLXclientStateRec
-                                                     *, GLbyte *);
-extern _X_HIDDEN int __glXDisp_GenRenderbuffersEXT(struct __GLXclientStateRec *,
-                                                   GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GenRenderbuffersEXT(struct
-                                                       __GLXclientStateRec *,
-                                                       GLbyte *);
-extern _X_HIDDEN void __glXDisp_VertexAttrib2dvARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttrib2dvARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_VertexAttribs2svNV(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttribs2svNV(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_GetTexParameteriv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetTexParameteriv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN void __glXDisp_VertexAttrib3sv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttrib3sv(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_IsQuery(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_IsQuery(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_Rectdv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Rectdv(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_VertexAttrib4NivARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttrib4NivARB(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_VertexAttrib4dv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttrib4dv(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_SamplePatternSGIS(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_SamplePatternSGIS(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Materialiv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Materialiv(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_SampleMaskSGIS(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_SampleMaskSGIS(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_SecondaryColor3fvEXT(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_SecondaryColor3fvEXT(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_PolygonMode(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_PolygonMode(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_CompressedTexSubImage1DARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_CompressedTexSubImage1DARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_VertexAttrib2dvNV(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttrib2dvNV(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GetVertexAttribivNV(struct __GLXclientStateRec *,
-                                                   GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetVertexAttribivNV(struct
-                                                       __GLXclientStateRec *,
-                                                       GLbyte *);
-extern _X_HIDDEN int __glXDisp_IsQueryARB(struct __GLXclientStateRec *,
-                                          GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_IsQueryARB(struct __GLXclientStateRec *,
-                                              GLbyte *);
+extern _X_HIDDEN void __glXDisp_SecondaryColor3iv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_SecondaryColor3iv(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_VertexAttrib4Niv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttrib4Niv(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_GetVertexAttribivNV(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetVertexAttribivNV(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_GetProgramStringARB(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetProgramStringARB(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_TexGeni(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexGeni(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_TexGenf(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexGenf(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_TexGend(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexGend(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GetPolygonStipple(struct __GLXclientStateRec *,
-                                                 GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetPolygonStipple(struct __GLXclientStateRec
-                                                     *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_GetPolygonStipple(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetPolygonStipple(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_GetVertexAttribfvNV(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetVertexAttribfvNV(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_VertexAttrib2svNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_VertexAttrib2svNV(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_VertexAttrib4NuivARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttrib4NuivARB(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GetVertexAttribdvNV(struct __GLXclientStateRec *,
-                                                   GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetVertexAttribdvNV(struct
-                                                       __GLXclientStateRec *,
-                                                       GLbyte *);
-extern _X_HIDDEN int __glXDisp_DestroyWindow(struct __GLXclientStateRec *,
-                                             GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_DestroyWindow(struct __GLXclientStateRec *,
-                                                 GLbyte *);
+extern _X_HIDDEN void __glXDisp_VertexAttribs1fvNV(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttribs1fvNV(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_VertexAttrib2dvNV(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttrib2dvNV(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_DestroyWindow(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_DestroyWindow(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_Color4sv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Color4sv(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_IsProgramNV(struct __GLXclientStateRec *,
-                                           GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_IsProgramNV(struct __GLXclientStateRec *,
-                                               GLbyte *);
 extern _X_HIDDEN void __glXDisp_PixelZoom(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_PixelZoom(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_ColorTableParameterfv(GLbyte * pc);
@@ -788,263 +592,172 @@ extern _X_HIDDEN void __glXDisp_PixelMapuiv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_PixelMapuiv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Color3dv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Color3dv(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_IsTexture(struct __GLXclientStateRec *,
-                                         GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_IsTexture(struct __GLXclientStateRec *,
-                                             GLbyte *);
-extern _X_HIDDEN int __glXDisp_IsTextureEXT(struct __GLXclientStateRec *,
-                                            GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_IsTextureEXT(struct __GLXclientStateRec *,
-                                                GLbyte *);
-extern _X_HIDDEN int __glXDisp_SetClientInfo2ARB(struct __GLXclientStateRec *,
-                                                 GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_SetClientInfo2ARB(struct __GLXclientStateRec
-                                                     *, GLbyte *);
-extern _X_HIDDEN int __glXDisp_DeleteQueriesARB(struct __GLXclientStateRec *,
-                                                GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_DeleteQueriesARB(struct __GLXclientStateRec
-                                                    *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_IsTexture(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_IsTexture(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_IsTextureEXT(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_IsTextureEXT(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN void __glXDisp_VertexAttrib4fvNV(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttrib4fvNV(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_BeginQuery(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_BeginQuery(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_GetMapdv(struct __GLXclientStateRec *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetMapdv(struct __GLXclientStateRec *,
-                                            GLbyte *);
-extern _X_HIDDEN int __glXDisp_DestroyGLXPixmap(struct __GLXclientStateRec *,
-                                                GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_DestroyGLXPixmap(struct __GLXclientStateRec
-                                                    *, GLbyte *);
-extern _X_HIDDEN void __glXDisp_SamplePatternSGIS(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_SamplePatternSGIS(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_PixelStoref(struct __GLXclientStateRec *,
-                                           GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_PixelStoref(struct __GLXclientStateRec *,
-                                               GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetMapdv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN void __glXDisp_MultiTexCoord3iv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_MultiTexCoord3iv(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_DestroyGLXPixmap(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_DestroyGLXPixmap(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_PixelStoref(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_PixelStoref(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_PrioritizeTextures(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_PrioritizeTextures(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_PixelStorei(struct __GLXclientStateRec *,
-                                           GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_PixelStorei(struct __GLXclientStateRec *,
-                                               GLbyte *);
-extern _X_HIDDEN void __glXDisp_VertexAttrib4usvARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttrib4usvARB(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_DestroyGLXPbufferSGIX(struct __GLXclientStateRec
-                                                     *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_DestroyGLXPbufferSGIX(struct
-                                                         __GLXclientStateRec *,
-                                                         GLbyte *);
+extern _X_HIDDEN int __glXDisp_PixelStorei(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_PixelStorei(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_DestroyGLXPbufferSGIX(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_DestroyGLXPbufferSGIX(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_EvalCoord2dv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_EvalCoord2dv(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_VertexAttrib3svARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttrib3svARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_ColorMaterial(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_ColorMaterial(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_CompressedTexSubImage3DARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_CompressedTexSubImage3DARB(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_IsFramebufferEXT(struct __GLXclientStateRec *,
-                                                GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_IsFramebufferEXT(struct __GLXclientStateRec
-                                                    *, GLbyte *);
-extern _X_HIDDEN int __glXDisp_GetVertexAttribdvARB(struct __GLXclientStateRec
-                                                    *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetVertexAttribdvARB(struct
-                                                        __GLXclientStateRec *,
-                                                        GLbyte *);
-extern _X_HIDDEN int __glXDisp_GetSeparableFilter(struct __GLXclientStateRec *,
-                                                  GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetSeparableFilter(struct __GLXclientStateRec
-                                                      *, GLbyte *);
-extern _X_HIDDEN int __glXDisp_GetSeparableFilterEXT(struct __GLXclientStateRec
-                                                     *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetSeparableFilterEXT(struct
-                                                         __GLXclientStateRec *,
-                                                         GLbyte *);
+extern _X_HIDDEN void __glXDisp_VertexAttribs1svNV(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttribs1svNV(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_GetSeparableFilter(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetSeparableFilter(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_GetSeparableFilterEXT(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetSeparableFilterEXT(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_RequestResidentProgramsNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_RequestResidentProgramsNV(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_FeedbackBuffer(struct __GLXclientStateRec *,
-                                              GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_FeedbackBuffer(struct __GLXclientStateRec *,
-                                                  GLbyte *);
+extern _X_HIDDEN int __glXDisp_FeedbackBuffer(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_FeedbackBuffer(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_RasterPos2iv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_RasterPos2iv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_TexImage1D(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexImage1D(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_FrontFace(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_FrontFace(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_RenderLarge(struct __GLXclientStateRec *,
-                                           GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_RenderLarge(struct __GLXclientStateRec *,
-                                               GLbyte *);
-extern _X_HIDDEN void __glXDisp_VertexAttrib4dvARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttrib4dvARB(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_RenderLarge(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_RenderLarge(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_PolygonOffset(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_PolygonOffset(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_ExecuteProgramNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_ExecuteProgramNV(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_GetVertexAttribdv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetVertexAttribdv(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_Normal3dv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Normal3dv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Lightf(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Lightf(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_MatrixMode(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_MatrixMode(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GetPixelMapusv(struct __GLXclientStateRec *,
-                                              GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetPixelMapusv(struct __GLXclientStateRec *,
-                                                  GLbyte *);
+extern _X_HIDDEN int __glXDisp_GetPixelMapusv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetPixelMapusv(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_Lighti(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Lighti(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GetFramebufferAttachmentParameterivEXT(struct
-                                                                      __GLXclientStateRec
-                                                                      *,
-                                                                      GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetFramebufferAttachmentParameterivEXT(struct
-                                                                          __GLXclientStateRec
-                                                                          *,
-                                                                          GLbyte
-                                                                          *);
-extern _X_HIDDEN int __glXDisp_ChangeDrawableAttributesSGIX(struct
-                                                            __GLXclientStateRec
-                                                            *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_ChangeDrawableAttributesSGIX(struct
-                                                                __GLXclientStateRec
-                                                                *, GLbyte *);
-extern _X_HIDDEN void __glXDisp_MultiTexCoord4dvARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_MultiTexCoord4dvARB(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_CreatePbuffer(struct __GLXclientStateRec *,
-                                             GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_CreatePbuffer(struct __GLXclientStateRec *,
-                                                 GLbyte *);
-extern _X_HIDDEN int __glXDisp_GetDoublev(struct __GLXclientStateRec *,
-                                          GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetDoublev(struct __GLXclientStateRec *,
-                                              GLbyte *);
+extern _X_HIDDEN int __glXDisp_GenFramebuffers(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GenFramebuffers(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_IsFramebuffer(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_IsFramebuffer(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_ChangeDrawableAttributesSGIX(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_ChangeDrawableAttributesSGIX(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN void __glXDisp_BlendEquationSeparate(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_BlendEquationSeparate(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_CreatePbuffer(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_CreatePbuffer(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_GetDoublev(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetDoublev(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_MultMatrixd(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_MultMatrixd(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_MultMatrixf(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_MultMatrixf(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_CompressedTexImage1D(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_CompressedTexImage1D(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_MultiTexCoord4fvARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_MultiTexCoord4fvARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_RasterPos4sv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_RasterPos4sv(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_VertexAttrib4NsvARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttrib4NsvARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_VertexAttrib3fvARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_VertexAttrib3fvARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_ClearColor(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_ClearColor(GLbyte * pc);
 extern _X_HIDDEN int __glXDisp_IsDirect(struct __GLXclientStateRec *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_IsDirect(struct __GLXclientStateRec *,
-                                            GLbyte *);
-extern _X_HIDDEN void __glXDisp_DeleteFramebuffersEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_DeleteFramebuffersEXT(GLbyte * pc);
+extern _X_HIDDEN int __glXDispSwap_IsDirect(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN void __glXDisp_VertexAttrib1svNV(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttrib1svNV(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_SecondaryColor3ubv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_SecondaryColor3ubv(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_PointParameteri(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_PointParameteri(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_PointParameterf(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_PointParameterf(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_TexEnviv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexEnviv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_TexSubImage3D(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexSubImage3D(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_SwapIntervalSGI(struct __GLXclientStateRec *,
-                                               GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_SwapIntervalSGI(struct __GLXclientStateRec *,
-                                                   GLbyte *);
-extern _X_HIDDEN int __glXDisp_GetColorTableParameterfv(struct
-                                                        __GLXclientStateRec *,
-                                                        GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetColorTableParameterfv(struct
-                                                            __GLXclientStateRec
-                                                            *, GLbyte *);
-extern _X_HIDDEN int __glXDisp_GetColorTableParameterfvSGI(struct
-                                                           __GLXclientStateRec
-                                                           *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetColorTableParameterfvSGI(struct
-                                                               __GLXclientStateRec
-                                                               *, GLbyte *);
+extern _X_HIDDEN void __glXDisp_VertexAttrib4iv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttrib4iv(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_SwapIntervalSGI(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_SwapIntervalSGI(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_GetColorTableParameterfv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetColorTableParameterfv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_GetColorTableParameterfvSGI(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetColorTableParameterfvSGI(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN void __glXDisp_FramebufferTexture2D(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_FramebufferTexture2D(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Bitmap(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Bitmap(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GetTexLevelParameterfv(struct __GLXclientStateRec
-                                                      *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetTexLevelParameterfv(struct
-                                                          __GLXclientStateRec *,
-                                                          GLbyte *);
-extern _X_HIDDEN int __glXDisp_GenFramebuffersEXT(struct __GLXclientStateRec *,
-                                                  GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GenFramebuffersEXT(struct __GLXclientStateRec
-                                                      *, GLbyte *);
-extern _X_HIDDEN int __glXDisp_GetProgramParameterdvNV(struct
-                                                       __GLXclientStateRec *,
-                                                       GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetProgramParameterdvNV(struct
-                                                           __GLXclientStateRec
-                                                           *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_GetTexLevelParameterfv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetTexLevelParameterfv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_CheckFramebufferStatus(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_CheckFramebufferStatus(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_Vertex2sv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Vertex2sv(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GetIntegerv(struct __GLXclientStateRec *,
-                                           GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetIntegerv(struct __GLXclientStateRec *,
-                                               GLbyte *);
-extern _X_HIDDEN int __glXDisp_GetProgramEnvParameterfvARB(struct
-                                                           __GLXclientStateRec
-                                                           *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetProgramEnvParameterfvARB(struct
-                                                               __GLXclientStateRec
-                                                               *, GLbyte *);
-extern _X_HIDDEN int __glXDisp_GetTrackMatrixivNV(struct __GLXclientStateRec *,
-                                                  GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetTrackMatrixivNV(struct __GLXclientStateRec
-                                                      *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_GetIntegerv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetIntegerv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN void __glXDisp_BindProgramARB(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_BindProgramARB(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_GetProgramEnvParameterfvARB(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetProgramEnvParameterfvARB(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_GetTrackMatrixivNV(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetTrackMatrixivNV(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_VertexAttrib3svNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_VertexAttrib3svNV(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GetTexEnviv(struct __GLXclientStateRec *,
-                                           GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetTexEnviv(struct __GLXclientStateRec *,
-                                               GLbyte *);
-extern _X_HIDDEN int __glXDisp_VendorPrivateWithReply(struct __GLXclientStateRec
-                                                      *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_VendorPrivateWithReply(struct
-                                                          __GLXclientStateRec *,
-                                                          GLbyte *);
+extern _X_HIDDEN int __glXDisp_GetTexEnviv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetTexEnviv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_VendorPrivateWithReply(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_VendorPrivateWithReply(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_SeparableFilter2D(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_SeparableFilter2D(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_GetQueryObjectuiv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetQueryObjectuiv(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_Map1d(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Map1d(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Map1f(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Map1f(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_CompressedTexImage2DARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_CompressedTexImage2DARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_TexImage2D(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexImage2D(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_ProgramParameters4fvNV(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_ProgramParameters4fvNV(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GetProgramivNV(struct __GLXclientStateRec *,
-                                              GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetProgramivNV(struct __GLXclientStateRec *,
-                                                  GLbyte *);
-extern _X_HIDDEN int __glXDisp_ChangeDrawableAttributes(struct
-                                                        __GLXclientStateRec *,
-                                                        GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_ChangeDrawableAttributes(struct
-                                                            __GLXclientStateRec
-                                                            *, GLbyte *);
-extern _X_HIDDEN int __glXDisp_GetMinmaxParameteriv(struct __GLXclientStateRec
-                                                    *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetMinmaxParameteriv(struct
-                                                        __GLXclientStateRec *,
-                                                        GLbyte *);
-extern _X_HIDDEN int __glXDisp_GetMinmaxParameterivEXT(struct
-                                                       __GLXclientStateRec *,
-                                                       GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetMinmaxParameterivEXT(struct
-                                                           __GLXclientStateRec
-                                                           *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_GetProgramivNV(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetProgramivNV(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_ChangeDrawableAttributes(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_ChangeDrawableAttributes(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_GetMinmaxParameteriv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetMinmaxParameteriv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_GetMinmaxParameterivEXT(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetMinmaxParameterivEXT(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_PixelTransferf(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_PixelTransferf(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_CopyTexImage1D(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_CopyTexImage1D(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_RasterPos2dv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_RasterPos2dv(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_VertexAttrib1fvNV(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttrib1fvNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Fogiv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Fogiv(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_EndQuery(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_EndQuery(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_TexCoord1dv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexCoord1dv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_PixelTransferi(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_PixelTransferi(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_SecondaryColor3ubvEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_SecondaryColor3ubvEXT(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_VertexAttrib3fvNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_VertexAttrib3fvNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Clear(GLbyte * pc);
@@ -1053,97 +766,66 @@ extern _X_HIDDEN void __glXDisp_ReadBuffer(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_ReadBuffer(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_ConvolutionParameteri(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_ConvolutionParameteri(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_LightModeli(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_LightModeli(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_VertexAttrib4sv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttrib4sv(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_Ortho(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_Ortho(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_ListBase(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_ListBase(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_ConvolutionParameterf(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_ConvolutionParameterf(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GetColorTableParameteriv(struct
-                                                        __GLXclientStateRec *,
-                                                        GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetColorTableParameteriv(struct
-                                                            __GLXclientStateRec
-                                                            *, GLbyte *);
-extern _X_HIDDEN int __glXDisp_GetColorTableParameterivSGI(struct
-                                                           __GLXclientStateRec
-                                                           *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetColorTableParameterivSGI(struct
-                                                               __GLXclientStateRec
-                                                               *, GLbyte *);
-extern _X_HIDDEN int __glXDisp_ReleaseTexImageEXT(struct __GLXclientStateRec *,
-                                                  GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_ReleaseTexImageEXT(struct __GLXclientStateRec
-                                                      *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_GetColorTableParameteriv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetColorTableParameteriv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_GetColorTableParameterivSGI(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetColorTableParameterivSGI(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_ReleaseTexImageEXT(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_ReleaseTexImageEXT(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_CallList(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_CallList(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_VertexAttribs2fvNV(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttribs2fvNV(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_GenerateMipmap(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_GenerateMipmap(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Rectiv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Rectiv(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_SecondaryColor3dvEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_SecondaryColor3dvEXT(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_MultiTexCoord1iv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_MultiTexCoord1iv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Vertex2fv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Vertex2fv(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_BindRenderbufferEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_BindRenderbufferEXT(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_SampleMaskSGIS(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_SampleMaskSGIS(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Vertex3sv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Vertex3sv(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_SetClientInfoARB(struct __GLXclientStateRec *,
-                                                GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_SetClientInfoARB(struct __GLXclientStateRec
-                                                    *, GLbyte *);
-extern _X_HIDDEN int __glXDisp_BindTexImageEXT(struct __GLXclientStateRec *,
-                                               GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_BindTexImageEXT(struct __GLXclientStateRec *,
-                                                   GLbyte *);
+extern _X_HIDDEN int __glXDisp_GetQueryObjectiv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetQueryObjectiv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_BindTexImageEXT(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_BindTexImageEXT(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_ProgramLocalParameter4fvARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_ProgramLocalParameter4fvARB(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_DeleteProgramsNV(struct __GLXclientStateRec *,
-                                                GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_DeleteProgramsNV(struct __GLXclientStateRec
-                                                    *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_EvalMesh1(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_EvalMesh1(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_VertexAttribs1fvNV(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttribs1fvNV(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_MultiTexCoord1dvARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_MultiTexCoord1dvARB(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_CompressedTexSubImage3D(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_CompressedTexSubImage3D(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Vertex2iv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Vertex2iv(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GetProgramStringNV(struct __GLXclientStateRec *,
-                                                  GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetProgramStringNV(struct __GLXclientStateRec
-                                                      *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_GetProgramStringNV(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetProgramStringNV(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_LineWidth(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_LineWidth(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_VertexAttrib2fvARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttrib2fvARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_TexGendv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexGendv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_ResetMinmax(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_ResetMinmax(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GetConvolutionParameterfv(struct
-                                                         __GLXclientStateRec *,
-                                                         GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetConvolutionParameterfv(struct
-                                                             __GLXclientStateRec
-                                                             *, GLbyte *);
-extern _X_HIDDEN int __glXDisp_GetConvolutionParameterfvEXT(struct
-                                                            __GLXclientStateRec
-                                                            *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetConvolutionParameterfvEXT(struct
-                                                                __GLXclientStateRec
-                                                                *, GLbyte *);
-extern _X_HIDDEN void __glXDisp_VertexAttribs4dvNV(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttribs4dvNV(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GetMaterialfv(struct __GLXclientStateRec *,
-                                             GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetMaterialfv(struct __GLXclientStateRec *,
-                                                 GLbyte *);
+extern _X_HIDDEN int __glXDisp_GetConvolutionParameterfv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetConvolutionParameterfv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_GetConvolutionParameterfvEXT(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetConvolutionParameterfvEXT(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_GetMaterialfv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetMaterialfv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN void __glXDisp_WindowPos3fv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_WindowPos3fv(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_DeleteProgramsARB(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_DeleteProgramsARB(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN int __glXDisp_UseXFont(struct __GLXclientStateRec *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_UseXFont(struct __GLXclientStateRec *,
-                                            GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_UseXFont(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_ShadeModel(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_ShadeModel(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Materialfv(GLbyte * pc);
@@ -1152,40 +834,28 @@ extern _X_HIDDEN void __glXDisp_TexCoord3fv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexCoord3fv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_FogCoordfvEXT(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_FogCoordfvEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_MultiTexCoord1ivARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_MultiTexCoord1ivARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_MultiTexCoord2ivARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_MultiTexCoord2ivARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_DrawArrays(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_DrawArrays(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_SampleCoverage(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_SampleCoverage(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Color3iv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Color3iv(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GetProgramLocalParameterdvARB(struct
-                                                             __GLXclientStateRec
-                                                             *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetProgramLocalParameterdvARB(struct
-                                                                 __GLXclientStateRec
-                                                                 *, GLbyte *);
-extern _X_HIDDEN int __glXDisp_GetHistogramParameteriv(struct
-                                                       __GLXclientStateRec *,
-                                                       GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetHistogramParameteriv(struct
-                                                           __GLXclientStateRec
-                                                           *, GLbyte *);
-extern _X_HIDDEN int __glXDisp_GetHistogramParameterivEXT(struct
-                                                          __GLXclientStateRec *,
-                                                          GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetHistogramParameterivEXT(struct
-                                                              __GLXclientStateRec
-                                                              *, GLbyte *);
+extern _X_HIDDEN void __glXDisp_VertexAttrib4ubv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttrib4ubv(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_GetProgramLocalParameterdvARB(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetProgramLocalParameterdvARB(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_GetHistogramParameteriv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetHistogramParameteriv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_GetHistogramParameterivEXT(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetHistogramParameterivEXT(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN void __glXDisp_PointParameteriv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_PointParameteriv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Rotatef(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Rotatef(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GetProgramivARB(struct __GLXclientStateRec *,
-                                               GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetProgramivARB(struct __GLXclientStateRec *,
-                                                   GLbyte *);
-extern _X_HIDDEN void __glXDisp_BlendFuncSeparateEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_BlendFuncSeparateEXT(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_GetProgramivARB(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetProgramivARB(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN void __glXDisp_BindRenderbuffer(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_BindRenderbuffer(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_ProgramParameters4dvNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_ProgramParameters4dvNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_EvalPoint2(GLbyte * pc);
@@ -1194,53 +864,42 @@ extern _X_HIDDEN void __glXDisp_EvalPoint1(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_EvalPoint1(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_PopMatrix(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_PopMatrix(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_MakeCurrentReadSGI(struct __GLXclientStateRec *,
-                                                  GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_MakeCurrentReadSGI(struct __GLXclientStateRec
-                                                      *, GLbyte *);
-extern _X_HIDDEN int __glXDisp_GetTexGeniv(struct __GLXclientStateRec *,
-                                           GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetTexGeniv(struct __GLXclientStateRec *,
-                                               GLbyte *);
-extern _X_HIDDEN int __glXDisp_MakeCurrent(struct __GLXclientStateRec *,
-                                           GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_MakeCurrent(struct __GLXclientStateRec *,
-                                               GLbyte *);
+extern _X_HIDDEN void __glXDisp_DeleteFramebuffers(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_DeleteFramebuffers(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_MakeCurrentReadSGI(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_MakeCurrentReadSGI(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_GetTexGeniv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetTexGeniv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_MakeCurrent(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_MakeCurrent(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN void __glXDisp_FramebufferRenderbuffer(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_FramebufferRenderbuffer(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_IsProgramARB(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_IsProgramARB(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN void __glXDisp_VertexAttrib4uiv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttrib4uiv(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_VertexAttrib4Nsv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttrib4Nsv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Map2d(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Map2d(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Map2f(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Map2f(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_ProgramStringARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_ProgramStringARB(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GetConvolutionFilter(struct __GLXclientStateRec
-                                                    *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetConvolutionFilter(struct
-                                                        __GLXclientStateRec *,
-                                                        GLbyte *);
-extern _X_HIDDEN int __glXDisp_GetConvolutionFilterEXT(struct
-                                                       __GLXclientStateRec *,
-                                                       GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetConvolutionFilterEXT(struct
-                                                           __GLXclientStateRec
-                                                           *, GLbyte *);
-extern _X_HIDDEN int __glXDisp_GetCompressedTexImageARB(struct
-                                                        __GLXclientStateRec *,
-                                                        GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetCompressedTexImageARB(struct
-                                                            __GLXclientStateRec
-                                                            *, GLbyte *);
-extern _X_HIDDEN int __glXDisp_GetTexGenfv(struct __GLXclientStateRec *,
-                                           GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetTexGenfv(struct __GLXclientStateRec *,
-                                               GLbyte *);
-extern _X_HIDDEN int __glXDisp_GetHistogram(struct __GLXclientStateRec *,
-                                            GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetHistogram(struct __GLXclientStateRec *,
-                                                GLbyte *);
-extern _X_HIDDEN int __glXDisp_GetHistogramEXT(struct __GLXclientStateRec *,
-                                               GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetHistogramEXT(struct __GLXclientStateRec *,
-                                                   GLbyte *);
+extern _X_HIDDEN void __glXDisp_VertexAttrib4bv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttrib4bv(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_GetConvolutionFilter(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetConvolutionFilter(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_GetConvolutionFilterEXT(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetConvolutionFilterEXT(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN void __glXDisp_VertexAttribs4dvNV(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttribs4dvNV(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_GetTexGenfv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetTexGenfv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_GetHistogram(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetHistogram(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_GetHistogramEXT(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetHistogramEXT(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_ActiveStencilFaceEXT(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_ActiveStencilFaceEXT(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Materialf(GLbyte * pc);
@@ -1249,16 +908,14 @@ extern _X_HIDDEN void __glXDisp_Materiali(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Materiali(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Indexsv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Indexsv(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_MultiTexCoord4svARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_MultiTexCoord4svARB(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_VertexAttrib1fvARB(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttrib1fvARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_LightModelfv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_LightModelfv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_TexCoord2dv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexCoord2dv(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GenQueriesARB(struct __GLXclientStateRec *,
-                                             GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GenQueriesARB(struct __GLXclientStateRec *,
-                                                 GLbyte *);
+extern _X_HIDDEN void __glXDisp_ProgramParameters4fvNV(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_ProgramParameters4fvNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_EvalCoord1dv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_EvalCoord1dv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Translated(GLbyte * pc);
@@ -1267,38 +924,24 @@ extern _X_HIDDEN void __glXDisp_Translatef(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Translatef(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_StencilMask(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_StencilMask(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_ClampColorARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_ClampColorARB(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_CreateWindow(struct __GLXclientStateRec *,
-                                            GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_CreateWindow(struct __GLXclientStateRec *,
-                                                GLbyte *);
-extern _X_HIDDEN int __glXDisp_GetLightiv(struct __GLXclientStateRec *,
-                                          GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetLightiv(struct __GLXclientStateRec *,
-                                              GLbyte *);
+extern _X_HIDDEN int __glXDisp_CreateWindow(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_CreateWindow(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_GetLightiv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetLightiv(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN int __glXDisp_IsList(struct __GLXclientStateRec *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_IsList(struct __GLXclientStateRec *,
-                                          GLbyte *);
-extern _X_HIDDEN int __glXDisp_RenderMode(struct __GLXclientStateRec *,
-                                          GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_RenderMode(struct __GLXclientStateRec *,
-                                              GLbyte *);
-extern _X_HIDDEN void __glXDisp_DrawBuffersARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_DrawBuffersARB(GLbyte * pc);
+extern _X_HIDDEN int __glXDispSwap_IsList(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_RenderMode(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_RenderMode(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_LoadName(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_LoadName(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_CopyTexSubImage1D(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_CopyTexSubImage1D(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_CullFace(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_CullFace(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_QueryContextInfoEXT(struct __GLXclientStateRec *,
-                                                   GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_QueryContextInfoEXT(struct
-                                                       __GLXclientStateRec *,
-                                                       GLbyte *);
-extern _X_HIDDEN void __glXDisp_VertexAttribs3svNV(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttribs3svNV(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_QueryContextInfoEXT(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_QueryContextInfoEXT(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN void __glXDisp_VertexAttribs2fvNV(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttribs2fvNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_StencilFunc(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_StencilFunc(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_CopyPixels(GLbyte * pc);
@@ -1309,38 +952,30 @@ extern _X_HIDDEN void __glXDisp_CopyConvolutionFilter2D(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_CopyConvolutionFilter2D(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_TexParameterfv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexParameterfv(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_VertexAttrib4uivARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttrib4uivARB(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_VertexAttrib4Nubv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttrib4Nubv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_ClipPlane(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_ClipPlane(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_TrackMatrixNV(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_TrackMatrixNV(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GetPixelMapuiv(struct __GLXclientStateRec *,
-                                              GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetPixelMapuiv(struct __GLXclientStateRec *,
-                                                  GLbyte *);
+extern _X_HIDDEN void __glXDisp_SecondaryColor3usv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_SecondaryColor3usv(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_MultiTexCoord3dv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_MultiTexCoord3dv(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_GetPixelMapuiv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetPixelMapuiv(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_Indexfv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Indexfv(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_QueryContext(struct __GLXclientStateRec *,
-                                            GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_QueryContext(struct __GLXclientStateRec *,
-                                                GLbyte *);
-extern _X_HIDDEN void __glXDisp_SecondaryColor3svEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_SecondaryColor3svEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_MultiTexCoord3fvARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_MultiTexCoord3fvARB(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_QueryContext(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_QueryContext(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN void __glXDisp_BlitFramebuffer(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_BlitFramebuffer(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_IndexMask(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_IndexMask(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_BindProgramNV(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_BindProgramNV(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_VertexAttrib4svARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttrib4svARB(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GetFloatv(struct __GLXclientStateRec *,
-                                         GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetFloatv(struct __GLXclientStateRec *,
-                                             GLbyte *);
+extern _X_HIDDEN int __glXDisp_GetFloatv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetFloatv(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_TexCoord3sv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexCoord3sv(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_FogCoorddv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_FogCoorddv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_PopAttrib(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_PopAttrib(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Fogfv(GLbyte * pc);
@@ -1351,107 +986,65 @@ extern _X_HIDDEN void __glXDisp_Normal3sv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Normal3sv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Minmax(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Minmax(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_FogCoorddvEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_FogCoorddvEXT(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GetBooleanv(struct __GLXclientStateRec *,
-                                           GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetBooleanv(struct __GLXclientStateRec *,
-                                               GLbyte *);
+extern _X_HIDDEN int __glXDisp_DeleteQueries(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_DeleteQueries(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_GetBooleanv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetBooleanv(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_Hint(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Hint(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Color4dv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Color4dv(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_VertexAttrib2svARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttrib2svARB(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_AreProgramsResidentNV(struct __GLXclientStateRec
-                                                     *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_AreProgramsResidentNV(struct
-                                                         __GLXclientStateRec *,
-                                                         GLbyte *);
+extern _X_HIDDEN int __glXDisp_AreProgramsResidentNV(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_AreProgramsResidentNV(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_CopyColorSubTable(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_CopyColorSubTable(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_DeleteRenderbuffersEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_DeleteRenderbuffersEXT(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_VertexAttrib4NubvARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttrib4NubvARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_VertexAttrib3dvNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_VertexAttrib3dvNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Vertex4iv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Vertex4iv(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GetProgramEnvParameterdvARB(struct
-                                                           __GLXclientStateRec
-                                                           *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetProgramEnvParameterdvARB(struct
-                                                               __GLXclientStateRec
-                                                               *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_TexCoord4dv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_TexCoord4dv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Begin(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Begin(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_ClientInfo(struct __GLXclientStateRec *,
-                                          GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_ClientInfo(struct __GLXclientStateRec *,
-                                              GLbyte *);
+extern _X_HIDDEN int __glXDisp_ClientInfo(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_ClientInfo(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_Rectfv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Rectfv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_LightModelf(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_LightModelf(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GetTexParameterfv(struct __GLXclientStateRec *,
-                                                 GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetTexParameterfv(struct __GLXclientStateRec
-                                                     *, GLbyte *);
-extern _X_HIDDEN int __glXDisp_GetLightfv(struct __GLXclientStateRec *,
-                                          GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetLightfv(struct __GLXclientStateRec *,
-                                              GLbyte *);
+extern _X_HIDDEN int __glXDisp_GetTexParameterfv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetTexParameterfv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_GetLightfv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetLightfv(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_Disable(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Disable(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_MultiTexCoord2fvARB(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_MultiTexCoord2fvARB(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GetRenderbufferParameterivEXT(struct
-                                                             __GLXclientStateRec
-                                                             *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetRenderbufferParameterivEXT(struct
-                                                                 __GLXclientStateRec
-                                                                 *, GLbyte *);
-extern _X_HIDDEN int __glXDisp_SelectBuffer(struct __GLXclientStateRec *,
-                                            GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_SelectBuffer(struct __GLXclientStateRec *,
-                                                GLbyte *);
+extern _X_HIDDEN int __glXDisp_SelectBuffer(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_SelectBuffer(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_ColorMask(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_ColorMask(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_RasterPos4iv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_RasterPos4iv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Enable(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Enable(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_GetRenderbufferParameteriv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetRenderbufferParameteriv(struct __GLXclientStateRec *, GLbyte *);
 extern _X_HIDDEN void __glXDisp_VertexAttribs4svNV(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_VertexAttribs4svNV(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_GetMinmaxParameterfv(struct __GLXclientStateRec
-                                                    *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetMinmaxParameterfv(struct
-                                                        __GLXclientStateRec *,
-                                                        GLbyte *);
-extern _X_HIDDEN int __glXDisp_GetMinmaxParameterfvEXT(struct
-                                                       __GLXclientStateRec *,
-                                                       GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetMinmaxParameterfvEXT(struct
-                                                           __GLXclientStateRec
-                                                           *, GLbyte *);
-extern _X_HIDDEN void __glXDisp_VertexAttrib1fvARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttrib1fvARB(GLbyte * pc);
-extern _X_HIDDEN void __glXDisp_VertexAttribs1svNV(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttribs1svNV(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_GenRenderbuffers(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GenRenderbuffers(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_GetMinmaxParameterfv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetMinmaxParameterfv(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDisp_GetMinmaxParameterfvEXT(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetMinmaxParameterfvEXT(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN void __glXDisp_VertexAttrib4Nuiv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_VertexAttrib4Nuiv(GLbyte * pc);
 extern _X_HIDDEN void __glXDisp_Vertex3fv(GLbyte * pc);
 extern _X_HIDDEN void __glXDispSwap_Vertex3fv(GLbyte * pc);
-extern _X_HIDDEN int __glXDisp_IsRenderbufferEXT(struct __GLXclientStateRec *,
-                                                 GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_IsRenderbufferEXT(struct __GLXclientStateRec
-                                                     *, GLbyte *);
-extern _X_HIDDEN int __glXDisp_GenProgramsNV(struct __GLXclientStateRec *,
-                                             GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GenProgramsNV(struct __GLXclientStateRec *,
-                                                 GLbyte *);
-extern _X_HIDDEN void __glXDisp_VertexAttrib4dvNV(GLbyte * pc);
-extern _X_HIDDEN void __glXDispSwap_VertexAttrib4dvNV(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_SecondaryColor3sv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_SecondaryColor3sv(GLbyte * pc);
+extern _X_HIDDEN void __glXDisp_MultiTexCoord2sv(GLbyte * pc);
+extern _X_HIDDEN void __glXDispSwap_MultiTexCoord2sv(GLbyte * pc);
 
-#endif                          /* !defined( _INDIRECT_DISPATCH_H_ ) */
+#endif /* !defined( _INDIRECT_DISPATCH_H_ ) */
diff --git a/xorg-server/glx/indirect_dispatch_swap.c b/xorg-server/glx/indirect_dispatch_swap.c
index 80010b3f7..b96439626 100644
--- a/xorg-server/glx/indirect_dispatch_swap.c
+++ b/xorg-server/glx/indirect_dispatch_swap.c
@@ -25,6 +25,11 @@
  * SOFTWARE.
  */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+#include "glheader.h"
+
 #include <X11/Xmd.h>
 #include <GL/gl.h>
 #include <GL/glxproto.h>
@@ -47,91 +52,66 @@ typedef struct {
     __GLX_PIXEL_3D_HDR;
 } __GLXpixel3DHeader;
 
-extern GLboolean __glXErrorOccured(void);
-extern void __glXClearErrorOccured(void);
+extern GLboolean __glXErrorOccured( void );
+extern void __glXClearErrorOccured( void );
 
-static const unsigned dummy_answer[2] = { 0, 0 };
+static const unsigned dummy_answer[2] = {0, 0};
 
 static GLsizei
-bswap_CARD32(const void *src)
+bswap_CARD32( const void * src )
 {
-    union {
-        uint32_t dst;
-        GLsizei ret;
-    } x;
-
-    x.dst = bswap_32(*(uint32_t *) src);
+    union { uint32_t dst; GLsizei ret; } x;
+    x.dst = bswap_32( *(uint32_t *) src );
     return x.ret;
 }
 
 static GLshort
-bswap_CARD16(const void *src)
+bswap_CARD16( const void * src )
 {
-    union {
-        uint16_t dst;
-        GLshort ret;
-    } x;
-
-    x.dst = bswap_16(*(uint16_t *) src);
+    union { uint16_t dst; GLshort ret; } x;
+    x.dst = bswap_16( *(uint16_t *) src );
     return x.ret;
 }
 
 static GLenum
-bswap_ENUM(const void *src)
+bswap_ENUM( const void * src )
 {
-    union {
-        uint32_t dst;
-        GLenum ret;
-    } x;
-
-    x.dst = bswap_32(*(uint32_t *) src);
+    union { uint32_t dst; GLenum ret; } x;
+    x.dst = bswap_32( *(uint32_t *) src );
     return x.ret;
 }
 
 static GLsync
-bswap_CARD64(const void *src)
+bswap_CARD64( const void * src )
 {
-    union {
-        uint64_t dst;
-        GLsync ret;
-    } x;
-
-    x.dst = bswap_64(*(uint64_t *) src);
+    union { uint64_t dst; GLsync ret; } x;
+    x.dst = bswap_64( *(uint64_t *) src );
     return x.ret;
 }
 
 static GLdouble
-bswap_FLOAT64(const void *src)
+bswap_FLOAT64( const void * src )
 {
-    union {
-        uint64_t dst;
-        GLdouble ret;
-    } x;
-
-    x.dst = bswap_64(*(uint64_t *) src);
+    union { uint64_t dst; GLdouble ret; } x;
+    x.dst = bswap_64( *(uint64_t *) src );
     return x.ret;
 }
 
 static GLfloat
-bswap_FLOAT32(const void *src)
+bswap_FLOAT32( const void * src )
 {
-    union {
-        uint32_t dst;
-        GLfloat ret;
-    } x;
-
-    x.dst = bswap_32(*(uint32_t *) src);
+    union { uint32_t dst; GLfloat ret; } x;
+    x.dst = bswap_32( *(uint32_t *) src );
     return x.ret;
 }
 
 static void *
-bswap_16_array(uint16_t * src, unsigned count)
+bswap_16_array( uint16_t * src, unsigned count )
 {
-    unsigned i;
-
-    for (i = 0; i < count; i++) {
-        uint16_t temp = bswap_16(src[i]);
+    unsigned  i;
 
+    for ( i = 0 ; i < count ; i++ ) {
+        uint16_t temp = bswap_16( src[i] );
         src[i] = temp;
     }
 
@@ -139,13 +119,12 @@ bswap_16_array(uint16_t * src, unsigned count)
 }
 
 static void *
-bswap_32_array(uint32_t * src, unsigned count)
+bswap_32_array( uint32_t * src, unsigned count )
 {
-    unsigned i;
-
-    for (i = 0; i < count; i++) {
-        uint32_t temp = bswap_32(src[i]);
+    unsigned  i;
 
+    for ( i = 0 ; i < count ; i++ ) {
+        uint32_t temp = bswap_32( src[i] );
         src[i] = temp;
     }
 
@@ -153,126 +132,119 @@ bswap_32_array(uint32_t * src, unsigned count)
 }
 
 static void *
-bswap_64_array(uint64_t * src, unsigned count)
+bswap_64_array( uint64_t * src, unsigned count )
 {
-    unsigned i;
-
-    for (i = 0; i < count; i++) {
-        uint64_t temp = bswap_64(src[i]);
+    unsigned  i;
 
+    for ( i = 0 ; i < count ; i++ ) {
+        uint64_t temp = bswap_64( src[i] );
         src[i] = temp;
     }
 
     return src;
 }
 
-int
-__glXDispSwap_NewList(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_NewList(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        CALL_NewList(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                      (GLenum) bswap_ENUM(pc + 4)
-                     ));
+    if ( cx != NULL ) {
+        CALL_NewList( GET_DISPATCH(), (
+             (GLuint  )bswap_CARD32 ( pc +  0 ),
+             (GLenum  )bswap_ENUM   ( pc +  4 )
+        ) );
         error = Success;
     }
 
     return error;
 }
 
-int
-__glXDispSwap_EndList(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_EndList(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        CALL_EndList(GET_DISPATCH(), ());
+    if ( cx != NULL ) {
+        CALL_EndList( GET_DISPATCH(), () );
         error = Success;
     }
 
     return error;
 }
 
-void
-__glXDispSwap_CallList(GLbyte * pc)
+void __glXDispSwap_CallList(GLbyte * pc)
 {
-    CALL_CallList(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0)
-                  ));
+    CALL_CallList( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 )
+    ) );
 }
 
-void
-__glXDispSwap_CallLists(GLbyte * pc)
+void __glXDispSwap_CallLists(GLbyte * pc)
 {
-    const GLsizei n = (GLsizei) bswap_CARD32(pc + 0);
-    const GLenum type = (GLenum) bswap_ENUM(pc + 4);
-    const GLvoid *lists;
+    const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  0 );
+    const GLenum type =  (GLenum  )bswap_ENUM   ( pc +  4 );
+    const GLvoid * lists;
 
-    switch (type) {
+    switch(type) {
     case GL_BYTE:
     case GL_UNSIGNED_BYTE:
     case GL_2_BYTES:
     case GL_3_BYTES:
     case GL_4_BYTES:
-        lists = (const GLvoid *) (pc + 8);
-        break;
+        lists = (const GLvoid *) (pc + 8); break;
     case GL_SHORT:
     case GL_UNSIGNED_SHORT:
-        lists = (const GLvoid *) bswap_16_array((uint16_t *) (pc + 8), n);
-        break;
+        lists = (const GLvoid *) bswap_16_array( (uint16_t *) (pc + 8), n ); break;
     case GL_INT:
     case GL_UNSIGNED_INT:
     case GL_FLOAT:
-        lists = (const GLvoid *) bswap_32_array((uint32_t *) (pc + 8), n);
-        break;
+        lists = (const GLvoid *) bswap_32_array( (uint32_t *) (pc + 8), n ); break;
     default:
         return;
     }
 
-    CALL_CallLists(GET_DISPATCH(), (n, type, lists));
+    CALL_CallLists( GET_DISPATCH(), (
+        n,
+        type,
+        lists
+    ) );
 }
 
-int
-__glXDispSwap_DeleteLists(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_DeleteLists(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        CALL_DeleteLists(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                          (GLsizei) bswap_CARD32(pc + 4)
-                         ));
+    if ( cx != NULL ) {
+        CALL_DeleteLists( GET_DISPATCH(), (
+             (GLuint  )bswap_CARD32 ( pc +  0 ),
+             (GLsizei )bswap_CARD32 ( pc +  4 )
+        ) );
         error = Success;
     }
 
     return error;
 }
 
-int
-__glXDispSwap_GenLists(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GenLists(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
+    if ( cx != NULL ) {
         GLuint retval;
-
-        retval = CALL_GenLists(GET_DISPATCH(), ((GLsizei) bswap_CARD32(pc + 0)
-                               ));
+        retval = CALL_GenLists( GET_DISPATCH(), (
+             (GLsizei )bswap_CARD32 ( pc +  0 )
+        ) );
         __glXSendReplySwap(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
         error = Success;
     }
@@ -280,1757 +252,1648 @@ __glXDispSwap_GenLists(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-void
-__glXDispSwap_ListBase(GLbyte * pc)
+void __glXDispSwap_ListBase(GLbyte * pc)
 {
-    CALL_ListBase(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0)
-                  ));
+    CALL_ListBase( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 )
+    ) );
 }
 
-void
-__glXDispSwap_Begin(GLbyte * pc)
+void __glXDispSwap_Begin(GLbyte * pc)
 {
-    CALL_Begin(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0)
-               ));
+    CALL_Begin( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 )
+    ) );
 }
 
-void
-__glXDispSwap_Bitmap(GLbyte * pc)
+void __glXDispSwap_Bitmap(GLbyte * pc)
 {
-    const GLubyte *const bitmap = (const GLubyte *) ((pc + 44));
-    __GLXpixelHeader *const hdr = (__GLXpixelHeader *) (pc);
+    const GLubyte * const bitmap = (const GLubyte *) (pc + 44);
+    __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ROW_LENGTH,
-                      (GLint) bswap_CARD32(&hdr->rowLength)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_ROWS,
-                      (GLint) bswap_CARD32(&hdr->skipRows)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_PIXELS,
-                      (GLint) bswap_CARD32(&hdr->skipPixels)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ALIGNMENT,
-                      (GLint) bswap_CARD32(&hdr->alignment)));
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST,    hdr->lsbFirst) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,   (GLint) bswap_CARD32( & hdr->rowLength )) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,    (GLint) bswap_CARD32( & hdr->skipRows )) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,  (GLint) bswap_CARD32( & hdr->skipPixels )) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT,    (GLint) bswap_CARD32( & hdr->alignment )) );
 
-    CALL_Bitmap(GET_DISPATCH(), ((GLsizei) bswap_CARD32(pc + 20),
-                                 (GLsizei) bswap_CARD32(pc + 24),
-                                 (GLfloat) bswap_FLOAT32(pc + 28),
-                                 (GLfloat) bswap_FLOAT32(pc + 32),
-                                 (GLfloat) bswap_FLOAT32(pc + 36),
-                                 (GLfloat) bswap_FLOAT32(pc + 40), bitmap));
+    CALL_Bitmap( GET_DISPATCH(), (
+         (GLsizei )bswap_CARD32 ( pc + 20 ),
+         (GLsizei )bswap_CARD32 ( pc + 24 ),
+         (GLfloat )bswap_FLOAT32( pc + 28 ),
+         (GLfloat )bswap_FLOAT32( pc + 32 ),
+         (GLfloat )bswap_FLOAT32( pc + 36 ),
+         (GLfloat )bswap_FLOAT32( pc + 40 ),
+        bitmap
+    ) );
 }
 
-void
-__glXDispSwap_Color3bv(GLbyte * pc)
+void __glXDispSwap_Color3bv(GLbyte * pc)
 {
-    CALL_Color3bv(GET_DISPATCH(), ((const GLbyte *) (pc + 0)
-                  ));
+    CALL_Color3bv( GET_DISPATCH(), (
+         (const GLbyte *)(pc +  0)
+    ) );
 }
 
-void
-__glXDispSwap_Color3dv(GLbyte * pc)
+void __glXDispSwap_Color3dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 24);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 24);
         pc -= 4;
     }
 #endif
 
-    CALL_Color3dv(GET_DISPATCH(), ((const GLdouble *)
-                                   bswap_64_array((uint64_t *) (pc + 0), 3)
-                  ));
+    CALL_Color3dv( GET_DISPATCH(), (
+         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  0), 3 )
+    ) );
 }
 
-void
-__glXDispSwap_Color3fv(GLbyte * pc)
+void __glXDispSwap_Color3fv(GLbyte * pc)
 {
-    CALL_Color3fv(GET_DISPATCH(), ((const GLfloat *)
-                                   bswap_32_array((uint32_t *) (pc + 0), 3)
-                  ));
+    CALL_Color3fv( GET_DISPATCH(), (
+         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  0), 3 )
+    ) );
 }
 
-void
-__glXDispSwap_Color3iv(GLbyte * pc)
+void __glXDispSwap_Color3iv(GLbyte * pc)
 {
-    CALL_Color3iv(GET_DISPATCH(), ((const GLint *)
-                                   bswap_32_array((uint32_t *) (pc + 0), 3)
-                  ));
+    CALL_Color3iv( GET_DISPATCH(), (
+         (const GLint *)bswap_32_array( (uint32_t *) (pc +  0), 3 )
+    ) );
 }
 
-void
-__glXDispSwap_Color3sv(GLbyte * pc)
+void __glXDispSwap_Color3sv(GLbyte * pc)
 {
-    CALL_Color3sv(GET_DISPATCH(), ((const GLshort *)
-                                   bswap_16_array((uint16_t *) (pc + 0), 3)
-                  ));
+    CALL_Color3sv( GET_DISPATCH(), (
+         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  0), 3 )
+    ) );
 }
 
-void
-__glXDispSwap_Color3ubv(GLbyte * pc)
+void __glXDispSwap_Color3ubv(GLbyte * pc)
 {
-    CALL_Color3ubv(GET_DISPATCH(), ((const GLubyte *) (pc + 0)
-                   ));
+    CALL_Color3ubv( GET_DISPATCH(), (
+         (const GLubyte *)(pc +  0)
+    ) );
 }
 
-void
-__glXDispSwap_Color3uiv(GLbyte * pc)
+void __glXDispSwap_Color3uiv(GLbyte * pc)
 {
-    CALL_Color3uiv(GET_DISPATCH(), ((const GLuint *)
-                                    bswap_32_array((uint32_t *) (pc + 0), 3)
-                   ));
+    CALL_Color3uiv( GET_DISPATCH(), (
+         (const GLuint *)bswap_32_array( (uint32_t *) (pc +  0), 3 )
+    ) );
 }
 
-void
-__glXDispSwap_Color3usv(GLbyte * pc)
+void __glXDispSwap_Color3usv(GLbyte * pc)
 {
-    CALL_Color3usv(GET_DISPATCH(), ((const GLushort *)
-                                    bswap_16_array((uint16_t *) (pc + 0), 3)
-                   ));
+    CALL_Color3usv( GET_DISPATCH(), (
+         (const GLushort *)bswap_16_array( (uint16_t *) (pc +  0), 3 )
+    ) );
 }
 
-void
-__glXDispSwap_Color4bv(GLbyte * pc)
+void __glXDispSwap_Color4bv(GLbyte * pc)
 {
-    CALL_Color4bv(GET_DISPATCH(), ((const GLbyte *) (pc + 0)
-                  ));
+    CALL_Color4bv( GET_DISPATCH(), (
+         (const GLbyte *)(pc +  0)
+    ) );
 }
 
-void
-__glXDispSwap_Color4dv(GLbyte * pc)
+void __glXDispSwap_Color4dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 32);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 32);
         pc -= 4;
     }
 #endif
 
-    CALL_Color4dv(GET_DISPATCH(), ((const GLdouble *)
-                                   bswap_64_array((uint64_t *) (pc + 0), 4)
-                  ));
+    CALL_Color4dv( GET_DISPATCH(), (
+         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  0), 4 )
+    ) );
 }
 
-void
-__glXDispSwap_Color4fv(GLbyte * pc)
+void __glXDispSwap_Color4fv(GLbyte * pc)
 {
-    CALL_Color4fv(GET_DISPATCH(), ((const GLfloat *)
-                                   bswap_32_array((uint32_t *) (pc + 0), 4)
-                  ));
+    CALL_Color4fv( GET_DISPATCH(), (
+         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  0), 4 )
+    ) );
 }
 
-void
-__glXDispSwap_Color4iv(GLbyte * pc)
+void __glXDispSwap_Color4iv(GLbyte * pc)
 {
-    CALL_Color4iv(GET_DISPATCH(), ((const GLint *)
-                                   bswap_32_array((uint32_t *) (pc + 0), 4)
-                  ));
+    CALL_Color4iv( GET_DISPATCH(), (
+         (const GLint *)bswap_32_array( (uint32_t *) (pc +  0), 4 )
+    ) );
 }
 
-void
-__glXDispSwap_Color4sv(GLbyte * pc)
+void __glXDispSwap_Color4sv(GLbyte * pc)
 {
-    CALL_Color4sv(GET_DISPATCH(), ((const GLshort *)
-                                   bswap_16_array((uint16_t *) (pc + 0), 4)
-                  ));
+    CALL_Color4sv( GET_DISPATCH(), (
+         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  0), 4 )
+    ) );
 }
 
-void
-__glXDispSwap_Color4ubv(GLbyte * pc)
+void __glXDispSwap_Color4ubv(GLbyte * pc)
 {
-    CALL_Color4ubv(GET_DISPATCH(), ((const GLubyte *) (pc + 0)
-                   ));
+    CALL_Color4ubv( GET_DISPATCH(), (
+         (const GLubyte *)(pc +  0)
+    ) );
 }
 
-void
-__glXDispSwap_Color4uiv(GLbyte * pc)
+void __glXDispSwap_Color4uiv(GLbyte * pc)
 {
-    CALL_Color4uiv(GET_DISPATCH(), ((const GLuint *)
-                                    bswap_32_array((uint32_t *) (pc + 0), 4)
-                   ));
+    CALL_Color4uiv( GET_DISPATCH(), (
+         (const GLuint *)bswap_32_array( (uint32_t *) (pc +  0), 4 )
+    ) );
 }
 
-void
-__glXDispSwap_Color4usv(GLbyte * pc)
+void __glXDispSwap_Color4usv(GLbyte * pc)
 {
-    CALL_Color4usv(GET_DISPATCH(), ((const GLushort *)
-                                    bswap_16_array((uint16_t *) (pc + 0), 4)
-                   ));
+    CALL_Color4usv( GET_DISPATCH(), (
+         (const GLushort *)bswap_16_array( (uint16_t *) (pc +  0), 4 )
+    ) );
 }
 
-void
-__glXDispSwap_EdgeFlagv(GLbyte * pc)
+void __glXDispSwap_EdgeFlagv(GLbyte * pc)
 {
-    CALL_EdgeFlagv(GET_DISPATCH(), ((const GLboolean *) (pc + 0)
-                   ));
+    CALL_EdgeFlagv( GET_DISPATCH(), (
+         (const GLboolean *)(pc +  0)
+    ) );
 }
 
-void
-__glXDispSwap_End(GLbyte * pc)
+void __glXDispSwap_End(GLbyte * pc)
 {
-    CALL_End(GET_DISPATCH(), ());
+    CALL_End( GET_DISPATCH(), () );
 }
 
-void
-__glXDispSwap_Indexdv(GLbyte * pc)
+void __glXDispSwap_Indexdv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 8);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 8);
         pc -= 4;
     }
 #endif
 
-    CALL_Indexdv(GET_DISPATCH(), ((const GLdouble *)
-                                  bswap_64_array((uint64_t *) (pc + 0), 1)
-                 ));
+    CALL_Indexdv( GET_DISPATCH(), (
+         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  0), 1 )
+    ) );
 }
 
-void
-__glXDispSwap_Indexfv(GLbyte * pc)
+void __glXDispSwap_Indexfv(GLbyte * pc)
 {
-    CALL_Indexfv(GET_DISPATCH(), ((const GLfloat *)
-                                  bswap_32_array((uint32_t *) (pc + 0), 1)
-                 ));
+    CALL_Indexfv( GET_DISPATCH(), (
+         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  0), 1 )
+    ) );
 }
 
-void
-__glXDispSwap_Indexiv(GLbyte * pc)
+void __glXDispSwap_Indexiv(GLbyte * pc)
 {
-    CALL_Indexiv(GET_DISPATCH(), ((const GLint *)
-                                  bswap_32_array((uint32_t *) (pc + 0), 1)
-                 ));
+    CALL_Indexiv( GET_DISPATCH(), (
+         (const GLint *)bswap_32_array( (uint32_t *) (pc +  0), 1 )
+    ) );
 }
 
-void
-__glXDispSwap_Indexsv(GLbyte * pc)
+void __glXDispSwap_Indexsv(GLbyte * pc)
 {
-    CALL_Indexsv(GET_DISPATCH(), ((const GLshort *)
-                                  bswap_16_array((uint16_t *) (pc + 0), 1)
-                 ));
+    CALL_Indexsv( GET_DISPATCH(), (
+         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  0), 1 )
+    ) );
 }
 
-void
-__glXDispSwap_Normal3bv(GLbyte * pc)
+void __glXDispSwap_Normal3bv(GLbyte * pc)
 {
-    CALL_Normal3bv(GET_DISPATCH(), ((const GLbyte *) (pc + 0)
-                   ));
+    CALL_Normal3bv( GET_DISPATCH(), (
+         (const GLbyte *)(pc +  0)
+    ) );
 }
 
-void
-__glXDispSwap_Normal3dv(GLbyte * pc)
+void __glXDispSwap_Normal3dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 24);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 24);
         pc -= 4;
     }
 #endif
 
-    CALL_Normal3dv(GET_DISPATCH(), ((const GLdouble *)
-                                    bswap_64_array((uint64_t *) (pc + 0), 3)
-                   ));
+    CALL_Normal3dv( GET_DISPATCH(), (
+         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  0), 3 )
+    ) );
 }
 
-void
-__glXDispSwap_Normal3fv(GLbyte * pc)
+void __glXDispSwap_Normal3fv(GLbyte * pc)
 {
-    CALL_Normal3fv(GET_DISPATCH(), ((const GLfloat *)
-                                    bswap_32_array((uint32_t *) (pc + 0), 3)
-                   ));
+    CALL_Normal3fv( GET_DISPATCH(), (
+         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  0), 3 )
+    ) );
 }
 
-void
-__glXDispSwap_Normal3iv(GLbyte * pc)
+void __glXDispSwap_Normal3iv(GLbyte * pc)
 {
-    CALL_Normal3iv(GET_DISPATCH(), ((const GLint *)
-                                    bswap_32_array((uint32_t *) (pc + 0), 3)
-                   ));
+    CALL_Normal3iv( GET_DISPATCH(), (
+         (const GLint *)bswap_32_array( (uint32_t *) (pc +  0), 3 )
+    ) );
 }
 
-void
-__glXDispSwap_Normal3sv(GLbyte * pc)
+void __glXDispSwap_Normal3sv(GLbyte * pc)
 {
-    CALL_Normal3sv(GET_DISPATCH(), ((const GLshort *)
-                                    bswap_16_array((uint16_t *) (pc + 0), 3)
-                   ));
+    CALL_Normal3sv( GET_DISPATCH(), (
+         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  0), 3 )
+    ) );
 }
 
-void
-__glXDispSwap_RasterPos2dv(GLbyte * pc)
+void __glXDispSwap_RasterPos2dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 16);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 16);
         pc -= 4;
     }
 #endif
 
-    CALL_RasterPos2dv(GET_DISPATCH(), ((const GLdouble *)
-                                       bswap_64_array((uint64_t *) (pc + 0), 2)
-                      ));
+    CALL_RasterPos2dv( GET_DISPATCH(), (
+         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  0), 2 )
+    ) );
 }
 
-void
-__glXDispSwap_RasterPos2fv(GLbyte * pc)
+void __glXDispSwap_RasterPos2fv(GLbyte * pc)
 {
-    CALL_RasterPos2fv(GET_DISPATCH(), ((const GLfloat *)
-                                       bswap_32_array((uint32_t *) (pc + 0), 2)
-                      ));
+    CALL_RasterPos2fv( GET_DISPATCH(), (
+         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  0), 2 )
+    ) );
 }
 
-void
-__glXDispSwap_RasterPos2iv(GLbyte * pc)
+void __glXDispSwap_RasterPos2iv(GLbyte * pc)
 {
-    CALL_RasterPos2iv(GET_DISPATCH(), ((const GLint *)
-                                       bswap_32_array((uint32_t *) (pc + 0), 2)
-                      ));
+    CALL_RasterPos2iv( GET_DISPATCH(), (
+         (const GLint *)bswap_32_array( (uint32_t *) (pc +  0), 2 )
+    ) );
 }
 
-void
-__glXDispSwap_RasterPos2sv(GLbyte * pc)
+void __glXDispSwap_RasterPos2sv(GLbyte * pc)
 {
-    CALL_RasterPos2sv(GET_DISPATCH(), ((const GLshort *)
-                                       bswap_16_array((uint16_t *) (pc + 0), 2)
-                      ));
+    CALL_RasterPos2sv( GET_DISPATCH(), (
+         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  0), 2 )
+    ) );
 }
 
-void
-__glXDispSwap_RasterPos3dv(GLbyte * pc)
+void __glXDispSwap_RasterPos3dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 24);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 24);
         pc -= 4;
     }
 #endif
 
-    CALL_RasterPos3dv(GET_DISPATCH(), ((const GLdouble *)
-                                       bswap_64_array((uint64_t *) (pc + 0), 3)
-                      ));
+    CALL_RasterPos3dv( GET_DISPATCH(), (
+         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  0), 3 )
+    ) );
 }
 
-void
-__glXDispSwap_RasterPos3fv(GLbyte * pc)
+void __glXDispSwap_RasterPos3fv(GLbyte * pc)
 {
-    CALL_RasterPos3fv(GET_DISPATCH(), ((const GLfloat *)
-                                       bswap_32_array((uint32_t *) (pc + 0), 3)
-                      ));
+    CALL_RasterPos3fv( GET_DISPATCH(), (
+         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  0), 3 )
+    ) );
 }
 
-void
-__glXDispSwap_RasterPos3iv(GLbyte * pc)
+void __glXDispSwap_RasterPos3iv(GLbyte * pc)
 {
-    CALL_RasterPos3iv(GET_DISPATCH(), ((const GLint *)
-                                       bswap_32_array((uint32_t *) (pc + 0), 3)
-                      ));
+    CALL_RasterPos3iv( GET_DISPATCH(), (
+         (const GLint *)bswap_32_array( (uint32_t *) (pc +  0), 3 )
+    ) );
 }
 
-void
-__glXDispSwap_RasterPos3sv(GLbyte * pc)
+void __glXDispSwap_RasterPos3sv(GLbyte * pc)
 {
-    CALL_RasterPos3sv(GET_DISPATCH(), ((const GLshort *)
-                                       bswap_16_array((uint16_t *) (pc + 0), 3)
-                      ));
+    CALL_RasterPos3sv( GET_DISPATCH(), (
+         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  0), 3 )
+    ) );
 }
 
-void
-__glXDispSwap_RasterPos4dv(GLbyte * pc)
+void __glXDispSwap_RasterPos4dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 32);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 32);
         pc -= 4;
     }
 #endif
 
-    CALL_RasterPos4dv(GET_DISPATCH(), ((const GLdouble *)
-                                       bswap_64_array((uint64_t *) (pc + 0), 4)
-                      ));
+    CALL_RasterPos4dv( GET_DISPATCH(), (
+         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  0), 4 )
+    ) );
 }
 
-void
-__glXDispSwap_RasterPos4fv(GLbyte * pc)
+void __glXDispSwap_RasterPos4fv(GLbyte * pc)
 {
-    CALL_RasterPos4fv(GET_DISPATCH(), ((const GLfloat *)
-                                       bswap_32_array((uint32_t *) (pc + 0), 4)
-                      ));
+    CALL_RasterPos4fv( GET_DISPATCH(), (
+         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  0), 4 )
+    ) );
 }
 
-void
-__glXDispSwap_RasterPos4iv(GLbyte * pc)
+void __glXDispSwap_RasterPos4iv(GLbyte * pc)
 {
-    CALL_RasterPos4iv(GET_DISPATCH(), ((const GLint *)
-                                       bswap_32_array((uint32_t *) (pc + 0), 4)
-                      ));
+    CALL_RasterPos4iv( GET_DISPATCH(), (
+         (const GLint *)bswap_32_array( (uint32_t *) (pc +  0), 4 )
+    ) );
 }
 
-void
-__glXDispSwap_RasterPos4sv(GLbyte * pc)
+void __glXDispSwap_RasterPos4sv(GLbyte * pc)
 {
-    CALL_RasterPos4sv(GET_DISPATCH(), ((const GLshort *)
-                                       bswap_16_array((uint16_t *) (pc + 0), 4)
-                      ));
+    CALL_RasterPos4sv( GET_DISPATCH(), (
+         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  0), 4 )
+    ) );
 }
 
-void
-__glXDispSwap_Rectdv(GLbyte * pc)
+void __glXDispSwap_Rectdv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 32);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 32);
         pc -= 4;
     }
 #endif
 
-    CALL_Rectdv(GET_DISPATCH(), ((const GLdouble *)
-                                 bswap_64_array((uint64_t *) (pc + 0), 2),
-                                 (const GLdouble *)
-                                 bswap_64_array((uint64_t *) (pc + 16), 2)
-                ));
+    CALL_Rectdv( GET_DISPATCH(), (
+         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  0), 2 ),
+         (const GLdouble *)bswap_64_array( (uint64_t *) (pc + 16), 2 )
+    ) );
 }
 
-void
-__glXDispSwap_Rectfv(GLbyte * pc)
+void __glXDispSwap_Rectfv(GLbyte * pc)
 {
-    CALL_Rectfv(GET_DISPATCH(), ((const GLfloat *)
-                                 bswap_32_array((uint32_t *) (pc + 0), 2),
-                                 (const GLfloat *)
-                                 bswap_32_array((uint32_t *) (pc + 8), 2)
-                ));
+    CALL_Rectfv( GET_DISPATCH(), (
+         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  0), 2 ),
+         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  8), 2 )
+    ) );
 }
 
-void
-__glXDispSwap_Rectiv(GLbyte * pc)
+void __glXDispSwap_Rectiv(GLbyte * pc)
 {
-    CALL_Rectiv(GET_DISPATCH(), ((const GLint *)
-                                 bswap_32_array((uint32_t *) (pc + 0), 2),
-                                 (const GLint *)
-                                 bswap_32_array((uint32_t *) (pc + 8), 2)
-                ));
+    CALL_Rectiv( GET_DISPATCH(), (
+         (const GLint *)bswap_32_array( (uint32_t *) (pc +  0), 2 ),
+         (const GLint *)bswap_32_array( (uint32_t *) (pc +  8), 2 )
+    ) );
 }
 
-void
-__glXDispSwap_Rectsv(GLbyte * pc)
+void __glXDispSwap_Rectsv(GLbyte * pc)
 {
-    CALL_Rectsv(GET_DISPATCH(), ((const GLshort *)
-                                 bswap_16_array((uint16_t *) (pc + 0), 2),
-                                 (const GLshort *)
-                                 bswap_16_array((uint16_t *) (pc + 4), 2)
-                ));
+    CALL_Rectsv( GET_DISPATCH(), (
+         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  0), 2 ),
+         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  4), 2 )
+    ) );
 }
 
-void
-__glXDispSwap_TexCoord1dv(GLbyte * pc)
+void __glXDispSwap_TexCoord1dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 8);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 8);
         pc -= 4;
     }
 #endif
 
-    CALL_TexCoord1dv(GET_DISPATCH(), ((const GLdouble *)
-                                      bswap_64_array((uint64_t *) (pc + 0), 1)
-                     ));
+    CALL_TexCoord1dv( GET_DISPATCH(), (
+         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  0), 1 )
+    ) );
 }
 
-void
-__glXDispSwap_TexCoord1fv(GLbyte * pc)
+void __glXDispSwap_TexCoord1fv(GLbyte * pc)
 {
-    CALL_TexCoord1fv(GET_DISPATCH(), ((const GLfloat *)
-                                      bswap_32_array((uint32_t *) (pc + 0), 1)
-                     ));
+    CALL_TexCoord1fv( GET_DISPATCH(), (
+         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  0), 1 )
+    ) );
 }
 
-void
-__glXDispSwap_TexCoord1iv(GLbyte * pc)
+void __glXDispSwap_TexCoord1iv(GLbyte * pc)
 {
-    CALL_TexCoord1iv(GET_DISPATCH(), ((const GLint *)
-                                      bswap_32_array((uint32_t *) (pc + 0), 1)
-                     ));
+    CALL_TexCoord1iv( GET_DISPATCH(), (
+         (const GLint *)bswap_32_array( (uint32_t *) (pc +  0), 1 )
+    ) );
 }
 
-void
-__glXDispSwap_TexCoord1sv(GLbyte * pc)
+void __glXDispSwap_TexCoord1sv(GLbyte * pc)
 {
-    CALL_TexCoord1sv(GET_DISPATCH(), ((const GLshort *)
-                                      bswap_16_array((uint16_t *) (pc + 0), 1)
-                     ));
+    CALL_TexCoord1sv( GET_DISPATCH(), (
+         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  0), 1 )
+    ) );
 }
 
-void
-__glXDispSwap_TexCoord2dv(GLbyte * pc)
+void __glXDispSwap_TexCoord2dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 16);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 16);
         pc -= 4;
     }
 #endif
 
-    CALL_TexCoord2dv(GET_DISPATCH(), ((const GLdouble *)
-                                      bswap_64_array((uint64_t *) (pc + 0), 2)
-                     ));
+    CALL_TexCoord2dv( GET_DISPATCH(), (
+         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  0), 2 )
+    ) );
 }
 
-void
-__glXDispSwap_TexCoord2fv(GLbyte * pc)
+void __glXDispSwap_TexCoord2fv(GLbyte * pc)
 {
-    CALL_TexCoord2fv(GET_DISPATCH(), ((const GLfloat *)
-                                      bswap_32_array((uint32_t *) (pc + 0), 2)
-                     ));
+    CALL_TexCoord2fv( GET_DISPATCH(), (
+         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  0), 2 )
+    ) );
 }
 
-void
-__glXDispSwap_TexCoord2iv(GLbyte * pc)
+void __glXDispSwap_TexCoord2iv(GLbyte * pc)
 {
-    CALL_TexCoord2iv(GET_DISPATCH(), ((const GLint *)
-                                      bswap_32_array((uint32_t *) (pc + 0), 2)
-                     ));
+    CALL_TexCoord2iv( GET_DISPATCH(), (
+         (const GLint *)bswap_32_array( (uint32_t *) (pc +  0), 2 )
+    ) );
 }
 
-void
-__glXDispSwap_TexCoord2sv(GLbyte * pc)
+void __glXDispSwap_TexCoord2sv(GLbyte * pc)
 {
-    CALL_TexCoord2sv(GET_DISPATCH(), ((const GLshort *)
-                                      bswap_16_array((uint16_t *) (pc + 0), 2)
-                     ));
+    CALL_TexCoord2sv( GET_DISPATCH(), (
+         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  0), 2 )
+    ) );
 }
 
-void
-__glXDispSwap_TexCoord3dv(GLbyte * pc)
+void __glXDispSwap_TexCoord3dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 24);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 24);
         pc -= 4;
     }
 #endif
 
-    CALL_TexCoord3dv(GET_DISPATCH(), ((const GLdouble *)
-                                      bswap_64_array((uint64_t *) (pc + 0), 3)
-                     ));
+    CALL_TexCoord3dv( GET_DISPATCH(), (
+         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  0), 3 )
+    ) );
 }
 
-void
-__glXDispSwap_TexCoord3fv(GLbyte * pc)
+void __glXDispSwap_TexCoord3fv(GLbyte * pc)
 {
-    CALL_TexCoord3fv(GET_DISPATCH(), ((const GLfloat *)
-                                      bswap_32_array((uint32_t *) (pc + 0), 3)
-                     ));
+    CALL_TexCoord3fv( GET_DISPATCH(), (
+         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  0), 3 )
+    ) );
 }
 
-void
-__glXDispSwap_TexCoord3iv(GLbyte * pc)
+void __glXDispSwap_TexCoord3iv(GLbyte * pc)
 {
-    CALL_TexCoord3iv(GET_DISPATCH(), ((const GLint *)
-                                      bswap_32_array((uint32_t *) (pc + 0), 3)
-                     ));
+    CALL_TexCoord3iv( GET_DISPATCH(), (
+         (const GLint *)bswap_32_array( (uint32_t *) (pc +  0), 3 )
+    ) );
 }
 
-void
-__glXDispSwap_TexCoord3sv(GLbyte * pc)
+void __glXDispSwap_TexCoord3sv(GLbyte * pc)
 {
-    CALL_TexCoord3sv(GET_DISPATCH(), ((const GLshort *)
-                                      bswap_16_array((uint16_t *) (pc + 0), 3)
-                     ));
+    CALL_TexCoord3sv( GET_DISPATCH(), (
+         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  0), 3 )
+    ) );
 }
 
-void
-__glXDispSwap_TexCoord4dv(GLbyte * pc)
+void __glXDispSwap_TexCoord4dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 32);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 32);
         pc -= 4;
     }
 #endif
 
-    CALL_TexCoord4dv(GET_DISPATCH(), ((const GLdouble *)
-                                      bswap_64_array((uint64_t *) (pc + 0), 4)
-                     ));
+    CALL_TexCoord4dv( GET_DISPATCH(), (
+         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  0), 4 )
+    ) );
 }
 
-void
-__glXDispSwap_TexCoord4fv(GLbyte * pc)
+void __glXDispSwap_TexCoord4fv(GLbyte * pc)
 {
-    CALL_TexCoord4fv(GET_DISPATCH(), ((const GLfloat *)
-                                      bswap_32_array((uint32_t *) (pc + 0), 4)
-                     ));
+    CALL_TexCoord4fv( GET_DISPATCH(), (
+         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  0), 4 )
+    ) );
 }
 
-void
-__glXDispSwap_TexCoord4iv(GLbyte * pc)
+void __glXDispSwap_TexCoord4iv(GLbyte * pc)
 {
-    CALL_TexCoord4iv(GET_DISPATCH(), ((const GLint *)
-                                      bswap_32_array((uint32_t *) (pc + 0), 4)
-                     ));
+    CALL_TexCoord4iv( GET_DISPATCH(), (
+         (const GLint *)bswap_32_array( (uint32_t *) (pc +  0), 4 )
+    ) );
 }
 
-void
-__glXDispSwap_TexCoord4sv(GLbyte * pc)
+void __glXDispSwap_TexCoord4sv(GLbyte * pc)
 {
-    CALL_TexCoord4sv(GET_DISPATCH(), ((const GLshort *)
-                                      bswap_16_array((uint16_t *) (pc + 0), 4)
-                     ));
+    CALL_TexCoord4sv( GET_DISPATCH(), (
+         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  0), 4 )
+    ) );
 }
 
-void
-__glXDispSwap_Vertex2dv(GLbyte * pc)
+void __glXDispSwap_Vertex2dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 16);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 16);
         pc -= 4;
     }
 #endif
 
-    CALL_Vertex2dv(GET_DISPATCH(), ((const GLdouble *)
-                                    bswap_64_array((uint64_t *) (pc + 0), 2)
-                   ));
+    CALL_Vertex2dv( GET_DISPATCH(), (
+         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  0), 2 )
+    ) );
 }
 
-void
-__glXDispSwap_Vertex2fv(GLbyte * pc)
+void __glXDispSwap_Vertex2fv(GLbyte * pc)
 {
-    CALL_Vertex2fv(GET_DISPATCH(), ((const GLfloat *)
-                                    bswap_32_array((uint32_t *) (pc + 0), 2)
-                   ));
+    CALL_Vertex2fv( GET_DISPATCH(), (
+         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  0), 2 )
+    ) );
 }
 
-void
-__glXDispSwap_Vertex2iv(GLbyte * pc)
+void __glXDispSwap_Vertex2iv(GLbyte * pc)
 {
-    CALL_Vertex2iv(GET_DISPATCH(), ((const GLint *)
-                                    bswap_32_array((uint32_t *) (pc + 0), 2)
-                   ));
+    CALL_Vertex2iv( GET_DISPATCH(), (
+         (const GLint *)bswap_32_array( (uint32_t *) (pc +  0), 2 )
+    ) );
 }
 
-void
-__glXDispSwap_Vertex2sv(GLbyte * pc)
+void __glXDispSwap_Vertex2sv(GLbyte * pc)
 {
-    CALL_Vertex2sv(GET_DISPATCH(), ((const GLshort *)
-                                    bswap_16_array((uint16_t *) (pc + 0), 2)
-                   ));
+    CALL_Vertex2sv( GET_DISPATCH(), (
+         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  0), 2 )
+    ) );
 }
 
-void
-__glXDispSwap_Vertex3dv(GLbyte * pc)
+void __glXDispSwap_Vertex3dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 24);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 24);
         pc -= 4;
     }
 #endif
 
-    CALL_Vertex3dv(GET_DISPATCH(), ((const GLdouble *)
-                                    bswap_64_array((uint64_t *) (pc + 0), 3)
-                   ));
+    CALL_Vertex3dv( GET_DISPATCH(), (
+         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  0), 3 )
+    ) );
 }
 
-void
-__glXDispSwap_Vertex3fv(GLbyte * pc)
+void __glXDispSwap_Vertex3fv(GLbyte * pc)
 {
-    CALL_Vertex3fv(GET_DISPATCH(), ((const GLfloat *)
-                                    bswap_32_array((uint32_t *) (pc + 0), 3)
-                   ));
+    CALL_Vertex3fv( GET_DISPATCH(), (
+         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  0), 3 )
+    ) );
 }
 
-void
-__glXDispSwap_Vertex3iv(GLbyte * pc)
+void __glXDispSwap_Vertex3iv(GLbyte * pc)
 {
-    CALL_Vertex3iv(GET_DISPATCH(), ((const GLint *)
-                                    bswap_32_array((uint32_t *) (pc + 0), 3)
-                   ));
+    CALL_Vertex3iv( GET_DISPATCH(), (
+         (const GLint *)bswap_32_array( (uint32_t *) (pc +  0), 3 )
+    ) );
 }
 
-void
-__glXDispSwap_Vertex3sv(GLbyte * pc)
+void __glXDispSwap_Vertex3sv(GLbyte * pc)
 {
-    CALL_Vertex3sv(GET_DISPATCH(), ((const GLshort *)
-                                    bswap_16_array((uint16_t *) (pc + 0), 3)
-                   ));
+    CALL_Vertex3sv( GET_DISPATCH(), (
+         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  0), 3 )
+    ) );
 }
 
-void
-__glXDispSwap_Vertex4dv(GLbyte * pc)
+void __glXDispSwap_Vertex4dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 32);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 32);
         pc -= 4;
     }
 #endif
 
-    CALL_Vertex4dv(GET_DISPATCH(), ((const GLdouble *)
-                                    bswap_64_array((uint64_t *) (pc + 0), 4)
-                   ));
+    CALL_Vertex4dv( GET_DISPATCH(), (
+         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  0), 4 )
+    ) );
 }
 
-void
-__glXDispSwap_Vertex4fv(GLbyte * pc)
+void __glXDispSwap_Vertex4fv(GLbyte * pc)
 {
-    CALL_Vertex4fv(GET_DISPATCH(), ((const GLfloat *)
-                                    bswap_32_array((uint32_t *) (pc + 0), 4)
-                   ));
+    CALL_Vertex4fv( GET_DISPATCH(), (
+         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  0), 4 )
+    ) );
 }
 
-void
-__glXDispSwap_Vertex4iv(GLbyte * pc)
+void __glXDispSwap_Vertex4iv(GLbyte * pc)
 {
-    CALL_Vertex4iv(GET_DISPATCH(), ((const GLint *)
-                                    bswap_32_array((uint32_t *) (pc + 0), 4)
-                   ));
+    CALL_Vertex4iv( GET_DISPATCH(), (
+         (const GLint *)bswap_32_array( (uint32_t *) (pc +  0), 4 )
+    ) );
 }
 
-void
-__glXDispSwap_Vertex4sv(GLbyte * pc)
+void __glXDispSwap_Vertex4sv(GLbyte * pc)
 {
-    CALL_Vertex4sv(GET_DISPATCH(), ((const GLshort *)
-                                    bswap_16_array((uint16_t *) (pc + 0), 4)
-                   ));
+    CALL_Vertex4sv( GET_DISPATCH(), (
+         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  0), 4 )
+    ) );
 }
 
-void
-__glXDispSwap_ClipPlane(GLbyte * pc)
+void __glXDispSwap_ClipPlane(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 36);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 36);
         pc -= 4;
     }
 #endif
 
-    CALL_ClipPlane(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 32),
-                                    (const GLdouble *)
-                                    bswap_64_array((uint64_t *) (pc + 0), 4)
-                   ));
+    CALL_ClipPlane( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc + 32 ),
+         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  0), 4 )
+    ) );
 }
 
-void
-__glXDispSwap_ColorMaterial(GLbyte * pc)
+void __glXDispSwap_ColorMaterial(GLbyte * pc)
 {
-    CALL_ColorMaterial(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                        (GLenum) bswap_ENUM(pc + 4)
-                       ));
+    CALL_ColorMaterial( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLenum  )bswap_ENUM   ( pc +  4 )
+    ) );
 }
 
-void
-__glXDispSwap_CullFace(GLbyte * pc)
+void __glXDispSwap_CullFace(GLbyte * pc)
 {
-    CALL_CullFace(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0)
-                  ));
+    CALL_CullFace( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 )
+    ) );
 }
 
-void
-__glXDispSwap_Fogf(GLbyte * pc)
+void __glXDispSwap_Fogf(GLbyte * pc)
 {
-    CALL_Fogf(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                               (GLfloat) bswap_FLOAT32(pc + 4)
-              ));
+    CALL_Fogf( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLfloat )bswap_FLOAT32( pc +  4 )
+    ) );
 }
 
-void
-__glXDispSwap_Fogfv(GLbyte * pc)
+void __glXDispSwap_Fogfv(GLbyte * pc)
 {
-    const GLenum pname = (GLenum) bswap_ENUM(pc + 0);
-    const GLfloat *params;
+    const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  0 );
+    const GLfloat * params;
 
-    params =
-        (const GLfloat *) bswap_32_array((uint32_t *) (pc + 4),
-                                         __glFogfv_size(pname));
+    params = (const GLfloat *) bswap_32_array( (uint32_t *) (pc + 4), __glFogfv_size(pname) );
 
-    CALL_Fogfv(GET_DISPATCH(), (pname, params));
+    CALL_Fogfv( GET_DISPATCH(), (
+        pname,
+        params
+    ) );
 }
 
-void
-__glXDispSwap_Fogi(GLbyte * pc)
+void __glXDispSwap_Fogi(GLbyte * pc)
 {
-    CALL_Fogi(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                               (GLint) bswap_CARD32(pc + 4)
-              ));
+    CALL_Fogi( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLint   )bswap_CARD32 ( pc +  4 )
+    ) );
 }
 
-void
-__glXDispSwap_Fogiv(GLbyte * pc)
+void __glXDispSwap_Fogiv(GLbyte * pc)
 {
-    const GLenum pname = (GLenum) bswap_ENUM(pc + 0);
-    const GLint *params;
+    const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  0 );
+    const GLint * params;
 
-    params =
-        (const GLint *) bswap_32_array((uint32_t *) (pc + 4),
-                                       __glFogiv_size(pname));
+    params = (const GLint *) bswap_32_array( (uint32_t *) (pc + 4), __glFogiv_size(pname) );
 
-    CALL_Fogiv(GET_DISPATCH(), (pname, params));
+    CALL_Fogiv( GET_DISPATCH(), (
+        pname,
+        params
+    ) );
 }
 
-void
-__glXDispSwap_FrontFace(GLbyte * pc)
+void __glXDispSwap_FrontFace(GLbyte * pc)
 {
-    CALL_FrontFace(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0)
-                   ));
+    CALL_FrontFace( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 )
+    ) );
 }
 
-void
-__glXDispSwap_Hint(GLbyte * pc)
+void __glXDispSwap_Hint(GLbyte * pc)
 {
-    CALL_Hint(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                               (GLenum) bswap_ENUM(pc + 4)
-              ));
+    CALL_Hint( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLenum  )bswap_ENUM   ( pc +  4 )
+    ) );
 }
 
-void
-__glXDispSwap_Lightf(GLbyte * pc)
+void __glXDispSwap_Lightf(GLbyte * pc)
 {
-    CALL_Lightf(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                 (GLenum) bswap_ENUM(pc + 4),
-                                 (GLfloat) bswap_FLOAT32(pc + 8)
-                ));
+    CALL_Lightf( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLenum  )bswap_ENUM   ( pc +  4 ),
+         (GLfloat )bswap_FLOAT32( pc +  8 )
+    ) );
 }
 
-void
-__glXDispSwap_Lightfv(GLbyte * pc)
+void __glXDispSwap_Lightfv(GLbyte * pc)
 {
-    const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
-    const GLfloat *params;
+    const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
+    const GLfloat * params;
 
-    params =
-        (const GLfloat *) bswap_32_array((uint32_t *) (pc + 8),
-                                         __glLightfv_size(pname));
+    params = (const GLfloat *) bswap_32_array( (uint32_t *) (pc + 8), __glLightfv_size(pname) );
 
-    CALL_Lightfv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0), pname, params));
+    CALL_Lightfv( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+        pname,
+        params
+    ) );
 }
 
-void
-__glXDispSwap_Lighti(GLbyte * pc)
+void __glXDispSwap_Lighti(GLbyte * pc)
 {
-    CALL_Lighti(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                 (GLenum) bswap_ENUM(pc + 4),
-                                 (GLint) bswap_CARD32(pc + 8)
-                ));
+    CALL_Lighti( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLenum  )bswap_ENUM   ( pc +  4 ),
+         (GLint   )bswap_CARD32 ( pc +  8 )
+    ) );
 }
 
-void
-__glXDispSwap_Lightiv(GLbyte * pc)
+void __glXDispSwap_Lightiv(GLbyte * pc)
 {
-    const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
-    const GLint *params;
+    const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
+    const GLint * params;
 
-    params =
-        (const GLint *) bswap_32_array((uint32_t *) (pc + 8),
-                                       __glLightiv_size(pname));
+    params = (const GLint *) bswap_32_array( (uint32_t *) (pc + 8), __glLightiv_size(pname) );
 
-    CALL_Lightiv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0), pname, params));
+    CALL_Lightiv( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+        pname,
+        params
+    ) );
 }
 
-void
-__glXDispSwap_LightModelf(GLbyte * pc)
+void __glXDispSwap_LightModelf(GLbyte * pc)
 {
-    CALL_LightModelf(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                      (GLfloat) bswap_FLOAT32(pc + 4)
-                     ));
+    CALL_LightModelf( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLfloat )bswap_FLOAT32( pc +  4 )
+    ) );
 }
 
-void
-__glXDispSwap_LightModelfv(GLbyte * pc)
+void __glXDispSwap_LightModelfv(GLbyte * pc)
 {
-    const GLenum pname = (GLenum) bswap_ENUM(pc + 0);
-    const GLfloat *params;
+    const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  0 );
+    const GLfloat * params;
 
-    params =
-        (const GLfloat *) bswap_32_array((uint32_t *) (pc + 4),
-                                         __glLightModelfv_size(pname));
+    params = (const GLfloat *) bswap_32_array( (uint32_t *) (pc + 4), __glLightModelfv_size(pname) );
 
-    CALL_LightModelfv(GET_DISPATCH(), (pname, params));
+    CALL_LightModelfv( GET_DISPATCH(), (
+        pname,
+        params
+    ) );
 }
 
-void
-__glXDispSwap_LightModeli(GLbyte * pc)
+void __glXDispSwap_LightModeli(GLbyte * pc)
 {
-    CALL_LightModeli(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                      (GLint) bswap_CARD32(pc + 4)
-                     ));
+    CALL_LightModeli( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLint   )bswap_CARD32 ( pc +  4 )
+    ) );
 }
 
-void
-__glXDispSwap_LightModeliv(GLbyte * pc)
+void __glXDispSwap_LightModeliv(GLbyte * pc)
 {
-    const GLenum pname = (GLenum) bswap_ENUM(pc + 0);
-    const GLint *params;
+    const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  0 );
+    const GLint * params;
 
-    params =
-        (const GLint *) bswap_32_array((uint32_t *) (pc + 4),
-                                       __glLightModeliv_size(pname));
+    params = (const GLint *) bswap_32_array( (uint32_t *) (pc + 4), __glLightModeliv_size(pname) );
 
-    CALL_LightModeliv(GET_DISPATCH(), (pname, params));
+    CALL_LightModeliv( GET_DISPATCH(), (
+        pname,
+        params
+    ) );
 }
 
-void
-__glXDispSwap_LineStipple(GLbyte * pc)
+void __glXDispSwap_LineStipple(GLbyte * pc)
 {
-    CALL_LineStipple(GET_DISPATCH(), ((GLint) bswap_CARD32(pc + 0),
-                                      (GLushort) bswap_CARD16(pc + 4)
-                     ));
+    CALL_LineStipple( GET_DISPATCH(), (
+         (GLint   )bswap_CARD32 ( pc +  0 ),
+         (GLushort)bswap_CARD16 ( pc +  4 )
+    ) );
 }
 
-void
-__glXDispSwap_LineWidth(GLbyte * pc)
+void __glXDispSwap_LineWidth(GLbyte * pc)
 {
-    CALL_LineWidth(GET_DISPATCH(), ((GLfloat) bswap_FLOAT32(pc + 0)
-                   ));
+    CALL_LineWidth( GET_DISPATCH(), (
+         (GLfloat )bswap_FLOAT32( pc +  0 )
+    ) );
 }
 
-void
-__glXDispSwap_Materialf(GLbyte * pc)
+void __glXDispSwap_Materialf(GLbyte * pc)
 {
-    CALL_Materialf(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                    (GLenum) bswap_ENUM(pc + 4),
-                                    (GLfloat) bswap_FLOAT32(pc + 8)
-                   ));
+    CALL_Materialf( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLenum  )bswap_ENUM   ( pc +  4 ),
+         (GLfloat )bswap_FLOAT32( pc +  8 )
+    ) );
 }
 
-void
-__glXDispSwap_Materialfv(GLbyte * pc)
+void __glXDispSwap_Materialfv(GLbyte * pc)
 {
-    const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
-    const GLfloat *params;
+    const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
+    const GLfloat * params;
 
-    params =
-        (const GLfloat *) bswap_32_array((uint32_t *) (pc + 8),
-                                         __glMaterialfv_size(pname));
+    params = (const GLfloat *) bswap_32_array( (uint32_t *) (pc + 8), __glMaterialfv_size(pname) );
 
-    CALL_Materialfv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                     pname, params));
+    CALL_Materialfv( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+        pname,
+        params
+    ) );
 }
 
-void
-__glXDispSwap_Materiali(GLbyte * pc)
+void __glXDispSwap_Materiali(GLbyte * pc)
 {
-    CALL_Materiali(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                    (GLenum) bswap_ENUM(pc + 4),
-                                    (GLint) bswap_CARD32(pc + 8)
-                   ));
+    CALL_Materiali( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLenum  )bswap_ENUM   ( pc +  4 ),
+         (GLint   )bswap_CARD32 ( pc +  8 )
+    ) );
 }
 
-void
-__glXDispSwap_Materialiv(GLbyte * pc)
+void __glXDispSwap_Materialiv(GLbyte * pc)
 {
-    const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
-    const GLint *params;
+    const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
+    const GLint * params;
 
-    params =
-        (const GLint *) bswap_32_array((uint32_t *) (pc + 8),
-                                       __glMaterialiv_size(pname));
+    params = (const GLint *) bswap_32_array( (uint32_t *) (pc + 8), __glMaterialiv_size(pname) );
 
-    CALL_Materialiv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                     pname, params));
+    CALL_Materialiv( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+        pname,
+        params
+    ) );
 }
 
-void
-__glXDispSwap_PointSize(GLbyte * pc)
+void __glXDispSwap_PointSize(GLbyte * pc)
 {
-    CALL_PointSize(GET_DISPATCH(), ((GLfloat) bswap_FLOAT32(pc + 0)
-                   ));
+    CALL_PointSize( GET_DISPATCH(), (
+         (GLfloat )bswap_FLOAT32( pc +  0 )
+    ) );
 }
 
-void
-__glXDispSwap_PolygonMode(GLbyte * pc)
+void __glXDispSwap_PolygonMode(GLbyte * pc)
 {
-    CALL_PolygonMode(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                      (GLenum) bswap_ENUM(pc + 4)
-                     ));
+    CALL_PolygonMode( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLenum  )bswap_ENUM   ( pc +  4 )
+    ) );
 }
 
-void
-__glXDispSwap_PolygonStipple(GLbyte * pc)
+void __glXDispSwap_PolygonStipple(GLbyte * pc)
 {
-    const GLubyte *const mask = (const GLubyte *) ((pc + 20));
-    __GLXpixelHeader *const hdr = (__GLXpixelHeader *) (pc);
+    const GLubyte * const mask = (const GLubyte *) (pc + 20);
+    __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ROW_LENGTH,
-                      (GLint) bswap_CARD32(&hdr->rowLength)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_ROWS,
-                      (GLint) bswap_CARD32(&hdr->skipRows)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_PIXELS,
-                      (GLint) bswap_CARD32(&hdr->skipPixels)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ALIGNMENT,
-                      (GLint) bswap_CARD32(&hdr->alignment)));
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST,    hdr->lsbFirst) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,   (GLint) bswap_CARD32( & hdr->rowLength )) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,    (GLint) bswap_CARD32( & hdr->skipRows )) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,  (GLint) bswap_CARD32( & hdr->skipPixels )) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT,    (GLint) bswap_CARD32( & hdr->alignment )) );
 
-    CALL_PolygonStipple(GET_DISPATCH(), (mask));
+    CALL_PolygonStipple( GET_DISPATCH(), (
+        mask
+    ) );
 }
 
-void
-__glXDispSwap_Scissor(GLbyte * pc)
+void __glXDispSwap_Scissor(GLbyte * pc)
 {
-    CALL_Scissor(GET_DISPATCH(), ((GLint) bswap_CARD32(pc + 0),
-                                  (GLint) bswap_CARD32(pc + 4),
-                                  (GLsizei) bswap_CARD32(pc + 8),
-                                  (GLsizei) bswap_CARD32(pc + 12)
-                 ));
+    CALL_Scissor( GET_DISPATCH(), (
+         (GLint   )bswap_CARD32 ( pc +  0 ),
+         (GLint   )bswap_CARD32 ( pc +  4 ),
+         (GLsizei )bswap_CARD32 ( pc +  8 ),
+         (GLsizei )bswap_CARD32 ( pc + 12 )
+    ) );
 }
 
-void
-__glXDispSwap_ShadeModel(GLbyte * pc)
+void __glXDispSwap_ShadeModel(GLbyte * pc)
 {
-    CALL_ShadeModel(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0)
-                    ));
+    CALL_ShadeModel( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 )
+    ) );
 }
 
-void
-__glXDispSwap_TexParameterf(GLbyte * pc)
+void __glXDispSwap_TexParameterf(GLbyte * pc)
 {
-    CALL_TexParameterf(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                        (GLenum) bswap_ENUM(pc + 4),
-                                        (GLfloat) bswap_FLOAT32(pc + 8)
-                       ));
+    CALL_TexParameterf( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLenum  )bswap_ENUM   ( pc +  4 ),
+         (GLfloat )bswap_FLOAT32( pc +  8 )
+    ) );
 }
 
-void
-__glXDispSwap_TexParameterfv(GLbyte * pc)
+void __glXDispSwap_TexParameterfv(GLbyte * pc)
 {
-    const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
-    const GLfloat *params;
+    const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
+    const GLfloat * params;
 
-    params =
-        (const GLfloat *) bswap_32_array((uint32_t *) (pc + 8),
-                                         __glTexParameterfv_size(pname));
+    params = (const GLfloat *) bswap_32_array( (uint32_t *) (pc + 8), __glTexParameterfv_size(pname) );
 
-    CALL_TexParameterfv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                         pname, params));
+    CALL_TexParameterfv( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+        pname,
+        params
+    ) );
 }
 
-void
-__glXDispSwap_TexParameteri(GLbyte * pc)
+void __glXDispSwap_TexParameteri(GLbyte * pc)
 {
-    CALL_TexParameteri(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                        (GLenum) bswap_ENUM(pc + 4),
-                                        (GLint) bswap_CARD32(pc + 8)
-                       ));
+    CALL_TexParameteri( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLenum  )bswap_ENUM   ( pc +  4 ),
+         (GLint   )bswap_CARD32 ( pc +  8 )
+    ) );
 }
 
-void
-__glXDispSwap_TexParameteriv(GLbyte * pc)
+void __glXDispSwap_TexParameteriv(GLbyte * pc)
 {
-    const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
-    const GLint *params;
+    const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
+    const GLint * params;
 
-    params =
-        (const GLint *) bswap_32_array((uint32_t *) (pc + 8),
-                                       __glTexParameteriv_size(pname));
+    params = (const GLint *) bswap_32_array( (uint32_t *) (pc + 8), __glTexParameteriv_size(pname) );
 
-    CALL_TexParameteriv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                         pname, params));
+    CALL_TexParameteriv( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+        pname,
+        params
+    ) );
 }
 
-void
-__glXDispSwap_TexImage1D(GLbyte * pc)
+void __glXDispSwap_TexImage1D(GLbyte * pc)
 {
-    const GLvoid *const pixels = (const GLvoid *) ((pc + 52));
-    __GLXpixelHeader *const hdr = (__GLXpixelHeader *) (pc);
+    const GLvoid * const pixels = (const GLvoid *) (pc + 52);
+    __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ROW_LENGTH,
-                      (GLint) bswap_CARD32(&hdr->rowLength)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_ROWS,
-                      (GLint) bswap_CARD32(&hdr->skipRows)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_PIXELS,
-                      (GLint) bswap_CARD32(&hdr->skipPixels)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ALIGNMENT,
-                      (GLint) bswap_CARD32(&hdr->alignment)));
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES,   hdr->swapBytes) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST,    hdr->lsbFirst) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,   (GLint) bswap_CARD32( & hdr->rowLength )) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,    (GLint) bswap_CARD32( & hdr->skipRows )) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,  (GLint) bswap_CARD32( & hdr->skipPixels )) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT,    (GLint) bswap_CARD32( & hdr->alignment )) );
 
-    CALL_TexImage1D(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 20),
-                                     (GLint) bswap_CARD32(pc + 24),
-                                     (GLint) bswap_CARD32(pc + 28),
-                                     (GLsizei) bswap_CARD32(pc + 32),
-                                     (GLint) bswap_CARD32(pc + 40),
-                                     (GLenum) bswap_ENUM(pc + 44),
-                                     (GLenum) bswap_ENUM(pc + 48), pixels));
+    CALL_TexImage1D( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc + 20 ),
+         (GLint   )bswap_CARD32 ( pc + 24 ),
+         (GLint   )bswap_CARD32 ( pc + 28 ),
+         (GLsizei )bswap_CARD32 ( pc + 32 ),
+         (GLint   )bswap_CARD32 ( pc + 40 ),
+         (GLenum  )bswap_ENUM   ( pc + 44 ),
+         (GLenum  )bswap_ENUM   ( pc + 48 ),
+        pixels
+    ) );
 }
 
-void
-__glXDispSwap_TexImage2D(GLbyte * pc)
+void __glXDispSwap_TexImage2D(GLbyte * pc)
 {
-    const GLvoid *const pixels = (const GLvoid *) ((pc + 52));
-    __GLXpixelHeader *const hdr = (__GLXpixelHeader *) (pc);
+    const GLvoid * const pixels = (const GLvoid *) (pc + 52);
+    __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ROW_LENGTH,
-                      (GLint) bswap_CARD32(&hdr->rowLength)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_ROWS,
-                      (GLint) bswap_CARD32(&hdr->skipRows)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_PIXELS,
-                      (GLint) bswap_CARD32(&hdr->skipPixels)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ALIGNMENT,
-                      (GLint) bswap_CARD32(&hdr->alignment)));
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES,   hdr->swapBytes) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST,    hdr->lsbFirst) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,   (GLint) bswap_CARD32( & hdr->rowLength )) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,    (GLint) bswap_CARD32( & hdr->skipRows )) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,  (GLint) bswap_CARD32( & hdr->skipPixels )) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT,    (GLint) bswap_CARD32( & hdr->alignment )) );
 
-    CALL_TexImage2D(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 20),
-                                     (GLint) bswap_CARD32(pc + 24),
-                                     (GLint) bswap_CARD32(pc + 28),
-                                     (GLsizei) bswap_CARD32(pc + 32),
-                                     (GLsizei) bswap_CARD32(pc + 36),
-                                     (GLint) bswap_CARD32(pc + 40),
-                                     (GLenum) bswap_ENUM(pc + 44),
-                                     (GLenum) bswap_ENUM(pc + 48), pixels));
+    CALL_TexImage2D( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc + 20 ),
+         (GLint   )bswap_CARD32 ( pc + 24 ),
+         (GLint   )bswap_CARD32 ( pc + 28 ),
+         (GLsizei )bswap_CARD32 ( pc + 32 ),
+         (GLsizei )bswap_CARD32 ( pc + 36 ),
+         (GLint   )bswap_CARD32 ( pc + 40 ),
+         (GLenum  )bswap_ENUM   ( pc + 44 ),
+         (GLenum  )bswap_ENUM   ( pc + 48 ),
+        pixels
+    ) );
 }
 
-void
-__glXDispSwap_TexEnvf(GLbyte * pc)
+void __glXDispSwap_TexEnvf(GLbyte * pc)
 {
-    CALL_TexEnvf(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                  (GLenum) bswap_ENUM(pc + 4),
-                                  (GLfloat) bswap_FLOAT32(pc + 8)
-                 ));
+    CALL_TexEnvf( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLenum  )bswap_ENUM   ( pc +  4 ),
+         (GLfloat )bswap_FLOAT32( pc +  8 )
+    ) );
 }
 
-void
-__glXDispSwap_TexEnvfv(GLbyte * pc)
+void __glXDispSwap_TexEnvfv(GLbyte * pc)
 {
-    const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
-    const GLfloat *params;
+    const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
+    const GLfloat * params;
 
-    params =
-        (const GLfloat *) bswap_32_array((uint32_t *) (pc + 8),
-                                         __glTexEnvfv_size(pname));
+    params = (const GLfloat *) bswap_32_array( (uint32_t *) (pc + 8), __glTexEnvfv_size(pname) );
 
-    CALL_TexEnvfv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0), pname, params));
+    CALL_TexEnvfv( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+        pname,
+        params
+    ) );
 }
 
-void
-__glXDispSwap_TexEnvi(GLbyte * pc)
+void __glXDispSwap_TexEnvi(GLbyte * pc)
 {
-    CALL_TexEnvi(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                  (GLenum) bswap_ENUM(pc + 4),
-                                  (GLint) bswap_CARD32(pc + 8)
-                 ));
+    CALL_TexEnvi( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLenum  )bswap_ENUM   ( pc +  4 ),
+         (GLint   )bswap_CARD32 ( pc +  8 )
+    ) );
 }
 
-void
-__glXDispSwap_TexEnviv(GLbyte * pc)
+void __glXDispSwap_TexEnviv(GLbyte * pc)
 {
-    const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
-    const GLint *params;
+    const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
+    const GLint * params;
 
-    params =
-        (const GLint *) bswap_32_array((uint32_t *) (pc + 8),
-                                       __glTexEnviv_size(pname));
+    params = (const GLint *) bswap_32_array( (uint32_t *) (pc + 8), __glTexEnviv_size(pname) );
 
-    CALL_TexEnviv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0), pname, params));
+    CALL_TexEnviv( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+        pname,
+        params
+    ) );
 }
 
-void
-__glXDispSwap_TexGend(GLbyte * pc)
+void __glXDispSwap_TexGend(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 16);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 16);
         pc -= 4;
     }
 #endif
 
-    CALL_TexGend(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 8),
-                                  (GLenum) bswap_ENUM(pc + 12),
-                                  (GLdouble) bswap_FLOAT64(pc + 0)
-                 ));
+    CALL_TexGend( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  8 ),
+         (GLenum  )bswap_ENUM   ( pc + 12 ),
+         (GLdouble)bswap_FLOAT64( pc +  0 )
+    ) );
 }
 
-void
-__glXDispSwap_TexGendv(GLbyte * pc)
+void __glXDispSwap_TexGendv(GLbyte * pc)
 {
-    const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
-    const GLdouble *params;
+    const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
+    const GLdouble * params;
 
 #ifdef __GLX_ALIGN64
     const GLuint compsize = __glTexGendv_size(pname);
     const GLuint cmdlen = 12 + __GLX_PAD((compsize * 8)) - 4;
-
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, cmdlen);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, cmdlen);
         pc -= 4;
     }
 #endif
 
-    params =
-        (const GLdouble *) bswap_64_array((uint64_t *) (pc + 8),
-                                          __glTexGendv_size(pname));
+    params = (const GLdouble *) bswap_64_array( (uint64_t *) (pc + 8), __glTexGendv_size(pname) );
 
-    CALL_TexGendv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0), pname, params));
+    CALL_TexGendv( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+        pname,
+        params
+    ) );
 }
 
-void
-__glXDispSwap_TexGenf(GLbyte * pc)
+void __glXDispSwap_TexGenf(GLbyte * pc)
 {
-    CALL_TexGenf(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                  (GLenum) bswap_ENUM(pc + 4),
-                                  (GLfloat) bswap_FLOAT32(pc + 8)
-                 ));
+    CALL_TexGenf( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLenum  )bswap_ENUM   ( pc +  4 ),
+         (GLfloat )bswap_FLOAT32( pc +  8 )
+    ) );
 }
 
-void
-__glXDispSwap_TexGenfv(GLbyte * pc)
+void __glXDispSwap_TexGenfv(GLbyte * pc)
 {
-    const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
-    const GLfloat *params;
+    const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
+    const GLfloat * params;
 
-    params =
-        (const GLfloat *) bswap_32_array((uint32_t *) (pc + 8),
-                                         __glTexGenfv_size(pname));
+    params = (const GLfloat *) bswap_32_array( (uint32_t *) (pc + 8), __glTexGenfv_size(pname) );
 
-    CALL_TexGenfv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0), pname, params));
+    CALL_TexGenfv( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+        pname,
+        params
+    ) );
 }
 
-void
-__glXDispSwap_TexGeni(GLbyte * pc)
+void __glXDispSwap_TexGeni(GLbyte * pc)
 {
-    CALL_TexGeni(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                  (GLenum) bswap_ENUM(pc + 4),
-                                  (GLint) bswap_CARD32(pc + 8)
-                 ));
+    CALL_TexGeni( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLenum  )bswap_ENUM   ( pc +  4 ),
+         (GLint   )bswap_CARD32 ( pc +  8 )
+    ) );
 }
 
-void
-__glXDispSwap_TexGeniv(GLbyte * pc)
+void __glXDispSwap_TexGeniv(GLbyte * pc)
 {
-    const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
-    const GLint *params;
+    const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
+    const GLint * params;
 
-    params =
-        (const GLint *) bswap_32_array((uint32_t *) (pc + 8),
-                                       __glTexGeniv_size(pname));
+    params = (const GLint *) bswap_32_array( (uint32_t *) (pc + 8), __glTexGeniv_size(pname) );
 
-    CALL_TexGeniv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0), pname, params));
+    CALL_TexGeniv( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+        pname,
+        params
+    ) );
 }
 
-void
-__glXDispSwap_InitNames(GLbyte * pc)
+void __glXDispSwap_InitNames(GLbyte * pc)
 {
-    CALL_InitNames(GET_DISPATCH(), ());
+    CALL_InitNames( GET_DISPATCH(), () );
 }
 
-void
-__glXDispSwap_LoadName(GLbyte * pc)
+void __glXDispSwap_LoadName(GLbyte * pc)
 {
-    CALL_LoadName(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0)
-                  ));
+    CALL_LoadName( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 )
+    ) );
 }
 
-void
-__glXDispSwap_PassThrough(GLbyte * pc)
+void __glXDispSwap_PassThrough(GLbyte * pc)
 {
-    CALL_PassThrough(GET_DISPATCH(), ((GLfloat) bswap_FLOAT32(pc + 0)
-                     ));
+    CALL_PassThrough( GET_DISPATCH(), (
+         (GLfloat )bswap_FLOAT32( pc +  0 )
+    ) );
 }
 
-void
-__glXDispSwap_PopName(GLbyte * pc)
+void __glXDispSwap_PopName(GLbyte * pc)
 {
-    CALL_PopName(GET_DISPATCH(), ());
+    CALL_PopName( GET_DISPATCH(), () );
 }
 
-void
-__glXDispSwap_PushName(GLbyte * pc)
+void __glXDispSwap_PushName(GLbyte * pc)
 {
-    CALL_PushName(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0)
-                  ));
+    CALL_PushName( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 )
+    ) );
 }
 
-void
-__glXDispSwap_DrawBuffer(GLbyte * pc)
+void __glXDispSwap_DrawBuffer(GLbyte * pc)
 {
-    CALL_DrawBuffer(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0)
-                    ));
+    CALL_DrawBuffer( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 )
+    ) );
 }
 
-void
-__glXDispSwap_Clear(GLbyte * pc)
+void __glXDispSwap_Clear(GLbyte * pc)
 {
-    CALL_Clear(GET_DISPATCH(), ((GLbitfield) bswap_CARD32(pc + 0)
-               ));
+    CALL_Clear( GET_DISPATCH(), (
+         (GLbitfield)bswap_CARD32 ( pc +  0 )
+    ) );
 }
 
-void
-__glXDispSwap_ClearAccum(GLbyte * pc)
+void __glXDispSwap_ClearAccum(GLbyte * pc)
 {
-    CALL_ClearAccum(GET_DISPATCH(), ((GLfloat) bswap_FLOAT32(pc + 0),
-                                     (GLfloat) bswap_FLOAT32(pc + 4),
-                                     (GLfloat) bswap_FLOAT32(pc + 8),
-                                     (GLfloat) bswap_FLOAT32(pc + 12)
-                    ));
+    CALL_ClearAccum( GET_DISPATCH(), (
+         (GLfloat )bswap_FLOAT32( pc +  0 ),
+         (GLfloat )bswap_FLOAT32( pc +  4 ),
+         (GLfloat )bswap_FLOAT32( pc +  8 ),
+         (GLfloat )bswap_FLOAT32( pc + 12 )
+    ) );
 }
 
-void
-__glXDispSwap_ClearIndex(GLbyte * pc)
+void __glXDispSwap_ClearIndex(GLbyte * pc)
 {
-    CALL_ClearIndex(GET_DISPATCH(), ((GLfloat) bswap_FLOAT32(pc + 0)
-                    ));
+    CALL_ClearIndex( GET_DISPATCH(), (
+         (GLfloat )bswap_FLOAT32( pc +  0 )
+    ) );
 }
 
-void
-__glXDispSwap_ClearColor(GLbyte * pc)
+void __glXDispSwap_ClearColor(GLbyte * pc)
 {
-    CALL_ClearColor(GET_DISPATCH(), ((GLclampf) bswap_FLOAT32(pc + 0),
-                                     (GLclampf) bswap_FLOAT32(pc + 4),
-                                     (GLclampf) bswap_FLOAT32(pc + 8),
-                                     (GLclampf) bswap_FLOAT32(pc + 12)
-                    ));
+    CALL_ClearColor( GET_DISPATCH(), (
+         (GLclampf)bswap_FLOAT32( pc +  0 ),
+         (GLclampf)bswap_FLOAT32( pc +  4 ),
+         (GLclampf)bswap_FLOAT32( pc +  8 ),
+         (GLclampf)bswap_FLOAT32( pc + 12 )
+    ) );
 }
 
-void
-__glXDispSwap_ClearStencil(GLbyte * pc)
+void __glXDispSwap_ClearStencil(GLbyte * pc)
 {
-    CALL_ClearStencil(GET_DISPATCH(), ((GLint) bswap_CARD32(pc + 0)
-                      ));
+    CALL_ClearStencil( GET_DISPATCH(), (
+         (GLint   )bswap_CARD32 ( pc +  0 )
+    ) );
 }
 
-void
-__glXDispSwap_ClearDepth(GLbyte * pc)
+void __glXDispSwap_ClearDepth(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 8);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 8);
         pc -= 4;
     }
 #endif
 
-    CALL_ClearDepth(GET_DISPATCH(), ((GLclampd) bswap_FLOAT64(pc + 0)
-                    ));
+    CALL_ClearDepth( GET_DISPATCH(), (
+         (GLclampd)bswap_FLOAT64( pc +  0 )
+    ) );
 }
 
-void
-__glXDispSwap_StencilMask(GLbyte * pc)
+void __glXDispSwap_StencilMask(GLbyte * pc)
 {
-    CALL_StencilMask(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0)
-                     ));
+    CALL_StencilMask( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 )
+    ) );
 }
 
-void
-__glXDispSwap_ColorMask(GLbyte * pc)
+void __glXDispSwap_ColorMask(GLbyte * pc)
 {
-    CALL_ColorMask(GET_DISPATCH(), (*(GLboolean *) (pc + 0),
-                                    *(GLboolean *) (pc + 1),
-                                    *(GLboolean *) (pc + 2),
-                                    *(GLboolean *) (pc + 3)
-                   ));
+    CALL_ColorMask( GET_DISPATCH(), (
+        *(GLboolean *)(pc +  0),
+        *(GLboolean *)(pc +  1),
+        *(GLboolean *)(pc +  2),
+        *(GLboolean *)(pc +  3)
+    ) );
 }
 
-void
-__glXDispSwap_DepthMask(GLbyte * pc)
+void __glXDispSwap_DepthMask(GLbyte * pc)
 {
-    CALL_DepthMask(GET_DISPATCH(), (*(GLboolean *) (pc + 0)
-                   ));
+    CALL_DepthMask( GET_DISPATCH(), (
+        *(GLboolean *)(pc +  0)
+    ) );
 }
 
-void
-__glXDispSwap_IndexMask(GLbyte * pc)
+void __glXDispSwap_IndexMask(GLbyte * pc)
 {
-    CALL_IndexMask(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0)
-                   ));
+    CALL_IndexMask( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 )
+    ) );
 }
 
-void
-__glXDispSwap_Accum(GLbyte * pc)
+void __glXDispSwap_Accum(GLbyte * pc)
 {
-    CALL_Accum(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                (GLfloat) bswap_FLOAT32(pc + 4)
-               ));
+    CALL_Accum( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLfloat )bswap_FLOAT32( pc +  4 )
+    ) );
 }
 
-void
-__glXDispSwap_Disable(GLbyte * pc)
+void __glXDispSwap_Disable(GLbyte * pc)
 {
-    CALL_Disable(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0)
-                 ));
+    CALL_Disable( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 )
+    ) );
 }
 
-void
-__glXDispSwap_Enable(GLbyte * pc)
+void __glXDispSwap_Enable(GLbyte * pc)
 {
-    CALL_Enable(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0)
-                ));
+    CALL_Enable( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 )
+    ) );
 }
 
-void
-__glXDispSwap_PopAttrib(GLbyte * pc)
+void __glXDispSwap_PopAttrib(GLbyte * pc)
 {
-    CALL_PopAttrib(GET_DISPATCH(), ());
+    CALL_PopAttrib( GET_DISPATCH(), () );
 }
 
-void
-__glXDispSwap_PushAttrib(GLbyte * pc)
+void __glXDispSwap_PushAttrib(GLbyte * pc)
 {
-    CALL_PushAttrib(GET_DISPATCH(), ((GLbitfield) bswap_CARD32(pc + 0)
-                    ));
+    CALL_PushAttrib( GET_DISPATCH(), (
+         (GLbitfield)bswap_CARD32 ( pc +  0 )
+    ) );
 }
 
-void
-__glXDispSwap_MapGrid1d(GLbyte * pc)
+void __glXDispSwap_MapGrid1d(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 20);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 20);
         pc -= 4;
     }
 #endif
 
-    CALL_MapGrid1d(GET_DISPATCH(), ((GLint) bswap_CARD32(pc + 16),
-                                    (GLdouble) bswap_FLOAT64(pc + 0),
-                                    (GLdouble) bswap_FLOAT64(pc + 8)
-                   ));
+    CALL_MapGrid1d( GET_DISPATCH(), (
+         (GLint   )bswap_CARD32 ( pc + 16 ),
+         (GLdouble)bswap_FLOAT64( pc +  0 ),
+         (GLdouble)bswap_FLOAT64( pc +  8 )
+    ) );
 }
 
-void
-__glXDispSwap_MapGrid1f(GLbyte * pc)
+void __glXDispSwap_MapGrid1f(GLbyte * pc)
 {
-    CALL_MapGrid1f(GET_DISPATCH(), ((GLint) bswap_CARD32(pc + 0),
-                                    (GLfloat) bswap_FLOAT32(pc + 4),
-                                    (GLfloat) bswap_FLOAT32(pc + 8)
-                   ));
+    CALL_MapGrid1f( GET_DISPATCH(), (
+         (GLint   )bswap_CARD32 ( pc +  0 ),
+         (GLfloat )bswap_FLOAT32( pc +  4 ),
+         (GLfloat )bswap_FLOAT32( pc +  8 )
+    ) );
 }
 
-void
-__glXDispSwap_MapGrid2d(GLbyte * pc)
+void __glXDispSwap_MapGrid2d(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 40);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 40);
         pc -= 4;
     }
 #endif
 
-    CALL_MapGrid2d(GET_DISPATCH(), ((GLint) bswap_CARD32(pc + 32),
-                                    (GLdouble) bswap_FLOAT64(pc + 0),
-                                    (GLdouble) bswap_FLOAT64(pc + 8),
-                                    (GLint) bswap_CARD32(pc + 36),
-                                    (GLdouble) bswap_FLOAT64(pc + 16),
-                                    (GLdouble) bswap_FLOAT64(pc + 24)
-                   ));
+    CALL_MapGrid2d( GET_DISPATCH(), (
+         (GLint   )bswap_CARD32 ( pc + 32 ),
+         (GLdouble)bswap_FLOAT64( pc +  0 ),
+         (GLdouble)bswap_FLOAT64( pc +  8 ),
+         (GLint   )bswap_CARD32 ( pc + 36 ),
+         (GLdouble)bswap_FLOAT64( pc + 16 ),
+         (GLdouble)bswap_FLOAT64( pc + 24 )
+    ) );
 }
 
-void
-__glXDispSwap_MapGrid2f(GLbyte * pc)
+void __glXDispSwap_MapGrid2f(GLbyte * pc)
 {
-    CALL_MapGrid2f(GET_DISPATCH(), ((GLint) bswap_CARD32(pc + 0),
-                                    (GLfloat) bswap_FLOAT32(pc + 4),
-                                    (GLfloat) bswap_FLOAT32(pc + 8),
-                                    (GLint) bswap_CARD32(pc + 12),
-                                    (GLfloat) bswap_FLOAT32(pc + 16),
-                                    (GLfloat) bswap_FLOAT32(pc + 20)
-                   ));
+    CALL_MapGrid2f( GET_DISPATCH(), (
+         (GLint   )bswap_CARD32 ( pc +  0 ),
+         (GLfloat )bswap_FLOAT32( pc +  4 ),
+         (GLfloat )bswap_FLOAT32( pc +  8 ),
+         (GLint   )bswap_CARD32 ( pc + 12 ),
+         (GLfloat )bswap_FLOAT32( pc + 16 ),
+         (GLfloat )bswap_FLOAT32( pc + 20 )
+    ) );
 }
 
-void
-__glXDispSwap_EvalCoord1dv(GLbyte * pc)
+void __glXDispSwap_EvalCoord1dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 8);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 8);
         pc -= 4;
     }
 #endif
 
-    CALL_EvalCoord1dv(GET_DISPATCH(), ((const GLdouble *)
-                                       bswap_64_array((uint64_t *) (pc + 0), 1)
-                      ));
+    CALL_EvalCoord1dv( GET_DISPATCH(), (
+         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  0), 1 )
+    ) );
 }
 
-void
-__glXDispSwap_EvalCoord1fv(GLbyte * pc)
+void __glXDispSwap_EvalCoord1fv(GLbyte * pc)
 {
-    CALL_EvalCoord1fv(GET_DISPATCH(), ((const GLfloat *)
-                                       bswap_32_array((uint32_t *) (pc + 0), 1)
-                      ));
+    CALL_EvalCoord1fv( GET_DISPATCH(), (
+         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  0), 1 )
+    ) );
 }
 
-void
-__glXDispSwap_EvalCoord2dv(GLbyte * pc)
+void __glXDispSwap_EvalCoord2dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 16);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 16);
         pc -= 4;
     }
 #endif
 
-    CALL_EvalCoord2dv(GET_DISPATCH(), ((const GLdouble *)
-                                       bswap_64_array((uint64_t *) (pc + 0), 2)
-                      ));
+    CALL_EvalCoord2dv( GET_DISPATCH(), (
+         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  0), 2 )
+    ) );
 }
 
-void
-__glXDispSwap_EvalCoord2fv(GLbyte * pc)
+void __glXDispSwap_EvalCoord2fv(GLbyte * pc)
 {
-    CALL_EvalCoord2fv(GET_DISPATCH(), ((const GLfloat *)
-                                       bswap_32_array((uint32_t *) (pc + 0), 2)
-                      ));
+    CALL_EvalCoord2fv( GET_DISPATCH(), (
+         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  0), 2 )
+    ) );
 }
 
-void
-__glXDispSwap_EvalMesh1(GLbyte * pc)
+void __glXDispSwap_EvalMesh1(GLbyte * pc)
 {
-    CALL_EvalMesh1(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                    (GLint) bswap_CARD32(pc + 4),
-                                    (GLint) bswap_CARD32(pc + 8)
-                   ));
+    CALL_EvalMesh1( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLint   )bswap_CARD32 ( pc +  4 ),
+         (GLint   )bswap_CARD32 ( pc +  8 )
+    ) );
 }
 
-void
-__glXDispSwap_EvalPoint1(GLbyte * pc)
+void __glXDispSwap_EvalPoint1(GLbyte * pc)
 {
-    CALL_EvalPoint1(GET_DISPATCH(), ((GLint) bswap_CARD32(pc + 0)
-                    ));
+    CALL_EvalPoint1( GET_DISPATCH(), (
+         (GLint   )bswap_CARD32 ( pc +  0 )
+    ) );
 }
 
-void
-__glXDispSwap_EvalMesh2(GLbyte * pc)
+void __glXDispSwap_EvalMesh2(GLbyte * pc)
 {
-    CALL_EvalMesh2(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                    (GLint) bswap_CARD32(pc + 4),
-                                    (GLint) bswap_CARD32(pc + 8),
-                                    (GLint) bswap_CARD32(pc + 12),
-                                    (GLint) bswap_CARD32(pc + 16)
-                   ));
+    CALL_EvalMesh2( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLint   )bswap_CARD32 ( pc +  4 ),
+         (GLint   )bswap_CARD32 ( pc +  8 ),
+         (GLint   )bswap_CARD32 ( pc + 12 ),
+         (GLint   )bswap_CARD32 ( pc + 16 )
+    ) );
 }
 
-void
-__glXDispSwap_EvalPoint2(GLbyte * pc)
+void __glXDispSwap_EvalPoint2(GLbyte * pc)
 {
-    CALL_EvalPoint2(GET_DISPATCH(), ((GLint) bswap_CARD32(pc + 0),
-                                     (GLint) bswap_CARD32(pc + 4)
-                    ));
+    CALL_EvalPoint2( GET_DISPATCH(), (
+         (GLint   )bswap_CARD32 ( pc +  0 ),
+         (GLint   )bswap_CARD32 ( pc +  4 )
+    ) );
 }
 
-void
-__glXDispSwap_AlphaFunc(GLbyte * pc)
+void __glXDispSwap_AlphaFunc(GLbyte * pc)
 {
-    CALL_AlphaFunc(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                    (GLclampf) bswap_FLOAT32(pc + 4)
-                   ));
+    CALL_AlphaFunc( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLclampf)bswap_FLOAT32( pc +  4 )
+    ) );
 }
 
-void
-__glXDispSwap_BlendFunc(GLbyte * pc)
+void __glXDispSwap_BlendFunc(GLbyte * pc)
 {
-    CALL_BlendFunc(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                    (GLenum) bswap_ENUM(pc + 4)
-                   ));
+    CALL_BlendFunc( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLenum  )bswap_ENUM   ( pc +  4 )
+    ) );
 }
 
-void
-__glXDispSwap_LogicOp(GLbyte * pc)
+void __glXDispSwap_LogicOp(GLbyte * pc)
 {
-    CALL_LogicOp(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0)
-                 ));
+    CALL_LogicOp( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 )
+    ) );
 }
 
-void
-__glXDispSwap_StencilFunc(GLbyte * pc)
+void __glXDispSwap_StencilFunc(GLbyte * pc)
 {
-    CALL_StencilFunc(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                      (GLint) bswap_CARD32(pc + 4),
-                                      (GLuint) bswap_CARD32(pc + 8)
-                     ));
+    CALL_StencilFunc( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLint   )bswap_CARD32 ( pc +  4 ),
+         (GLuint  )bswap_CARD32 ( pc +  8 )
+    ) );
 }
 
-void
-__glXDispSwap_StencilOp(GLbyte * pc)
+void __glXDispSwap_StencilOp(GLbyte * pc)
 {
-    CALL_StencilOp(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                    (GLenum) bswap_ENUM(pc + 4),
-                                    (GLenum) bswap_ENUM(pc + 8)
-                   ));
+    CALL_StencilOp( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLenum  )bswap_ENUM   ( pc +  4 ),
+         (GLenum  )bswap_ENUM   ( pc +  8 )
+    ) );
 }
 
-void
-__glXDispSwap_DepthFunc(GLbyte * pc)
+void __glXDispSwap_DepthFunc(GLbyte * pc)
 {
-    CALL_DepthFunc(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0)
-                   ));
+    CALL_DepthFunc( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 )
+    ) );
 }
 
-void
-__glXDispSwap_PixelZoom(GLbyte * pc)
+void __glXDispSwap_PixelZoom(GLbyte * pc)
 {
-    CALL_PixelZoom(GET_DISPATCH(), ((GLfloat) bswap_FLOAT32(pc + 0),
-                                    (GLfloat) bswap_FLOAT32(pc + 4)
-                   ));
+    CALL_PixelZoom( GET_DISPATCH(), (
+         (GLfloat )bswap_FLOAT32( pc +  0 ),
+         (GLfloat )bswap_FLOAT32( pc +  4 )
+    ) );
 }
 
-void
-__glXDispSwap_PixelTransferf(GLbyte * pc)
+void __glXDispSwap_PixelTransferf(GLbyte * pc)
 {
-    CALL_PixelTransferf(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                         (GLfloat) bswap_FLOAT32(pc + 4)
-                        ));
+    CALL_PixelTransferf( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLfloat )bswap_FLOAT32( pc +  4 )
+    ) );
 }
 
-void
-__glXDispSwap_PixelTransferi(GLbyte * pc)
+void __glXDispSwap_PixelTransferi(GLbyte * pc)
 {
-    CALL_PixelTransferi(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                         (GLint) bswap_CARD32(pc + 4)
-                        ));
+    CALL_PixelTransferi( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLint   )bswap_CARD32 ( pc +  4 )
+    ) );
 }
 
-int
-__glXDispSwap_PixelStoref(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_PixelStoref(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        CALL_PixelStoref(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                          (GLfloat) bswap_FLOAT32(pc + 4)
-                         ));
+    if ( cx != NULL ) {
+        CALL_PixelStoref( GET_DISPATCH(), (
+             (GLenum  )bswap_ENUM   ( pc +  0 ),
+             (GLfloat )bswap_FLOAT32( pc +  4 )
+        ) );
         error = Success;
     }
 
     return error;
 }
 
-int
-__glXDispSwap_PixelStorei(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_PixelStorei(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        CALL_PixelStorei(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                          (GLint) bswap_CARD32(pc + 4)
-                         ));
+    if ( cx != NULL ) {
+        CALL_PixelStorei( GET_DISPATCH(), (
+             (GLenum  )bswap_ENUM   ( pc +  0 ),
+             (GLint   )bswap_CARD32 ( pc +  4 )
+        ) );
         error = Success;
     }
 
     return error;
 }
 
-void
-__glXDispSwap_PixelMapfv(GLbyte * pc)
+void __glXDispSwap_PixelMapfv(GLbyte * pc)
 {
-    const GLsizei mapsize = (GLsizei) bswap_CARD32(pc + 4);
+    const GLsizei mapsize =  (GLsizei )bswap_CARD32 ( pc +  4 );
 
-    CALL_PixelMapfv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                     mapsize,
-                                     (const GLfloat *)
-                                     bswap_32_array((uint32_t *) (pc + 8), 0)
-                    ));
+    CALL_PixelMapfv( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+        mapsize,
+         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  8), 0 )
+    ) );
 }
 
-void
-__glXDispSwap_PixelMapuiv(GLbyte * pc)
+void __glXDispSwap_PixelMapuiv(GLbyte * pc)
 {
-    const GLsizei mapsize = (GLsizei) bswap_CARD32(pc + 4);
+    const GLsizei mapsize =  (GLsizei )bswap_CARD32 ( pc +  4 );
 
-    CALL_PixelMapuiv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                      mapsize,
-                                      (const GLuint *)
-                                      bswap_32_array((uint32_t *) (pc + 8), 0)
-                     ));
+    CALL_PixelMapuiv( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+        mapsize,
+         (const GLuint *)bswap_32_array( (uint32_t *) (pc +  8), 0 )
+    ) );
 }
 
-void
-__glXDispSwap_PixelMapusv(GLbyte * pc)
+void __glXDispSwap_PixelMapusv(GLbyte * pc)
 {
-    const GLsizei mapsize = (GLsizei) bswap_CARD32(pc + 4);
+    const GLsizei mapsize =  (GLsizei )bswap_CARD32 ( pc +  4 );
 
-    CALL_PixelMapusv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                      mapsize,
-                                      (const GLushort *)
-                                      bswap_16_array((uint16_t *) (pc + 8), 0)
-                     ));
+    CALL_PixelMapusv( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+        mapsize,
+         (const GLushort *)bswap_16_array( (uint16_t *) (pc +  8), 0 )
+    ) );
 }
 
-void
-__glXDispSwap_ReadBuffer(GLbyte * pc)
+void __glXDispSwap_ReadBuffer(GLbyte * pc)
 {
-    CALL_ReadBuffer(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0)
-                    ));
+    CALL_ReadBuffer( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 )
+    ) );
 }
 
-void
-__glXDispSwap_CopyPixels(GLbyte * pc)
+void __glXDispSwap_CopyPixels(GLbyte * pc)
 {
-    CALL_CopyPixels(GET_DISPATCH(), ((GLint) bswap_CARD32(pc + 0),
-                                     (GLint) bswap_CARD32(pc + 4),
-                                     (GLsizei) bswap_CARD32(pc + 8),
-                                     (GLsizei) bswap_CARD32(pc + 12),
-                                     (GLenum) bswap_ENUM(pc + 16)
-                    ));
+    CALL_CopyPixels( GET_DISPATCH(), (
+         (GLint   )bswap_CARD32 ( pc +  0 ),
+         (GLint   )bswap_CARD32 ( pc +  4 ),
+         (GLsizei )bswap_CARD32 ( pc +  8 ),
+         (GLsizei )bswap_CARD32 ( pc + 12 ),
+         (GLenum  )bswap_ENUM   ( pc + 16 )
+    ) );
 }
 
-void
-__glXDispSwap_DrawPixels(GLbyte * pc)
+void __glXDispSwap_DrawPixels(GLbyte * pc)
 {
-    const GLvoid *const pixels = (const GLvoid *) ((pc + 36));
-    __GLXpixelHeader *const hdr = (__GLXpixelHeader *) (pc);
+    const GLvoid * const pixels = (const GLvoid *) (pc + 36);
+    __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ROW_LENGTH,
-                      (GLint) bswap_CARD32(&hdr->rowLength)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_ROWS,
-                      (GLint) bswap_CARD32(&hdr->skipRows)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_PIXELS,
-                      (GLint) bswap_CARD32(&hdr->skipPixels)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ALIGNMENT,
-                      (GLint) bswap_CARD32(&hdr->alignment)));
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES,   hdr->swapBytes) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST,    hdr->lsbFirst) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,   (GLint) bswap_CARD32( & hdr->rowLength )) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,    (GLint) bswap_CARD32( & hdr->skipRows )) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,  (GLint) bswap_CARD32( & hdr->skipPixels )) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT,    (GLint) bswap_CARD32( & hdr->alignment )) );
 
-    CALL_DrawPixels(GET_DISPATCH(), ((GLsizei) bswap_CARD32(pc + 20),
-                                     (GLsizei) bswap_CARD32(pc + 24),
-                                     (GLenum) bswap_ENUM(pc + 28),
-                                     (GLenum) bswap_ENUM(pc + 32), pixels));
+    CALL_DrawPixels( GET_DISPATCH(), (
+         (GLsizei )bswap_CARD32 ( pc + 20 ),
+         (GLsizei )bswap_CARD32 ( pc + 24 ),
+         (GLenum  )bswap_ENUM   ( pc + 28 ),
+         (GLenum  )bswap_ENUM   ( pc + 32 ),
+        pixels
+    ) );
 }
 
-int
-__glXDispSwap_GetBooleanv(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GetBooleanv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = (GLenum) bswap_ENUM(pc + 0);
+    if ( cx != NULL ) {
+        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  0 );
 
         const GLuint compsize = __glGetBooleanv_size(pname);
         GLboolean answerBuffer[200];
-        GLboolean *params =
-            __glXGetAnswerBuffer(cl, compsize, answerBuffer,
-                                 sizeof(answerBuffer), 1);
+        GLboolean * params = __glXGetAnswerBuffer(cl, compsize, answerBuffer, sizeof(answerBuffer), 1);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetBooleanv(GET_DISPATCH(), (pname, params));
+        CALL_GetBooleanv( GET_DISPATCH(), (
+            pname,
+            params
+        ) );
         __glXSendReplySwap(cl->client, params, compsize, 1, GL_FALSE, 0);
         error = Success;
     }
@@ -2038,21 +1901,20 @@ __glXDispSwap_GetBooleanv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDispSwap_GetClipPlane(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GetClipPlane(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
+    if ( cx != NULL ) {
         GLdouble equation[4];
-
-        CALL_GetClipPlane(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                           equation));
-        (void) bswap_64_array((uint64_t *) equation, 4);
+        CALL_GetClipPlane( GET_DISPATCH(), (
+             (GLenum  )bswap_ENUM   ( pc +  0 ),
+            equation
+        ) );
+        (void) bswap_64_array( (uint64_t *) equation, 4 );
         __glXSendReplySwap(cl->client, equation, 4, 8, GL_TRUE, 0);
         error = Success;
     }
@@ -2060,30 +1922,28 @@ __glXDispSwap_GetClipPlane(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDispSwap_GetDoublev(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GetDoublev(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = (GLenum) bswap_ENUM(pc + 0);
+    if ( cx != NULL ) {
+        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  0 );
 
         const GLuint compsize = __glGetDoublev_size(pname);
         GLdouble answerBuffer[200];
-        GLdouble *params =
-            __glXGetAnswerBuffer(cl, compsize * 8, answerBuffer,
-                                 sizeof(answerBuffer), 8);
+        GLdouble * params = __glXGetAnswerBuffer(cl, compsize * 8, answerBuffer, sizeof(answerBuffer), 8);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetDoublev(GET_DISPATCH(), (pname, params));
-        (void) bswap_64_array((uint64_t *) params, compsize);
+        CALL_GetDoublev( GET_DISPATCH(), (
+            pname,
+            params
+        ) );
+        (void) bswap_64_array( (uint64_t *) params, compsize );
         __glXSendReplySwap(cl->client, params, compsize, 8, GL_FALSE, 0);
         error = Success;
     }
@@ -2091,19 +1951,16 @@ __glXDispSwap_GetDoublev(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDispSwap_GetError(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GetError(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
+    if ( cx != NULL ) {
         GLenum retval;
-
-        retval = CALL_GetError(GET_DISPATCH(), ());
+        retval = CALL_GetError( GET_DISPATCH(), () );
         __glXSendReplySwap(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
         error = Success;
     }
@@ -2111,30 +1968,28 @@ __glXDispSwap_GetError(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDispSwap_GetFloatv(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GetFloatv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = (GLenum) bswap_ENUM(pc + 0);
+    if ( cx != NULL ) {
+        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  0 );
 
         const GLuint compsize = __glGetFloatv_size(pname);
         GLfloat answerBuffer[200];
-        GLfloat *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetFloatv(GET_DISPATCH(), (pname, params));
-        (void) bswap_32_array((uint32_t *) params, compsize);
+        CALL_GetFloatv( GET_DISPATCH(), (
+            pname,
+            params
+        ) );
+        (void) bswap_32_array( (uint32_t *) params, compsize );
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -2142,30 +1997,28 @@ __glXDispSwap_GetFloatv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDispSwap_GetIntegerv(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GetIntegerv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = (GLenum) bswap_ENUM(pc + 0);
+    if ( cx != NULL ) {
+        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  0 );
 
         const GLuint compsize = __glGetIntegerv_size(pname);
         GLint answerBuffer[200];
-        GLint *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetIntegerv(GET_DISPATCH(), (pname, params));
-        (void) bswap_32_array((uint32_t *) params, compsize);
+        CALL_GetIntegerv( GET_DISPATCH(), (
+            pname,
+            params
+        ) );
+        (void) bswap_32_array( (uint32_t *) params, compsize );
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -2173,31 +2026,29 @@ __glXDispSwap_GetIntegerv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDispSwap_GetLightfv(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GetLightfv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
 
         const GLuint compsize = __glGetLightfv_size(pname);
         GLfloat answerBuffer[200];
-        GLfloat *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetLightfv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                         pname, params));
-        (void) bswap_32_array((uint32_t *) params, compsize);
+        CALL_GetLightfv( GET_DISPATCH(), (
+             (GLenum  )bswap_ENUM   ( pc +  0 ),
+            pname,
+            params
+        ) );
+        (void) bswap_32_array( (uint32_t *) params, compsize );
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -2205,31 +2056,29 @@ __glXDispSwap_GetLightfv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDispSwap_GetLightiv(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GetLightiv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
 
         const GLuint compsize = __glGetLightiv_size(pname);
         GLint answerBuffer[200];
-        GLint *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetLightiv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                         pname, params));
-        (void) bswap_32_array((uint32_t *) params, compsize);
+        CALL_GetLightiv( GET_DISPATCH(), (
+             (GLenum  )bswap_ENUM   ( pc +  0 ),
+            pname,
+            params
+        ) );
+        (void) bswap_32_array( (uint32_t *) params, compsize );
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -2237,31 +2086,30 @@ __glXDispSwap_GetLightiv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDispSwap_GetMapdv(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GetMapdv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum target = (GLenum) bswap_ENUM(pc + 0);
-        const GLenum query = (GLenum) bswap_ENUM(pc + 4);
+    if ( cx != NULL ) {
+        const GLenum target =  (GLenum  )bswap_ENUM   ( pc +  0 );
+        const GLenum query =  (GLenum  )bswap_ENUM   ( pc +  4 );
 
-        const GLuint compsize = __glGetMapdv_size(target, query);
+        const GLuint compsize = __glGetMapdv_size(target,query);
         GLdouble answerBuffer[200];
-        GLdouble *v =
-            __glXGetAnswerBuffer(cl, compsize * 8, answerBuffer,
-                                 sizeof(answerBuffer), 8);
+        GLdouble * v = __glXGetAnswerBuffer(cl, compsize * 8, answerBuffer, sizeof(answerBuffer), 8);
 
-        if (v == NULL)
-            return BadAlloc;
+        if (v == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetMapdv(GET_DISPATCH(), (target, query, v));
-        (void) bswap_64_array((uint64_t *) v, compsize);
+        CALL_GetMapdv( GET_DISPATCH(), (
+            target,
+            query,
+            v
+        ) );
+        (void) bswap_64_array( (uint64_t *) v, compsize );
         __glXSendReplySwap(cl->client, v, compsize, 8, GL_FALSE, 0);
         error = Success;
     }
@@ -2269,31 +2117,30 @@ __glXDispSwap_GetMapdv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDispSwap_GetMapfv(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GetMapfv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum target = (GLenum) bswap_ENUM(pc + 0);
-        const GLenum query = (GLenum) bswap_ENUM(pc + 4);
+    if ( cx != NULL ) {
+        const GLenum target =  (GLenum  )bswap_ENUM   ( pc +  0 );
+        const GLenum query =  (GLenum  )bswap_ENUM   ( pc +  4 );
 
-        const GLuint compsize = __glGetMapfv_size(target, query);
+        const GLuint compsize = __glGetMapfv_size(target,query);
         GLfloat answerBuffer[200];
-        GLfloat *v =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLfloat * v = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (v == NULL)
-            return BadAlloc;
+        if (v == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetMapfv(GET_DISPATCH(), (target, query, v));
-        (void) bswap_32_array((uint32_t *) v, compsize);
+        CALL_GetMapfv( GET_DISPATCH(), (
+            target,
+            query,
+            v
+        ) );
+        (void) bswap_32_array( (uint32_t *) v, compsize );
         __glXSendReplySwap(cl->client, v, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -2301,31 +2148,30 @@ __glXDispSwap_GetMapfv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDispSwap_GetMapiv(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GetMapiv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum target = (GLenum) bswap_ENUM(pc + 0);
-        const GLenum query = (GLenum) bswap_ENUM(pc + 4);
+    if ( cx != NULL ) {
+        const GLenum target =  (GLenum  )bswap_ENUM   ( pc +  0 );
+        const GLenum query =  (GLenum  )bswap_ENUM   ( pc +  4 );
 
-        const GLuint compsize = __glGetMapiv_size(target, query);
+        const GLuint compsize = __glGetMapiv_size(target,query);
         GLint answerBuffer[200];
-        GLint *v =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLint * v = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (v == NULL)
-            return BadAlloc;
+        if (v == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetMapiv(GET_DISPATCH(), (target, query, v));
-        (void) bswap_32_array((uint32_t *) v, compsize);
+        CALL_GetMapiv( GET_DISPATCH(), (
+            target,
+            query,
+            v
+        ) );
+        (void) bswap_32_array( (uint32_t *) v, compsize );
         __glXSendReplySwap(cl->client, v, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -2333,31 +2179,29 @@ __glXDispSwap_GetMapiv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDispSwap_GetMaterialfv(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GetMaterialfv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
 
         const GLuint compsize = __glGetMaterialfv_size(pname);
         GLfloat answerBuffer[200];
-        GLfloat *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetMaterialfv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                            pname, params));
-        (void) bswap_32_array((uint32_t *) params, compsize);
+        CALL_GetMaterialfv( GET_DISPATCH(), (
+             (GLenum  )bswap_ENUM   ( pc +  0 ),
+            pname,
+            params
+        ) );
+        (void) bswap_32_array( (uint32_t *) params, compsize );
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -2365,31 +2209,29 @@ __glXDispSwap_GetMaterialfv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDispSwap_GetMaterialiv(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GetMaterialiv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
 
         const GLuint compsize = __glGetMaterialiv_size(pname);
         GLint answerBuffer[200];
-        GLint *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetMaterialiv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                            pname, params));
-        (void) bswap_32_array((uint32_t *) params, compsize);
+        CALL_GetMaterialiv( GET_DISPATCH(), (
+             (GLenum  )bswap_ENUM   ( pc +  0 ),
+            pname,
+            params
+        ) );
+        (void) bswap_32_array( (uint32_t *) params, compsize );
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -2397,30 +2239,28 @@ __glXDispSwap_GetMaterialiv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDispSwap_GetPixelMapfv(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GetPixelMapfv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum map = (GLenum) bswap_ENUM(pc + 0);
+    if ( cx != NULL ) {
+        const GLenum map =  (GLenum  )bswap_ENUM   ( pc +  0 );
 
         const GLuint compsize = __glGetPixelMapfv_size(map);
         GLfloat answerBuffer[200];
-        GLfloat *values =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLfloat * values = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (values == NULL)
-            return BadAlloc;
+        if (values == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetPixelMapfv(GET_DISPATCH(), (map, values));
-        (void) bswap_32_array((uint32_t *) values, compsize);
+        CALL_GetPixelMapfv( GET_DISPATCH(), (
+            map,
+            values
+        ) );
+        (void) bswap_32_array( (uint32_t *) values, compsize );
         __glXSendReplySwap(cl->client, values, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -2428,30 +2268,28 @@ __glXDispSwap_GetPixelMapfv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDispSwap_GetPixelMapuiv(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GetPixelMapuiv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum map = (GLenum) bswap_ENUM(pc + 0);
+    if ( cx != NULL ) {
+        const GLenum map =  (GLenum  )bswap_ENUM   ( pc +  0 );
 
         const GLuint compsize = __glGetPixelMapuiv_size(map);
         GLuint answerBuffer[200];
-        GLuint *values =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLuint * values = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (values == NULL)
-            return BadAlloc;
+        if (values == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetPixelMapuiv(GET_DISPATCH(), (map, values));
-        (void) bswap_32_array((uint32_t *) values, compsize);
+        CALL_GetPixelMapuiv( GET_DISPATCH(), (
+            map,
+            values
+        ) );
+        (void) bswap_32_array( (uint32_t *) values, compsize );
         __glXSendReplySwap(cl->client, values, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -2459,30 +2297,28 @@ __glXDispSwap_GetPixelMapuiv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDispSwap_GetPixelMapusv(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GetPixelMapusv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum map = (GLenum) bswap_ENUM(pc + 0);
+    if ( cx != NULL ) {
+        const GLenum map =  (GLenum  )bswap_ENUM   ( pc +  0 );
 
         const GLuint compsize = __glGetPixelMapusv_size(map);
         GLushort answerBuffer[200];
-        GLushort *values =
-            __glXGetAnswerBuffer(cl, compsize * 2, answerBuffer,
-                                 sizeof(answerBuffer), 2);
+        GLushort * values = __glXGetAnswerBuffer(cl, compsize * 2, answerBuffer, sizeof(answerBuffer), 2);
 
-        if (values == NULL)
-            return BadAlloc;
+        if (values == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetPixelMapusv(GET_DISPATCH(), (map, values));
-        (void) bswap_16_array((uint16_t *) values, compsize);
+        CALL_GetPixelMapusv( GET_DISPATCH(), (
+            map,
+            values
+        ) );
+        (void) bswap_16_array( (uint16_t *) values, compsize );
         __glXSendReplySwap(cl->client, values, compsize, 2, GL_FALSE, 0);
         error = Success;
     }
@@ -2490,31 +2326,29 @@ __glXDispSwap_GetPixelMapusv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDispSwap_GetTexEnvfv(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GetTexEnvfv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
 
         const GLuint compsize = __glGetTexEnvfv_size(pname);
         GLfloat answerBuffer[200];
-        GLfloat *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetTexEnvfv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                          pname, params));
-        (void) bswap_32_array((uint32_t *) params, compsize);
+        CALL_GetTexEnvfv( GET_DISPATCH(), (
+             (GLenum  )bswap_ENUM   ( pc +  0 ),
+            pname,
+            params
+        ) );
+        (void) bswap_32_array( (uint32_t *) params, compsize );
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -2522,31 +2356,29 @@ __glXDispSwap_GetTexEnvfv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDispSwap_GetTexEnviv(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GetTexEnviv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
 
         const GLuint compsize = __glGetTexEnviv_size(pname);
         GLint answerBuffer[200];
-        GLint *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetTexEnviv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                          pname, params));
-        (void) bswap_32_array((uint32_t *) params, compsize);
+        CALL_GetTexEnviv( GET_DISPATCH(), (
+             (GLenum  )bswap_ENUM   ( pc +  0 ),
+            pname,
+            params
+        ) );
+        (void) bswap_32_array( (uint32_t *) params, compsize );
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -2554,31 +2386,29 @@ __glXDispSwap_GetTexEnviv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDispSwap_GetTexGendv(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GetTexGendv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
 
         const GLuint compsize = __glGetTexGendv_size(pname);
         GLdouble answerBuffer[200];
-        GLdouble *params =
-            __glXGetAnswerBuffer(cl, compsize * 8, answerBuffer,
-                                 sizeof(answerBuffer), 8);
+        GLdouble * params = __glXGetAnswerBuffer(cl, compsize * 8, answerBuffer, sizeof(answerBuffer), 8);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetTexGendv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                          pname, params));
-        (void) bswap_64_array((uint64_t *) params, compsize);
+        CALL_GetTexGendv( GET_DISPATCH(), (
+             (GLenum  )bswap_ENUM   ( pc +  0 ),
+            pname,
+            params
+        ) );
+        (void) bswap_64_array( (uint64_t *) params, compsize );
         __glXSendReplySwap(cl->client, params, compsize, 8, GL_FALSE, 0);
         error = Success;
     }
@@ -2586,31 +2416,29 @@ __glXDispSwap_GetTexGendv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDispSwap_GetTexGenfv(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GetTexGenfv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
 
         const GLuint compsize = __glGetTexGenfv_size(pname);
         GLfloat answerBuffer[200];
-        GLfloat *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetTexGenfv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                          pname, params));
-        (void) bswap_32_array((uint32_t *) params, compsize);
+        CALL_GetTexGenfv( GET_DISPATCH(), (
+             (GLenum  )bswap_ENUM   ( pc +  0 ),
+            pname,
+            params
+        ) );
+        (void) bswap_32_array( (uint32_t *) params, compsize );
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -2618,31 +2446,29 @@ __glXDispSwap_GetTexGenfv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDispSwap_GetTexGeniv(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GetTexGeniv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
 
         const GLuint compsize = __glGetTexGeniv_size(pname);
         GLint answerBuffer[200];
-        GLint *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetTexGeniv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                          pname, params));
-        (void) bswap_32_array((uint32_t *) params, compsize);
+        CALL_GetTexGeniv( GET_DISPATCH(), (
+             (GLenum  )bswap_ENUM   ( pc +  0 ),
+            pname,
+            params
+        ) );
+        (void) bswap_32_array( (uint32_t *) params, compsize );
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -2650,31 +2476,29 @@ __glXDispSwap_GetTexGeniv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDispSwap_GetTexParameterfv(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GetTexParameterfv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
 
         const GLuint compsize = __glGetTexParameterfv_size(pname);
         GLfloat answerBuffer[200];
-        GLfloat *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetTexParameterfv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                                pname, params));
-        (void) bswap_32_array((uint32_t *) params, compsize);
+        CALL_GetTexParameterfv( GET_DISPATCH(), (
+             (GLenum  )bswap_ENUM   ( pc +  0 ),
+            pname,
+            params
+        ) );
+        (void) bswap_32_array( (uint32_t *) params, compsize );
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -2682,31 +2506,29 @@ __glXDispSwap_GetTexParameterfv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDispSwap_GetTexParameteriv(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GetTexParameteriv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
 
         const GLuint compsize = __glGetTexParameteriv_size(pname);
         GLint answerBuffer[200];
-        GLint *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetTexParameteriv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                                pname, params));
-        (void) bswap_32_array((uint32_t *) params, compsize);
+        CALL_GetTexParameteriv( GET_DISPATCH(), (
+             (GLenum  )bswap_ENUM   ( pc +  0 ),
+            pname,
+            params
+        ) );
+        (void) bswap_32_array( (uint32_t *) params, compsize );
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -2714,34 +2536,30 @@ __glXDispSwap_GetTexParameteriv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDispSwap_GetTexLevelParameterfv(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GetTexLevelParameterfv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = (GLenum) bswap_ENUM(pc + 8);
+    if ( cx != NULL ) {
+        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  8 );
 
         const GLuint compsize = __glGetTexLevelParameterfv_size(pname);
         GLfloat answerBuffer[200];
-        GLfloat *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetTexLevelParameterfv(GET_DISPATCH(), ((GLenum)
-                                                     bswap_ENUM(pc + 0),
-                                                     (GLint) bswap_CARD32(pc +
-                                                                          4),
-                                                     pname, params));
-        (void) bswap_32_array((uint32_t *) params, compsize);
+        CALL_GetTexLevelParameterfv( GET_DISPATCH(), (
+             (GLenum  )bswap_ENUM   ( pc +  0 ),
+             (GLint   )bswap_CARD32 ( pc +  4 ),
+            pname,
+            params
+        ) );
+        (void) bswap_32_array( (uint32_t *) params, compsize );
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -2749,34 +2567,30 @@ __glXDispSwap_GetTexLevelParameterfv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDispSwap_GetTexLevelParameteriv(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GetTexLevelParameteriv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = (GLenum) bswap_ENUM(pc + 8);
+    if ( cx != NULL ) {
+        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  8 );
 
         const GLuint compsize = __glGetTexLevelParameteriv_size(pname);
         GLint answerBuffer[200];
-        GLint *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetTexLevelParameteriv(GET_DISPATCH(), ((GLenum)
-                                                     bswap_ENUM(pc + 0),
-                                                     (GLint) bswap_CARD32(pc +
-                                                                          4),
-                                                     pname, params));
-        (void) bswap_32_array((uint32_t *) params, compsize);
+        CALL_GetTexLevelParameteriv( GET_DISPATCH(), (
+             (GLenum  )bswap_ENUM   ( pc +  0 ),
+             (GLint   )bswap_CARD32 ( pc +  4 ),
+            pname,
+            params
+        ) );
+        (void) bswap_32_array( (uint32_t *) params, compsize );
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -2784,20 +2598,18 @@ __glXDispSwap_GetTexLevelParameteriv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDispSwap_IsEnabled(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_IsEnabled(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
+    if ( cx != NULL ) {
         GLboolean retval;
-
-        retval = CALL_IsEnabled(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0)
-                                ));
+        retval = CALL_IsEnabled( GET_DISPATCH(), (
+             (GLenum  )bswap_ENUM   ( pc +  0 )
+        ) );
         __glXSendReplySwap(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
         error = Success;
     }
@@ -2805,20 +2617,18 @@ __glXDispSwap_IsEnabled(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDispSwap_IsList(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_IsList(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
+    if ( cx != NULL ) {
         GLboolean retval;
-
-        retval = CALL_IsList(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0)
-                             ));
+        retval = CALL_IsList( GET_DISPATCH(), (
+             (GLuint  )bswap_CARD32 ( pc +  0 )
+        ) );
         __glXSendReplySwap(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
         error = Success;
     }
@@ -2826,262 +2636,251 @@ __glXDispSwap_IsList(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-void
-__glXDispSwap_DepthRange(GLbyte * pc)
+void __glXDispSwap_DepthRange(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 16);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 16);
         pc -= 4;
     }
 #endif
 
-    CALL_DepthRange(GET_DISPATCH(), ((GLclampd) bswap_FLOAT64(pc + 0),
-                                     (GLclampd) bswap_FLOAT64(pc + 8)
-                    ));
+    CALL_DepthRange( GET_DISPATCH(), (
+         (GLclampd)bswap_FLOAT64( pc +  0 ),
+         (GLclampd)bswap_FLOAT64( pc +  8 )
+    ) );
 }
 
-void
-__glXDispSwap_Frustum(GLbyte * pc)
+void __glXDispSwap_Frustum(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 48);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 48);
         pc -= 4;
     }
 #endif
 
-    CALL_Frustum(GET_DISPATCH(), ((GLdouble) bswap_FLOAT64(pc + 0),
-                                  (GLdouble) bswap_FLOAT64(pc + 8),
-                                  (GLdouble) bswap_FLOAT64(pc + 16),
-                                  (GLdouble) bswap_FLOAT64(pc + 24),
-                                  (GLdouble) bswap_FLOAT64(pc + 32),
-                                  (GLdouble) bswap_FLOAT64(pc + 40)
-                 ));
+    CALL_Frustum( GET_DISPATCH(), (
+         (GLdouble)bswap_FLOAT64( pc +  0 ),
+         (GLdouble)bswap_FLOAT64( pc +  8 ),
+         (GLdouble)bswap_FLOAT64( pc + 16 ),
+         (GLdouble)bswap_FLOAT64( pc + 24 ),
+         (GLdouble)bswap_FLOAT64( pc + 32 ),
+         (GLdouble)bswap_FLOAT64( pc + 40 )
+    ) );
 }
 
-void
-__glXDispSwap_LoadIdentity(GLbyte * pc)
+void __glXDispSwap_LoadIdentity(GLbyte * pc)
 {
-    CALL_LoadIdentity(GET_DISPATCH(), ());
+    CALL_LoadIdentity( GET_DISPATCH(), () );
 }
 
-void
-__glXDispSwap_LoadMatrixf(GLbyte * pc)
+void __glXDispSwap_LoadMatrixf(GLbyte * pc)
 {
-    CALL_LoadMatrixf(GET_DISPATCH(), ((const GLfloat *)
-                                      bswap_32_array((uint32_t *) (pc + 0), 16)
-                     ));
+    CALL_LoadMatrixf( GET_DISPATCH(), (
+         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  0), 16 )
+    ) );
 }
 
-void
-__glXDispSwap_LoadMatrixd(GLbyte * pc)
+void __glXDispSwap_LoadMatrixd(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 128);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 128);
         pc -= 4;
     }
 #endif
 
-    CALL_LoadMatrixd(GET_DISPATCH(), ((const GLdouble *)
-                                      bswap_64_array((uint64_t *) (pc + 0), 16)
-                     ));
+    CALL_LoadMatrixd( GET_DISPATCH(), (
+         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  0), 16 )
+    ) );
 }
 
-void
-__glXDispSwap_MatrixMode(GLbyte * pc)
+void __glXDispSwap_MatrixMode(GLbyte * pc)
 {
-    CALL_MatrixMode(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0)
-                    ));
+    CALL_MatrixMode( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 )
+    ) );
 }
 
-void
-__glXDispSwap_MultMatrixf(GLbyte * pc)
+void __glXDispSwap_MultMatrixf(GLbyte * pc)
 {
-    CALL_MultMatrixf(GET_DISPATCH(), ((const GLfloat *)
-                                      bswap_32_array((uint32_t *) (pc + 0), 16)
-                     ));
+    CALL_MultMatrixf( GET_DISPATCH(), (
+         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  0), 16 )
+    ) );
 }
 
-void
-__glXDispSwap_MultMatrixd(GLbyte * pc)
+void __glXDispSwap_MultMatrixd(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 128);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 128);
         pc -= 4;
     }
 #endif
 
-    CALL_MultMatrixd(GET_DISPATCH(), ((const GLdouble *)
-                                      bswap_64_array((uint64_t *) (pc + 0), 16)
-                     ));
+    CALL_MultMatrixd( GET_DISPATCH(), (
+         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  0), 16 )
+    ) );
 }
 
-void
-__glXDispSwap_Ortho(GLbyte * pc)
+void __glXDispSwap_Ortho(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 48);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 48);
         pc -= 4;
     }
 #endif
 
-    CALL_Ortho(GET_DISPATCH(), ((GLdouble) bswap_FLOAT64(pc + 0),
-                                (GLdouble) bswap_FLOAT64(pc + 8),
-                                (GLdouble) bswap_FLOAT64(pc + 16),
-                                (GLdouble) bswap_FLOAT64(pc + 24),
-                                (GLdouble) bswap_FLOAT64(pc + 32),
-                                (GLdouble) bswap_FLOAT64(pc + 40)
-               ));
+    CALL_Ortho( GET_DISPATCH(), (
+         (GLdouble)bswap_FLOAT64( pc +  0 ),
+         (GLdouble)bswap_FLOAT64( pc +  8 ),
+         (GLdouble)bswap_FLOAT64( pc + 16 ),
+         (GLdouble)bswap_FLOAT64( pc + 24 ),
+         (GLdouble)bswap_FLOAT64( pc + 32 ),
+         (GLdouble)bswap_FLOAT64( pc + 40 )
+    ) );
 }
 
-void
-__glXDispSwap_PopMatrix(GLbyte * pc)
+void __glXDispSwap_PopMatrix(GLbyte * pc)
 {
-    CALL_PopMatrix(GET_DISPATCH(), ());
+    CALL_PopMatrix( GET_DISPATCH(), () );
 }
 
-void
-__glXDispSwap_PushMatrix(GLbyte * pc)
+void __glXDispSwap_PushMatrix(GLbyte * pc)
 {
-    CALL_PushMatrix(GET_DISPATCH(), ());
+    CALL_PushMatrix( GET_DISPATCH(), () );
 }
 
-void
-__glXDispSwap_Rotated(GLbyte * pc)
+void __glXDispSwap_Rotated(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 32);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 32);
         pc -= 4;
     }
 #endif
 
-    CALL_Rotated(GET_DISPATCH(), ((GLdouble) bswap_FLOAT64(pc + 0),
-                                  (GLdouble) bswap_FLOAT64(pc + 8),
-                                  (GLdouble) bswap_FLOAT64(pc + 16),
-                                  (GLdouble) bswap_FLOAT64(pc + 24)
-                 ));
+    CALL_Rotated( GET_DISPATCH(), (
+         (GLdouble)bswap_FLOAT64( pc +  0 ),
+         (GLdouble)bswap_FLOAT64( pc +  8 ),
+         (GLdouble)bswap_FLOAT64( pc + 16 ),
+         (GLdouble)bswap_FLOAT64( pc + 24 )
+    ) );
 }
 
-void
-__glXDispSwap_Rotatef(GLbyte * pc)
+void __glXDispSwap_Rotatef(GLbyte * pc)
 {
-    CALL_Rotatef(GET_DISPATCH(), ((GLfloat) bswap_FLOAT32(pc + 0),
-                                  (GLfloat) bswap_FLOAT32(pc + 4),
-                                  (GLfloat) bswap_FLOAT32(pc + 8),
-                                  (GLfloat) bswap_FLOAT32(pc + 12)
-                 ));
+    CALL_Rotatef( GET_DISPATCH(), (
+         (GLfloat )bswap_FLOAT32( pc +  0 ),
+         (GLfloat )bswap_FLOAT32( pc +  4 ),
+         (GLfloat )bswap_FLOAT32( pc +  8 ),
+         (GLfloat )bswap_FLOAT32( pc + 12 )
+    ) );
 }
 
-void
-__glXDispSwap_Scaled(GLbyte * pc)
+void __glXDispSwap_Scaled(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 24);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 24);
         pc -= 4;
     }
 #endif
 
-    CALL_Scaled(GET_DISPATCH(), ((GLdouble) bswap_FLOAT64(pc + 0),
-                                 (GLdouble) bswap_FLOAT64(pc + 8),
-                                 (GLdouble) bswap_FLOAT64(pc + 16)
-                ));
+    CALL_Scaled( GET_DISPATCH(), (
+         (GLdouble)bswap_FLOAT64( pc +  0 ),
+         (GLdouble)bswap_FLOAT64( pc +  8 ),
+         (GLdouble)bswap_FLOAT64( pc + 16 )
+    ) );
 }
 
-void
-__glXDispSwap_Scalef(GLbyte * pc)
+void __glXDispSwap_Scalef(GLbyte * pc)
 {
-    CALL_Scalef(GET_DISPATCH(), ((GLfloat) bswap_FLOAT32(pc + 0),
-                                 (GLfloat) bswap_FLOAT32(pc + 4),
-                                 (GLfloat) bswap_FLOAT32(pc + 8)
-                ));
+    CALL_Scalef( GET_DISPATCH(), (
+         (GLfloat )bswap_FLOAT32( pc +  0 ),
+         (GLfloat )bswap_FLOAT32( pc +  4 ),
+         (GLfloat )bswap_FLOAT32( pc +  8 )
+    ) );
 }
 
-void
-__glXDispSwap_Translated(GLbyte * pc)
+void __glXDispSwap_Translated(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 24);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 24);
         pc -= 4;
     }
 #endif
 
-    CALL_Translated(GET_DISPATCH(), ((GLdouble) bswap_FLOAT64(pc + 0),
-                                     (GLdouble) bswap_FLOAT64(pc + 8),
-                                     (GLdouble) bswap_FLOAT64(pc + 16)
-                    ));
+    CALL_Translated( GET_DISPATCH(), (
+         (GLdouble)bswap_FLOAT64( pc +  0 ),
+         (GLdouble)bswap_FLOAT64( pc +  8 ),
+         (GLdouble)bswap_FLOAT64( pc + 16 )
+    ) );
 }
 
-void
-__glXDispSwap_Translatef(GLbyte * pc)
+void __glXDispSwap_Translatef(GLbyte * pc)
 {
-    CALL_Translatef(GET_DISPATCH(), ((GLfloat) bswap_FLOAT32(pc + 0),
-                                     (GLfloat) bswap_FLOAT32(pc + 4),
-                                     (GLfloat) bswap_FLOAT32(pc + 8)
-                    ));
+    CALL_Translatef( GET_DISPATCH(), (
+         (GLfloat )bswap_FLOAT32( pc +  0 ),
+         (GLfloat )bswap_FLOAT32( pc +  4 ),
+         (GLfloat )bswap_FLOAT32( pc +  8 )
+    ) );
 }
 
-void
-__glXDispSwap_Viewport(GLbyte * pc)
+void __glXDispSwap_Viewport(GLbyte * pc)
 {
-    CALL_Viewport(GET_DISPATCH(), ((GLint) bswap_CARD32(pc + 0),
-                                   (GLint) bswap_CARD32(pc + 4),
-                                   (GLsizei) bswap_CARD32(pc + 8),
-                                   (GLsizei) bswap_CARD32(pc + 12)
-                  ));
+    CALL_Viewport( GET_DISPATCH(), (
+         (GLint   )bswap_CARD32 ( pc +  0 ),
+         (GLint   )bswap_CARD32 ( pc +  4 ),
+         (GLsizei )bswap_CARD32 ( pc +  8 ),
+         (GLsizei )bswap_CARD32 ( pc + 12 )
+    ) );
 }
 
-void
-__glXDispSwap_BindTexture(GLbyte * pc)
+void __glXDispSwap_BindTexture(GLbyte * pc)
 {
-    CALL_BindTexture(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                      (GLuint) bswap_CARD32(pc + 4)
-                     ));
+    CALL_BindTexture( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLuint  )bswap_CARD32 ( pc +  4 )
+    ) );
 }
 
-void
-__glXDispSwap_Indexubv(GLbyte * pc)
+void __glXDispSwap_Indexubv(GLbyte * pc)
 {
-    CALL_Indexubv(GET_DISPATCH(), ((const GLubyte *) (pc + 0)
-                  ));
+    CALL_Indexubv( GET_DISPATCH(), (
+         (const GLubyte *)(pc +  0)
+    ) );
 }
 
-void
-__glXDispSwap_PolygonOffset(GLbyte * pc)
+void __glXDispSwap_PolygonOffset(GLbyte * pc)
 {
-    CALL_PolygonOffset(GET_DISPATCH(), ((GLfloat) bswap_FLOAT32(pc + 0),
-                                        (GLfloat) bswap_FLOAT32(pc + 4)
-                       ));
+    CALL_PolygonOffset( GET_DISPATCH(), (
+         (GLfloat )bswap_FLOAT32( pc +  0 ),
+         (GLfloat )bswap_FLOAT32( pc +  4 )
+    ) );
 }
 
-int
-__glXDispSwap_AreTexturesResident(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_AreTexturesResident(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLsizei n = (GLsizei) bswap_CARD32(pc + 0);
+    if ( cx != NULL ) {
+        const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  0 );
 
         GLboolean retval;
         GLboolean answerBuffer[200];
-        GLboolean *residences =
-            __glXGetAnswerBuffer(cl, n, answerBuffer, sizeof(answerBuffer), 1);
-        retval =
-            CALL_AreTexturesResident(GET_DISPATCH(),
-                                     (n,
-                                      (const GLuint *)
-                                      bswap_32_array((uint32_t *) (pc + 4), 0),
-                                      residences));
+        GLboolean * residences = __glXGetAnswerBuffer(cl, n, answerBuffer, sizeof(answerBuffer), 1);
+        retval = CALL_AreTexturesResident( GET_DISPATCH(), (
+            n,
+             (const GLuint *)bswap_32_array( (uint32_t *) (pc +  4), 0 ),
+            residences
+        ) );
         __glXSendReplySwap(cl->client, residences, n, 1, GL_TRUE, retval);
         error = Success;
     }
@@ -3089,28 +2888,24 @@ __glXDispSwap_AreTexturesResident(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDispSwap_AreTexturesResidentEXT(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_AreTexturesResidentEXT(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLsizei n = (GLsizei) bswap_CARD32(pc + 0);
+    if ( cx != NULL ) {
+        const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  0 );
 
         GLboolean retval;
         GLboolean answerBuffer[200];
-        GLboolean *residences =
-            __glXGetAnswerBuffer(cl, n, answerBuffer, sizeof(answerBuffer), 1);
-        retval =
-            CALL_AreTexturesResident(GET_DISPATCH(),
-                                     (n,
-                                      (const GLuint *)
-                                      bswap_32_array((uint32_t *) (pc + 4), 0),
-                                      residences));
+        GLboolean * residences = __glXGetAnswerBuffer(cl, n, answerBuffer, sizeof(answerBuffer), 1);
+        retval = CALL_AreTexturesResident( GET_DISPATCH(), (
+            n,
+             (const GLuint *)bswap_32_array( (uint32_t *) (pc +  4), 0 ),
+            residences
+        ) );
         __glXSendReplySwap(cl->client, residences, n, 1, GL_TRUE, retval);
         error = Success;
     }
@@ -3118,123 +2913,116 @@ __glXDispSwap_AreTexturesResidentEXT(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-void
-__glXDispSwap_CopyTexImage1D(GLbyte * pc)
+void __glXDispSwap_CopyTexImage1D(GLbyte * pc)
 {
-    CALL_CopyTexImage1D(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                         (GLint) bswap_CARD32(pc + 4),
-                                         (GLenum) bswap_ENUM(pc + 8),
-                                         (GLint) bswap_CARD32(pc + 12),
-                                         (GLint) bswap_CARD32(pc + 16),
-                                         (GLsizei) bswap_CARD32(pc + 20),
-                                         (GLint) bswap_CARD32(pc + 24)
-                        ));
+    CALL_CopyTexImage1D( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLint   )bswap_CARD32 ( pc +  4 ),
+         (GLenum  )bswap_ENUM   ( pc +  8 ),
+         (GLint   )bswap_CARD32 ( pc + 12 ),
+         (GLint   )bswap_CARD32 ( pc + 16 ),
+         (GLsizei )bswap_CARD32 ( pc + 20 ),
+         (GLint   )bswap_CARD32 ( pc + 24 )
+    ) );
 }
 
-void
-__glXDispSwap_CopyTexImage2D(GLbyte * pc)
+void __glXDispSwap_CopyTexImage2D(GLbyte * pc)
 {
-    CALL_CopyTexImage2D(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                         (GLint) bswap_CARD32(pc + 4),
-                                         (GLenum) bswap_ENUM(pc + 8),
-                                         (GLint) bswap_CARD32(pc + 12),
-                                         (GLint) bswap_CARD32(pc + 16),
-                                         (GLsizei) bswap_CARD32(pc + 20),
-                                         (GLsizei) bswap_CARD32(pc + 24),
-                                         (GLint) bswap_CARD32(pc + 28)
-                        ));
+    CALL_CopyTexImage2D( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLint   )bswap_CARD32 ( pc +  4 ),
+         (GLenum  )bswap_ENUM   ( pc +  8 ),
+         (GLint   )bswap_CARD32 ( pc + 12 ),
+         (GLint   )bswap_CARD32 ( pc + 16 ),
+         (GLsizei )bswap_CARD32 ( pc + 20 ),
+         (GLsizei )bswap_CARD32 ( pc + 24 ),
+         (GLint   )bswap_CARD32 ( pc + 28 )
+    ) );
 }
 
-void
-__glXDispSwap_CopyTexSubImage1D(GLbyte * pc)
+void __glXDispSwap_CopyTexSubImage1D(GLbyte * pc)
 {
-    CALL_CopyTexSubImage1D(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                            (GLint) bswap_CARD32(pc + 4),
-                                            (GLint) bswap_CARD32(pc + 8),
-                                            (GLint) bswap_CARD32(pc + 12),
-                                            (GLint) bswap_CARD32(pc + 16),
-                                            (GLsizei) bswap_CARD32(pc + 20)
-                           ));
+    CALL_CopyTexSubImage1D( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLint   )bswap_CARD32 ( pc +  4 ),
+         (GLint   )bswap_CARD32 ( pc +  8 ),
+         (GLint   )bswap_CARD32 ( pc + 12 ),
+         (GLint   )bswap_CARD32 ( pc + 16 ),
+         (GLsizei )bswap_CARD32 ( pc + 20 )
+    ) );
 }
 
-void
-__glXDispSwap_CopyTexSubImage2D(GLbyte * pc)
+void __glXDispSwap_CopyTexSubImage2D(GLbyte * pc)
 {
-    CALL_CopyTexSubImage2D(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                            (GLint) bswap_CARD32(pc + 4),
-                                            (GLint) bswap_CARD32(pc + 8),
-                                            (GLint) bswap_CARD32(pc + 12),
-                                            (GLint) bswap_CARD32(pc + 16),
-                                            (GLint) bswap_CARD32(pc + 20),
-                                            (GLsizei) bswap_CARD32(pc + 24),
-                                            (GLsizei) bswap_CARD32(pc + 28)
-                           ));
+    CALL_CopyTexSubImage2D( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLint   )bswap_CARD32 ( pc +  4 ),
+         (GLint   )bswap_CARD32 ( pc +  8 ),
+         (GLint   )bswap_CARD32 ( pc + 12 ),
+         (GLint   )bswap_CARD32 ( pc + 16 ),
+         (GLint   )bswap_CARD32 ( pc + 20 ),
+         (GLsizei )bswap_CARD32 ( pc + 24 ),
+         (GLsizei )bswap_CARD32 ( pc + 28 )
+    ) );
 }
 
-int
-__glXDispSwap_DeleteTextures(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_DeleteTextures(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLsizei n = (GLsizei) bswap_CARD32(pc + 0);
-
-        CALL_DeleteTextures(GET_DISPATCH(), (n,
-                                             (const GLuint *)
-                                             bswap_32_array((uint32_t *) (pc +
-                                                                          4), 0)
-                            ));
+    if ( cx != NULL ) {
+        const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  0 );
+
+        CALL_DeleteTextures( GET_DISPATCH(), (
+            n,
+             (const GLuint *)bswap_32_array( (uint32_t *) (pc +  4), 0 )
+        ) );
         error = Success;
     }
 
     return error;
 }
 
-int
-__glXDispSwap_DeleteTexturesEXT(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_DeleteTexturesEXT(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLsizei n = (GLsizei) bswap_CARD32(pc + 0);
-
-        CALL_DeleteTextures(GET_DISPATCH(), (n,
-                                             (const GLuint *)
-                                             bswap_32_array((uint32_t *) (pc +
-                                                                          4), 0)
-                            ));
+    if ( cx != NULL ) {
+        const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  0 );
+
+        CALL_DeleteTextures( GET_DISPATCH(), (
+            n,
+             (const GLuint *)bswap_32_array( (uint32_t *) (pc +  4), 0 )
+        ) );
         error = Success;
     }
 
     return error;
 }
 
-int
-__glXDispSwap_GenTextures(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GenTextures(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLsizei n = (GLsizei) bswap_CARD32(pc + 0);
+    if ( cx != NULL ) {
+        const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  0 );
 
         GLuint answerBuffer[200];
-        GLuint *textures =
-            __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer),
-                                 4);
-        CALL_GenTextures(GET_DISPATCH(), (n, textures));
-        (void) bswap_32_array((uint32_t *) textures, n);
+        GLuint * textures = __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer), 4);
+        CALL_GenTextures( GET_DISPATCH(), (
+            n,
+            textures
+        ) );
+        (void) bswap_32_array( (uint32_t *) textures, n );
         __glXSendReplySwap(cl->client, textures, n, 4, GL_TRUE, 0);
         error = Success;
     }
@@ -3242,24 +3030,23 @@ __glXDispSwap_GenTextures(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDispSwap_GenTexturesEXT(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GenTexturesEXT(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLsizei n = (GLsizei) bswap_CARD32(pc + 0);
+    if ( cx != NULL ) {
+        const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  0 );
 
         GLuint answerBuffer[200];
-        GLuint *textures =
-            __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer),
-                                 4);
-        CALL_GenTextures(GET_DISPATCH(), (n, textures));
-        (void) bswap_32_array((uint32_t *) textures, n);
+        GLuint * textures = __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer), 4);
+        CALL_GenTextures( GET_DISPATCH(), (
+            n,
+            textures
+        ) );
+        (void) bswap_32_array( (uint32_t *) textures, n );
         __glXSendReplySwap(cl->client, textures, n, 4, GL_TRUE, 0);
         error = Success;
     }
@@ -3267,20 +3054,18 @@ __glXDispSwap_GenTexturesEXT(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDispSwap_IsTexture(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_IsTexture(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
+    if ( cx != NULL ) {
         GLboolean retval;
-
-        retval = CALL_IsTexture(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0)
-                                ));
+        retval = CALL_IsTexture( GET_DISPATCH(), (
+             (GLuint  )bswap_CARD32 ( pc +  0 )
+        ) );
         __glXSendReplySwap(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
         error = Success;
     }
@@ -3288,20 +3073,18 @@ __glXDispSwap_IsTexture(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDispSwap_IsTextureEXT(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_IsTextureEXT(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
+    if ( cx != NULL ) {
         GLboolean retval;
-
-        retval = CALL_IsTexture(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0)
-                                ));
+        retval = CALL_IsTexture( GET_DISPATCH(), (
+             (GLuint  )bswap_CARD32 ( pc +  0 )
+        ) );
         __glXSendReplySwap(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
         error = Success;
     }
@@ -3309,192 +3092,166 @@ __glXDispSwap_IsTextureEXT(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-void
-__glXDispSwap_PrioritizeTextures(GLbyte * pc)
-{
-    const GLsizei n = (GLsizei) bswap_CARD32(pc + 0);
-
-    CALL_PrioritizeTextures(GET_DISPATCH(), (n,
-                                             (const GLuint *)
-                                             bswap_32_array((uint32_t *) (pc +
-                                                                          4),
-                                                            0),
-                                             (const GLclampf *)
-                                             bswap_32_array((uint32_t *) (pc +
-                                                                          4), 0)
-                            ));
-}
-
-void
-__glXDispSwap_TexSubImage1D(GLbyte * pc)
-{
-    const GLvoid *const pixels = (const GLvoid *) ((pc + 56));
-    __GLXpixelHeader *const hdr = (__GLXpixelHeader *) (pc);
-
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ROW_LENGTH,
-                      (GLint) bswap_CARD32(&hdr->rowLength)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_ROWS,
-                      (GLint) bswap_CARD32(&hdr->skipRows)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_PIXELS,
-                      (GLint) bswap_CARD32(&hdr->skipPixels)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ALIGNMENT,
-                      (GLint) bswap_CARD32(&hdr->alignment)));
-
-    CALL_TexSubImage1D(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 20),
-                                        (GLint) bswap_CARD32(pc + 24),
-                                        (GLint) bswap_CARD32(pc + 28),
-                                        (GLsizei) bswap_CARD32(pc + 36),
-                                        (GLenum) bswap_ENUM(pc + 44),
-                                        (GLenum) bswap_ENUM(pc + 48), pixels));
-}
-
-void
-__glXDispSwap_TexSubImage2D(GLbyte * pc)
-{
-    const GLvoid *const pixels = (const GLvoid *) ((pc + 56));
-    __GLXpixelHeader *const hdr = (__GLXpixelHeader *) (pc);
-
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ROW_LENGTH,
-                      (GLint) bswap_CARD32(&hdr->rowLength)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_ROWS,
-                      (GLint) bswap_CARD32(&hdr->skipRows)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_PIXELS,
-                      (GLint) bswap_CARD32(&hdr->skipPixels)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ALIGNMENT,
-                      (GLint) bswap_CARD32(&hdr->alignment)));
+void __glXDispSwap_PrioritizeTextures(GLbyte * pc)
+{
+    const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  0 );
+
+    CALL_PrioritizeTextures( GET_DISPATCH(), (
+        n,
+         (const GLuint *)bswap_32_array( (uint32_t *) (pc +  4), 0 ),
+         (const GLclampf *)bswap_32_array( (uint32_t *) (pc +  4), 0 )
+    ) );
+}
+
+void __glXDispSwap_TexSubImage1D(GLbyte * pc)
+{
+    const GLvoid * const pixels = (const GLvoid *) (pc + 56);
+    __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
+
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES,   hdr->swapBytes) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST,    hdr->lsbFirst) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,   (GLint) bswap_CARD32( & hdr->rowLength )) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,    (GLint) bswap_CARD32( & hdr->skipRows )) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,  (GLint) bswap_CARD32( & hdr->skipPixels )) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT,    (GLint) bswap_CARD32( & hdr->alignment )) );
+
+    CALL_TexSubImage1D( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc + 20 ),
+         (GLint   )bswap_CARD32 ( pc + 24 ),
+         (GLint   )bswap_CARD32 ( pc + 28 ),
+         (GLsizei )bswap_CARD32 ( pc + 36 ),
+         (GLenum  )bswap_ENUM   ( pc + 44 ),
+         (GLenum  )bswap_ENUM   ( pc + 48 ),
+        pixels
+    ) );
+}
+
+void __glXDispSwap_TexSubImage2D(GLbyte * pc)
+{
+    const GLvoid * const pixels = (const GLvoid *) (pc + 56);
+    __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
 
-    CALL_TexSubImage2D(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 20),
-                                        (GLint) bswap_CARD32(pc + 24),
-                                        (GLint) bswap_CARD32(pc + 28),
-                                        (GLint) bswap_CARD32(pc + 32),
-                                        (GLsizei) bswap_CARD32(pc + 36),
-                                        (GLsizei) bswap_CARD32(pc + 40),
-                                        (GLenum) bswap_ENUM(pc + 44),
-                                        (GLenum) bswap_ENUM(pc + 48), pixels));
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES,   hdr->swapBytes) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST,    hdr->lsbFirst) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,   (GLint) bswap_CARD32( & hdr->rowLength )) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,    (GLint) bswap_CARD32( & hdr->skipRows )) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,  (GLint) bswap_CARD32( & hdr->skipPixels )) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT,    (GLint) bswap_CARD32( & hdr->alignment )) );
+
+    CALL_TexSubImage2D( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc + 20 ),
+         (GLint   )bswap_CARD32 ( pc + 24 ),
+         (GLint   )bswap_CARD32 ( pc + 28 ),
+         (GLint   )bswap_CARD32 ( pc + 32 ),
+         (GLsizei )bswap_CARD32 ( pc + 36 ),
+         (GLsizei )bswap_CARD32 ( pc + 40 ),
+         (GLenum  )bswap_ENUM   ( pc + 44 ),
+         (GLenum  )bswap_ENUM   ( pc + 48 ),
+        pixels
+    ) );
 }
 
-void
-__glXDispSwap_BlendColor(GLbyte * pc)
+void __glXDispSwap_BlendColor(GLbyte * pc)
 {
-    CALL_BlendColor(GET_DISPATCH(), ((GLclampf) bswap_FLOAT32(pc + 0),
-                                     (GLclampf) bswap_FLOAT32(pc + 4),
-                                     (GLclampf) bswap_FLOAT32(pc + 8),
-                                     (GLclampf) bswap_FLOAT32(pc + 12)
-                    ));
+    CALL_BlendColor( GET_DISPATCH(), (
+         (GLclampf)bswap_FLOAT32( pc +  0 ),
+         (GLclampf)bswap_FLOAT32( pc +  4 ),
+         (GLclampf)bswap_FLOAT32( pc +  8 ),
+         (GLclampf)bswap_FLOAT32( pc + 12 )
+    ) );
 }
 
-void
-__glXDispSwap_BlendEquation(GLbyte * pc)
+void __glXDispSwap_BlendEquation(GLbyte * pc)
 {
-    CALL_BlendEquation(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0)
-                       ));
+    CALL_BlendEquation( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 )
+    ) );
 }
 
-void
-__glXDispSwap_ColorTable(GLbyte * pc)
+void __glXDispSwap_ColorTable(GLbyte * pc)
 {
-    const GLvoid *const table = (const GLvoid *) ((pc + 40));
-    __GLXpixelHeader *const hdr = (__GLXpixelHeader *) (pc);
+    const GLvoid * const table = (const GLvoid *) (pc + 40);
+    __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ROW_LENGTH,
-                      (GLint) bswap_CARD32(&hdr->rowLength)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_ROWS,
-                      (GLint) bswap_CARD32(&hdr->skipRows)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_PIXELS,
-                      (GLint) bswap_CARD32(&hdr->skipPixels)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ALIGNMENT,
-                      (GLint) bswap_CARD32(&hdr->alignment)));
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES,   hdr->swapBytes) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST,    hdr->lsbFirst) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,   (GLint) bswap_CARD32( & hdr->rowLength )) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,    (GLint) bswap_CARD32( & hdr->skipRows )) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,  (GLint) bswap_CARD32( & hdr->skipPixels )) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT,    (GLint) bswap_CARD32( & hdr->alignment )) );
 
-    CALL_ColorTable(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 20),
-                                     (GLenum) bswap_ENUM(pc + 24),
-                                     (GLsizei) bswap_CARD32(pc + 28),
-                                     (GLenum) bswap_ENUM(pc + 32),
-                                     (GLenum) bswap_ENUM(pc + 36), table));
-}
-
-void
-__glXDispSwap_ColorTableParameterfv(GLbyte * pc)
-{
-    const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
-    const GLfloat *params;
-
-    params =
-        (const GLfloat *) bswap_32_array((uint32_t *) (pc + 8),
-                                         __glColorTableParameterfv_size(pname));
+    CALL_ColorTable( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc + 20 ),
+         (GLenum  )bswap_ENUM   ( pc + 24 ),
+         (GLsizei )bswap_CARD32 ( pc + 28 ),
+         (GLenum  )bswap_ENUM   ( pc + 32 ),
+         (GLenum  )bswap_ENUM   ( pc + 36 ),
+        table
+    ) );
+}
 
-    CALL_ColorTableParameterfv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                                pname, params));
+void __glXDispSwap_ColorTableParameterfv(GLbyte * pc)
+{
+    const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
+    const GLfloat * params;
+
+    params = (const GLfloat *) bswap_32_array( (uint32_t *) (pc + 8), __glColorTableParameterfv_size(pname) );
+
+    CALL_ColorTableParameterfv( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+        pname,
+        params
+    ) );
 }
 
-void
-__glXDispSwap_ColorTableParameteriv(GLbyte * pc)
+void __glXDispSwap_ColorTableParameteriv(GLbyte * pc)
 {
-    const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
-    const GLint *params;
+    const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
+    const GLint * params;
 
-    params =
-        (const GLint *) bswap_32_array((uint32_t *) (pc + 8),
-                                       __glColorTableParameteriv_size(pname));
+    params = (const GLint *) bswap_32_array( (uint32_t *) (pc + 8), __glColorTableParameteriv_size(pname) );
 
-    CALL_ColorTableParameteriv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                                pname, params));
+    CALL_ColorTableParameteriv( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+        pname,
+        params
+    ) );
 }
 
-void
-__glXDispSwap_CopyColorTable(GLbyte * pc)
+void __glXDispSwap_CopyColorTable(GLbyte * pc)
 {
-    CALL_CopyColorTable(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                         (GLenum) bswap_ENUM(pc + 4),
-                                         (GLint) bswap_CARD32(pc + 8),
-                                         (GLint) bswap_CARD32(pc + 12),
-                                         (GLsizei) bswap_CARD32(pc + 16)
-                        ));
+    CALL_CopyColorTable( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLenum  )bswap_ENUM   ( pc +  4 ),
+         (GLint   )bswap_CARD32 ( pc +  8 ),
+         (GLint   )bswap_CARD32 ( pc + 12 ),
+         (GLsizei )bswap_CARD32 ( pc + 16 )
+    ) );
 }
 
-int
-__glXDispSwap_GetColorTableParameterfv(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GetColorTableParameterfv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
 
         const GLuint compsize = __glGetColorTableParameterfv_size(pname);
         GLfloat answerBuffer[200];
-        GLfloat *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetColorTableParameterfv(GET_DISPATCH(), ((GLenum)
-                                                       bswap_ENUM(pc + 0),
-                                                       pname, params));
-        (void) bswap_32_array((uint32_t *) params, compsize);
+        CALL_GetColorTableParameterfv( GET_DISPATCH(), (
+             (GLenum  )bswap_ENUM   ( pc +  0 ),
+            pname,
+            params
+        ) );
+        (void) bswap_32_array( (uint32_t *) params, compsize );
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -3502,32 +3259,29 @@ __glXDispSwap_GetColorTableParameterfv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDispSwap_GetColorTableParameterfvSGI(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GetColorTableParameterfvSGI(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
 
         const GLuint compsize = __glGetColorTableParameterfv_size(pname);
         GLfloat answerBuffer[200];
-        GLfloat *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetColorTableParameterfv(GET_DISPATCH(), ((GLenum)
-                                                       bswap_ENUM(pc + 0),
-                                                       pname, params));
-        (void) bswap_32_array((uint32_t *) params, compsize);
+        CALL_GetColorTableParameterfv( GET_DISPATCH(), (
+             (GLenum  )bswap_ENUM   ( pc +  0 ),
+            pname,
+            params
+        ) );
+        (void) bswap_32_array( (uint32_t *) params, compsize );
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -3535,32 +3289,29 @@ __glXDispSwap_GetColorTableParameterfvSGI(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDispSwap_GetColorTableParameteriv(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GetColorTableParameteriv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
 
         const GLuint compsize = __glGetColorTableParameteriv_size(pname);
         GLint answerBuffer[200];
-        GLint *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetColorTableParameteriv(GET_DISPATCH(), ((GLenum)
-                                                       bswap_ENUM(pc + 0),
-                                                       pname, params));
-        (void) bswap_32_array((uint32_t *) params, compsize);
+        CALL_GetColorTableParameteriv( GET_DISPATCH(), (
+             (GLenum  )bswap_ENUM   ( pc +  0 ),
+            pname,
+            params
+        ) );
+        (void) bswap_32_array( (uint32_t *) params, compsize );
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -3568,32 +3319,29 @@ __glXDispSwap_GetColorTableParameteriv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDispSwap_GetColorTableParameterivSGI(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GetColorTableParameterivSGI(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
 
         const GLuint compsize = __glGetColorTableParameteriv_size(pname);
         GLint answerBuffer[200];
-        GLint *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetColorTableParameteriv(GET_DISPATCH(), ((GLenum)
-                                                       bswap_ENUM(pc + 0),
-                                                       pname, params));
-        (void) bswap_32_array((uint32_t *) params, compsize);
+        CALL_GetColorTableParameteriv( GET_DISPATCH(), (
+             (GLenum  )bswap_ENUM   ( pc +  0 ),
+            pname,
+            params
+        ) );
+        (void) bswap_32_array( (uint32_t *) params, compsize );
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -3601,203 +3349,176 @@ __glXDispSwap_GetColorTableParameterivSGI(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-void
-__glXDispSwap_ColorSubTable(GLbyte * pc)
-{
-    const GLvoid *const data = (const GLvoid *) ((pc + 40));
-    __GLXpixelHeader *const hdr = (__GLXpixelHeader *) (pc);
-
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ROW_LENGTH,
-                      (GLint) bswap_CARD32(&hdr->rowLength)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_ROWS,
-                      (GLint) bswap_CARD32(&hdr->skipRows)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_PIXELS,
-                      (GLint) bswap_CARD32(&hdr->skipPixels)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ALIGNMENT,
-                      (GLint) bswap_CARD32(&hdr->alignment)));
-
-    CALL_ColorSubTable(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 20),
-                                        (GLsizei) bswap_CARD32(pc + 24),
-                                        (GLsizei) bswap_CARD32(pc + 28),
-                                        (GLenum) bswap_ENUM(pc + 32),
-                                        (GLenum) bswap_ENUM(pc + 36), data));
-}
-
-void
-__glXDispSwap_CopyColorSubTable(GLbyte * pc)
-{
-    CALL_CopyColorSubTable(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                            (GLsizei) bswap_CARD32(pc + 4),
-                                            (GLint) bswap_CARD32(pc + 8),
-                                            (GLint) bswap_CARD32(pc + 12),
-                                            (GLsizei) bswap_CARD32(pc + 16)
-                           ));
-}
-
-void
-__glXDispSwap_ConvolutionFilter1D(GLbyte * pc)
-{
-    const GLvoid *const image = (const GLvoid *) ((pc + 44));
-    __GLXpixelHeader *const hdr = (__GLXpixelHeader *) (pc);
+void __glXDispSwap_ColorSubTable(GLbyte * pc)
+{
+    const GLvoid * const data = (const GLvoid *) (pc + 40);
+    __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ROW_LENGTH,
-                      (GLint) bswap_CARD32(&hdr->rowLength)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_ROWS,
-                      (GLint) bswap_CARD32(&hdr->skipRows)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_PIXELS,
-                      (GLint) bswap_CARD32(&hdr->skipPixels)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ALIGNMENT,
-                      (GLint) bswap_CARD32(&hdr->alignment)));
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES,   hdr->swapBytes) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST,    hdr->lsbFirst) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,   (GLint) bswap_CARD32( & hdr->rowLength )) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,    (GLint) bswap_CARD32( & hdr->skipRows )) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,  (GLint) bswap_CARD32( & hdr->skipPixels )) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT,    (GLint) bswap_CARD32( & hdr->alignment )) );
 
-    CALL_ConvolutionFilter1D(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 20),
-                                              (GLenum) bswap_ENUM(pc + 24),
-                                              (GLsizei) bswap_CARD32(pc + 28),
-                                              (GLenum) bswap_ENUM(pc + 36),
-                                              (GLenum) bswap_ENUM(pc + 40),
-                                              image));
-}
-
-void
-__glXDispSwap_ConvolutionFilter2D(GLbyte * pc)
-{
-    const GLvoid *const image = (const GLvoid *) ((pc + 44));
-    __GLXpixelHeader *const hdr = (__GLXpixelHeader *) (pc);
-
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ROW_LENGTH,
-                      (GLint) bswap_CARD32(&hdr->rowLength)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_ROWS,
-                      (GLint) bswap_CARD32(&hdr->skipRows)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_PIXELS,
-                      (GLint) bswap_CARD32(&hdr->skipPixels)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ALIGNMENT,
-                      (GLint) bswap_CARD32(&hdr->alignment)));
-
-    CALL_ConvolutionFilter2D(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 20),
-                                              (GLenum) bswap_ENUM(pc + 24),
-                                              (GLsizei) bswap_CARD32(pc + 28),
-                                              (GLsizei) bswap_CARD32(pc + 32),
-                                              (GLenum) bswap_ENUM(pc + 36),
-                                              (GLenum) bswap_ENUM(pc + 40),
-                                              image));
-}
-
-void
-__glXDispSwap_ConvolutionParameterf(GLbyte * pc)
-{
-    CALL_ConvolutionParameterf(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                                (GLenum) bswap_ENUM(pc + 4),
-                                                (GLfloat) bswap_FLOAT32(pc + 8)
-                               ));
-}
-
-void
-__glXDispSwap_ConvolutionParameterfv(GLbyte * pc)
-{
-    const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
-    const GLfloat *params;
-
-    params =
-        (const GLfloat *) bswap_32_array((uint32_t *) (pc + 8),
-                                         __glConvolutionParameterfv_size
-                                         (pname));
+    CALL_ColorSubTable( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc + 20 ),
+         (GLsizei )bswap_CARD32 ( pc + 24 ),
+         (GLsizei )bswap_CARD32 ( pc + 28 ),
+         (GLenum  )bswap_ENUM   ( pc + 32 ),
+         (GLenum  )bswap_ENUM   ( pc + 36 ),
+        data
+    ) );
+}
+
+void __glXDispSwap_CopyColorSubTable(GLbyte * pc)
+{
+    CALL_CopyColorSubTable( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLsizei )bswap_CARD32 ( pc +  4 ),
+         (GLint   )bswap_CARD32 ( pc +  8 ),
+         (GLint   )bswap_CARD32 ( pc + 12 ),
+         (GLsizei )bswap_CARD32 ( pc + 16 )
+    ) );
+}
+
+void __glXDispSwap_ConvolutionFilter1D(GLbyte * pc)
+{
+    const GLvoid * const image = (const GLvoid *) (pc + 44);
+    __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
+
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES,   hdr->swapBytes) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST,    hdr->lsbFirst) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,   (GLint) bswap_CARD32( & hdr->rowLength )) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,    (GLint) bswap_CARD32( & hdr->skipRows )) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,  (GLint) bswap_CARD32( & hdr->skipPixels )) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT,    (GLint) bswap_CARD32( & hdr->alignment )) );
+
+    CALL_ConvolutionFilter1D( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc + 20 ),
+         (GLenum  )bswap_ENUM   ( pc + 24 ),
+         (GLsizei )bswap_CARD32 ( pc + 28 ),
+         (GLenum  )bswap_ENUM   ( pc + 36 ),
+         (GLenum  )bswap_ENUM   ( pc + 40 ),
+        image
+    ) );
+}
+
+void __glXDispSwap_ConvolutionFilter2D(GLbyte * pc)
+{
+    const GLvoid * const image = (const GLvoid *) (pc + 44);
+    __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
+
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES,   hdr->swapBytes) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST,    hdr->lsbFirst) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,   (GLint) bswap_CARD32( & hdr->rowLength )) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,    (GLint) bswap_CARD32( & hdr->skipRows )) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,  (GLint) bswap_CARD32( & hdr->skipPixels )) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT,    (GLint) bswap_CARD32( & hdr->alignment )) );
+
+    CALL_ConvolutionFilter2D( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc + 20 ),
+         (GLenum  )bswap_ENUM   ( pc + 24 ),
+         (GLsizei )bswap_CARD32 ( pc + 28 ),
+         (GLsizei )bswap_CARD32 ( pc + 32 ),
+         (GLenum  )bswap_ENUM   ( pc + 36 ),
+         (GLenum  )bswap_ENUM   ( pc + 40 ),
+        image
+    ) );
+}
+
+void __glXDispSwap_ConvolutionParameterf(GLbyte * pc)
+{
+    CALL_ConvolutionParameterf( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLenum  )bswap_ENUM   ( pc +  4 ),
+         (GLfloat )bswap_FLOAT32( pc +  8 )
+    ) );
+}
+
+void __glXDispSwap_ConvolutionParameterfv(GLbyte * pc)
+{
+    const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
+    const GLfloat * params;
+
+    params = (const GLfloat *) bswap_32_array( (uint32_t *) (pc + 8), __glConvolutionParameterfv_size(pname) );
 
-    CALL_ConvolutionParameterfv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                                 pname, params));
+    CALL_ConvolutionParameterfv( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+        pname,
+        params
+    ) );
 }
 
-void
-__glXDispSwap_ConvolutionParameteri(GLbyte * pc)
+void __glXDispSwap_ConvolutionParameteri(GLbyte * pc)
 {
-    CALL_ConvolutionParameteri(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                                (GLenum) bswap_ENUM(pc + 4),
-                                                (GLint) bswap_CARD32(pc + 8)
-                               ));
+    CALL_ConvolutionParameteri( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLenum  )bswap_ENUM   ( pc +  4 ),
+         (GLint   )bswap_CARD32 ( pc +  8 )
+    ) );
 }
 
-void
-__glXDispSwap_ConvolutionParameteriv(GLbyte * pc)
+void __glXDispSwap_ConvolutionParameteriv(GLbyte * pc)
 {
-    const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
-    const GLint *params;
+    const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
+    const GLint * params;
 
-    params =
-        (const GLint *) bswap_32_array((uint32_t *) (pc + 8),
-                                       __glConvolutionParameteriv_size(pname));
+    params = (const GLint *) bswap_32_array( (uint32_t *) (pc + 8), __glConvolutionParameteriv_size(pname) );
 
-    CALL_ConvolutionParameteriv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                                 pname, params));
-}
+    CALL_ConvolutionParameteriv( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+        pname,
+        params
+    ) );
+}
 
-void
-__glXDispSwap_CopyConvolutionFilter1D(GLbyte * pc)
-{
-    CALL_CopyConvolutionFilter1D(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                                  (GLenum) bswap_ENUM(pc + 4),
-                                                  (GLint) bswap_CARD32(pc + 8),
-                                                  (GLint) bswap_CARD32(pc + 12),
-                                                  (GLsizei) bswap_CARD32(pc +
-                                                                         16)
-                                 ));
+void __glXDispSwap_CopyConvolutionFilter1D(GLbyte * pc)
+{
+    CALL_CopyConvolutionFilter1D( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLenum  )bswap_ENUM   ( pc +  4 ),
+         (GLint   )bswap_CARD32 ( pc +  8 ),
+         (GLint   )bswap_CARD32 ( pc + 12 ),
+         (GLsizei )bswap_CARD32 ( pc + 16 )
+    ) );
 }
 
-void
-__glXDispSwap_CopyConvolutionFilter2D(GLbyte * pc)
+void __glXDispSwap_CopyConvolutionFilter2D(GLbyte * pc)
 {
-    CALL_CopyConvolutionFilter2D(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                                  (GLenum) bswap_ENUM(pc + 4),
-                                                  (GLint) bswap_CARD32(pc + 8),
-                                                  (GLint) bswap_CARD32(pc + 12),
-                                                  (GLsizei) bswap_CARD32(pc +
-                                                                         16),
-                                                  (GLsizei) bswap_CARD32(pc +
-                                                                         20)
-                                 ));
+    CALL_CopyConvolutionFilter2D( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLenum  )bswap_ENUM   ( pc +  4 ),
+         (GLint   )bswap_CARD32 ( pc +  8 ),
+         (GLint   )bswap_CARD32 ( pc + 12 ),
+         (GLsizei )bswap_CARD32 ( pc + 16 ),
+         (GLsizei )bswap_CARD32 ( pc + 20 )
+    ) );
 }
 
-int
-__glXDispSwap_GetConvolutionParameterfv(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GetConvolutionParameterfv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
 
         const GLuint compsize = __glGetConvolutionParameterfv_size(pname);
         GLfloat answerBuffer[200];
-        GLfloat *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetConvolutionParameterfv(GET_DISPATCH(), ((GLenum)
-                                                        bswap_ENUM(pc + 0),
-                                                        pname, params));
-        (void) bswap_32_array((uint32_t *) params, compsize);
+        CALL_GetConvolutionParameterfv( GET_DISPATCH(), (
+             (GLenum  )bswap_ENUM   ( pc +  0 ),
+            pname,
+            params
+        ) );
+        (void) bswap_32_array( (uint32_t *) params, compsize );
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -3805,32 +3526,29 @@ __glXDispSwap_GetConvolutionParameterfv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDispSwap_GetConvolutionParameterfvEXT(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GetConvolutionParameterfvEXT(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
 
         const GLuint compsize = __glGetConvolutionParameterfv_size(pname);
         GLfloat answerBuffer[200];
-        GLfloat *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetConvolutionParameterfv(GET_DISPATCH(), ((GLenum)
-                                                        bswap_ENUM(pc + 0),
-                                                        pname, params));
-        (void) bswap_32_array((uint32_t *) params, compsize);
+        CALL_GetConvolutionParameterfv( GET_DISPATCH(), (
+             (GLenum  )bswap_ENUM   ( pc +  0 ),
+            pname,
+            params
+        ) );
+        (void) bswap_32_array( (uint32_t *) params, compsize );
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -3838,32 +3556,29 @@ __glXDispSwap_GetConvolutionParameterfvEXT(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDispSwap_GetConvolutionParameteriv(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GetConvolutionParameteriv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
 
         const GLuint compsize = __glGetConvolutionParameteriv_size(pname);
         GLint answerBuffer[200];
-        GLint *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetConvolutionParameteriv(GET_DISPATCH(), ((GLenum)
-                                                        bswap_ENUM(pc + 0),
-                                                        pname, params));
-        (void) bswap_32_array((uint32_t *) params, compsize);
+        CALL_GetConvolutionParameteriv( GET_DISPATCH(), (
+             (GLenum  )bswap_ENUM   ( pc +  0 ),
+            pname,
+            params
+        ) );
+        (void) bswap_32_array( (uint32_t *) params, compsize );
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -3871,32 +3586,29 @@ __glXDispSwap_GetConvolutionParameteriv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDispSwap_GetConvolutionParameterivEXT(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GetConvolutionParameterivEXT(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
 
         const GLuint compsize = __glGetConvolutionParameteriv_size(pname);
         GLint answerBuffer[200];
-        GLint *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetConvolutionParameteriv(GET_DISPATCH(), ((GLenum)
-                                                        bswap_ENUM(pc + 0),
-                                                        pname, params));
-        (void) bswap_32_array((uint32_t *) params, compsize);
+        CALL_GetConvolutionParameteriv( GET_DISPATCH(), (
+             (GLenum  )bswap_ENUM   ( pc +  0 ),
+            pname,
+            params
+        ) );
+        (void) bswap_32_array( (uint32_t *) params, compsize );
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -3904,32 +3616,29 @@ __glXDispSwap_GetConvolutionParameterivEXT(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDispSwap_GetHistogramParameterfv(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GetHistogramParameterfv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
 
         const GLuint compsize = __glGetHistogramParameterfv_size(pname);
         GLfloat answerBuffer[200];
-        GLfloat *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetHistogramParameterfv(GET_DISPATCH(), ((GLenum)
-                                                      bswap_ENUM(pc + 0), pname,
-                                                      params));
-        (void) bswap_32_array((uint32_t *) params, compsize);
+        CALL_GetHistogramParameterfv( GET_DISPATCH(), (
+             (GLenum  )bswap_ENUM   ( pc +  0 ),
+            pname,
+            params
+        ) );
+        (void) bswap_32_array( (uint32_t *) params, compsize );
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -3937,32 +3646,29 @@ __glXDispSwap_GetHistogramParameterfv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDispSwap_GetHistogramParameterfvEXT(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GetHistogramParameterfvEXT(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
 
         const GLuint compsize = __glGetHistogramParameterfv_size(pname);
         GLfloat answerBuffer[200];
-        GLfloat *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetHistogramParameterfv(GET_DISPATCH(), ((GLenum)
-                                                      bswap_ENUM(pc + 0), pname,
-                                                      params));
-        (void) bswap_32_array((uint32_t *) params, compsize);
+        CALL_GetHistogramParameterfv( GET_DISPATCH(), (
+             (GLenum  )bswap_ENUM   ( pc +  0 ),
+            pname,
+            params
+        ) );
+        (void) bswap_32_array( (uint32_t *) params, compsize );
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -3970,32 +3676,29 @@ __glXDispSwap_GetHistogramParameterfvEXT(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDispSwap_GetHistogramParameteriv(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GetHistogramParameteriv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
 
         const GLuint compsize = __glGetHistogramParameteriv_size(pname);
         GLint answerBuffer[200];
-        GLint *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetHistogramParameteriv(GET_DISPATCH(), ((GLenum)
-                                                      bswap_ENUM(pc + 0), pname,
-                                                      params));
-        (void) bswap_32_array((uint32_t *) params, compsize);
+        CALL_GetHistogramParameteriv( GET_DISPATCH(), (
+             (GLenum  )bswap_ENUM   ( pc +  0 ),
+            pname,
+            params
+        ) );
+        (void) bswap_32_array( (uint32_t *) params, compsize );
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -4003,32 +3706,29 @@ __glXDispSwap_GetHistogramParameteriv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDispSwap_GetHistogramParameterivEXT(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GetHistogramParameterivEXT(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
 
         const GLuint compsize = __glGetHistogramParameteriv_size(pname);
         GLint answerBuffer[200];
-        GLint *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetHistogramParameteriv(GET_DISPATCH(), ((GLenum)
-                                                      bswap_ENUM(pc + 0), pname,
-                                                      params));
-        (void) bswap_32_array((uint32_t *) params, compsize);
+        CALL_GetHistogramParameteriv( GET_DISPATCH(), (
+             (GLenum  )bswap_ENUM   ( pc +  0 ),
+            pname,
+            params
+        ) );
+        (void) bswap_32_array( (uint32_t *) params, compsize );
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -4036,31 +3736,29 @@ __glXDispSwap_GetHistogramParameterivEXT(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDispSwap_GetMinmaxParameterfv(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GetMinmaxParameterfv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
 
         const GLuint compsize = __glGetMinmaxParameterfv_size(pname);
         GLfloat answerBuffer[200];
-        GLfloat *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetMinmaxParameterfv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                                   pname, params));
-        (void) bswap_32_array((uint32_t *) params, compsize);
+        CALL_GetMinmaxParameterfv( GET_DISPATCH(), (
+             (GLenum  )bswap_ENUM   ( pc +  0 ),
+            pname,
+            params
+        ) );
+        (void) bswap_32_array( (uint32_t *) params, compsize );
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -4068,31 +3766,29 @@ __glXDispSwap_GetMinmaxParameterfv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDispSwap_GetMinmaxParameterfvEXT(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GetMinmaxParameterfvEXT(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
 
         const GLuint compsize = __glGetMinmaxParameterfv_size(pname);
         GLfloat answerBuffer[200];
-        GLfloat *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetMinmaxParameterfv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                                   pname, params));
-        (void) bswap_32_array((uint32_t *) params, compsize);
+        CALL_GetMinmaxParameterfv( GET_DISPATCH(), (
+             (GLenum  )bswap_ENUM   ( pc +  0 ),
+            pname,
+            params
+        ) );
+        (void) bswap_32_array( (uint32_t *) params, compsize );
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -4100,31 +3796,29 @@ __glXDispSwap_GetMinmaxParameterfvEXT(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDispSwap_GetMinmaxParameteriv(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GetMinmaxParameteriv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
 
         const GLuint compsize = __glGetMinmaxParameteriv_size(pname);
         GLint answerBuffer[200];
-        GLint *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetMinmaxParameteriv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                                   pname, params));
-        (void) bswap_32_array((uint32_t *) params, compsize);
+        CALL_GetMinmaxParameteriv( GET_DISPATCH(), (
+             (GLenum  )bswap_ENUM   ( pc +  0 ),
+            pname,
+            params
+        ) );
+        (void) bswap_32_array( (uint32_t *) params, compsize );
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -4132,31 +3826,29 @@ __glXDispSwap_GetMinmaxParameteriv(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDispSwap_GetMinmaxParameterivEXT(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GetMinmaxParameterivEXT(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
 
         const GLuint compsize = __glGetMinmaxParameteriv_size(pname);
         GLint answerBuffer[200];
-        GLint *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetMinmaxParameteriv(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                                   pname, params));
-        (void) bswap_32_array((uint32_t *) params, compsize);
+        CALL_GetMinmaxParameteriv( GET_DISPATCH(), (
+             (GLenum  )bswap_ENUM   ( pc +  0 ),
+            pname,
+            params
+        ) );
+        (void) bswap_32_array( (uint32_t *) params, compsize );
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -4164,605 +3856,593 @@ __glXDispSwap_GetMinmaxParameterivEXT(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-void
-__glXDispSwap_Histogram(GLbyte * pc)
-{
-    CALL_Histogram(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                    (GLsizei) bswap_CARD32(pc + 4),
-                                    (GLenum) bswap_ENUM(pc + 8),
-                                    *(GLboolean *) (pc + 12)
-                   ));
-}
-
-void
-__glXDispSwap_Minmax(GLbyte * pc)
-{
-    CALL_Minmax(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                 (GLenum) bswap_ENUM(pc + 4),
-                                 *(GLboolean *) (pc + 8)
-                ));
-}
-
-void
-__glXDispSwap_ResetHistogram(GLbyte * pc)
-{
-    CALL_ResetHistogram(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0)
-                        ));
-}
-
-void
-__glXDispSwap_ResetMinmax(GLbyte * pc)
-{
-    CALL_ResetMinmax(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0)
-                     ));
-}
-
-void
-__glXDispSwap_TexImage3D(GLbyte * pc)
-{
-    const CARD32 ptr_is_null = *(CARD32 *) (pc + 76);
-    const GLvoid *const pixels =
-        (const GLvoid *) ((ptr_is_null != 0) ? NULL : (pc + 80));
-    __GLXpixel3DHeader *const hdr = (__GLXpixel3DHeader *) (pc);
-
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ROW_LENGTH,
-                      (GLint) bswap_CARD32(&hdr->rowLength)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_IMAGE_HEIGHT,
-                      (GLint) bswap_CARD32(&hdr->imageHeight)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_ROWS,
-                      (GLint) bswap_CARD32(&hdr->skipRows)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_IMAGES,
-                      (GLint) bswap_CARD32(&hdr->skipImages)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_PIXELS,
-                      (GLint) bswap_CARD32(&hdr->skipPixels)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ALIGNMENT,
-                      (GLint) bswap_CARD32(&hdr->alignment)));
-
-    CALL_TexImage3D(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 36),
-                                     (GLint) bswap_CARD32(pc + 40),
-                                     (GLint) bswap_CARD32(pc + 44),
-                                     (GLsizei) bswap_CARD32(pc + 48),
-                                     (GLsizei) bswap_CARD32(pc + 52),
-                                     (GLsizei) bswap_CARD32(pc + 56),
-                                     (GLint) bswap_CARD32(pc + 64),
-                                     (GLenum) bswap_ENUM(pc + 68),
-                                     (GLenum) bswap_ENUM(pc + 72), pixels));
-}
-
-void
-__glXDispSwap_TexSubImage3D(GLbyte * pc)
-{
-    const GLvoid *const pixels = (const GLvoid *) ((pc + 88));
-    __GLXpixel3DHeader *const hdr = (__GLXpixel3DHeader *) (pc);
-
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ROW_LENGTH,
-                      (GLint) bswap_CARD32(&hdr->rowLength)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_IMAGE_HEIGHT,
-                      (GLint) bswap_CARD32(&hdr->imageHeight)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_ROWS,
-                      (GLint) bswap_CARD32(&hdr->skipRows)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_IMAGES,
-                      (GLint) bswap_CARD32(&hdr->skipImages)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_SKIP_PIXELS,
-                      (GLint) bswap_CARD32(&hdr->skipPixels)));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_ALIGNMENT,
-                      (GLint) bswap_CARD32(&hdr->alignment)));
-
-    CALL_TexSubImage3D(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 36),
-                                        (GLint) bswap_CARD32(pc + 40),
-                                        (GLint) bswap_CARD32(pc + 44),
-                                        (GLint) bswap_CARD32(pc + 48),
-                                        (GLint) bswap_CARD32(pc + 52),
-                                        (GLsizei) bswap_CARD32(pc + 60),
-                                        (GLsizei) bswap_CARD32(pc + 64),
-                                        (GLsizei) bswap_CARD32(pc + 68),
-                                        (GLenum) bswap_ENUM(pc + 76),
-                                        (GLenum) bswap_ENUM(pc + 80), pixels));
-}
-
-void
-__glXDispSwap_CopyTexSubImage3D(GLbyte * pc)
-{
-    CALL_CopyTexSubImage3D(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                            (GLint) bswap_CARD32(pc + 4),
-                                            (GLint) bswap_CARD32(pc + 8),
-                                            (GLint) bswap_CARD32(pc + 12),
-                                            (GLint) bswap_CARD32(pc + 16),
-                                            (GLint) bswap_CARD32(pc + 20),
-                                            (GLint) bswap_CARD32(pc + 24),
-                                            (GLsizei) bswap_CARD32(pc + 28),
-                                            (GLsizei) bswap_CARD32(pc + 32)
-                           ));
-}
-
-void
-__glXDispSwap_ActiveTextureARB(GLbyte * pc)
-{
-    CALL_ActiveTextureARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0)
-                          ));
-}
-
-void
-__glXDispSwap_MultiTexCoord1dvARB(GLbyte * pc)
+void __glXDispSwap_Histogram(GLbyte * pc)
+{
+    CALL_Histogram( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLsizei )bswap_CARD32 ( pc +  4 ),
+         (GLenum  )bswap_ENUM   ( pc +  8 ),
+        *(GLboolean *)(pc + 12)
+    ) );
+}
+
+void __glXDispSwap_Minmax(GLbyte * pc)
+{
+    CALL_Minmax( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLenum  )bswap_ENUM   ( pc +  4 ),
+        *(GLboolean *)(pc +  8)
+    ) );
+}
+
+void __glXDispSwap_ResetHistogram(GLbyte * pc)
+{
+    CALL_ResetHistogram( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 )
+    ) );
+}
+
+void __glXDispSwap_ResetMinmax(GLbyte * pc)
+{
+    CALL_ResetMinmax( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 )
+    ) );
+}
+
+void __glXDispSwap_TexImage3D(GLbyte * pc)
+{
+    const CARD32 ptr_is_null = *(CARD32 *)(pc + 76);
+    const GLvoid * const pixels = (const GLvoid *) ((ptr_is_null != 0) ? NULL : (pc + 80));
+    __GLXpixel3DHeader * const hdr = (__GLXpixel3DHeader *)(pc);
+
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES,   hdr->swapBytes) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST,    hdr->lsbFirst) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,   (GLint) bswap_CARD32( & hdr->rowLength )) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_IMAGE_HEIGHT, (GLint) bswap_CARD32( & hdr->imageHeight )) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,    (GLint) bswap_CARD32( & hdr->skipRows )) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_IMAGES,  (GLint) bswap_CARD32( & hdr->skipImages )) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,  (GLint) bswap_CARD32( & hdr->skipPixels )) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT,    (GLint) bswap_CARD32( & hdr->alignment )) );
+
+    CALL_TexImage3D( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc + 36 ),
+         (GLint   )bswap_CARD32 ( pc + 40 ),
+         (GLint   )bswap_CARD32 ( pc + 44 ),
+         (GLsizei )bswap_CARD32 ( pc + 48 ),
+         (GLsizei )bswap_CARD32 ( pc + 52 ),
+         (GLsizei )bswap_CARD32 ( pc + 56 ),
+         (GLint   )bswap_CARD32 ( pc + 64 ),
+         (GLenum  )bswap_ENUM   ( pc + 68 ),
+         (GLenum  )bswap_ENUM   ( pc + 72 ),
+        pixels
+    ) );
+}
+
+void __glXDispSwap_TexSubImage3D(GLbyte * pc)
+{
+    const GLvoid * const pixels = (const GLvoid *) (pc + 88);
+    __GLXpixel3DHeader * const hdr = (__GLXpixel3DHeader *)(pc);
+
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES,   hdr->swapBytes) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST,    hdr->lsbFirst) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,   (GLint) bswap_CARD32( & hdr->rowLength )) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_IMAGE_HEIGHT, (GLint) bswap_CARD32( & hdr->imageHeight )) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,    (GLint) bswap_CARD32( & hdr->skipRows )) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_IMAGES,  (GLint) bswap_CARD32( & hdr->skipImages )) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,  (GLint) bswap_CARD32( & hdr->skipPixels )) );
+    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT,    (GLint) bswap_CARD32( & hdr->alignment )) );
+
+    CALL_TexSubImage3D( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc + 36 ),
+         (GLint   )bswap_CARD32 ( pc + 40 ),
+         (GLint   )bswap_CARD32 ( pc + 44 ),
+         (GLint   )bswap_CARD32 ( pc + 48 ),
+         (GLint   )bswap_CARD32 ( pc + 52 ),
+         (GLsizei )bswap_CARD32 ( pc + 60 ),
+         (GLsizei )bswap_CARD32 ( pc + 64 ),
+         (GLsizei )bswap_CARD32 ( pc + 68 ),
+         (GLenum  )bswap_ENUM   ( pc + 76 ),
+         (GLenum  )bswap_ENUM   ( pc + 80 ),
+        pixels
+    ) );
+}
+
+void __glXDispSwap_CopyTexSubImage3D(GLbyte * pc)
+{
+    CALL_CopyTexSubImage3D( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLint   )bswap_CARD32 ( pc +  4 ),
+         (GLint   )bswap_CARD32 ( pc +  8 ),
+         (GLint   )bswap_CARD32 ( pc + 12 ),
+         (GLint   )bswap_CARD32 ( pc + 16 ),
+         (GLint   )bswap_CARD32 ( pc + 20 ),
+         (GLint   )bswap_CARD32 ( pc + 24 ),
+         (GLsizei )bswap_CARD32 ( pc + 28 ),
+         (GLsizei )bswap_CARD32 ( pc + 32 )
+    ) );
+}
+
+void __glXDispSwap_ActiveTexture(GLbyte * pc)
+{
+    CALL_ActiveTexture( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 )
+    ) );
+}
+
+void __glXDispSwap_MultiTexCoord1dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 12);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 12);
         pc -= 4;
     }
 #endif
 
-    CALL_MultiTexCoord1dvARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 8),
-                                              (const GLdouble *)
-                                              bswap_64_array((uint64_t *) (pc +
-                                                                           0),
-                                                             1)
-                             ));
+    CALL_MultiTexCoord1dv( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  8 ),
+         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  0), 1 )
+    ) );
 }
 
-void
-__glXDispSwap_MultiTexCoord1fvARB(GLbyte * pc)
+void __glXDispSwap_MultiTexCoord1fvARB(GLbyte * pc)
 {
-    CALL_MultiTexCoord1fvARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                              (const GLfloat *)
-                                              bswap_32_array((uint32_t *) (pc +
-                                                                           4),
-                                                             1)
-                             ));
+    CALL_MultiTexCoord1fvARB( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  4), 1 )
+    ) );
 }
 
-void
-__glXDispSwap_MultiTexCoord1ivARB(GLbyte * pc)
+void __glXDispSwap_MultiTexCoord1iv(GLbyte * pc)
 {
-    CALL_MultiTexCoord1ivARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                              (const GLint *)
-                                              bswap_32_array((uint32_t *) (pc +
-                                                                           4),
-                                                             1)
-                             ));
+    CALL_MultiTexCoord1iv( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (const GLint *)bswap_32_array( (uint32_t *) (pc +  4), 1 )
+    ) );
 }
 
-void
-__glXDispSwap_MultiTexCoord1svARB(GLbyte * pc)
+void __glXDispSwap_MultiTexCoord1sv(GLbyte * pc)
 {
-    CALL_MultiTexCoord1svARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                              (const GLshort *)
-                                              bswap_16_array((uint16_t *) (pc +
-                                                                           4),
-                                                             1)
-                             ));
+    CALL_MultiTexCoord1sv( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  4), 1 )
+    ) );
 }
 
-void
-__glXDispSwap_MultiTexCoord2dvARB(GLbyte * pc)
+void __glXDispSwap_MultiTexCoord2dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 20);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 20);
         pc -= 4;
     }
 #endif
 
-    CALL_MultiTexCoord2dvARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 16),
-                                              (const GLdouble *)
-                                              bswap_64_array((uint64_t *) (pc +
-                                                                           0),
-                                                             2)
-                             ));
+    CALL_MultiTexCoord2dv( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc + 16 ),
+         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  0), 2 )
+    ) );
 }
 
-void
-__glXDispSwap_MultiTexCoord2fvARB(GLbyte * pc)
+void __glXDispSwap_MultiTexCoord2fvARB(GLbyte * pc)
 {
-    CALL_MultiTexCoord2fvARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                              (const GLfloat *)
-                                              bswap_32_array((uint32_t *) (pc +
-                                                                           4),
-                                                             2)
-                             ));
+    CALL_MultiTexCoord2fvARB( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  4), 2 )
+    ) );
 }
 
-void
-__glXDispSwap_MultiTexCoord2ivARB(GLbyte * pc)
+void __glXDispSwap_MultiTexCoord2iv(GLbyte * pc)
 {
-    CALL_MultiTexCoord2ivARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                              (const GLint *)
-                                              bswap_32_array((uint32_t *) (pc +
-                                                                           4),
-                                                             2)
-                             ));
+    CALL_MultiTexCoord2iv( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (const GLint *)bswap_32_array( (uint32_t *) (pc +  4), 2 )
+    ) );
 }
 
-void
-__glXDispSwap_MultiTexCoord2svARB(GLbyte * pc)
+void __glXDispSwap_MultiTexCoord2sv(GLbyte * pc)
 {
-    CALL_MultiTexCoord2svARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                              (const GLshort *)
-                                              bswap_16_array((uint16_t *) (pc +
-                                                                           4),
-                                                             2)
-                             ));
+    CALL_MultiTexCoord2sv( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  4), 2 )
+    ) );
 }
 
-void
-__glXDispSwap_MultiTexCoord3dvARB(GLbyte * pc)
+void __glXDispSwap_MultiTexCoord3dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 28);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 28);
         pc -= 4;
     }
 #endif
 
-    CALL_MultiTexCoord3dvARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 24),
-                                              (const GLdouble *)
-                                              bswap_64_array((uint64_t *) (pc +
-                                                                           0),
-                                                             3)
-                             ));
+    CALL_MultiTexCoord3dv( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc + 24 ),
+         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  0), 3 )
+    ) );
 }
 
-void
-__glXDispSwap_MultiTexCoord3fvARB(GLbyte * pc)
+void __glXDispSwap_MultiTexCoord3fvARB(GLbyte * pc)
 {
-    CALL_MultiTexCoord3fvARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                              (const GLfloat *)
-                                              bswap_32_array((uint32_t *) (pc +
-                                                                           4),
-                                                             3)
-                             ));
+    CALL_MultiTexCoord3fvARB( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  4), 3 )
+    ) );
 }
 
-void
-__glXDispSwap_MultiTexCoord3ivARB(GLbyte * pc)
+void __glXDispSwap_MultiTexCoord3iv(GLbyte * pc)
 {
-    CALL_MultiTexCoord3ivARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                              (const GLint *)
-                                              bswap_32_array((uint32_t *) (pc +
-                                                                           4),
-                                                             3)
-                             ));
+    CALL_MultiTexCoord3iv( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (const GLint *)bswap_32_array( (uint32_t *) (pc +  4), 3 )
+    ) );
 }
 
-void
-__glXDispSwap_MultiTexCoord3svARB(GLbyte * pc)
+void __glXDispSwap_MultiTexCoord3sv(GLbyte * pc)
 {
-    CALL_MultiTexCoord3svARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                              (const GLshort *)
-                                              bswap_16_array((uint16_t *) (pc +
-                                                                           4),
-                                                             3)
-                             ));
+    CALL_MultiTexCoord3sv( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  4), 3 )
+    ) );
 }
 
-void
-__glXDispSwap_MultiTexCoord4dvARB(GLbyte * pc)
+void __glXDispSwap_MultiTexCoord4dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 36);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 36);
         pc -= 4;
     }
 #endif
 
-    CALL_MultiTexCoord4dvARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 32),
-                                              (const GLdouble *)
-                                              bswap_64_array((uint64_t *) (pc +
-                                                                           0),
-                                                             4)
-                             ));
+    CALL_MultiTexCoord4dv( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc + 32 ),
+         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  0), 4 )
+    ) );
 }
 
-void
-__glXDispSwap_MultiTexCoord4fvARB(GLbyte * pc)
+void __glXDispSwap_MultiTexCoord4fvARB(GLbyte * pc)
 {
-    CALL_MultiTexCoord4fvARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                              (const GLfloat *)
-                                              bswap_32_array((uint32_t *) (pc +
-                                                                           4),
-                                                             4)
-                             ));
+    CALL_MultiTexCoord4fvARB( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  4), 4 )
+    ) );
 }
-
-void
-__glXDispSwap_MultiTexCoord4ivARB(GLbyte * pc)
+
+void __glXDispSwap_MultiTexCoord4iv(GLbyte * pc)
 {
-    CALL_MultiTexCoord4ivARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                              (const GLint *)
-                                              bswap_32_array((uint32_t *) (pc +
-                                                                           4),
-                                                             4)
-                             ));
+    CALL_MultiTexCoord4iv( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (const GLint *)bswap_32_array( (uint32_t *) (pc +  4), 4 )
+    ) );
 }
 
-void
-__glXDispSwap_MultiTexCoord4svARB(GLbyte * pc)
+void __glXDispSwap_MultiTexCoord4sv(GLbyte * pc)
 {
-    CALL_MultiTexCoord4svARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                              (const GLshort *)
-                                              bswap_16_array((uint16_t *) (pc +
-                                                                           4),
-                                                             4)
-                             ));
-}
-
-void
-__glXDispSwap_SampleCoverageARB(GLbyte * pc)
-{
-    CALL_SampleCoverageARB(GET_DISPATCH(), ((GLclampf) bswap_FLOAT32(pc + 0),
-                                            *(GLboolean *) (pc + 4)
-                           ));
-}
-
-void
-__glXDispSwap_CompressedTexImage1DARB(GLbyte * pc)
-{
-    const GLsizei imageSize = (GLsizei) bswap_CARD32(pc + 20);
-
-    CALL_CompressedTexImage1DARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                                  (GLint) bswap_CARD32(pc + 4),
-                                                  (GLenum) bswap_ENUM(pc + 8),
-                                                  (GLsizei) bswap_CARD32(pc +
-                                                                         12),
-                                                  (GLint) bswap_CARD32(pc + 16),
-                                                  imageSize,
-                                                  (const GLvoid *) (pc + 24)
-                                 ));
-}
-
-void
-__glXDispSwap_CompressedTexImage2DARB(GLbyte * pc)
-{
-    const GLsizei imageSize = (GLsizei) bswap_CARD32(pc + 24);
-
-    CALL_CompressedTexImage2DARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                                  (GLint) bswap_CARD32(pc + 4),
-                                                  (GLenum) bswap_ENUM(pc + 8),
-                                                  (GLsizei) bswap_CARD32(pc +
-                                                                         12),
-                                                  (GLsizei) bswap_CARD32(pc +
-                                                                         16),
-                                                  (GLint) bswap_CARD32(pc + 20),
-                                                  imageSize,
-                                                  (const GLvoid *) (pc + 28)
-                                 ));
-}
-
-void
-__glXDispSwap_CompressedTexImage3DARB(GLbyte * pc)
-{
-    const GLsizei imageSize = (GLsizei) bswap_CARD32(pc + 28);
-
-    CALL_CompressedTexImage3DARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                                  (GLint) bswap_CARD32(pc + 4),
-                                                  (GLenum) bswap_ENUM(pc + 8),
-                                                  (GLsizei) bswap_CARD32(pc +
-                                                                         12),
-                                                  (GLsizei) bswap_CARD32(pc +
-                                                                         16),
-                                                  (GLsizei) bswap_CARD32(pc +
-                                                                         20),
-                                                  (GLint) bswap_CARD32(pc + 24),
-                                                  imageSize,
-                                                  (const GLvoid *) (pc + 32)
-                                 ));
-}
-
-void
-__glXDispSwap_CompressedTexSubImage1DARB(GLbyte * pc)
-{
-    const GLsizei imageSize = (GLsizei) bswap_CARD32(pc + 20);
-
-    CALL_CompressedTexSubImage1DARB(GET_DISPATCH(), ((GLenum)
-                                                     bswap_ENUM(pc + 0),
-                                                     (GLint) bswap_CARD32(pc +
-                                                                          4),
-                                                     (GLint) bswap_CARD32(pc +
-                                                                          8),
-                                                     (GLsizei) bswap_CARD32(pc +
-                                                                            12),
-                                                     (GLenum) bswap_ENUM(pc +
-                                                                         16),
-                                                     imageSize,
-                                                     (const GLvoid *) (pc + 24)
-                                    ));
-}
-
-void
-__glXDispSwap_CompressedTexSubImage2DARB(GLbyte * pc)
-{
-    const GLsizei imageSize = (GLsizei) bswap_CARD32(pc + 28);
-
-    CALL_CompressedTexSubImage2DARB(GET_DISPATCH(), ((GLenum)
-                                                     bswap_ENUM(pc + 0),
-                                                     (GLint) bswap_CARD32(pc +
-                                                                          4),
-                                                     (GLint) bswap_CARD32(pc +
-                                                                          8),
-                                                     (GLint) bswap_CARD32(pc +
-                                                                          12),
-                                                     (GLsizei) bswap_CARD32(pc +
-                                                                            16),
-                                                     (GLsizei) bswap_CARD32(pc +
-                                                                            20),
-                                                     (GLenum) bswap_ENUM(pc +
-                                                                         24),
-                                                     imageSize,
-                                                     (const GLvoid *) (pc + 32)
-                                    ));
-}
-
-void
-__glXDispSwap_CompressedTexSubImage3DARB(GLbyte * pc)
-{
-    const GLsizei imageSize = (GLsizei) bswap_CARD32(pc + 36);
-
-    CALL_CompressedTexSubImage3DARB(GET_DISPATCH(), ((GLenum)
-                                                     bswap_ENUM(pc + 0),
-                                                     (GLint) bswap_CARD32(pc +
-                                                                          4),
-                                                     (GLint) bswap_CARD32(pc +
-                                                                          8),
-                                                     (GLint) bswap_CARD32(pc +
-                                                                          12),
-                                                     (GLint) bswap_CARD32(pc +
-                                                                          16),
-                                                     (GLsizei) bswap_CARD32(pc +
-                                                                            20),
-                                                     (GLsizei) bswap_CARD32(pc +
-                                                                            24),
-                                                     (GLsizei) bswap_CARD32(pc +
-                                                                            28),
-                                                     (GLenum) bswap_ENUM(pc +
-                                                                         32),
-                                                     imageSize,
-                                                     (const GLvoid *) (pc + 40)
-                                    ));
-}
-
-int
-__glXDispSwap_GetProgramEnvParameterdvARB(__GLXclientState * cl, GLbyte * pc)
-{
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    CALL_MultiTexCoord4sv( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  4), 4 )
+    ) );
+}
 
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        GLdouble params[4];
+void __glXDispSwap_CompressedTexImage1D(GLbyte * pc)
+{
+    const GLsizei imageSize =  (GLsizei )bswap_CARD32 ( pc + 20 );
 
-        CALL_GetProgramEnvParameterdvARB(GET_DISPATCH(), ((GLenum)
-                                                          bswap_ENUM(pc + 0),
-                                                          (GLuint)
-                                                          bswap_CARD32(pc + 4),
-                                                          params));
-        (void) bswap_64_array((uint64_t *) params, 4);
-        __glXSendReplySwap(cl->client, params, 4, 8, GL_FALSE, 0);
-        error = Success;
+    CALL_CompressedTexImage1D( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLint   )bswap_CARD32 ( pc +  4 ),
+         (GLenum  )bswap_ENUM   ( pc +  8 ),
+         (GLsizei )bswap_CARD32 ( pc + 12 ),
+         (GLint   )bswap_CARD32 ( pc + 16 ),
+        imageSize,
+         (const GLvoid *)(pc + 24)
+    ) );
+}
+
+void __glXDispSwap_CompressedTexImage2D(GLbyte * pc)
+{
+    const GLsizei imageSize =  (GLsizei )bswap_CARD32 ( pc + 24 );
+
+    CALL_CompressedTexImage2D( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLint   )bswap_CARD32 ( pc +  4 ),
+         (GLenum  )bswap_ENUM   ( pc +  8 ),
+         (GLsizei )bswap_CARD32 ( pc + 12 ),
+         (GLsizei )bswap_CARD32 ( pc + 16 ),
+         (GLint   )bswap_CARD32 ( pc + 20 ),
+        imageSize,
+         (const GLvoid *)(pc + 28)
+    ) );
+}
+
+void __glXDispSwap_CompressedTexImage3D(GLbyte * pc)
+{
+    const GLsizei imageSize =  (GLsizei )bswap_CARD32 ( pc + 28 );
+
+    CALL_CompressedTexImage3D( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLint   )bswap_CARD32 ( pc +  4 ),
+         (GLenum  )bswap_ENUM   ( pc +  8 ),
+         (GLsizei )bswap_CARD32 ( pc + 12 ),
+         (GLsizei )bswap_CARD32 ( pc + 16 ),
+         (GLsizei )bswap_CARD32 ( pc + 20 ),
+         (GLint   )bswap_CARD32 ( pc + 24 ),
+        imageSize,
+         (const GLvoid *)(pc + 32)
+    ) );
+}
+
+void __glXDispSwap_CompressedTexSubImage1D(GLbyte * pc)
+{
+    const GLsizei imageSize =  (GLsizei )bswap_CARD32 ( pc + 20 );
+
+    CALL_CompressedTexSubImage1D( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLint   )bswap_CARD32 ( pc +  4 ),
+         (GLint   )bswap_CARD32 ( pc +  8 ),
+         (GLsizei )bswap_CARD32 ( pc + 12 ),
+         (GLenum  )bswap_ENUM   ( pc + 16 ),
+        imageSize,
+         (const GLvoid *)(pc + 24)
+    ) );
+}
+
+void __glXDispSwap_CompressedTexSubImage2D(GLbyte * pc)
+{
+    const GLsizei imageSize =  (GLsizei )bswap_CARD32 ( pc + 28 );
+
+    CALL_CompressedTexSubImage2D( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLint   )bswap_CARD32 ( pc +  4 ),
+         (GLint   )bswap_CARD32 ( pc +  8 ),
+         (GLint   )bswap_CARD32 ( pc + 12 ),
+         (GLsizei )bswap_CARD32 ( pc + 16 ),
+         (GLsizei )bswap_CARD32 ( pc + 20 ),
+         (GLenum  )bswap_ENUM   ( pc + 24 ),
+        imageSize,
+         (const GLvoid *)(pc + 32)
+    ) );
+}
+
+void __glXDispSwap_CompressedTexSubImage3D(GLbyte * pc)
+{
+    const GLsizei imageSize =  (GLsizei )bswap_CARD32 ( pc + 36 );
+
+    CALL_CompressedTexSubImage3D( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLint   )bswap_CARD32 ( pc +  4 ),
+         (GLint   )bswap_CARD32 ( pc +  8 ),
+         (GLint   )bswap_CARD32 ( pc + 12 ),
+         (GLint   )bswap_CARD32 ( pc + 16 ),
+         (GLsizei )bswap_CARD32 ( pc + 20 ),
+         (GLsizei )bswap_CARD32 ( pc + 24 ),
+         (GLsizei )bswap_CARD32 ( pc + 28 ),
+         (GLenum  )bswap_ENUM   ( pc + 32 ),
+        imageSize,
+         (const GLvoid *)(pc + 40)
+    ) );
+}
+
+void __glXDispSwap_SampleCoverage(GLbyte * pc)
+{
+    CALL_SampleCoverage( GET_DISPATCH(), (
+         (GLclampf)bswap_FLOAT32( pc +  0 ),
+        *(GLboolean *)(pc +  4)
+    ) );
+}
+
+void __glXDispSwap_BlendFuncSeparate(GLbyte * pc)
+{
+    CALL_BlendFuncSeparate( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLenum  )bswap_ENUM   ( pc +  4 ),
+         (GLenum  )bswap_ENUM   ( pc +  8 ),
+         (GLenum  )bswap_ENUM   ( pc + 12 )
+    ) );
+}
+
+void __glXDispSwap_FogCoorddv(GLbyte * pc)
+{
+#ifdef __GLX_ALIGN64
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 8);
+        pc -= 4;
     }
+#endif
 
-    return error;
+    CALL_FogCoorddv( GET_DISPATCH(), (
+         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  0), 1 )
+    ) );
 }
 
-int
-__glXDispSwap_GetProgramEnvParameterfvARB(__GLXclientState * cl, GLbyte * pc)
+void __glXDispSwap_PointParameterf(GLbyte * pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    CALL_PointParameterf( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLfloat )bswap_FLOAT32( pc +  4 )
+    ) );
+}
 
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        GLfloat params[4];
+void __glXDispSwap_PointParameterfv(GLbyte * pc)
+{
+    const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  0 );
+    const GLfloat * params;
 
-        CALL_GetProgramEnvParameterfvARB(GET_DISPATCH(), ((GLenum)
-                                                          bswap_ENUM(pc + 0),
-                                                          (GLuint)
-                                                          bswap_CARD32(pc + 4),
-                                                          params));
-        (void) bswap_32_array((uint32_t *) params, 4);
-        __glXSendReplySwap(cl->client, params, 4, 4, GL_FALSE, 0);
-        error = Success;
+    params = (const GLfloat *) bswap_32_array( (uint32_t *) (pc + 4), __glPointParameterfv_size(pname) );
+
+    CALL_PointParameterfv( GET_DISPATCH(), (
+        pname,
+        params
+    ) );
+}
+
+void __glXDispSwap_PointParameteri(GLbyte * pc)
+{
+    CALL_PointParameteri( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLint   )bswap_CARD32 ( pc +  4 )
+    ) );
+}
+
+void __glXDispSwap_PointParameteriv(GLbyte * pc)
+{
+    const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  0 );
+    const GLint * params;
+
+    params = (const GLint *) bswap_32_array( (uint32_t *) (pc + 4), __glPointParameteriv_size(pname) );
+
+    CALL_PointParameteriv( GET_DISPATCH(), (
+        pname,
+        params
+    ) );
+}
+
+void __glXDispSwap_SecondaryColor3bv(GLbyte * pc)
+{
+    CALL_SecondaryColor3bv( GET_DISPATCH(), (
+         (const GLbyte *)(pc +  0)
+    ) );
+}
+
+void __glXDispSwap_SecondaryColor3dv(GLbyte * pc)
+{
+#ifdef __GLX_ALIGN64
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 24);
+        pc -= 4;
     }
+#endif
 
-    return error;
+    CALL_SecondaryColor3dv( GET_DISPATCH(), (
+         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  0), 3 )
+    ) );
 }
 
-int
-__glXDispSwap_GetProgramLocalParameterdvARB(__GLXclientState * cl, GLbyte * pc)
+void __glXDispSwap_SecondaryColor3iv(GLbyte * pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    CALL_SecondaryColor3iv( GET_DISPATCH(), (
+         (const GLint *)bswap_32_array( (uint32_t *) (pc +  0), 3 )
+    ) );
+}
+
+void __glXDispSwap_SecondaryColor3sv(GLbyte * pc)
+{
+    CALL_SecondaryColor3sv( GET_DISPATCH(), (
+         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  0), 3 )
+    ) );
+}
+
+void __glXDispSwap_SecondaryColor3ubv(GLbyte * pc)
+{
+    CALL_SecondaryColor3ubv( GET_DISPATCH(), (
+         (const GLubyte *)(pc +  0)
+    ) );
+}
+
+void __glXDispSwap_SecondaryColor3uiv(GLbyte * pc)
+{
+    CALL_SecondaryColor3uiv( GET_DISPATCH(), (
+         (const GLuint *)bswap_32_array( (uint32_t *) (pc +  0), 3 )
+    ) );
+}
+
+void __glXDispSwap_SecondaryColor3usv(GLbyte * pc)
+{
+    CALL_SecondaryColor3usv( GET_DISPATCH(), (
+         (const GLushort *)bswap_16_array( (uint16_t *) (pc +  0), 3 )
+    ) );
+}
+
+void __glXDispSwap_WindowPos3fv(GLbyte * pc)
+{
+    CALL_WindowPos3fv( GET_DISPATCH(), (
+         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  0), 3 )
+    ) );
+}
+
+void __glXDispSwap_BeginQuery(GLbyte * pc)
+{
+    CALL_BeginQuery( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLuint  )bswap_CARD32 ( pc +  4 )
+    ) );
+}
+
+int __glXDispSwap_DeleteQueries(__GLXclientState *cl, GLbyte *pc)
+{
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        GLdouble params[4];
+    pc += __GLX_SINGLE_HDR_SIZE;
+    if ( cx != NULL ) {
+        const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  0 );
 
-        CALL_GetProgramLocalParameterdvARB(GET_DISPATCH(), ((GLenum)
-                                                            bswap_ENUM(pc + 0),
-                                                            (GLuint)
-                                                            bswap_CARD32(pc +
-                                                                         4),
-                                                            params));
-        (void) bswap_64_array((uint64_t *) params, 4);
-        __glXSendReplySwap(cl->client, params, 4, 8, GL_FALSE, 0);
+        CALL_DeleteQueries( GET_DISPATCH(), (
+            n,
+             (const GLuint *)bswap_32_array( (uint32_t *) (pc +  4), 0 )
+        ) );
         error = Success;
     }
 
     return error;
 }
 
-int
-__glXDispSwap_GetProgramLocalParameterfvARB(__GLXclientState * cl, GLbyte * pc)
+void __glXDispSwap_EndQuery(GLbyte * pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    CALL_EndQuery( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 )
+    ) );
+}
+
+int __glXDispSwap_GenQueries(__GLXclientState *cl, GLbyte *pc)
+{
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        GLfloat params[4];
+    pc += __GLX_SINGLE_HDR_SIZE;
+    if ( cx != NULL ) {
+        const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  0 );
 
-        CALL_GetProgramLocalParameterfvARB(GET_DISPATCH(), ((GLenum)
-                                                            bswap_ENUM(pc + 0),
-                                                            (GLuint)
-                                                            bswap_CARD32(pc +
-                                                                         4),
-                                                            params));
-        (void) bswap_32_array((uint32_t *) params, 4);
-        __glXSendReplySwap(cl->client, params, 4, 4, GL_FALSE, 0);
+        GLuint answerBuffer[200];
+        GLuint * ids = __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer), 4);
+        CALL_GenQueries( GET_DISPATCH(), (
+            n,
+            ids
+        ) );
+        (void) bswap_32_array( (uint32_t *) ids, n );
+        __glXSendReplySwap(cl->client, ids, n, 4, GL_TRUE, 0);
         error = Success;
     }
 
     return error;
 }
 
-int
-__glXDispSwap_GetProgramivARB(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GetQueryObjectiv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
+    pc += __GLX_SINGLE_HDR_SIZE;
+    if ( cx != NULL ) {
+        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
 
-        const GLuint compsize = __glGetProgramivARB_size(pname);
+        const GLuint compsize = __glGetQueryObjectiv_size(pname);
         GLint answerBuffer[200];
-        GLint *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetProgramivARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                              pname, params));
-        (void) bswap_32_array((uint32_t *) params, compsize);
+        CALL_GetQueryObjectiv( GET_DISPATCH(), (
+             (GLuint  )bswap_CARD32 ( pc +  0 ),
+            pname,
+            params
+        ) );
+        (void) bswap_32_array( (uint32_t *) params, compsize );
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -4770,65 +4450,59 @@ __glXDispSwap_GetProgramivARB(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDispSwap_GetVertexAttribdvARB(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GetQueryObjectuiv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
+    pc += __GLX_SINGLE_HDR_SIZE;
+    if ( cx != NULL ) {
+        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
 
-        const GLuint compsize = __glGetVertexAttribdvARB_size(pname);
-        GLdouble answerBuffer[200];
-        GLdouble *params =
-            __glXGetAnswerBuffer(cl, compsize * 8, answerBuffer,
-                                 sizeof(answerBuffer), 8);
+        const GLuint compsize = __glGetQueryObjectuiv_size(pname);
+        GLuint answerBuffer[200];
+        GLuint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetVertexAttribdvARB(GET_DISPATCH(), ((GLuint)
-                                                   bswap_CARD32(pc + 0), pname,
-                                                   params));
-        (void) bswap_64_array((uint64_t *) params, compsize);
-        __glXSendReplySwap(cl->client, params, compsize, 8, GL_FALSE, 0);
+        CALL_GetQueryObjectuiv( GET_DISPATCH(), (
+             (GLuint  )bswap_CARD32 ( pc +  0 ),
+            pname,
+            params
+        ) );
+        (void) bswap_32_array( (uint32_t *) params, compsize );
+        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
 
     return error;
 }
 
-int
-__glXDispSwap_GetVertexAttribfvARB(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GetQueryiv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
+    pc += __GLX_SINGLE_HDR_SIZE;
+    if ( cx != NULL ) {
+        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
 
-        const GLuint compsize = __glGetVertexAttribfvARB_size(pname);
-        GLfloat answerBuffer[200];
-        GLfloat *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        const GLuint compsize = __glGetQueryiv_size(pname);
+        GLint answerBuffer[200];
+        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetVertexAttribfvARB(GET_DISPATCH(), ((GLuint)
-                                                   bswap_CARD32(pc + 0), pname,
-                                                   params));
-        (void) bswap_32_array((uint32_t *) params, compsize);
+        CALL_GetQueryiv( GET_DISPATCH(), (
+             (GLenum  )bswap_ENUM   ( pc +  0 ),
+            pname,
+            params
+        ) );
+        (void) bswap_32_array( (uint32_t *) params, compsize );
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -4836,528 +4510,484 @@ __glXDispSwap_GetVertexAttribfvARB(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDispSwap_GetVertexAttribivARB(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_IsQuery(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
-
-        const GLuint compsize = __glGetVertexAttribivARB_size(pname);
-        GLint answerBuffer[200];
-        GLint *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
-
-        if (params == NULL)
-            return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetVertexAttribivARB(GET_DISPATCH(), ((GLuint)
-                                                   bswap_CARD32(pc + 0), pname,
-                                                   params));
-        (void) bswap_32_array((uint32_t *) params, compsize);
-        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
+    pc += __GLX_SINGLE_HDR_SIZE;
+    if ( cx != NULL ) {
+        GLboolean retval;
+        retval = CALL_IsQuery( GET_DISPATCH(), (
+             (GLuint  )bswap_CARD32 ( pc +  0 )
+        ) );
+        __glXSendReplySwap(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
         error = Success;
     }
 
     return error;
 }
 
-void
-__glXDispSwap_ProgramEnvParameter4dvARB(GLbyte * pc)
+void __glXDispSwap_BlendEquationSeparate(GLbyte * pc)
 {
-#ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 40);
-        pc -= 4;
-    }
-#endif
-
-    CALL_ProgramEnvParameter4dvARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                                    (GLuint) bswap_CARD32(pc +
-                                                                          4),
-                                                    (const GLdouble *)
-                                                    bswap_64_array((uint64_t
-                                                                    *) (pc + 8),
-                                                                   4)
-                                   ));
+    CALL_BlendEquationSeparate( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLenum  )bswap_ENUM   ( pc +  4 )
+    ) );
 }
 
-void
-__glXDispSwap_ProgramEnvParameter4fvARB(GLbyte * pc)
+void __glXDispSwap_DrawBuffers(GLbyte * pc)
 {
-    CALL_ProgramEnvParameter4fvARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                                    (GLuint) bswap_CARD32(pc +
-                                                                          4),
-                                                    (const GLfloat *)
-                                                    bswap_32_array((uint32_t
-                                                                    *) (pc + 8),
-                                                                   4)
-                                   ));
+    const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  0 );
+
+    CALL_DrawBuffers( GET_DISPATCH(), (
+        n,
+         (const GLenum *)bswap_32_array( (uint32_t *) (pc +  4), 0 )
+    ) );
 }
 
-void
-__glXDispSwap_ProgramLocalParameter4dvARB(GLbyte * pc)
+int __glXDispSwap_GetVertexAttribdv(__GLXclientState *cl, GLbyte *pc)
 {
-#ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 40);
-        pc -= 4;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
+    int error;
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
+
+    pc += __GLX_VENDPRIV_HDR_SIZE;
+    if ( cx != NULL ) {
+        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
+
+        const GLuint compsize = __glGetVertexAttribdv_size(pname);
+        GLdouble answerBuffer[200];
+        GLdouble * params = __glXGetAnswerBuffer(cl, compsize * 8, answerBuffer, sizeof(answerBuffer), 8);
+
+        if (params == NULL) return BadAlloc;
+        __glXClearErrorOccured();
+
+        CALL_GetVertexAttribdv( GET_DISPATCH(), (
+             (GLuint  )bswap_CARD32 ( pc +  0 ),
+            pname,
+            params
+        ) );
+        (void) bswap_64_array( (uint64_t *) params, compsize );
+        __glXSendReplySwap(cl->client, params, compsize, 8, GL_FALSE, 0);
+        error = Success;
     }
-#endif
 
-    CALL_ProgramLocalParameter4dvARB(GET_DISPATCH(), ((GLenum)
-                                                      bswap_ENUM(pc + 0),
-                                                      (GLuint) bswap_CARD32(pc +
-                                                                            4),
-                                                      (const GLdouble *)
-                                                      bswap_64_array((uint64_t
-                                                                      *) (pc +
-                                                                          8), 4)
-                                     ));
+    return error;
 }
 
-void
-__glXDispSwap_ProgramLocalParameter4fvARB(GLbyte * pc)
+int __glXDispSwap_GetVertexAttribfv(__GLXclientState *cl, GLbyte *pc)
 {
-    CALL_ProgramLocalParameter4fvARB(GET_DISPATCH(), ((GLenum)
-                                                      bswap_ENUM(pc + 0),
-                                                      (GLuint) bswap_CARD32(pc +
-                                                                            4),
-                                                      (const GLfloat *)
-                                                      bswap_32_array((uint32_t
-                                                                      *) (pc +
-                                                                          8), 4)
-                                     ));
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
+    int error;
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
+
+    pc += __GLX_VENDPRIV_HDR_SIZE;
+    if ( cx != NULL ) {
+        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
+
+        const GLuint compsize = __glGetVertexAttribfv_size(pname);
+        GLfloat answerBuffer[200];
+        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
+
+        if (params == NULL) return BadAlloc;
+        __glXClearErrorOccured();
+
+        CALL_GetVertexAttribfv( GET_DISPATCH(), (
+             (GLuint  )bswap_CARD32 ( pc +  0 ),
+            pname,
+            params
+        ) );
+        (void) bswap_32_array( (uint32_t *) params, compsize );
+        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
+        error = Success;
+    }
+
+    return error;
 }
 
-void
-__glXDispSwap_ProgramStringARB(GLbyte * pc)
+int __glXDispSwap_GetVertexAttribiv(__GLXclientState *cl, GLbyte *pc)
 {
-    const GLsizei len = (GLsizei) bswap_CARD32(pc + 8);
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
+    int error;
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
+
+    pc += __GLX_VENDPRIV_HDR_SIZE;
+    if ( cx != NULL ) {
+        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
+
+        const GLuint compsize = __glGetVertexAttribiv_size(pname);
+        GLint answerBuffer[200];
+        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
+
+        if (params == NULL) return BadAlloc;
+        __glXClearErrorOccured();
+
+        CALL_GetVertexAttribiv( GET_DISPATCH(), (
+             (GLuint  )bswap_CARD32 ( pc +  0 ),
+            pname,
+            params
+        ) );
+        (void) bswap_32_array( (uint32_t *) params, compsize );
+        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
+        error = Success;
+    }
 
-    CALL_ProgramStringARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                           (GLenum) bswap_ENUM(pc + 4),
-                                           len, (const GLvoid *) (pc + 12)
-                          ));
+    return error;
 }
 
-void
-__glXDispSwap_VertexAttrib1dvARB(GLbyte * pc)
+void __glXDispSwap_VertexAttrib1dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 12);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 12);
         pc -= 4;
     }
 #endif
 
-    CALL_VertexAttrib1dvARB(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             (const GLdouble *)
-                                             bswap_64_array((uint64_t *) (pc +
-                                                                          4), 1)
-                            ));
+    CALL_VertexAttrib1dv( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 ),
+         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  4), 1 )
+    ) );
 }
 
-void
-__glXDispSwap_VertexAttrib1fvARB(GLbyte * pc)
+void __glXDispSwap_VertexAttrib1sv(GLbyte * pc)
 {
-    CALL_VertexAttrib1fvARB(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             (const GLfloat *)
-                                             bswap_32_array((uint32_t *) (pc +
-                                                                          4), 1)
-                            ));
+    CALL_VertexAttrib1sv( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 ),
+         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  4), 1 )
+    ) );
 }
 
-void
-__glXDispSwap_VertexAttrib1svARB(GLbyte * pc)
-{
-    CALL_VertexAttrib1svARB(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             (const GLshort *)
-                                             bswap_16_array((uint16_t *) (pc +
-                                                                          4), 1)
-                            ));
-}
-
-void
-__glXDispSwap_VertexAttrib2dvARB(GLbyte * pc)
+void __glXDispSwap_VertexAttrib2dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 20);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 20);
         pc -= 4;
     }
 #endif
 
-    CALL_VertexAttrib2dvARB(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             (const GLdouble *)
-                                             bswap_64_array((uint64_t *) (pc +
-                                                                          4), 2)
-                            ));
+    CALL_VertexAttrib2dv( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 ),
+         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  4), 2 )
+    ) );
 }
 
-void
-__glXDispSwap_VertexAttrib2fvARB(GLbyte * pc)
+void __glXDispSwap_VertexAttrib2sv(GLbyte * pc)
 {
-    CALL_VertexAttrib2fvARB(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             (const GLfloat *)
-                                             bswap_32_array((uint32_t *) (pc +
-                                                                          4), 2)
-                            ));
+    CALL_VertexAttrib2sv( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 ),
+         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  4), 2 )
+    ) );
 }
 
-void
-__glXDispSwap_VertexAttrib2svARB(GLbyte * pc)
-{
-    CALL_VertexAttrib2svARB(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             (const GLshort *)
-                                             bswap_16_array((uint16_t *) (pc +
-                                                                          4), 2)
-                            ));
-}
-
-void
-__glXDispSwap_VertexAttrib3dvARB(GLbyte * pc)
+void __glXDispSwap_VertexAttrib3dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 28);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 28);
         pc -= 4;
     }
 #endif
 
-    CALL_VertexAttrib3dvARB(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             (const GLdouble *)
-                                             bswap_64_array((uint64_t *) (pc +
-                                                                          4), 3)
-                            ));
-}
-
-void
-__glXDispSwap_VertexAttrib3fvARB(GLbyte * pc)
-{
-    CALL_VertexAttrib3fvARB(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             (const GLfloat *)
-                                             bswap_32_array((uint32_t *) (pc +
-                                                                          4), 3)
-                            ));
+    CALL_VertexAttrib3dv( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 ),
+         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  4), 3 )
+    ) );
 }
 
-void
-__glXDispSwap_VertexAttrib3svARB(GLbyte * pc)
+void __glXDispSwap_VertexAttrib3sv(GLbyte * pc)
 {
-    CALL_VertexAttrib3svARB(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             (const GLshort *)
-                                             bswap_16_array((uint16_t *) (pc +
-                                                                          4), 3)
-                            ));
+    CALL_VertexAttrib3sv( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 ),
+         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  4), 3 )
+    ) );
 }
 
-void
-__glXDispSwap_VertexAttrib4NbvARB(GLbyte * pc)
+void __glXDispSwap_VertexAttrib4Nbv(GLbyte * pc)
 {
-    CALL_VertexAttrib4NbvARB(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                              (const GLbyte *) (pc + 4)
-                             ));
+    CALL_VertexAttrib4Nbv( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 ),
+         (const GLbyte *)(pc +  4)
+    ) );
 }
 
-void
-__glXDispSwap_VertexAttrib4NivARB(GLbyte * pc)
+void __glXDispSwap_VertexAttrib4Niv(GLbyte * pc)
 {
-    CALL_VertexAttrib4NivARB(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                              (const GLint *)
-                                              bswap_32_array((uint32_t *) (pc +
-                                                                           4),
-                                                             4)
-                             ));
+    CALL_VertexAttrib4Niv( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 ),
+         (const GLint *)bswap_32_array( (uint32_t *) (pc +  4), 4 )
+    ) );
 }
 
-void
-__glXDispSwap_VertexAttrib4NsvARB(GLbyte * pc)
+void __glXDispSwap_VertexAttrib4Nsv(GLbyte * pc)
 {
-    CALL_VertexAttrib4NsvARB(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                              (const GLshort *)
-                                              bswap_16_array((uint16_t *) (pc +
-                                                                           4),
-                                                             4)
-                             ));
+    CALL_VertexAttrib4Nsv( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 ),
+         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  4), 4 )
+    ) );
 }
 
-void
-__glXDispSwap_VertexAttrib4NubvARB(GLbyte * pc)
+void __glXDispSwap_VertexAttrib4Nubv(GLbyte * pc)
 {
-    CALL_VertexAttrib4NubvARB(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                               (const GLubyte *) (pc + 4)
-                              ));
+    CALL_VertexAttrib4Nubv( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 ),
+         (const GLubyte *)(pc +  4)
+    ) );
 }
 
-void
-__glXDispSwap_VertexAttrib4NuivARB(GLbyte * pc)
+void __glXDispSwap_VertexAttrib4Nuiv(GLbyte * pc)
 {
-    CALL_VertexAttrib4NuivARB(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                               (const GLuint *)
-                                               bswap_32_array((uint32_t *) (pc +
-                                                                            4),
-                                                              4)
-                              ));
+    CALL_VertexAttrib4Nuiv( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 ),
+         (const GLuint *)bswap_32_array( (uint32_t *) (pc +  4), 4 )
+    ) );
 }
 
-void
-__glXDispSwap_VertexAttrib4NusvARB(GLbyte * pc)
+void __glXDispSwap_VertexAttrib4Nusv(GLbyte * pc)
 {
-    CALL_VertexAttrib4NusvARB(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                               (const GLushort *)
-                                               bswap_16_array((uint16_t *) (pc +
-                                                                            4),
-                                                              4)
-                              ));
+    CALL_VertexAttrib4Nusv( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 ),
+         (const GLushort *)bswap_16_array( (uint16_t *) (pc +  4), 4 )
+    ) );
 }
 
-void
-__glXDispSwap_VertexAttrib4bvARB(GLbyte * pc)
+void __glXDispSwap_VertexAttrib4bv(GLbyte * pc)
 {
-    CALL_VertexAttrib4bvARB(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             (const GLbyte *) (pc + 4)
-                            ));
+    CALL_VertexAttrib4bv( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 ),
+         (const GLbyte *)(pc +  4)
+    ) );
 }
 
-void
-__glXDispSwap_VertexAttrib4dvARB(GLbyte * pc)
+void __glXDispSwap_VertexAttrib4dv(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 36);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 36);
         pc -= 4;
     }
 #endif
 
-    CALL_VertexAttrib4dvARB(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             (const GLdouble *)
-                                             bswap_64_array((uint64_t *) (pc +
-                                                                          4), 4)
-                            ));
+    CALL_VertexAttrib4dv( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 ),
+         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  4), 4 )
+    ) );
 }
 
-void
-__glXDispSwap_VertexAttrib4fvARB(GLbyte * pc)
+void __glXDispSwap_VertexAttrib4iv(GLbyte * pc)
 {
-    CALL_VertexAttrib4fvARB(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             (const GLfloat *)
-                                             bswap_32_array((uint32_t *) (pc +
-                                                                          4), 4)
-                            ));
+    CALL_VertexAttrib4iv( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 ),
+         (const GLint *)bswap_32_array( (uint32_t *) (pc +  4), 4 )
+    ) );
 }
 
-void
-__glXDispSwap_VertexAttrib4ivARB(GLbyte * pc)
+void __glXDispSwap_VertexAttrib4sv(GLbyte * pc)
 {
-    CALL_VertexAttrib4ivARB(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             (const GLint *)
-                                             bswap_32_array((uint32_t *) (pc +
-                                                                          4), 4)
-                            ));
+    CALL_VertexAttrib4sv( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 ),
+         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  4), 4 )
+    ) );
 }
 
-void
-__glXDispSwap_VertexAttrib4svARB(GLbyte * pc)
+void __glXDispSwap_VertexAttrib4ubv(GLbyte * pc)
 {
-    CALL_VertexAttrib4svARB(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             (const GLshort *)
-                                             bswap_16_array((uint16_t *) (pc +
-                                                                          4), 4)
-                            ));
+    CALL_VertexAttrib4ubv( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 ),
+         (const GLubyte *)(pc +  4)
+    ) );
 }
 
-void
-__glXDispSwap_VertexAttrib4ubvARB(GLbyte * pc)
+void __glXDispSwap_VertexAttrib4uiv(GLbyte * pc)
 {
-    CALL_VertexAttrib4ubvARB(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                              (const GLubyte *) (pc + 4)
-                             ));
+    CALL_VertexAttrib4uiv( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 ),
+         (const GLuint *)bswap_32_array( (uint32_t *) (pc +  4), 4 )
+    ) );
 }
 
-void
-__glXDispSwap_VertexAttrib4uivARB(GLbyte * pc)
+void __glXDispSwap_VertexAttrib4usv(GLbyte * pc)
 {
-    CALL_VertexAttrib4uivARB(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                              (const GLuint *)
-                                              bswap_32_array((uint32_t *) (pc +
-                                                                           4),
-                                                             4)
-                             ));
+    CALL_VertexAttrib4usv( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 ),
+         (const GLushort *)bswap_16_array( (uint16_t *) (pc +  4), 4 )
+    ) );
 }
 
-void
-__glXDispSwap_VertexAttrib4usvARB(GLbyte * pc)
+void __glXDispSwap_ClampColor(GLbyte * pc)
 {
-    CALL_VertexAttrib4usvARB(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                              (const GLushort *)
-                                              bswap_16_array((uint16_t *) (pc +
-                                                                           4),
-                                                             4)
-                             ));
+    CALL_ClampColor( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLenum  )bswap_ENUM   ( pc +  4 )
+    ) );
 }
 
-void
-__glXDispSwap_BeginQueryARB(GLbyte * pc)
+void __glXDispSwap_BindProgramARB(GLbyte * pc)
 {
-    CALL_BeginQueryARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                        (GLuint) bswap_CARD32(pc + 4)
-                       ));
+    CALL_BindProgramARB( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLuint  )bswap_CARD32 ( pc +  4 )
+    ) );
 }
 
-int
-__glXDispSwap_DeleteQueriesARB(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_DeleteProgramsARB(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLsizei n = (GLsizei) bswap_CARD32(pc + 0);
-
-        CALL_DeleteQueriesARB(GET_DISPATCH(), (n,
-                                               (const GLuint *)
-                                               bswap_32_array((uint32_t *) (pc +
-                                                                            4),
-                                                              0)
-                              ));
+    pc += __GLX_VENDPRIV_HDR_SIZE;
+    if ( cx != NULL ) {
+        const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  0 );
+
+        CALL_DeleteProgramsARB( GET_DISPATCH(), (
+            n,
+             (const GLuint *)bswap_32_array( (uint32_t *) (pc +  4), 0 )
+        ) );
         error = Success;
     }
 
     return error;
 }
 
-void
-__glXDispSwap_EndQueryARB(GLbyte * pc)
+int __glXDispSwap_GenProgramsARB(__GLXclientState *cl, GLbyte *pc)
 {
-    CALL_EndQueryARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0)
-                     ));
-}
-
-int
-__glXDispSwap_GenQueriesARB(__GLXclientState * cl, GLbyte * pc)
-{
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLsizei n = (GLsizei) bswap_CARD32(pc + 0);
+    pc += __GLX_VENDPRIV_HDR_SIZE;
+    if ( cx != NULL ) {
+        const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  0 );
 
         GLuint answerBuffer[200];
-        GLuint *ids =
-            __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer),
-                                 4);
-        CALL_GenQueriesARB(GET_DISPATCH(), (n, ids));
-        (void) bswap_32_array((uint32_t *) ids, n);
-        __glXSendReplySwap(cl->client, ids, n, 4, GL_TRUE, 0);
+        GLuint * programs = __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer), 4);
+        CALL_GenProgramsARB( GET_DISPATCH(), (
+            n,
+            programs
+        ) );
+        (void) bswap_32_array( (uint32_t *) programs, n );
+        __glXSendReplySwap(cl->client, programs, n, 4, GL_TRUE, 0);
         error = Success;
     }
 
     return error;
 }
 
-int
-__glXDispSwap_GetQueryObjectivARB(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GetProgramEnvParameterdvARB(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
+    pc += __GLX_VENDPRIV_HDR_SIZE;
+    if ( cx != NULL ) {
+        GLdouble params[4];
+        CALL_GetProgramEnvParameterdvARB( GET_DISPATCH(), (
+             (GLenum  )bswap_ENUM   ( pc +  0 ),
+             (GLuint  )bswap_CARD32 ( pc +  4 ),
+            params
+        ) );
+        (void) bswap_64_array( (uint64_t *) params, 4 );
+        __glXSendReplySwap(cl->client, params, 4, 8, GL_FALSE, 0);
+        error = Success;
+    }
 
-        const GLuint compsize = __glGetQueryObjectivARB_size(pname);
-        GLint answerBuffer[200];
-        GLint *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+    return error;
+}
 
-        if (params == NULL)
-            return BadAlloc;
-        __glXClearErrorOccured();
+int __glXDispSwap_GetProgramEnvParameterfvARB(__GLXclientState *cl, GLbyte *pc)
+{
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
+    int error;
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
-        CALL_GetQueryObjectivARB(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                                  pname, params));
-        (void) bswap_32_array((uint32_t *) params, compsize);
-        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
+    pc += __GLX_VENDPRIV_HDR_SIZE;
+    if ( cx != NULL ) {
+        GLfloat params[4];
+        CALL_GetProgramEnvParameterfvARB( GET_DISPATCH(), (
+             (GLenum  )bswap_ENUM   ( pc +  0 ),
+             (GLuint  )bswap_CARD32 ( pc +  4 ),
+            params
+        ) );
+        (void) bswap_32_array( (uint32_t *) params, 4 );
+        __glXSendReplySwap(cl->client, params, 4, 4, GL_FALSE, 0);
         error = Success;
     }
 
     return error;
 }
 
-int
-__glXDispSwap_GetQueryObjectuivARB(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GetProgramLocalParameterdvARB(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
+    pc += __GLX_VENDPRIV_HDR_SIZE;
+    if ( cx != NULL ) {
+        GLdouble params[4];
+        CALL_GetProgramLocalParameterdvARB( GET_DISPATCH(), (
+             (GLenum  )bswap_ENUM   ( pc +  0 ),
+             (GLuint  )bswap_CARD32 ( pc +  4 ),
+            params
+        ) );
+        (void) bswap_64_array( (uint64_t *) params, 4 );
+        __glXSendReplySwap(cl->client, params, 4, 8, GL_FALSE, 0);
+        error = Success;
+    }
 
-        const GLuint compsize = __glGetQueryObjectuivARB_size(pname);
-        GLuint answerBuffer[200];
-        GLuint *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+    return error;
+}
 
-        if (params == NULL)
-            return BadAlloc;
-        __glXClearErrorOccured();
+int __glXDispSwap_GetProgramLocalParameterfvARB(__GLXclientState *cl, GLbyte *pc)
+{
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
+    int error;
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
-        CALL_GetQueryObjectuivARB(GET_DISPATCH(), ((GLuint)
-                                                   bswap_CARD32(pc + 0), pname,
-                                                   params));
-        (void) bswap_32_array((uint32_t *) params, compsize);
-        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
+    pc += __GLX_VENDPRIV_HDR_SIZE;
+    if ( cx != NULL ) {
+        GLfloat params[4];
+        CALL_GetProgramLocalParameterfvARB( GET_DISPATCH(), (
+             (GLenum  )bswap_ENUM   ( pc +  0 ),
+             (GLuint  )bswap_CARD32 ( pc +  4 ),
+            params
+        ) );
+        (void) bswap_32_array( (uint32_t *) params, 4 );
+        __glXSendReplySwap(cl->client, params, 4, 4, GL_FALSE, 0);
         error = Success;
     }
 
     return error;
 }
 
-int
-__glXDispSwap_GetQueryivARB(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GetProgramivARB(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
+    pc += __GLX_VENDPRIV_HDR_SIZE;
+    if ( cx != NULL ) {
+        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
 
-        const GLuint compsize = __glGetQueryivARB_size(pname);
+        const GLuint compsize = __glGetProgramivARB_size(pname);
         GLint answerBuffer[200];
-        GLint *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetQueryivARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                            pname, params));
-        (void) bswap_32_array((uint32_t *) params, compsize);
+        CALL_GetProgramivARB( GET_DISPATCH(), (
+             (GLenum  )bswap_ENUM   ( pc +  0 ),
+            pname,
+            params
+        ) );
+        (void) bswap_32_array( (uint32_t *) params, compsize );
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -5365,20 +4995,18 @@ __glXDispSwap_GetQueryivARB(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDispSwap_IsQueryARB(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_IsProgramARB(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXSingleReq *const req = (xGLXSingleReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if (cx != NULL) {
+    pc += __GLX_VENDPRIV_HDR_SIZE;
+    if ( cx != NULL ) {
         GLboolean retval;
-
-        retval = CALL_IsQueryARB(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0)
-                                 ));
+        retval = CALL_IsProgramARB( GET_DISPATCH(), (
+             (GLuint  )bswap_CARD32 ( pc +  0 )
+        ) );
         __glXSendReplySwap(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
         error = Success;
     }
@@ -5386,321 +5014,464 @@ __glXDispSwap_IsQueryARB(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-void
-__glXDispSwap_DrawBuffersARB(GLbyte * pc)
+void __glXDispSwap_ProgramEnvParameter4dvARB(GLbyte * pc)
 {
-    const GLsizei n = (GLsizei) bswap_CARD32(pc + 0);
+#ifdef __GLX_ALIGN64
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 40);
+        pc -= 4;
+    }
+#endif
 
-    CALL_DrawBuffersARB(GET_DISPATCH(), (n,
-                                         (const GLenum *)
-                                         bswap_32_array((uint32_t *) (pc + 4),
-                                                        0)
-                        ));
+    CALL_ProgramEnvParameter4dvARB( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLuint  )bswap_CARD32 ( pc +  4 ),
+         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  8), 4 )
+    ) );
 }
 
-void
-__glXDispSwap_ClampColorARB(GLbyte * pc)
+void __glXDispSwap_ProgramEnvParameter4fvARB(GLbyte * pc)
 {
-    CALL_ClampColorARB(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                        (GLenum) bswap_ENUM(pc + 4)
-                       ));
+    CALL_ProgramEnvParameter4fvARB( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLuint  )bswap_CARD32 ( pc +  4 ),
+         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  8), 4 )
+    ) );
 }
 
-void
-__glXDispSwap_RenderbufferStorageMultisample(GLbyte * pc)
+void __glXDispSwap_ProgramLocalParameter4dvARB(GLbyte * pc)
 {
-    CALL_RenderbufferStorageMultisample(GET_DISPATCH(), ((GLenum)
-                                                         bswap_ENUM(pc + 0),
-                                                         (GLsizei)
-                                                         bswap_CARD32(pc + 4),
-                                                         (GLenum) bswap_ENUM(pc
-                                                                             +
-                                                                             8),
-                                                         (GLsizei)
-                                                         bswap_CARD32(pc + 12),
-                                                         (GLsizei)
-                                                         bswap_CARD32(pc + 16)
-                                        ));
+#ifdef __GLX_ALIGN64
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 40);
+        pc -= 4;
+    }
+#endif
+
+    CALL_ProgramLocalParameter4dvARB( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLuint  )bswap_CARD32 ( pc +  4 ),
+         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  8), 4 )
+    ) );
 }
 
-void
-__glXDispSwap_SampleMaskSGIS(GLbyte * pc)
+void __glXDispSwap_ProgramLocalParameter4fvARB(GLbyte * pc)
 {
-    CALL_SampleMaskSGIS(GET_DISPATCH(), ((GLclampf) bswap_FLOAT32(pc + 0),
-                                         *(GLboolean *) (pc + 4)
-                        ));
+    CALL_ProgramLocalParameter4fvARB( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLuint  )bswap_CARD32 ( pc +  4 ),
+         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  8), 4 )
+    ) );
 }
 
-void
-__glXDispSwap_SamplePatternSGIS(GLbyte * pc)
+void __glXDispSwap_ProgramStringARB(GLbyte * pc)
 {
-    CALL_SamplePatternSGIS(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0)
-                           ));
+    const GLsizei len =  (GLsizei )bswap_CARD32 ( pc +  8 );
+
+    CALL_ProgramStringARB( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLenum  )bswap_ENUM   ( pc +  4 ),
+        len,
+         (const GLvoid *)(pc + 12)
+    ) );
 }
 
-void
-__glXDispSwap_PointParameterfEXT(GLbyte * pc)
+void __glXDispSwap_VertexAttrib1fvARB(GLbyte * pc)
 {
-    CALL_PointParameterfEXT(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                             (GLfloat) bswap_FLOAT32(pc + 4)
-                            ));
+    CALL_VertexAttrib1fvARB( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 ),
+         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  4), 1 )
+    ) );
 }
 
-void
-__glXDispSwap_PointParameterfvEXT(GLbyte * pc)
+void __glXDispSwap_VertexAttrib2fvARB(GLbyte * pc)
 {
-    const GLenum pname = (GLenum) bswap_ENUM(pc + 0);
-    const GLfloat *params;
+    CALL_VertexAttrib2fvARB( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 ),
+         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  4), 2 )
+    ) );
+}
 
-    params =
-        (const GLfloat *) bswap_32_array((uint32_t *) (pc + 4),
-                                         __glPointParameterfvEXT_size(pname));
+void __glXDispSwap_VertexAttrib3fvARB(GLbyte * pc)
+{
+    CALL_VertexAttrib3fvARB( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 ),
+         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  4), 3 )
+    ) );
+}
 
-    CALL_PointParameterfvEXT(GET_DISPATCH(), (pname, params));
+void __glXDispSwap_VertexAttrib4fvARB(GLbyte * pc)
+{
+    CALL_VertexAttrib4fvARB( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 ),
+         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  4), 4 )
+    ) );
 }
 
-void
-__glXDispSwap_SecondaryColor3bvEXT(GLbyte * pc)
+void __glXDispSwap_BindFramebuffer(GLbyte * pc)
 {
-    CALL_SecondaryColor3bvEXT(GET_DISPATCH(), ((const GLbyte *) (pc + 0)
-                              ));
+    CALL_BindFramebuffer( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLuint  )bswap_CARD32 ( pc +  4 )
+    ) );
 }
 
-void
-__glXDispSwap_SecondaryColor3dvEXT(GLbyte * pc)
+void __glXDispSwap_BindRenderbuffer(GLbyte * pc)
 {
-#ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 24);
-        pc -= 4;
+    CALL_BindRenderbuffer( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLuint  )bswap_CARD32 ( pc +  4 )
+    ) );
+}
+
+void __glXDispSwap_BlitFramebuffer(GLbyte * pc)
+{
+    CALL_BlitFramebuffer( GET_DISPATCH(), (
+         (GLint   )bswap_CARD32 ( pc +  0 ),
+         (GLint   )bswap_CARD32 ( pc +  4 ),
+         (GLint   )bswap_CARD32 ( pc +  8 ),
+         (GLint   )bswap_CARD32 ( pc + 12 ),
+         (GLint   )bswap_CARD32 ( pc + 16 ),
+         (GLint   )bswap_CARD32 ( pc + 20 ),
+         (GLint   )bswap_CARD32 ( pc + 24 ),
+         (GLint   )bswap_CARD32 ( pc + 28 ),
+         (GLbitfield)bswap_CARD32 ( pc + 32 ),
+         (GLenum  )bswap_ENUM   ( pc + 36 )
+    ) );
+}
+
+int __glXDispSwap_CheckFramebufferStatus(__GLXclientState *cl, GLbyte *pc)
+{
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
+    int error;
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
+
+    pc += __GLX_VENDPRIV_HDR_SIZE;
+    if ( cx != NULL ) {
+        GLenum retval;
+        retval = CALL_CheckFramebufferStatus( GET_DISPATCH(), (
+             (GLenum  )bswap_ENUM   ( pc +  0 )
+        ) );
+        __glXSendReplySwap(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
+        error = Success;
     }
-#endif
 
-    CALL_SecondaryColor3dvEXT(GET_DISPATCH(), ((const GLdouble *)
-                                               bswap_64_array((uint64_t *) (pc +
-                                                                            0),
-                                                              3)
-                              ));
+    return error;
 }
 
-void
-__glXDispSwap_SecondaryColor3fvEXT(GLbyte * pc)
+void __glXDispSwap_DeleteFramebuffers(GLbyte * pc)
 {
-    CALL_SecondaryColor3fvEXT(GET_DISPATCH(), ((const GLfloat *)
-                                               bswap_32_array((uint32_t *) (pc +
-                                                                            0),
-                                                              3)
-                              ));
+    const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  0 );
+
+    CALL_DeleteFramebuffers( GET_DISPATCH(), (
+        n,
+         (const GLuint *)bswap_32_array( (uint32_t *) (pc +  4), 0 )
+    ) );
 }
 
-void
-__glXDispSwap_SecondaryColor3ivEXT(GLbyte * pc)
+void __glXDispSwap_DeleteRenderbuffers(GLbyte * pc)
 {
-    CALL_SecondaryColor3ivEXT(GET_DISPATCH(), ((const GLint *)
-                                               bswap_32_array((uint32_t *) (pc +
-                                                                            0),
-                                                              3)
-                              ));
+    const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  0 );
+
+    CALL_DeleteRenderbuffers( GET_DISPATCH(), (
+        n,
+         (const GLuint *)bswap_32_array( (uint32_t *) (pc +  4), 0 )
+    ) );
 }
 
-void
-__glXDispSwap_SecondaryColor3svEXT(GLbyte * pc)
+void __glXDispSwap_FramebufferRenderbuffer(GLbyte * pc)
 {
-    CALL_SecondaryColor3svEXT(GET_DISPATCH(), ((const GLshort *)
-                                               bswap_16_array((uint16_t *) (pc +
-                                                                            0),
-                                                              3)
-                              ));
+    CALL_FramebufferRenderbuffer( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLenum  )bswap_ENUM   ( pc +  4 ),
+         (GLenum  )bswap_ENUM   ( pc +  8 ),
+         (GLuint  )bswap_CARD32 ( pc + 12 )
+    ) );
 }
 
-void
-__glXDispSwap_SecondaryColor3ubvEXT(GLbyte * pc)
+void __glXDispSwap_FramebufferTexture1D(GLbyte * pc)
 {
-    CALL_SecondaryColor3ubvEXT(GET_DISPATCH(), ((const GLubyte *) (pc + 0)
-                               ));
+    CALL_FramebufferTexture1D( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLenum  )bswap_ENUM   ( pc +  4 ),
+         (GLenum  )bswap_ENUM   ( pc +  8 ),
+         (GLuint  )bswap_CARD32 ( pc + 12 ),
+         (GLint   )bswap_CARD32 ( pc + 16 )
+    ) );
 }
 
-void
-__glXDispSwap_SecondaryColor3uivEXT(GLbyte * pc)
+void __glXDispSwap_FramebufferTexture2D(GLbyte * pc)
 {
-    CALL_SecondaryColor3uivEXT(GET_DISPATCH(), ((const GLuint *)
-                                                bswap_32_array((uint32_t *) (pc
-                                                                             +
-                                                                             0),
-                                                               3)
-                               ));
+    CALL_FramebufferTexture2D( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLenum  )bswap_ENUM   ( pc +  4 ),
+         (GLenum  )bswap_ENUM   ( pc +  8 ),
+         (GLuint  )bswap_CARD32 ( pc + 12 ),
+         (GLint   )bswap_CARD32 ( pc + 16 )
+    ) );
 }
 
-void
-__glXDispSwap_SecondaryColor3usvEXT(GLbyte * pc)
+void __glXDispSwap_FramebufferTexture3D(GLbyte * pc)
 {
-    CALL_SecondaryColor3usvEXT(GET_DISPATCH(), ((const GLushort *)
-                                                bswap_16_array((uint16_t *) (pc
-                                                                             +
-                                                                             0),
-                                                               3)
-                               ));
+    CALL_FramebufferTexture3D( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLenum  )bswap_ENUM   ( pc +  4 ),
+         (GLenum  )bswap_ENUM   ( pc +  8 ),
+         (GLuint  )bswap_CARD32 ( pc + 12 ),
+         (GLint   )bswap_CARD32 ( pc + 16 ),
+         (GLint   )bswap_CARD32 ( pc + 20 )
+    ) );
 }
 
-void
-__glXDispSwap_FogCoorddvEXT(GLbyte * pc)
+void __glXDispSwap_FramebufferTextureLayer(GLbyte * pc)
 {
-#ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 8);
-        pc -= 4;
+    CALL_FramebufferTextureLayer( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLenum  )bswap_ENUM   ( pc +  4 ),
+         (GLuint  )bswap_CARD32 ( pc +  8 ),
+         (GLint   )bswap_CARD32 ( pc + 12 ),
+         (GLint   )bswap_CARD32 ( pc + 16 )
+    ) );
+}
+
+int __glXDispSwap_GenFramebuffers(__GLXclientState *cl, GLbyte *pc)
+{
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
+    int error;
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
+
+    pc += __GLX_VENDPRIV_HDR_SIZE;
+    if ( cx != NULL ) {
+        const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  0 );
+
+        GLuint answerBuffer[200];
+        GLuint * framebuffers = __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer), 4);
+        CALL_GenFramebuffers( GET_DISPATCH(), (
+            n,
+            framebuffers
+        ) );
+        (void) bswap_32_array( (uint32_t *) framebuffers, n );
+        __glXSendReplySwap(cl->client, framebuffers, n, 4, GL_TRUE, 0);
+        error = Success;
     }
-#endif
 
-    CALL_FogCoorddvEXT(GET_DISPATCH(), ((const GLdouble *)
-                                        bswap_64_array((uint64_t *) (pc + 0), 1)
-                       ));
+    return error;
 }
 
-void
-__glXDispSwap_FogCoordfvEXT(GLbyte * pc)
+int __glXDispSwap_GenRenderbuffers(__GLXclientState *cl, GLbyte *pc)
 {
-    CALL_FogCoordfvEXT(GET_DISPATCH(), ((const GLfloat *)
-                                        bswap_32_array((uint32_t *) (pc + 0), 1)
-                       ));
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
+    int error;
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
+
+    pc += __GLX_VENDPRIV_HDR_SIZE;
+    if ( cx != NULL ) {
+        const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  0 );
+
+        GLuint answerBuffer[200];
+        GLuint * renderbuffers = __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer), 4);
+        CALL_GenRenderbuffers( GET_DISPATCH(), (
+            n,
+            renderbuffers
+        ) );
+        (void) bswap_32_array( (uint32_t *) renderbuffers, n );
+        __glXSendReplySwap(cl->client, renderbuffers, n, 4, GL_TRUE, 0);
+        error = Success;
+    }
+
+    return error;
 }
 
-void
-__glXDispSwap_BlendFuncSeparateEXT(GLbyte * pc)
+void __glXDispSwap_GenerateMipmap(GLbyte * pc)
 {
-    CALL_BlendFuncSeparateEXT(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                               (GLenum) bswap_ENUM(pc + 4),
-                                               (GLenum) bswap_ENUM(pc + 8),
-                                               (GLenum) bswap_ENUM(pc + 12)
-                              ));
+    CALL_GenerateMipmap( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 )
+    ) );
 }
 
-void
-__glXDispSwap_WindowPos3fvMESA(GLbyte * pc)
+int __glXDispSwap_GetFramebufferAttachmentParameteriv(__GLXclientState *cl, GLbyte *pc)
 {
-    CALL_WindowPos3fvMESA(GET_DISPATCH(), ((const GLfloat *)
-                                           bswap_32_array((uint32_t *) (pc + 0),
-                                                          3)
-                          ));
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
+    int error;
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
+
+    pc += __GLX_VENDPRIV_HDR_SIZE;
+    if ( cx != NULL ) {
+        GLint params[1];
+        CALL_GetFramebufferAttachmentParameteriv( GET_DISPATCH(), (
+             (GLenum  )bswap_ENUM   ( pc +  0 ),
+             (GLenum  )bswap_ENUM   ( pc +  4 ),
+             (GLenum  )bswap_ENUM   ( pc +  8 ),
+            params
+        ) );
+        (void) bswap_32_array( (uint32_t *) params, 1 );
+        __glXSendReplySwap(cl->client, params, 1, 4, GL_FALSE, 0);
+        error = Success;
+    }
+
+    return error;
 }
 
-int
-__glXDispSwap_AreProgramsResidentNV(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GetRenderbufferParameteriv(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLsizei n = (GLsizei) bswap_CARD32(pc + 0);
-
-        GLboolean retval;
-        GLboolean answerBuffer[200];
-        GLboolean *residences =
-            __glXGetAnswerBuffer(cl, n, answerBuffer, sizeof(answerBuffer), 1);
-        retval =
-            CALL_AreProgramsResidentNV(GET_DISPATCH(),
-                                       (n,
-                                        (const GLuint *)
-                                        bswap_32_array((uint32_t *) (pc + 4),
-                                                       0), residences));
-        __glXSendReplySwap(cl->client, residences, n, 1, GL_FALSE, retval);
+    if ( cx != NULL ) {
+        GLint params[1];
+        CALL_GetRenderbufferParameteriv( GET_DISPATCH(), (
+             (GLenum  )bswap_ENUM   ( pc +  0 ),
+             (GLenum  )bswap_ENUM   ( pc +  4 ),
+            params
+        ) );
+        (void) bswap_32_array( (uint32_t *) params, 1 );
+        __glXSendReplySwap(cl->client, params, 1, 4, GL_FALSE, 0);
         error = Success;
     }
 
     return error;
 }
 
-void
-__glXDispSwap_BindProgramNV(GLbyte * pc)
+int __glXDispSwap_IsFramebuffer(__GLXclientState *cl, GLbyte *pc)
 {
-    CALL_BindProgramNV(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                        (GLuint) bswap_CARD32(pc + 4)
-                       ));
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
+    int error;
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
+
+    pc += __GLX_VENDPRIV_HDR_SIZE;
+    if ( cx != NULL ) {
+        GLboolean retval;
+        retval = CALL_IsFramebuffer( GET_DISPATCH(), (
+             (GLuint  )bswap_CARD32 ( pc +  0 )
+        ) );
+        __glXSendReplySwap(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
+        error = Success;
+    }
+
+    return error;
 }
 
-int
-__glXDispSwap_DeleteProgramsNV(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_IsRenderbuffer(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLsizei n = (GLsizei) bswap_CARD32(pc + 0);
-
-        CALL_DeleteProgramsNV(GET_DISPATCH(), (n,
-                                               (const GLuint *)
-                                               bswap_32_array((uint32_t *) (pc +
-                                                                            4),
-                                                              0)
-                              ));
+    if ( cx != NULL ) {
+        GLboolean retval;
+        retval = CALL_IsRenderbuffer( GET_DISPATCH(), (
+             (GLuint  )bswap_CARD32 ( pc +  0 )
+        ) );
+        __glXSendReplySwap(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
         error = Success;
     }
 
     return error;
 }
 
-void
-__glXDispSwap_ExecuteProgramNV(GLbyte * pc)
+void __glXDispSwap_RenderbufferStorage(GLbyte * pc)
+{
+    CALL_RenderbufferStorage( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLenum  )bswap_ENUM   ( pc +  4 ),
+         (GLsizei )bswap_CARD32 ( pc +  8 ),
+         (GLsizei )bswap_CARD32 ( pc + 12 )
+    ) );
+}
+
+void __glXDispSwap_RenderbufferStorageMultisample(GLbyte * pc)
+{
+    CALL_RenderbufferStorageMultisample( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLsizei )bswap_CARD32 ( pc +  4 ),
+         (GLenum  )bswap_ENUM   ( pc +  8 ),
+         (GLsizei )bswap_CARD32 ( pc + 12 ),
+         (GLsizei )bswap_CARD32 ( pc + 16 )
+    ) );
+}
+
+void __glXDispSwap_SampleMaskSGIS(GLbyte * pc)
+{
+    CALL_SampleMaskSGIS( GET_DISPATCH(), (
+         (GLclampf)bswap_FLOAT32( pc +  0 ),
+        *(GLboolean *)(pc +  4)
+    ) );
+}
+
+void __glXDispSwap_SamplePatternSGIS(GLbyte * pc)
+{
+    CALL_SamplePatternSGIS( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 )
+    ) );
+}
+
+void __glXDispSwap_SecondaryColor3fvEXT(GLbyte * pc)
+{
+    CALL_SecondaryColor3fvEXT( GET_DISPATCH(), (
+         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  0), 3 )
+    ) );
+}
+
+void __glXDispSwap_FogCoordfvEXT(GLbyte * pc)
 {
-    CALL_ExecuteProgramNV(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                           (GLuint) bswap_CARD32(pc + 4),
-                                           (const GLfloat *)
-                                           bswap_32_array((uint32_t *) (pc + 8),
-                                                          4)
-                          ));
+    CALL_FogCoordfvEXT( GET_DISPATCH(), (
+         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  0), 1 )
+    ) );
 }
 
-int
-__glXDispSwap_GenProgramsNV(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_AreProgramsResidentNV(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLsizei n = (GLsizei) bswap_CARD32(pc + 0);
+    if ( cx != NULL ) {
+        const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  0 );
 
-        GLuint answerBuffer[200];
-        GLuint *programs =
-            __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer),
-                                 4);
-        CALL_GenProgramsNV(GET_DISPATCH(), (n, programs));
-        (void) bswap_32_array((uint32_t *) programs, n);
-        __glXSendReplySwap(cl->client, programs, n, 4, GL_TRUE, 0);
+        GLboolean retval;
+        GLboolean answerBuffer[200];
+        GLboolean * residences = __glXGetAnswerBuffer(cl, n, answerBuffer, sizeof(answerBuffer), 1);
+        retval = CALL_AreProgramsResidentNV( GET_DISPATCH(), (
+            n,
+             (const GLuint *)bswap_32_array( (uint32_t *) (pc +  4), 0 ),
+            residences
+        ) );
+        __glXSendReplySwap(cl->client, residences, n, 1, GL_FALSE, retval);
         error = Success;
     }
 
     return error;
 }
 
-int
-__glXDispSwap_GetProgramParameterdvNV(__GLXclientState * cl, GLbyte * pc)
+void __glXDispSwap_ExecuteProgramNV(GLbyte * pc)
+{
+    CALL_ExecuteProgramNV( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLuint  )bswap_CARD32 ( pc +  4 ),
+         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  8), 4 )
+    ) );
+}
+
+int __glXDispSwap_GetProgramParameterdvNV(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
+    if ( cx != NULL ) {
         GLdouble params[4];
-
-        CALL_GetProgramParameterdvNV(GET_DISPATCH(), ((GLenum)
-                                                      bswap_ENUM(pc + 0),
-                                                      (GLuint) bswap_CARD32(pc +
-                                                                            4),
-                                                      (GLenum) bswap_ENUM(pc +
-                                                                          8),
-                                                      params));
-        (void) bswap_64_array((uint64_t *) params, 4);
+        CALL_GetProgramParameterdvNV( GET_DISPATCH(), (
+             (GLenum  )bswap_ENUM   ( pc +  0 ),
+             (GLuint  )bswap_CARD32 ( pc +  4 ),
+             (GLenum  )bswap_ENUM   ( pc +  8 ),
+            params
+        ) );
+        (void) bswap_64_array( (uint64_t *) params, 4 );
         __glXSendReplySwap(cl->client, params, 4, 8, GL_FALSE, 0);
         error = Success;
     }
@@ -5708,26 +5479,22 @@ __glXDispSwap_GetProgramParameterdvNV(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDispSwap_GetProgramParameterfvNV(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GetProgramParameterfvNV(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
+    if ( cx != NULL ) {
         GLfloat params[4];
-
-        CALL_GetProgramParameterfvNV(GET_DISPATCH(), ((GLenum)
-                                                      bswap_ENUM(pc + 0),
-                                                      (GLuint) bswap_CARD32(pc +
-                                                                            4),
-                                                      (GLenum) bswap_ENUM(pc +
-                                                                          8),
-                                                      params));
-        (void) bswap_32_array((uint32_t *) params, 4);
+        CALL_GetProgramParameterfvNV( GET_DISPATCH(), (
+             (GLenum  )bswap_ENUM   ( pc +  0 ),
+             (GLuint  )bswap_CARD32 ( pc +  4 ),
+             (GLenum  )bswap_ENUM   ( pc +  8 ),
+            params
+        ) );
+        (void) bswap_32_array( (uint32_t *) params, 4 );
         __glXSendReplySwap(cl->client, params, 4, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -5735,31 +5502,29 @@ __glXDispSwap_GetProgramParameterfvNV(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDispSwap_GetProgramivNV(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GetProgramivNV(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
 
         const GLuint compsize = __glGetProgramivNV_size(pname);
         GLint answerBuffer[200];
-        GLint *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetProgramivNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             pname, params));
-        (void) bswap_32_array((uint32_t *) params, compsize);
+        CALL_GetProgramivNV( GET_DISPATCH(), (
+             (GLuint  )bswap_CARD32 ( pc +  0 ),
+            pname,
+            params
+        ) );
+        (void) bswap_32_array( (uint32_t *) params, compsize );
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -5767,23 +5532,22 @@ __glXDispSwap_GetProgramivNV(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDispSwap_GetTrackMatrixivNV(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GetTrackMatrixivNV(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
+    if ( cx != NULL ) {
         GLint params[1];
-
-        CALL_GetTrackMatrixivNV(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                                 (GLuint) bswap_CARD32(pc + 4),
-                                                 (GLenum) bswap_ENUM(pc + 8),
-                                                 params));
-        (void) bswap_32_array((uint32_t *) params, 1);
+        CALL_GetTrackMatrixivNV( GET_DISPATCH(), (
+             (GLenum  )bswap_ENUM   ( pc +  0 ),
+             (GLuint  )bswap_CARD32 ( pc +  4 ),
+             (GLenum  )bswap_ENUM   ( pc +  8 ),
+            params
+        ) );
+        (void) bswap_32_array( (uint32_t *) params, 1 );
         __glXSendReplySwap(cl->client, params, 1, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -5791,31 +5555,29 @@ __glXDispSwap_GetTrackMatrixivNV(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDispSwap_GetVertexAttribdvNV(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GetVertexAttribdvNV(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
 
         const GLuint compsize = __glGetVertexAttribdvNV_size(pname);
         GLdouble answerBuffer[200];
-        GLdouble *params =
-            __glXGetAnswerBuffer(cl, compsize * 8, answerBuffer,
-                                 sizeof(answerBuffer), 8);
+        GLdouble * params = __glXGetAnswerBuffer(cl, compsize * 8, answerBuffer, sizeof(answerBuffer), 8);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetVertexAttribdvNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                                  pname, params));
-        (void) bswap_64_array((uint64_t *) params, compsize);
+        CALL_GetVertexAttribdvNV( GET_DISPATCH(), (
+             (GLuint  )bswap_CARD32 ( pc +  0 ),
+            pname,
+            params
+        ) );
+        (void) bswap_64_array( (uint64_t *) params, compsize );
         __glXSendReplySwap(cl->client, params, compsize, 8, GL_FALSE, 0);
         error = Success;
     }
@@ -5823,31 +5585,29 @@ __glXDispSwap_GetVertexAttribdvNV(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDispSwap_GetVertexAttribfvNV(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GetVertexAttribfvNV(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
 
         const GLuint compsize = __glGetVertexAttribfvNV_size(pname);
         GLfloat answerBuffer[200];
-        GLfloat *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetVertexAttribfvNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                                  pname, params));
-        (void) bswap_32_array((uint32_t *) params, compsize);
+        CALL_GetVertexAttribfvNV( GET_DISPATCH(), (
+             (GLuint  )bswap_CARD32 ( pc +  0 ),
+            pname,
+            params
+        ) );
+        (void) bswap_32_array( (uint32_t *) params, compsize );
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -5855,31 +5615,29 @@ __glXDispSwap_GetVertexAttribfvNV(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDispSwap_GetVertexAttribivNV(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GetVertexAttribivNV(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLenum pname = (GLenum) bswap_ENUM(pc + 4);
+    if ( cx != NULL ) {
+        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
 
         const GLuint compsize = __glGetVertexAttribivNV_size(pname);
         GLint answerBuffer[200];
-        GLint *params =
-            __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer,
-                                 sizeof(answerBuffer), 4);
+        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
 
-        if (params == NULL)
-            return BadAlloc;
+        if (params == NULL) return BadAlloc;
         __glXClearErrorOccured();
 
-        CALL_GetVertexAttribivNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                                  pname, params));
-        (void) bswap_32_array((uint32_t *) params, compsize);
+        CALL_GetVertexAttribivNV( GET_DISPATCH(), (
+             (GLuint  )bswap_CARD32 ( pc +  0 ),
+            pname,
+            params
+        ) );
+        (void) bswap_32_array( (uint32_t *) params, compsize );
         __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
         error = Success;
     }
@@ -5887,510 +5645,402 @@ __glXDispSwap_GetVertexAttribivNV(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDispSwap_IsProgramNV(__GLXclientState * cl, GLbyte * pc)
-{
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        GLboolean retval;
-
-        retval = CALL_IsProgramNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0)
-                                  ));
-        __glXSendReplySwap(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
-        error = Success;
-    }
-
-    return error;
-}
-
-void
-__glXDispSwap_LoadProgramNV(GLbyte * pc)
+void __glXDispSwap_LoadProgramNV(GLbyte * pc)
 {
-    const GLsizei len = (GLsizei) bswap_CARD32(pc + 8);
+    const GLsizei len =  (GLsizei )bswap_CARD32 ( pc +  8 );
 
-    CALL_LoadProgramNV(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                        (GLuint) bswap_CARD32(pc + 4),
-                                        len, (const GLubyte *) (pc + 12)
-                       ));
+    CALL_LoadProgramNV( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLuint  )bswap_CARD32 ( pc +  4 ),
+        len,
+         (const GLubyte *)(pc + 12)
+    ) );
 }
 
-void
-__glXDispSwap_ProgramParameters4dvNV(GLbyte * pc)
+void __glXDispSwap_ProgramParameters4dvNV(GLbyte * pc)
 {
-    const GLsizei num = (GLsizei) bswap_CARD32(pc + 8);
+    const GLsizei num =  (GLsizei )bswap_CARD32 ( pc +  8 );
 
 #ifdef __GLX_ALIGN64
     const GLuint cmdlen = 16 + __GLX_PAD((num * 32)) - 4;
-
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, cmdlen);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, cmdlen);
         pc -= 4;
     }
 #endif
 
-    CALL_ProgramParameters4dvNV(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                                 (GLuint) bswap_CARD32(pc + 4),
-                                                 num,
-                                                 (const GLdouble *)
-                                                 bswap_64_array((uint64_t *) (pc
-                                                                              +
-                                                                              12),
-                                                                0)
-                                ));
+    CALL_ProgramParameters4dvNV( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLuint  )bswap_CARD32 ( pc +  4 ),
+        num,
+         (const GLdouble *)bswap_64_array( (uint64_t *) (pc + 12), 0 )
+    ) );
 }
 
-void
-__glXDispSwap_ProgramParameters4fvNV(GLbyte * pc)
+void __glXDispSwap_ProgramParameters4fvNV(GLbyte * pc)
 {
-    const GLsizei num = (GLsizei) bswap_CARD32(pc + 8);
+    const GLsizei num =  (GLsizei )bswap_CARD32 ( pc +  8 );
 
-    CALL_ProgramParameters4fvNV(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                                 (GLuint) bswap_CARD32(pc + 4),
-                                                 num,
-                                                 (const GLfloat *)
-                                                 bswap_32_array((uint32_t *) (pc
-                                                                              +
-                                                                              12),
-                                                                0)
-                                ));
+    CALL_ProgramParameters4fvNV( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLuint  )bswap_CARD32 ( pc +  4 ),
+        num,
+         (const GLfloat *)bswap_32_array( (uint32_t *) (pc + 12), 0 )
+    ) );
 }
 
-void
-__glXDispSwap_RequestResidentProgramsNV(GLbyte * pc)
+void __glXDispSwap_RequestResidentProgramsNV(GLbyte * pc)
 {
-    const GLsizei n = (GLsizei) bswap_CARD32(pc + 0);
+    const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  0 );
 
-    CALL_RequestResidentProgramsNV(GET_DISPATCH(), (n,
-                                                    (const GLuint *)
-                                                    bswap_32_array((uint32_t
-                                                                    *) (pc + 4),
-                                                                   0)
-                                   ));
+    CALL_RequestResidentProgramsNV( GET_DISPATCH(), (
+        n,
+         (const GLuint *)bswap_32_array( (uint32_t *) (pc +  4), 0 )
+    ) );
 }
 
-void
-__glXDispSwap_TrackMatrixNV(GLbyte * pc)
+void __glXDispSwap_TrackMatrixNV(GLbyte * pc)
 {
-    CALL_TrackMatrixNV(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                        (GLuint) bswap_CARD32(pc + 4),
-                                        (GLenum) bswap_ENUM(pc + 8),
-                                        (GLenum) bswap_ENUM(pc + 12)
-                       ));
+    CALL_TrackMatrixNV( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 ),
+         (GLuint  )bswap_CARD32 ( pc +  4 ),
+         (GLenum  )bswap_ENUM   ( pc +  8 ),
+         (GLenum  )bswap_ENUM   ( pc + 12 )
+    ) );
 }
 
-void
-__glXDispSwap_VertexAttrib1dvNV(GLbyte * pc)
+void __glXDispSwap_VertexAttrib1dvNV(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 12);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 12);
         pc -= 4;
     }
 #endif
 
-    CALL_VertexAttrib1dvNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                            (const GLdouble *)
-                                            bswap_64_array((uint64_t *) (pc +
-                                                                         4), 1)
-                           ));
+    CALL_VertexAttrib1dvNV( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 ),
+         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  4), 1 )
+    ) );
 }
 
-void
-__glXDispSwap_VertexAttrib1fvNV(GLbyte * pc)
+void __glXDispSwap_VertexAttrib1fvNV(GLbyte * pc)
 {
-    CALL_VertexAttrib1fvNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                            (const GLfloat *)
-                                            bswap_32_array((uint32_t *) (pc +
-                                                                         4), 1)
-                           ));
+    CALL_VertexAttrib1fvNV( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 ),
+         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  4), 1 )
+    ) );
 }
 
-void
-__glXDispSwap_VertexAttrib1svNV(GLbyte * pc)
+void __glXDispSwap_VertexAttrib1svNV(GLbyte * pc)
 {
-    CALL_VertexAttrib1svNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                            (const GLshort *)
-                                            bswap_16_array((uint16_t *) (pc +
-                                                                         4), 1)
-                           ));
+    CALL_VertexAttrib1svNV( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 ),
+         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  4), 1 )
+    ) );
 }
 
-void
-__glXDispSwap_VertexAttrib2dvNV(GLbyte * pc)
+void __glXDispSwap_VertexAttrib2dvNV(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 20);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 20);
         pc -= 4;
     }
 #endif
 
-    CALL_VertexAttrib2dvNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                            (const GLdouble *)
-                                            bswap_64_array((uint64_t *) (pc +
-                                                                         4), 2)
-                           ));
+    CALL_VertexAttrib2dvNV( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 ),
+         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  4), 2 )
+    ) );
 }
 
-void
-__glXDispSwap_VertexAttrib2fvNV(GLbyte * pc)
+void __glXDispSwap_VertexAttrib2fvNV(GLbyte * pc)
 {
-    CALL_VertexAttrib2fvNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                            (const GLfloat *)
-                                            bswap_32_array((uint32_t *) (pc +
-                                                                         4), 2)
-                           ));
+    CALL_VertexAttrib2fvNV( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 ),
+         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  4), 2 )
+    ) );
 }
 
-void
-__glXDispSwap_VertexAttrib2svNV(GLbyte * pc)
+void __glXDispSwap_VertexAttrib2svNV(GLbyte * pc)
 {
-    CALL_VertexAttrib2svNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                            (const GLshort *)
-                                            bswap_16_array((uint16_t *) (pc +
-                                                                         4), 2)
-                           ));
+    CALL_VertexAttrib2svNV( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 ),
+         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  4), 2 )
+    ) );
 }
 
-void
-__glXDispSwap_VertexAttrib3dvNV(GLbyte * pc)
+void __glXDispSwap_VertexAttrib3dvNV(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 28);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 28);
         pc -= 4;
     }
 #endif
 
-    CALL_VertexAttrib3dvNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                            (const GLdouble *)
-                                            bswap_64_array((uint64_t *) (pc +
-                                                                         4), 3)
-                           ));
+    CALL_VertexAttrib3dvNV( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 ),
+         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  4), 3 )
+    ) );
 }
 
-void
-__glXDispSwap_VertexAttrib3fvNV(GLbyte * pc)
+void __glXDispSwap_VertexAttrib3fvNV(GLbyte * pc)
 {
-    CALL_VertexAttrib3fvNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                            (const GLfloat *)
-                                            bswap_32_array((uint32_t *) (pc +
-                                                                         4), 3)
-                           ));
+    CALL_VertexAttrib3fvNV( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 ),
+         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  4), 3 )
+    ) );
 }
 
-void
-__glXDispSwap_VertexAttrib3svNV(GLbyte * pc)
+void __glXDispSwap_VertexAttrib3svNV(GLbyte * pc)
 {
-    CALL_VertexAttrib3svNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                            (const GLshort *)
-                                            bswap_16_array((uint16_t *) (pc +
-                                                                         4), 3)
-                           ));
+    CALL_VertexAttrib3svNV( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 ),
+         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  4), 3 )
+    ) );
 }
 
-void
-__glXDispSwap_VertexAttrib4dvNV(GLbyte * pc)
+void __glXDispSwap_VertexAttrib4dvNV(GLbyte * pc)
 {
 #ifdef __GLX_ALIGN64
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, 36);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, 36);
         pc -= 4;
     }
 #endif
 
-    CALL_VertexAttrib4dvNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                            (const GLdouble *)
-                                            bswap_64_array((uint64_t *) (pc +
-                                                                         4), 4)
-                           ));
+    CALL_VertexAttrib4dvNV( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 ),
+         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  4), 4 )
+    ) );
 }
 
-void
-__glXDispSwap_VertexAttrib4fvNV(GLbyte * pc)
+void __glXDispSwap_VertexAttrib4fvNV(GLbyte * pc)
 {
-    CALL_VertexAttrib4fvNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                            (const GLfloat *)
-                                            bswap_32_array((uint32_t *) (pc +
-                                                                         4), 4)
-                           ));
+    CALL_VertexAttrib4fvNV( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 ),
+         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  4), 4 )
+    ) );
 }
 
-void
-__glXDispSwap_VertexAttrib4svNV(GLbyte * pc)
+void __glXDispSwap_VertexAttrib4svNV(GLbyte * pc)
 {
-    CALL_VertexAttrib4svNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                            (const GLshort *)
-                                            bswap_16_array((uint16_t *) (pc +
-                                                                         4), 4)
-                           ));
+    CALL_VertexAttrib4svNV( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 ),
+         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  4), 4 )
+    ) );
 }
 
-void
-__glXDispSwap_VertexAttrib4ubvNV(GLbyte * pc)
+void __glXDispSwap_VertexAttrib4ubvNV(GLbyte * pc)
 {
-    CALL_VertexAttrib4ubvNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             (const GLubyte *) (pc + 4)
-                            ));
+    CALL_VertexAttrib4ubvNV( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 ),
+         (const GLubyte *)(pc +  4)
+    ) );
 }
 
-void
-__glXDispSwap_VertexAttribs1dvNV(GLbyte * pc)
+void __glXDispSwap_VertexAttribs1dvNV(GLbyte * pc)
 {
-    const GLsizei n = (GLsizei) bswap_CARD32(pc + 4);
+    const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  4 );
 
 #ifdef __GLX_ALIGN64
     const GLuint cmdlen = 12 + __GLX_PAD((n * 8)) - 4;
-
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, cmdlen);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, cmdlen);
         pc -= 4;
     }
 #endif
 
-    CALL_VertexAttribs1dvNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             n,
-                                             (const GLdouble *)
-                                             bswap_64_array((uint64_t *) (pc +
-                                                                          8), 0)
-                            ));
+    CALL_VertexAttribs1dvNV( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 ),
+        n,
+         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  8), 0 )
+    ) );
 }
 
-void
-__glXDispSwap_VertexAttribs1fvNV(GLbyte * pc)
+void __glXDispSwap_VertexAttribs1fvNV(GLbyte * pc)
 {
-    const GLsizei n = (GLsizei) bswap_CARD32(pc + 4);
+    const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  4 );
 
-    CALL_VertexAttribs1fvNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             n,
-                                             (const GLfloat *)
-                                             bswap_32_array((uint32_t *) (pc +
-                                                                          8), 0)
-                            ));
+    CALL_VertexAttribs1fvNV( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 ),
+        n,
+         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  8), 0 )
+    ) );
 }
 
-void
-__glXDispSwap_VertexAttribs1svNV(GLbyte * pc)
+void __glXDispSwap_VertexAttribs1svNV(GLbyte * pc)
 {
-    const GLsizei n = (GLsizei) bswap_CARD32(pc + 4);
+    const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  4 );
 
-    CALL_VertexAttribs1svNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             n,
-                                             (const GLshort *)
-                                             bswap_16_array((uint16_t *) (pc +
-                                                                          8), 0)
-                            ));
+    CALL_VertexAttribs1svNV( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 ),
+        n,
+         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  8), 0 )
+    ) );
 }
 
-void
-__glXDispSwap_VertexAttribs2dvNV(GLbyte * pc)
+void __glXDispSwap_VertexAttribs2dvNV(GLbyte * pc)
 {
-    const GLsizei n = (GLsizei) bswap_CARD32(pc + 4);
+    const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  4 );
 
 #ifdef __GLX_ALIGN64
     const GLuint cmdlen = 12 + __GLX_PAD((n * 16)) - 4;
-
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, cmdlen);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, cmdlen);
         pc -= 4;
     }
 #endif
 
-    CALL_VertexAttribs2dvNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             n,
-                                             (const GLdouble *)
-                                             bswap_64_array((uint64_t *) (pc +
-                                                                          8), 0)
-                            ));
+    CALL_VertexAttribs2dvNV( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 ),
+        n,
+         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  8), 0 )
+    ) );
 }
 
-void
-__glXDispSwap_VertexAttribs2fvNV(GLbyte * pc)
+void __glXDispSwap_VertexAttribs2fvNV(GLbyte * pc)
 {
-    const GLsizei n = (GLsizei) bswap_CARD32(pc + 4);
+    const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  4 );
 
-    CALL_VertexAttribs2fvNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             n,
-                                             (const GLfloat *)
-                                             bswap_32_array((uint32_t *) (pc +
-                                                                          8), 0)
-                            ));
+    CALL_VertexAttribs2fvNV( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 ),
+        n,
+         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  8), 0 )
+    ) );
 }
 
-void
-__glXDispSwap_VertexAttribs2svNV(GLbyte * pc)
+void __glXDispSwap_VertexAttribs2svNV(GLbyte * pc)
 {
-    const GLsizei n = (GLsizei) bswap_CARD32(pc + 4);
+    const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  4 );
 
-    CALL_VertexAttribs2svNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             n,
-                                             (const GLshort *)
-                                             bswap_16_array((uint16_t *) (pc +
-                                                                          8), 0)
-                            ));
+    CALL_VertexAttribs2svNV( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 ),
+        n,
+         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  8), 0 )
+    ) );
 }
 
-void
-__glXDispSwap_VertexAttribs3dvNV(GLbyte * pc)
+void __glXDispSwap_VertexAttribs3dvNV(GLbyte * pc)
 {
-    const GLsizei n = (GLsizei) bswap_CARD32(pc + 4);
+    const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  4 );
 
 #ifdef __GLX_ALIGN64
     const GLuint cmdlen = 12 + __GLX_PAD((n * 24)) - 4;
-
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, cmdlen);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, cmdlen);
         pc -= 4;
     }
 #endif
 
-    CALL_VertexAttribs3dvNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             n,
-                                             (const GLdouble *)
-                                             bswap_64_array((uint64_t *) (pc +
-                                                                          8), 0)
-                            ));
+    CALL_VertexAttribs3dvNV( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 ),
+        n,
+         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  8), 0 )
+    ) );
 }
 
-void
-__glXDispSwap_VertexAttribs3fvNV(GLbyte * pc)
+void __glXDispSwap_VertexAttribs3fvNV(GLbyte * pc)
 {
-    const GLsizei n = (GLsizei) bswap_CARD32(pc + 4);
+    const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  4 );
 
-    CALL_VertexAttribs3fvNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             n,
-                                             (const GLfloat *)
-                                             bswap_32_array((uint32_t *) (pc +
-                                                                          8), 0)
-                            ));
+    CALL_VertexAttribs3fvNV( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 ),
+        n,
+         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  8), 0 )
+    ) );
 }
 
-void
-__glXDispSwap_VertexAttribs3svNV(GLbyte * pc)
+void __glXDispSwap_VertexAttribs3svNV(GLbyte * pc)
 {
-    const GLsizei n = (GLsizei) bswap_CARD32(pc + 4);
+    const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  4 );
 
-    CALL_VertexAttribs3svNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             n,
-                                             (const GLshort *)
-                                             bswap_16_array((uint16_t *) (pc +
-                                                                          8), 0)
-                            ));
+    CALL_VertexAttribs3svNV( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 ),
+        n,
+         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  8), 0 )
+    ) );
 }
 
-void
-__glXDispSwap_VertexAttribs4dvNV(GLbyte * pc)
+void __glXDispSwap_VertexAttribs4dvNV(GLbyte * pc)
 {
-    const GLsizei n = (GLsizei) bswap_CARD32(pc + 4);
+    const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  4 );
 
 #ifdef __GLX_ALIGN64
     const GLuint cmdlen = 12 + __GLX_PAD((n * 32)) - 4;
-
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, cmdlen);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, cmdlen);
         pc -= 4;
     }
 #endif
 
-    CALL_VertexAttribs4dvNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             n,
-                                             (const GLdouble *)
-                                             bswap_64_array((uint64_t *) (pc +
-                                                                          8), 0)
-                            ));
+    CALL_VertexAttribs4dvNV( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 ),
+        n,
+         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  8), 0 )
+    ) );
 }
 
-void
-__glXDispSwap_VertexAttribs4fvNV(GLbyte * pc)
+void __glXDispSwap_VertexAttribs4fvNV(GLbyte * pc)
 {
-    const GLsizei n = (GLsizei) bswap_CARD32(pc + 4);
+    const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  4 );
 
-    CALL_VertexAttribs4fvNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             n,
-                                             (const GLfloat *)
-                                             bswap_32_array((uint32_t *) (pc +
-                                                                          8), 0)
-                            ));
+    CALL_VertexAttribs4fvNV( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 ),
+        n,
+         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  8), 0 )
+    ) );
 }
 
-void
-__glXDispSwap_VertexAttribs4svNV(GLbyte * pc)
+void __glXDispSwap_VertexAttribs4svNV(GLbyte * pc)
 {
-    const GLsizei n = (GLsizei) bswap_CARD32(pc + 4);
+    const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  4 );
 
-    CALL_VertexAttribs4svNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                             n,
-                                             (const GLshort *)
-                                             bswap_16_array((uint16_t *) (pc +
-                                                                          8), 0)
-                            ));
+    CALL_VertexAttribs4svNV( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 ),
+        n,
+         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  8), 0 )
+    ) );
 }
 
-void
-__glXDispSwap_VertexAttribs4ubvNV(GLbyte * pc)
+void __glXDispSwap_VertexAttribs4ubvNV(GLbyte * pc)
 {
-    const GLsizei n = (GLsizei) bswap_CARD32(pc + 4);
-
-    CALL_VertexAttribs4ubvNV(GET_DISPATCH(), ((GLuint) bswap_CARD32(pc + 0),
-                                              n, (const GLubyte *) (pc + 8)
-                             ));
-}
+    const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  4 );
 
-void
-__glXDispSwap_PointParameteriNV(GLbyte * pc)
-{
-    CALL_PointParameteriNV(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                            (GLint) bswap_CARD32(pc + 4)
-                           ));
+    CALL_VertexAttribs4ubvNV( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 ),
+        n,
+         (const GLubyte *)(pc +  8)
+    ) );
 }
 
-void
-__glXDispSwap_PointParameterivNV(GLbyte * pc)
+void __glXDispSwap_ActiveStencilFaceEXT(GLbyte * pc)
 {
-    const GLenum pname = (GLenum) bswap_ENUM(pc + 0);
-    const GLint *params;
-
-    params =
-        (const GLint *) bswap_32_array((uint32_t *) (pc + 4),
-                                       __glPointParameterivNV_size(pname));
-
-    CALL_PointParameterivNV(GET_DISPATCH(), (pname, params));
+    CALL_ActiveStencilFaceEXT( GET_DISPATCH(), (
+         (GLenum  )bswap_ENUM   ( pc +  0 )
+    ) );
 }
 
-void
-__glXDispSwap_ActiveStencilFaceEXT(GLbyte * pc)
+int __glXDispSwap_GetProgramNamedParameterdvNV(__GLXclientState *cl, GLbyte *pc)
 {
-    CALL_ActiveStencilFaceEXT(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0)
-                              ));
-}
-
-int
-__glXDispSwap_GetProgramNamedParameterdvNV(__GLXclientState * cl, GLbyte * pc)
-{
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLsizei len = (GLsizei) bswap_CARD32(pc + 4);
+    if ( cx != NULL ) {
+        const GLsizei len =  (GLsizei )bswap_CARD32 ( pc +  4 );
 
         GLdouble params[4];
-
-        CALL_GetProgramNamedParameterdvNV(GET_DISPATCH(), ((GLuint)
-                                                           bswap_CARD32(pc + 0),
-                                                           len,
-                                                           (const GLubyte *) (pc
-                                                                              +
-                                                                              8),
-                                                           params));
-        (void) bswap_64_array((uint64_t *) params, 4);
+        CALL_GetProgramNamedParameterdvNV( GET_DISPATCH(), (
+             (GLuint  )bswap_CARD32 ( pc +  0 ),
+            len,
+             (const GLubyte *)(pc +  8),
+            params
+        ) );
+        (void) bswap_64_array( (uint64_t *) params, 4 );
         __glXSendReplySwap(cl->client, params, 4, 8, GL_TRUE, 0);
         error = Success;
     }
@@ -6398,28 +6048,24 @@ __glXDispSwap_GetProgramNamedParameterdvNV(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-int
-__glXDispSwap_GetProgramNamedParameterfvNV(__GLXclientState * cl, GLbyte * pc)
+int __glXDispSwap_GetProgramNamedParameterfvNV(__GLXclientState *cl, GLbyte *pc)
 {
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
+    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
+    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLsizei len = (GLsizei) bswap_CARD32(pc + 4);
+    if ( cx != NULL ) {
+        const GLsizei len =  (GLsizei )bswap_CARD32 ( pc +  4 );
 
         GLfloat params[4];
-
-        CALL_GetProgramNamedParameterfvNV(GET_DISPATCH(), ((GLuint)
-                                                           bswap_CARD32(pc + 0),
-                                                           len,
-                                                           (const GLubyte *) (pc
-                                                                              +
-                                                                              8),
-                                                           params));
-        (void) bswap_32_array((uint32_t *) params, 4);
+        CALL_GetProgramNamedParameterfvNV( GET_DISPATCH(), (
+             (GLuint  )bswap_CARD32 ( pc +  0 ),
+            len,
+             (const GLubyte *)(pc +  8),
+            params
+        ) );
+        (void) bswap_32_array( (uint32_t *) params, 4 );
         __glXSendReplySwap(cl->client, params, 4, 4, GL_TRUE, 0);
         error = Success;
     }
@@ -6427,368 +6073,35 @@ __glXDispSwap_GetProgramNamedParameterfvNV(__GLXclientState * cl, GLbyte * pc)
     return error;
 }
 
-void
-__glXDispSwap_ProgramNamedParameter4dvNV(GLbyte * pc)
+void __glXDispSwap_ProgramNamedParameter4dvNV(GLbyte * pc)
 {
-    const GLsizei len = (GLsizei) bswap_CARD32(pc + 36);
+    const GLsizei len =  (GLsizei )bswap_CARD32 ( pc + 36 );
 
 #ifdef __GLX_ALIGN64
     const GLuint cmdlen = 44 + __GLX_PAD(len) - 4;
-
-    if ((unsigned long) (pc) & 7) {
-        (void) memmove(pc - 4, pc, cmdlen);
+    if ((unsigned long)(pc) & 7) {
+        (void) memmove(pc-4, pc, cmdlen);
         pc -= 4;
     }
 #endif
 
-    CALL_ProgramNamedParameter4dvNV(GET_DISPATCH(), ((GLuint)
-                                                     bswap_CARD32(pc + 32), len,
-                                                     (const GLubyte *) (pc +
-                                                                        40),
-                                                     (const GLdouble *)
-                                                     bswap_64_array((uint64_t
-                                                                     *) (pc +
-                                                                         0), 4)
-                                    ));
+    CALL_ProgramNamedParameter4dvNV( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc + 32 ),
+        len,
+         (const GLubyte *)(pc + 40),
+         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  0), 4 )
+    ) );
 }
 
-void
-__glXDispSwap_ProgramNamedParameter4fvNV(GLbyte * pc)
+void __glXDispSwap_ProgramNamedParameter4fvNV(GLbyte * pc)
 {
-    const GLsizei len = (GLsizei) bswap_CARD32(pc + 4);
+    const GLsizei len =  (GLsizei )bswap_CARD32 ( pc +  4 );
 
-    CALL_ProgramNamedParameter4fvNV(GET_DISPATCH(), ((GLuint)
-                                                     bswap_CARD32(pc + 0), len,
-                                                     (const GLubyte *) (pc +
-                                                                        24),
-                                                     (const GLfloat *)
-                                                     bswap_32_array((uint32_t
-                                                                     *) (pc +
-                                                                         8), 4)
-                                    ));
+    CALL_ProgramNamedParameter4fvNV( GET_DISPATCH(), (
+         (GLuint  )bswap_CARD32 ( pc +  0 ),
+        len,
+         (const GLubyte *)(pc + 24),
+         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  8), 4 )
+    ) );
 }
 
-void
-__glXDispSwap_BlendEquationSeparateEXT(GLbyte * pc)
-{
-    CALL_BlendEquationSeparateEXT(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                                   (GLenum) bswap_ENUM(pc + 4)
-                                  ));
-}
-
-void
-__glXDispSwap_BindFramebufferEXT(GLbyte * pc)
-{
-    CALL_BindFramebufferEXT(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                             (GLuint) bswap_CARD32(pc + 4)
-                            ));
-}
-
-void
-__glXDispSwap_BindRenderbufferEXT(GLbyte * pc)
-{
-    CALL_BindRenderbufferEXT(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                              (GLuint) bswap_CARD32(pc + 4)
-                             ));
-}
-
-int
-__glXDispSwap_CheckFramebufferStatusEXT(__GLXclientState * cl, GLbyte * pc)
-{
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        GLenum retval;
-
-        retval = CALL_CheckFramebufferStatusEXT(GET_DISPATCH(), ((GLenum)
-                                                                 bswap_ENUM(pc +
-                                                                            0)
-                                                ));
-        __glXSendReplySwap(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
-        error = Success;
-    }
-
-    return error;
-}
-
-void
-__glXDispSwap_DeleteFramebuffersEXT(GLbyte * pc)
-{
-    const GLsizei n = (GLsizei) bswap_CARD32(pc + 0);
-
-    CALL_DeleteFramebuffersEXT(GET_DISPATCH(), (n,
-                                                (const GLuint *)
-                                                bswap_32_array((uint32_t *) (pc
-                                                                             +
-                                                                             4),
-                                                               0)
-                               ));
-}
-
-void
-__glXDispSwap_DeleteRenderbuffersEXT(GLbyte * pc)
-{
-    const GLsizei n = (GLsizei) bswap_CARD32(pc + 0);
-
-    CALL_DeleteRenderbuffersEXT(GET_DISPATCH(), (n,
-                                                 (const GLuint *)
-                                                 bswap_32_array((uint32_t *) (pc
-                                                                              +
-                                                                              4),
-                                                                0)
-                                ));
-}
-
-void
-__glXDispSwap_FramebufferRenderbufferEXT(GLbyte * pc)
-{
-    CALL_FramebufferRenderbufferEXT(GET_DISPATCH(), ((GLenum)
-                                                     bswap_ENUM(pc + 0),
-                                                     (GLenum) bswap_ENUM(pc +
-                                                                         4),
-                                                     (GLenum) bswap_ENUM(pc +
-                                                                         8),
-                                                     (GLuint) bswap_CARD32(pc +
-                                                                           12)
-                                    ));
-}
-
-void
-__glXDispSwap_FramebufferTexture1DEXT(GLbyte * pc)
-{
-    CALL_FramebufferTexture1DEXT(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                                  (GLenum) bswap_ENUM(pc + 4),
-                                                  (GLenum) bswap_ENUM(pc + 8),
-                                                  (GLuint) bswap_CARD32(pc +
-                                                                        12),
-                                                  (GLint) bswap_CARD32(pc + 16)
-                                 ));
-}
-
-void
-__glXDispSwap_FramebufferTexture2DEXT(GLbyte * pc)
-{
-    CALL_FramebufferTexture2DEXT(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                                  (GLenum) bswap_ENUM(pc + 4),
-                                                  (GLenum) bswap_ENUM(pc + 8),
-                                                  (GLuint) bswap_CARD32(pc +
-                                                                        12),
-                                                  (GLint) bswap_CARD32(pc + 16)
-                                 ));
-}
-
-void
-__glXDispSwap_FramebufferTexture3DEXT(GLbyte * pc)
-{
-    CALL_FramebufferTexture3DEXT(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                                  (GLenum) bswap_ENUM(pc + 4),
-                                                  (GLenum) bswap_ENUM(pc + 8),
-                                                  (GLuint) bswap_CARD32(pc +
-                                                                        12),
-                                                  (GLint) bswap_CARD32(pc + 16),
-                                                  (GLint) bswap_CARD32(pc + 20)
-                                 ));
-}
-
-int
-__glXDispSwap_GenFramebuffersEXT(__GLXclientState * cl, GLbyte * pc)
-{
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLsizei n = (GLsizei) bswap_CARD32(pc + 0);
-
-        GLuint answerBuffer[200];
-        GLuint *framebuffers =
-            __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer),
-                                 4);
-        CALL_GenFramebuffersEXT(GET_DISPATCH(), (n, framebuffers));
-        (void) bswap_32_array((uint32_t *) framebuffers, n);
-        __glXSendReplySwap(cl->client, framebuffers, n, 4, GL_TRUE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int
-__glXDispSwap_GenRenderbuffersEXT(__GLXclientState * cl, GLbyte * pc)
-{
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        const GLsizei n = (GLsizei) bswap_CARD32(pc + 0);
-
-        GLuint answerBuffer[200];
-        GLuint *renderbuffers =
-            __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer),
-                                 4);
-        CALL_GenRenderbuffersEXT(GET_DISPATCH(), (n, renderbuffers));
-        (void) bswap_32_array((uint32_t *) renderbuffers, n);
-        __glXSendReplySwap(cl->client, renderbuffers, n, 4, GL_TRUE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-void
-__glXDispSwap_GenerateMipmapEXT(GLbyte * pc)
-{
-    CALL_GenerateMipmapEXT(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0)
-                           ));
-}
-
-int
-__glXDispSwap_GetFramebufferAttachmentParameterivEXT(__GLXclientState * cl,
-                                                     GLbyte * pc)
-{
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        GLint params[1];
-
-        CALL_GetFramebufferAttachmentParameterivEXT(GET_DISPATCH(), ((GLenum)
-                                                                     bswap_ENUM
-                                                                     (pc + 0),
-                                                                     (GLenum)
-                                                                     bswap_ENUM
-                                                                     (pc + 4),
-                                                                     (GLenum)
-                                                                     bswap_ENUM
-                                                                     (pc + 8),
-                                                                     params));
-        (void) bswap_32_array((uint32_t *) params, 1);
-        __glXSendReplySwap(cl->client, params, 1, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int
-__glXDispSwap_GetRenderbufferParameterivEXT(__GLXclientState * cl, GLbyte * pc)
-{
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        GLint params[1];
-
-        CALL_GetRenderbufferParameterivEXT(GET_DISPATCH(), ((GLenum)
-                                                            bswap_ENUM(pc + 0),
-                                                            (GLenum)
-                                                            bswap_ENUM(pc + 4),
-                                                            params));
-        (void) bswap_32_array((uint32_t *) params, 1);
-        __glXSendReplySwap(cl->client, params, 1, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int
-__glXDispSwap_IsFramebufferEXT(__GLXclientState * cl, GLbyte * pc)
-{
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        GLboolean retval;
-
-        retval = CALL_IsFramebufferEXT(GET_DISPATCH(), ((GLuint)
-                                                        bswap_CARD32(pc + 0)
-                                       ));
-        __glXSendReplySwap(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
-        error = Success;
-    }
-
-    return error;
-}
-
-int
-__glXDispSwap_IsRenderbufferEXT(__GLXclientState * cl, GLbyte * pc)
-{
-    xGLXVendorPrivateReq *const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext *const cx =
-        __glXForceCurrent(cl, bswap_CARD32(&req->contextTag), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if (cx != NULL) {
-        GLboolean retval;
-
-        retval = CALL_IsRenderbufferEXT(GET_DISPATCH(), ((GLuint)
-                                                         bswap_CARD32(pc + 0)
-                                        ));
-        __glXSendReplySwap(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
-        error = Success;
-    }
-
-    return error;
-}
-
-void
-__glXDispSwap_RenderbufferStorageEXT(GLbyte * pc)
-{
-    CALL_RenderbufferStorageEXT(GET_DISPATCH(), ((GLenum) bswap_ENUM(pc + 0),
-                                                 (GLenum) bswap_ENUM(pc + 4),
-                                                 (GLsizei) bswap_CARD32(pc + 8),
-                                                 (GLsizei) bswap_CARD32(pc + 12)
-                                ));
-}
-
-void
-__glXDispSwap_BlitFramebufferEXT(GLbyte * pc)
-{
-    CALL_BlitFramebufferEXT(GET_DISPATCH(), ((GLint) bswap_CARD32(pc + 0),
-                                             (GLint) bswap_CARD32(pc + 4),
-                                             (GLint) bswap_CARD32(pc + 8),
-                                             (GLint) bswap_CARD32(pc + 12),
-                                             (GLint) bswap_CARD32(pc + 16),
-                                             (GLint) bswap_CARD32(pc + 20),
-                                             (GLint) bswap_CARD32(pc + 24),
-                                             (GLint) bswap_CARD32(pc + 28),
-                                             (GLbitfield) bswap_CARD32(pc + 32),
-                                             (GLenum) bswap_ENUM(pc + 36)
-                            ));
-}
-
-void
-__glXDispSwap_FramebufferTextureLayerEXT(GLbyte * pc)
-{
-    CALL_FramebufferTextureLayerEXT(GET_DISPATCH(), ((GLenum)
-                                                     bswap_ENUM(pc + 0),
-                                                     (GLenum) bswap_ENUM(pc +
-                                                                         4),
-                                                     (GLuint) bswap_CARD32(pc +
-                                                                           8),
-                                                     (GLint) bswap_CARD32(pc +
-                                                                          12),
-                                                     (GLint) bswap_CARD32(pc +
-                                                                          16)
-                                    ));
-}
diff --git a/xorg-server/glx/indirect_program.c b/xorg-server/glx/indirect_program.c
index 0114d7347..17204c17d 100644
--- a/xorg-server/glx/indirect_program.c
+++ b/xorg-server/glx/indirect_program.c
@@ -32,6 +32,7 @@
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
+#include "glheader.h"
 
 #include "glxserver.h"
 #include "glxbyteorder.h"
diff --git a/xorg-server/glx/indirect_reqsize.c b/xorg-server/glx/indirect_reqsize.c
index 86ea9700f..a87f7d230 100644
--- a/xorg-server/glx/indirect_reqsize.c
+++ b/xorg-server/glx/indirect_reqsize.c
@@ -25,6 +25,15 @@
  * SOFTWARE.
  */
 
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#else
+
+#include "glheader.h"
+
+#endif
+
 #include <GL/gl.h>
 #include "glxserver.h"
 #include "glxbyteorder.h"
@@ -34,24 +43,25 @@
 #define __GLX_PAD(x)  (((x) + 3) & ~3)
 
 #if defined(__CYGWIN__) || defined(__MINGW32__)
-#undef HAVE_ALIAS
+#  undef HAVE_ALIAS
 #endif
 #ifdef HAVE_ALIAS
-#define ALIAS2(from,to) \
+#  define ALIAS2(from,to) \
     GLint __glX ## from ## ReqSize( const GLbyte * pc, Bool swap ) \
         __attribute__ ((alias( # to )));
-#define ALIAS(from,to) ALIAS2( from, __glX ## to ## ReqSize )
+#  define ALIAS(from,to) ALIAS2( from, __glX ## to ## ReqSize )
 #else
-#define ALIAS(from,to) \
+#  define ALIAS(from,to) \
     GLint __glX ## from ## ReqSize( const GLbyte * pc, Bool swap ) \
     { return __glX ## to ## ReqSize( pc, swap ); }
 #endif
 
+
 int
-__glXCallListsReqSize(const GLbyte * pc, Bool swap)
+__glXCallListsReqSize( const GLbyte * pc, Bool swap )
 {
-    GLsizei n = *(GLsizei *) (pc + 0);
-    GLenum type = *(GLenum *) (pc + 4);
+GLsizei n          = *(GLsizei *)(pc + 0);
+GLenum type        = * (GLenum *)(pc + 4);
     GLsizei compsize;
 
     if (swap) {
@@ -64,15 +74,15 @@ __glXCallListsReqSize(const GLbyte * pc, Bool swap)
 }
 
 int
-__glXBitmapReqSize(const GLbyte * pc, Bool swap)
+__glXBitmapReqSize( const GLbyte * pc, Bool swap )
 {
-    GLint row_length = *(GLint *) (pc + 4);
+    GLint row_length   = *  (GLint *)(pc +  4);
     GLint image_height = 0;
-    GLint skip_images = 0;
-    GLint skip_rows = *(GLint *) (pc + 8);
-    GLint alignment = *(GLint *) (pc + 16);
-    GLsizei width = *(GLsizei *) (pc + 20);
-    GLsizei height = *(GLsizei *) (pc + 24);
+    GLint skip_images  = 0;
+    GLint skip_rows    = *  (GLint *)(pc +  8);
+    GLint alignment    = *  (GLint *)(pc + 16);
+GLsizei width      = *(GLsizei *)(pc + 20);
+GLsizei height     = *(GLsizei *)(pc + 24);
 
     if (swap) {
         row_length = bswap_32(row_length);
@@ -88,9 +98,9 @@ __glXBitmapReqSize(const GLbyte * pc, Bool swap)
 }
 
 int
-__glXFogfvReqSize(const GLbyte * pc, Bool swap)
+__glXFogfvReqSize( const GLbyte * pc, Bool swap )
 {
-    GLenum pname = *(GLenum *) (pc + 0);
+GLenum pname       = * (GLenum *)(pc + 0);
     GLsizei compsize;
 
     if (swap) {
@@ -102,9 +112,9 @@ __glXFogfvReqSize(const GLbyte * pc, Bool swap)
 }
 
 int
-__glXLightfvReqSize(const GLbyte * pc, Bool swap)
+__glXLightfvReqSize( const GLbyte * pc, Bool swap )
 {
-    GLenum pname = *(GLenum *) (pc + 4);
+GLenum pname       = * (GLenum *)(pc + 4);
     GLsizei compsize;
 
     if (swap) {
@@ -116,9 +126,9 @@ __glXLightfvReqSize(const GLbyte * pc, Bool swap)
 }
 
 int
-__glXLightModelfvReqSize(const GLbyte * pc, Bool swap)
+__glXLightModelfvReqSize( const GLbyte * pc, Bool swap )
 {
-    GLenum pname = *(GLenum *) (pc + 0);
+GLenum pname       = * (GLenum *)(pc + 0);
     GLsizei compsize;
 
     if (swap) {
@@ -130,9 +140,9 @@ __glXLightModelfvReqSize(const GLbyte * pc, Bool swap)
 }
 
 int
-__glXMaterialfvReqSize(const GLbyte * pc, Bool swap)
+__glXMaterialfvReqSize( const GLbyte * pc, Bool swap )
 {
-    GLenum pname = *(GLenum *) (pc + 4);
+GLenum pname       = * (GLenum *)(pc + 4);
     GLsizei compsize;
 
     if (swap) {
@@ -144,13 +154,13 @@ __glXMaterialfvReqSize(const GLbyte * pc, Bool swap)
 }
 
 int
-__glXPolygonStippleReqSize(const GLbyte * pc, Bool swap)
+__glXPolygonStippleReqSize( const GLbyte * pc, Bool swap )
 {
-    GLint row_length = *(GLint *) (pc + 4);
+    GLint row_length   = *  (GLint *)(pc +  4);
     GLint image_height = 0;
-    GLint skip_images = 0;
-    GLint skip_rows = *(GLint *) (pc + 8);
-    GLint alignment = *(GLint *) (pc + 16);
+    GLint skip_images  = 0;
+    GLint skip_rows    = *  (GLint *)(pc +  8);
+    GLint alignment    = *  (GLint *)(pc + 16);
 
     if (swap) {
         row_length = bswap_32(row_length);
@@ -164,9 +174,9 @@ __glXPolygonStippleReqSize(const GLbyte * pc, Bool swap)
 }
 
 int
-__glXTexParameterfvReqSize(const GLbyte * pc, Bool swap)
+__glXTexParameterfvReqSize( const GLbyte * pc, Bool swap )
 {
-    GLenum pname = *(GLenum *) (pc + 4);
+GLenum pname       = * (GLenum *)(pc + 4);
     GLsizei compsize;
 
     if (swap) {
@@ -178,17 +188,17 @@ __glXTexParameterfvReqSize(const GLbyte * pc, Bool swap)
 }
 
 int
-__glXTexImage1DReqSize(const GLbyte * pc, Bool swap)
+__glXTexImage1DReqSize( const GLbyte * pc, Bool swap )
 {
-    GLint row_length = *(GLint *) (pc + 4);
+    GLint row_length   = *  (GLint *)(pc +  4);
     GLint image_height = 0;
-    GLint skip_images = 0;
-    GLint skip_rows = *(GLint *) (pc + 8);
-    GLint alignment = *(GLint *) (pc + 16);
-    GLenum target = *(GLenum *) (pc + 20);
-    GLsizei width = *(GLsizei *) (pc + 32);
-    GLenum format = *(GLenum *) (pc + 44);
-    GLenum type = *(GLenum *) (pc + 48);
+    GLint skip_images  = 0;
+    GLint skip_rows    = *  (GLint *)(pc +  8);
+    GLint alignment    = *  (GLint *)(pc + 16);
+GLenum target      = * (GLenum *)(pc + 20);
+GLsizei width      = *(GLsizei *)(pc + 32);
+GLenum format      = * (GLenum *)(pc + 44);
+GLenum type        = * (GLenum *)(pc + 48);
 
     if (swap) {
         row_length = bswap_32(row_length);
@@ -206,18 +216,18 @@ __glXTexImage1DReqSize(const GLbyte * pc, Bool swap)
 }
 
 int
-__glXTexImage2DReqSize(const GLbyte * pc, Bool swap)
+__glXTexImage2DReqSize( const GLbyte * pc, Bool swap )
 {
-    GLint row_length = *(GLint *) (pc + 4);
+    GLint row_length   = *  (GLint *)(pc +  4);
     GLint image_height = 0;
-    GLint skip_images = 0;
-    GLint skip_rows = *(GLint *) (pc + 8);
-    GLint alignment = *(GLint *) (pc + 16);
-    GLenum target = *(GLenum *) (pc + 20);
-    GLsizei width = *(GLsizei *) (pc + 32);
-    GLsizei height = *(GLsizei *) (pc + 36);
-    GLenum format = *(GLenum *) (pc + 44);
-    GLenum type = *(GLenum *) (pc + 48);
+    GLint skip_images  = 0;
+    GLint skip_rows    = *  (GLint *)(pc +  8);
+    GLint alignment    = *  (GLint *)(pc + 16);
+GLenum target      = * (GLenum *)(pc + 20);
+GLsizei width      = *(GLsizei *)(pc + 32);
+GLsizei height     = *(GLsizei *)(pc + 36);
+GLenum format      = * (GLenum *)(pc + 44);
+GLenum type        = * (GLenum *)(pc + 48);
 
     if (swap) {
         row_length = bswap_32(row_length);
@@ -236,9 +246,9 @@ __glXTexImage2DReqSize(const GLbyte * pc, Bool swap)
 }
 
 int
-__glXTexEnvfvReqSize(const GLbyte * pc, Bool swap)
+__glXTexEnvfvReqSize( const GLbyte * pc, Bool swap )
 {
-    GLenum pname = *(GLenum *) (pc + 4);
+GLenum pname       = * (GLenum *)(pc + 4);
     GLsizei compsize;
 
     if (swap) {
@@ -250,9 +260,9 @@ __glXTexEnvfvReqSize(const GLbyte * pc, Bool swap)
 }
 
 int
-__glXTexGendvReqSize(const GLbyte * pc, Bool swap)
+__glXTexGendvReqSize( const GLbyte * pc, Bool swap )
 {
-    GLenum pname = *(GLenum *) (pc + 4);
+GLenum pname       = * (GLenum *)(pc + 4);
     GLsizei compsize;
 
     if (swap) {
@@ -264,9 +274,9 @@ __glXTexGendvReqSize(const GLbyte * pc, Bool swap)
 }
 
 int
-__glXTexGenfvReqSize(const GLbyte * pc, Bool swap)
+__glXTexGenfvReqSize( const GLbyte * pc, Bool swap )
 {
-    GLenum pname = *(GLenum *) (pc + 4);
+GLenum pname       = * (GLenum *)(pc + 4);
     GLsizei compsize;
 
     if (swap) {
@@ -278,9 +288,9 @@ __glXTexGenfvReqSize(const GLbyte * pc, Bool swap)
 }
 
 int
-__glXPixelMapfvReqSize(const GLbyte * pc, Bool swap)
+__glXPixelMapfvReqSize( const GLbyte * pc, Bool swap )
 {
-    GLsizei mapsize = *(GLsizei *) (pc + 4);
+GLsizei mapsize    = *(GLsizei *)(pc + 4);
 
     if (swap) {
         mapsize = bswap_32(mapsize);
@@ -290,9 +300,9 @@ __glXPixelMapfvReqSize(const GLbyte * pc, Bool swap)
 }
 
 int
-__glXPixelMapusvReqSize(const GLbyte * pc, Bool swap)
+__glXPixelMapusvReqSize( const GLbyte * pc, Bool swap )
 {
-    GLsizei mapsize = *(GLsizei *) (pc + 4);
+GLsizei mapsize    = *(GLsizei *)(pc + 4);
 
     if (swap) {
         mapsize = bswap_32(mapsize);
@@ -302,17 +312,17 @@ __glXPixelMapusvReqSize(const GLbyte * pc, Bool swap)
 }
 
 int
-__glXDrawPixelsReqSize(const GLbyte * pc, Bool swap)
+__glXDrawPixelsReqSize( const GLbyte * pc, Bool swap )
 {
-    GLint row_length = *(GLint *) (pc + 4);
+    GLint row_length   = *  (GLint *)(pc +  4);
     GLint image_height = 0;
-    GLint skip_images = 0;
-    GLint skip_rows = *(GLint *) (pc + 8);
-    GLint alignment = *(GLint *) (pc + 16);
-    GLsizei width = *(GLsizei *) (pc + 20);
-    GLsizei height = *(GLsizei *) (pc + 24);
-    GLenum format = *(GLenum *) (pc + 28);
-    GLenum type = *(GLenum *) (pc + 32);
+    GLint skip_images  = 0;
+    GLint skip_rows    = *  (GLint *)(pc +  8);
+    GLint alignment    = *  (GLint *)(pc + 16);
+GLsizei width      = *(GLsizei *)(pc + 20);
+GLsizei height     = *(GLsizei *)(pc + 24);
+GLenum format      = * (GLenum *)(pc + 28);
+GLenum type        = * (GLenum *)(pc + 32);
 
     if (swap) {
         row_length = bswap_32(row_length);
@@ -330,9 +340,9 @@ __glXDrawPixelsReqSize(const GLbyte * pc, Bool swap)
 }
 
 int
-__glXPrioritizeTexturesReqSize(const GLbyte * pc, Bool swap)
+__glXPrioritizeTexturesReqSize( const GLbyte * pc, Bool swap )
 {
-    GLsizei n = *(GLsizei *) (pc + 0);
+GLsizei n          = *(GLsizei *)(pc + 0);
 
     if (swap) {
         n = bswap_32(n);
@@ -342,17 +352,17 @@ __glXPrioritizeTexturesReqSize(const GLbyte * pc, Bool swap)
 }
 
 int
-__glXTexSubImage1DReqSize(const GLbyte * pc, Bool swap)
+__glXTexSubImage1DReqSize( const GLbyte * pc, Bool swap )
 {
-    GLint row_length = *(GLint *) (pc + 4);
+    GLint row_length   = *  (GLint *)(pc +  4);
     GLint image_height = 0;
-    GLint skip_images = 0;
-    GLint skip_rows = *(GLint *) (pc + 8);
-    GLint alignment = *(GLint *) (pc + 16);
-    GLenum target = *(GLenum *) (pc + 20);
-    GLsizei width = *(GLsizei *) (pc + 36);
-    GLenum format = *(GLenum *) (pc + 44);
-    GLenum type = *(GLenum *) (pc + 48);
+    GLint skip_images  = 0;
+    GLint skip_rows    = *  (GLint *)(pc +  8);
+    GLint alignment    = *  (GLint *)(pc + 16);
+GLenum target      = * (GLenum *)(pc + 20);
+GLsizei width      = *(GLsizei *)(pc + 36);
+GLenum format      = * (GLenum *)(pc + 44);
+GLenum type        = * (GLenum *)(pc + 48);
 
     if (swap) {
         row_length = bswap_32(row_length);
@@ -370,18 +380,18 @@ __glXTexSubImage1DReqSize(const GLbyte * pc, Bool swap)
 }
 
 int
-__glXTexSubImage2DReqSize(const GLbyte * pc, Bool swap)
+__glXTexSubImage2DReqSize( const GLbyte * pc, Bool swap )
 {
-    GLint row_length = *(GLint *) (pc + 4);
+    GLint row_length   = *  (GLint *)(pc +  4);
     GLint image_height = 0;
-    GLint skip_images = 0;
-    GLint skip_rows = *(GLint *) (pc + 8);
-    GLint alignment = *(GLint *) (pc + 16);
-    GLenum target = *(GLenum *) (pc + 20);
-    GLsizei width = *(GLsizei *) (pc + 36);
-    GLsizei height = *(GLsizei *) (pc + 40);
-    GLenum format = *(GLenum *) (pc + 44);
-    GLenum type = *(GLenum *) (pc + 48);
+    GLint skip_images  = 0;
+    GLint skip_rows    = *  (GLint *)(pc +  8);
+    GLint alignment    = *  (GLint *)(pc + 16);
+GLenum target      = * (GLenum *)(pc + 20);
+GLsizei width      = *(GLsizei *)(pc + 36);
+GLsizei height     = *(GLsizei *)(pc + 40);
+GLenum format      = * (GLenum *)(pc + 44);
+GLenum type        = * (GLenum *)(pc + 48);
 
     if (swap) {
         row_length = bswap_32(row_length);
@@ -400,17 +410,17 @@ __glXTexSubImage2DReqSize(const GLbyte * pc, Bool swap)
 }
 
 int
-__glXColorTableReqSize(const GLbyte * pc, Bool swap)
+__glXColorTableReqSize( const GLbyte * pc, Bool swap )
 {
-    GLint row_length = *(GLint *) (pc + 4);
+    GLint row_length   = *  (GLint *)(pc +  4);
     GLint image_height = 0;
-    GLint skip_images = 0;
-    GLint skip_rows = *(GLint *) (pc + 8);
-    GLint alignment = *(GLint *) (pc + 16);
-    GLenum target = *(GLenum *) (pc + 20);
-    GLsizei width = *(GLsizei *) (pc + 28);
-    GLenum format = *(GLenum *) (pc + 32);
-    GLenum type = *(GLenum *) (pc + 36);
+    GLint skip_images  = 0;
+    GLint skip_rows    = *  (GLint *)(pc +  8);
+    GLint alignment    = *  (GLint *)(pc + 16);
+GLenum target      = * (GLenum *)(pc + 20);
+GLsizei width      = *(GLsizei *)(pc + 28);
+GLenum format      = * (GLenum *)(pc + 32);
+GLenum type        = * (GLenum *)(pc + 36);
 
     if (swap) {
         row_length = bswap_32(row_length);
@@ -428,9 +438,9 @@ __glXColorTableReqSize(const GLbyte * pc, Bool swap)
 }
 
 int
-__glXColorTableParameterfvReqSize(const GLbyte * pc, Bool swap)
+__glXColorTableParameterfvReqSize( const GLbyte * pc, Bool swap )
 {
-    GLenum pname = *(GLenum *) (pc + 4);
+GLenum pname       = * (GLenum *)(pc + 4);
     GLsizei compsize;
 
     if (swap) {
@@ -442,17 +452,17 @@ __glXColorTableParameterfvReqSize(const GLbyte * pc, Bool swap)
 }
 
 int
-__glXColorSubTableReqSize(const GLbyte * pc, Bool swap)
+__glXColorSubTableReqSize( const GLbyte * pc, Bool swap )
 {
-    GLint row_length = *(GLint *) (pc + 4);
+    GLint row_length   = *  (GLint *)(pc +  4);
     GLint image_height = 0;
-    GLint skip_images = 0;
-    GLint skip_rows = *(GLint *) (pc + 8);
-    GLint alignment = *(GLint *) (pc + 16);
-    GLenum target = *(GLenum *) (pc + 20);
-    GLsizei count = *(GLsizei *) (pc + 28);
-    GLenum format = *(GLenum *) (pc + 32);
-    GLenum type = *(GLenum *) (pc + 36);
+    GLint skip_images  = 0;
+    GLint skip_rows    = *  (GLint *)(pc +  8);
+    GLint alignment    = *  (GLint *)(pc + 16);
+GLenum target      = * (GLenum *)(pc + 20);
+GLsizei count      = *(GLsizei *)(pc + 28);
+GLenum format      = * (GLenum *)(pc + 32);
+GLenum type        = * (GLenum *)(pc + 36);
 
     if (swap) {
         row_length = bswap_32(row_length);
@@ -470,17 +480,17 @@ __glXColorSubTableReqSize(const GLbyte * pc, Bool swap)
 }
 
 int
-__glXConvolutionFilter1DReqSize(const GLbyte * pc, Bool swap)
+__glXConvolutionFilter1DReqSize( const GLbyte * pc, Bool swap )
 {
-    GLint row_length = *(GLint *) (pc + 4);
+    GLint row_length   = *  (GLint *)(pc +  4);
     GLint image_height = 0;
-    GLint skip_images = 0;
-    GLint skip_rows = *(GLint *) (pc + 8);
-    GLint alignment = *(GLint *) (pc + 16);
-    GLenum target = *(GLenum *) (pc + 20);
-    GLsizei width = *(GLsizei *) (pc + 28);
-    GLenum format = *(GLenum *) (pc + 36);
-    GLenum type = *(GLenum *) (pc + 40);
+    GLint skip_images  = 0;
+    GLint skip_rows    = *  (GLint *)(pc +  8);
+    GLint alignment    = *  (GLint *)(pc + 16);
+GLenum target      = * (GLenum *)(pc + 20);
+GLsizei width      = *(GLsizei *)(pc + 28);
+GLenum format      = * (GLenum *)(pc + 36);
+GLenum type        = * (GLenum *)(pc + 40);
 
     if (swap) {
         row_length = bswap_32(row_length);
@@ -498,18 +508,18 @@ __glXConvolutionFilter1DReqSize(const GLbyte * pc, Bool swap)
 }
 
 int
-__glXConvolutionFilter2DReqSize(const GLbyte * pc, Bool swap)
+__glXConvolutionFilter2DReqSize( const GLbyte * pc, Bool swap )
 {
-    GLint row_length = *(GLint *) (pc + 4);
+    GLint row_length   = *  (GLint *)(pc +  4);
     GLint image_height = 0;
-    GLint skip_images = 0;
-    GLint skip_rows = *(GLint *) (pc + 8);
-    GLint alignment = *(GLint *) (pc + 16);
-    GLenum target = *(GLenum *) (pc + 20);
-    GLsizei width = *(GLsizei *) (pc + 28);
-    GLsizei height = *(GLsizei *) (pc + 32);
-    GLenum format = *(GLenum *) (pc + 36);
-    GLenum type = *(GLenum *) (pc + 40);
+    GLint skip_images  = 0;
+    GLint skip_rows    = *  (GLint *)(pc +  8);
+    GLint alignment    = *  (GLint *)(pc + 16);
+GLenum target      = * (GLenum *)(pc + 20);
+GLsizei width      = *(GLsizei *)(pc + 28);
+GLsizei height     = *(GLsizei *)(pc + 32);
+GLenum format      = * (GLenum *)(pc + 36);
+GLenum type        = * (GLenum *)(pc + 40);
 
     if (swap) {
         row_length = bswap_32(row_length);
@@ -528,9 +538,9 @@ __glXConvolutionFilter2DReqSize(const GLbyte * pc, Bool swap)
 }
 
 int
-__glXConvolutionParameterfvReqSize(const GLbyte * pc, Bool swap)
+__glXConvolutionParameterfvReqSize( const GLbyte * pc, Bool swap )
 {
-    GLenum pname = *(GLenum *) (pc + 4);
+GLenum pname       = * (GLenum *)(pc + 4);
     GLsizei compsize;
 
     if (swap) {
@@ -542,19 +552,19 @@ __glXConvolutionParameterfvReqSize(const GLbyte * pc, Bool swap)
 }
 
 int
-__glXTexImage3DReqSize(const GLbyte * pc, Bool swap)
+__glXTexImage3DReqSize( const GLbyte * pc, Bool swap )
 {
-    GLint row_length = *(GLint *) (pc + 4);
-    GLint image_height = *(GLint *) (pc + 8);
-    GLint skip_rows = *(GLint *) (pc + 16);
-    GLint skip_images = *(GLint *) (pc + 20);
-    GLint alignment = *(GLint *) (pc + 32);
-    GLenum target = *(GLenum *) (pc + 36);
-    GLsizei width = *(GLsizei *) (pc + 48);
-    GLsizei height = *(GLsizei *) (pc + 52);
-    GLsizei depth = *(GLsizei *) (pc + 56);
-    GLenum format = *(GLenum *) (pc + 68);
-    GLenum type = *(GLenum *) (pc + 72);
+    GLint row_length   = *  (GLint *)(pc +  4);
+    GLint image_height = *  (GLint *)(pc +  8);
+    GLint skip_rows    = *  (GLint *)(pc + 16);
+    GLint skip_images  = *  (GLint *)(pc + 20);
+    GLint alignment    = *  (GLint *)(pc + 32);
+GLenum target      = * (GLenum *)(pc + 36);
+GLsizei width      = *(GLsizei *)(pc + 48);
+GLsizei height     = *(GLsizei *)(pc + 52);
+GLsizei depth      = *(GLsizei *)(pc + 56);
+GLenum format      = * (GLenum *)(pc + 68);
+GLenum type        = * (GLenum *)(pc + 72);
 
     if (swap) {
         row_length = bswap_32(row_length);
@@ -570,8 +580,8 @@ __glXTexImage3DReqSize(const GLbyte * pc, Bool swap)
         type = bswap_32(type);
     }
 
-    if (*(CARD32 *) (pc + 76))
-        return 0;
+	   if (*(CARD32 *) (pc + 76))
+	       return 0;
 
     return __glXImageSize(format, type, target, width, height, depth,
                           image_height, row_length, skip_images,
@@ -579,19 +589,19 @@ __glXTexImage3DReqSize(const GLbyte * pc, Bool swap)
 }
 
 int
-__glXTexSubImage3DReqSize(const GLbyte * pc, Bool swap)
+__glXTexSubImage3DReqSize( const GLbyte * pc, Bool swap )
 {
-    GLint row_length = *(GLint *) (pc + 4);
-    GLint image_height = *(GLint *) (pc + 8);
-    GLint skip_rows = *(GLint *) (pc + 16);
-    GLint skip_images = *(GLint *) (pc + 20);
-    GLint alignment = *(GLint *) (pc + 32);
-    GLenum target = *(GLenum *) (pc + 36);
-    GLsizei width = *(GLsizei *) (pc + 60);
-    GLsizei height = *(GLsizei *) (pc + 64);
-    GLsizei depth = *(GLsizei *) (pc + 68);
-    GLenum format = *(GLenum *) (pc + 76);
-    GLenum type = *(GLenum *) (pc + 80);
+    GLint row_length   = *  (GLint *)(pc +  4);
+    GLint image_height = *  (GLint *)(pc +  8);
+    GLint skip_rows    = *  (GLint *)(pc + 16);
+    GLint skip_images  = *  (GLint *)(pc + 20);
+    GLint alignment    = *  (GLint *)(pc + 32);
+GLenum target      = * (GLenum *)(pc + 36);
+GLsizei width      = *(GLsizei *)(pc + 60);
+GLsizei height     = *(GLsizei *)(pc + 64);
+GLsizei depth      = *(GLsizei *)(pc + 68);
+GLenum format      = * (GLenum *)(pc + 76);
+GLenum type        = * (GLenum *)(pc + 80);
 
     if (swap) {
         row_length = bswap_32(row_length);
@@ -613,9 +623,9 @@ __glXTexSubImage3DReqSize(const GLbyte * pc, Bool swap)
 }
 
 int
-__glXCompressedTexImage1DARBReqSize(const GLbyte * pc, Bool swap)
+__glXCompressedTexImage1DReqSize( const GLbyte * pc, Bool swap )
 {
-    GLsizei imageSize = *(GLsizei *) (pc + 20);
+GLsizei imageSize  = *(GLsizei *)(pc + 20);
 
     if (swap) {
         imageSize = bswap_32(imageSize);
@@ -625,9 +635,9 @@ __glXCompressedTexImage1DARBReqSize(const GLbyte * pc, Bool swap)
 }
 
 int
-__glXCompressedTexImage2DARBReqSize(const GLbyte * pc, Bool swap)
+__glXCompressedTexImage2DReqSize( const GLbyte * pc, Bool swap )
 {
-    GLsizei imageSize = *(GLsizei *) (pc + 24);
+GLsizei imageSize  = *(GLsizei *)(pc + 24);
 
     if (swap) {
         imageSize = bswap_32(imageSize);
@@ -637,9 +647,9 @@ __glXCompressedTexImage2DARBReqSize(const GLbyte * pc, Bool swap)
 }
 
 int
-__glXCompressedTexImage3DARBReqSize(const GLbyte * pc, Bool swap)
+__glXCompressedTexImage3DReqSize( const GLbyte * pc, Bool swap )
 {
-    GLsizei imageSize = *(GLsizei *) (pc + 28);
+GLsizei imageSize  = *(GLsizei *)(pc + 28);
 
     if (swap) {
         imageSize = bswap_32(imageSize);
@@ -649,9 +659,9 @@ __glXCompressedTexImage3DARBReqSize(const GLbyte * pc, Bool swap)
 }
 
 int
-__glXCompressedTexSubImage3DARBReqSize(const GLbyte * pc, Bool swap)
+__glXCompressedTexSubImage3DReqSize( const GLbyte * pc, Bool swap )
 {
-    GLsizei imageSize = *(GLsizei *) (pc + 36);
+GLsizei imageSize  = *(GLsizei *)(pc + 36);
 
     if (swap) {
         imageSize = bswap_32(imageSize);
@@ -661,21 +671,23 @@ __glXCompressedTexSubImage3DARBReqSize(const GLbyte * pc, Bool swap)
 }
 
 int
-__glXProgramStringARBReqSize(const GLbyte * pc, Bool swap)
+__glXPointParameterfvReqSize( const GLbyte * pc, Bool swap )
 {
-    GLsizei len = *(GLsizei *) (pc + 8);
+GLenum pname       = * (GLenum *)(pc + 0);
+    GLsizei compsize;
 
     if (swap) {
-        len = bswap_32(len);
+        pname = bswap_32(pname);
     }
 
-    return __GLX_PAD(len);
+    compsize = __glPointParameterfv_size(pname);
+    return __GLX_PAD((compsize * 4));
 }
 
 int
-__glXDrawBuffersARBReqSize(const GLbyte * pc, Bool swap)
+__glXDrawBuffersReqSize( const GLbyte * pc, Bool swap )
 {
-    GLsizei n = *(GLsizei *) (pc + 0);
+GLsizei n          = *(GLsizei *)(pc + 0);
 
     if (swap) {
         n = bswap_32(n);
@@ -685,23 +697,21 @@ __glXDrawBuffersARBReqSize(const GLbyte * pc, Bool swap)
 }
 
 int
-__glXPointParameterfvEXTReqSize(const GLbyte * pc, Bool swap)
+__glXProgramStringARBReqSize( const GLbyte * pc, Bool swap )
 {
-    GLenum pname = *(GLenum *) (pc + 0);
-    GLsizei compsize;
+GLsizei len        = *(GLsizei *)(pc + 8);
 
     if (swap) {
-        pname = bswap_32(pname);
+        len = bswap_32(len);
     }
 
-    compsize = __glPointParameterfvEXT_size(pname);
-    return __GLX_PAD((compsize * 4));
+    return __GLX_PAD(len);
 }
 
 int
-__glXProgramParameters4dvNVReqSize(const GLbyte * pc, Bool swap)
+__glXProgramParameters4dvNVReqSize( const GLbyte * pc, Bool swap )
 {
-    GLsizei num = *(GLsizei *) (pc + 8);
+GLsizei num        = *(GLsizei *)(pc + 8);
 
     if (swap) {
         num = bswap_32(num);
@@ -711,9 +721,9 @@ __glXProgramParameters4dvNVReqSize(const GLbyte * pc, Bool swap)
 }
 
 int
-__glXProgramParameters4fvNVReqSize(const GLbyte * pc, Bool swap)
+__glXProgramParameters4fvNVReqSize( const GLbyte * pc, Bool swap )
 {
-    GLsizei num = *(GLsizei *) (pc + 8);
+GLsizei num        = *(GLsizei *)(pc + 8);
 
     if (swap) {
         num = bswap_32(num);
@@ -723,9 +733,9 @@ __glXProgramParameters4fvNVReqSize(const GLbyte * pc, Bool swap)
 }
 
 int
-__glXVertexAttribs1dvNVReqSize(const GLbyte * pc, Bool swap)
+__glXVertexAttribs1dvNVReqSize( const GLbyte * pc, Bool swap )
 {
-    GLsizei n = *(GLsizei *) (pc + 4);
+GLsizei n          = *(GLsizei *)(pc + 4);
 
     if (swap) {
         n = bswap_32(n);
@@ -735,9 +745,9 @@ __glXVertexAttribs1dvNVReqSize(const GLbyte * pc, Bool swap)
 }
 
 int
-__glXVertexAttribs2dvNVReqSize(const GLbyte * pc, Bool swap)
+__glXVertexAttribs2dvNVReqSize( const GLbyte * pc, Bool swap )
 {
-    GLsizei n = *(GLsizei *) (pc + 4);
+GLsizei n          = *(GLsizei *)(pc + 4);
 
     if (swap) {
         n = bswap_32(n);
@@ -747,9 +757,9 @@ __glXVertexAttribs2dvNVReqSize(const GLbyte * pc, Bool swap)
 }
 
 int
-__glXVertexAttribs3dvNVReqSize(const GLbyte * pc, Bool swap)
+__glXVertexAttribs3dvNVReqSize( const GLbyte * pc, Bool swap )
 {
-    GLsizei n = *(GLsizei *) (pc + 4);
+GLsizei n          = *(GLsizei *)(pc + 4);
 
     if (swap) {
         n = bswap_32(n);
@@ -759,9 +769,9 @@ __glXVertexAttribs3dvNVReqSize(const GLbyte * pc, Bool swap)
 }
 
 int
-__glXVertexAttribs3fvNVReqSize(const GLbyte * pc, Bool swap)
+__glXVertexAttribs3fvNVReqSize( const GLbyte * pc, Bool swap )
 {
-    GLsizei n = *(GLsizei *) (pc + 4);
+GLsizei n          = *(GLsizei *)(pc + 4);
 
     if (swap) {
         n = bswap_32(n);
@@ -771,9 +781,9 @@ __glXVertexAttribs3fvNVReqSize(const GLbyte * pc, Bool swap)
 }
 
 int
-__glXVertexAttribs3svNVReqSize(const GLbyte * pc, Bool swap)
+__glXVertexAttribs3svNVReqSize( const GLbyte * pc, Bool swap )
 {
-    GLsizei n = *(GLsizei *) (pc + 4);
+GLsizei n          = *(GLsizei *)(pc + 4);
 
     if (swap) {
         n = bswap_32(n);
@@ -783,9 +793,9 @@ __glXVertexAttribs3svNVReqSize(const GLbyte * pc, Bool swap)
 }
 
 int
-__glXVertexAttribs4dvNVReqSize(const GLbyte * pc, Bool swap)
+__glXVertexAttribs4dvNVReqSize( const GLbyte * pc, Bool swap )
 {
-    GLsizei n = *(GLsizei *) (pc + 4);
+GLsizei n          = *(GLsizei *)(pc + 4);
 
     if (swap) {
         n = bswap_32(n);
@@ -795,9 +805,9 @@ __glXVertexAttribs4dvNVReqSize(const GLbyte * pc, Bool swap)
 }
 
 int
-__glXProgramNamedParameter4fvNVReqSize(const GLbyte * pc, Bool swap)
+__glXProgramNamedParameter4fvNVReqSize( const GLbyte * pc, Bool swap )
 {
-    GLsizei len = *(GLsizei *) (pc + 4);
+GLsizei len        = *(GLsizei *)(pc + 4);
 
     if (swap) {
         len = bswap_32(len);
@@ -806,28 +816,28 @@ __glXProgramNamedParameter4fvNVReqSize(const GLbyte * pc, Bool swap)
     return __GLX_PAD(len);
 }
 
-ALIAS(Fogiv, Fogfv)
-    ALIAS(Lightiv, Lightfv)
-    ALIAS(LightModeliv, LightModelfv)
-    ALIAS(Materialiv, Materialfv)
-    ALIAS(TexParameteriv, TexParameterfv)
-    ALIAS(TexEnviv, TexEnvfv)
-    ALIAS(TexGeniv, TexGenfv)
-    ALIAS(PixelMapuiv, PixelMapfv)
-    ALIAS(ColorTableParameteriv, ColorTableParameterfv)
-    ALIAS(ConvolutionParameteriv, ConvolutionParameterfv)
-    ALIAS(CompressedTexSubImage1DARB, CompressedTexImage1DARB)
-    ALIAS(CompressedTexSubImage2DARB, CompressedTexImage3DARB)
-    ALIAS(LoadProgramNV, ProgramStringARB)
-    ALIAS(RequestResidentProgramsNV, DrawBuffersARB)
-    ALIAS(VertexAttribs1fvNV, PixelMapfv)
-    ALIAS(VertexAttribs1svNV, PixelMapusv)
-    ALIAS(VertexAttribs2fvNV, VertexAttribs1dvNV)
-    ALIAS(VertexAttribs2svNV, PixelMapfv)
-    ALIAS(VertexAttribs4fvNV, VertexAttribs2dvNV)
-    ALIAS(VertexAttribs4svNV, VertexAttribs1dvNV)
-    ALIAS(VertexAttribs4ubvNV, PixelMapfv)
-    ALIAS(PointParameterivNV, PointParameterfvEXT)
-    ALIAS(ProgramNamedParameter4dvNV, CompressedTexSubImage3DARB)
-    ALIAS(DeleteFramebuffersEXT, DrawBuffersARB)
-    ALIAS(DeleteRenderbuffersEXT, DrawBuffersARB)
+ALIAS( Fogiv, Fogfv )
+ALIAS( Lightiv, Lightfv )
+ALIAS( LightModeliv, LightModelfv )
+ALIAS( Materialiv, Materialfv )
+ALIAS( TexParameteriv, TexParameterfv )
+ALIAS( TexEnviv, TexEnvfv )
+ALIAS( TexGeniv, TexGenfv )
+ALIAS( PixelMapuiv, PixelMapfv )
+ALIAS( ColorTableParameteriv, ColorTableParameterfv )
+ALIAS( ConvolutionParameteriv, ConvolutionParameterfv )
+ALIAS( CompressedTexSubImage1D, CompressedTexImage1D )
+ALIAS( CompressedTexSubImage2D, CompressedTexImage3D )
+ALIAS( PointParameteriv, PointParameterfv )
+ALIAS( DeleteFramebuffers, DrawBuffers )
+ALIAS( DeleteRenderbuffers, DrawBuffers )
+ALIAS( LoadProgramNV, ProgramStringARB )
+ALIAS( RequestResidentProgramsNV, DrawBuffers )
+ALIAS( VertexAttribs1fvNV, PixelMapfv )
+ALIAS( VertexAttribs1svNV, PixelMapusv )
+ALIAS( VertexAttribs2fvNV, VertexAttribs1dvNV )
+ALIAS( VertexAttribs2svNV, PixelMapfv )
+ALIAS( VertexAttribs4fvNV, VertexAttribs2dvNV )
+ALIAS( VertexAttribs4svNV, VertexAttribs1dvNV )
+ALIAS( VertexAttribs4ubvNV, PixelMapfv )
+ALIAS( ProgramNamedParameter4dvNV, CompressedTexSubImage3D )
diff --git a/xorg-server/glx/indirect_reqsize.h b/xorg-server/glx/indirect_reqsize.h
index d2c1da762..1b7bd6ebf 100644
--- a/xorg-server/glx/indirect_reqsize.h
+++ b/xorg-server/glx/indirect_reqsize.h
@@ -26,139 +26,91 @@
  */
 
 #if !defined( _INDIRECT_REQSIZE_H_ )
-#define _INDIRECT_REQSIZE_H_
+#  define _INDIRECT_REQSIZE_H_
 
 #include <X11/Xfuncproto.h>
 
-#if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
-#define PURE __attribute__((pure))
-#else
-#define PURE
-#endif
+#  if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
+#    define PURE __attribute__((pure))
+#  else
+#    define PURE
+#  endif
 
-extern PURE _X_HIDDEN int __glXCallListsReqSize(const GLbyte * pc, Bool swap);
-extern PURE _X_HIDDEN int __glXBitmapReqSize(const GLbyte * pc, Bool swap);
-extern PURE _X_HIDDEN int __glXFogfvReqSize(const GLbyte * pc, Bool swap);
-extern PURE _X_HIDDEN int __glXFogivReqSize(const GLbyte * pc, Bool swap);
-extern PURE _X_HIDDEN int __glXLightfvReqSize(const GLbyte * pc, Bool swap);
-extern PURE _X_HIDDEN int __glXLightivReqSize(const GLbyte * pc, Bool swap);
-extern PURE _X_HIDDEN int __glXLightModelfvReqSize(const GLbyte * pc,
-                                                   Bool swap);
-extern PURE _X_HIDDEN int __glXLightModelivReqSize(const GLbyte * pc,
-                                                   Bool swap);
-extern PURE _X_HIDDEN int __glXMaterialfvReqSize(const GLbyte * pc, Bool swap);
-extern PURE _X_HIDDEN int __glXMaterialivReqSize(const GLbyte * pc, Bool swap);
-extern PURE _X_HIDDEN int __glXPolygonStippleReqSize(const GLbyte * pc,
-                                                     Bool swap);
-extern PURE _X_HIDDEN int __glXTexParameterfvReqSize(const GLbyte * pc,
-                                                     Bool swap);
-extern PURE _X_HIDDEN int __glXTexParameterivReqSize(const GLbyte * pc,
-                                                     Bool swap);
-extern PURE _X_HIDDEN int __glXTexImage1DReqSize(const GLbyte * pc, Bool swap);
-extern PURE _X_HIDDEN int __glXTexImage2DReqSize(const GLbyte * pc, Bool swap);
-extern PURE _X_HIDDEN int __glXTexEnvfvReqSize(const GLbyte * pc, Bool swap);
-extern PURE _X_HIDDEN int __glXTexEnvivReqSize(const GLbyte * pc, Bool swap);
-extern PURE _X_HIDDEN int __glXTexGendvReqSize(const GLbyte * pc, Bool swap);
-extern PURE _X_HIDDEN int __glXTexGenfvReqSize(const GLbyte * pc, Bool swap);
-extern PURE _X_HIDDEN int __glXTexGenivReqSize(const GLbyte * pc, Bool swap);
-extern PURE _X_HIDDEN int __glXMap1dReqSize(const GLbyte * pc, Bool swap);
-extern PURE _X_HIDDEN int __glXMap1fReqSize(const GLbyte * pc, Bool swap);
-extern PURE _X_HIDDEN int __glXMap2dReqSize(const GLbyte * pc, Bool swap);
-extern PURE _X_HIDDEN int __glXMap2fReqSize(const GLbyte * pc, Bool swap);
-extern PURE _X_HIDDEN int __glXPixelMapfvReqSize(const GLbyte * pc, Bool swap);
-extern PURE _X_HIDDEN int __glXPixelMapuivReqSize(const GLbyte * pc, Bool swap);
-extern PURE _X_HIDDEN int __glXPixelMapusvReqSize(const GLbyte * pc, Bool swap);
-extern PURE _X_HIDDEN int __glXDrawPixelsReqSize(const GLbyte * pc, Bool swap);
-extern PURE _X_HIDDEN int __glXDrawArraysReqSize(const GLbyte * pc, Bool swap);
-extern PURE _X_HIDDEN int __glXPrioritizeTexturesReqSize(const GLbyte * pc,
-                                                         Bool swap);
-extern PURE _X_HIDDEN int __glXTexSubImage1DReqSize(const GLbyte * pc,
-                                                    Bool swap);
-extern PURE _X_HIDDEN int __glXTexSubImage2DReqSize(const GLbyte * pc,
-                                                    Bool swap);
-extern PURE _X_HIDDEN int __glXColorTableReqSize(const GLbyte * pc, Bool swap);
-extern PURE _X_HIDDEN int __glXColorTableParameterfvReqSize(const GLbyte * pc,
-                                                            Bool swap);
-extern PURE _X_HIDDEN int __glXColorTableParameterivReqSize(const GLbyte * pc,
-                                                            Bool swap);
-extern PURE _X_HIDDEN int __glXColorSubTableReqSize(const GLbyte * pc,
-                                                    Bool swap);
-extern PURE _X_HIDDEN int __glXConvolutionFilter1DReqSize(const GLbyte * pc,
-                                                          Bool swap);
-extern PURE _X_HIDDEN int __glXConvolutionFilter2DReqSize(const GLbyte * pc,
-                                                          Bool swap);
-extern PURE _X_HIDDEN int __glXConvolutionParameterfvReqSize(const GLbyte * pc,
-                                                             Bool swap);
-extern PURE _X_HIDDEN int __glXConvolutionParameterivReqSize(const GLbyte * pc,
-                                                             Bool swap);
-extern PURE _X_HIDDEN int __glXSeparableFilter2DReqSize(const GLbyte * pc,
-                                                        Bool swap);
-extern PURE _X_HIDDEN int __glXTexImage3DReqSize(const GLbyte * pc, Bool swap);
-extern PURE _X_HIDDEN int __glXTexSubImage3DReqSize(const GLbyte * pc,
-                                                    Bool swap);
-extern PURE _X_HIDDEN int __glXCompressedTexImage1DARBReqSize(const GLbyte * pc,
-                                                              Bool swap);
-extern PURE _X_HIDDEN int __glXCompressedTexImage2DARBReqSize(const GLbyte * pc,
-                                                              Bool swap);
-extern PURE _X_HIDDEN int __glXCompressedTexImage3DARBReqSize(const GLbyte * pc,
-                                                              Bool swap);
-extern PURE _X_HIDDEN int __glXCompressedTexSubImage1DARBReqSize(const GLbyte *
-                                                                 pc, Bool swap);
-extern PURE _X_HIDDEN int __glXCompressedTexSubImage2DARBReqSize(const GLbyte *
-                                                                 pc, Bool swap);
-extern PURE _X_HIDDEN int __glXCompressedTexSubImage3DARBReqSize(const GLbyte *
-                                                                 pc, Bool swap);
-extern PURE _X_HIDDEN int __glXProgramStringARBReqSize(const GLbyte * pc,
-                                                       Bool swap);
-extern PURE _X_HIDDEN int __glXDrawBuffersARBReqSize(const GLbyte * pc,
-                                                     Bool swap);
-extern PURE _X_HIDDEN int __glXPointParameterfvEXTReqSize(const GLbyte * pc,
-                                                          Bool swap);
-extern PURE _X_HIDDEN int __glXLoadProgramNVReqSize(const GLbyte * pc,
-                                                    Bool swap);
-extern PURE _X_HIDDEN int __glXProgramParameters4dvNVReqSize(const GLbyte * pc,
-                                                             Bool swap);
-extern PURE _X_HIDDEN int __glXProgramParameters4fvNVReqSize(const GLbyte * pc,
-                                                             Bool swap);
-extern PURE _X_HIDDEN int __glXRequestResidentProgramsNVReqSize(const GLbyte *
-                                                                pc, Bool swap);
-extern PURE _X_HIDDEN int __glXVertexAttribs1dvNVReqSize(const GLbyte * pc,
-                                                         Bool swap);
-extern PURE _X_HIDDEN int __glXVertexAttribs1fvNVReqSize(const GLbyte * pc,
-                                                         Bool swap);
-extern PURE _X_HIDDEN int __glXVertexAttribs1svNVReqSize(const GLbyte * pc,
-                                                         Bool swap);
-extern PURE _X_HIDDEN int __glXVertexAttribs2dvNVReqSize(const GLbyte * pc,
-                                                         Bool swap);
-extern PURE _X_HIDDEN int __glXVertexAttribs2fvNVReqSize(const GLbyte * pc,
-                                                         Bool swap);
-extern PURE _X_HIDDEN int __glXVertexAttribs2svNVReqSize(const GLbyte * pc,
-                                                         Bool swap);
-extern PURE _X_HIDDEN int __glXVertexAttribs3dvNVReqSize(const GLbyte * pc,
-                                                         Bool swap);
-extern PURE _X_HIDDEN int __glXVertexAttribs3fvNVReqSize(const GLbyte * pc,
-                                                         Bool swap);
-extern PURE _X_HIDDEN int __glXVertexAttribs3svNVReqSize(const GLbyte * pc,
-                                                         Bool swap);
-extern PURE _X_HIDDEN int __glXVertexAttribs4dvNVReqSize(const GLbyte * pc,
-                                                         Bool swap);
-extern PURE _X_HIDDEN int __glXVertexAttribs4fvNVReqSize(const GLbyte * pc,
-                                                         Bool swap);
-extern PURE _X_HIDDEN int __glXVertexAttribs4svNVReqSize(const GLbyte * pc,
-                                                         Bool swap);
-extern PURE _X_HIDDEN int __glXVertexAttribs4ubvNVReqSize(const GLbyte * pc,
-                                                          Bool swap);
-extern PURE _X_HIDDEN int __glXPointParameterivNVReqSize(const GLbyte * pc,
-                                                         Bool swap);
-extern PURE _X_HIDDEN int __glXProgramNamedParameter4dvNVReqSize(const GLbyte *
-                                                                 pc, Bool swap);
-extern PURE _X_HIDDEN int __glXProgramNamedParameter4fvNVReqSize(const GLbyte *
-                                                                 pc, Bool swap);
-extern PURE _X_HIDDEN int __glXDeleteFramebuffersEXTReqSize(const GLbyte * pc,
-                                                            Bool swap);
-extern PURE _X_HIDDEN int __glXDeleteRenderbuffersEXTReqSize(const GLbyte * pc,
-                                                             Bool swap);
+extern PURE _X_HIDDEN int __glXCallListsReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXBitmapReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXFogfvReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXFogivReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXLightfvReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXLightivReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXLightModelfvReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXLightModelivReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXMaterialfvReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXMaterialivReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXPolygonStippleReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXTexParameterfvReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXTexParameterivReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXTexImage1DReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXTexImage2DReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXTexEnvfvReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXTexEnvivReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXTexGendvReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXTexGenfvReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXTexGenivReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXMap1dReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXMap1fReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXMap2dReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXMap2fReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXPixelMapfvReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXPixelMapuivReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXPixelMapusvReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXDrawPixelsReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXDrawArraysReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXPrioritizeTexturesReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXTexSubImage1DReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXTexSubImage2DReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXColorTableReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXColorTableParameterfvReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXColorTableParameterivReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXColorSubTableReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXConvolutionFilter1DReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXConvolutionFilter2DReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXConvolutionParameterfvReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXConvolutionParameterivReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXSeparableFilter2DReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXTexImage3DReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXTexSubImage3DReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXCompressedTexImage1DReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXCompressedTexImage2DReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXCompressedTexImage3DReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXCompressedTexSubImage1DReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXCompressedTexSubImage2DReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXCompressedTexSubImage3DReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXPointParameterfvReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXPointParameterivReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXDrawBuffersReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXProgramStringARBReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXDeleteFramebuffersReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXDeleteRenderbuffersReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXLoadProgramNVReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXProgramParameters4dvNVReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXProgramParameters4fvNVReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXRequestResidentProgramsNVReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXVertexAttribs1dvNVReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXVertexAttribs1fvNVReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXVertexAttribs1svNVReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXVertexAttribs2dvNVReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXVertexAttribs2fvNVReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXVertexAttribs2svNVReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXVertexAttribs3dvNVReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXVertexAttribs3fvNVReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXVertexAttribs3svNVReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXVertexAttribs4dvNVReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXVertexAttribs4fvNVReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXVertexAttribs4svNVReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXVertexAttribs4ubvNVReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXProgramNamedParameter4dvNVReqSize(const GLbyte *pc, Bool swap);
+extern PURE _X_HIDDEN int __glXProgramNamedParameter4fvNVReqSize(const GLbyte *pc, Bool swap);
 
-#undef PURE
+#  undef PURE
 
-#endif                          /* !defined( _INDIRECT_REQSIZE_H_ ) */
+#endif /* !defined( _INDIRECT_REQSIZE_H_ ) */
diff --git a/xorg-server/glx/indirect_size.h b/xorg-server/glx/indirect_size.h
index 56ffc1c68..b1be16b3c 100644
--- a/xorg-server/glx/indirect_size.h
+++ b/xorg-server/glx/indirect_size.h
@@ -1,83 +1,57 @@
-/* DO NOT EDIT - This file generated automatically by glX_proto_size.py (from Mesa) script */
-
-/*
- * (C) Copyright IBM Corporation 2004
- * All Rights Reserved.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sub license,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
- * IBM,
- * AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#if !defined( _INDIRECT_SIZE_H_ )
-#define _INDIRECT_SIZE_H_
-
-/**
- * \file
- * Prototypes for functions used to determine the number of data elements in
- * various GLX protocol messages.
- *
- * \author Ian Romanick <idr@us.ibm.com>
- */
-
-#include <X11/Xfuncproto.h>
-
-#if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
-#define PURE __attribute__((pure))
-#else
-#define PURE
-#endif
-
-#if defined(__i386__) && defined(__GNUC__) && !defined(__CYGWIN__) && !defined(__MINGW32__)
-#define FASTCALL __attribute__((fastcall))
-#else
-#define FASTCALL
-#endif
-
-extern _X_INTERNAL PURE FASTCALL GLint __glCallLists_size(GLenum);
-extern _X_INTERNAL PURE FASTCALL GLint __glFogfv_size(GLenum);
-extern _X_INTERNAL PURE FASTCALL GLint __glFogiv_size(GLenum);
-extern _X_INTERNAL PURE FASTCALL GLint __glLightfv_size(GLenum);
-extern _X_INTERNAL PURE FASTCALL GLint __glLightiv_size(GLenum);
-extern _X_INTERNAL PURE FASTCALL GLint __glLightModelfv_size(GLenum);
-extern _X_INTERNAL PURE FASTCALL GLint __glLightModeliv_size(GLenum);
-extern _X_INTERNAL PURE FASTCALL GLint __glMaterialfv_size(GLenum);
-extern _X_INTERNAL PURE FASTCALL GLint __glMaterialiv_size(GLenum);
-extern _X_INTERNAL PURE FASTCALL GLint __glTexParameterfv_size(GLenum);
-extern _X_INTERNAL PURE FASTCALL GLint __glTexParameteriv_size(GLenum);
-extern _X_INTERNAL PURE FASTCALL GLint __glTexEnvfv_size(GLenum);
-extern _X_INTERNAL PURE FASTCALL GLint __glTexEnviv_size(GLenum);
-extern _X_INTERNAL PURE FASTCALL GLint __glTexGendv_size(GLenum);
-extern _X_INTERNAL PURE FASTCALL GLint __glTexGenfv_size(GLenum);
-extern _X_INTERNAL PURE FASTCALL GLint __glTexGeniv_size(GLenum);
-extern _X_INTERNAL PURE FASTCALL GLint __glMap1d_size(GLenum);
-extern _X_INTERNAL PURE FASTCALL GLint __glMap1f_size(GLenum);
-extern _X_INTERNAL PURE FASTCALL GLint __glMap2d_size(GLenum);
-extern _X_INTERNAL PURE FASTCALL GLint __glMap2f_size(GLenum);
-extern _X_INTERNAL PURE FASTCALL GLint __glColorTableParameterfv_size(GLenum);
-extern _X_INTERNAL PURE FASTCALL GLint __glColorTableParameteriv_size(GLenum);
-extern _X_INTERNAL PURE FASTCALL GLint __glConvolutionParameterfv_size(GLenum);
-extern _X_INTERNAL PURE FASTCALL GLint __glConvolutionParameteriv_size(GLenum);
-extern _X_INTERNAL PURE FASTCALL GLint __glPointParameterfvEXT_size(GLenum);
-extern _X_INTERNAL PURE FASTCALL GLint __glPointParameterivNV_size(GLenum);
-
-#undef PURE
-#undef FASTCALL
-
-#endif                          /* !defined( _INDIRECT_SIZE_H_ ) */
+/* DO NOT EDIT - This file generated automatically by glX_proto_size.py (from Mesa) script */

+

+/*

+ * (C) Copyright IBM Corporation 2004

+ * All Rights Reserved.

+ * 

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

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

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

+ * the rights to use, copy, modify, merge, publish, distribute, sub license,

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

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

+ * 

+ * The above copyright notice and this permission notice (including the next

+ * paragraph) shall be included in all copies or substantial portions of the

+ * Software.

+ * 

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

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

+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL

+ * IBM,

+ * AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

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

+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

+ * SOFTWARE.

+ */

+

+#if !defined( _INDIRECT_SIZE_H_ )

+#  define _INDIRECT_SIZE_H_

+

+/**

+ * \file

+ * Prototypes for functions used to determine the number of data elements in

+ * various GLX protocol messages.

+ *

+ * \author Ian Romanick <idr@us.ibm.com>

+ */

+

+#include <X11/Xfuncproto.h>

+

+#  if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))

+#    define PURE __attribute__((pure))

+#  else

+#    define PURE

+#  endif

+

+#  if defined(__i386__) && defined(__GNUC__) && !defined(__CYGWIN__) && !defined(__MINGW32__)

+#    define FASTCALL __attribute__((fastcall))

+#  else

+#    define FASTCALL

+#  endif

+

+

+#  undef PURE

+#  undef FASTCALL

+

+#endif /* !defined( _INDIRECT_SIZE_H_ ) */

diff --git a/xorg-server/glx/indirect_size_get.c b/xorg-server/glx/indirect_size_get.c
index da3a6cb85..f3329298a 100644
--- a/xorg-server/glx/indirect_size_get.c
+++ b/xorg-server/glx/indirect_size_get.c
@@ -25,1212 +25,1226 @@
  * SOFTWARE.
  */
 
-#include <X11/Xfuncproto.h>
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#else
+
+#include "glheader.h"
+
+#endif
+
 #include <GL/gl.h>
 #include "indirect_size_get.h"
 #include "glxserver.h"
 #include "indirect_util.h"
 #include "indirect_size.h"
 
-#if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
-#define PURE __attribute__((pure))
-#else
-#define PURE
-#endif
+#  if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
+#    define PURE __attribute__((pure))
+#  else
+#    define PURE
+#  endif
+
+#  if defined(__i386__) && defined(__GNUC__) && !defined(__CYGWIN__) && !defined(__MINGW32__)
+#    define FASTCALL __attribute__((fastcall))
+#  else
+#    define FASTCALL
+#  endif
 
-#if defined(__i386__) && defined(__GNUC__) && !defined(__CYGWIN__) && !defined(__MINGW32__)
-#define FASTCALL __attribute__((fastcall))
-#else
-#define FASTCALL
-#endif
 
 #if defined(__CYGWIN__) || defined(__MINGW32__) || defined(GLX_USE_APPLEGL)
-#undef HAVE_ALIAS
+#  undef HAVE_ALIAS
 #endif
 #ifdef HAVE_ALIAS
-#define ALIAS2(from,to) \
+#  define ALIAS2(from,to) \
     _X_INTERNAL PURE FASTCALL GLint __gl ## from ## _size( GLenum e ) \
         __attribute__ ((alias( # to )));
-#define ALIAS(from,to) ALIAS2( from, __gl ## to ## _size )
+#  define ALIAS(from,to) ALIAS2( from, __gl ## to ## _size )
 #else
-#define ALIAS(from,to) \
+#  define ALIAS(from,to) \
     _X_INTERNAL PURE FASTCALL GLint __gl ## from ## _size( GLenum e ) \
     { return __gl ## to ## _size( e ); }
 #endif
 
+
 _X_INTERNAL PURE FASTCALL GLint
-__glCallLists_size(GLenum e)
+__glCallLists_size( GLenum e )
 {
-    switch (e) {
-    case GL_BYTE:
-    case GL_UNSIGNED_BYTE:
-        return 1;
-    case GL_SHORT:
-    case GL_UNSIGNED_SHORT:
-    case GL_2_BYTES:
-    case GL_HALF_FLOAT:
-        return 2;
-    case GL_3_BYTES:
-        return 3;
-    case GL_INT:
-    case GL_UNSIGNED_INT:
-    case GL_FLOAT:
-    case GL_4_BYTES:
-        return 4;
-    default:
-        return 0;
+    switch( e ) {
+        case GL_BYTE:
+        case GL_UNSIGNED_BYTE:
+            return 1;
+        case GL_SHORT:
+        case GL_UNSIGNED_SHORT:
+        case GL_2_BYTES:
+        case GL_HALF_FLOAT:
+            return 2;
+        case GL_3_BYTES:
+            return 3;
+        case GL_INT:
+        case GL_UNSIGNED_INT:
+        case GL_FLOAT:
+        case GL_4_BYTES:
+            return 4;
+        default: return 0;
     }
 }
 
 _X_INTERNAL PURE FASTCALL GLint
-__glFogfv_size(GLenum e)
+__glFogfv_size( GLenum e )
 {
-    switch (e) {
-    case GL_FOG_INDEX:
-    case GL_FOG_DENSITY:
-    case GL_FOG_START:
-    case GL_FOG_END:
-    case GL_FOG_MODE:
-    case GL_FOG_OFFSET_VALUE_SGIX:
-    case GL_FOG_DISTANCE_MODE_NV:
-        return 1;
-    case GL_FOG_COLOR:
-        return 4;
-    default:
-        return 0;
+    switch( e ) {
+        case GL_FOG_INDEX:
+        case GL_FOG_DENSITY:
+        case GL_FOG_START:
+        case GL_FOG_END:
+        case GL_FOG_MODE:
+        case GL_FOG_OFFSET_VALUE_SGIX:
+        case GL_FOG_DISTANCE_MODE_NV:
+            return 1;
+        case GL_FOG_COLOR:
+            return 4;
+        default: return 0;
     }
 }
 
 _X_INTERNAL PURE FASTCALL GLint
-__glLightfv_size(GLenum e)
+__glLightfv_size( GLenum e )
 {
-    switch (e) {
-    case GL_SPOT_EXPONENT:
-    case GL_SPOT_CUTOFF:
-    case GL_CONSTANT_ATTENUATION:
-    case GL_LINEAR_ATTENUATION:
-    case GL_QUADRATIC_ATTENUATION:
-        return 1;
-    case GL_SPOT_DIRECTION:
-        return 3;
-    case GL_AMBIENT:
-    case GL_DIFFUSE:
-    case GL_SPECULAR:
-    case GL_POSITION:
-        return 4;
-    default:
-        return 0;
+    switch( e ) {
+        case GL_SPOT_EXPONENT:
+        case GL_SPOT_CUTOFF:
+        case GL_CONSTANT_ATTENUATION:
+        case GL_LINEAR_ATTENUATION:
+        case GL_QUADRATIC_ATTENUATION:
+            return 1;
+        case GL_SPOT_DIRECTION:
+            return 3;
+        case GL_AMBIENT:
+        case GL_DIFFUSE:
+        case GL_SPECULAR:
+        case GL_POSITION:
+            return 4;
+        default: return 0;
     }
 }
 
 _X_INTERNAL PURE FASTCALL GLint
-__glLightModelfv_size(GLenum e)
+__glLightModelfv_size( GLenum e )
 {
-    switch (e) {
-    case GL_LIGHT_MODEL_LOCAL_VIEWER:
-    case GL_LIGHT_MODEL_TWO_SIDE:
-    case GL_LIGHT_MODEL_COLOR_CONTROL:
+    switch( e ) {
+        case GL_LIGHT_MODEL_LOCAL_VIEWER:
+        case GL_LIGHT_MODEL_TWO_SIDE:
+        case GL_LIGHT_MODEL_COLOR_CONTROL:
 /*      case GL_LIGHT_MODEL_COLOR_CONTROL_EXT:*/
-        return 1;
-    case GL_LIGHT_MODEL_AMBIENT:
-        return 4;
-    default:
-        return 0;
+            return 1;
+        case GL_LIGHT_MODEL_AMBIENT:
+            return 4;
+        default: return 0;
     }
 }
 
 _X_INTERNAL PURE FASTCALL GLint
-__glMaterialfv_size(GLenum e)
+__glMaterialfv_size( GLenum e )
 {
-    switch (e) {
-    case GL_SHININESS:
-        return 1;
-    case GL_COLOR_INDEXES:
-        return 3;
-    case GL_AMBIENT:
-    case GL_DIFFUSE:
-    case GL_SPECULAR:
-    case GL_EMISSION:
-    case GL_AMBIENT_AND_DIFFUSE:
-        return 4;
-    default:
-        return 0;
+    switch( e ) {
+        case GL_SHININESS:
+            return 1;
+        case GL_COLOR_INDEXES:
+            return 3;
+        case GL_AMBIENT:
+        case GL_DIFFUSE:
+        case GL_SPECULAR:
+        case GL_EMISSION:
+        case GL_AMBIENT_AND_DIFFUSE:
+            return 4;
+        default: return 0;
     }
 }
 
 _X_INTERNAL PURE FASTCALL GLint
-__glTexParameterfv_size(GLenum e)
+__glTexParameterfv_size( GLenum e )
 {
-    switch (e) {
-    case GL_TEXTURE_MAG_FILTER:
-    case GL_TEXTURE_MIN_FILTER:
-    case GL_TEXTURE_WRAP_S:
-    case GL_TEXTURE_WRAP_T:
-    case GL_TEXTURE_PRIORITY:
-    case GL_TEXTURE_WRAP_R:
-    case GL_TEXTURE_COMPARE_FAIL_VALUE_ARB:
+    switch( e ) {
+        case GL_TEXTURE_MAG_FILTER:
+        case GL_TEXTURE_MIN_FILTER:
+        case GL_TEXTURE_WRAP_S:
+        case GL_TEXTURE_WRAP_T:
+        case GL_TEXTURE_PRIORITY:
+        case GL_TEXTURE_WRAP_R:
+        case GL_TEXTURE_COMPARE_FAIL_VALUE_ARB:
 /*      case GL_SHADOW_AMBIENT_SGIX:*/
-    case GL_TEXTURE_MIN_LOD:
-    case GL_TEXTURE_MAX_LOD:
-    case GL_TEXTURE_BASE_LEVEL:
-    case GL_TEXTURE_MAX_LEVEL:
-    case GL_TEXTURE_CLIPMAP_FRAME_SGIX:
-    case GL_TEXTURE_LOD_BIAS_S_SGIX:
-    case GL_TEXTURE_LOD_BIAS_T_SGIX:
-    case GL_TEXTURE_LOD_BIAS_R_SGIX:
-    case GL_GENERATE_MIPMAP:
+        case GL_TEXTURE_MIN_LOD:
+        case GL_TEXTURE_MAX_LOD:
+        case GL_TEXTURE_BASE_LEVEL:
+        case GL_TEXTURE_MAX_LEVEL:
+        case GL_TEXTURE_CLIPMAP_FRAME_SGIX:
+        case GL_TEXTURE_LOD_BIAS_S_SGIX:
+        case GL_TEXTURE_LOD_BIAS_T_SGIX:
+        case GL_TEXTURE_LOD_BIAS_R_SGIX:
+        case GL_GENERATE_MIPMAP:
 /*      case GL_GENERATE_MIPMAP_SGIS:*/
-    case GL_TEXTURE_COMPARE_SGIX:
-    case GL_TEXTURE_COMPARE_OPERATOR_SGIX:
-    case GL_TEXTURE_MAX_CLAMP_S_SGIX:
-    case GL_TEXTURE_MAX_CLAMP_T_SGIX:
-    case GL_TEXTURE_MAX_CLAMP_R_SGIX:
-    case GL_TEXTURE_MAX_ANISOTROPY_EXT:
-    case GL_TEXTURE_LOD_BIAS:
+        case GL_TEXTURE_COMPARE_SGIX:
+        case GL_TEXTURE_COMPARE_OPERATOR_SGIX:
+        case GL_TEXTURE_MAX_CLAMP_S_SGIX:
+        case GL_TEXTURE_MAX_CLAMP_T_SGIX:
+        case GL_TEXTURE_MAX_CLAMP_R_SGIX:
+        case GL_TEXTURE_MAX_ANISOTROPY_EXT:
+        case GL_TEXTURE_LOD_BIAS:
 /*      case GL_TEXTURE_LOD_BIAS_EXT:*/
-    case GL_TEXTURE_STORAGE_HINT_APPLE:
-    case GL_STORAGE_PRIVATE_APPLE:
-    case GL_STORAGE_CACHED_APPLE:
-    case GL_STORAGE_SHARED_APPLE:
-    case GL_DEPTH_TEXTURE_MODE:
+        case GL_TEXTURE_STORAGE_HINT_APPLE:
+        case GL_STORAGE_PRIVATE_APPLE:
+        case GL_STORAGE_CACHED_APPLE:
+        case GL_STORAGE_SHARED_APPLE:
+        case GL_DEPTH_TEXTURE_MODE:
 /*      case GL_DEPTH_TEXTURE_MODE_ARB:*/
-    case GL_TEXTURE_COMPARE_MODE:
+        case GL_TEXTURE_COMPARE_MODE:
 /*      case GL_TEXTURE_COMPARE_MODE_ARB:*/
-    case GL_TEXTURE_COMPARE_FUNC:
+        case GL_TEXTURE_COMPARE_FUNC:
 /*      case GL_TEXTURE_COMPARE_FUNC_ARB:*/
-    case GL_TEXTURE_UNSIGNED_REMAP_MODE_NV:
-        return 1;
-    case GL_TEXTURE_CLIPMAP_CENTER_SGIX:
-    case GL_TEXTURE_CLIPMAP_OFFSET_SGIX:
-        return 2;
-    case GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX:
-        return 3;
-    case GL_TEXTURE_BORDER_COLOR:
-    case GL_POST_TEXTURE_FILTER_BIAS_SGIX:
-    case GL_POST_TEXTURE_FILTER_SCALE_SGIX:
-        return 4;
-    default:
-        return 0;
+        case GL_TEXTURE_UNSIGNED_REMAP_MODE_NV:
+            return 1;
+        case GL_TEXTURE_CLIPMAP_CENTER_SGIX:
+        case GL_TEXTURE_CLIPMAP_OFFSET_SGIX:
+            return 2;
+        case GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX:
+            return 3;
+        case GL_TEXTURE_BORDER_COLOR:
+        case GL_POST_TEXTURE_FILTER_BIAS_SGIX:
+        case GL_POST_TEXTURE_FILTER_SCALE_SGIX:
+            return 4;
+        default: return 0;
     }
 }
 
 _X_INTERNAL PURE FASTCALL GLint
-__glTexEnvfv_size(GLenum e)
+__glTexEnvfv_size( GLenum e )
 {
-    switch (e) {
-    case GL_ALPHA_SCALE:
-    case GL_TEXTURE_ENV_MODE:
-    case GL_TEXTURE_LOD_BIAS:
-    case GL_COMBINE_RGB:
-    case GL_COMBINE_ALPHA:
-    case GL_RGB_SCALE:
-    case GL_SOURCE0_RGB:
-    case GL_SOURCE1_RGB:
-    case GL_SOURCE2_RGB:
-    case GL_SOURCE3_RGB_NV:
-    case GL_SOURCE0_ALPHA:
-    case GL_SOURCE1_ALPHA:
-    case GL_SOURCE2_ALPHA:
-    case GL_SOURCE3_ALPHA_NV:
-    case GL_OPERAND0_RGB:
-    case GL_OPERAND1_RGB:
-    case GL_OPERAND2_RGB:
-    case GL_OPERAND3_RGB_NV:
-    case GL_OPERAND0_ALPHA:
-    case GL_OPERAND1_ALPHA:
-    case GL_OPERAND2_ALPHA:
-    case GL_OPERAND3_ALPHA_NV:
-    case GL_BUMP_TARGET_ATI:
-    case GL_COORD_REPLACE_ARB:
+    switch( e ) {
+        case GL_ALPHA_SCALE:
+        case GL_TEXTURE_ENV_MODE:
+        case GL_TEXTURE_LOD_BIAS:
+        case GL_COMBINE_RGB:
+        case GL_COMBINE_ALPHA:
+        case GL_RGB_SCALE:
+        case GL_SOURCE0_RGB:
+        case GL_SOURCE1_RGB:
+        case GL_SOURCE2_RGB:
+        case GL_SOURCE3_RGB_NV:
+        case GL_SOURCE0_ALPHA:
+        case GL_SOURCE1_ALPHA:
+        case GL_SOURCE2_ALPHA:
+        case GL_SOURCE3_ALPHA_NV:
+        case GL_OPERAND0_RGB:
+        case GL_OPERAND1_RGB:
+        case GL_OPERAND2_RGB:
+        case GL_OPERAND3_RGB_NV:
+        case GL_OPERAND0_ALPHA:
+        case GL_OPERAND1_ALPHA:
+        case GL_OPERAND2_ALPHA:
+        case GL_OPERAND3_ALPHA_NV:
+        case GL_BUMP_TARGET_ATI:
+        case GL_COORD_REPLACE_ARB:
 /*      case GL_COORD_REPLACE_NV:*/
-        return 1;
-    case GL_TEXTURE_ENV_COLOR:
-        return 4;
-    default:
-        return 0;
+            return 1;
+        case GL_TEXTURE_ENV_COLOR:
+            return 4;
+        default: return 0;
     }
 }
 
 _X_INTERNAL PURE FASTCALL GLint
-__glTexGendv_size(GLenum e)
+__glTexGendv_size( GLenum e )
 {
-    switch (e) {
-    case GL_TEXTURE_GEN_MODE:
-        return 1;
-    case GL_OBJECT_PLANE:
-    case GL_EYE_PLANE:
-        return 4;
-    default:
-        return 0;
+    switch( e ) {
+        case GL_TEXTURE_GEN_MODE:
+            return 1;
+        case GL_OBJECT_PLANE:
+        case GL_EYE_PLANE:
+            return 4;
+        default: return 0;
     }
 }
 
 _X_INTERNAL PURE FASTCALL GLint
-__glMap1d_size(GLenum e)
+__glMap1d_size( GLenum e )
 {
-    switch (e) {
-    case GL_MAP1_INDEX:
-    case GL_MAP1_TEXTURE_COORD_1:
-        return 1;
-    case GL_MAP1_TEXTURE_COORD_2:
-        return 2;
-    case GL_MAP1_NORMAL:
-    case GL_MAP1_TEXTURE_COORD_3:
-    case GL_MAP1_VERTEX_3:
-        return 3;
-    case GL_MAP1_COLOR_4:
-    case GL_MAP1_TEXTURE_COORD_4:
-    case GL_MAP1_VERTEX_4:
-        return 4;
-    default:
-        return 0;
+    switch( e ) {
+        case GL_MAP1_INDEX:
+        case GL_MAP1_TEXTURE_COORD_1:
+            return 1;
+        case GL_MAP1_TEXTURE_COORD_2:
+            return 2;
+        case GL_MAP1_NORMAL:
+        case GL_MAP1_TEXTURE_COORD_3:
+        case GL_MAP1_VERTEX_3:
+            return 3;
+        case GL_MAP1_COLOR_4:
+        case GL_MAP1_TEXTURE_COORD_4:
+        case GL_MAP1_VERTEX_4:
+            return 4;
+        default: return 0;
     }
 }
 
 _X_INTERNAL PURE FASTCALL GLint
-__glMap2d_size(GLenum e)
+__glMap2d_size( GLenum e )
 {
-    switch (e) {
-    case GL_MAP2_INDEX:
-    case GL_MAP2_TEXTURE_COORD_1:
-        return 1;
-    case GL_MAP2_TEXTURE_COORD_2:
-        return 2;
-    case GL_MAP2_NORMAL:
-    case GL_MAP2_TEXTURE_COORD_3:
-    case GL_MAP2_VERTEX_3:
-        return 3;
-    case GL_MAP2_COLOR_4:
-    case GL_MAP2_TEXTURE_COORD_4:
-    case GL_MAP2_VERTEX_4:
-        return 4;
-    default:
-        return 0;
+    switch( e ) {
+        case GL_MAP2_INDEX:
+        case GL_MAP2_TEXTURE_COORD_1:
+            return 1;
+        case GL_MAP2_TEXTURE_COORD_2:
+            return 2;
+        case GL_MAP2_NORMAL:
+        case GL_MAP2_TEXTURE_COORD_3:
+        case GL_MAP2_VERTEX_3:
+            return 3;
+        case GL_MAP2_COLOR_4:
+        case GL_MAP2_TEXTURE_COORD_4:
+        case GL_MAP2_VERTEX_4:
+            return 4;
+        default: return 0;
     }
 }
 
 _X_INTERNAL PURE FASTCALL GLint
-__glGetBooleanv_size(GLenum e)
+__glGetBooleanv_size( GLenum e )
 {
-    switch (e) {
-    case GL_CURRENT_INDEX:
-    case GL_CURRENT_RASTER_INDEX:
-    case GL_CURRENT_RASTER_POSITION_VALID:
-    case GL_CURRENT_RASTER_DISTANCE:
-    case GL_POINT_SMOOTH:
-    case GL_POINT_SIZE:
-    case GL_SMOOTH_POINT_SIZE_GRANULARITY:
-    case GL_LINE_SMOOTH:
-    case GL_LINE_WIDTH:
-    case GL_LINE_WIDTH_GRANULARITY:
-    case GL_LINE_STIPPLE:
-    case GL_LINE_STIPPLE_PATTERN:
-    case GL_LINE_STIPPLE_REPEAT:
-    case GL_LIST_MODE:
-    case GL_MAX_LIST_NESTING:
-    case GL_LIST_BASE:
-    case GL_LIST_INDEX:
-    case GL_POLYGON_SMOOTH:
-    case GL_POLYGON_STIPPLE:
-    case GL_EDGE_FLAG:
-    case GL_CULL_FACE:
-    case GL_CULL_FACE_MODE:
-    case GL_FRONT_FACE:
-    case GL_LIGHTING:
-    case GL_LIGHT_MODEL_LOCAL_VIEWER:
-    case GL_LIGHT_MODEL_TWO_SIDE:
-    case GL_SHADE_MODEL:
-    case GL_COLOR_MATERIAL_FACE:
-    case GL_COLOR_MATERIAL_PARAMETER:
-    case GL_COLOR_MATERIAL:
-    case GL_FOG:
-    case GL_FOG_INDEX:
-    case GL_FOG_DENSITY:
-    case GL_FOG_START:
-    case GL_FOG_END:
-    case GL_FOG_MODE:
-    case GL_DEPTH_TEST:
-    case GL_DEPTH_WRITEMASK:
-    case GL_DEPTH_CLEAR_VALUE:
-    case GL_DEPTH_FUNC:
-    case GL_STENCIL_TEST:
-    case GL_STENCIL_CLEAR_VALUE:
-    case GL_STENCIL_FUNC:
-    case GL_STENCIL_VALUE_MASK:
-    case GL_STENCIL_FAIL:
-    case GL_STENCIL_PASS_DEPTH_FAIL:
-    case GL_STENCIL_PASS_DEPTH_PASS:
-    case GL_STENCIL_REF:
-    case GL_STENCIL_WRITEMASK:
-    case GL_MATRIX_MODE:
-    case GL_NORMALIZE:
-    case GL_MODELVIEW_STACK_DEPTH:
-    case GL_PROJECTION_STACK_DEPTH:
-    case GL_TEXTURE_STACK_DEPTH:
-    case GL_ATTRIB_STACK_DEPTH:
-    case GL_CLIENT_ATTRIB_STACK_DEPTH:
-    case GL_ALPHA_TEST:
-    case GL_ALPHA_TEST_FUNC:
-    case GL_ALPHA_TEST_REF:
-    case GL_DITHER:
-    case GL_BLEND_DST:
-    case GL_BLEND_SRC:
-    case GL_BLEND:
-    case GL_LOGIC_OP_MODE:
-    case GL_LOGIC_OP:
-    case GL_AUX_BUFFERS:
-    case GL_DRAW_BUFFER:
-    case GL_READ_BUFFER:
-    case GL_SCISSOR_TEST:
-    case GL_INDEX_CLEAR_VALUE:
-    case GL_INDEX_WRITEMASK:
-    case GL_INDEX_MODE:
-    case GL_RGBA_MODE:
-    case GL_DOUBLEBUFFER:
-    case GL_STEREO:
-    case GL_RENDER_MODE:
-    case GL_PERSPECTIVE_CORRECTION_HINT:
-    case GL_POINT_SMOOTH_HINT:
-    case GL_LINE_SMOOTH_HINT:
-    case GL_POLYGON_SMOOTH_HINT:
-    case GL_FOG_HINT:
-    case GL_TEXTURE_GEN_S:
-    case GL_TEXTURE_GEN_T:
-    case GL_TEXTURE_GEN_R:
-    case GL_TEXTURE_GEN_Q:
-    case GL_PIXEL_MAP_I_TO_I:
-    case GL_PIXEL_MAP_I_TO_I_SIZE:
-    case GL_PIXEL_MAP_S_TO_S_SIZE:
-    case GL_PIXEL_MAP_I_TO_R_SIZE:
-    case GL_PIXEL_MAP_I_TO_G_SIZE:
-    case GL_PIXEL_MAP_I_TO_B_SIZE:
-    case GL_PIXEL_MAP_I_TO_A_SIZE:
-    case GL_PIXEL_MAP_R_TO_R_SIZE:
-    case GL_PIXEL_MAP_G_TO_G_SIZE:
-    case GL_PIXEL_MAP_B_TO_B_SIZE:
-    case GL_PIXEL_MAP_A_TO_A_SIZE:
-    case GL_UNPACK_SWAP_BYTES:
-    case GL_UNPACK_LSB_FIRST:
-    case GL_UNPACK_ROW_LENGTH:
-    case GL_UNPACK_SKIP_ROWS:
-    case GL_UNPACK_SKIP_PIXELS:
-    case GL_UNPACK_ALIGNMENT:
-    case GL_PACK_SWAP_BYTES:
-    case GL_PACK_LSB_FIRST:
-    case GL_PACK_ROW_LENGTH:
-    case GL_PACK_SKIP_ROWS:
-    case GL_PACK_SKIP_PIXELS:
-    case GL_PACK_ALIGNMENT:
-    case GL_MAP_COLOR:
-    case GL_MAP_STENCIL:
-    case GL_INDEX_SHIFT:
-    case GL_INDEX_OFFSET:
-    case GL_RED_SCALE:
-    case GL_RED_BIAS:
-    case GL_ZOOM_X:
-    case GL_ZOOM_Y:
-    case GL_GREEN_SCALE:
-    case GL_GREEN_BIAS:
-    case GL_BLUE_SCALE:
-    case GL_BLUE_BIAS:
-    case GL_ALPHA_SCALE:
-    case GL_ALPHA_BIAS:
-    case GL_DEPTH_SCALE:
-    case GL_DEPTH_BIAS:
-    case GL_MAX_EVAL_ORDER:
-    case GL_MAX_LIGHTS:
-    case GL_MAX_CLIP_PLANES:
-    case GL_MAX_TEXTURE_SIZE:
-    case GL_MAX_PIXEL_MAP_TABLE:
-    case GL_MAX_ATTRIB_STACK_DEPTH:
-    case GL_MAX_MODELVIEW_STACK_DEPTH:
-    case GL_MAX_NAME_STACK_DEPTH:
-    case GL_MAX_PROJECTION_STACK_DEPTH:
-    case GL_MAX_TEXTURE_STACK_DEPTH:
-    case GL_MAX_CLIENT_ATTRIB_STACK_DEPTH:
-    case GL_SUBPIXEL_BITS:
-    case GL_INDEX_BITS:
-    case GL_RED_BITS:
-    case GL_GREEN_BITS:
-    case GL_BLUE_BITS:
-    case GL_ALPHA_BITS:
-    case GL_DEPTH_BITS:
-    case GL_STENCIL_BITS:
-    case GL_ACCUM_RED_BITS:
-    case GL_ACCUM_GREEN_BITS:
-    case GL_ACCUM_BLUE_BITS:
-    case GL_ACCUM_ALPHA_BITS:
-    case GL_NAME_STACK_DEPTH:
-    case GL_AUTO_NORMAL:
-    case GL_MAP1_COLOR_4:
-    case GL_MAP1_INDEX:
-    case GL_MAP1_NORMAL:
-    case GL_MAP1_TEXTURE_COORD_1:
-    case GL_MAP1_TEXTURE_COORD_2:
-    case GL_MAP1_TEXTURE_COORD_3:
-    case GL_MAP1_TEXTURE_COORD_4:
-    case GL_MAP1_VERTEX_3:
-    case GL_MAP1_VERTEX_4:
-    case GL_MAP2_COLOR_4:
-    case GL_MAP2_INDEX:
-    case GL_MAP2_NORMAL:
-    case GL_MAP2_TEXTURE_COORD_1:
-    case GL_MAP2_TEXTURE_COORD_2:
-    case GL_MAP2_TEXTURE_COORD_3:
-    case GL_MAP2_TEXTURE_COORD_4:
-    case GL_MAP2_VERTEX_3:
-    case GL_MAP2_VERTEX_4:
-    case GL_MAP1_GRID_SEGMENTS:
-    case GL_TEXTURE_1D:
-    case GL_TEXTURE_2D:
-    case GL_POLYGON_OFFSET_UNITS:
-    case GL_CLIP_PLANE0:
-    case GL_CLIP_PLANE1:
-    case GL_CLIP_PLANE2:
-    case GL_CLIP_PLANE3:
-    case GL_CLIP_PLANE4:
-    case GL_CLIP_PLANE5:
-    case GL_LIGHT0:
-    case GL_LIGHT1:
-    case GL_LIGHT2:
-    case GL_LIGHT3:
-    case GL_LIGHT4:
-    case GL_LIGHT5:
-    case GL_LIGHT6:
-    case GL_LIGHT7:
-    case GL_BLEND_EQUATION:
+    switch( e ) {
+        case GL_CURRENT_INDEX:
+        case GL_CURRENT_RASTER_INDEX:
+        case GL_CURRENT_RASTER_POSITION_VALID:
+        case GL_CURRENT_RASTER_DISTANCE:
+        case GL_POINT_SMOOTH:
+        case GL_POINT_SIZE:
+        case GL_SMOOTH_POINT_SIZE_GRANULARITY:
+        case GL_LINE_SMOOTH:
+        case GL_LINE_WIDTH:
+        case GL_LINE_WIDTH_GRANULARITY:
+        case GL_LINE_STIPPLE:
+        case GL_LINE_STIPPLE_PATTERN:
+        case GL_LINE_STIPPLE_REPEAT:
+        case GL_LIST_MODE:
+        case GL_MAX_LIST_NESTING:
+        case GL_LIST_BASE:
+        case GL_LIST_INDEX:
+        case GL_POLYGON_SMOOTH:
+        case GL_POLYGON_STIPPLE:
+        case GL_EDGE_FLAG:
+        case GL_CULL_FACE:
+        case GL_CULL_FACE_MODE:
+        case GL_FRONT_FACE:
+        case GL_LIGHTING:
+        case GL_LIGHT_MODEL_LOCAL_VIEWER:
+        case GL_LIGHT_MODEL_TWO_SIDE:
+        case GL_SHADE_MODEL:
+        case GL_COLOR_MATERIAL_FACE:
+        case GL_COLOR_MATERIAL_PARAMETER:
+        case GL_COLOR_MATERIAL:
+        case GL_FOG:
+        case GL_FOG_INDEX:
+        case GL_FOG_DENSITY:
+        case GL_FOG_START:
+        case GL_FOG_END:
+        case GL_FOG_MODE:
+        case GL_DEPTH_TEST:
+        case GL_DEPTH_WRITEMASK:
+        case GL_DEPTH_CLEAR_VALUE:
+        case GL_DEPTH_FUNC:
+        case GL_STENCIL_TEST:
+        case GL_STENCIL_CLEAR_VALUE:
+        case GL_STENCIL_FUNC:
+        case GL_STENCIL_VALUE_MASK:
+        case GL_STENCIL_FAIL:
+        case GL_STENCIL_PASS_DEPTH_FAIL:
+        case GL_STENCIL_PASS_DEPTH_PASS:
+        case GL_STENCIL_REF:
+        case GL_STENCIL_WRITEMASK:
+        case GL_MATRIX_MODE:
+        case GL_NORMALIZE:
+        case GL_MODELVIEW_STACK_DEPTH:
+        case GL_PROJECTION_STACK_DEPTH:
+        case GL_TEXTURE_STACK_DEPTH:
+        case GL_ATTRIB_STACK_DEPTH:
+        case GL_CLIENT_ATTRIB_STACK_DEPTH:
+        case GL_ALPHA_TEST:
+        case GL_ALPHA_TEST_FUNC:
+        case GL_ALPHA_TEST_REF:
+        case GL_DITHER:
+        case GL_BLEND_DST:
+        case GL_BLEND_SRC:
+        case GL_BLEND:
+        case GL_LOGIC_OP_MODE:
+        case GL_LOGIC_OP:
+        case GL_AUX_BUFFERS:
+        case GL_DRAW_BUFFER:
+        case GL_READ_BUFFER:
+        case GL_SCISSOR_TEST:
+        case GL_INDEX_CLEAR_VALUE:
+        case GL_INDEX_WRITEMASK:
+        case GL_INDEX_MODE:
+        case GL_RGBA_MODE:
+        case GL_DOUBLEBUFFER:
+        case GL_STEREO:
+        case GL_RENDER_MODE:
+        case GL_PERSPECTIVE_CORRECTION_HINT:
+        case GL_POINT_SMOOTH_HINT:
+        case GL_LINE_SMOOTH_HINT:
+        case GL_POLYGON_SMOOTH_HINT:
+        case GL_FOG_HINT:
+        case GL_TEXTURE_GEN_S:
+        case GL_TEXTURE_GEN_T:
+        case GL_TEXTURE_GEN_R:
+        case GL_TEXTURE_GEN_Q:
+        case GL_PIXEL_MAP_I_TO_I:
+        case GL_PIXEL_MAP_I_TO_I_SIZE:
+        case GL_PIXEL_MAP_S_TO_S_SIZE:
+        case GL_PIXEL_MAP_I_TO_R_SIZE:
+        case GL_PIXEL_MAP_I_TO_G_SIZE:
+        case GL_PIXEL_MAP_I_TO_B_SIZE:
+        case GL_PIXEL_MAP_I_TO_A_SIZE:
+        case GL_PIXEL_MAP_R_TO_R_SIZE:
+        case GL_PIXEL_MAP_G_TO_G_SIZE:
+        case GL_PIXEL_MAP_B_TO_B_SIZE:
+        case GL_PIXEL_MAP_A_TO_A_SIZE:
+        case GL_UNPACK_SWAP_BYTES:
+        case GL_UNPACK_LSB_FIRST:
+        case GL_UNPACK_ROW_LENGTH:
+        case GL_UNPACK_SKIP_ROWS:
+        case GL_UNPACK_SKIP_PIXELS:
+        case GL_UNPACK_ALIGNMENT:
+        case GL_PACK_SWAP_BYTES:
+        case GL_PACK_LSB_FIRST:
+        case GL_PACK_ROW_LENGTH:
+        case GL_PACK_SKIP_ROWS:
+        case GL_PACK_SKIP_PIXELS:
+        case GL_PACK_ALIGNMENT:
+        case GL_MAP_COLOR:
+        case GL_MAP_STENCIL:
+        case GL_INDEX_SHIFT:
+        case GL_INDEX_OFFSET:
+        case GL_RED_SCALE:
+        case GL_RED_BIAS:
+        case GL_ZOOM_X:
+        case GL_ZOOM_Y:
+        case GL_GREEN_SCALE:
+        case GL_GREEN_BIAS:
+        case GL_BLUE_SCALE:
+        case GL_BLUE_BIAS:
+        case GL_ALPHA_SCALE:
+        case GL_ALPHA_BIAS:
+        case GL_DEPTH_SCALE:
+        case GL_DEPTH_BIAS:
+        case GL_MAX_EVAL_ORDER:
+        case GL_MAX_LIGHTS:
+        case GL_MAX_CLIP_PLANES:
+        case GL_MAX_TEXTURE_SIZE:
+        case GL_MAX_PIXEL_MAP_TABLE:
+        case GL_MAX_ATTRIB_STACK_DEPTH:
+        case GL_MAX_MODELVIEW_STACK_DEPTH:
+        case GL_MAX_NAME_STACK_DEPTH:
+        case GL_MAX_PROJECTION_STACK_DEPTH:
+        case GL_MAX_TEXTURE_STACK_DEPTH:
+        case GL_MAX_CLIENT_ATTRIB_STACK_DEPTH:
+        case GL_SUBPIXEL_BITS:
+        case GL_INDEX_BITS:
+        case GL_RED_BITS:
+        case GL_GREEN_BITS:
+        case GL_BLUE_BITS:
+        case GL_ALPHA_BITS:
+        case GL_DEPTH_BITS:
+        case GL_STENCIL_BITS:
+        case GL_ACCUM_RED_BITS:
+        case GL_ACCUM_GREEN_BITS:
+        case GL_ACCUM_BLUE_BITS:
+        case GL_ACCUM_ALPHA_BITS:
+        case GL_NAME_STACK_DEPTH:
+        case GL_AUTO_NORMAL:
+        case GL_MAP1_COLOR_4:
+        case GL_MAP1_INDEX:
+        case GL_MAP1_NORMAL:
+        case GL_MAP1_TEXTURE_COORD_1:
+        case GL_MAP1_TEXTURE_COORD_2:
+        case GL_MAP1_TEXTURE_COORD_3:
+        case GL_MAP1_TEXTURE_COORD_4:
+        case GL_MAP1_VERTEX_3:
+        case GL_MAP1_VERTEX_4:
+        case GL_MAP2_COLOR_4:
+        case GL_MAP2_INDEX:
+        case GL_MAP2_NORMAL:
+        case GL_MAP2_TEXTURE_COORD_1:
+        case GL_MAP2_TEXTURE_COORD_2:
+        case GL_MAP2_TEXTURE_COORD_3:
+        case GL_MAP2_TEXTURE_COORD_4:
+        case GL_MAP2_VERTEX_3:
+        case GL_MAP2_VERTEX_4:
+        case GL_MAP1_GRID_SEGMENTS:
+        case GL_TEXTURE_1D:
+        case GL_TEXTURE_2D:
+        case GL_POLYGON_OFFSET_UNITS:
+        case GL_CLIP_PLANE0:
+        case GL_CLIP_PLANE1:
+        case GL_CLIP_PLANE2:
+        case GL_CLIP_PLANE3:
+        case GL_CLIP_PLANE4:
+        case GL_CLIP_PLANE5:
+        case GL_LIGHT0:
+        case GL_LIGHT1:
+        case GL_LIGHT2:
+        case GL_LIGHT3:
+        case GL_LIGHT4:
+        case GL_LIGHT5:
+        case GL_LIGHT6:
+        case GL_LIGHT7:
+        case GL_BLEND_EQUATION:
 /*      case GL_BLEND_EQUATION_EXT:*/
-    case GL_CONVOLUTION_1D:
-    case GL_CONVOLUTION_2D:
-    case GL_SEPARABLE_2D:
-    case GL_MAX_CONVOLUTION_WIDTH:
+        case GL_CONVOLUTION_1D:
+        case GL_CONVOLUTION_2D:
+        case GL_SEPARABLE_2D:
+        case GL_MAX_CONVOLUTION_WIDTH:
 /*      case GL_MAX_CONVOLUTION_WIDTH_EXT:*/
-    case GL_MAX_CONVOLUTION_HEIGHT:
+        case GL_MAX_CONVOLUTION_HEIGHT:
 /*      case GL_MAX_CONVOLUTION_HEIGHT_EXT:*/
-    case GL_POST_CONVOLUTION_RED_SCALE:
+        case GL_POST_CONVOLUTION_RED_SCALE:
 /*      case GL_POST_CONVOLUTION_RED_SCALE_EXT:*/
-    case GL_POST_CONVOLUTION_GREEN_SCALE:
+        case GL_POST_CONVOLUTION_GREEN_SCALE:
 /*      case GL_POST_CONVOLUTION_GREEN_SCALE_EXT:*/
-    case GL_POST_CONVOLUTION_BLUE_SCALE:
+        case GL_POST_CONVOLUTION_BLUE_SCALE:
 /*      case GL_POST_CONVOLUTION_BLUE_SCALE_EXT:*/
-    case GL_POST_CONVOLUTION_ALPHA_SCALE:
+        case GL_POST_CONVOLUTION_ALPHA_SCALE:
 /*      case GL_POST_CONVOLUTION_ALPHA_SCALE_EXT:*/
-    case GL_POST_CONVOLUTION_RED_BIAS:
+        case GL_POST_CONVOLUTION_RED_BIAS:
 /*      case GL_POST_CONVOLUTION_RED_BIAS_EXT:*/
-    case GL_POST_CONVOLUTION_GREEN_BIAS:
+        case GL_POST_CONVOLUTION_GREEN_BIAS:
 /*      case GL_POST_CONVOLUTION_GREEN_BIAS_EXT:*/
-    case GL_POST_CONVOLUTION_BLUE_BIAS:
+        case GL_POST_CONVOLUTION_BLUE_BIAS:
 /*      case GL_POST_CONVOLUTION_BLUE_BIAS_EXT:*/
-    case GL_POST_CONVOLUTION_ALPHA_BIAS:
+        case GL_POST_CONVOLUTION_ALPHA_BIAS:
 /*      case GL_POST_CONVOLUTION_ALPHA_BIAS_EXT:*/
-    case GL_HISTOGRAM:
-    case GL_MINMAX:
-    case GL_POLYGON_OFFSET_FACTOR:
-    case GL_RESCALE_NORMAL:
+        case GL_HISTOGRAM:
+        case GL_MINMAX:
+        case GL_POLYGON_OFFSET_FACTOR:
+        case GL_RESCALE_NORMAL:
 /*      case GL_RESCALE_NORMAL_EXT:*/
-    case GL_TEXTURE_BINDING_1D:
-    case GL_TEXTURE_BINDING_2D:
-    case GL_TEXTURE_BINDING_3D:
-    case GL_PACK_SKIP_IMAGES:
-    case GL_PACK_IMAGE_HEIGHT:
-    case GL_UNPACK_SKIP_IMAGES:
-    case GL_UNPACK_IMAGE_HEIGHT:
-    case GL_TEXTURE_3D:
-    case GL_MAX_3D_TEXTURE_SIZE:
-    case GL_VERTEX_ARRAY:
-    case GL_NORMAL_ARRAY:
-    case GL_COLOR_ARRAY:
-    case GL_INDEX_ARRAY:
-    case GL_TEXTURE_COORD_ARRAY:
-    case GL_EDGE_FLAG_ARRAY:
-    case GL_VERTEX_ARRAY_SIZE:
-    case GL_VERTEX_ARRAY_TYPE:
-    case GL_VERTEX_ARRAY_STRIDE:
-    case GL_NORMAL_ARRAY_TYPE:
-    case GL_NORMAL_ARRAY_STRIDE:
-    case GL_COLOR_ARRAY_SIZE:
-    case GL_COLOR_ARRAY_TYPE:
-    case GL_COLOR_ARRAY_STRIDE:
-    case GL_INDEX_ARRAY_TYPE:
-    case GL_INDEX_ARRAY_STRIDE:
-    case GL_TEXTURE_COORD_ARRAY_SIZE:
-    case GL_TEXTURE_COORD_ARRAY_TYPE:
-    case GL_TEXTURE_COORD_ARRAY_STRIDE:
-    case GL_EDGE_FLAG_ARRAY_STRIDE:
-    case GL_MULTISAMPLE:
+        case GL_TEXTURE_BINDING_1D:
+        case GL_TEXTURE_BINDING_2D:
+        case GL_TEXTURE_BINDING_3D:
+        case GL_PACK_SKIP_IMAGES:
+        case GL_PACK_IMAGE_HEIGHT:
+        case GL_UNPACK_SKIP_IMAGES:
+        case GL_UNPACK_IMAGE_HEIGHT:
+        case GL_TEXTURE_3D:
+        case GL_MAX_3D_TEXTURE_SIZE:
+        case GL_VERTEX_ARRAY:
+        case GL_NORMAL_ARRAY:
+        case GL_COLOR_ARRAY:
+        case GL_INDEX_ARRAY:
+        case GL_TEXTURE_COORD_ARRAY:
+        case GL_EDGE_FLAG_ARRAY:
+        case GL_VERTEX_ARRAY_SIZE:
+        case GL_VERTEX_ARRAY_TYPE:
+        case GL_VERTEX_ARRAY_STRIDE:
+        case GL_NORMAL_ARRAY_TYPE:
+        case GL_NORMAL_ARRAY_STRIDE:
+        case GL_COLOR_ARRAY_SIZE:
+        case GL_COLOR_ARRAY_TYPE:
+        case GL_COLOR_ARRAY_STRIDE:
+        case GL_INDEX_ARRAY_TYPE:
+        case GL_INDEX_ARRAY_STRIDE:
+        case GL_TEXTURE_COORD_ARRAY_SIZE:
+        case GL_TEXTURE_COORD_ARRAY_TYPE:
+        case GL_TEXTURE_COORD_ARRAY_STRIDE:
+        case GL_EDGE_FLAG_ARRAY_STRIDE:
+        case GL_MULTISAMPLE:
 /*      case GL_MULTISAMPLE_ARB:*/
-    case GL_SAMPLE_ALPHA_TO_COVERAGE:
+        case GL_SAMPLE_ALPHA_TO_COVERAGE:
 /*      case GL_SAMPLE_ALPHA_TO_COVERAGE_ARB:*/
-    case GL_SAMPLE_ALPHA_TO_ONE:
+        case GL_SAMPLE_ALPHA_TO_ONE:
 /*      case GL_SAMPLE_ALPHA_TO_ONE_ARB:*/
-    case GL_SAMPLE_COVERAGE:
+        case GL_SAMPLE_COVERAGE:
 /*      case GL_SAMPLE_COVERAGE_ARB:*/
-    case GL_SAMPLE_BUFFERS:
+        case GL_SAMPLE_BUFFERS:
 /*      case GL_SAMPLE_BUFFERS_ARB:*/
-    case GL_SAMPLES:
+        case GL_SAMPLES:
 /*      case GL_SAMPLES_ARB:*/
-    case GL_SAMPLE_COVERAGE_VALUE:
+        case GL_SAMPLE_COVERAGE_VALUE:
 /*      case GL_SAMPLE_COVERAGE_VALUE_ARB:*/
-    case GL_SAMPLE_COVERAGE_INVERT:
+        case GL_SAMPLE_COVERAGE_INVERT:
 /*      case GL_SAMPLE_COVERAGE_INVERT_ARB:*/
-    case GL_COLOR_MATRIX_STACK_DEPTH:
-    case GL_MAX_COLOR_MATRIX_STACK_DEPTH:
-    case GL_POST_COLOR_MATRIX_RED_SCALE:
-    case GL_POST_COLOR_MATRIX_GREEN_SCALE:
-    case GL_POST_COLOR_MATRIX_BLUE_SCALE:
-    case GL_POST_COLOR_MATRIX_ALPHA_SCALE:
-    case GL_POST_COLOR_MATRIX_RED_BIAS:
-    case GL_POST_COLOR_MATRIX_GREEN_BIAS:
-    case GL_POST_COLOR_MATRIX_BLUE_BIAS:
-    case GL_POST_COLOR_MATRIX_ALPHA_BIAS:
-    case GL_BLEND_DST_RGB:
-    case GL_BLEND_SRC_RGB:
-    case GL_BLEND_DST_ALPHA:
-    case GL_BLEND_SRC_ALPHA:
-    case GL_COLOR_TABLE:
-    case GL_POST_CONVOLUTION_COLOR_TABLE:
-    case GL_POST_COLOR_MATRIX_COLOR_TABLE:
-    case GL_MAX_ELEMENTS_VERTICES:
-    case GL_MAX_ELEMENTS_INDICES:
-    case GL_CLIP_VOLUME_CLIPPING_HINT_EXT:
-    case GL_POINT_SIZE_MIN:
-    case GL_POINT_SIZE_MAX:
-    case GL_POINT_FADE_THRESHOLD_SIZE:
-    case GL_OCCLUSION_TEST_HP:
-    case GL_OCCLUSION_TEST_RESULT_HP:
-    case GL_LIGHT_MODEL_COLOR_CONTROL:
-    case GL_RESET_NOTIFICATION_STRATEGY_ARB:
-    case GL_CURRENT_FOG_COORD:
-    case GL_FOG_COORDINATE_ARRAY_TYPE:
-    case GL_FOG_COORDINATE_ARRAY_STRIDE:
-    case GL_FOG_COORD_ARRAY:
-    case GL_COLOR_SUM_ARB:
-    case GL_SECONDARY_COLOR_ARRAY_SIZE:
-    case GL_SECONDARY_COLOR_ARRAY_TYPE:
-    case GL_SECONDARY_COLOR_ARRAY_STRIDE:
-    case GL_SECONDARY_COLOR_ARRAY:
-    case GL_ACTIVE_TEXTURE:
+        case GL_COLOR_MATRIX_STACK_DEPTH:
+        case GL_MAX_COLOR_MATRIX_STACK_DEPTH:
+        case GL_POST_COLOR_MATRIX_RED_SCALE:
+        case GL_POST_COLOR_MATRIX_GREEN_SCALE:
+        case GL_POST_COLOR_MATRIX_BLUE_SCALE:
+        case GL_POST_COLOR_MATRIX_ALPHA_SCALE:
+        case GL_POST_COLOR_MATRIX_RED_BIAS:
+        case GL_POST_COLOR_MATRIX_GREEN_BIAS:
+        case GL_POST_COLOR_MATRIX_BLUE_BIAS:
+        case GL_POST_COLOR_MATRIX_ALPHA_BIAS:
+        case GL_BLEND_DST_RGB:
+        case GL_BLEND_SRC_RGB:
+        case GL_BLEND_DST_ALPHA:
+        case GL_BLEND_SRC_ALPHA:
+        case GL_COLOR_TABLE:
+        case GL_POST_CONVOLUTION_COLOR_TABLE:
+        case GL_POST_COLOR_MATRIX_COLOR_TABLE:
+        case GL_MAX_ELEMENTS_VERTICES:
+        case GL_MAX_ELEMENTS_INDICES:
+        case GL_CLIP_VOLUME_CLIPPING_HINT_EXT:
+        case GL_POINT_SIZE_MIN:
+        case GL_POINT_SIZE_MAX:
+        case GL_POINT_FADE_THRESHOLD_SIZE:
+        case GL_OCCLUSION_TEST_HP:
+        case GL_OCCLUSION_TEST_RESULT_HP:
+        case GL_LIGHT_MODEL_COLOR_CONTROL:
+        case GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_ARB:
+        case GL_RESET_NOTIFICATION_STRATEGY_ARB:
+        case GL_CURRENT_FOG_COORD:
+        case GL_FOG_COORDINATE_ARRAY_TYPE:
+        case GL_FOG_COORDINATE_ARRAY_STRIDE:
+        case GL_FOG_COORD_ARRAY:
+        case GL_COLOR_SUM_ARB:
+        case GL_SECONDARY_COLOR_ARRAY_SIZE:
+        case GL_SECONDARY_COLOR_ARRAY_TYPE:
+        case GL_SECONDARY_COLOR_ARRAY_STRIDE:
+        case GL_SECONDARY_COLOR_ARRAY:
+        case GL_ACTIVE_TEXTURE:
 /*      case GL_ACTIVE_TEXTURE_ARB:*/
-    case GL_CLIENT_ACTIVE_TEXTURE:
+        case GL_CLIENT_ACTIVE_TEXTURE:
 /*      case GL_CLIENT_ACTIVE_TEXTURE_ARB:*/
-    case GL_MAX_TEXTURE_UNITS:
+        case GL_MAX_TEXTURE_UNITS:
 /*      case GL_MAX_TEXTURE_UNITS_ARB:*/
-    case GL_MAX_RENDERBUFFER_SIZE:
+        case GL_MAX_RENDERBUFFER_SIZE:
 /*      case GL_MAX_RENDERBUFFER_SIZE_EXT:*/
-    case GL_TEXTURE_COMPRESSION_HINT:
+        case GL_TEXTURE_COMPRESSION_HINT:
 /*      case GL_TEXTURE_COMPRESSION_HINT_ARB:*/
-    case GL_TEXTURE_RECTANGLE_ARB:
+        case GL_TEXTURE_RECTANGLE_ARB:
 /*      case GL_TEXTURE_RECTANGLE_NV:*/
-    case GL_TEXTURE_BINDING_RECTANGLE_ARB:
+        case GL_TEXTURE_BINDING_RECTANGLE_ARB:
 /*      case GL_TEXTURE_BINDING_RECTANGLE_NV:*/
-    case GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB:
+        case GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB:
 /*      case GL_MAX_RECTANGLE_TEXTURE_SIZE_NV:*/
-    case GL_MAX_TEXTURE_LOD_BIAS:
-    case GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT:
-    case GL_MAX_SHININESS_NV:
-    case GL_MAX_SPOT_EXPONENT_NV:
-    case GL_TEXTURE_CUBE_MAP:
+        case GL_MAX_TEXTURE_LOD_BIAS:
+        case GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT:
+        case GL_MAX_SHININESS_NV:
+        case GL_MAX_SPOT_EXPONENT_NV:
+        case GL_TEXTURE_CUBE_MAP:
 /*      case GL_TEXTURE_CUBE_MAP_ARB:*/
-    case GL_TEXTURE_BINDING_CUBE_MAP:
+        case GL_TEXTURE_BINDING_CUBE_MAP:
 /*      case GL_TEXTURE_BINDING_CUBE_MAP_ARB:*/
-    case GL_MAX_CUBE_MAP_TEXTURE_SIZE:
+        case GL_MAX_CUBE_MAP_TEXTURE_SIZE:
 /*      case GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB:*/
-    case GL_MULTISAMPLE_FILTER_HINT_NV:
-    case GL_FOG_DISTANCE_MODE_NV:
-    case GL_VERTEX_PROGRAM_ARB:
-    case GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB:
-    case GL_MAX_PROGRAM_MATRICES_ARB:
-    case GL_CURRENT_MATRIX_STACK_DEPTH_ARB:
-    case GL_VERTEX_PROGRAM_POINT_SIZE_ARB:
-    case GL_VERTEX_PROGRAM_TWO_SIDE_ARB:
-    case GL_PROGRAM_ERROR_POSITION_ARB:
-    case GL_DEPTH_CLAMP:
+        case GL_MULTISAMPLE_FILTER_HINT_NV:
+        case GL_FOG_DISTANCE_MODE_NV:
+        case GL_VERTEX_PROGRAM_ARB:
+        case GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB:
+        case GL_MAX_PROGRAM_MATRICES_ARB:
+        case GL_CURRENT_MATRIX_STACK_DEPTH_ARB:
+        case GL_VERTEX_PROGRAM_POINT_SIZE_ARB:
+        case GL_VERTEX_PROGRAM_TWO_SIDE_ARB:
+        case GL_PROGRAM_ERROR_POSITION_ARB:
+        case GL_DEPTH_CLAMP:
 /*      case GL_DEPTH_CLAMP_NV:*/
-    case GL_NUM_COMPRESSED_TEXTURE_FORMATS:
+        case GL_NUM_COMPRESSED_TEXTURE_FORMATS:
 /*      case GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB:*/
-    case GL_MAX_VERTEX_UNITS_ARB:
-    case GL_ACTIVE_VERTEX_UNITS_ARB:
-    case GL_WEIGHT_SUM_UNITY_ARB:
-    case GL_VERTEX_BLEND_ARB:
-    case GL_CURRENT_WEIGHT_ARB:
-    case GL_WEIGHT_ARRAY_TYPE_ARB:
-    case GL_WEIGHT_ARRAY_STRIDE_ARB:
-    case GL_WEIGHT_ARRAY_SIZE_ARB:
-    case GL_WEIGHT_ARRAY_ARB:
-    case GL_PACK_INVERT_MESA:
-    case GL_STENCIL_BACK_FUNC_ATI:
-    case GL_STENCIL_BACK_FAIL_ATI:
-    case GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI:
-    case GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI:
-    case GL_FRAGMENT_PROGRAM_ARB:
-    case GL_MAX_DRAW_BUFFERS_ARB:
-/*      case GL_MAX_DRAW_BUFFERS_NV:*/
-    case GL_DRAW_BUFFER0_ARB:
+        case GL_MAX_VERTEX_UNITS_ARB:
+        case GL_ACTIVE_VERTEX_UNITS_ARB:
+        case GL_WEIGHT_SUM_UNITY_ARB:
+        case GL_VERTEX_BLEND_ARB:
+        case GL_CURRENT_WEIGHT_ARB:
+        case GL_WEIGHT_ARRAY_TYPE_ARB:
+        case GL_WEIGHT_ARRAY_STRIDE_ARB:
+        case GL_WEIGHT_ARRAY_SIZE_ARB:
+        case GL_WEIGHT_ARRAY_ARB:
+        case GL_PACK_INVERT_MESA:
+        case GL_STENCIL_BACK_FUNC_ATI:
+        case GL_STENCIL_BACK_FAIL_ATI:
+        case GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI:
+        case GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI:
+        case GL_FRAGMENT_PROGRAM_ARB:
+        case GL_MAX_DRAW_BUFFERS_ARB:
+/*      case GL_MAX_DRAW_BUFFERS_ATI:*/
+        case GL_DRAW_BUFFER0_ARB:
 /*      case GL_DRAW_BUFFER0_ATI:*/
-    case GL_DRAW_BUFFER1_ARB:
-/*      case GL_DRAW_BUFFER1_NV:*/
-    case GL_DRAW_BUFFER2_ARB:
+        case GL_DRAW_BUFFER1_ARB:
+/*      case GL_DRAW_BUFFER1_ATI:*/
+        case GL_DRAW_BUFFER2_ARB:
 /*      case GL_DRAW_BUFFER2_ATI:*/
-    case GL_DRAW_BUFFER3_ARB:
+        case GL_DRAW_BUFFER3_ARB:
 /*      case GL_DRAW_BUFFER3_ATI:*/
-    case GL_DRAW_BUFFER4_ARB:
+        case GL_DRAW_BUFFER4_ARB:
 /*      case GL_DRAW_BUFFER4_ATI:*/
-    case GL_DRAW_BUFFER5_ARB:
+        case GL_DRAW_BUFFER5_ARB:
 /*      case GL_DRAW_BUFFER5_ATI:*/
-    case GL_DRAW_BUFFER6_ARB:
+        case GL_DRAW_BUFFER6_ARB:
 /*      case GL_DRAW_BUFFER6_ATI:*/
-    case GL_DRAW_BUFFER7_ARB:
+        case GL_DRAW_BUFFER7_ARB:
 /*      case GL_DRAW_BUFFER7_ATI:*/
-    case GL_DRAW_BUFFER8_ARB:
+        case GL_DRAW_BUFFER8_ARB:
 /*      case GL_DRAW_BUFFER8_ATI:*/
-    case GL_DRAW_BUFFER9_ARB:
+        case GL_DRAW_BUFFER9_ARB:
 /*      case GL_DRAW_BUFFER9_ATI:*/
-    case GL_DRAW_BUFFER10_ARB:
-/*      case GL_DRAW_BUFFER10_NV:*/
-    case GL_DRAW_BUFFER11_ARB:
-/*      case GL_DRAW_BUFFER11_NV:*/
-    case GL_DRAW_BUFFER12_ARB:
+        case GL_DRAW_BUFFER10_ARB:
+/*      case GL_DRAW_BUFFER10_ATI:*/
+        case GL_DRAW_BUFFER11_ARB:
+/*      case GL_DRAW_BUFFER11_ATI:*/
+        case GL_DRAW_BUFFER12_ARB:
 /*      case GL_DRAW_BUFFER12_ATI:*/
-    case GL_DRAW_BUFFER13_ARB:
+        case GL_DRAW_BUFFER13_ARB:
 /*      case GL_DRAW_BUFFER13_ATI:*/
-    case GL_DRAW_BUFFER14_ARB:
-/*      case GL_DRAW_BUFFER14_NV:*/
-    case GL_DRAW_BUFFER15_ARB:
+        case GL_DRAW_BUFFER14_ARB:
+/*      case GL_DRAW_BUFFER14_ATI:*/
+        case GL_DRAW_BUFFER15_ARB:
 /*      case GL_DRAW_BUFFER15_ATI:*/
-    case GL_BLEND_EQUATION_ALPHA_EXT:
-    case GL_MATRIX_PALETTE_ARB:
-    case GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB:
-    case GL_MAX_PALETTE_MATRICES_ARB:
-    case GL_CURRENT_PALETTE_MATRIX_ARB:
-    case GL_MATRIX_INDEX_ARRAY_ARB:
-    case GL_CURRENT_MATRIX_INDEX_ARB:
-    case GL_MATRIX_INDEX_ARRAY_SIZE_ARB:
-    case GL_MATRIX_INDEX_ARRAY_TYPE_ARB:
-    case GL_MATRIX_INDEX_ARRAY_STRIDE_ARB:
-    case GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT:
-    case GL_POINT_SPRITE_ARB:
+        case GL_BLEND_EQUATION_ALPHA_EXT:
+        case GL_MATRIX_PALETTE_ARB:
+        case GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB:
+        case GL_MAX_PALETTE_MATRICES_ARB:
+        case GL_CURRENT_PALETTE_MATRIX_ARB:
+        case GL_MATRIX_INDEX_ARRAY_ARB:
+        case GL_CURRENT_MATRIX_INDEX_ARB:
+        case GL_MATRIX_INDEX_ARRAY_SIZE_ARB:
+        case GL_MATRIX_INDEX_ARRAY_TYPE_ARB:
+        case GL_MATRIX_INDEX_ARRAY_STRIDE_ARB:
+        case GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT:
+        case GL_TEXTURE_CUBE_MAP_SEAMLESS:
+        case GL_POINT_SPRITE_ARB:
 /*      case GL_POINT_SPRITE_NV:*/
-    case GL_POINT_SPRITE_R_MODE_NV:
-    case GL_MAX_VERTEX_ATTRIBS_ARB:
-    case GL_MAX_TEXTURE_COORDS_ARB:
-    case GL_MAX_TEXTURE_IMAGE_UNITS_ARB:
-    case GL_DEPTH_BOUNDS_TEST_EXT:
-    case GL_ARRAY_BUFFER_BINDING_ARB:
-    case GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB:
-    case GL_VERTEX_ARRAY_BUFFER_BINDING_ARB:
-    case GL_NORMAL_ARRAY_BUFFER_BINDING_ARB:
-    case GL_COLOR_ARRAY_BUFFER_BINDING_ARB:
-    case GL_INDEX_ARRAY_BUFFER_BINDING_ARB:
-    case GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB:
-    case GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB:
-    case GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB:
-    case GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB:
-    case GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB:
-    case GL_TEXTURE_CUBE_MAP_SEAMLESS:
-    case GL_MAX_ARRAY_TEXTURE_LAYERS_EXT:
-    case GL_STENCIL_TEST_TWO_SIDE_EXT:
-    case GL_ACTIVE_STENCIL_FACE_EXT:
-    case GL_SAMPLER_BINDING:
-    case GL_TEXTURE_BINDING_1D_ARRAY_EXT:
-    case GL_TEXTURE_BINDING_2D_ARRAY_EXT:
-    case GL_FRAMEBUFFER_BINDING:
+        case GL_POINT_SPRITE_R_MODE_NV:
+        case GL_MAX_VERTEX_ATTRIBS_ARB:
+        case GL_MAX_TEXTURE_COORDS_ARB:
+        case GL_MAX_TEXTURE_IMAGE_UNITS_ARB:
+        case GL_DEPTH_BOUNDS_TEST_EXT:
+        case GL_ARRAY_BUFFER_BINDING_ARB:
+        case GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB:
+        case GL_VERTEX_ARRAY_BUFFER_BINDING_ARB:
+        case GL_NORMAL_ARRAY_BUFFER_BINDING_ARB:
+        case GL_COLOR_ARRAY_BUFFER_BINDING_ARB:
+        case GL_INDEX_ARRAY_BUFFER_BINDING_ARB:
+        case GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB:
+        case GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB:
+        case GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB:
+        case GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB:
+        case GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB:
+        case GL_MAX_ARRAY_TEXTURE_LAYERS_EXT:
+        case GL_STENCIL_TEST_TWO_SIDE_EXT:
+        case GL_ACTIVE_STENCIL_FACE_EXT:
+        case GL_SAMPLER_BINDING:
+        case GL_TEXTURE_BINDING_1D_ARRAY_EXT:
+        case GL_TEXTURE_BINDING_2D_ARRAY_EXT:
+        case GL_FRAMEBUFFER_BINDING:
 /*      case GL_DRAW_FRAMEBUFFER_BINDING_EXT:*/
-    case GL_RENDERBUFFER_BINDING:
+        case GL_RENDERBUFFER_BINDING:
 /*      case GL_RENDERBUFFER_BINDING_EXT:*/
-    case GL_READ_FRAMEBUFFER_BINDING:
+        case GL_READ_FRAMEBUFFER_BINDING:
 /*      case GL_READ_FRAMEBUFFER_BINDING_EXT:*/
-    case GL_MAX_COLOR_ATTACHMENTS:
+        case GL_MAX_COLOR_ATTACHMENTS:
 /*      case GL_MAX_COLOR_ATTACHMENTS_EXT:*/
-    case GL_MAX_SAMPLES:
+        case GL_MAX_SAMPLES:
 /*      case GL_MAX_SAMPLES_EXT:*/
-    case GL_MAX_SERVER_WAIT_TIMEOUT:
-    case GL_RASTER_POSITION_UNCLIPPED_IBM:
-        return 1;
-    case GL_SMOOTH_POINT_SIZE_RANGE:
-    case GL_LINE_WIDTH_RANGE:
-    case GL_POLYGON_MODE:
-    case GL_DEPTH_RANGE:
-    case GL_MAX_VIEWPORT_DIMS:
-    case GL_MAP1_GRID_DOMAIN:
-    case GL_MAP2_GRID_SEGMENTS:
-    case GL_ALIASED_POINT_SIZE_RANGE:
-    case GL_ALIASED_LINE_WIDTH_RANGE:
-    case GL_DEPTH_BOUNDS_EXT:
-        return 2;
-    case GL_CURRENT_NORMAL:
-    case GL_POINT_DISTANCE_ATTENUATION:
-        return 3;
-    case GL_CURRENT_COLOR:
-    case GL_CURRENT_TEXTURE_COORDS:
-    case GL_CURRENT_RASTER_COLOR:
-    case GL_CURRENT_RASTER_TEXTURE_COORDS:
-    case GL_CURRENT_RASTER_POSITION:
-    case GL_LIGHT_MODEL_AMBIENT:
-    case GL_FOG_COLOR:
-    case GL_ACCUM_CLEAR_VALUE:
-    case GL_VIEWPORT:
-    case GL_SCISSOR_BOX:
-    case GL_COLOR_CLEAR_VALUE:
-    case GL_COLOR_WRITEMASK:
-    case GL_MAP2_GRID_DOMAIN:
-    case GL_BLEND_COLOR:
+        case GL_MAX_SERVER_WAIT_TIMEOUT:
+        case GL_MAX_DEBUG_MESSAGE_LENGTH_ARB:
+        case GL_MAX_DEBUG_LOGGED_MESSAGES_ARB:
+        case GL_DEBUG_LOGGED_MESSAGES_ARB:
+        case GL_RASTER_POSITION_UNCLIPPED_IBM:
+            return 1;
+        case GL_SMOOTH_POINT_SIZE_RANGE:
+        case GL_LINE_WIDTH_RANGE:
+        case GL_POLYGON_MODE:
+        case GL_DEPTH_RANGE:
+        case GL_MAX_VIEWPORT_DIMS:
+        case GL_MAP1_GRID_DOMAIN:
+        case GL_MAP2_GRID_SEGMENTS:
+        case GL_ALIASED_POINT_SIZE_RANGE:
+        case GL_ALIASED_LINE_WIDTH_RANGE:
+        case GL_DEPTH_BOUNDS_EXT:
+            return 2;
+        case GL_CURRENT_NORMAL:
+        case GL_POINT_DISTANCE_ATTENUATION:
+            return 3;
+        case GL_CURRENT_COLOR:
+        case GL_CURRENT_TEXTURE_COORDS:
+        case GL_CURRENT_RASTER_COLOR:
+        case GL_CURRENT_RASTER_TEXTURE_COORDS:
+        case GL_CURRENT_RASTER_POSITION:
+        case GL_LIGHT_MODEL_AMBIENT:
+        case GL_FOG_COLOR:
+        case GL_ACCUM_CLEAR_VALUE:
+        case GL_VIEWPORT:
+        case GL_SCISSOR_BOX:
+        case GL_COLOR_CLEAR_VALUE:
+        case GL_COLOR_WRITEMASK:
+        case GL_MAP2_GRID_DOMAIN:
+        case GL_BLEND_COLOR:
 /*      case GL_BLEND_COLOR_EXT:*/
-    case GL_CURRENT_SECONDARY_COLOR:
-        return 4;
-    case GL_MODELVIEW_MATRIX:
-    case GL_PROJECTION_MATRIX:
-    case GL_TEXTURE_MATRIX:
-    case GL_MODELVIEW0_ARB:
-    case GL_COLOR_MATRIX:
-    case GL_MODELVIEW1_ARB:
-    case GL_CURRENT_MATRIX_ARB:
-    case GL_MODELVIEW2_ARB:
-    case GL_MODELVIEW3_ARB:
-    case GL_MODELVIEW4_ARB:
-    case GL_MODELVIEW5_ARB:
-    case GL_MODELVIEW6_ARB:
-    case GL_MODELVIEW7_ARB:
-    case GL_MODELVIEW8_ARB:
-    case GL_MODELVIEW9_ARB:
-    case GL_MODELVIEW10_ARB:
-    case GL_MODELVIEW11_ARB:
-    case GL_MODELVIEW12_ARB:
-    case GL_MODELVIEW13_ARB:
-    case GL_MODELVIEW14_ARB:
-    case GL_MODELVIEW15_ARB:
-    case GL_MODELVIEW16_ARB:
-    case GL_MODELVIEW17_ARB:
-    case GL_MODELVIEW18_ARB:
-    case GL_MODELVIEW19_ARB:
-    case GL_MODELVIEW20_ARB:
-    case GL_MODELVIEW21_ARB:
-    case GL_MODELVIEW22_ARB:
-    case GL_MODELVIEW23_ARB:
-    case GL_MODELVIEW24_ARB:
-    case GL_MODELVIEW25_ARB:
-    case GL_MODELVIEW26_ARB:
-    case GL_MODELVIEW27_ARB:
-    case GL_MODELVIEW28_ARB:
-    case GL_MODELVIEW29_ARB:
-    case GL_MODELVIEW30_ARB:
-    case GL_MODELVIEW31_ARB:
-    case GL_TRANSPOSE_CURRENT_MATRIX_ARB:
-        return 16;
-    case GL_FOG_COORDINATE_SOURCE:
-    case GL_COMPRESSED_TEXTURE_FORMATS:
-    case GL_RGBA_INTEGER_MODE_EXT:
-        return __glGetBooleanv_variable_size(e);
-    default:
-        return 0;
+        case GL_CURRENT_SECONDARY_COLOR:
+            return 4;
+        case GL_MODELVIEW_MATRIX:
+        case GL_PROJECTION_MATRIX:
+        case GL_TEXTURE_MATRIX:
+        case GL_MODELVIEW0_ARB:
+        case GL_COLOR_MATRIX:
+        case GL_MODELVIEW1_ARB:
+        case GL_CURRENT_MATRIX_ARB:
+        case GL_MODELVIEW2_ARB:
+        case GL_MODELVIEW3_ARB:
+        case GL_MODELVIEW4_ARB:
+        case GL_MODELVIEW5_ARB:
+        case GL_MODELVIEW6_ARB:
+        case GL_MODELVIEW7_ARB:
+        case GL_MODELVIEW8_ARB:
+        case GL_MODELVIEW9_ARB:
+        case GL_MODELVIEW10_ARB:
+        case GL_MODELVIEW11_ARB:
+        case GL_MODELVIEW12_ARB:
+        case GL_MODELVIEW13_ARB:
+        case GL_MODELVIEW14_ARB:
+        case GL_MODELVIEW15_ARB:
+        case GL_MODELVIEW16_ARB:
+        case GL_MODELVIEW17_ARB:
+        case GL_MODELVIEW18_ARB:
+        case GL_MODELVIEW19_ARB:
+        case GL_MODELVIEW20_ARB:
+        case GL_MODELVIEW21_ARB:
+        case GL_MODELVIEW22_ARB:
+        case GL_MODELVIEW23_ARB:
+        case GL_MODELVIEW24_ARB:
+        case GL_MODELVIEW25_ARB:
+        case GL_MODELVIEW26_ARB:
+        case GL_MODELVIEW27_ARB:
+        case GL_MODELVIEW28_ARB:
+        case GL_MODELVIEW29_ARB:
+        case GL_MODELVIEW30_ARB:
+        case GL_MODELVIEW31_ARB:
+        case GL_TRANSPOSE_CURRENT_MATRIX_ARB:
+            return 16;
+        case GL_FOG_COORDINATE_SOURCE:
+        case GL_COMPRESSED_TEXTURE_FORMATS:
+        case GL_MIN_PROGRAM_TEXEL_OFFSET:
+        case GL_MAX_PROGRAM_TEXEL_OFFSET:
+        case GL_RGBA_INTEGER_MODE_EXT:
+            return __glGetBooleanv_variable_size( e );
+        default: return 0;
     }
 }
 
 _X_INTERNAL PURE FASTCALL GLint
-__glGetTexParameterfv_size(GLenum e)
+__glGetTexParameterfv_size( GLenum e )
 {
-    switch (e) {
-    case GL_TEXTURE_MAG_FILTER:
-    case GL_TEXTURE_MIN_FILTER:
-    case GL_TEXTURE_WRAP_S:
-    case GL_TEXTURE_WRAP_T:
-    case GL_TEXTURE_PRIORITY:
-    case GL_TEXTURE_RESIDENT:
-    case GL_TEXTURE_WRAP_R:
-    case GL_TEXTURE_COMPARE_FAIL_VALUE_ARB:
+    switch( e ) {
+        case GL_TEXTURE_MAG_FILTER:
+        case GL_TEXTURE_MIN_FILTER:
+        case GL_TEXTURE_WRAP_S:
+        case GL_TEXTURE_WRAP_T:
+        case GL_TEXTURE_PRIORITY:
+        case GL_TEXTURE_RESIDENT:
+        case GL_TEXTURE_WRAP_R:
+        case GL_TEXTURE_COMPARE_FAIL_VALUE_ARB:
 /*      case GL_SHADOW_AMBIENT_SGIX:*/
-    case GL_TEXTURE_MIN_LOD:
-    case GL_TEXTURE_MAX_LOD:
-    case GL_TEXTURE_BASE_LEVEL:
-    case GL_TEXTURE_MAX_LEVEL:
-    case GL_TEXTURE_CLIPMAP_FRAME_SGIX:
-    case GL_TEXTURE_LOD_BIAS_S_SGIX:
-    case GL_TEXTURE_LOD_BIAS_T_SGIX:
-    case GL_TEXTURE_LOD_BIAS_R_SGIX:
-    case GL_GENERATE_MIPMAP:
+        case GL_TEXTURE_MIN_LOD:
+        case GL_TEXTURE_MAX_LOD:
+        case GL_TEXTURE_BASE_LEVEL:
+        case GL_TEXTURE_MAX_LEVEL:
+        case GL_TEXTURE_CLIPMAP_FRAME_SGIX:
+        case GL_TEXTURE_LOD_BIAS_S_SGIX:
+        case GL_TEXTURE_LOD_BIAS_T_SGIX:
+        case GL_TEXTURE_LOD_BIAS_R_SGIX:
+        case GL_GENERATE_MIPMAP:
 /*      case GL_GENERATE_MIPMAP_SGIS:*/
-    case GL_TEXTURE_COMPARE_SGIX:
-    case GL_TEXTURE_COMPARE_OPERATOR_SGIX:
-    case GL_TEXTURE_MAX_CLAMP_S_SGIX:
-    case GL_TEXTURE_MAX_CLAMP_T_SGIX:
-    case GL_TEXTURE_MAX_CLAMP_R_SGIX:
-    case GL_TEXTURE_MAX_ANISOTROPY_EXT:
-    case GL_TEXTURE_LOD_BIAS:
+        case GL_TEXTURE_COMPARE_SGIX:
+        case GL_TEXTURE_COMPARE_OPERATOR_SGIX:
+        case GL_TEXTURE_MAX_CLAMP_S_SGIX:
+        case GL_TEXTURE_MAX_CLAMP_T_SGIX:
+        case GL_TEXTURE_MAX_CLAMP_R_SGIX:
+        case GL_TEXTURE_MAX_ANISOTROPY_EXT:
+        case GL_TEXTURE_LOD_BIAS:
 /*      case GL_TEXTURE_LOD_BIAS_EXT:*/
-    case GL_TEXTURE_RANGE_LENGTH_APPLE:
-    case GL_TEXTURE_STORAGE_HINT_APPLE:
-    case GL_DEPTH_TEXTURE_MODE:
+        case GL_TEXTURE_RANGE_LENGTH_APPLE:
+        case GL_TEXTURE_STORAGE_HINT_APPLE:
+        case GL_DEPTH_TEXTURE_MODE:
 /*      case GL_DEPTH_TEXTURE_MODE_ARB:*/
-    case GL_TEXTURE_COMPARE_MODE:
+        case GL_TEXTURE_COMPARE_MODE:
 /*      case GL_TEXTURE_COMPARE_MODE_ARB:*/
-    case GL_TEXTURE_COMPARE_FUNC:
+        case GL_TEXTURE_COMPARE_FUNC:
 /*      case GL_TEXTURE_COMPARE_FUNC_ARB:*/
-    case GL_TEXTURE_UNSIGNED_REMAP_MODE_NV:
-        return 1;
-    case GL_TEXTURE_CLIPMAP_CENTER_SGIX:
-    case GL_TEXTURE_CLIPMAP_OFFSET_SGIX:
-        return 2;
-    case GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX:
-        return 3;
-    case GL_TEXTURE_BORDER_COLOR:
-    case GL_POST_TEXTURE_FILTER_BIAS_SGIX:
-    case GL_POST_TEXTURE_FILTER_SCALE_SGIX:
-        return 4;
-    default:
-        return 0;
+        case GL_TEXTURE_UNSIGNED_REMAP_MODE_NV:
+            return 1;
+        case GL_TEXTURE_CLIPMAP_CENTER_SGIX:
+        case GL_TEXTURE_CLIPMAP_OFFSET_SGIX:
+            return 2;
+        case GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX:
+            return 3;
+        case GL_TEXTURE_BORDER_COLOR:
+        case GL_POST_TEXTURE_FILTER_BIAS_SGIX:
+        case GL_POST_TEXTURE_FILTER_SCALE_SGIX:
+            return 4;
+        default: return 0;
     }
 }
 
 _X_INTERNAL PURE FASTCALL GLint
-__glGetTexLevelParameterfv_size(GLenum e)
+__glGetTexLevelParameterfv_size( GLenum e )
 {
-    switch (e) {
-    case GL_TEXTURE_WIDTH:
-    case GL_TEXTURE_HEIGHT:
-    case GL_TEXTURE_COMPONENTS:
-    case GL_TEXTURE_BORDER:
-    case GL_TEXTURE_RED_SIZE:
+    switch( e ) {
+        case GL_TEXTURE_WIDTH:
+        case GL_TEXTURE_HEIGHT:
+        case GL_TEXTURE_COMPONENTS:
+        case GL_TEXTURE_BORDER:
+        case GL_TEXTURE_RED_SIZE:
 /*      case GL_TEXTURE_RED_SIZE_EXT:*/
-    case GL_TEXTURE_GREEN_SIZE:
+        case GL_TEXTURE_GREEN_SIZE:
 /*      case GL_TEXTURE_GREEN_SIZE_EXT:*/
-    case GL_TEXTURE_BLUE_SIZE:
+        case GL_TEXTURE_BLUE_SIZE:
 /*      case GL_TEXTURE_BLUE_SIZE_EXT:*/
-    case GL_TEXTURE_ALPHA_SIZE:
+        case GL_TEXTURE_ALPHA_SIZE:
 /*      case GL_TEXTURE_ALPHA_SIZE_EXT:*/
-    case GL_TEXTURE_LUMINANCE_SIZE:
+        case GL_TEXTURE_LUMINANCE_SIZE:
 /*      case GL_TEXTURE_LUMINANCE_SIZE_EXT:*/
-    case GL_TEXTURE_INTENSITY_SIZE:
+        case GL_TEXTURE_INTENSITY_SIZE:
 /*      case GL_TEXTURE_INTENSITY_SIZE_EXT:*/
-    case GL_TEXTURE_DEPTH:
-    case GL_TEXTURE_INDEX_SIZE_EXT:
-    case GL_TEXTURE_COMPRESSED_IMAGE_SIZE:
+        case GL_TEXTURE_DEPTH:
+        case GL_TEXTURE_INDEX_SIZE_EXT:
+        case GL_TEXTURE_COMPRESSED_IMAGE_SIZE:
 /*      case GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB:*/
-    case GL_TEXTURE_COMPRESSED:
+        case GL_TEXTURE_COMPRESSED:
 /*      case GL_TEXTURE_COMPRESSED_ARB:*/
-    case GL_TEXTURE_DEPTH_SIZE:
+        case GL_TEXTURE_DEPTH_SIZE:
 /*      case GL_TEXTURE_DEPTH_SIZE_ARB:*/
-    case GL_TEXTURE_STENCIL_SIZE:
+        case GL_TEXTURE_STENCIL_SIZE:
 /*      case GL_TEXTURE_STENCIL_SIZE_EXT:*/
-        return 1;
-    default:
-        return 0;
+            return 1;
+        default: return 0;
+    }
+}
+
+_X_INTERNAL PURE FASTCALL GLint
+__glGetPointerv_size( GLenum e )
+{
+    switch( e ) {
+        case GL_DEBUG_CALLBACK_FUNCTION_ARB:
+        case GL_DEBUG_CALLBACK_USER_PARAM_ARB:
+            return 1;
+        default: return 0;
     }
 }
 
 _X_INTERNAL PURE FASTCALL GLint
-__glColorTableParameterfv_size(GLenum e)
+__glColorTableParameterfv_size( GLenum e )
 {
-    switch (e) {
-    case GL_COLOR_TABLE_SCALE:
-    case GL_COLOR_TABLE_BIAS:
-        return 4;
-    default:
-        return 0;
+    switch( e ) {
+        case GL_COLOR_TABLE_SCALE:
+        case GL_COLOR_TABLE_BIAS:
+            return 4;
+        default: return 0;
     }
 }
 
 _X_INTERNAL PURE FASTCALL GLint
-__glGetColorTableParameterfv_size(GLenum e)
+__glGetColorTableParameterfv_size( GLenum e )
 {
-    switch (e) {
-    case GL_COLOR_TABLE_FORMAT:
+    switch( e ) {
+        case GL_COLOR_TABLE_FORMAT:
 /*      case GL_COLOR_TABLE_FORMAT_EXT:*/
-    case GL_COLOR_TABLE_WIDTH:
+        case GL_COLOR_TABLE_WIDTH:
 /*      case GL_COLOR_TABLE_WIDTH_EXT:*/
-    case GL_COLOR_TABLE_RED_SIZE:
+        case GL_COLOR_TABLE_RED_SIZE:
 /*      case GL_COLOR_TABLE_RED_SIZE_EXT:*/
-    case GL_COLOR_TABLE_GREEN_SIZE:
+        case GL_COLOR_TABLE_GREEN_SIZE:
 /*      case GL_COLOR_TABLE_GREEN_SIZE_EXT:*/
-    case GL_COLOR_TABLE_BLUE_SIZE:
+        case GL_COLOR_TABLE_BLUE_SIZE:
 /*      case GL_COLOR_TABLE_BLUE_SIZE_EXT:*/
-    case GL_COLOR_TABLE_ALPHA_SIZE:
+        case GL_COLOR_TABLE_ALPHA_SIZE:
 /*      case GL_COLOR_TABLE_ALPHA_SIZE_EXT:*/
-    case GL_COLOR_TABLE_LUMINANCE_SIZE:
+        case GL_COLOR_TABLE_LUMINANCE_SIZE:
 /*      case GL_COLOR_TABLE_LUMINANCE_SIZE_EXT:*/
-    case GL_COLOR_TABLE_INTENSITY_SIZE:
+        case GL_COLOR_TABLE_INTENSITY_SIZE:
 /*      case GL_COLOR_TABLE_INTENSITY_SIZE_EXT:*/
-        return 1;
-    case GL_COLOR_TABLE_SCALE:
-    case GL_COLOR_TABLE_BIAS:
-        return 4;
-    default:
-        return 0;
+            return 1;
+        case GL_COLOR_TABLE_SCALE:
+        case GL_COLOR_TABLE_BIAS:
+            return 4;
+        default: return 0;
     }
 }
 
 _X_INTERNAL PURE FASTCALL GLint
-__glConvolutionParameterfv_size(GLenum e)
+__glConvolutionParameterfv_size( GLenum e )
 {
-    switch (e) {
-    case GL_CONVOLUTION_BORDER_MODE:
+    switch( e ) {
+        case GL_CONVOLUTION_BORDER_MODE:
 /*      case GL_CONVOLUTION_BORDER_MODE_EXT:*/
-        return 1;
-    case GL_CONVOLUTION_FILTER_SCALE:
+            return 1;
+        case GL_CONVOLUTION_FILTER_SCALE:
 /*      case GL_CONVOLUTION_FILTER_SCALE_EXT:*/
-    case GL_CONVOLUTION_FILTER_BIAS:
+        case GL_CONVOLUTION_FILTER_BIAS:
 /*      case GL_CONVOLUTION_FILTER_BIAS_EXT:*/
-    case GL_CONVOLUTION_BORDER_COLOR:
+        case GL_CONVOLUTION_BORDER_COLOR:
 /*      case GL_CONVOLUTION_BORDER_COLOR_HP:*/
-        return 4;
-    default:
-        return 0;
+            return 4;
+        default: return 0;
     }
 }
 
 _X_INTERNAL PURE FASTCALL GLint
-__glGetConvolutionParameterfv_size(GLenum e)
+__glGetConvolutionParameterfv_size( GLenum e )
 {
-    switch (e) {
-    case GL_CONVOLUTION_BORDER_MODE:
+    switch( e ) {
+        case GL_CONVOLUTION_BORDER_MODE:
 /*      case GL_CONVOLUTION_BORDER_MODE_EXT:*/
-    case GL_CONVOLUTION_FORMAT:
+        case GL_CONVOLUTION_FORMAT:
 /*      case GL_CONVOLUTION_FORMAT_EXT:*/
-    case GL_CONVOLUTION_WIDTH:
+        case GL_CONVOLUTION_WIDTH:
 /*      case GL_CONVOLUTION_WIDTH_EXT:*/
-    case GL_CONVOLUTION_HEIGHT:
+        case GL_CONVOLUTION_HEIGHT:
 /*      case GL_CONVOLUTION_HEIGHT_EXT:*/
-    case GL_MAX_CONVOLUTION_WIDTH:
+        case GL_MAX_CONVOLUTION_WIDTH:
 /*      case GL_MAX_CONVOLUTION_WIDTH_EXT:*/
-    case GL_MAX_CONVOLUTION_HEIGHT:
+        case GL_MAX_CONVOLUTION_HEIGHT:
 /*      case GL_MAX_CONVOLUTION_HEIGHT_EXT:*/
-        return 1;
-    case GL_CONVOLUTION_FILTER_SCALE:
+            return 1;
+        case GL_CONVOLUTION_FILTER_SCALE:
 /*      case GL_CONVOLUTION_FILTER_SCALE_EXT:*/
-    case GL_CONVOLUTION_FILTER_BIAS:
+        case GL_CONVOLUTION_FILTER_BIAS:
 /*      case GL_CONVOLUTION_FILTER_BIAS_EXT:*/
-    case GL_CONVOLUTION_BORDER_COLOR:
+        case GL_CONVOLUTION_BORDER_COLOR:
 /*      case GL_CONVOLUTION_BORDER_COLOR_HP:*/
-        return 4;
-    default:
-        return 0;
+            return 4;
+        default: return 0;
     }
 }
 
 _X_INTERNAL PURE FASTCALL GLint
-__glGetHistogramParameterfv_size(GLenum e)
+__glGetHistogramParameterfv_size( GLenum e )
 {
-    switch (e) {
-    case GL_HISTOGRAM_WIDTH:
-    case GL_HISTOGRAM_FORMAT:
-    case GL_HISTOGRAM_RED_SIZE:
-    case GL_HISTOGRAM_GREEN_SIZE:
-    case GL_HISTOGRAM_BLUE_SIZE:
-    case GL_HISTOGRAM_ALPHA_SIZE:
-    case GL_HISTOGRAM_LUMINANCE_SIZE:
-    case GL_HISTOGRAM_SINK:
-        return 1;
-    default:
-        return 0;
+    switch( e ) {
+        case GL_HISTOGRAM_WIDTH:
+        case GL_HISTOGRAM_FORMAT:
+        case GL_HISTOGRAM_RED_SIZE:
+        case GL_HISTOGRAM_GREEN_SIZE:
+        case GL_HISTOGRAM_BLUE_SIZE:
+        case GL_HISTOGRAM_ALPHA_SIZE:
+        case GL_HISTOGRAM_LUMINANCE_SIZE:
+        case GL_HISTOGRAM_SINK:
+            return 1;
+        default: return 0;
     }
 }
 
 _X_INTERNAL PURE FASTCALL GLint
-__glGetMinmaxParameterfv_size(GLenum e)
+__glGetMinmaxParameterfv_size( GLenum e )
 {
-    switch (e) {
-    case GL_MINMAX_FORMAT:
-    case GL_MINMAX_SINK:
-        return 1;
-    default:
-        return 0;
+    switch( e ) {
+        case GL_MINMAX_FORMAT:
+        case GL_MINMAX_SINK:
+            return 1;
+        default: return 0;
     }
 }
 
 _X_INTERNAL PURE FASTCALL GLint
-__glGetProgramivARB_size(GLenum e)
+__glPointParameterfv_size( GLenum e )
 {
-    switch (e) {
-    case GL_PROGRAM_LENGTH_ARB:
-    case GL_PROGRAM_BINDING_ARB:
-    case GL_PROGRAM_ALU_INSTRUCTIONS_ARB:
-    case GL_PROGRAM_TEX_INSTRUCTIONS_ARB:
-    case GL_PROGRAM_TEX_INDIRECTIONS_ARB:
-    case GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB:
-    case GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB:
-    case GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB:
-    case GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB:
-    case GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB:
-    case GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB:
-    case GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB:
-    case GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB:
-    case GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB:
-    case GL_PROGRAM_FORMAT_ARB:
-    case GL_PROGRAM_INSTRUCTIONS_ARB:
-    case GL_MAX_PROGRAM_INSTRUCTIONS_ARB:
-    case GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB:
-    case GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB:
-    case GL_PROGRAM_TEMPORARIES_ARB:
-    case GL_MAX_PROGRAM_TEMPORARIES_ARB:
-    case GL_PROGRAM_NATIVE_TEMPORARIES_ARB:
-    case GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB:
-    case GL_PROGRAM_PARAMETERS_ARB:
-    case GL_MAX_PROGRAM_PARAMETERS_ARB:
-    case GL_PROGRAM_NATIVE_PARAMETERS_ARB:
-    case GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB:
-    case GL_PROGRAM_ATTRIBS_ARB:
-    case GL_MAX_PROGRAM_ATTRIBS_ARB:
-    case GL_PROGRAM_NATIVE_ATTRIBS_ARB:
-    case GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB:
-    case GL_PROGRAM_ADDRESS_REGISTERS_ARB:
-    case GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB:
-    case GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB:
-    case GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB:
-    case GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB:
-    case GL_MAX_PROGRAM_ENV_PARAMETERS_ARB:
-    case GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB:
-    case GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV:
-    case GL_MAX_PROGRAM_CALL_DEPTH_NV:
-    case GL_MAX_PROGRAM_IF_DEPTH_NV:
-    case GL_MAX_PROGRAM_LOOP_DEPTH_NV:
-    case GL_MAX_PROGRAM_LOOP_COUNT_NV:
-        return 1;
-    default:
-        return 0;
+    switch( e ) {
+        case GL_POINT_SIZE_MIN:
+/*      case GL_POINT_SIZE_MIN_ARB:*/
+/*      case GL_POINT_SIZE_MIN_SGIS:*/
+        case GL_POINT_SIZE_MAX:
+/*      case GL_POINT_SIZE_MAX_ARB:*/
+/*      case GL_POINT_SIZE_MAX_SGIS:*/
+        case GL_POINT_FADE_THRESHOLD_SIZE:
+/*      case GL_POINT_FADE_THRESHOLD_SIZE_ARB:*/
+/*      case GL_POINT_FADE_THRESHOLD_SIZE_SGIS:*/
+        case GL_POINT_SPRITE_R_MODE_NV:
+        case GL_POINT_SPRITE_COORD_ORIGIN:
+            return 1;
+        case GL_POINT_DISTANCE_ATTENUATION:
+/*      case GL_POINT_DISTANCE_ATTENUATION_ARB:*/
+/*      case GL_POINT_DISTANCE_ATTENUATION_SGIS:*/
+            return 3;
+        default: return 0;
     }
 }
 
 _X_INTERNAL PURE FASTCALL GLint
-__glGetVertexAttribdvARB_size(GLenum e)
+__glGetQueryObjectiv_size( GLenum e )
 {
-    switch (e) {
-    case GL_VERTEX_PROGRAM_ARB:
-    case GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB:
-    case GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB:
-    case GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB:
-    case GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB:
-    case GL_CURRENT_VERTEX_ATTRIB_ARB:
-    case GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB:
-        return 1;
-    default:
-        return 0;
+    switch( e ) {
+        case GL_QUERY_RESULT_ARB:
+        case GL_QUERY_RESULT_AVAILABLE_ARB:
+            return 1;
+        default: return 0;
     }
 }
 
 _X_INTERNAL PURE FASTCALL GLint
-__glGetQueryObjectivARB_size(GLenum e)
+__glGetQueryiv_size( GLenum e )
 {
-    switch (e) {
-    case GL_QUERY_RESULT_ARB:
-    case GL_QUERY_RESULT_AVAILABLE_ARB:
-        return 1;
-    default:
-        return 0;
+    switch( e ) {
+        case GL_QUERY_COUNTER_BITS_ARB:
+        case GL_CURRENT_QUERY_ARB:
+        case GL_ANY_SAMPLES_PASSED:
+            return 1;
+        default: return 0;
     }
 }
 
 _X_INTERNAL PURE FASTCALL GLint
-__glGetQueryivARB_size(GLenum e)
+__glGetVertexAttribdv_size( GLenum e )
 {
-    switch (e) {
-    case GL_QUERY_COUNTER_BITS_ARB:
-    case GL_CURRENT_QUERY_ARB:
-        return 1;
-    default:
-        return 0;
+    switch( e ) {
+        case GL_VERTEX_PROGRAM_ARB:
+        case GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB:
+        case GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB:
+        case GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB:
+        case GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB:
+        case GL_CURRENT_VERTEX_ATTRIB_ARB:
+        case GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB:
+            return 1;
+        default: return 0;
     }
 }
 
 _X_INTERNAL PURE FASTCALL GLint
-__glPointParameterfvEXT_size(GLenum e)
+__glGetProgramivARB_size( GLenum e )
 {
-    switch (e) {
-    case GL_POINT_SIZE_MIN:
-/*      case GL_POINT_SIZE_MIN_ARB:*/
-/*      case GL_POINT_SIZE_MIN_SGIS:*/
-    case GL_POINT_SIZE_MAX:
-/*      case GL_POINT_SIZE_MAX_ARB:*/
-/*      case GL_POINT_SIZE_MAX_SGIS:*/
-    case GL_POINT_FADE_THRESHOLD_SIZE:
-/*      case GL_POINT_FADE_THRESHOLD_SIZE_ARB:*/
-/*      case GL_POINT_FADE_THRESHOLD_SIZE_SGIS:*/
-    case GL_POINT_SPRITE_R_MODE_NV:
-    case GL_POINT_SPRITE_COORD_ORIGIN:
-        return 1;
-    case GL_POINT_DISTANCE_ATTENUATION:
-/*      case GL_POINT_DISTANCE_ATTENUATION_ARB:*/
-/*      case GL_POINT_DISTANCE_ATTENUATION_SGIS:*/
-        return 3;
-    default:
-        return 0;
+    switch( e ) {
+        case GL_PROGRAM_LENGTH_ARB:
+        case GL_PROGRAM_BINDING_ARB:
+        case GL_PROGRAM_ALU_INSTRUCTIONS_ARB:
+        case GL_PROGRAM_TEX_INSTRUCTIONS_ARB:
+        case GL_PROGRAM_TEX_INDIRECTIONS_ARB:
+        case GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB:
+        case GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB:
+        case GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB:
+        case GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB:
+        case GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB:
+        case GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB:
+        case GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB:
+        case GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB:
+        case GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB:
+        case GL_PROGRAM_FORMAT_ARB:
+        case GL_PROGRAM_INSTRUCTIONS_ARB:
+        case GL_MAX_PROGRAM_INSTRUCTIONS_ARB:
+        case GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB:
+        case GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB:
+        case GL_PROGRAM_TEMPORARIES_ARB:
+        case GL_MAX_PROGRAM_TEMPORARIES_ARB:
+        case GL_PROGRAM_NATIVE_TEMPORARIES_ARB:
+        case GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB:
+        case GL_PROGRAM_PARAMETERS_ARB:
+        case GL_MAX_PROGRAM_PARAMETERS_ARB:
+        case GL_PROGRAM_NATIVE_PARAMETERS_ARB:
+        case GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB:
+        case GL_PROGRAM_ATTRIBS_ARB:
+        case GL_MAX_PROGRAM_ATTRIBS_ARB:
+        case GL_PROGRAM_NATIVE_ATTRIBS_ARB:
+        case GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB:
+        case GL_PROGRAM_ADDRESS_REGISTERS_ARB:
+        case GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB:
+        case GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB:
+        case GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB:
+        case GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB:
+        case GL_MAX_PROGRAM_ENV_PARAMETERS_ARB:
+        case GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB:
+        case GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV:
+        case GL_MAX_PROGRAM_CALL_DEPTH_NV:
+        case GL_MAX_PROGRAM_IF_DEPTH_NV:
+        case GL_MAX_PROGRAM_LOOP_DEPTH_NV:
+        case GL_MAX_PROGRAM_LOOP_COUNT_NV:
+            return 1;
+        default: return 0;
     }
 }
 
 _X_INTERNAL PURE FASTCALL GLint
-__glGetProgramivNV_size(GLenum e)
+__glGetFramebufferAttachmentParameteriv_size( GLenum e )
 {
-    switch (e) {
-    case GL_PROGRAM_LENGTH_NV:
-    case GL_PROGRAM_TARGET_NV:
-    case GL_PROGRAM_RESIDENT_NV:
-        return 1;
-    default:
-        return 0;
+    switch( e ) {
+        case GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING:
+        case GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE:
+        case GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE:
+        case GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE:
+        case GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE:
+        case GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE:
+        case GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE:
+        case GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE:
+        case GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE:
+/*      case GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT:*/
+        case GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME:
+/*      case GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT:*/
+        case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL:
+/*      case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT:*/
+        case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE:
+/*      case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT:*/
+        case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT:
+            return 1;
+        default: return 0;
     }
 }
 
 _X_INTERNAL PURE FASTCALL GLint
-__glGetVertexAttribdvNV_size(GLenum e)
+__glGetProgramivNV_size( GLenum e )
 {
-    switch (e) {
-    case GL_ATTRIB_ARRAY_SIZE_NV:
-    case GL_ATTRIB_ARRAY_STRIDE_NV:
-    case GL_ATTRIB_ARRAY_TYPE_NV:
-    case GL_CURRENT_ATTRIB_NV:
-        return 1;
-    default:
-        return 0;
+    switch( e ) {
+        case GL_PROGRAM_LENGTH_NV:
+        case GL_PROGRAM_TARGET_NV:
+        case GL_PROGRAM_RESIDENT_NV:
+            return 1;
+        default: return 0;
     }
 }
 
 _X_INTERNAL PURE FASTCALL GLint
-__glGetFramebufferAttachmentParameterivEXT_size(GLenum e)
+__glGetVertexAttribdvNV_size( GLenum e )
 {
-    switch (e) {
-    case GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT:
-    case GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT:
-    case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT:
-    case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT:
-    case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT:
-        return 1;
-    default:
-        return 0;
+    switch( e ) {
+        case GL_ATTRIB_ARRAY_SIZE_NV:
+        case GL_ATTRIB_ARRAY_STRIDE_NV:
+        case GL_ATTRIB_ARRAY_TYPE_NV:
+        case GL_CURRENT_ATTRIB_NV:
+            return 1;
+        default: return 0;
     }
 }
 
-ALIAS(Fogiv, Fogfv)
-    ALIAS(Lightiv, Lightfv)
-    ALIAS(LightModeliv, LightModelfv)
-    ALIAS(Materialiv, Materialfv)
-    ALIAS(TexParameteriv, TexParameterfv)
-    ALIAS(TexEnviv, TexEnvfv)
-    ALIAS(TexGenfv, TexGendv)
-    ALIAS(TexGeniv, TexGendv)
-    ALIAS(Map1f, Map1d)
-    ALIAS(Map2f, Map2d)
-    ALIAS(GetDoublev, GetBooleanv)
-    ALIAS(GetFloatv, GetBooleanv)
-    ALIAS(GetIntegerv, GetBooleanv)
-    ALIAS(GetLightfv, Lightfv)
-    ALIAS(GetLightiv, Lightfv)
-    ALIAS(GetMaterialfv, Materialfv)
-    ALIAS(GetMaterialiv, Materialfv)
-    ALIAS(GetTexEnvfv, TexEnvfv)
-    ALIAS(GetTexEnviv, TexEnvfv)
-    ALIAS(GetTexGendv, TexGendv)
-    ALIAS(GetTexGenfv, TexGendv)
-    ALIAS(GetTexGeniv, TexGendv)
-    ALIAS(GetTexParameteriv, GetTexParameterfv)
-    ALIAS(GetTexLevelParameteriv, GetTexLevelParameterfv)
-    ALIAS(ColorTableParameteriv, ColorTableParameterfv)
-    ALIAS(GetColorTableParameteriv, GetColorTableParameterfv)
-    ALIAS(ConvolutionParameteriv, ConvolutionParameterfv)
-    ALIAS(GetConvolutionParameteriv, GetConvolutionParameterfv)
-    ALIAS(GetHistogramParameteriv, GetHistogramParameterfv)
-    ALIAS(GetMinmaxParameteriv, GetMinmaxParameterfv)
-    ALIAS(GetVertexAttribfvARB, GetVertexAttribdvARB)
-    ALIAS(GetVertexAttribivARB, GetVertexAttribdvARB)
-    ALIAS(GetQueryObjectuivARB, GetQueryObjectivARB)
-    ALIAS(GetVertexAttribfvNV, GetVertexAttribdvNV)
-    ALIAS(GetVertexAttribivNV, GetVertexAttribdvNV)
-    ALIAS(PointParameterivNV, PointParameterfvEXT)
-#undef PURE
-#undef FASTCALL
+ALIAS( Fogiv, Fogfv )
+ALIAS( Lightiv, Lightfv )
+ALIAS( LightModeliv, LightModelfv )
+ALIAS( Materialiv, Materialfv )
+ALIAS( TexParameteriv, TexParameterfv )
+ALIAS( TexEnviv, TexEnvfv )
+ALIAS( TexGenfv, TexGendv )
+ALIAS( TexGeniv, TexGendv )
+ALIAS( Map1f, Map1d )
+ALIAS( Map2f, Map2d )
+ALIAS( GetDoublev, GetBooleanv )
+ALIAS( GetFloatv, GetBooleanv )
+ALIAS( GetIntegerv, GetBooleanv )
+ALIAS( GetLightfv, Lightfv )
+ALIAS( GetLightiv, Lightfv )
+ALIAS( GetMaterialfv, Materialfv )
+ALIAS( GetMaterialiv, Materialfv )
+ALIAS( GetTexEnvfv, TexEnvfv )
+ALIAS( GetTexEnviv, TexEnvfv )
+ALIAS( GetTexGendv, TexGendv )
+ALIAS( GetTexGenfv, TexGendv )
+ALIAS( GetTexGeniv, TexGendv )
+ALIAS( GetTexParameteriv, GetTexParameterfv )
+ALIAS( GetTexLevelParameteriv, GetTexLevelParameterfv )
+ALIAS( ColorTableParameteriv, ColorTableParameterfv )
+ALIAS( GetColorTableParameteriv, GetColorTableParameterfv )
+ALIAS( ConvolutionParameteriv, ConvolutionParameterfv )
+ALIAS( GetConvolutionParameteriv, GetConvolutionParameterfv )
+ALIAS( GetHistogramParameteriv, GetHistogramParameterfv )
+ALIAS( GetMinmaxParameteriv, GetMinmaxParameterfv )
+ALIAS( PointParameteriv, PointParameterfv )
+ALIAS( GetQueryObjectuiv, GetQueryObjectiv )
+ALIAS( GetVertexAttribfv, GetVertexAttribdv )
+ALIAS( GetVertexAttribiv, GetVertexAttribdv )
+ALIAS( GetVertexAttribfvNV, GetVertexAttribdvNV )
+ALIAS( GetVertexAttribivNV, GetVertexAttribdvNV )
+
+#  undef PURE
+#  undef FASTCALL
diff --git a/xorg-server/glx/indirect_size_get.h b/xorg-server/glx/indirect_size_get.h
index 4cfb3a6ba..8c2027653 100644
--- a/xorg-server/glx/indirect_size_get.h
+++ b/xorg-server/glx/indirect_size_get.h
@@ -26,7 +26,7 @@
  */
 
 #if !defined( _INDIRECT_SIZE_GET_H_ )
-#define _INDIRECT_SIZE_GET_H_
+#  define _INDIRECT_SIZE_GET_H_
 
 /**
  * \file
@@ -38,18 +38,38 @@
 
 #include <X11/Xfuncproto.h>
 
-#if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
-#define PURE __attribute__((pure))
-#else
-#define PURE
-#endif
+#  if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
+#    define PURE __attribute__((pure))
+#  else
+#    define PURE
+#  endif
 
-#if defined(__i386__) && defined(__GNUC__) && !defined(__CYGWIN__) && !defined(__MINGW32__)
-#define FASTCALL __attribute__((fastcall))
-#else
-#define FASTCALL
-#endif
+#  if defined(__i386__) && defined(__GNUC__) && !defined(__CYGWIN__) && !defined(__MINGW32__)
+#    define FASTCALL __attribute__((fastcall))
+#  else
+#    define FASTCALL
+#  endif
 
+extern _X_INTERNAL PURE FASTCALL GLint __glCallLists_size(GLenum);
+extern _X_INTERNAL PURE FASTCALL GLint __glFogfv_size(GLenum);
+extern _X_INTERNAL PURE FASTCALL GLint __glFogiv_size(GLenum);
+extern _X_INTERNAL PURE FASTCALL GLint __glLightfv_size(GLenum);
+extern _X_INTERNAL PURE FASTCALL GLint __glLightiv_size(GLenum);
+extern _X_INTERNAL PURE FASTCALL GLint __glLightModelfv_size(GLenum);
+extern _X_INTERNAL PURE FASTCALL GLint __glLightModeliv_size(GLenum);
+extern _X_INTERNAL PURE FASTCALL GLint __glMaterialfv_size(GLenum);
+extern _X_INTERNAL PURE FASTCALL GLint __glMaterialiv_size(GLenum);
+extern _X_INTERNAL PURE FASTCALL GLint __glTexParameterfv_size(GLenum);
+extern _X_INTERNAL PURE FASTCALL GLint __glTexParameteriv_size(GLenum);
+extern _X_INTERNAL PURE FASTCALL GLint __glTexEnvfv_size(GLenum);
+extern _X_INTERNAL PURE FASTCALL GLint __glTexEnviv_size(GLenum);
+extern _X_INTERNAL PURE FASTCALL GLint __glTexGendv_size(GLenum);
+extern _X_INTERNAL PURE FASTCALL GLint __glTexGenfv_size(GLenum);
+extern _X_INTERNAL PURE FASTCALL GLint __glTexGeniv_size(GLenum);
+extern _X_INTERNAL PURE FASTCALL GLint __glMap1d_size(GLenum);
+extern _X_INTERNAL PURE FASTCALL GLint __glMap1f_size(GLenum);
+extern _X_INTERNAL PURE FASTCALL GLint __glMap2d_size(GLenum);
+extern _X_INTERNAL PURE FASTCALL GLint __glMap2f_size(GLenum);
 extern _X_INTERNAL PURE FASTCALL GLint __glGetBooleanv_size(GLenum);
 extern _X_INTERNAL PURE FASTCALL GLint __glGetDoublev_size(GLenum);
 extern _X_INTERNAL PURE FASTCALL GLint __glGetFloatv_size(GLenum);
@@ -67,33 +87,35 @@ extern _X_INTERNAL PURE FASTCALL GLint __glGetTexParameterfv_size(GLenum);
 extern _X_INTERNAL PURE FASTCALL GLint __glGetTexParameteriv_size(GLenum);
 extern _X_INTERNAL PURE FASTCALL GLint __glGetTexLevelParameterfv_size(GLenum);
 extern _X_INTERNAL PURE FASTCALL GLint __glGetTexLevelParameteriv_size(GLenum);
-extern _X_INTERNAL PURE FASTCALL GLint
-__glGetColorTableParameterfv_size(GLenum);
-extern _X_INTERNAL PURE FASTCALL GLint
-__glGetColorTableParameteriv_size(GLenum);
-extern _X_INTERNAL PURE FASTCALL GLint
-__glGetConvolutionParameterfv_size(GLenum);
-extern _X_INTERNAL PURE FASTCALL GLint
-__glGetConvolutionParameteriv_size(GLenum);
+extern _X_INTERNAL PURE FASTCALL GLint __glGetPointerv_size(GLenum);
+extern _X_INTERNAL PURE FASTCALL GLint __glColorTableParameterfv_size(GLenum);
+extern _X_INTERNAL PURE FASTCALL GLint __glColorTableParameteriv_size(GLenum);
+extern _X_INTERNAL PURE FASTCALL GLint __glGetColorTableParameterfv_size(GLenum);
+extern _X_INTERNAL PURE FASTCALL GLint __glGetColorTableParameteriv_size(GLenum);
+extern _X_INTERNAL PURE FASTCALL GLint __glConvolutionParameterfv_size(GLenum);
+extern _X_INTERNAL PURE FASTCALL GLint __glConvolutionParameteriv_size(GLenum);
+extern _X_INTERNAL PURE FASTCALL GLint __glGetConvolutionParameterfv_size(GLenum);
+extern _X_INTERNAL PURE FASTCALL GLint __glGetConvolutionParameteriv_size(GLenum);
 extern _X_INTERNAL PURE FASTCALL GLint __glGetHistogramParameterfv_size(GLenum);
 extern _X_INTERNAL PURE FASTCALL GLint __glGetHistogramParameteriv_size(GLenum);
 extern _X_INTERNAL PURE FASTCALL GLint __glGetMinmaxParameterfv_size(GLenum);
 extern _X_INTERNAL PURE FASTCALL GLint __glGetMinmaxParameteriv_size(GLenum);
+extern _X_INTERNAL PURE FASTCALL GLint __glPointParameterfv_size(GLenum);
+extern _X_INTERNAL PURE FASTCALL GLint __glPointParameteriv_size(GLenum);
+extern _X_INTERNAL PURE FASTCALL GLint __glGetQueryObjectiv_size(GLenum);
+extern _X_INTERNAL PURE FASTCALL GLint __glGetQueryObjectuiv_size(GLenum);
+extern _X_INTERNAL PURE FASTCALL GLint __glGetQueryiv_size(GLenum);
+extern _X_INTERNAL PURE FASTCALL GLint __glGetVertexAttribdv_size(GLenum);
+extern _X_INTERNAL PURE FASTCALL GLint __glGetVertexAttribfv_size(GLenum);
+extern _X_INTERNAL PURE FASTCALL GLint __glGetVertexAttribiv_size(GLenum);
 extern _X_INTERNAL PURE FASTCALL GLint __glGetProgramivARB_size(GLenum);
-extern _X_INTERNAL PURE FASTCALL GLint __glGetVertexAttribdvARB_size(GLenum);
-extern _X_INTERNAL PURE FASTCALL GLint __glGetVertexAttribfvARB_size(GLenum);
-extern _X_INTERNAL PURE FASTCALL GLint __glGetVertexAttribivARB_size(GLenum);
-extern _X_INTERNAL PURE FASTCALL GLint __glGetQueryObjectivARB_size(GLenum);
-extern _X_INTERNAL PURE FASTCALL GLint __glGetQueryObjectuivARB_size(GLenum);
-extern _X_INTERNAL PURE FASTCALL GLint __glGetQueryivARB_size(GLenum);
+extern _X_INTERNAL PURE FASTCALL GLint __glGetFramebufferAttachmentParameteriv_size(GLenum);
 extern _X_INTERNAL PURE FASTCALL GLint __glGetProgramivNV_size(GLenum);
 extern _X_INTERNAL PURE FASTCALL GLint __glGetVertexAttribdvNV_size(GLenum);
 extern _X_INTERNAL PURE FASTCALL GLint __glGetVertexAttribfvNV_size(GLenum);
 extern _X_INTERNAL PURE FASTCALL GLint __glGetVertexAttribivNV_size(GLenum);
-extern _X_INTERNAL PURE FASTCALL GLint
-__glGetFramebufferAttachmentParameterivEXT_size(GLenum);
 
-#undef PURE
-#undef FASTCALL
+#  undef PURE
+#  undef FASTCALL
 
-#endif                          /* !defined( _INDIRECT_SIZE_GET_H_ ) */
+#endif /* !defined( _INDIRECT_SIZE_GET_H_ ) */
diff --git a/xorg-server/glx/indirect_table.c b/xorg-server/glx/indirect_table.c
index 8922e43fd..4ab3ba3e8 100644
--- a/xorg-server/glx/indirect_table.c
+++ b/xorg-server/glx/indirect_table.c
@@ -25,6 +25,10 @@
  * SOFTWARE.
  */
 
+#ifndef HAVE_DIX_CONFIG_H
+#include "glheader.h"
+#endif
+
 #include <inttypes.h>
 #include "glxserver.h"
 #include "glxext.h"
@@ -78,8 +82,7 @@ static const void *Single_function_table[112][2] = {
     /* [  1] =     1 */ {__glXDisp_Render, __glXDispSwap_Render},
     /* [  2] =     2 */ {__glXDisp_RenderLarge, __glXDispSwap_RenderLarge},
     /* [  3] =     3 */ {__glXDisp_CreateContext, __glXDispSwap_CreateContext},
-    /* [  4] =     4 */ {__glXDisp_DestroyContext,
-                         __glXDispSwap_DestroyContext},
+    /* [  4] =     4 */ {__glXDisp_DestroyContext, __glXDispSwap_DestroyContext},
     /* [  5] =     5 */ {__glXDisp_MakeCurrent, __glXDispSwap_MakeCurrent},
     /* [  6] =     6 */ {__glXDisp_IsDirect, __glXDispSwap_IsDirect},
     /* [  7] =     7 */ {__glXDisp_QueryVersion, __glXDispSwap_QueryVersion},
@@ -88,43 +91,29 @@ static const void *Single_function_table[112][2] = {
     /* [ 10] =    10 */ {__glXDisp_CopyContext, __glXDispSwap_CopyContext},
     /* [ 11] =    11 */ {__glXDisp_SwapBuffers, __glXDispSwap_SwapBuffers},
     /* [ 12] =    12 */ {__glXDisp_UseXFont, __glXDispSwap_UseXFont},
-    /* [ 13] =    13 */ {__glXDisp_CreateGLXPixmap,
-                         __glXDispSwap_CreateGLXPixmap},
-    /* [ 14] =    14 */ {__glXDisp_GetVisualConfigs,
-                         __glXDispSwap_GetVisualConfigs},
-    /* [ 15] =    15 */ {__glXDisp_DestroyGLXPixmap,
-                         __glXDispSwap_DestroyGLXPixmap},
+    /* [ 13] =    13 */ {__glXDisp_CreateGLXPixmap, __glXDispSwap_CreateGLXPixmap},
+    /* [ 14] =    14 */ {__glXDisp_GetVisualConfigs, __glXDispSwap_GetVisualConfigs},
+    /* [ 15] =    15 */ {__glXDisp_DestroyGLXPixmap, __glXDispSwap_DestroyGLXPixmap},
     /* [ 16] =    16 */ {__glXDisp_VendorPrivate, __glXDispSwap_VendorPrivate},
-    /* [ 17] =    17 */ {__glXDisp_VendorPrivateWithReply,
-                         __glXDispSwap_VendorPrivateWithReply},
-    /* [ 18] =    18 */ {__glXDisp_QueryExtensionsString,
-                         __glXDispSwap_QueryExtensionsString},
-    /* [ 19] =    19 */ {__glXDisp_QueryServerString,
-                         __glXDispSwap_QueryServerString},
+    /* [ 17] =    17 */ {__glXDisp_VendorPrivateWithReply, __glXDispSwap_VendorPrivateWithReply},
+    /* [ 18] =    18 */ {__glXDisp_QueryExtensionsString, __glXDispSwap_QueryExtensionsString},
+    /* [ 19] =    19 */ {__glXDisp_QueryServerString, __glXDispSwap_QueryServerString},
     /* [ 20] =    20 */ {__glXDisp_ClientInfo, __glXDispSwap_ClientInfo},
     /* [ 21] =    21 */ {__glXDisp_GetFBConfigs, __glXDispSwap_GetFBConfigs},
     /* [ 22] =    22 */ {__glXDisp_CreatePixmap, __glXDispSwap_CreatePixmap},
     /* [ 23] =    23 */ {__glXDisp_DestroyPixmap, __glXDispSwap_DestroyPixmap},
-    /* [ 24] =    24 */ {__glXDisp_CreateNewContext,
-                         __glXDispSwap_CreateNewContext},
+    /* [ 24] =    24 */ {__glXDisp_CreateNewContext, __glXDispSwap_CreateNewContext},
     /* [ 25] =    25 */ {__glXDisp_QueryContext, __glXDispSwap_QueryContext},
-    /* [ 26] =    26 */ {__glXDisp_MakeContextCurrent,
-                         __glXDispSwap_MakeContextCurrent},
+    /* [ 26] =    26 */ {__glXDisp_MakeContextCurrent, __glXDispSwap_MakeContextCurrent},
     /* [ 27] =    27 */ {__glXDisp_CreatePbuffer, __glXDispSwap_CreatePbuffer},
-    /* [ 28] =    28 */ {__glXDisp_DestroyPbuffer,
-                         __glXDispSwap_DestroyPbuffer},
-    /* [ 29] =    29 */ {__glXDisp_GetDrawableAttributes,
-                         __glXDispSwap_GetDrawableAttributes},
-    /* [ 30] =    30 */ {__glXDisp_ChangeDrawableAttributes,
-                         __glXDispSwap_ChangeDrawableAttributes},
+    /* [ 28] =    28 */ {__glXDisp_DestroyPbuffer, __glXDispSwap_DestroyPbuffer},
+    /* [ 29] =    29 */ {__glXDisp_GetDrawableAttributes, __glXDispSwap_GetDrawableAttributes},
+    /* [ 30] =    30 */ {__glXDisp_ChangeDrawableAttributes, __glXDispSwap_ChangeDrawableAttributes},
     /* [ 31] =    31 */ {__glXDisp_CreateWindow, __glXDispSwap_CreateWindow},
     /* [ 32] =    32 */ {__glXDisp_DestroyWindow, __glXDispSwap_DestroyWindow},
-    /* [ 33] =    33 */ {__glXDisp_SetClientInfoARB,
-                         __glXDispSwap_SetClientInfoARB},
-    /* [ 34] =    34 */ {__glXDisp_CreateContextAttribsARB,
-                         __glXDispSwap_CreateContextAttribsARB},
-    /* [ 35] =    35 */ {__glXDisp_SetClientInfo2ARB,
-                         __glXDispSwap_SetClientInfo2ARB},
+    /* [ 33] =    33 */ {NULL, NULL},
+    /* [ 34] =    34 */ {NULL, NULL},
+    /* [ 35] =    35 */ {NULL, NULL},
     /* [ 36] =    36 */ {NULL, NULL},
     /* [ 37] =    37 */ {NULL, NULL},
     /* [ 38] =    38 */ {NULL, NULL},
@@ -138,8 +127,7 @@ static const void *Single_function_table[112][2] = {
     /* [ 46] =   102 */ {__glXDisp_EndList, __glXDispSwap_EndList},
     /* [ 47] =   103 */ {__glXDisp_DeleteLists, __glXDispSwap_DeleteLists},
     /* [ 48] =   104 */ {__glXDisp_GenLists, __glXDispSwap_GenLists},
-    /* [ 49] =   105 */ {__glXDisp_FeedbackBuffer,
-                         __glXDispSwap_FeedbackBuffer},
+    /* [ 49] =   105 */ {__glXDisp_FeedbackBuffer, __glXDispSwap_FeedbackBuffer},
     /* [ 50] =   106 */ {__glXDisp_SelectBuffer, __glXDispSwap_SelectBuffer},
     /* [ 51] =   107 */ {__glXDisp_RenderMode, __glXDispSwap_RenderMode},
     /* [ 52] =   108 */ {__glXDisp_Finish, __glXDispSwap_Finish},
@@ -160,12 +148,9 @@ static const void *Single_function_table[112][2] = {
     /* [ 67] =   123 */ {__glXDisp_GetMaterialfv, __glXDispSwap_GetMaterialfv},
     /* [ 68] =   124 */ {__glXDisp_GetMaterialiv, __glXDispSwap_GetMaterialiv},
     /* [ 69] =   125 */ {__glXDisp_GetPixelMapfv, __glXDispSwap_GetPixelMapfv},
-    /* [ 70] =   126 */ {__glXDisp_GetPixelMapuiv,
-                         __glXDispSwap_GetPixelMapuiv},
-    /* [ 71] =   127 */ {__glXDisp_GetPixelMapusv,
-                         __glXDispSwap_GetPixelMapusv},
-    /* [ 72] =   128 */ {__glXDisp_GetPolygonStipple,
-                         __glXDispSwap_GetPolygonStipple},
+    /* [ 70] =   126 */ {__glXDisp_GetPixelMapuiv, __glXDispSwap_GetPixelMapuiv},
+    /* [ 71] =   127 */ {__glXDisp_GetPixelMapusv, __glXDispSwap_GetPixelMapusv},
+    /* [ 72] =   128 */ {__glXDisp_GetPolygonStipple, __glXDispSwap_GetPolygonStipple},
     /* [ 73] =   129 */ {__glXDisp_GetString, __glXDispSwap_GetString},
     /* [ 74] =   130 */ {__glXDisp_GetTexEnvfv, __glXDispSwap_GetTexEnvfv},
     /* [ 75] =   131 */ {__glXDisp_GetTexEnviv, __glXDispSwap_GetTexEnviv},
@@ -173,57 +158,37 @@ static const void *Single_function_table[112][2] = {
     /* [ 77] =   133 */ {__glXDisp_GetTexGenfv, __glXDispSwap_GetTexGenfv},
     /* [ 78] =   134 */ {__glXDisp_GetTexGeniv, __glXDispSwap_GetTexGeniv},
     /* [ 79] =   135 */ {__glXDisp_GetTexImage, __glXDispSwap_GetTexImage},
-    /* [ 80] =   136 */ {__glXDisp_GetTexParameterfv,
-                         __glXDispSwap_GetTexParameterfv},
-    /* [ 81] =   137 */ {__glXDisp_GetTexParameteriv,
-                         __glXDispSwap_GetTexParameteriv},
-    /* [ 82] =   138 */ {__glXDisp_GetTexLevelParameterfv,
-                         __glXDispSwap_GetTexLevelParameterfv},
-    /* [ 83] =   139 */ {__glXDisp_GetTexLevelParameteriv,
-                         __glXDispSwap_GetTexLevelParameteriv},
+    /* [ 80] =   136 */ {__glXDisp_GetTexParameterfv, __glXDispSwap_GetTexParameterfv},
+    /* [ 81] =   137 */ {__glXDisp_GetTexParameteriv, __glXDispSwap_GetTexParameteriv},
+    /* [ 82] =   138 */ {__glXDisp_GetTexLevelParameterfv, __glXDispSwap_GetTexLevelParameterfv},
+    /* [ 83] =   139 */ {__glXDisp_GetTexLevelParameteriv, __glXDispSwap_GetTexLevelParameteriv},
     /* [ 84] =   140 */ {__glXDisp_IsEnabled, __glXDispSwap_IsEnabled},
     /* [ 85] =   141 */ {__glXDisp_IsList, __glXDispSwap_IsList},
     /* [ 86] =   142 */ {__glXDisp_Flush, __glXDispSwap_Flush},
-    /* [ 87] =   143 */ {__glXDisp_AreTexturesResident,
-                         __glXDispSwap_AreTexturesResident},
-    /* [ 88] =   144 */ {__glXDisp_DeleteTextures,
-                         __glXDispSwap_DeleteTextures},
+    /* [ 87] =   143 */ {__glXDisp_AreTexturesResident, __glXDispSwap_AreTexturesResident},
+    /* [ 88] =   144 */ {__glXDisp_DeleteTextures, __glXDispSwap_DeleteTextures},
     /* [ 89] =   145 */ {__glXDisp_GenTextures, __glXDispSwap_GenTextures},
     /* [ 90] =   146 */ {__glXDisp_IsTexture, __glXDispSwap_IsTexture},
     /* [ 91] =   147 */ {__glXDisp_GetColorTable, __glXDispSwap_GetColorTable},
-    /* [ 92] =   148 */ {__glXDisp_GetColorTableParameterfv,
-                         __glXDispSwap_GetColorTableParameterfv},
-    /* [ 93] =   149 */ {__glXDisp_GetColorTableParameteriv,
-                         __glXDispSwap_GetColorTableParameteriv},
-    /* [ 94] =   150 */ {__glXDisp_GetConvolutionFilter,
-                         __glXDispSwap_GetConvolutionFilter},
-    /* [ 95] =   151 */ {__glXDisp_GetConvolutionParameterfv,
-                         __glXDispSwap_GetConvolutionParameterfv},
-    /* [ 96] =   152 */ {__glXDisp_GetConvolutionParameteriv,
-                         __glXDispSwap_GetConvolutionParameteriv},
-    /* [ 97] =   153 */ {__glXDisp_GetSeparableFilter,
-                         __glXDispSwap_GetSeparableFilter},
+    /* [ 92] =   148 */ {__glXDisp_GetColorTableParameterfv, __glXDispSwap_GetColorTableParameterfv},
+    /* [ 93] =   149 */ {__glXDisp_GetColorTableParameteriv, __glXDispSwap_GetColorTableParameteriv},
+    /* [ 94] =   150 */ {__glXDisp_GetConvolutionFilter, __glXDispSwap_GetConvolutionFilter},
+    /* [ 95] =   151 */ {__glXDisp_GetConvolutionParameterfv, __glXDispSwap_GetConvolutionParameterfv},
+    /* [ 96] =   152 */ {__glXDisp_GetConvolutionParameteriv, __glXDispSwap_GetConvolutionParameteriv},
+    /* [ 97] =   153 */ {__glXDisp_GetSeparableFilter, __glXDispSwap_GetSeparableFilter},
     /* [ 98] =   154 */ {__glXDisp_GetHistogram, __glXDispSwap_GetHistogram},
-    /* [ 99] =   155 */ {__glXDisp_GetHistogramParameterfv,
-                         __glXDispSwap_GetHistogramParameterfv},
-    /* [ 100] =   156 */ {__glXDisp_GetHistogramParameteriv,
-                          __glXDispSwap_GetHistogramParameteriv},
+    /* [ 99] =   155 */ {__glXDisp_GetHistogramParameterfv, __glXDispSwap_GetHistogramParameterfv},
+    /* [ 100] =   156 */ {__glXDisp_GetHistogramParameteriv, __glXDispSwap_GetHistogramParameteriv},
     /* [ 101] =   157 */ {__glXDisp_GetMinmax, __glXDispSwap_GetMinmax},
-    /* [ 102] =   158 */ {__glXDisp_GetMinmaxParameterfv,
-                          __glXDispSwap_GetMinmaxParameterfv},
-    /* [ 103] =   159 */ {__glXDisp_GetMinmaxParameteriv,
-                          __glXDispSwap_GetMinmaxParameteriv},
-    /* [ 104] =   160 */ {__glXDisp_GetCompressedTexImageARB,
-                          __glXDispSwap_GetCompressedTexImageARB},
-    /* [ 105] =   161 */ {__glXDisp_DeleteQueriesARB,
-                          __glXDispSwap_DeleteQueriesARB},
-    /* [ 106] =   162 */ {__glXDisp_GenQueriesARB, __glXDispSwap_GenQueriesARB},
-    /* [ 107] =   163 */ {__glXDisp_IsQueryARB, __glXDispSwap_IsQueryARB},
-    /* [ 108] =   164 */ {__glXDisp_GetQueryivARB, __glXDispSwap_GetQueryivARB},
-    /* [ 109] =   165 */ {__glXDisp_GetQueryObjectivARB,
-                          __glXDispSwap_GetQueryObjectivARB},
-    /* [ 110] =   166 */ {__glXDisp_GetQueryObjectuivARB,
-                          __glXDispSwap_GetQueryObjectuivARB},
+    /* [ 102] =   158 */ {__glXDisp_GetMinmaxParameterfv, __glXDispSwap_GetMinmaxParameterfv},
+    /* [ 103] =   159 */ {__glXDisp_GetMinmaxParameteriv, __glXDispSwap_GetMinmaxParameteriv},
+    /* [ 104] =   160 */ {__glXDisp_GetCompressedTexImage, __glXDispSwap_GetCompressedTexImage},
+    /* [ 105] =   161 */ {__glXDisp_DeleteQueries, __glXDispSwap_DeleteQueries},
+    /* [ 106] =   162 */ {__glXDisp_GenQueries, __glXDispSwap_GenQueries},
+    /* [ 107] =   163 */ {__glXDisp_IsQuery, __glXDispSwap_IsQuery},
+    /* [ 108] =   164 */ {__glXDisp_GetQueryiv, __glXDispSwap_GetQueryiv},
+    /* [ 109] =   165 */ {__glXDisp_GetQueryObjectiv, __glXDispSwap_GetQueryObjectiv},
+    /* [ 110] =   166 */ {__glXDisp_GetQueryObjectuiv, __glXDispSwap_GetQueryObjectuiv},
     /* [ 111] =   167 */ {NULL, NULL},
 };
 
@@ -475,16 +440,13 @@ static const void *Render_function_table[408][2] = {
     /* [ 99] =    99 */ {__glXDisp_Materialiv, __glXDispSwap_Materialiv},
     /* [ 100] =   100 */ {__glXDisp_PointSize, __glXDispSwap_PointSize},
     /* [ 101] =   101 */ {__glXDisp_PolygonMode, __glXDispSwap_PolygonMode},
-    /* [ 102] =   102 */ {__glXDisp_PolygonStipple,
-                          __glXDispSwap_PolygonStipple},
+    /* [ 102] =   102 */ {__glXDisp_PolygonStipple, __glXDispSwap_PolygonStipple},
     /* [ 103] =   103 */ {__glXDisp_Scissor, __glXDispSwap_Scissor},
     /* [ 104] =   104 */ {__glXDisp_ShadeModel, __glXDispSwap_ShadeModel},
     /* [ 105] =   105 */ {__glXDisp_TexParameterf, __glXDispSwap_TexParameterf},
-    /* [ 106] =   106 */ {__glXDisp_TexParameterfv,
-                          __glXDispSwap_TexParameterfv},
+    /* [ 106] =   106 */ {__glXDisp_TexParameterfv, __glXDispSwap_TexParameterfv},
     /* [ 107] =   107 */ {__glXDisp_TexParameteri, __glXDispSwap_TexParameteri},
-    /* [ 108] =   108 */ {__glXDisp_TexParameteriv,
-                          __glXDispSwap_TexParameteriv},
+    /* [ 108] =   108 */ {__glXDisp_TexParameteriv, __glXDispSwap_TexParameteriv},
     /* [ 109] =   109 */ {__glXDisp_TexImage1D, __glXDispSwap_TexImage1D},
     /* [ 110] =   110 */ {__glXDisp_TexImage2D, __glXDispSwap_TexImage2D},
     /* [ 111] =   111 */ {__glXDisp_TexEnvf, __glXDispSwap_TexEnvf},
@@ -542,10 +504,8 @@ static const void *Render_function_table[408][2] = {
     /* [ 163] =   163 */ {__glXDisp_StencilOp, __glXDispSwap_StencilOp},
     /* [ 164] =   164 */ {__glXDisp_DepthFunc, __glXDispSwap_DepthFunc},
     /* [ 165] =   165 */ {__glXDisp_PixelZoom, __glXDispSwap_PixelZoom},
-    /* [ 166] =   166 */ {__glXDisp_PixelTransferf,
-                          __glXDispSwap_PixelTransferf},
-    /* [ 167] =   167 */ {__glXDisp_PixelTransferi,
-                          __glXDispSwap_PixelTransferi},
+    /* [ 166] =   166 */ {__glXDisp_PixelTransferf, __glXDispSwap_PixelTransferf},
+    /* [ 167] =   167 */ {__glXDisp_PixelTransferi, __glXDispSwap_PixelTransferi},
     /* [ 168] =   168 */ {__glXDisp_PixelMapfv, __glXDispSwap_PixelMapfv},
     /* [ 169] =   169 */ {__glXDisp_PixelMapuiv, __glXDispSwap_PixelMapuiv},
     /* [ 170] =   170 */ {__glXDisp_PixelMapusv, __glXDispSwap_PixelMapusv},
@@ -574,54 +534,30 @@ static const void *Render_function_table[408][2] = {
     /* [ 193] =   193 */ {__glXDisp_DrawArrays, __glXDispSwap_DrawArrays},
     /* [ 194] =   194 */ {__glXDisp_Indexubv, __glXDispSwap_Indexubv},
     /* [ 195] =   195 */ {__glXDisp_ColorSubTable, __glXDispSwap_ColorSubTable},
-    /* [ 196] =   196 */ {__glXDisp_CopyColorSubTable,
-                          __glXDispSwap_CopyColorSubTable},
-    /* [ 197] =   197 */ {__glXDisp_ActiveTextureARB,
-                          __glXDispSwap_ActiveTextureARB},
-    /* [ 198] =   198 */ {__glXDisp_MultiTexCoord1dvARB,
-                          __glXDispSwap_MultiTexCoord1dvARB},
-    /* [ 199] =   199 */ {__glXDisp_MultiTexCoord1fvARB,
-                          __glXDispSwap_MultiTexCoord1fvARB},
-    /* [ 200] =   200 */ {__glXDisp_MultiTexCoord1ivARB,
-                          __glXDispSwap_MultiTexCoord1ivARB},
-    /* [ 201] =   201 */ {__glXDisp_MultiTexCoord1svARB,
-                          __glXDispSwap_MultiTexCoord1svARB},
-    /* [ 202] =   202 */ {__glXDisp_MultiTexCoord2dvARB,
-                          __glXDispSwap_MultiTexCoord2dvARB},
-    /* [ 203] =   203 */ {__glXDisp_MultiTexCoord2fvARB,
-                          __glXDispSwap_MultiTexCoord2fvARB},
-    /* [ 204] =   204 */ {__glXDisp_MultiTexCoord2ivARB,
-                          __glXDispSwap_MultiTexCoord2ivARB},
-    /* [ 205] =   205 */ {__glXDisp_MultiTexCoord2svARB,
-                          __glXDispSwap_MultiTexCoord2svARB},
-    /* [ 206] =   206 */ {__glXDisp_MultiTexCoord3dvARB,
-                          __glXDispSwap_MultiTexCoord3dvARB},
-    /* [ 207] =   207 */ {__glXDisp_MultiTexCoord3fvARB,
-                          __glXDispSwap_MultiTexCoord3fvARB},
-    /* [ 208] =   208 */ {__glXDisp_MultiTexCoord3ivARB,
-                          __glXDispSwap_MultiTexCoord3ivARB},
-    /* [ 209] =   209 */ {__glXDisp_MultiTexCoord3svARB,
-                          __glXDispSwap_MultiTexCoord3svARB},
-    /* [ 210] =   210 */ {__glXDisp_MultiTexCoord4dvARB,
-                          __glXDispSwap_MultiTexCoord4dvARB},
-    /* [ 211] =   211 */ {__glXDisp_MultiTexCoord4fvARB,
-                          __glXDispSwap_MultiTexCoord4fvARB},
-    /* [ 212] =   212 */ {__glXDisp_MultiTexCoord4ivARB,
-                          __glXDispSwap_MultiTexCoord4ivARB},
-    /* [ 213] =   213 */ {__glXDisp_MultiTexCoord4svARB,
-                          __glXDispSwap_MultiTexCoord4svARB},
-    /* [ 214] =   214 */ {__glXDisp_CompressedTexImage1DARB,
-                          __glXDispSwap_CompressedTexImage1DARB},
-    /* [ 215] =   215 */ {__glXDisp_CompressedTexImage2DARB,
-                          __glXDispSwap_CompressedTexImage2DARB},
-    /* [ 216] =   216 */ {__glXDisp_CompressedTexImage3DARB,
-                          __glXDispSwap_CompressedTexImage3DARB},
-    /* [ 217] =   217 */ {__glXDisp_CompressedTexSubImage1DARB,
-                          __glXDispSwap_CompressedTexSubImage1DARB},
-    /* [ 218] =   218 */ {__glXDisp_CompressedTexSubImage2DARB,
-                          __glXDispSwap_CompressedTexSubImage2DARB},
-    /* [ 219] =   219 */ {__glXDisp_CompressedTexSubImage3DARB,
-                          __glXDispSwap_CompressedTexSubImage3DARB},
+    /* [ 196] =   196 */ {__glXDisp_CopyColorSubTable, __glXDispSwap_CopyColorSubTable},
+    /* [ 197] =   197 */ {__glXDisp_ActiveTexture, __glXDispSwap_ActiveTexture},
+    /* [ 198] =   198 */ {__glXDisp_MultiTexCoord1dv, __glXDispSwap_MultiTexCoord1dv},
+    /* [ 199] =   199 */ {__glXDisp_MultiTexCoord1fvARB, __glXDispSwap_MultiTexCoord1fvARB},
+    /* [ 200] =   200 */ {__glXDisp_MultiTexCoord1iv, __glXDispSwap_MultiTexCoord1iv},
+    /* [ 201] =   201 */ {__glXDisp_MultiTexCoord1sv, __glXDispSwap_MultiTexCoord1sv},
+    /* [ 202] =   202 */ {__glXDisp_MultiTexCoord2dv, __glXDispSwap_MultiTexCoord2dv},
+    /* [ 203] =   203 */ {__glXDisp_MultiTexCoord2fvARB, __glXDispSwap_MultiTexCoord2fvARB},
+    /* [ 204] =   204 */ {__glXDisp_MultiTexCoord2iv, __glXDispSwap_MultiTexCoord2iv},
+    /* [ 205] =   205 */ {__glXDisp_MultiTexCoord2sv, __glXDispSwap_MultiTexCoord2sv},
+    /* [ 206] =   206 */ {__glXDisp_MultiTexCoord3dv, __glXDispSwap_MultiTexCoord3dv},
+    /* [ 207] =   207 */ {__glXDisp_MultiTexCoord3fvARB, __glXDispSwap_MultiTexCoord3fvARB},
+    /* [ 208] =   208 */ {__glXDisp_MultiTexCoord3iv, __glXDispSwap_MultiTexCoord3iv},
+    /* [ 209] =   209 */ {__glXDisp_MultiTexCoord3sv, __glXDispSwap_MultiTexCoord3sv},
+    /* [ 210] =   210 */ {__glXDisp_MultiTexCoord4dv, __glXDispSwap_MultiTexCoord4dv},
+    /* [ 211] =   211 */ {__glXDisp_MultiTexCoord4fvARB, __glXDispSwap_MultiTexCoord4fvARB},
+    /* [ 212] =   212 */ {__glXDisp_MultiTexCoord4iv, __glXDispSwap_MultiTexCoord4iv},
+    /* [ 213] =   213 */ {__glXDisp_MultiTexCoord4sv, __glXDispSwap_MultiTexCoord4sv},
+    /* [ 214] =   214 */ {__glXDisp_CompressedTexImage1D, __glXDispSwap_CompressedTexImage1D},
+    /* [ 215] =   215 */ {__glXDisp_CompressedTexImage2D, __glXDispSwap_CompressedTexImage2D},
+    /* [ 216] =   216 */ {__glXDisp_CompressedTexImage3D, __glXDispSwap_CompressedTexImage3D},
+    /* [ 217] =   217 */ {__glXDisp_CompressedTexSubImage1D, __glXDispSwap_CompressedTexSubImage1D},
+    /* [ 218] =   218 */ {__glXDisp_CompressedTexSubImage2D, __glXDispSwap_CompressedTexSubImage2D},
+    /* [ 219] =   219 */ {__glXDisp_CompressedTexSubImage3D, __glXDispSwap_CompressedTexSubImage3D},
     /* [ 220] =   220 */ {NULL, NULL},
     /* [ 221] =   221 */ {NULL, NULL},
     /* [ 222] =   222 */ {NULL, NULL},
@@ -631,35 +567,26 @@ static const void *Render_function_table[408][2] = {
     /* [ 226] =   226 */ {NULL, NULL},
     /* [ 227] =   227 */ {NULL, NULL},
     /* [ 228] =   228 */ {NULL, NULL},
-    /* [ 229] =   229 */ {__glXDisp_SampleCoverageARB,
-                          __glXDispSwap_SampleCoverageARB},
-    /* [ 230] =   230 */ {__glXDisp_WindowPos3fvMESA,
-                          __glXDispSwap_WindowPos3fvMESA},
-    /* [ 231] =   231 */ {__glXDisp_BeginQueryARB, __glXDispSwap_BeginQueryARB},
-    /* [ 232] =   232 */ {__glXDisp_EndQueryARB, __glXDispSwap_EndQueryARB},
-    /* [ 233] =   233 */ {__glXDisp_DrawBuffersARB,
-                          __glXDispSwap_DrawBuffersARB},
-    /* [ 234] =   234 */ {__glXDisp_ClampColorARB, __glXDispSwap_ClampColorARB},
+    /* [ 229] =   229 */ {__glXDisp_SampleCoverage, __glXDispSwap_SampleCoverage},
+    /* [ 230] =   230 */ {__glXDisp_WindowPos3fv, __glXDispSwap_WindowPos3fv},
+    /* [ 231] =   231 */ {__glXDisp_BeginQuery, __glXDispSwap_BeginQuery},
+    /* [ 232] =   232 */ {__glXDisp_EndQuery, __glXDispSwap_EndQuery},
+    /* [ 233] =   233 */ {__glXDisp_DrawBuffers, __glXDispSwap_DrawBuffers},
+    /* [ 234] =   234 */ {__glXDisp_ClampColor, __glXDispSwap_ClampColor},
     /* [ 235] =   235 */ {NULL, NULL},
     /* [ 236] =   236 */ {NULL, NULL},
-    /* [ 237] =   237 */ {__glXDisp_FramebufferTextureLayerEXT,
-                          __glXDispSwap_FramebufferTextureLayerEXT},
+    /* [ 237] =   237 */ {__glXDisp_FramebufferTextureLayer, __glXDispSwap_FramebufferTextureLayer},
     /* [ 238] =   238 */ {NULL, NULL},
     /* [ 239] =   239 */ {NULL, NULL},
-    /* [ 240] =  2048 */ {__glXDisp_SampleMaskSGIS,
-                          __glXDispSwap_SampleMaskSGIS},
-    /* [ 241] =  2049 */ {__glXDisp_SamplePatternSGIS,
-                          __glXDispSwap_SamplePatternSGIS},
+    /* [ 240] =  2048 */ {__glXDisp_SampleMaskSGIS, __glXDispSwap_SampleMaskSGIS},
+    /* [ 241] =  2049 */ {__glXDisp_SamplePatternSGIS, __glXDispSwap_SamplePatternSGIS},
     /* [ 242] =  2050 */ {NULL, NULL},
     /* [ 243] =  2051 */ {NULL, NULL},
     /* [ 244] =  2052 */ {NULL, NULL},
     /* [ 245] =  2053 */ {__glXDisp_ColorTable, __glXDispSwap_ColorTable},
-    /* [ 246] =  2054 */ {__glXDisp_ColorTableParameterfv,
-                          __glXDispSwap_ColorTableParameterfv},
-    /* [ 247] =  2055 */ {__glXDisp_ColorTableParameteriv,
-                          __glXDispSwap_ColorTableParameteriv},
-    /* [ 248] =  2056 */ {__glXDisp_CopyColorTable,
-                          __glXDispSwap_CopyColorTable},
+    /* [ 246] =  2054 */ {__glXDisp_ColorTableParameterfv, __glXDispSwap_ColorTableParameterfv},
+    /* [ 247] =  2055 */ {__glXDisp_ColorTableParameteriv, __glXDispSwap_ColorTableParameteriv},
+    /* [ 248] =  2056 */ {__glXDisp_CopyColorTable, __glXDispSwap_CopyColorTable},
     /* [ 249] =  2057 */ {NULL, NULL},
     /* [ 250] =  2058 */ {NULL, NULL},
     /* [ 251] =  2059 */ {NULL, NULL},
@@ -668,10 +595,8 @@ static const void *Render_function_table[408][2] = {
     /* [ 254] =  2062 */ {NULL, NULL},
     /* [ 255] =  2063 */ {NULL, NULL},
     /* [ 256] =  2064 */ {NULL, NULL},
-    /* [ 257] =  2065 */ {__glXDisp_PointParameterfEXT,
-                          __glXDispSwap_PointParameterfEXT},
-    /* [ 258] =  2066 */ {__glXDisp_PointParameterfvEXT,
-                          __glXDispSwap_PointParameterfvEXT},
+    /* [ 257] =  2065 */ {__glXDisp_PointParameterf, __glXDispSwap_PointParameterf},
+    /* [ 258] =  2066 */ {__glXDisp_PointParameterfv, __glXDispSwap_PointParameterfv},
     /* [ 259] =  2067 */ {NULL, NULL},
     /* [ 260] =  2068 */ {NULL, NULL},
     /* [ 261] =  2069 */ {NULL, NULL},
@@ -682,734 +607,633 @@ static const void *Render_function_table[408][2] = {
     /* [ 266] =  4098 */ {NULL, NULL},
     /* [ 267] =  4099 */ {__glXDisp_TexSubImage1D, __glXDispSwap_TexSubImage1D},
     /* [ 268] =  4100 */ {__glXDisp_TexSubImage2D, __glXDispSwap_TexSubImage2D},
-    /* [ 269] =  4101 */ {__glXDisp_ConvolutionFilter1D,
-                          __glXDispSwap_ConvolutionFilter1D},
-    /* [ 270] =  4102 */ {__glXDisp_ConvolutionFilter2D,
-                          __glXDispSwap_ConvolutionFilter2D},
-    /* [ 271] =  4103 */ {__glXDisp_ConvolutionParameterf,
-                          __glXDispSwap_ConvolutionParameterf},
-    /* [ 272] =  4104 */ {__glXDisp_ConvolutionParameterfv,
-                          __glXDispSwap_ConvolutionParameterfv},
-    /* [ 273] =  4105 */ {__glXDisp_ConvolutionParameteri,
-                          __glXDispSwap_ConvolutionParameteri},
-    /* [ 274] =  4106 */ {__glXDisp_ConvolutionParameteriv,
-                          __glXDispSwap_ConvolutionParameteriv},
-    /* [ 275] =  4107 */ {__glXDisp_CopyConvolutionFilter1D,
-                          __glXDispSwap_CopyConvolutionFilter1D},
-    /* [ 276] =  4108 */ {__glXDisp_CopyConvolutionFilter2D,
-                          __glXDispSwap_CopyConvolutionFilter2D},
-    /* [ 277] =  4109 */ {__glXDisp_SeparableFilter2D,
-                          __glXDispSwap_SeparableFilter2D},
+    /* [ 269] =  4101 */ {__glXDisp_ConvolutionFilter1D, __glXDispSwap_ConvolutionFilter1D},
+    /* [ 270] =  4102 */ {__glXDisp_ConvolutionFilter2D, __glXDispSwap_ConvolutionFilter2D},
+    /* [ 271] =  4103 */ {__glXDisp_ConvolutionParameterf, __glXDispSwap_ConvolutionParameterf},
+    /* [ 272] =  4104 */ {__glXDisp_ConvolutionParameterfv, __glXDispSwap_ConvolutionParameterfv},
+    /* [ 273] =  4105 */ {__glXDisp_ConvolutionParameteri, __glXDispSwap_ConvolutionParameteri},
+    /* [ 274] =  4106 */ {__glXDisp_ConvolutionParameteriv, __glXDispSwap_ConvolutionParameteriv},
+    /* [ 275] =  4107 */ {__glXDisp_CopyConvolutionFilter1D, __glXDispSwap_CopyConvolutionFilter1D},
+    /* [ 276] =  4108 */ {__glXDisp_CopyConvolutionFilter2D, __glXDispSwap_CopyConvolutionFilter2D},
+    /* [ 277] =  4109 */ {__glXDisp_SeparableFilter2D, __glXDispSwap_SeparableFilter2D},
     /* [ 278] =  4110 */ {__glXDisp_Histogram, __glXDispSwap_Histogram},
     /* [ 279] =  4111 */ {__glXDisp_Minmax, __glXDispSwap_Minmax},
-    /* [ 280] =  4112 */ {__glXDisp_ResetHistogram,
-                          __glXDispSwap_ResetHistogram},
+    /* [ 280] =  4112 */ {__glXDisp_ResetHistogram, __glXDispSwap_ResetHistogram},
     /* [ 281] =  4113 */ {__glXDisp_ResetMinmax, __glXDispSwap_ResetMinmax},
     /* [ 282] =  4114 */ {__glXDisp_TexImage3D, __glXDispSwap_TexImage3D},
     /* [ 283] =  4115 */ {__glXDisp_TexSubImage3D, __glXDispSwap_TexSubImage3D},
     /* [ 284] =  4116 */ {NULL, NULL},
     /* [ 285] =  4117 */ {__glXDisp_BindTexture, __glXDispSwap_BindTexture},
-    /* [ 286] =  4118 */ {__glXDisp_PrioritizeTextures,
-                          __glXDispSwap_PrioritizeTextures},
-    /* [ 287] =  4119 */ {__glXDisp_CopyTexImage1D,
-                          __glXDispSwap_CopyTexImage1D},
-    /* [ 288] =  4120 */ {__glXDisp_CopyTexImage2D,
-                          __glXDispSwap_CopyTexImage2D},
-    /* [ 289] =  4121 */ {__glXDisp_CopyTexSubImage1D,
-                          __glXDispSwap_CopyTexSubImage1D},
-    /* [ 290] =  4122 */ {__glXDisp_CopyTexSubImage2D,
-                          __glXDispSwap_CopyTexSubImage2D},
-    /* [ 291] =  4123 */ {__glXDisp_CopyTexSubImage3D,
-                          __glXDispSwap_CopyTexSubImage3D},
+    /* [ 286] =  4118 */ {__glXDisp_PrioritizeTextures, __glXDispSwap_PrioritizeTextures},
+    /* [ 287] =  4119 */ {__glXDisp_CopyTexImage1D, __glXDispSwap_CopyTexImage1D},
+    /* [ 288] =  4120 */ {__glXDisp_CopyTexImage2D, __glXDispSwap_CopyTexImage2D},
+    /* [ 289] =  4121 */ {__glXDisp_CopyTexSubImage1D, __glXDispSwap_CopyTexSubImage1D},
+    /* [ 290] =  4122 */ {__glXDisp_CopyTexSubImage2D, __glXDispSwap_CopyTexSubImage2D},
+    /* [ 291] =  4123 */ {__glXDisp_CopyTexSubImage3D, __glXDispSwap_CopyTexSubImage3D},
     /* [ 292] =  4124 */ {__glXDisp_FogCoordfvEXT, __glXDispSwap_FogCoordfvEXT},
-    /* [ 293] =  4125 */ {__glXDisp_FogCoorddvEXT, __glXDispSwap_FogCoorddvEXT},
-    /* [ 294] =  4126 */ {__glXDisp_SecondaryColor3bvEXT,
-                          __glXDispSwap_SecondaryColor3bvEXT},
-    /* [ 295] =  4127 */ {__glXDisp_SecondaryColor3svEXT,
-                          __glXDispSwap_SecondaryColor3svEXT},
+    /* [ 293] =  4125 */ {__glXDisp_FogCoorddv, __glXDispSwap_FogCoorddv},
+    /* [ 294] =  4126 */ {__glXDisp_SecondaryColor3bv, __glXDispSwap_SecondaryColor3bv},
+    /* [ 295] =  4127 */ {__glXDisp_SecondaryColor3sv, __glXDispSwap_SecondaryColor3sv},
     /* [ 296] =  4176 */ {NULL, NULL},
     /* [ 297] =  4177 */ {NULL, NULL},
     /* [ 298] =  4178 */ {NULL, NULL},
     /* [ 299] =  4179 */ {NULL, NULL},
-    /* [ 300] =  4180 */ {__glXDisp_BindProgramNV, __glXDispSwap_BindProgramNV},
-    /* [ 301] =  4181 */ {__glXDisp_ExecuteProgramNV,
-                          __glXDispSwap_ExecuteProgramNV},
-    /* [ 302] =  4182 */ {__glXDisp_RequestResidentProgramsNV,
-                          __glXDispSwap_RequestResidentProgramsNV},
+    /* [ 300] =  4180 */ {__glXDisp_BindProgramARB, __glXDispSwap_BindProgramARB},
+    /* [ 301] =  4181 */ {__glXDisp_ExecuteProgramNV, __glXDispSwap_ExecuteProgramNV},
+    /* [ 302] =  4182 */ {__glXDisp_RequestResidentProgramsNV, __glXDispSwap_RequestResidentProgramsNV},
     /* [ 303] =  4183 */ {__glXDisp_LoadProgramNV, __glXDispSwap_LoadProgramNV},
-    /* [ 304] =  4184 */ {__glXDisp_ProgramEnvParameter4fvARB,
-                          __glXDispSwap_ProgramEnvParameter4fvARB},
-    /* [ 305] =  4185 */ {__glXDisp_ProgramEnvParameter4dvARB,
-                          __glXDispSwap_ProgramEnvParameter4dvARB},
-    /* [ 306] =  4186 */ {__glXDisp_ProgramParameters4fvNV,
-                          __glXDispSwap_ProgramParameters4fvNV},
-    /* [ 307] =  4187 */ {__glXDisp_ProgramParameters4dvNV,
-                          __glXDispSwap_ProgramParameters4dvNV},
+    /* [ 304] =  4184 */ {__glXDisp_ProgramEnvParameter4fvARB, __glXDispSwap_ProgramEnvParameter4fvARB},
+    /* [ 305] =  4185 */ {__glXDisp_ProgramEnvParameter4dvARB, __glXDispSwap_ProgramEnvParameter4dvARB},
+    /* [ 306] =  4186 */ {__glXDisp_ProgramParameters4fvNV, __glXDispSwap_ProgramParameters4fvNV},
+    /* [ 307] =  4187 */ {__glXDisp_ProgramParameters4dvNV, __glXDispSwap_ProgramParameters4dvNV},
     /* [ 308] =  4188 */ {__glXDisp_TrackMatrixNV, __glXDispSwap_TrackMatrixNV},
-    /* [ 309] =  4189 */ {__glXDisp_VertexAttrib1svARB,
-                          __glXDispSwap_VertexAttrib1svARB},
-    /* [ 310] =  4190 */ {__glXDisp_VertexAttrib2svARB,
-                          __glXDispSwap_VertexAttrib2svARB},
-    /* [ 311] =  4191 */ {__glXDisp_VertexAttrib3svARB,
-                          __glXDispSwap_VertexAttrib3svARB},
-    /* [ 312] =  4192 */ {__glXDisp_VertexAttrib4svARB,
-                          __glXDispSwap_VertexAttrib4svARB},
-    /* [ 313] =  4193 */ {__glXDisp_VertexAttrib1fvARB,
-                          __glXDispSwap_VertexAttrib1fvARB},
-    /* [ 314] =  4194 */ {__glXDisp_VertexAttrib2fvARB,
-                          __glXDispSwap_VertexAttrib2fvARB},
-    /* [ 315] =  4195 */ {__glXDisp_VertexAttrib3fvARB,
-                          __glXDispSwap_VertexAttrib3fvARB},
-    /* [ 316] =  4196 */ {__glXDisp_VertexAttrib4fvARB,
-                          __glXDispSwap_VertexAttrib4fvARB},
-    /* [ 317] =  4197 */ {__glXDisp_VertexAttrib1dvARB,
-                          __glXDispSwap_VertexAttrib1dvARB},
-    /* [ 318] =  4198 */ {__glXDisp_VertexAttrib2dvARB,
-                          __glXDispSwap_VertexAttrib2dvARB},
-    /* [ 319] =  4199 */ {__glXDisp_VertexAttrib3dvARB,
-                          __glXDispSwap_VertexAttrib3dvARB},
-    /* [ 320] =  4200 */ {__glXDisp_VertexAttrib4dvARB,
-                          __glXDispSwap_VertexAttrib4dvARB},
-    /* [ 321] =  4201 */ {__glXDisp_VertexAttrib4NubvARB,
-                          __glXDispSwap_VertexAttrib4NubvARB},
-    /* [ 322] =  4202 */ {__glXDisp_VertexAttribs1svNV,
-                          __glXDispSwap_VertexAttribs1svNV},
-    /* [ 323] =  4203 */ {__glXDisp_VertexAttribs2svNV,
-                          __glXDispSwap_VertexAttribs2svNV},
-    /* [ 324] =  4204 */ {__glXDisp_VertexAttribs3svNV,
-                          __glXDispSwap_VertexAttribs3svNV},
-    /* [ 325] =  4205 */ {__glXDisp_VertexAttribs4svNV,
-                          __glXDispSwap_VertexAttribs4svNV},
-    /* [ 326] =  4206 */ {__glXDisp_VertexAttribs1fvNV,
-                          __glXDispSwap_VertexAttribs1fvNV},
-    /* [ 327] =  4207 */ {__glXDisp_VertexAttribs2fvNV,
-                          __glXDispSwap_VertexAttribs2fvNV},
-    /* [ 328] =  4208 */ {__glXDisp_VertexAttribs3fvNV,
-                          __glXDispSwap_VertexAttribs3fvNV},
-    /* [ 329] =  4209 */ {__glXDisp_VertexAttribs4fvNV,
-                          __glXDispSwap_VertexAttribs4fvNV},
-    /* [ 330] =  4210 */ {__glXDisp_VertexAttribs1dvNV,
-                          __glXDispSwap_VertexAttribs1dvNV},
-    /* [ 331] =  4211 */ {__glXDisp_VertexAttribs2dvNV,
-                          __glXDispSwap_VertexAttribs2dvNV},
-    /* [ 332] =  4212 */ {__glXDisp_VertexAttribs3dvNV,
-                          __glXDispSwap_VertexAttribs3dvNV},
-    /* [ 333] =  4213 */ {__glXDisp_VertexAttribs4dvNV,
-                          __glXDispSwap_VertexAttribs4dvNV},
-    /* [ 334] =  4214 */ {__glXDisp_VertexAttribs4ubvNV,
-                          __glXDispSwap_VertexAttribs4ubvNV},
-    /* [ 335] =  4215 */ {__glXDisp_ProgramLocalParameter4fvARB,
-                          __glXDispSwap_ProgramLocalParameter4fvARB},
-    /* [ 336] =  4216 */ {__glXDisp_ProgramLocalParameter4dvARB,
-                          __glXDispSwap_ProgramLocalParameter4dvARB},
-    /* [ 337] =  4217 */ {__glXDisp_ProgramStringARB,
-                          __glXDispSwap_ProgramStringARB},
-    /* [ 338] =  4218 */ {__glXDisp_ProgramNamedParameter4fvNV,
-                          __glXDispSwap_ProgramNamedParameter4fvNV},
-    /* [ 339] =  4219 */ {__glXDisp_ProgramNamedParameter4dvNV,
-                          __glXDispSwap_ProgramNamedParameter4dvNV},
-    /* [ 340] =  4220 */ {__glXDisp_ActiveStencilFaceEXT,
-                          __glXDispSwap_ActiveStencilFaceEXT},
-    /* [ 341] =  4221 */ {__glXDisp_PointParameteriNV,
-                          __glXDispSwap_PointParameteriNV},
-    /* [ 342] =  4222 */ {__glXDisp_PointParameterivNV,
-                          __glXDispSwap_PointParameterivNV},
+    /* [ 309] =  4189 */ {__glXDisp_VertexAttrib1sv, __glXDispSwap_VertexAttrib1sv},
+    /* [ 310] =  4190 */ {__glXDisp_VertexAttrib2sv, __glXDispSwap_VertexAttrib2sv},
+    /* [ 311] =  4191 */ {__glXDisp_VertexAttrib3sv, __glXDispSwap_VertexAttrib3sv},
+    /* [ 312] =  4192 */ {__glXDisp_VertexAttrib4sv, __glXDispSwap_VertexAttrib4sv},
+    /* [ 313] =  4193 */ {__glXDisp_VertexAttrib1fvARB, __glXDispSwap_VertexAttrib1fvARB},
+    /* [ 314] =  4194 */ {__glXDisp_VertexAttrib2fvARB, __glXDispSwap_VertexAttrib2fvARB},
+    /* [ 315] =  4195 */ {__glXDisp_VertexAttrib3fvARB, __glXDispSwap_VertexAttrib3fvARB},
+    /* [ 316] =  4196 */ {__glXDisp_VertexAttrib4fvARB, __glXDispSwap_VertexAttrib4fvARB},
+    /* [ 317] =  4197 */ {__glXDisp_VertexAttrib1dv, __glXDispSwap_VertexAttrib1dv},
+    /* [ 318] =  4198 */ {__glXDisp_VertexAttrib2dv, __glXDispSwap_VertexAttrib2dv},
+    /* [ 319] =  4199 */ {__glXDisp_VertexAttrib3dv, __glXDispSwap_VertexAttrib3dv},
+    /* [ 320] =  4200 */ {__glXDisp_VertexAttrib4dv, __glXDispSwap_VertexAttrib4dv},
+    /* [ 321] =  4201 */ {__glXDisp_VertexAttrib4Nubv, __glXDispSwap_VertexAttrib4Nubv},
+    /* [ 322] =  4202 */ {__glXDisp_VertexAttribs1svNV, __glXDispSwap_VertexAttribs1svNV},
+    /* [ 323] =  4203 */ {__glXDisp_VertexAttribs2svNV, __glXDispSwap_VertexAttribs2svNV},
+    /* [ 324] =  4204 */ {__glXDisp_VertexAttribs3svNV, __glXDispSwap_VertexAttribs3svNV},
+    /* [ 325] =  4205 */ {__glXDisp_VertexAttribs4svNV, __glXDispSwap_VertexAttribs4svNV},
+    /* [ 326] =  4206 */ {__glXDisp_VertexAttribs1fvNV, __glXDispSwap_VertexAttribs1fvNV},
+    /* [ 327] =  4207 */ {__glXDisp_VertexAttribs2fvNV, __glXDispSwap_VertexAttribs2fvNV},
+    /* [ 328] =  4208 */ {__glXDisp_VertexAttribs3fvNV, __glXDispSwap_VertexAttribs3fvNV},
+    /* [ 329] =  4209 */ {__glXDisp_VertexAttribs4fvNV, __glXDispSwap_VertexAttribs4fvNV},
+    /* [ 330] =  4210 */ {__glXDisp_VertexAttribs1dvNV, __glXDispSwap_VertexAttribs1dvNV},
+    /* [ 331] =  4211 */ {__glXDisp_VertexAttribs2dvNV, __glXDispSwap_VertexAttribs2dvNV},
+    /* [ 332] =  4212 */ {__glXDisp_VertexAttribs3dvNV, __glXDispSwap_VertexAttribs3dvNV},
+    /* [ 333] =  4213 */ {__glXDisp_VertexAttribs4dvNV, __glXDispSwap_VertexAttribs4dvNV},
+    /* [ 334] =  4214 */ {__glXDisp_VertexAttribs4ubvNV, __glXDispSwap_VertexAttribs4ubvNV},
+    /* [ 335] =  4215 */ {__glXDisp_ProgramLocalParameter4fvARB, __glXDispSwap_ProgramLocalParameter4fvARB},
+    /* [ 336] =  4216 */ {__glXDisp_ProgramLocalParameter4dvARB, __glXDispSwap_ProgramLocalParameter4dvARB},
+    /* [ 337] =  4217 */ {__glXDisp_ProgramStringARB, __glXDispSwap_ProgramStringARB},
+    /* [ 338] =  4218 */ {__glXDisp_ProgramNamedParameter4fvNV, __glXDispSwap_ProgramNamedParameter4fvNV},
+    /* [ 339] =  4219 */ {__glXDisp_ProgramNamedParameter4dvNV, __glXDispSwap_ProgramNamedParameter4dvNV},
+    /* [ 340] =  4220 */ {__glXDisp_ActiveStencilFaceEXT, __glXDispSwap_ActiveStencilFaceEXT},
+    /* [ 341] =  4221 */ {__glXDisp_PointParameteri, __glXDispSwap_PointParameteri},
+    /* [ 342] =  4222 */ {__glXDisp_PointParameteriv, __glXDispSwap_PointParameteriv},
     /* [ 343] =  4223 */ {NULL, NULL},
     /* [ 344] =  4224 */ {NULL, NULL},
     /* [ 345] =  4225 */ {NULL, NULL},
     /* [ 346] =  4226 */ {NULL, NULL},
     /* [ 347] =  4227 */ {NULL, NULL},
-    /* [ 348] =  4228 */ {__glXDisp_BlendEquationSeparateEXT,
-                          __glXDispSwap_BlendEquationSeparateEXT},
+    /* [ 348] =  4228 */ {__glXDisp_BlendEquationSeparate, __glXDispSwap_BlendEquationSeparate},
     /* [ 349] =  4229 */ {NULL, NULL},
-    /* [ 350] =  4230 */ {__glXDisp_VertexAttrib4bvARB,
-                          __glXDispSwap_VertexAttrib4bvARB},
-    /* [ 351] =  4231 */ {__glXDisp_VertexAttrib4ivARB,
-                          __glXDispSwap_VertexAttrib4ivARB},
-    /* [ 352] =  4232 */ {__glXDisp_VertexAttrib4ubvARB,
-                          __glXDispSwap_VertexAttrib4ubvARB},
-    /* [ 353] =  4233 */ {__glXDisp_VertexAttrib4usvARB,
-                          __glXDispSwap_VertexAttrib4usvARB},
-    /* [ 354] =  4234 */ {__glXDisp_VertexAttrib4uivARB,
-                          __glXDispSwap_VertexAttrib4uivARB},
-    /* [ 355] =  4235 */ {__glXDisp_VertexAttrib4NbvARB,
-                          __glXDispSwap_VertexAttrib4NbvARB},
-    /* [ 356] =  4236 */ {__glXDisp_VertexAttrib4NsvARB,
-                          __glXDispSwap_VertexAttrib4NsvARB},
-    /* [ 357] =  4237 */ {__glXDisp_VertexAttrib4NivARB,
-                          __glXDispSwap_VertexAttrib4NivARB},
-    /* [ 358] =  4238 */ {__glXDisp_VertexAttrib4NusvARB,
-                          __glXDispSwap_VertexAttrib4NusvARB},
-    /* [ 359] =  4239 */ {__glXDisp_VertexAttrib4NuivARB,
-                          __glXDispSwap_VertexAttrib4NuivARB},
-    /* [ 360] =  4320 */ {__glXDisp_DeleteFramebuffersEXT,
-                          __glXDispSwap_DeleteFramebuffersEXT},
-    /* [ 361] =  4321 */ {__glXDisp_FramebufferTexture1DEXT,
-                          __glXDispSwap_FramebufferTexture1DEXT},
-    /* [ 362] =  4322 */ {__glXDisp_FramebufferTexture2DEXT,
-                          __glXDispSwap_FramebufferTexture2DEXT},
-    /* [ 363] =  4323 */ {__glXDisp_FramebufferTexture3DEXT,
-                          __glXDispSwap_FramebufferTexture3DEXT},
-    /* [ 364] =  4324 */ {__glXDisp_FramebufferRenderbufferEXT,
-                          __glXDispSwap_FramebufferRenderbufferEXT},
-    /* [ 365] =  4325 */ {__glXDisp_GenerateMipmapEXT,
-                          __glXDispSwap_GenerateMipmapEXT},
+    /* [ 350] =  4230 */ {__glXDisp_VertexAttrib4bv, __glXDispSwap_VertexAttrib4bv},
+    /* [ 351] =  4231 */ {__glXDisp_VertexAttrib4iv, __glXDispSwap_VertexAttrib4iv},
+    /* [ 352] =  4232 */ {__glXDisp_VertexAttrib4ubv, __glXDispSwap_VertexAttrib4ubv},
+    /* [ 353] =  4233 */ {__glXDisp_VertexAttrib4usv, __glXDispSwap_VertexAttrib4usv},
+    /* [ 354] =  4234 */ {__glXDisp_VertexAttrib4uiv, __glXDispSwap_VertexAttrib4uiv},
+    /* [ 355] =  4235 */ {__glXDisp_VertexAttrib4Nbv, __glXDispSwap_VertexAttrib4Nbv},
+    /* [ 356] =  4236 */ {__glXDisp_VertexAttrib4Nsv, __glXDispSwap_VertexAttrib4Nsv},
+    /* [ 357] =  4237 */ {__glXDisp_VertexAttrib4Niv, __glXDispSwap_VertexAttrib4Niv},
+    /* [ 358] =  4238 */ {__glXDisp_VertexAttrib4Nusv, __glXDispSwap_VertexAttrib4Nusv},
+    /* [ 359] =  4239 */ {__glXDisp_VertexAttrib4Nuiv, __glXDispSwap_VertexAttrib4Nuiv},
+    /* [ 360] =  4320 */ {__glXDisp_DeleteFramebuffers, __glXDispSwap_DeleteFramebuffers},
+    /* [ 361] =  4321 */ {__glXDisp_FramebufferTexture1D, __glXDispSwap_FramebufferTexture1D},
+    /* [ 362] =  4322 */ {__glXDisp_FramebufferTexture2D, __glXDispSwap_FramebufferTexture2D},
+    /* [ 363] =  4323 */ {__glXDisp_FramebufferTexture3D, __glXDispSwap_FramebufferTexture3D},
+    /* [ 364] =  4324 */ {__glXDisp_FramebufferRenderbuffer, __glXDispSwap_FramebufferRenderbuffer},
+    /* [ 365] =  4325 */ {__glXDisp_GenerateMipmap, __glXDispSwap_GenerateMipmap},
     /* [ 366] =  4326 */ {NULL, NULL},
     /* [ 367] =  4327 */ {NULL, NULL},
     /* [ 368] =  4328 */ {NULL, NULL},
     /* [ 369] =  4329 */ {NULL, NULL},
-    /* [ 370] =  4330 */ {__glXDisp_BlitFramebufferEXT,
-                          __glXDispSwap_BlitFramebufferEXT},
-    /* [ 371] =  4331 */ {__glXDisp_RenderbufferStorageMultisample,
-                          __glXDispSwap_RenderbufferStorageMultisample},
+    /* [ 370] =  4330 */ {__glXDisp_BlitFramebuffer, __glXDispSwap_BlitFramebuffer},
+    /* [ 371] =  4331 */ {__glXDisp_RenderbufferStorageMultisample, __glXDispSwap_RenderbufferStorageMultisample},
     /* [ 372] =  4332 */ {NULL, NULL},
     /* [ 373] =  4333 */ {NULL, NULL},
     /* [ 374] =  4334 */ {NULL, NULL},
     /* [ 375] =  4335 */ {NULL, NULL},
-    /* [ 376] =  4128 */ {__glXDisp_SecondaryColor3ivEXT,
-                          __glXDispSwap_SecondaryColor3ivEXT},
-    /* [ 377] =  4129 */ {__glXDisp_SecondaryColor3fvEXT,
-                          __glXDispSwap_SecondaryColor3fvEXT},
-    /* [ 378] =  4130 */ {__glXDisp_SecondaryColor3dvEXT,
-                          __glXDispSwap_SecondaryColor3dvEXT},
-    /* [ 379] =  4131 */ {__glXDisp_SecondaryColor3ubvEXT,
-                          __glXDispSwap_SecondaryColor3ubvEXT},
-    /* [ 380] =  4132 */ {__glXDisp_SecondaryColor3usvEXT,
-                          __glXDispSwap_SecondaryColor3usvEXT},
-    /* [ 381] =  4133 */ {__glXDisp_SecondaryColor3uivEXT,
-                          __glXDispSwap_SecondaryColor3uivEXT},
-    /* [ 382] =  4134 */ {__glXDisp_BlendFuncSeparateEXT,
-                          __glXDispSwap_BlendFuncSeparateEXT},
+    /* [ 376] =  4128 */ {__glXDisp_SecondaryColor3iv, __glXDispSwap_SecondaryColor3iv},
+    /* [ 377] =  4129 */ {__glXDisp_SecondaryColor3fvEXT, __glXDispSwap_SecondaryColor3fvEXT},
+    /* [ 378] =  4130 */ {__glXDisp_SecondaryColor3dv, __glXDispSwap_SecondaryColor3dv},
+    /* [ 379] =  4131 */ {__glXDisp_SecondaryColor3ubv, __glXDispSwap_SecondaryColor3ubv},
+    /* [ 380] =  4132 */ {__glXDisp_SecondaryColor3usv, __glXDispSwap_SecondaryColor3usv},
+    /* [ 381] =  4133 */ {__glXDisp_SecondaryColor3uiv, __glXDispSwap_SecondaryColor3uiv},
+    /* [ 382] =  4134 */ {__glXDisp_BlendFuncSeparate, __glXDispSwap_BlendFuncSeparate},
     /* [ 383] =  4135 */ {NULL, NULL},
     /* [ 384] =  4264 */ {NULL, NULL},
-    /* [ 385] =  4265 */ {__glXDisp_VertexAttrib1svNV,
-                          __glXDispSwap_VertexAttrib1svNV},
-    /* [ 386] =  4266 */ {__glXDisp_VertexAttrib2svNV,
-                          __glXDispSwap_VertexAttrib2svNV},
-    /* [ 387] =  4267 */ {__glXDisp_VertexAttrib3svNV,
-                          __glXDispSwap_VertexAttrib3svNV},
-    /* [ 388] =  4268 */ {__glXDisp_VertexAttrib4svNV,
-                          __glXDispSwap_VertexAttrib4svNV},
-    /* [ 389] =  4269 */ {__glXDisp_VertexAttrib1fvNV,
-                          __glXDispSwap_VertexAttrib1fvNV},
-    /* [ 390] =  4270 */ {__glXDisp_VertexAttrib2fvNV,
-                          __glXDispSwap_VertexAttrib2fvNV},
-    /* [ 391] =  4271 */ {__glXDisp_VertexAttrib3fvNV,
-                          __glXDispSwap_VertexAttrib3fvNV},
-    /* [ 392] =  4272 */ {__glXDisp_VertexAttrib4fvNV,
-                          __glXDispSwap_VertexAttrib4fvNV},
-    /* [ 393] =  4273 */ {__glXDisp_VertexAttrib1dvNV,
-                          __glXDispSwap_VertexAttrib1dvNV},
-    /* [ 394] =  4274 */ {__glXDisp_VertexAttrib2dvNV,
-                          __glXDispSwap_VertexAttrib2dvNV},
-    /* [ 395] =  4275 */ {__glXDisp_VertexAttrib3dvNV,
-                          __glXDispSwap_VertexAttrib3dvNV},
-    /* [ 396] =  4276 */ {__glXDisp_VertexAttrib4dvNV,
-                          __glXDispSwap_VertexAttrib4dvNV},
-    /* [ 397] =  4277 */ {__glXDisp_VertexAttrib4ubvNV,
-                          __glXDispSwap_VertexAttrib4ubvNV},
+    /* [ 385] =  4265 */ {__glXDisp_VertexAttrib1svNV, __glXDispSwap_VertexAttrib1svNV},
+    /* [ 386] =  4266 */ {__glXDisp_VertexAttrib2svNV, __glXDispSwap_VertexAttrib2svNV},
+    /* [ 387] =  4267 */ {__glXDisp_VertexAttrib3svNV, __glXDispSwap_VertexAttrib3svNV},
+    /* [ 388] =  4268 */ {__glXDisp_VertexAttrib4svNV, __glXDispSwap_VertexAttrib4svNV},
+    /* [ 389] =  4269 */ {__glXDisp_VertexAttrib1fvNV, __glXDispSwap_VertexAttrib1fvNV},
+    /* [ 390] =  4270 */ {__glXDisp_VertexAttrib2fvNV, __glXDispSwap_VertexAttrib2fvNV},
+    /* [ 391] =  4271 */ {__glXDisp_VertexAttrib3fvNV, __glXDispSwap_VertexAttrib3fvNV},
+    /* [ 392] =  4272 */ {__glXDisp_VertexAttrib4fvNV, __glXDispSwap_VertexAttrib4fvNV},
+    /* [ 393] =  4273 */ {__glXDisp_VertexAttrib1dvNV, __glXDispSwap_VertexAttrib1dvNV},
+    /* [ 394] =  4274 */ {__glXDisp_VertexAttrib2dvNV, __glXDispSwap_VertexAttrib2dvNV},
+    /* [ 395] =  4275 */ {__glXDisp_VertexAttrib3dvNV, __glXDispSwap_VertexAttrib3dvNV},
+    /* [ 396] =  4276 */ {__glXDisp_VertexAttrib4dvNV, __glXDispSwap_VertexAttrib4dvNV},
+    /* [ 397] =  4277 */ {__glXDisp_VertexAttrib4ubvNV, __glXDispSwap_VertexAttrib4ubvNV},
     /* [ 398] =  4278 */ {NULL, NULL},
     /* [ 399] =  4279 */ {NULL, NULL},
     /* [ 400] =  4312 */ {NULL, NULL},
     /* [ 401] =  4313 */ {NULL, NULL},
     /* [ 402] =  4314 */ {NULL, NULL},
     /* [ 403] =  4315 */ {NULL, NULL},
-    /* [ 404] =  4316 */ {__glXDisp_BindRenderbufferEXT,
-                          __glXDispSwap_BindRenderbufferEXT},
-    /* [ 405] =  4317 */ {__glXDisp_DeleteRenderbuffersEXT,
-                          __glXDispSwap_DeleteRenderbuffersEXT},
-    /* [ 406] =  4318 */ {__glXDisp_RenderbufferStorageEXT,
-                          __glXDispSwap_RenderbufferStorageEXT},
-    /* [ 407] =  4319 */ {__glXDisp_BindFramebufferEXT,
-                          __glXDispSwap_BindFramebufferEXT},
+    /* [ 404] =  4316 */ {__glXDisp_BindRenderbuffer, __glXDispSwap_BindRenderbuffer},
+    /* [ 405] =  4317 */ {__glXDisp_DeleteRenderbuffers, __glXDispSwap_DeleteRenderbuffers},
+    /* [ 406] =  4318 */ {__glXDisp_RenderbufferStorage, __glXDispSwap_RenderbufferStorage},
+    /* [ 407] =  4319 */ {__glXDisp_BindFramebuffer, __glXDispSwap_BindFramebuffer},
 };
 
 static const int_fast16_t Render_size_table[408][2] = {
-    /* [  0] =     0 */ {0, ~0},
-    /* [  1] =     1 */ {8, ~0},
-    /* [  2] =     2 */ {12, 0},
-    /* [  3] =     3 */ {8, ~0},
-    /* [  4] =     4 */ {8, ~0},
-    /* [  5] =     5 */ {48, 1},
-    /* [  6] =     6 */ {8, ~0},
-    /* [  7] =     7 */ {28, ~0},
-    /* [  8] =     8 */ {16, ~0},
-    /* [  9] =     9 */ {16, ~0},
-    /* [ 10] =    10 */ {12, ~0},
-    /* [ 11] =    11 */ {8, ~0},
-    /* [ 12] =    12 */ {16, ~0},
-    /* [ 13] =    13 */ {12, ~0},
-    /* [ 14] =    14 */ {8, ~0},
-    /* [ 15] =    15 */ {36, ~0},
-    /* [ 16] =    16 */ {20, ~0},
-    /* [ 17] =    17 */ {20, ~0},
-    /* [ 18] =    18 */ {12, ~0},
-    /* [ 19] =    19 */ {8, ~0},
-    /* [ 20] =    20 */ {20, ~0},
-    /* [ 21] =    21 */ {12, ~0},
-    /* [ 22] =    22 */ {8, ~0},
-    /* [ 23] =    23 */ {4, ~0},
-    /* [ 24] =    24 */ {12, ~0},
-    /* [ 25] =    25 */ {8, ~0},
-    /* [ 26] =    26 */ {8, ~0},
-    /* [ 27] =    27 */ {8, ~0},
-    /* [ 28] =    28 */ {8, ~0},
-    /* [ 29] =    29 */ {28, ~0},
-    /* [ 30] =    30 */ {16, ~0},
-    /* [ 31] =    31 */ {16, ~0},
-    /* [ 32] =    32 */ {12, ~0},
-    /* [ 33] =    33 */ {20, ~0},
-    /* [ 34] =    34 */ {12, ~0},
-    /* [ 35] =    35 */ {12, ~0},
-    /* [ 36] =    36 */ {8, ~0},
-    /* [ 37] =    37 */ {28, ~0},
-    /* [ 38] =    38 */ {16, ~0},
-    /* [ 39] =    39 */ {16, ~0},
-    /* [ 40] =    40 */ {12, ~0},
-    /* [ 41] =    41 */ {36, ~0},
-    /* [ 42] =    42 */ {20, ~0},
-    /* [ 43] =    43 */ {20, ~0},
-    /* [ 44] =    44 */ {12, ~0},
-    /* [ 45] =    45 */ {36, ~0},
-    /* [ 46] =    46 */ {20, ~0},
-    /* [ 47] =    47 */ {20, ~0},
-    /* [ 48] =    48 */ {12, ~0},
-    /* [ 49] =    49 */ {12, ~0},
-    /* [ 50] =    50 */ {8, ~0},
-    /* [ 51] =    51 */ {8, ~0},
-    /* [ 52] =    52 */ {8, ~0},
-    /* [ 53] =    53 */ {20, ~0},
-    /* [ 54] =    54 */ {12, ~0},
-    /* [ 55] =    55 */ {12, ~0},
-    /* [ 56] =    56 */ {8, ~0},
-    /* [ 57] =    57 */ {28, ~0},
-    /* [ 58] =    58 */ {16, ~0},
-    /* [ 59] =    59 */ {16, ~0},
-    /* [ 60] =    60 */ {12, ~0},
-    /* [ 61] =    61 */ {36, ~0},
-    /* [ 62] =    62 */ {20, ~0},
-    /* [ 63] =    63 */ {20, ~0},
-    /* [ 64] =    64 */ {12, ~0},
-    /* [ 65] =    65 */ {20, ~0},
-    /* [ 66] =    66 */ {12, ~0},
-    /* [ 67] =    67 */ {12, ~0},
-    /* [ 68] =    68 */ {8, ~0},
-    /* [ 69] =    69 */ {28, ~0},
-    /* [ 70] =    70 */ {16, ~0},
-    /* [ 71] =    71 */ {16, ~0},
-    /* [ 72] =    72 */ {12, ~0},
-    /* [ 73] =    73 */ {36, ~0},
-    /* [ 74] =    74 */ {20, ~0},
-    /* [ 75] =    75 */ {20, ~0},
-    /* [ 76] =    76 */ {12, ~0},
-    /* [ 77] =    77 */ {40, ~0},
-    /* [ 78] =    78 */ {12, ~0},
-    /* [ 79] =    79 */ {8, ~0},
-    /* [ 80] =    80 */ {12, ~0},
-    /* [ 81] =    81 */ {8, 2},
-    /* [ 82] =    82 */ {12, ~0},
-    /* [ 83] =    83 */ {8, 3},
-    /* [ 84] =    84 */ {8, ~0},
-    /* [ 85] =    85 */ {12, ~0},
-    /* [ 86] =    86 */ {16, ~0},
-    /* [ 87] =    87 */ {12, 4},
-    /* [ 88] =    88 */ {16, ~0},
-    /* [ 89] =    89 */ {12, 5},
-    /* [ 90] =    90 */ {12, ~0},
-    /* [ 91] =    91 */ {8, 6},
-    /* [ 92] =    92 */ {12, ~0},
-    /* [ 93] =    93 */ {8, 7},
-    /* [ 94] =    94 */ {12, ~0},
-    /* [ 95] =    95 */ {8, ~0},
-    /* [ 96] =    96 */ {16, ~0},
-    /* [ 97] =    97 */ {12, 8},
-    /* [ 98] =    98 */ {16, ~0},
-    /* [ 99] =    99 */ {12, 9},
-    /* [100] =   100 */ {8, ~0},
-    /* [101] =   101 */ {12, ~0},
-    /* [102] =   102 */ {24, 10},
-    /* [103] =   103 */ {20, ~0},
-    /* [104] =   104 */ {8, ~0},
-    /* [105] =   105 */ {16, ~0},
-    /* [106] =   106 */ {12, 11},
-    /* [107] =   107 */ {16, ~0},
-    /* [108] =   108 */ {12, 12},
-    /* [109] =   109 */ {56, 13},
-    /* [110] =   110 */ {56, 14},
-    /* [111] =   111 */ {16, ~0},
-    /* [112] =   112 */ {12, 15},
-    /* [113] =   113 */ {16, ~0},
-    /* [114] =   114 */ {12, 16},
-    /* [115] =   115 */ {20, ~0},
-    /* [116] =   116 */ {12, 17},
-    /* [117] =   117 */ {16, ~0},
-    /* [118] =   118 */ {12, 18},
-    /* [119] =   119 */ {16, ~0},
-    /* [120] =   120 */ {12, 19},
-    /* [121] =   121 */ {4, ~0},
-    /* [122] =   122 */ {8, ~0},
-    /* [123] =   123 */ {8, ~0},
-    /* [124] =   124 */ {4, ~0},
-    /* [125] =   125 */ {8, ~0},
-    /* [126] =   126 */ {8, ~0},
-    /* [127] =   127 */ {8, ~0},
-    /* [128] =   128 */ {20, ~0},
-    /* [129] =   129 */ {8, ~0},
-    /* [130] =   130 */ {20, ~0},
-    /* [131] =   131 */ {8, ~0},
-    /* [132] =   132 */ {12, ~0},
-    /* [133] =   133 */ {8, ~0},
-    /* [134] =   134 */ {8, ~0},
-    /* [135] =   135 */ {8, ~0},
-    /* [136] =   136 */ {8, ~0},
-    /* [137] =   137 */ {12, ~0},
-    /* [138] =   138 */ {8, ~0},
-    /* [139] =   139 */ {8, ~0},
-    /* [140] =   140 */ {0, ~0},
-    /* [141] =   141 */ {4, ~0},
-    /* [142] =   142 */ {8, ~0},
-    /* [143] =   143 */ {28, 20},
-    /* [144] =   144 */ {20, 21},
-    /* [145] =   145 */ {48, 22},
-    /* [146] =   146 */ {32, 23},
-    /* [147] =   147 */ {24, ~0},
-    /* [148] =   148 */ {16, ~0},
-    /* [149] =   149 */ {44, ~0},
-    /* [150] =   150 */ {28, ~0},
-    /* [151] =   151 */ {12, ~0},
-    /* [152] =   152 */ {8, ~0},
-    /* [153] =   153 */ {20, ~0},
-    /* [154] =   154 */ {12, ~0},
-    /* [155] =   155 */ {16, ~0},
-    /* [156] =   156 */ {8, ~0},
-    /* [157] =   157 */ {24, ~0},
-    /* [158] =   158 */ {12, ~0},
-    /* [159] =   159 */ {12, ~0},
-    /* [160] =   160 */ {12, ~0},
-    /* [161] =   161 */ {8, ~0},
-    /* [162] =   162 */ {16, ~0},
-    /* [163] =   163 */ {16, ~0},
-    /* [164] =   164 */ {8, ~0},
-    /* [165] =   165 */ {12, ~0},
-    /* [166] =   166 */ {12, ~0},
-    /* [167] =   167 */ {12, ~0},
-    /* [168] =   168 */ {12, 24},
-    /* [169] =   169 */ {12, 25},
-    /* [170] =   170 */ {12, 26},
-    /* [171] =   171 */ {8, ~0},
-    /* [172] =   172 */ {24, ~0},
-    /* [173] =   173 */ {40, 27},
-    /* [174] =   174 */ {20, ~0},
-    /* [175] =   175 */ {52, ~0},
-    /* [176] =   176 */ {4, ~0},
-    /* [177] =   177 */ {68, ~0},
+    /* [  0] =     0 */ {  0, ~0},
+    /* [  1] =     1 */ {  8, ~0},
+    /* [  2] =     2 */ { 12,  0},
+    /* [  3] =     3 */ {  8, ~0},
+    /* [  4] =     4 */ {  8, ~0},
+    /* [  5] =     5 */ { 48,  1},
+    /* [  6] =     6 */ {  8, ~0},
+    /* [  7] =     7 */ { 28, ~0},
+    /* [  8] =     8 */ { 16, ~0},
+    /* [  9] =     9 */ { 16, ~0},
+    /* [ 10] =    10 */ { 12, ~0},
+    /* [ 11] =    11 */ {  8, ~0},
+    /* [ 12] =    12 */ { 16, ~0},
+    /* [ 13] =    13 */ { 12, ~0},
+    /* [ 14] =    14 */ {  8, ~0},
+    /* [ 15] =    15 */ { 36, ~0},
+    /* [ 16] =    16 */ { 20, ~0},
+    /* [ 17] =    17 */ { 20, ~0},
+    /* [ 18] =    18 */ { 12, ~0},
+    /* [ 19] =    19 */ {  8, ~0},
+    /* [ 20] =    20 */ { 20, ~0},
+    /* [ 21] =    21 */ { 12, ~0},
+    /* [ 22] =    22 */ {  8, ~0},
+    /* [ 23] =    23 */ {  4, ~0},
+    /* [ 24] =    24 */ { 12, ~0},
+    /* [ 25] =    25 */ {  8, ~0},
+    /* [ 26] =    26 */ {  8, ~0},
+    /* [ 27] =    27 */ {  8, ~0},
+    /* [ 28] =    28 */ {  8, ~0},
+    /* [ 29] =    29 */ { 28, ~0},
+    /* [ 30] =    30 */ { 16, ~0},
+    /* [ 31] =    31 */ { 16, ~0},
+    /* [ 32] =    32 */ { 12, ~0},
+    /* [ 33] =    33 */ { 20, ~0},
+    /* [ 34] =    34 */ { 12, ~0},
+    /* [ 35] =    35 */ { 12, ~0},
+    /* [ 36] =    36 */ {  8, ~0},
+    /* [ 37] =    37 */ { 28, ~0},
+    /* [ 38] =    38 */ { 16, ~0},
+    /* [ 39] =    39 */ { 16, ~0},
+    /* [ 40] =    40 */ { 12, ~0},
+    /* [ 41] =    41 */ { 36, ~0},
+    /* [ 42] =    42 */ { 20, ~0},
+    /* [ 43] =    43 */ { 20, ~0},
+    /* [ 44] =    44 */ { 12, ~0},
+    /* [ 45] =    45 */ { 36, ~0},
+    /* [ 46] =    46 */ { 20, ~0},
+    /* [ 47] =    47 */ { 20, ~0},
+    /* [ 48] =    48 */ { 12, ~0},
+    /* [ 49] =    49 */ { 12, ~0},
+    /* [ 50] =    50 */ {  8, ~0},
+    /* [ 51] =    51 */ {  8, ~0},
+    /* [ 52] =    52 */ {  8, ~0},
+    /* [ 53] =    53 */ { 20, ~0},
+    /* [ 54] =    54 */ { 12, ~0},
+    /* [ 55] =    55 */ { 12, ~0},
+    /* [ 56] =    56 */ {  8, ~0},
+    /* [ 57] =    57 */ { 28, ~0},
+    /* [ 58] =    58 */ { 16, ~0},
+    /* [ 59] =    59 */ { 16, ~0},
+    /* [ 60] =    60 */ { 12, ~0},
+    /* [ 61] =    61 */ { 36, ~0},
+    /* [ 62] =    62 */ { 20, ~0},
+    /* [ 63] =    63 */ { 20, ~0},
+    /* [ 64] =    64 */ { 12, ~0},
+    /* [ 65] =    65 */ { 20, ~0},
+    /* [ 66] =    66 */ { 12, ~0},
+    /* [ 67] =    67 */ { 12, ~0},
+    /* [ 68] =    68 */ {  8, ~0},
+    /* [ 69] =    69 */ { 28, ~0},
+    /* [ 70] =    70 */ { 16, ~0},
+    /* [ 71] =    71 */ { 16, ~0},
+    /* [ 72] =    72 */ { 12, ~0},
+    /* [ 73] =    73 */ { 36, ~0},
+    /* [ 74] =    74 */ { 20, ~0},
+    /* [ 75] =    75 */ { 20, ~0},
+    /* [ 76] =    76 */ { 12, ~0},
+    /* [ 77] =    77 */ { 40, ~0},
+    /* [ 78] =    78 */ { 12, ~0},
+    /* [ 79] =    79 */ {  8, ~0},
+    /* [ 80] =    80 */ { 12, ~0},
+    /* [ 81] =    81 */ {  8,  2},
+    /* [ 82] =    82 */ { 12, ~0},
+    /* [ 83] =    83 */ {  8,  3},
+    /* [ 84] =    84 */ {  8, ~0},
+    /* [ 85] =    85 */ { 12, ~0},
+    /* [ 86] =    86 */ { 16, ~0},
+    /* [ 87] =    87 */ { 12,  4},
+    /* [ 88] =    88 */ { 16, ~0},
+    /* [ 89] =    89 */ { 12,  5},
+    /* [ 90] =    90 */ { 12, ~0},
+    /* [ 91] =    91 */ {  8,  6},
+    /* [ 92] =    92 */ { 12, ~0},
+    /* [ 93] =    93 */ {  8,  7},
+    /* [ 94] =    94 */ { 12, ~0},
+    /* [ 95] =    95 */ {  8, ~0},
+    /* [ 96] =    96 */ { 16, ~0},
+    /* [ 97] =    97 */ { 12,  8},
+    /* [ 98] =    98 */ { 16, ~0},
+    /* [ 99] =    99 */ { 12,  9},
+    /* [100] =   100 */ {  8, ~0},
+    /* [101] =   101 */ { 12, ~0},
+    /* [102] =   102 */ { 24, 10},
+    /* [103] =   103 */ { 20, ~0},
+    /* [104] =   104 */ {  8, ~0},
+    /* [105] =   105 */ { 16, ~0},
+    /* [106] =   106 */ { 12, 11},
+    /* [107] =   107 */ { 16, ~0},
+    /* [108] =   108 */ { 12, 12},
+    /* [109] =   109 */ { 56, 13},
+    /* [110] =   110 */ { 56, 14},
+    /* [111] =   111 */ { 16, ~0},
+    /* [112] =   112 */ { 12, 15},
+    /* [113] =   113 */ { 16, ~0},
+    /* [114] =   114 */ { 12, 16},
+    /* [115] =   115 */ { 20, ~0},
+    /* [116] =   116 */ { 12, 17},
+    /* [117] =   117 */ { 16, ~0},
+    /* [118] =   118 */ { 12, 18},
+    /* [119] =   119 */ { 16, ~0},
+    /* [120] =   120 */ { 12, 19},
+    /* [121] =   121 */ {  4, ~0},
+    /* [122] =   122 */ {  8, ~0},
+    /* [123] =   123 */ {  8, ~0},
+    /* [124] =   124 */ {  4, ~0},
+    /* [125] =   125 */ {  8, ~0},
+    /* [126] =   126 */ {  8, ~0},
+    /* [127] =   127 */ {  8, ~0},
+    /* [128] =   128 */ { 20, ~0},
+    /* [129] =   129 */ {  8, ~0},
+    /* [130] =   130 */ { 20, ~0},
+    /* [131] =   131 */ {  8, ~0},
+    /* [132] =   132 */ { 12, ~0},
+    /* [133] =   133 */ {  8, ~0},
+    /* [134] =   134 */ {  8, ~0},
+    /* [135] =   135 */ {  8, ~0},
+    /* [136] =   136 */ {  8, ~0},
+    /* [137] =   137 */ { 12, ~0},
+    /* [138] =   138 */ {  8, ~0},
+    /* [139] =   139 */ {  8, ~0},
+    /* [140] =   140 */ {  0, ~0},
+    /* [141] =   141 */ {  4, ~0},
+    /* [142] =   142 */ {  8, ~0},
+    /* [143] =   143 */ { 28, 20},
+    /* [144] =   144 */ { 20, 21},
+    /* [145] =   145 */ { 48, 22},
+    /* [146] =   146 */ { 32, 23},
+    /* [147] =   147 */ { 24, ~0},
+    /* [148] =   148 */ { 16, ~0},
+    /* [149] =   149 */ { 44, ~0},
+    /* [150] =   150 */ { 28, ~0},
+    /* [151] =   151 */ { 12, ~0},
+    /* [152] =   152 */ {  8, ~0},
+    /* [153] =   153 */ { 20, ~0},
+    /* [154] =   154 */ { 12, ~0},
+    /* [155] =   155 */ { 16, ~0},
+    /* [156] =   156 */ {  8, ~0},
+    /* [157] =   157 */ { 24, ~0},
+    /* [158] =   158 */ { 12, ~0},
+    /* [159] =   159 */ { 12, ~0},
+    /* [160] =   160 */ { 12, ~0},
+    /* [161] =   161 */ {  8, ~0},
+    /* [162] =   162 */ { 16, ~0},
+    /* [163] =   163 */ { 16, ~0},
+    /* [164] =   164 */ {  8, ~0},
+    /* [165] =   165 */ { 12, ~0},
+    /* [166] =   166 */ { 12, ~0},
+    /* [167] =   167 */ { 12, ~0},
+    /* [168] =   168 */ { 12, 24},
+    /* [169] =   169 */ { 12, 25},
+    /* [170] =   170 */ { 12, 26},
+    /* [171] =   171 */ {  8, ~0},
+    /* [172] =   172 */ { 24, ~0},
+    /* [173] =   173 */ { 40, 27},
+    /* [174] =   174 */ { 20, ~0},
+    /* [175] =   175 */ { 52, ~0},
+    /* [176] =   176 */ {  4, ~0},
+    /* [177] =   177 */ { 68, ~0},
     /* [178] =   178 */ {132, ~0},
-    /* [179] =   179 */ {8, ~0},
-    /* [180] =   180 */ {68, ~0},
+    /* [179] =   179 */ {  8, ~0},
+    /* [180] =   180 */ { 68, ~0},
     /* [181] =   181 */ {132, ~0},
-    /* [182] =   182 */ {52, ~0},
-    /* [183] =   183 */ {4, ~0},
-    /* [184] =   184 */ {4, ~0},
-    /* [185] =   185 */ {36, ~0},
-    /* [186] =   186 */ {20, ~0},
-    /* [187] =   187 */ {28, ~0},
-    /* [188] =   188 */ {16, ~0},
-    /* [189] =   189 */ {28, ~0},
-    /* [190] =   190 */ {16, ~0},
-    /* [191] =   191 */ {20, ~0},
-    /* [192] =   192 */ {12, ~0},
-    /* [193] =   193 */ {16, 28},
-    /* [194] =   194 */ {8, ~0},
-    /* [195] =   195 */ {44, 29},
-    /* [196] =   196 */ {24, ~0},
-    /* [197] =   197 */ {8, ~0},
-    /* [198] =   198 */ {16, ~0},
-    /* [199] =   199 */ {12, ~0},
-    /* [200] =   200 */ {12, ~0},
-    /* [201] =   201 */ {12, ~0},
-    /* [202] =   202 */ {24, ~0},
-    /* [203] =   203 */ {16, ~0},
-    /* [204] =   204 */ {16, ~0},
-    /* [205] =   205 */ {12, ~0},
-    /* [206] =   206 */ {32, ~0},
-    /* [207] =   207 */ {20, ~0},
-    /* [208] =   208 */ {20, ~0},
-    /* [209] =   209 */ {16, ~0},
-    /* [210] =   210 */ {40, ~0},
-    /* [211] =   211 */ {24, ~0},
-    /* [212] =   212 */ {24, ~0},
-    /* [213] =   213 */ {16, ~0},
-    /* [214] =   214 */ {28, 30},
-    /* [215] =   215 */ {32, 31},
-    /* [216] =   216 */ {36, 32},
-    /* [217] =   217 */ {28, 33},
-    /* [218] =   218 */ {36, 34},
-    /* [219] =   219 */ {44, 35},
-    /* [220] =   220 */ {0, ~0},
-    /* [221] =   221 */ {0, ~0},
-    /* [222] =   222 */ {0, ~0},
-    /* [223] =   223 */ {0, ~0},
-    /* [224] =   224 */ {0, ~0},
-    /* [225] =   225 */ {0, ~0},
-    /* [226] =   226 */ {0, ~0},
-    /* [227] =   227 */ {0, ~0},
-    /* [228] =   228 */ {0, ~0},
-    /* [229] =   229 */ {12, ~0},
-    /* [230] =   230 */ {16, ~0},
-    /* [231] =   231 */ {12, ~0},
-    /* [232] =   232 */ {8, ~0},
-    /* [233] =   233 */ {8, 36},
-    /* [234] =   234 */ {12, ~0},
-    /* [235] =   235 */ {0, ~0},
-    /* [236] =   236 */ {0, ~0},
-    /* [237] =   237 */ {24, ~0},
-    /* [238] =   238 */ {0, ~0},
-    /* [239] =   239 */ {0, ~0},
-    /* [240] =  2048 */ {12, ~0},
-    /* [241] =  2049 */ {8, ~0},
-    /* [242] =  2050 */ {0, ~0},
-    /* [243] =  2051 */ {0, ~0},
-    /* [244] =  2052 */ {0, ~0},
-    /* [245] =  2053 */ {44, 37},
-    /* [246] =  2054 */ {12, 38},
-    /* [247] =  2055 */ {12, 39},
-    /* [248] =  2056 */ {24, ~0},
-    /* [249] =  2057 */ {0, ~0},
-    /* [250] =  2058 */ {0, ~0},
-    /* [251] =  2059 */ {0, ~0},
-    /* [252] =  2060 */ {0, ~0},
-    /* [253] =  2061 */ {0, ~0},
-    /* [254] =  2062 */ {0, ~0},
-    /* [255] =  2063 */ {0, ~0},
-    /* [256] =  2064 */ {0, ~0},
-    /* [257] =  2065 */ {12, ~0},
-    /* [258] =  2066 */ {8, 40},
-    /* [259] =  2067 */ {0, ~0},
-    /* [260] =  2068 */ {0, ~0},
-    /* [261] =  2069 */ {0, ~0},
-    /* [262] =  2070 */ {0, ~0},
-    /* [263] =  2071 */ {0, ~0},
-    /* [264] =  4096 */ {20, ~0},
-    /* [265] =  4097 */ {8, ~0},
-    /* [266] =  4098 */ {0, ~0},
-    /* [267] =  4099 */ {60, 41},
-    /* [268] =  4100 */ {60, 42},
-    /* [269] =  4101 */ {48, 43},
-    /* [270] =  4102 */ {48, 44},
-    /* [271] =  4103 */ {16, ~0},
-    /* [272] =  4104 */ {12, 45},
-    /* [273] =  4105 */ {16, ~0},
-    /* [274] =  4106 */ {12, 46},
-    /* [275] =  4107 */ {24, ~0},
-    /* [276] =  4108 */ {28, ~0},
-    /* [277] =  4109 */ {32, 47},
-    /* [278] =  4110 */ {20, ~0},
-    /* [279] =  4111 */ {16, ~0},
-    /* [280] =  4112 */ {8, ~0},
-    /* [281] =  4113 */ {8, ~0},
-    /* [282] =  4114 */ {84, 48},
-    /* [283] =  4115 */ {92, 49},
-    /* [284] =  4116 */ {0, ~0},
-    /* [285] =  4117 */ {12, ~0},
-    /* [286] =  4118 */ {8, 50},
-    /* [287] =  4119 */ {32, ~0},
-    /* [288] =  4120 */ {36, ~0},
-    /* [289] =  4121 */ {28, ~0},
-    /* [290] =  4122 */ {36, ~0},
-    /* [291] =  4123 */ {40, ~0},
-    /* [292] =  4124 */ {8, ~0},
-    /* [293] =  4125 */ {12, ~0},
-    /* [294] =  4126 */ {8, ~0},
-    /* [295] =  4127 */ {12, ~0},
-    /* [296] =  4176 */ {0, ~0},
-    /* [297] =  4177 */ {0, ~0},
-    /* [298] =  4178 */ {0, ~0},
-    /* [299] =  4179 */ {0, ~0},
-    /* [300] =  4180 */ {12, ~0},
-    /* [301] =  4181 */ {28, ~0},
-    /* [302] =  4182 */ {8, 51},
-    /* [303] =  4183 */ {16, 52},
-    /* [304] =  4184 */ {28, ~0},
-    /* [305] =  4185 */ {44, ~0},
-    /* [306] =  4186 */ {16, 53},
-    /* [307] =  4187 */ {16, 54},
-    /* [308] =  4188 */ {20, ~0},
-    /* [309] =  4189 */ {12, ~0},
-    /* [310] =  4190 */ {12, ~0},
-    /* [311] =  4191 */ {16, ~0},
-    /* [312] =  4192 */ {16, ~0},
-    /* [313] =  4193 */ {12, ~0},
-    /* [314] =  4194 */ {16, ~0},
-    /* [315] =  4195 */ {20, ~0},
-    /* [316] =  4196 */ {24, ~0},
-    /* [317] =  4197 */ {16, ~0},
-    /* [318] =  4198 */ {24, ~0},
-    /* [319] =  4199 */ {32, ~0},
-    /* [320] =  4200 */ {40, ~0},
-    /* [321] =  4201 */ {12, ~0},
-    /* [322] =  4202 */ {12, 55},
-    /* [323] =  4203 */ {12, 56},
-    /* [324] =  4204 */ {12, 57},
-    /* [325] =  4205 */ {12, 58},
-    /* [326] =  4206 */ {12, 59},
-    /* [327] =  4207 */ {12, 60},
-    /* [328] =  4208 */ {12, 61},
-    /* [329] =  4209 */ {12, 62},
-    /* [330] =  4210 */ {12, 63},
-    /* [331] =  4211 */ {12, 64},
-    /* [332] =  4212 */ {12, 65},
-    /* [333] =  4213 */ {12, 66},
-    /* [334] =  4214 */ {12, 67},
-    /* [335] =  4215 */ {28, ~0},
-    /* [336] =  4216 */ {44, ~0},
-    /* [337] =  4217 */ {16, 68},
-    /* [338] =  4218 */ {28, 69},
-    /* [339] =  4219 */ {44, 70},
-    /* [340] =  4220 */ {8, ~0},
-    /* [341] =  4221 */ {12, ~0},
-    /* [342] =  4222 */ {8, 71},
-    /* [343] =  4223 */ {0, ~0},
-    /* [344] =  4224 */ {0, ~0},
-    /* [345] =  4225 */ {0, ~0},
-    /* [346] =  4226 */ {0, ~0},
-    /* [347] =  4227 */ {0, ~0},
-    /* [348] =  4228 */ {12, ~0},
-    /* [349] =  4229 */ {0, ~0},
-    /* [350] =  4230 */ {12, ~0},
-    /* [351] =  4231 */ {24, ~0},
-    /* [352] =  4232 */ {12, ~0},
-    /* [353] =  4233 */ {16, ~0},
-    /* [354] =  4234 */ {24, ~0},
-    /* [355] =  4235 */ {12, ~0},
-    /* [356] =  4236 */ {16, ~0},
-    /* [357] =  4237 */ {24, ~0},
-    /* [358] =  4238 */ {16, ~0},
-    /* [359] =  4239 */ {24, ~0},
-    /* [360] =  4320 */ {8, 72},
-    /* [361] =  4321 */ {24, ~0},
-    /* [362] =  4322 */ {24, ~0},
-    /* [363] =  4323 */ {28, ~0},
-    /* [364] =  4324 */ {20, ~0},
-    /* [365] =  4325 */ {8, ~0},
-    /* [366] =  4326 */ {0, ~0},
-    /* [367] =  4327 */ {0, ~0},
-    /* [368] =  4328 */ {0, ~0},
-    /* [369] =  4329 */ {0, ~0},
-    /* [370] =  4330 */ {44, ~0},
-    /* [371] =  4331 */ {24, ~0},
-    /* [372] =  4332 */ {0, ~0},
-    /* [373] =  4333 */ {0, ~0},
-    /* [374] =  4334 */ {0, ~0},
-    /* [375] =  4335 */ {0, ~0},
-    /* [376] =  4128 */ {16, ~0},
-    /* [377] =  4129 */ {16, ~0},
-    /* [378] =  4130 */ {28, ~0},
-    /* [379] =  4131 */ {8, ~0},
-    /* [380] =  4132 */ {12, ~0},
-    /* [381] =  4133 */ {16, ~0},
-    /* [382] =  4134 */ {20, ~0},
-    /* [383] =  4135 */ {0, ~0},
-    /* [384] =  4264 */ {0, ~0},
-    /* [385] =  4265 */ {12, ~0},
-    /* [386] =  4266 */ {12, ~0},
-    /* [387] =  4267 */ {16, ~0},
-    /* [388] =  4268 */ {16, ~0},
-    /* [389] =  4269 */ {12, ~0},
-    /* [390] =  4270 */ {16, ~0},
-    /* [391] =  4271 */ {20, ~0},
-    /* [392] =  4272 */ {24, ~0},
-    /* [393] =  4273 */ {16, ~0},
-    /* [394] =  4274 */ {24, ~0},
-    /* [395] =  4275 */ {32, ~0},
-    /* [396] =  4276 */ {40, ~0},
-    /* [397] =  4277 */ {12, ~0},
-    /* [398] =  4278 */ {0, ~0},
-    /* [399] =  4279 */ {0, ~0},
-    /* [400] =  4312 */ {0, ~0},
-    /* [401] =  4313 */ {0, ~0},
-    /* [402] =  4314 */ {0, ~0},
-    /* [403] =  4315 */ {0, ~0},
-    /* [404] =  4316 */ {12, ~0},
-    /* [405] =  4317 */ {8, 73},
-    /* [406] =  4318 */ {20, ~0},
-    /* [407] =  4319 */ {12, ~0},
+    /* [182] =   182 */ { 52, ~0},
+    /* [183] =   183 */ {  4, ~0},
+    /* [184] =   184 */ {  4, ~0},
+    /* [185] =   185 */ { 36, ~0},
+    /* [186] =   186 */ { 20, ~0},
+    /* [187] =   187 */ { 28, ~0},
+    /* [188] =   188 */ { 16, ~0},
+    /* [189] =   189 */ { 28, ~0},
+    /* [190] =   190 */ { 16, ~0},
+    /* [191] =   191 */ { 20, ~0},
+    /* [192] =   192 */ { 12, ~0},
+    /* [193] =   193 */ { 16, 28},
+    /* [194] =   194 */ {  8, ~0},
+    /* [195] =   195 */ { 44, 29},
+    /* [196] =   196 */ { 24, ~0},
+    /* [197] =   197 */ {  8, ~0},
+    /* [198] =   198 */ { 16, ~0},
+    /* [199] =   199 */ { 12, ~0},
+    /* [200] =   200 */ { 12, ~0},
+    /* [201] =   201 */ { 12, ~0},
+    /* [202] =   202 */ { 24, ~0},
+    /* [203] =   203 */ { 16, ~0},
+    /* [204] =   204 */ { 16, ~0},
+    /* [205] =   205 */ { 12, ~0},
+    /* [206] =   206 */ { 32, ~0},
+    /* [207] =   207 */ { 20, ~0},
+    /* [208] =   208 */ { 20, ~0},
+    /* [209] =   209 */ { 16, ~0},
+    /* [210] =   210 */ { 40, ~0},
+    /* [211] =   211 */ { 24, ~0},
+    /* [212] =   212 */ { 24, ~0},
+    /* [213] =   213 */ { 16, ~0},
+    /* [214] =   214 */ { 28, 30},
+    /* [215] =   215 */ { 32, 31},
+    /* [216] =   216 */ { 36, 32},
+    /* [217] =   217 */ { 28, 33},
+    /* [218] =   218 */ { 36, 34},
+    /* [219] =   219 */ { 44, 35},
+    /* [220] =   220 */ {  0, ~0},
+    /* [221] =   221 */ {  0, ~0},
+    /* [222] =   222 */ {  0, ~0},
+    /* [223] =   223 */ {  0, ~0},
+    /* [224] =   224 */ {  0, ~0},
+    /* [225] =   225 */ {  0, ~0},
+    /* [226] =   226 */ {  0, ~0},
+    /* [227] =   227 */ {  0, ~0},
+    /* [228] =   228 */ {  0, ~0},
+    /* [229] =   229 */ { 12, ~0},
+    /* [230] =   230 */ { 16, ~0},
+    /* [231] =   231 */ { 12, ~0},
+    /* [232] =   232 */ {  8, ~0},
+    /* [233] =   233 */ {  8, 36},
+    /* [234] =   234 */ { 12, ~0},
+    /* [235] =   235 */ {  0, ~0},
+    /* [236] =   236 */ {  0, ~0},
+    /* [237] =   237 */ { 24, ~0},
+    /* [238] =   238 */ {  0, ~0},
+    /* [239] =   239 */ {  0, ~0},
+    /* [240] =  2048 */ { 12, ~0},
+    /* [241] =  2049 */ {  8, ~0},
+    /* [242] =  2050 */ {  0, ~0},
+    /* [243] =  2051 */ {  0, ~0},
+    /* [244] =  2052 */ {  0, ~0},
+    /* [245] =  2053 */ { 44, 37},
+    /* [246] =  2054 */ { 12, 38},
+    /* [247] =  2055 */ { 12, 39},
+    /* [248] =  2056 */ { 24, ~0},
+    /* [249] =  2057 */ {  0, ~0},
+    /* [250] =  2058 */ {  0, ~0},
+    /* [251] =  2059 */ {  0, ~0},
+    /* [252] =  2060 */ {  0, ~0},
+    /* [253] =  2061 */ {  0, ~0},
+    /* [254] =  2062 */ {  0, ~0},
+    /* [255] =  2063 */ {  0, ~0},
+    /* [256] =  2064 */ {  0, ~0},
+    /* [257] =  2065 */ { 12, ~0},
+    /* [258] =  2066 */ {  8, 40},
+    /* [259] =  2067 */ {  0, ~0},
+    /* [260] =  2068 */ {  0, ~0},
+    /* [261] =  2069 */ {  0, ~0},
+    /* [262] =  2070 */ {  0, ~0},
+    /* [263] =  2071 */ {  0, ~0},
+    /* [264] =  4096 */ { 20, ~0},
+    /* [265] =  4097 */ {  8, ~0},
+    /* [266] =  4098 */ {  0, ~0},
+    /* [267] =  4099 */ { 60, 41},
+    /* [268] =  4100 */ { 60, 42},
+    /* [269] =  4101 */ { 48, 43},
+    /* [270] =  4102 */ { 48, 44},
+    /* [271] =  4103 */ { 16, ~0},
+    /* [272] =  4104 */ { 12, 45},
+    /* [273] =  4105 */ { 16, ~0},
+    /* [274] =  4106 */ { 12, 46},
+    /* [275] =  4107 */ { 24, ~0},
+    /* [276] =  4108 */ { 28, ~0},
+    /* [277] =  4109 */ { 32, 47},
+    /* [278] =  4110 */ { 20, ~0},
+    /* [279] =  4111 */ { 16, ~0},
+    /* [280] =  4112 */ {  8, ~0},
+    /* [281] =  4113 */ {  8, ~0},
+    /* [282] =  4114 */ { 84, 48},
+    /* [283] =  4115 */ { 92, 49},
+    /* [284] =  4116 */ {  0, ~0},
+    /* [285] =  4117 */ { 12, ~0},
+    /* [286] =  4118 */ {  8, 50},
+    /* [287] =  4119 */ { 32, ~0},
+    /* [288] =  4120 */ { 36, ~0},
+    /* [289] =  4121 */ { 28, ~0},
+    /* [290] =  4122 */ { 36, ~0},
+    /* [291] =  4123 */ { 40, ~0},
+    /* [292] =  4124 */ {  8, ~0},
+    /* [293] =  4125 */ { 12, ~0},
+    /* [294] =  4126 */ {  8, ~0},
+    /* [295] =  4127 */ { 12, ~0},
+    /* [296] =  4176 */ {  0, ~0},
+    /* [297] =  4177 */ {  0, ~0},
+    /* [298] =  4178 */ {  0, ~0},
+    /* [299] =  4179 */ {  0, ~0},
+    /* [300] =  4180 */ { 12, ~0},
+    /* [301] =  4181 */ { 28, ~0},
+    /* [302] =  4182 */ {  8, 51},
+    /* [303] =  4183 */ { 16, 52},
+    /* [304] =  4184 */ { 28, ~0},
+    /* [305] =  4185 */ { 44, ~0},
+    /* [306] =  4186 */ { 16, 53},
+    /* [307] =  4187 */ { 16, 54},
+    /* [308] =  4188 */ { 20, ~0},
+    /* [309] =  4189 */ { 12, ~0},
+    /* [310] =  4190 */ { 12, ~0},
+    /* [311] =  4191 */ { 16, ~0},
+    /* [312] =  4192 */ { 16, ~0},
+    /* [313] =  4193 */ { 12, ~0},
+    /* [314] =  4194 */ { 16, ~0},
+    /* [315] =  4195 */ { 20, ~0},
+    /* [316] =  4196 */ { 24, ~0},
+    /* [317] =  4197 */ { 16, ~0},
+    /* [318] =  4198 */ { 24, ~0},
+    /* [319] =  4199 */ { 32, ~0},
+    /* [320] =  4200 */ { 40, ~0},
+    /* [321] =  4201 */ { 12, ~0},
+    /* [322] =  4202 */ { 12, 55},
+    /* [323] =  4203 */ { 12, 56},
+    /* [324] =  4204 */ { 12, 57},
+    /* [325] =  4205 */ { 12, 58},
+    /* [326] =  4206 */ { 12, 59},
+    /* [327] =  4207 */ { 12, 60},
+    /* [328] =  4208 */ { 12, 61},
+    /* [329] =  4209 */ { 12, 62},
+    /* [330] =  4210 */ { 12, 63},
+    /* [331] =  4211 */ { 12, 64},
+    /* [332] =  4212 */ { 12, 65},
+    /* [333] =  4213 */ { 12, 66},
+    /* [334] =  4214 */ { 12, 67},
+    /* [335] =  4215 */ { 28, ~0},
+    /* [336] =  4216 */ { 44, ~0},
+    /* [337] =  4217 */ { 16, 68},
+    /* [338] =  4218 */ { 28, 69},
+    /* [339] =  4219 */ { 44, 70},
+    /* [340] =  4220 */ {  8, ~0},
+    /* [341] =  4221 */ { 12, ~0},
+    /* [342] =  4222 */ {  8, 71},
+    /* [343] =  4223 */ {  0, ~0},
+    /* [344] =  4224 */ {  0, ~0},
+    /* [345] =  4225 */ {  0, ~0},
+    /* [346] =  4226 */ {  0, ~0},
+    /* [347] =  4227 */ {  0, ~0},
+    /* [348] =  4228 */ { 12, ~0},
+    /* [349] =  4229 */ {  0, ~0},
+    /* [350] =  4230 */ { 12, ~0},
+    /* [351] =  4231 */ { 24, ~0},
+    /* [352] =  4232 */ { 12, ~0},
+    /* [353] =  4233 */ { 16, ~0},
+    /* [354] =  4234 */ { 24, ~0},
+    /* [355] =  4235 */ { 12, ~0},
+    /* [356] =  4236 */ { 16, ~0},
+    /* [357] =  4237 */ { 24, ~0},
+    /* [358] =  4238 */ { 16, ~0},
+    /* [359] =  4239 */ { 24, ~0},
+    /* [360] =  4320 */ {  8, 72},
+    /* [361] =  4321 */ { 24, ~0},
+    /* [362] =  4322 */ { 24, ~0},
+    /* [363] =  4323 */ { 28, ~0},
+    /* [364] =  4324 */ { 20, ~0},
+    /* [365] =  4325 */ {  8, ~0},
+    /* [366] =  4326 */ {  0, ~0},
+    /* [367] =  4327 */ {  0, ~0},
+    /* [368] =  4328 */ {  0, ~0},
+    /* [369] =  4329 */ {  0, ~0},
+    /* [370] =  4330 */ { 44, ~0},
+    /* [371] =  4331 */ { 24, ~0},
+    /* [372] =  4332 */ {  0, ~0},
+    /* [373] =  4333 */ {  0, ~0},
+    /* [374] =  4334 */ {  0, ~0},
+    /* [375] =  4335 */ {  0, ~0},
+    /* [376] =  4128 */ { 16, ~0},
+    /* [377] =  4129 */ { 16, ~0},
+    /* [378] =  4130 */ { 28, ~0},
+    /* [379] =  4131 */ {  8, ~0},
+    /* [380] =  4132 */ { 12, ~0},
+    /* [381] =  4133 */ { 16, ~0},
+    /* [382] =  4134 */ { 20, ~0},
+    /* [383] =  4135 */ {  0, ~0},
+    /* [384] =  4264 */ {  0, ~0},
+    /* [385] =  4265 */ { 12, ~0},
+    /* [386] =  4266 */ { 12, ~0},
+    /* [387] =  4267 */ { 16, ~0},
+    /* [388] =  4268 */ { 16, ~0},
+    /* [389] =  4269 */ { 12, ~0},
+    /* [390] =  4270 */ { 16, ~0},
+    /* [391] =  4271 */ { 20, ~0},
+    /* [392] =  4272 */ { 24, ~0},
+    /* [393] =  4273 */ { 16, ~0},
+    /* [394] =  4274 */ { 24, ~0},
+    /* [395] =  4275 */ { 32, ~0},
+    /* [396] =  4276 */ { 40, ~0},
+    /* [397] =  4277 */ { 12, ~0},
+    /* [398] =  4278 */ {  0, ~0},
+    /* [399] =  4279 */ {  0, ~0},
+    /* [400] =  4312 */ {  0, ~0},
+    /* [401] =  4313 */ {  0, ~0},
+    /* [402] =  4314 */ {  0, ~0},
+    /* [403] =  4315 */ {  0, ~0},
+    /* [404] =  4316 */ { 12, ~0},
+    /* [405] =  4317 */ {  8, 73},
+    /* [406] =  4318 */ { 20, ~0},
+    /* [407] =  4319 */ { 12, ~0},
 };
 
 static const gl_proto_size_func Render_size_func_table[74] = {
-    __glXCallListsReqSize,
-    __glXBitmapReqSize,
-    __glXFogfvReqSize,
-    __glXFogivReqSize,
-    __glXLightfvReqSize,
-    __glXLightivReqSize,
-    __glXLightModelfvReqSize,
-    __glXLightModelivReqSize,
-    __glXMaterialfvReqSize,
-    __glXMaterialivReqSize,
-    __glXPolygonStippleReqSize,
-    __glXTexParameterfvReqSize,
-    __glXTexParameterivReqSize,
-    __glXTexImage1DReqSize,
-    __glXTexImage2DReqSize,
-    __glXTexEnvfvReqSize,
-    __glXTexEnvivReqSize,
-    __glXTexGendvReqSize,
-    __glXTexGenfvReqSize,
-    __glXTexGenivReqSize,
-    __glXMap1dReqSize,
-    __glXMap1fReqSize,
-    __glXMap2dReqSize,
-    __glXMap2fReqSize,
-    __glXPixelMapfvReqSize,
-    __glXPixelMapuivReqSize,
-    __glXPixelMapusvReqSize,
-    __glXDrawPixelsReqSize,
-    __glXDrawArraysReqSize,
-    __glXColorSubTableReqSize,
-    __glXCompressedTexImage1DARBReqSize,
-    __glXCompressedTexImage2DARBReqSize,
-    __glXCompressedTexImage3DARBReqSize,
-    __glXCompressedTexSubImage1DARBReqSize,
-    __glXCompressedTexSubImage2DARBReqSize,
-    __glXCompressedTexSubImage3DARBReqSize,
-    __glXDrawBuffersARBReqSize,
-    __glXColorTableReqSize,
-    __glXColorTableParameterfvReqSize,
-    __glXColorTableParameterivReqSize,
-    __glXPointParameterfvEXTReqSize,
-    __glXTexSubImage1DReqSize,
-    __glXTexSubImage2DReqSize,
-    __glXConvolutionFilter1DReqSize,
-    __glXConvolutionFilter2DReqSize,
-    __glXConvolutionParameterfvReqSize,
-    __glXConvolutionParameterivReqSize,
-    __glXSeparableFilter2DReqSize,
-    __glXTexImage3DReqSize,
-    __glXTexSubImage3DReqSize,
-    __glXPrioritizeTexturesReqSize,
-    __glXRequestResidentProgramsNVReqSize,
-    __glXLoadProgramNVReqSize,
-    __glXProgramParameters4fvNVReqSize,
-    __glXProgramParameters4dvNVReqSize,
-    __glXVertexAttribs1svNVReqSize,
-    __glXVertexAttribs2svNVReqSize,
-    __glXVertexAttribs3svNVReqSize,
-    __glXVertexAttribs4svNVReqSize,
-    __glXVertexAttribs1fvNVReqSize,
-    __glXVertexAttribs2fvNVReqSize,
-    __glXVertexAttribs3fvNVReqSize,
-    __glXVertexAttribs4fvNVReqSize,
-    __glXVertexAttribs1dvNVReqSize,
-    __glXVertexAttribs2dvNVReqSize,
-    __glXVertexAttribs3dvNVReqSize,
-    __glXVertexAttribs4dvNVReqSize,
-    __glXVertexAttribs4ubvNVReqSize,
-    __glXProgramStringARBReqSize,
-    __glXProgramNamedParameter4fvNVReqSize,
-    __glXProgramNamedParameter4dvNVReqSize,
-    __glXPointParameterivNVReqSize,
-    __glXDeleteFramebuffersEXTReqSize,
-    __glXDeleteRenderbuffersEXTReqSize,
+   __glXCallListsReqSize,
+   __glXBitmapReqSize,
+   __glXFogfvReqSize,
+   __glXFogivReqSize,
+   __glXLightfvReqSize,
+   __glXLightivReqSize,
+   __glXLightModelfvReqSize,
+   __glXLightModelivReqSize,
+   __glXMaterialfvReqSize,
+   __glXMaterialivReqSize,
+   __glXPolygonStippleReqSize,
+   __glXTexParameterfvReqSize,
+   __glXTexParameterivReqSize,
+   __glXTexImage1DReqSize,
+   __glXTexImage2DReqSize,
+   __glXTexEnvfvReqSize,
+   __glXTexEnvivReqSize,
+   __glXTexGendvReqSize,
+   __glXTexGenfvReqSize,
+   __glXTexGenivReqSize,
+   __glXMap1dReqSize,
+   __glXMap1fReqSize,
+   __glXMap2dReqSize,
+   __glXMap2fReqSize,
+   __glXPixelMapfvReqSize,
+   __glXPixelMapuivReqSize,
+   __glXPixelMapusvReqSize,
+   __glXDrawPixelsReqSize,
+   __glXDrawArraysReqSize,
+   __glXColorSubTableReqSize,
+   __glXCompressedTexImage1DReqSize,
+   __glXCompressedTexImage2DReqSize,
+   __glXCompressedTexImage3DReqSize,
+   __glXCompressedTexSubImage1DReqSize,
+   __glXCompressedTexSubImage2DReqSize,
+   __glXCompressedTexSubImage3DReqSize,
+   __glXDrawBuffersReqSize,
+   __glXColorTableReqSize,
+   __glXColorTableParameterfvReqSize,
+   __glXColorTableParameterivReqSize,
+   __glXPointParameterfvReqSize,
+   __glXTexSubImage1DReqSize,
+   __glXTexSubImage2DReqSize,
+   __glXConvolutionFilter1DReqSize,
+   __glXConvolutionFilter2DReqSize,
+   __glXConvolutionParameterfvReqSize,
+   __glXConvolutionParameterivReqSize,
+   __glXSeparableFilter2DReqSize,
+   __glXTexImage3DReqSize,
+   __glXTexSubImage3DReqSize,
+   __glXPrioritizeTexturesReqSize,
+   __glXRequestResidentProgramsNVReqSize,
+   __glXLoadProgramNVReqSize,
+   __glXProgramParameters4fvNVReqSize,
+   __glXProgramParameters4dvNVReqSize,
+   __glXVertexAttribs1svNVReqSize,
+   __glXVertexAttribs2svNVReqSize,
+   __glXVertexAttribs3svNVReqSize,
+   __glXVertexAttribs4svNVReqSize,
+   __glXVertexAttribs1fvNVReqSize,
+   __glXVertexAttribs2fvNVReqSize,
+   __glXVertexAttribs3fvNVReqSize,
+   __glXVertexAttribs4fvNVReqSize,
+   __glXVertexAttribs1dvNVReqSize,
+   __glXVertexAttribs2dvNVReqSize,
+   __glXVertexAttribs3dvNVReqSize,
+   __glXVertexAttribs4dvNVReqSize,
+   __glXVertexAttribs4ubvNVReqSize,
+   __glXProgramStringARBReqSize,
+   __glXProgramNamedParameter4fvNVReqSize,
+   __glXProgramNamedParameter4dvNVReqSize,
+   __glXPointParameterivReqSize,
+   __glXDeleteFramebuffersReqSize,
+   __glXDeleteRenderbuffersReqSize,
 };
 
 const struct __glXDispatchInfo Render_dispatch_info = {
@@ -1671,35 +1495,22 @@ static const int_fast16_t VendorPriv_dispatch_tree[152] = {
 
 static const void *VendorPriv_function_table[104][2] = {
     /* [  0] =     0 */ {NULL, NULL},
-    /* [  1] =     1 */ {__glXDisp_GetConvolutionFilterEXT,
-                         __glXDispSwap_GetConvolutionFilterEXT},
-    /* [  2] =     2 */ {__glXDisp_GetConvolutionParameterfvEXT,
-                         __glXDispSwap_GetConvolutionParameterfvEXT},
-    /* [  3] =     3 */ {__glXDisp_GetConvolutionParameterivEXT,
-                         __glXDispSwap_GetConvolutionParameterivEXT},
-    /* [  4] =     4 */ {__glXDisp_GetSeparableFilterEXT,
-                         __glXDispSwap_GetSeparableFilterEXT},
-    /* [  5] =     5 */ {__glXDisp_GetHistogramEXT,
-                         __glXDispSwap_GetHistogramEXT},
-    /* [  6] =     6 */ {__glXDisp_GetHistogramParameterfvEXT,
-                         __glXDispSwap_GetHistogramParameterfvEXT},
-    /* [  7] =     7 */ {__glXDisp_GetHistogramParameterivEXT,
-                         __glXDispSwap_GetHistogramParameterivEXT},
+    /* [  1] =     1 */ {__glXDisp_GetConvolutionFilterEXT, __glXDispSwap_GetConvolutionFilterEXT},
+    /* [  2] =     2 */ {__glXDisp_GetConvolutionParameterfvEXT, __glXDispSwap_GetConvolutionParameterfvEXT},
+    /* [  3] =     3 */ {__glXDisp_GetConvolutionParameterivEXT, __glXDispSwap_GetConvolutionParameterivEXT},
+    /* [  4] =     4 */ {__glXDisp_GetSeparableFilterEXT, __glXDispSwap_GetSeparableFilterEXT},
+    /* [  5] =     5 */ {__glXDisp_GetHistogramEXT, __glXDispSwap_GetHistogramEXT},
+    /* [  6] =     6 */ {__glXDisp_GetHistogramParameterfvEXT, __glXDispSwap_GetHistogramParameterfvEXT},
+    /* [  7] =     7 */ {__glXDisp_GetHistogramParameterivEXT, __glXDispSwap_GetHistogramParameterivEXT},
     /* [  8] =     8 */ {__glXDisp_GetMinmaxEXT, __glXDispSwap_GetMinmaxEXT},
-    /* [  9] =     9 */ {__glXDisp_GetMinmaxParameterfvEXT,
-                         __glXDispSwap_GetMinmaxParameterfvEXT},
-    /* [ 10] =    10 */ {__glXDisp_GetMinmaxParameterivEXT,
-                         __glXDispSwap_GetMinmaxParameterivEXT},
-    /* [ 11] =    11 */ {__glXDisp_AreTexturesResidentEXT,
-                         __glXDispSwap_AreTexturesResidentEXT},
-    /* [ 12] =    12 */ {__glXDisp_DeleteTexturesEXT,
-                         __glXDispSwap_DeleteTexturesEXT},
-    /* [ 13] =    13 */ {__glXDisp_GenTexturesEXT,
-                         __glXDispSwap_GenTexturesEXT},
+    /* [  9] =     9 */ {__glXDisp_GetMinmaxParameterfvEXT, __glXDispSwap_GetMinmaxParameterfvEXT},
+    /* [ 10] =    10 */ {__glXDisp_GetMinmaxParameterivEXT, __glXDispSwap_GetMinmaxParameterivEXT},
+    /* [ 11] =    11 */ {__glXDisp_AreTexturesResidentEXT, __glXDispSwap_AreTexturesResidentEXT},
+    /* [ 12] =    12 */ {__glXDisp_DeleteTexturesEXT, __glXDispSwap_DeleteTexturesEXT},
+    /* [ 13] =    13 */ {__glXDisp_GenTexturesEXT, __glXDispSwap_GenTexturesEXT},
     /* [ 14] =    14 */ {__glXDisp_IsTextureEXT, __glXDispSwap_IsTextureEXT},
     /* [ 15] =    15 */ {NULL, NULL},
-    /* [ 16] =  1024 */ {__glXDisp_QueryContextInfoEXT,
-                         __glXDispSwap_QueryContextInfoEXT},
+    /* [ 16] =  1024 */ {__glXDisp_QueryContextInfoEXT, __glXDispSwap_QueryContextInfoEXT},
     /* [ 17] =  1025 */ {NULL, NULL},
     /* [ 18] =  1026 */ {NULL, NULL},
     /* [ 19] =  1027 */ {NULL, NULL},
@@ -1707,52 +1518,34 @@ static const void *VendorPriv_function_table[104][2] = {
     /* [ 21] =  1029 */ {NULL, NULL},
     /* [ 22] =  1030 */ {NULL, NULL},
     /* [ 23] =  1031 */ {NULL, NULL},
-    /* [ 24] =  1296 */ {__glXDisp_GetProgramEnvParameterfvARB,
-                         __glXDispSwap_GetProgramEnvParameterfvARB},
-    /* [ 25] =  1297 */ {__glXDisp_GetProgramEnvParameterdvARB,
-                         __glXDispSwap_GetProgramEnvParameterdvARB},
-    /* [ 26] =  1298 */ {__glXDisp_GetProgramivNV,
-                         __glXDispSwap_GetProgramivNV},
-    /* [ 27] =  1299 */ {__glXDisp_GetProgramStringNV,
-                         __glXDispSwap_GetProgramStringNV},
-    /* [ 28] =  1300 */ {__glXDisp_GetTrackMatrixivNV,
-                         __glXDispSwap_GetTrackMatrixivNV},
-    /* [ 29] =  1301 */ {__glXDisp_GetVertexAttribdvARB,
-                         __glXDispSwap_GetVertexAttribdvARB},
-    /* [ 30] =  1302 */ {__glXDisp_GetVertexAttribfvARB,
-                         __glXDispSwap_GetVertexAttribfvARB},
-    /* [ 31] =  1303 */ {__glXDisp_GetVertexAttribivNV,
-                         __glXDispSwap_GetVertexAttribivNV},
-    /* [ 32] =  1304 */ {__glXDisp_IsProgramNV, __glXDispSwap_IsProgramNV},
-    /* [ 33] =  1305 */ {__glXDisp_GetProgramLocalParameterfvARB,
-                         __glXDispSwap_GetProgramLocalParameterfvARB},
-    /* [ 34] =  1306 */ {__glXDisp_GetProgramLocalParameterdvARB,
-                         __glXDispSwap_GetProgramLocalParameterdvARB},
-    /* [ 35] =  1307 */ {__glXDisp_GetProgramivARB,
-                         __glXDispSwap_GetProgramivARB},
-    /* [ 36] =  1308 */ {__glXDisp_GetProgramStringARB,
-                         __glXDispSwap_GetProgramStringARB},
+    /* [ 24] =  1296 */ {__glXDisp_GetProgramEnvParameterfvARB, __glXDispSwap_GetProgramEnvParameterfvARB},
+    /* [ 25] =  1297 */ {__glXDisp_GetProgramParameterdvNV, __glXDispSwap_GetProgramParameterdvNV},
+    /* [ 26] =  1298 */ {__glXDisp_GetProgramivNV, __glXDispSwap_GetProgramivNV},
+    /* [ 27] =  1299 */ {__glXDisp_GetProgramStringNV, __glXDispSwap_GetProgramStringNV},
+    /* [ 28] =  1300 */ {__glXDisp_GetTrackMatrixivNV, __glXDispSwap_GetTrackMatrixivNV},
+    /* [ 29] =  1301 */ {__glXDisp_GetVertexAttribdv, __glXDispSwap_GetVertexAttribdv},
+    /* [ 30] =  1302 */ {__glXDisp_GetVertexAttribfvNV, __glXDispSwap_GetVertexAttribfvNV},
+    /* [ 31] =  1303 */ {__glXDisp_GetVertexAttribivNV, __glXDispSwap_GetVertexAttribivNV},
+    /* [ 32] =  1304 */ {__glXDisp_IsProgramARB, __glXDispSwap_IsProgramARB},
+    /* [ 33] =  1305 */ {__glXDisp_GetProgramLocalParameterfvARB, __glXDispSwap_GetProgramLocalParameterfvARB},
+    /* [ 34] =  1306 */ {__glXDisp_GetProgramLocalParameterdvARB, __glXDispSwap_GetProgramLocalParameterdvARB},
+    /* [ 35] =  1307 */ {__glXDisp_GetProgramivARB, __glXDispSwap_GetProgramivARB},
+    /* [ 36] =  1308 */ {__glXDisp_GetProgramStringARB, __glXDispSwap_GetProgramStringARB},
     /* [ 37] =  1309 */ {NULL, NULL},
-    /* [ 38] =  1310 */ {__glXDisp_GetProgramNamedParameterfvNV,
-                         __glXDispSwap_GetProgramNamedParameterfvNV},
-    /* [ 39] =  1311 */ {__glXDisp_GetProgramNamedParameterdvNV,
-                         __glXDispSwap_GetProgramNamedParameterdvNV},
+    /* [ 38] =  1310 */ {__glXDisp_GetProgramNamedParameterfvNV, __glXDispSwap_GetProgramNamedParameterfvNV},
+    /* [ 39] =  1311 */ {__glXDisp_GetProgramNamedParameterdvNV, __glXDispSwap_GetProgramNamedParameterdvNV},
     /* [ 40] =  1288 */ {NULL, NULL},
     /* [ 41] =  1289 */ {NULL, NULL},
     /* [ 42] =  1290 */ {NULL, NULL},
     /* [ 43] =  1291 */ {NULL, NULL},
     /* [ 44] =  1292 */ {NULL, NULL},
-    /* [ 45] =  1293 */ {__glXDisp_AreProgramsResidentNV,
-                         __glXDispSwap_AreProgramsResidentNV},
-    /* [ 46] =  1294 */ {__glXDisp_DeleteProgramsNV,
-                         __glXDispSwap_DeleteProgramsNV},
-    /* [ 47] =  1295 */ {__glXDisp_GenProgramsNV, __glXDispSwap_GenProgramsNV},
+    /* [ 45] =  1293 */ {__glXDisp_AreProgramsResidentNV, __glXDispSwap_AreProgramsResidentNV},
+    /* [ 46] =  1294 */ {__glXDisp_DeleteProgramsARB, __glXDispSwap_DeleteProgramsARB},
+    /* [ 47] =  1295 */ {__glXDisp_GenProgramsARB, __glXDispSwap_GenProgramsARB},
     /* [ 48] =  1328 */ {NULL, NULL},
     /* [ 49] =  1329 */ {NULL, NULL},
-    /* [ 50] =  1330 */ {__glXDisp_BindTexImageEXT,
-                         __glXDispSwap_BindTexImageEXT},
-    /* [ 51] =  1331 */ {__glXDisp_ReleaseTexImageEXT,
-                         __glXDispSwap_ReleaseTexImageEXT},
+    /* [ 50] =  1330 */ {__glXDisp_BindTexImageEXT, __glXDispSwap_BindTexImageEXT},
+    /* [ 51] =  1331 */ {__glXDisp_ReleaseTexImageEXT, __glXDispSwap_ReleaseTexImageEXT},
     /* [ 52] =  1332 */ {NULL, NULL},
     /* [ 53] =  1333 */ {NULL, NULL},
     /* [ 54] =  1334 */ {NULL, NULL},
@@ -1763,63 +1556,43 @@ static const void *VendorPriv_function_table[104][2] = {
     /* [ 59] =  1419 */ {NULL, NULL},
     /* [ 60] =  1420 */ {NULL, NULL},
     /* [ 61] =  1421 */ {NULL, NULL},
-    /* [ 62] =  1422 */ {__glXDisp_IsRenderbufferEXT,
-                         __glXDispSwap_IsRenderbufferEXT},
-    /* [ 63] =  1423 */ {__glXDisp_GenRenderbuffersEXT,
-                         __glXDispSwap_GenRenderbuffersEXT},
-    /* [ 64] =  1424 */ {__glXDisp_GetRenderbufferParameterivEXT,
-                         __glXDispSwap_GetRenderbufferParameterivEXT},
-    /* [ 65] =  1425 */ {__glXDisp_IsFramebufferEXT,
-                         __glXDispSwap_IsFramebufferEXT},
-    /* [ 66] =  1426 */ {__glXDisp_GenFramebuffersEXT,
-                         __glXDispSwap_GenFramebuffersEXT},
-    /* [ 67] =  1427 */ {__glXDisp_CheckFramebufferStatusEXT,
-                         __glXDispSwap_CheckFramebufferStatusEXT},
-    /* [ 68] =  1428 */ {__glXDisp_GetFramebufferAttachmentParameterivEXT,
-                         __glXDispSwap_GetFramebufferAttachmentParameterivEXT},
+    /* [ 62] =  1422 */ {__glXDisp_IsRenderbuffer, __glXDispSwap_IsRenderbuffer},
+    /* [ 63] =  1423 */ {__glXDisp_GenRenderbuffers, __glXDispSwap_GenRenderbuffers},
+    /* [ 64] =  1424 */ {__glXDisp_GetRenderbufferParameteriv, __glXDispSwap_GetRenderbufferParameteriv},
+    /* [ 65] =  1425 */ {__glXDisp_IsFramebuffer, __glXDispSwap_IsFramebuffer},
+    /* [ 66] =  1426 */ {__glXDisp_GenFramebuffers, __glXDispSwap_GenFramebuffers},
+    /* [ 67] =  1427 */ {__glXDisp_CheckFramebufferStatus, __glXDispSwap_CheckFramebufferStatus},
+    /* [ 68] =  1428 */ {__glXDisp_GetFramebufferAttachmentParameteriv, __glXDispSwap_GetFramebufferAttachmentParameteriv},
     /* [ 69] =  1429 */ {NULL, NULL},
     /* [ 70] =  1430 */ {NULL, NULL},
     /* [ 71] =  1431 */ {NULL, NULL},
     /* [ 72] =  4096 */ {NULL, NULL},
     /* [ 73] =  4097 */ {NULL, NULL},
-    /* [ 74] =  4098 */ {__glXDisp_GetColorTableSGI,
-                         __glXDispSwap_GetColorTableSGI},
-    /* [ 75] =  4099 */ {__glXDisp_GetColorTableParameterfvSGI,
-                         __glXDispSwap_GetColorTableParameterfvSGI},
-    /* [ 76] =  4100 */ {__glXDisp_GetColorTableParameterivSGI,
-                         __glXDispSwap_GetColorTableParameterivSGI},
+    /* [ 74] =  4098 */ {__glXDisp_GetColorTableSGI, __glXDispSwap_GetColorTableSGI},
+    /* [ 75] =  4099 */ {__glXDisp_GetColorTableParameterfvSGI, __glXDispSwap_GetColorTableParameterfvSGI},
+    /* [ 76] =  4100 */ {__glXDisp_GetColorTableParameterivSGI, __glXDispSwap_GetColorTableParameterivSGI},
     /* [ 77] =  4101 */ {NULL, NULL},
     /* [ 78] =  4102 */ {NULL, NULL},
     /* [ 79] =  4103 */ {NULL, NULL},
     /* [ 80] =  5152 */ {NULL, NULL},
     /* [ 81] =  5153 */ {NULL, NULL},
-    /* [ 82] =  5154 */ {__glXDisp_CopySubBufferMESA,
-                         __glXDispSwap_CopySubBufferMESA},
+    /* [ 82] =  5154 */ {__glXDisp_CopySubBufferMESA, __glXDispSwap_CopySubBufferMESA},
     /* [ 83] =  5155 */ {NULL, NULL},
     /* [ 84] =  5156 */ {NULL, NULL},
     /* [ 85] =  5157 */ {NULL, NULL},
     /* [ 86] =  5158 */ {NULL, NULL},
     /* [ 87] =  5159 */ {NULL, NULL},
-    /* [ 88] = 65536 */ {__glXDisp_SwapIntervalSGI,
-                         __glXDispSwap_SwapIntervalSGI},
-    /* [ 89] = 65537 */ {__glXDisp_MakeCurrentReadSGI,
-                         __glXDispSwap_MakeCurrentReadSGI},
+    /* [ 88] = 65536 */ {__glXDisp_SwapIntervalSGI, __glXDispSwap_SwapIntervalSGI},
+    /* [ 89] = 65537 */ {__glXDisp_MakeCurrentReadSGI, __glXDispSwap_MakeCurrentReadSGI},
     /* [ 90] = 65538 */ {NULL, NULL},
     /* [ 91] = 65539 */ {NULL, NULL},
-    /* [ 92] = 65540 */ {__glXDisp_GetFBConfigsSGIX,
-                         __glXDispSwap_GetFBConfigsSGIX},
-    /* [ 93] = 65541 */ {__glXDisp_CreateContextWithConfigSGIX,
-                         __glXDispSwap_CreateContextWithConfigSGIX},
-    /* [ 94] = 65542 */ {__glXDisp_CreateGLXPixmapWithConfigSGIX,
-                         __glXDispSwap_CreateGLXPixmapWithConfigSGIX},
-    /* [ 95] = 65543 */ {__glXDisp_CreateGLXPbufferSGIX,
-                         __glXDispSwap_CreateGLXPbufferSGIX},
-    /* [ 96] = 65544 */ {__glXDisp_DestroyGLXPbufferSGIX,
-                         __glXDispSwap_DestroyGLXPbufferSGIX},
-    /* [ 97] = 65545 */ {__glXDisp_ChangeDrawableAttributesSGIX,
-                         __glXDispSwap_ChangeDrawableAttributesSGIX},
-    /* [ 98] = 65546 */ {__glXDisp_GetDrawableAttributesSGIX,
-                         __glXDispSwap_GetDrawableAttributesSGIX},
+    /* [ 92] = 65540 */ {__glXDisp_GetFBConfigsSGIX, __glXDispSwap_GetFBConfigsSGIX},
+    /* [ 93] = 65541 */ {__glXDisp_CreateContextWithConfigSGIX, __glXDispSwap_CreateContextWithConfigSGIX},
+    /* [ 94] = 65542 */ {__glXDisp_CreateGLXPixmapWithConfigSGIX, __glXDispSwap_CreateGLXPixmapWithConfigSGIX},
+    /* [ 95] = 65543 */ {__glXDisp_CreateGLXPbufferSGIX, __glXDispSwap_CreateGLXPbufferSGIX},
+    /* [ 96] = 65544 */ {__glXDisp_DestroyGLXPbufferSGIX, __glXDispSwap_DestroyGLXPbufferSGIX},
+    /* [ 97] = 65545 */ {__glXDisp_ChangeDrawableAttributesSGIX, __glXDispSwap_ChangeDrawableAttributesSGIX},
+    /* [ 98] = 65546 */ {__glXDisp_GetDrawableAttributesSGIX, __glXDispSwap_GetDrawableAttributesSGIX},
     /* [ 99] = 65547 */ {NULL, NULL},
     /* [ 100] = 65548 */ {NULL, NULL},
     /* [ 101] = 65549 */ {NULL, NULL},
@@ -1834,3 +1607,4 @@ const struct __glXDispatchInfo VendorPriv_dispatch_info = {
     NULL,
     NULL
 };
+
diff --git a/xorg-server/glx/indirect_texture_compression.c b/xorg-server/glx/indirect_texture_compression.c
index 5c2d06b42..a1a946e5c 100644
--- a/xorg-server/glx/indirect_texture_compression.c
+++ b/xorg-server/glx/indirect_texture_compression.c
@@ -26,6 +26,7 @@
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
+#include "glheader.h"
 
 #include "glxserver.h"
 #include "glxbyteorder.h"
@@ -34,13 +35,14 @@
 #include "unpack.h"
 #include "indirect_size_get.h"
 #include "indirect_dispatch.h"
+#include "GL/gl.h"
 #include "glapitable.h"
 #include "glapi.h"
 #include "glthread.h"
 #include "dispatch.h"
 
 int
-__glXDisp_GetCompressedTexImageARB(struct __GLXclientStateRec *cl, GLbyte * pc)
+__glXDisp_GetCompressedTexImage(struct __GLXclientStateRec *cl, GLbyte * pc)
 {
     xGLXSingleReq *const req = (xGLXSingleReq *) pc;
     int error;
@@ -62,7 +64,7 @@ __glXDisp_GetCompressedTexImageARB(struct __GLXclientStateRec *cl, GLbyte * pc)
         if (compsize != 0) {
             __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
             __glXClearErrorOccured();
-            CALL_GetCompressedTexImageARB(GET_DISPATCH(),
+            CALL_GetCompressedTexImage(GET_DISPATCH(),
                                           (target, level, answer));
         }
 
@@ -84,7 +86,7 @@ __glXDisp_GetCompressedTexImageARB(struct __GLXclientStateRec *cl, GLbyte * pc)
 }
 
 int
-__glXDispSwap_GetCompressedTexImageARB(struct __GLXclientStateRec *cl,
+__glXDispSwap_GetCompressedTexImage(struct __GLXclientStateRec *cl,
                                        GLbyte * pc)
 {
     xGLXSingleReq *const req = (xGLXSingleReq *) pc;
@@ -108,7 +110,7 @@ __glXDispSwap_GetCompressedTexImageARB(struct __GLXclientStateRec *cl,
         if (compsize != 0) {
             __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
             __glXClearErrorOccured();
-            CALL_GetCompressedTexImageARB(GET_DISPATCH(),
+            CALL_GetCompressedTexImage(GET_DISPATCH(),
                                           (target, level, answer));
         }
 
diff --git a/xorg-server/glx/indirect_util.c b/xorg-server/glx/indirect_util.c
index a30b1f880..8ab5afb16 100644
--- a/xorg-server/glx/indirect_util.c
+++ b/xorg-server/glx/indirect_util.c
@@ -26,6 +26,7 @@
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
+#include "glheader.h"
 
 #include <string.h>
 
diff --git a/xorg-server/glx/makefile b/xorg-server/glx/makefile
new file mode 100644
index 000000000..89aa37658
--- /dev/null
+++ b/xorg-server/glx/makefile
@@ -0,0 +1,45 @@
+LIBRARY=libglx

+

+DEFINES += GLAPIENTRY=__stdcall _GLAPI_NO_EXPORTS

+

+

+glapi_sources =					\

+	indirect_dispatch.c			\

+	indirect_dispatch_swap.c		\

+	indirect_reqsize.c			\

+	indirect_size_get.c			\

+	indirect_table.c			\

+	glapi.c					\

+	glthread.c				\

+

+

+CSRCS = \

+	$(indirect_sources) \

+	$(glapi_sources) \

+	clientinfo.c \

+	createcontext.c \

+	extension_string.c \

+	indirect_util.c \

+	indirect_program.c \

+	indirect_texture_compression.c \

+        glxcmds.c \

+        glxcmdsswap.c \

+        glxext.c \

+	glxdriswrast.c \

+	glxdricommon.c \

+        glxscreens.c \

+        render2.c \

+        render2swap.c \

+        renderpix.c \

+        renderpixswap.c \

+        rensize.c \

+        single2.c \

+        single2swap.c \

+        singlepix.c \

+        singlepixswap.c \

+        singlesize.c \

+        swap_interval.c \

+        xfont.c

+

+INCLUDES := $(MHMAKECONF)\mesalib\include $(INCLUDES)

+

diff --git a/xorg-server/glx/render2.c b/xorg-server/glx/render2.c
index 8cf74a691..01e33d5c9 100644
--- a/xorg-server/glx/render2.c
+++ b/xorg-server/glx/render2.c
@@ -31,6 +31,7 @@
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
+#include "glheader.h"
 
 #include <glxserver.h>
 #include "unpack.h"
@@ -242,12 +243,12 @@ __glXDisp_DrawArrays(GLbyte * pc)
             break;
         case GL_SECONDARY_COLOR_ARRAY:
             CALL_EnableClientState(GET_DISPATCH(), (GL_SECONDARY_COLOR_ARRAY));
-            CALL_SecondaryColorPointerEXT(GET_DISPATCH(),
+            CALL_SecondaryColorPointer(GET_DISPATCH(),
                                           (numVals, datatype, stride, pc));
             break;
         case GL_FOG_COORD_ARRAY:
             CALL_EnableClientState(GET_DISPATCH(), (GL_FOG_COORD_ARRAY));
-            CALL_FogCoordPointerEXT(GET_DISPATCH(), (datatype, stride, pc));
+            CALL_FogCoordPointer(GET_DISPATCH(), (datatype, stride, pc));
             break;
         default:
             break;
diff --git a/xorg-server/glx/render2swap.c b/xorg-server/glx/render2swap.c
index 8b5d9daff..435fa26ad 100644
--- a/xorg-server/glx/render2swap.c
+++ b/xorg-server/glx/render2swap.c
@@ -31,6 +31,7 @@
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
+#include "glheader.h"
 
 #include "glxserver.h"
 #include "unpack.h"
@@ -364,12 +365,12 @@ __glXDispSwap_DrawArrays(GLbyte * pc)
             break;
         case GL_SECONDARY_COLOR_ARRAY:
             CALL_EnableClientState(GET_DISPATCH(), (GL_SECONDARY_COLOR_ARRAY));
-            CALL_SecondaryColorPointerEXT(GET_DISPATCH(),
+            CALL_SecondaryColorPointer(GET_DISPATCH(),
                                           (numVals, datatype, stride, pc));
             break;
         case GL_FOG_COORD_ARRAY:
             CALL_EnableClientState(GET_DISPATCH(), (GL_FOG_COORD_ARRAY));
-            CALL_FogCoordPointerEXT(GET_DISPATCH(), (datatype, stride, pc));
+            CALL_FogCoordPointer(GET_DISPATCH(), (datatype, stride, pc));
             break;
         default:
             break;
diff --git a/xorg-server/glx/renderpix.c b/xorg-server/glx/renderpix.c
index 6fccde61f..97c5b9c7f 100644
--- a/xorg-server/glx/renderpix.c
+++ b/xorg-server/glx/renderpix.c
@@ -31,6 +31,7 @@
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
+#include "glheader.h"
 
 #include "glxserver.h"
 #include "unpack.h"
diff --git a/xorg-server/glx/renderpixswap.c b/xorg-server/glx/renderpixswap.c
index 24423cdef..79392409b 100644
--- a/xorg-server/glx/renderpixswap.c
+++ b/xorg-server/glx/renderpixswap.c
@@ -31,6 +31,7 @@
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
+#include "glheader.h"
 
 #include "glxserver.h"
 #include "unpack.h"
diff --git a/xorg-server/glx/rensize.c b/xorg-server/glx/rensize.c
index bcc3a53ad..38a7bf0ec 100644
--- a/xorg-server/glx/rensize.c
+++ b/xorg-server/glx/rensize.c
@@ -30,6 +30,10 @@
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#else
+
+#include "glheader.h"
+
 #endif
 
 #include <GL/gl.h>
@@ -226,12 +230,14 @@ __glXImageSize(GLenum format, GLenum type, GLenum target,
         case GL_INTENSITY:
             elementsPerGroup = 1;
             break;
+        case GL_RG:
         case GL_422_EXT:
         case GL_422_REV_EXT:
         case GL_422_AVERAGE_EXT:
         case GL_422_REV_AVERAGE_EXT:
         case GL_DEPTH_STENCIL_NV:
         case GL_DEPTH_STENCIL_MESA:
+        case GL_YCBCR_422_APPLE:
         case GL_YCBCR_MESA:
         case GL_LUMINANCE_ALPHA:
             elementsPerGroup = 2;
diff --git a/xorg-server/glx/single2.c b/xorg-server/glx/single2.c
index 9597d29fe..4bf65ed93 100644
--- a/xorg-server/glx/single2.c
+++ b/xorg-server/glx/single2.c
@@ -31,6 +31,7 @@
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
+#include "glheader.h"
 
 #include <string.h>
 #include <stdio.h>
@@ -193,14 +194,12 @@ __glXDisp_RenderMode(__GLXclientState * cl, GLbyte * pc)
      */
  noChangeAllowed:;
     client = cl->client;
-    reply = (xGLXRenderModeReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = nitems,
-        .retval = retval,
-        .size = nitems,
-        .newMode = newMode
-    };
+    reply.type = X_Reply;
+    reply.sequenceNumber = client->sequence;
+    reply.length = nitems;
+    reply.retval = retval;
+    reply.size = nitems;
+    reply.newMode = newMode;
     WriteToClient(client, sz_xGLXRenderModeReply, &reply);
     if (retBytes) {
         WriteToClient(client, retBytes, retBuffer);
diff --git a/xorg-server/glx/single2swap.c b/xorg-server/glx/single2swap.c
index 1ca532836..47ff3e4c7 100644
--- a/xorg-server/glx/single2swap.c
+++ b/xorg-server/glx/single2swap.c
@@ -31,6 +31,7 @@
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
+#include "glheader.h"
 
 #include "glxserver.h"
 #include "glxutil.h"
@@ -205,14 +206,12 @@ __glXDispSwap_RenderMode(__GLXclientState * cl, GLbyte * pc)
      */
  noChangeAllowed:;
     client = cl->client;
-    reply = (xGLXRenderModeReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = nitems,
-        .retval = retval,
-        .size = nitems,
-        .newMode = newMode
-    };
+    reply.type = X_Reply;
+    reply.sequenceNumber = client->sequence;
+    reply.length = nitems;
+    reply.retval = retval;
+    reply.size = nitems;
+    reply.newMode = newMode;
     __GLX_SWAP_SHORT(&reply.sequenceNumber);
     __GLX_SWAP_INT(&reply.length);
     __GLX_SWAP_INT(&reply.retval);
diff --git a/xorg-server/glx/singlepix.c b/xorg-server/glx/singlepix.c
index fb6868d2d..10fd651df 100644
--- a/xorg-server/glx/singlepix.c
+++ b/xorg-server/glx/singlepix.c
@@ -31,6 +31,7 @@
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
+#include "glheader.h"
 
 #include "glxserver.h"
 #include "glxext.h"
diff --git a/xorg-server/glx/singlepixswap.c b/xorg-server/glx/singlepixswap.c
index c777cea00..7e20ed6bb 100644
--- a/xorg-server/glx/singlepixswap.c
+++ b/xorg-server/glx/singlepixswap.c
@@ -31,6 +31,7 @@
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
+#include "glheader.h"
 
 #include "glxserver.h"
 #include "glxext.h"
diff --git a/xorg-server/glx/singlesize.c b/xorg-server/glx/singlesize.c
index 777ebb35e..5cfac92f8 100644
--- a/xorg-server/glx/singlesize.c
+++ b/xorg-server/glx/singlesize.c
@@ -31,6 +31,7 @@
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
+#include "glheader.h"
 
 #include <GL/gl.h>
 #include "glxserver.h"
diff --git a/xorg-server/glx/swap_interval.c b/xorg-server/glx/swap_interval.c
index 7533d2642..4eb97a535 100644
--- a/xorg-server/glx/swap_interval.c
+++ b/xorg-server/glx/swap_interval.c
@@ -25,6 +25,7 @@
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
+#include "glheader.h"
 
 #include "glxserver.h"
 #include "glxutil.h"
diff --git a/xorg-server/glx/xfont.c b/xorg-server/glx/xfont.c
index b203866d9..5a7a8bfcd 100644
--- a/xorg-server/glx/xfont.c
+++ b/xorg-server/glx/xfont.c
@@ -31,6 +31,7 @@
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
+#include "glheader.h"
 
 #include "glxserver.h"
 #include "glxutil.h"
diff --git a/xorg-server/hw/dmx/dmxinit.c b/xorg-server/hw/dmx/dmxinit.c
index 7de402b06..ec8a59e0d 100644
--- a/xorg-server/hw/dmx/dmxinit.c
+++ b/xorg-server/hw/dmx/dmxinit.c
@@ -898,6 +898,7 @@ AbortDDX(enum ExitCode error)
 }
 
 #ifdef DDXBEFORERESET
+/* This function is called in Xserver/dix/dispatch.c */
 void
 ddxBeforeReset(void)
 {
diff --git a/xorg-server/hw/kdrive/ephyr/ephyr.c b/xorg-server/hw/kdrive/ephyr/ephyr.c
index e6520d035..978fd93ef 100644
--- a/xorg-server/hw/kdrive/ephyr/ephyr.c
+++ b/xorg-server/hw/kdrive/ephyr/ephyr.c
@@ -60,8 +60,11 @@ Bool EphyrWantGrayScale = 0;
 Bool
 ephyrInitialize(KdCardInfo * card, EphyrPriv * priv)
 {
+#ifdef _MSC_VER
+  __asm int 3;
+#else
     OsSignal(SIGUSR1, hostx_handle_signal);
-
+#endif  
     priv->base = 0;
     priv->bytes_per_line = 0;
     return TRUE;
@@ -797,6 +800,14 @@ ephyrUpdateModifierState(unsigned int state)
     }
 }
 
+#ifdef _MSC_VER
+    __asm int 3;
+#else
+#endif
+#ifdef _MSC_VER
+    __asm int 3;
+#else
+#endif
 static Bool
 ephyrCursorOffScreen(ScreenPtr *ppScreen, int *x, int *y)
 {
diff --git a/xorg-server/hw/kdrive/ephyr/ephyr.h b/xorg-server/hw/kdrive/ephyr/ephyr.h
index be910c19e..1e9b930c7 100644
--- a/xorg-server/hw/kdrive/ephyr/ephyr.h
+++ b/xorg-server/hw/kdrive/ephyr/ephyr.h
@@ -26,9 +26,11 @@
 #ifndef _EPHYR_H_
 #define _EPHYR_H_
 #include <stdio.h>
+#ifndef _MSC_VER
 #include <unistd.h>
-#include <signal.h>
 #include <libgen.h>
+#endif
+#include <signal.h>
 
 #include "os.h"                 /* for OsSignal() */
 #include "kdrive.h"
@@ -177,6 +179,8 @@ extern void ephyrCursorEnable(ScreenPtr pScreen);
 
 extern int ephyrBufferHeight(KdScreenInfo * screen);
 
+extern int ephyrBufferHeight(KdScreenInfo *screen);
+
 /* ephyr_draw.c */
 
 Bool
diff --git a/xorg-server/hw/kdrive/ephyr/ephyrinit.c b/xorg-server/hw/kdrive/ephyr/ephyrinit.c
index 5e2eb672f..d7719e281 100644
--- a/xorg-server/hw/kdrive/ephyr/ephyrinit.c
+++ b/xorg-server/hw/kdrive/ephyr/ephyrinit.c
@@ -53,6 +53,7 @@ InitCard(char *name)
     KdCardInfoAdd(&ephyrFuncs, 0);
 }
 
+#ifndef _MSC_VER
 void
 InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
 {
@@ -130,6 +131,7 @@ ddxUseMsg(void)
 
     exit(1);
 }
+#endif
 
 void
 processScreenArg(char *screen_size, char *parent_id)
@@ -157,6 +159,7 @@ processScreenArg(char *screen_size, char *parent_id)
     }
 }
 
+#ifndef _MSC_VER
 int
 ddxProcessArgument(int argc, char **argv, int i)
 {
@@ -298,6 +301,15 @@ OsVendorInit(void)
     KdOsInit(&EphyrOsFuncs);
 }
 
+#ifdef DDXOSFATALERROR
+void
+OsVendorFatalError(void)
+{
+}
+#endif
+
+#endif
+
 /* 'Fake' cursor stuff, could be improved */
 
 static Bool
diff --git a/xorg-server/hw/kdrive/ephyr/ephyrlog.h b/xorg-server/hw/kdrive/ephyr/ephyrlog.h
index 0da0a2518..6671c4779 100644
--- a/xorg-server/hw/kdrive/ephyr/ephyrlog.h
+++ b/xorg-server/hw/kdrive/ephyr/ephyrlog.h
@@ -43,14 +43,14 @@
 #ifndef EPHYR_LOG
 #define EPHYR_LOG(...) \
 LogMessageVerb(X_NOTICE, INFO_LOG_LEVEL, "in %s:%d:%s: ",\
-                      __FILE__, __LINE__, __func__) ; \
+                      __FILE__, __LINE__, __FUNCTION__) ; \
 LogMessageVerb(X_NOTICE, INFO_LOG_LEVEL, __VA_ARGS__)
 #endif                          /*nomadik_log */
 
 #ifndef EPHYR_LOG_ERROR
 #define EPHYR_LOG_ERROR(...) \
 LogMessageVerb(X_NOTICE, ERROR_LOG_LEVEL, "Error:in %s:%d:%s: ",\
-                      __FILE__, __LINE__, __func__) ; \
+                      __FILE__, __LINE__, __FUNCTION__) ; \
 LogMessageVerb(X_NOTICE, ERROR_LOG_LEVEL, __VA_ARGS__)
 #endif                          /*EPHYR_LOG_ERROR */
 
diff --git a/xorg-server/hw/kdrive/ephyr/hostx.c b/xorg-server/hw/kdrive/ephyr/hostx.c
index 157ac36b2..be5ac6bd5 100644
--- a/xorg-server/hw/kdrive/ephyr/hostx.c
+++ b/xorg-server/hw/kdrive/ephyr/hostx.c
@@ -47,9 +47,11 @@
 #include <errno.h>
 #include <time.h>
 
+#ifndef _MSC_VER
 #include <sys/ipc.h>
 #include <sys/shm.h>
 #include <sys/time.h>
+#endif
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
@@ -198,7 +200,11 @@ hostx_add_screen(EphyrScreenInfo screen, unsigned long win_id, int screen_num)
 void
 hostx_set_display_name(char *name)
 {
+#ifdef _MSC_VER
+  __asm int 3;
+#else
     HostX.server_dpy_name = strdup(name);
+#endif
 }
 
 void
@@ -462,6 +468,9 @@ hostx_init(void)
     }
     /* Try to get share memory ximages for a little bit more speed */
 
+#ifdef _MSC_VER
+  __asm int 3;
+#else
     if (!XShmQueryExtension(HostX.dpy) || getenv("XEPHYR_NO_SHM")) {
         fprintf(stderr, "\nXephyr unable to use SHM XImages\n");
         HostX.have_shm = False;
@@ -489,6 +498,7 @@ hostx_init(void)
         shmdt(shminfo.shmaddr);
         shmctl(shminfo.shmid, IPC_RMID, 0);
     }
+#endif
 
     XFlush(HostX.dpy);
 
@@ -626,7 +636,7 @@ hostx_screen_init(EphyrScreenInfo screen,
     struct EphyrHostScreen *host_screen = host_screen_from_screen_info(screen);
 
     if (!host_screen) {
-        fprintf(stderr, "%s: Error in accessing hostx data\n", __func__);
+        fprintf(stderr, "%s: Error in accessing hostx data\n", __FUNCTION__);
         exit(1);
     }
 
@@ -639,10 +649,14 @@ hostx_screen_init(EphyrScreenInfo screen,
          */
 
         if (HostX.have_shm) {
+#ifdef _MSC_VER
+	  __asm int 3;
+#else
             XShmDetach(HostX.dpy, &host_screen->shminfo);
             XDestroyImage(host_screen->ximg);
             shmdt(host_screen->shminfo.shmaddr);
             shmctl(host_screen->shminfo.shmid, IPC_RMID, 0);
+#endif
         }
         else {
             free(host_screen->ximg->data);
@@ -654,6 +668,10 @@ hostx_screen_init(EphyrScreenInfo screen,
 
     if (HostX.have_shm) {
         host_screen->ximg =
+#ifdef _MSC_VER
+__asm int 3;
+#else
+        host_screen->ximg =
             XShmCreateImage(HostX.dpy, HostX.visual, HostX.depth, ZPixmap, NULL,
                             &host_screen->shminfo, width, buffer_height);
 
@@ -677,6 +695,7 @@ hostx_screen_init(EphyrScreenInfo screen,
             XShmAttach(HostX.dpy, &host_screen->shminfo);
             shm_success = True;
         }
+#endif
     }
 
     if (!shm_success) {
@@ -798,9 +817,13 @@ hostx_paint_rect(EphyrScreenInfo screen,
     }
 
     if (HostX.have_shm) {
+#ifdef _MSC_VER
+      __asm int 3;
+#else
         XShmPutImage(HostX.dpy, host_screen->win,
                      HostX.gc, host_screen->ximg,
                      sx, sy, dx, dy, width, height, False);
+#endif
     }
     else {
         XPutImage(HostX.dpy, host_screen->win, HostX.gc, host_screen->ximg,
@@ -814,6 +837,9 @@ static void
 hostx_paint_debug_rect(struct EphyrHostScreen *host_screen,
                        int x, int y, int width, int height)
 {
+#ifdef _MSC_VER
+  __asm int 3;
+#else
     struct timespec tspec;
 
     tspec.tv_sec = HostX.damage_debug_msec / (1000000);
@@ -829,6 +855,7 @@ hostx_paint_debug_rect(struct EphyrHostScreen *host_screen,
 
     /* nanosleep seems to work better than usleep for me... */
     nanosleep(&tspec, NULL);
+#endif
 }
 
 void
@@ -1241,8 +1268,12 @@ hostx_set_window_bounding_rectangles(int a_window,
                   rects[i].x, rects[i].y, rects[i].width, rects[i].height);
     }
     /*this aways returns 1 */
+#ifdef _MSC_VER
+    __asm int 3;
+#else
     XShapeCombineRectangles(dpy, a_window, ShapeBounding, 0, 0,
                             rects, a_num_rects, ShapeSet, YXBanded);
+#endif
     is_ok = TRUE;
 
     free(rects);
@@ -1274,8 +1305,12 @@ hostx_set_window_clipping_rectangles(int a_window,
                   rects[i].x, rects[i].y, rects[i].width, rects[i].height);
     }
     /*this aways returns 1 */
+#ifdef _MSC_VER
+    __asm int 3;
+#else
     XShapeCombineRectangles(dpy, a_window, ShapeClip, 0, 0,
                             rects, a_num_rects, ShapeSet, YXBanded);
+#endif
     is_ok = TRUE;
 
     free(rects);
@@ -1288,11 +1323,15 @@ int
 hostx_has_xshape(void)
 {
     int event_base = 0, error_base = 0;
+#ifdef _MSC_VER
+    __asm int 3;
+#else
     Display *dpy = hostx_get_display();
 
     if (!XShapeQueryExtension(dpy, &event_base, &error_base)) {
         return FALSE;
     }
+#endif
     return TRUE;
 }
 
diff --git a/xorg-server/hw/kdrive/ephyr/hostx.h b/xorg-server/hw/kdrive/ephyr/hostx.h
index 31c4053aa..1b91e5162 100644
--- a/xorg-server/hw/kdrive/ephyr/hostx.h
+++ b/xorg-server/hw/kdrive/ephyr/hostx.h
@@ -35,8 +35,12 @@
 #define EPHYR_DBG(x, a...) \
  fprintf(stderr, __FILE__ ":%d,%s() " x "\n", __LINE__, __func__, ##a)
 #else
+#ifdef _MSC_VER
+#define EPHYR_DBG()
+#else
 #define EPHYR_DBG(x, a...) do {} while (0)
 #endif
+#endif
 
 typedef struct EphyrHostXVars EphyrHostXVars;
 typedef struct EphyrHostXEvent EphyrHostXEvent;
diff --git a/xorg-server/hw/kdrive/ephyr/makefile b/xorg-server/hw/kdrive/ephyr/makefile
new file mode 100644
index 000000000..eba9a93e1
--- /dev/null
+++ b/xorg-server/hw/kdrive/ephyr/makefile
@@ -0,0 +1,6 @@
+LIBRARY = libxephyr
+
+CSRCS=ephyrinit.c ephyr.c hostx.c
+
+INCLUDES += ..\src ..\..\..\exa
+
diff --git a/xorg-server/hw/kdrive/src/kdrive.c b/xorg-server/hw/kdrive/src/kdrive.c
index 7d9bf9ddd..ab77c23aa 100644
--- a/xorg-server/hw/kdrive/src/kdrive.c
+++ b/xorg-server/hw/kdrive/src/kdrive.c
@@ -221,6 +221,7 @@ KdProcessSwitch(void)
         KdEnableScreens();
 }
 
+#ifndef _MSC_VER
 void
 AbortDDX(enum ExitCode error)
 {
@@ -242,6 +243,7 @@ ddxGiveUp(enum ExitCode error)
 {
     AbortDDX(error);
 }
+#endif
 
 Bool kdDumbDriver;
 Bool kdSoftCursor;
@@ -1103,6 +1105,7 @@ KdInitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
     OsRegisterSigWrapper(KdSignalWrapper);
 }
 
+#ifndef _MSC_VER
 void
 OsVendorFatalError(const char *f, va_list args)
 {
@@ -1119,3 +1122,4 @@ DPMSSupported(void)
 {
     return FALSE;
 }
+#endif
diff --git a/xorg-server/hw/kdrive/src/kdrive.h b/xorg-server/hw/kdrive/src/kdrive.h
index 4829e1a1b..b93dfd6f4 100644
--- a/xorg-server/hw/kdrive/src/kdrive.h
+++ b/xorg-server/hw/kdrive/src/kdrive.h
@@ -52,7 +52,7 @@
 #define KD_DPMS_POWERDOWN   3
 #define KD_DPMS_MAX	    KD_DPMS_POWERDOWN
 
-#define Status int
+typedef int Status;
 
 typedef struct _KdCardInfo {
     struct _KdCardFuncs *cfuncs;
diff --git a/xorg-server/hw/kdrive/src/kinput.c b/xorg-server/hw/kdrive/src/kinput.c
index b1068bbee..76424c1c5 100644
--- a/xorg-server/hw/kdrive/src/kinput.c
+++ b/xorg-server/hw/kdrive/src/kinput.c
@@ -102,6 +102,14 @@ KdSigio(int sig)
         (*kdInputFds[i].read) (kdInputFds[i].fd, kdInputFds[i].closure);
 }
 
+#ifdef _MSC_VER
+    __asm int 3;
+#else
+#endif
+#ifdef _MSC_VER
+    __asm int 3;
+#else
+#endif
 #ifdef DEBUG_SIGIO
 
 void
@@ -145,16 +153,23 @@ KdResetInputMachine(void)
 static void
 KdNonBlockFd(int fd)
 {
+#ifdef _MSC_VER
+    __asm int 3;
+#else
     int flags;
 
     flags = fcntl(fd, F_GETFL);
     flags |= FASYNC | NOBLOCK;
     fcntl(fd, F_SETFL, flags);
+#endif
 }
 
 static void
 KdAddFd(int fd)
 {
+#ifdef _MSC_VER
+    __asm int 3;
+#else
     struct sigaction act;
     sigset_t set;
 
@@ -171,11 +186,15 @@ KdAddFd(int fd)
     sigaction(SIGIO, &act, 0);
     sigemptyset(&set);
     sigprocmask(SIG_SETMASK, &set, 0);
+#endif
 }
 
 static void
 KdRemoveFd(int fd)
 {
+#ifdef _MSC_VER
+    __asm int 3;
+#else
     struct sigaction act;
     int flags;
 
@@ -190,6 +209,7 @@ KdRemoveFd(int fd)
         sigemptyset(&act.sa_mask);
         sigaction(SIGIO, &act, 0);
     }
+#endif
 }
 
 Bool
@@ -525,11 +545,13 @@ KdPointerProc(DeviceIntPtr pDevice, int onoff)
     return BadImplementation;
 }
 
+#ifndef _MSC_VER
 Bool
 LegalModifier(unsigned int key, DeviceIntPtr pDev)
 {
     return TRUE;
 }
+#endif
 
 static void
 KdBell(int volume, DeviceIntPtr pDev, pointer arg, int something)
@@ -548,6 +570,7 @@ KdBell(int volume, DeviceIntPtr pDev, pointer arg, int something)
     KdRingBell(ki, volume, ctrl->bell_pitch, ctrl->bell_duration);
 }
 
+#ifndef _MSC_VER
 void
 DDXRingBell(int volume, int pitch, int duration)
 {
@@ -563,7 +586,7 @@ DDXRingBell(int volume, int pitch, int duration)
         }
     }
 }
-
+#endif
 void
 KdRingBell(KdKeyboardInfo * ki, int volume, int pitch, int duration)
 {
@@ -2108,6 +2131,7 @@ miPointerScreenFuncRec kdPointerScreenFuncs = {
     KdWarpCursor
 };
 
+#ifndef _MSC_VER
 void
 ProcessInputEvents(void)
 {
@@ -2116,6 +2140,7 @@ ProcessInputEvents(void)
         KdProcessSwitch();
     KdCheckLock();
 }
+#endif
 
 /* At the moment, absolute/relative is up to the client. */
 int
diff --git a/xorg-server/hw/kdrive/src/makefile b/xorg-server/hw/kdrive/src/makefile
new file mode 100644
index 000000000..e3a826faa
--- /dev/null
+++ b/xorg-server/hw/kdrive/src/makefile
@@ -0,0 +1,14 @@
+LIBRARY = libkdrive
+
+CSRCS =	\
+	kcmap.c		\
+	kcurscol.c	\
+	kdrive.c	\
+	kinfo.c		\
+	kinput.c	\
+	kmap.c		\
+	kmode.c		\
+	kshadow.c
+
+
+
diff --git a/xorg-server/hw/xfree86/common/compiler.h b/xorg-server/hw/xfree86/common/compiler.h
index c980beeb9..dc6f77318 100644
--- a/xorg-server/hw/xfree86/common/compiler.h
+++ b/xorg-server/hw/xfree86/common/compiler.h
@@ -86,7 +86,7 @@
 #endif
 #endif                          /* __inline__ */
 #ifndef __inline
-#if defined(__GNUC__)
+#if defined(__GNUC__) || defined(_MSC_VER)
     /* gcc has __inline */
 #elif defined(__HIGHC__)
 #define __inline _Inline
@@ -1499,10 +1499,10 @@ inl(unsigned short port)
 #define asm __asm
 #endif
 #endif
-#if !defined(__SUNPRO_C)
+#if !defined(__SUNPRO_C) && !defined(_MSC_VER)
 #include <sys/inline.h>
 #endif
-#if !defined(__HIGHC__) && !defined(__SUNPRO_C) || \
+#if (!defined(__HIGHC__) && !defined(__SUNPRO_C) && !defined(_MSC_VER)) || \
 	defined(__USLC__)
 #pragma asm partial_optimization outl
 #pragma asm partial_optimization outw
diff --git a/xorg-server/hw/xwin/InitInput.c b/xorg-server/hw/xwin/InitInput.c
index 395b533fc..e7f402f80 100644
--- a/xorg-server/hw/xwin/InitInput.c
+++ b/xorg-server/hw/xwin/InitInput.c
@@ -32,14 +32,13 @@
 #include "win.h"
 #include "dixstruct.h"
 #include "inputstr.h"
-
+#include <unistd.h>
 /*
  * Local function prototypes
  */
 
 #ifdef XWIN_CLIPBOARD
 int winProcEstablishConnection(ClientPtr /* client */ );
-int winProcQueryTree(ClientPtr /* client */ );
 int winProcSetSelectionOwner(ClientPtr /* client */ );
 #endif
 
@@ -73,15 +72,7 @@ LegalModifier(unsigned int uiKey, DeviceIntPtr pDevice)
 void
 ProcessInputEvents(void)
 {
-#if 0
-    ErrorF("ProcessInputEvents\n");
-#endif
-
     mieqProcessInputEvents();
-
-#if 0
-    ErrorF("ProcessInputEvents - returning\n");
-#endif
 }
 
 void
@@ -95,9 +86,8 @@ DDXRingBell(int volume, int pitch, int duration)
 void
 InitInput(int argc, char *argv[])
 {
-#if CYGDEBUG
+  int rc;
     winDebug("InitInput\n");
-#endif
 
 #ifdef XWIN_CLIPBOARD
     /*
@@ -109,15 +99,20 @@ InitInput(int argc, char *argv[])
     }
 #endif
 
-    g_pwinPointer = AddInputDevice(serverClient, winMouseProc, TRUE);
-    g_pwinKeyboard = AddInputDevice(serverClient, winKeybdProc, TRUE);
-    g_pwinPointer->name = strdup("Windows mouse");
-    g_pwinKeyboard->name = strdup("Windows keyboard");
+    rc = AllocDevicePair(serverClient, "Windows",
+                         &g_pwinPointer,
+                         &g_pwinKeyboard,
+                         winMouseProc,
+                         winKeybdProc,
+                         FALSE);
+
+    if (rc != Success)
+        FatalError("Failed to init vcxsrv default devices.\n");
 
     mieqInit();
 
-    /* Initialize the mode key states */
-    winInitializeModeKeyStates();
+    /* Do not nitialize the mode key states here yet since the keyboard device is not started yet
+    winInitializeModeKeyStates (); */
 
 #ifdef HAS_DEVWINDOWS
     /* Only open the windows message queue device once */
@@ -134,13 +129,13 @@ InitInput(int argc, char *argv[])
     }
 #endif
 
-#if CYGDEBUG
     winDebug("InitInput - returning\n");
-#endif
 }
 
 void
 CloseInput(void)
 {
     mieqFini();
+    g_pwinPointer=NULL;
+    g_pwinKeyboard=NULL;
 }
diff --git a/xorg-server/hw/xwin/InitOutput.c b/xorg-server/hw/xwin/InitOutput.c
index 04c17b702..a35721e74 100644
--- a/xorg-server/hw/xwin/InitOutput.c
+++ b/xorg-server/hw/xwin/InitOutput.c
@@ -35,12 +35,10 @@ from The Open Group.
 #include "winmsg.h"
 #include "winconfig.h"
 #include "winprefs.h"
-#ifdef XWIN_CLIPBOARD
-#include "X11/Xlocale.h"
-#endif
 #ifdef DPMSExtension
 #include "dpmsproc.h"
 #endif
+#include <locale.h>
 #ifdef __CYGWIN__
 #include <mntent.h>
 #endif
@@ -48,11 +46,12 @@ from The Open Group.
 #include "xkbsrv.h"
 #endif
 #ifdef RELOCATE_PROJECTROOT
+#undef Status
 #include <shlobj.h>
-typedef WINAPI HRESULT(*SHGETFOLDERPATHPROC) (HWND hwndOwner,
-                                              int nFolder,
-                                              HANDLE hToken,
-                                              DWORD dwFlags, LPTSTR pszPath);
+typedef HRESULT  (__stdcall *  SHGETFOLDERPATHPROC)(HWND hwndOwner,
+                                                    int nFolder,
+                                                    HANDLE hToken,
+                                                    DWORD dwFlags, LPTSTR pszPath);
 #endif
 
 #include "glx_extinit.h"
@@ -126,6 +125,7 @@ winClipboardShutdown(void)
     if (g_fClipboard && g_fClipboardLaunched && g_fClipboardStarted) {
         /* Synchronously destroy the clipboard window */
         if (g_hwndClipboard != NULL) {
+	  g_fClipboardStarted=FALSE; /* This is to avoid dead-locls caused by the clipboard thread still doing some stuff */
             SendMessage(g_hwndClipboard, WM_DESTROY, 0, 0);
             /* NOTE: g_hwndClipboard is set to NULL in winclipboardthread.c */
         }
@@ -135,9 +135,6 @@ winClipboardShutdown(void)
         /* Wait for the clipboard thread to exit */
         pthread_join(g_ptClipboardProc, NULL);
 
-        g_fClipboardLaunched = FALSE;
-        g_fClipboardStarted = FALSE;
-
         winDebug("winClipboardShutdown - Clipboard thread has exited.\n");
     }
 }
@@ -192,9 +189,7 @@ ddxGiveUp(enum ExitCode error)
 {
     int i;
 
-#if CYGDEBUG
     winDebug("ddxGiveUp\n");
-#endif
 
     /* Perform per-screen deinitialization */
     for (i = 0; i < g_iNumScreens; ++i) {
@@ -249,9 +244,7 @@ ddxGiveUp(enum ExitCode error)
 void
 AbortDDX(enum ExitCode error)
 {
-#if CYGDEBUG
     winDebug("AbortDDX\n");
-#endif
     ddxGiveUp(error);
 }
 
@@ -334,8 +327,10 @@ winCheckMount(void)
         return;
     }
 
+#ifdef WINDBG
     if (!binary)
-        winMsg(X_WARNING, "/tmp mounted in textmode\n");
+        winDebug("/tmp mounted in textmode\n");
+#endif
 }
 #else
 static void
@@ -387,8 +382,17 @@ winFixupPaths(void)
 #ifdef READ_FONTDIRS
     {
         /* Open fontpath configuration file */
+#if defined WIN32 && defined __MINGW32__
+        static Bool once = False;
+        char buffer[MAX_PATH];
+        snprintf(buffer, sizeof(buffer), "%s\\font-dirs", basedir);
+        buffer[sizeof(buffer)-1] = 0;
+        FILE *fontdirs = fopen(buffer, "rt");
+        if (once) fontdirs = NULL;
+        else once = True;
+#else
         FILE *fontdirs = fopen(ETCX11DIR "/font-dirs", "rt");
-
+#endif
         if (fontdirs != NULL) {
             char buffer[256];
             int needs_sep = TRUE;
@@ -552,7 +556,7 @@ winFixupPaths(void)
     }
 #endif                          /* RELOCATE_PROJECTROOT */
     if (changed_fontpath)
-        winMsg(font_from, "FontPath set to \"%s\"\n", defaultFontPath);
+        winDebug ("FontPath set to \"%s\"\n", defaultFontPath);
 
 #ifdef RELOCATE_PROJECTROOT
     if (getenv("XKEYSYMDB") == NULL) {
@@ -576,6 +580,13 @@ winFixupPaths(void)
         buffer[sizeof(buffer) - 1] = 0;
         putenv(buffer);
     }
+    if (getenv("XHOSTPREFIX") == NULL) {
+        char buffer[MAX_PATH];
+        snprintf(buffer, sizeof(buffer), "XHOSTPREFIX=%s\\X",
+                basedir);
+        buffer[sizeof(buffer)-1] = 0;
+        putenv(buffer);
+    }
     if (getenv("HOME") == NULL) {
         char buffer[MAX_PATH + 5];
 
@@ -588,7 +599,7 @@ winFixupPaths(void)
             putenv(buffer);
         }
         else {
-            winMsg(X_ERROR, "Can not determine HOME directory\n");
+            ErrorF ("Can not determine HOME directory\n");
         }
     }
     if (!g_fLogFileChanged) {
@@ -597,16 +608,17 @@ winFixupPaths(void)
 
         if (size && size < sizeof(buffer)) {
             snprintf(buffer + size, sizeof(buffer) - size,
-                     "XWin.%s.log", display);
+                    "VCXSrv.%s.log", display); 
             buffer[sizeof(buffer) - 1] = 0;
             g_pszLogFile = buffer;
-            winMsg(X_DEFAULT, "Logfile set to \"%s\"\n", g_pszLogFile);
+            GetLongPathName(buffer, buffer, MAX_PATH);
+            winDebug ("Logfile set to \"%s\"\n", g_pszLogFile);
         }
     }
     {
         static char xkbbasedir[MAX_PATH];
 
-        snprintf(xkbbasedir, sizeof(xkbbasedir), "%s\\xkb", basedir);
+        snprintf(xkbbasedir, sizeof(xkbbasedir), "%s\\xkbdata", basedir);
         if (sizeof(xkbbasedir) > 0)
             xkbbasedir[sizeof(xkbbasedir) - 1] = 0;
         XkbBaseDirectory = xkbbasedir;
@@ -616,11 +628,8 @@ winFixupPaths(void)
 }
 
 void
-OsVendorInit(void)
+OsVendorPreInit(int argc, char *argv[])
 {
-    /* Re-initialize global variables on server reset */
-    winInitializeGlobals();
-
     winFixupPaths();
 
 #ifdef DDXOSVERRORF
@@ -641,6 +650,17 @@ OsVendorInit(void)
     LogSetParameter(XLOG_VERBOSITY, g_iLogVerbose);
     LogSetParameter(XLOG_FILE_VERBOSITY, g_iLogVerbose);
 
+    /* Log the command line */
+    winLogCommandLine(argc, argv);
+
+}
+
+void
+OsVendorInit(void)
+{
+    /* Re-initialize global variables on server reset */
+    winInitializeGlobals();
+
     /* Log the version information */
     if (serverGeneration == 1)
         winLogVersionInfo();
@@ -678,8 +698,7 @@ OsVendorInit(void)
                     g_ScreenInfo[j].iE3BTimeout = WIN_DEFAULT_E3B_TIME;
                     if (reportOnce) {
                         reportOnce = FALSE;
-                        winMsg(X_PROBED,
-                               "Windows reports only %d mouse buttons, defaulting to -emulate3buttons\n",
+                        winDebug("Windows reports only %d mouse buttons, defaulting to -emulate3buttons\n",
                                mouseButtons);
                     }
                 }
@@ -702,6 +721,10 @@ winUseMsg(void)
 #ifdef XWIN_CLIPBOARD
     ErrorF("-[no]clipboard\n"
            "\tEnable [disable] the clipboard integration. Default is enabled.\n");
+  ErrorF ("-[no]clipboardprimary\n"
+	  "\t[Do not] map the PRIMARY selection to the windows clipboard.\n"
+          "\tThe CLIPBOARD selection is always mapped if -clipboard is enabled.\n"
+          "\tDefault is mapped.\n");
 #endif
 
     ErrorF("-clipupdates num_boxes\n"
@@ -749,7 +772,7 @@ winUseMsg(void)
 
     ErrorF("-ignoreinput\n" "\tIgnore keyboard and mouse input.\n");
 
-#ifdef XWIN_MULTIWINDOWEXTWM
+#ifdef XWIN_MULTIWINDOWINTWM
     ErrorF("-internalwm\n" "\tRun the internal window manager.\n");
 #endif
 
@@ -838,10 +861,11 @@ winUseMsg(void)
 
     ErrorF("-[no]unixkill\n" "\tCtrl+Alt+Backspace exits the X Server.\n");
 
-#ifdef XWIN_GLX_WINDOWS
     ErrorF("-[no]wgl\n"
            "\tEnable the GLX extension to use the native Windows WGL interface for hardware-accelerated OpenGL\n");
-#endif
+
+    ErrorF("-swrastwgl\n"
+           "\tEnable the GLX extension to use the native Windows WGL interface based on the swrast interface for accelerated OpenGL\n");
 
     ErrorF("-[no]winkill\n" "\tAlt+F4 exits the X Server.\n");
 
@@ -902,12 +926,7 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char *argv[])
     if (serverGeneration == 1)
         XwinExtensionInit();
 
-    /* Log the command line */
-    winLogCommandLine(argc, argv);
-
-#if CYGDEBUG
     winDebug("InitOutput\n");
-#endif
 
     /* Validate command-line arguments */
     if (serverGeneration == 1 && !winValidateArgs()) {
@@ -926,11 +945,8 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char *argv[])
 #ifdef XWIN_XF86CONFIG
     /* Try to read the xorg.conf-style configuration file */
     if (!winReadConfigfile())
-        winErrorFVerb(1, "InitOutput - Error reading config file\n");
+        ErrorF ("InitOutput - Error reading config file\n");
 #else
-    winMsg(X_INFO, "xorg.conf is not supported\n");
-    winMsg(X_INFO, "See http://x.cygwin.com/docs/faq/cygwin-x-faq.html "
-           "for more information\n");
     winConfigFiles();
 #endif
 
@@ -959,6 +975,11 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char *argv[])
     winPropertyStoreInit();
 #endif
 
+#ifdef XWIN_MULTIWINDOW
+  /* Load libraries for taskbar grouping */
+  winTaskbarInit ();
+#endif
+
     /* Store the instance handle */
     g_hInstance = GetModuleHandle(NULL);
 
@@ -982,13 +1003,22 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char *argv[])
          * setlocale applies to all threads in the current process.
          * Apply locale specified in LANG environment variable.
          */
-        setlocale(LC_ALL, "");
+        if (!setlocale (LC_ALL, ""))
+          {
+            ErrorF ("setlocale failed.\n");
+          }
+
+        /* See if X supports the current locale */
+        if (XSupportsLocale () == FALSE)
+          {
+            ErrorF ("Warning: Locale not supported by X, falling back to 'C' locale.\n");
+            setlocale(LC_ALL, "C");
+          }
+
     }
 #endif
 
-#if CYGDEBUG || YES
     winDebug("InitOutput - Returning.\n");
-#endif
 }
 
 /*
@@ -1010,7 +1040,7 @@ winCheckDisplayNumber(void)
 
     /* Check display range */
     nDisp = atoi(display);
-    if (nDisp < 0 || nDisp > 65535) {
+    if (nDisp < 0 || nDisp > 59535) {
         ErrorF("winCheckDisplayNumber - Bad display number: %d\n", nDisp);
         return FALSE;
     }
@@ -1051,7 +1081,7 @@ winCheckDisplayNumber(void)
     }
     if (GetLastError() == ERROR_ALREADY_EXISTS) {
         ErrorF("winCheckDisplayNumber - "
-               PROJECT_NAME " is already running on display %d\n", nDisp);
+               "VCXsrv, Xming or Cygwin/X is already running on display %d\n", nDisp);
         return FALSE;
     }
 
diff --git a/xorg-server/hw/xwin/Makefile.am b/xorg-server/hw/xwin/Makefile.am
index 93ce57038..1a8006456 100644
--- a/xorg-server/hw/xwin/Makefile.am
+++ b/xorg-server/hw/xwin/Makefile.am
@@ -125,6 +125,7 @@ SRCS =	InitInput.c \
 	winprefs.h \
 	winresource.h \
 	winwindow.h \
+	windisplay.c \
 	XWin.rc \
 	$(top_srcdir)/Xext/dpmsstubs.c \
 	$(top_srcdir)/Xi/stubs.c \
diff --git a/xorg-server/hw/xwin/XWin.rc b/xorg-server/hw/xwin/XWin.rc
index a142f3070..b5481ade7 100644
--- a/xorg-server/hw/xwin/XWin.rc
+++ b/xorg-server/hw/xwin/XWin.rc
@@ -32,32 +32,29 @@
 #include <windows.h>
 #include "winresource.h"
 #include "xwin-config.h"
-#include "version-config.h"
 
 /*
  * Dialogs
  */
 
 /* About */
-ABOUT_BOX DIALOGEX 32, 32, 260, 105
+ABOUT_BOX DIALOGEX 32, 32, 260, 95
 STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | WS_TABSTOP  | DS_CENTERMOUSE
-CAPTION "About " XVENDORNAMESHORT
+CAPTION "About "XVENDORNAMESHORT
 FONT 8, "MS Shell Dlg 2"
 BEGIN
-  CONTROL				IDI_XWIN, IDC_STATIC, "Static", SS_ICON, 8, 8, 32, 32
-  LTEXT			XVENDORNAMESHORT " X Server ", IDC_STATIC, 36, 8, 220, 8
-  LTEXT			VENDOR_MAN_VERSION, IDC_STATIC, 36, 18, 220, 8
-  LTEXT			BUILDERSTRING, IDC_STATIC, 36, 28, 220, 8
-  LTEXT			"This software is licensed under the terms of the MIT/X11 License.", IDC_STATIC, 36, 48, 220, 20
-  CONTROL               __VENDORDWEBSUPPORT__, ID_ABOUT_WEBSITE, "Button",
-                        BS_OWNERDRAW | WS_TABSTOP, 36, 68, 220, 8
-  DEFPUSHBUTTON		"&OK", IDOK, 105, 85, 50, 15
+  CONTROL			IDI_XWIN, IDC_STATIC, "Static", SS_ICON, 8, 8, 32, 32
+  LTEXT			"VcXsrv X Server ", IDC_STATIC, 36, 8, 220, 8
+  LTEXT			"http://vcxsrv.sourceforge.net", IDC_STATIC, 36, 18, 220, 8
+  LTEXT			"marha@users.sourceforge.net", IDC_STATIC, 36, 28, 220, 8
+  LTEXT			"Version 1.13.1.0 (5 Dec 2012)", IDC_STATIC, 36, 38, 220, 8
+  DEFPUSHBUTTON		"OK", IDOK, 105, 75, 50, 15
 END
 
 
 /* Depth change */
 
-DEPTH_CHANGE_BOX DIALOGEX 32, 32, 180, 100
+DEPTH_CHANGE_BOX DIALOGEX	32, 32, 180, 100
 STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTERMOUSE
 FONT 8, "MS Shell Dlg 2"
 CAPTION XVENDORNAMESHORT
@@ -65,16 +62,16 @@ BEGIN
   DEFPUSHBUTTON		"Dismiss", IDOK, 66, 80, 50, 14
   CTEXT			XVENDORNAMESHORT, IDC_STATIC, 40, 12, 100, 8
   CTEXT			"Disruptive screen configuration change.", IDC_STATIC, 7, 40, 166, 8
-  CTEXT			"Restore previous resolution to use " XVENDORNAMESHORT ".", IDC_STATIC, 7, 52, 166, 8
+  CTEXT			"Restore previous resolution to use "XVENDORNAMESHORT".", IDC_STATIC, 7, 52, 166, 8
 END
 
 
 /* Exit */
 
-EXIT_DIALOG DIALOGEX 32, 32, 180, 78
+EXIT_DIALOG DIALOGEX	32, 32, 180, 78
 STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | WS_TABSTOP | DS_CENTERMOUSE
 FONT 8, "MS Shell Dlg 2"
-CAPTION "Exit " XVENDORNAMESHORT "?"
+CAPTION "Exit "XVENDORNAMESHORT"?"
 BEGIN
   PUSHBUTTON "E&xit", IDOK, 55, 56, 30, 14
   DEFPUSHBUTTON "&Cancel", IDCANCEL, 95, 56, 30, 14
@@ -83,6 +80,17 @@ BEGIN
   CTEXT "Proceed with shutdown of this display/server?", IDC_STATIC, 7, 36, 166, 8
 END
 
+/* Xdmcp host selection dialog  */
+XDMCP_HOSTS DIALOGEX 32, 32, 260, 156
+STYLE DS_SETFONT | DS_CENTERMOUSE | WS_POPUP | WS_VISIBLE | WS_CAPTION
+EXSTYLE WS_EX_NOPARENTNOTIFY
+CAPTION "Select host to connect to"
+FONT 8, "MS Shell Dlg 2", 0, 0, 0x1
+BEGIN
+    DEFPUSHBUTTON   "Connect",IDOK,61,132,50,15
+    LISTBOX         IDC_HOSTLIST,7,7,245,113,LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_NOTIFY | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "Cancel",IDCANCEL,147,134,50,14
+END
 
 /*
  * Menus
@@ -105,4 +113,4 @@ END
  */
 
 IDI_XWIN		ICON	"X.ico"
-CREATEPROCESS_MANIFEST_RESOURCE_ID	RT_MANIFEST	"XWin.exe.manifest"
+/* CREATEPROCESS_MANIFEST_RESOURCE_ID	RT_MANIFEST	"XWin.exe.manifest"*/
diff --git a/xorg-server/hw/xwin/ddraw.h b/xorg-server/hw/xwin/ddraw.h
deleted file mode 100644
index 1871d9551..000000000
--- a/xorg-server/hw/xwin/ddraw.h
+++ /dev/null
@@ -1,2322 +0,0 @@
-#ifdef __MINGW64_VERSION_MAJOR
-#include_next <ddraw.h>
-#define __XWIN_DDRAW_H
-#endif
-#ifndef __XWIN_DDRAW_H
-#define __XWIN_DDRAW_H
-
-#include <winnt.h>
-#include <wingdi.h>
-#include <objbase.h>
-
-#if defined(NONAMELESSUNION) && !defined(DUMMYUNIONNAME1)
-#define DUMMYUNIONNAME1 u1
-#endif
-
-#define ICOM_CALL_( xfn, p, args) (p)->lpVtbl->xfn args
-
-#ifdef UNICODE
-#define WINELIB_NAME_AW(func) func##W
-#else
-#define WINELIB_NAME_AW(func) func##A
-#endif                          /* UNICODE */
-#define DECL_WINELIB_TYPE_AW(type)  typedef WINELIB_NAME_AW(type) type;
-
-#ifdef __cplusplus
-extern "C" {
-#endif                          /* defined(__cplusplus) */
-
-#ifndef	DIRECTDRAW_VERSION
-#define	DIRECTDRAW_VERSION	0x0700
-#endif                          /* DIRECTDRAW_VERSION */
-
-/*****************************************************************************
- * Predeclare the interfaces
- */
-    DEFINE_GUID(CLSID_DirectDraw, 0xD7B70EE0, 0x4340, 0x11CF, 0xB0, 0x63, 0x00,
-                0x20, 0xAF, 0xC2, 0xCD, 0x35);
-    DEFINE_GUID(CLSID_DirectDraw7, 0x3C305196, 0x50DB, 0x11D3, 0x9C, 0xFE, 0x00,
-                0xC0, 0x4F, 0xD9, 0x30, 0xC5);
-    DEFINE_GUID(CLSID_DirectDrawClipper, 0x593817A0, 0x7DB3, 0x11CF, 0xA2, 0xDE,
-                0x00, 0xAA, 0x00, 0xb9, 0x33, 0x56);
-    DEFINE_GUID(IID_IDirectDraw, 0x6C14DB80, 0xA733, 0x11CE, 0xA5, 0x21, 0x00,
-                0x20, 0xAF, 0x0B, 0xE5, 0x60);
-    DEFINE_GUID(IID_IDirectDraw2, 0xB3A6F3E0, 0x2B43, 0x11CF, 0xA2, 0xDE, 0x00,
-                0xAA, 0x00, 0xB9, 0x33, 0x56);
-    DEFINE_GUID(IID_IDirectDraw4, 0x9c59509a, 0x39bd, 0x11d1, 0x8c, 0x4a, 0x00,
-                0xc0, 0x4f, 0xd9, 0x30, 0xc5);
-    DEFINE_GUID(IID_IDirectDraw7, 0x15e65ec0, 0x3b9c, 0x11d2, 0xb9, 0x2f, 0x00,
-                0x60, 0x97, 0x97, 0xea, 0x5b);
-    DEFINE_GUID(IID_IDirectDrawSurface, 0x6C14DB81, 0xA733, 0x11CE, 0xA5, 0x21,
-                0x00, 0x20, 0xAF, 0x0B, 0xE5, 0x60);
-    DEFINE_GUID(IID_IDirectDrawSurface2, 0x57805885, 0x6eec, 0x11cf, 0x94, 0x41,
-                0xa8, 0x23, 0x03, 0xc1, 0x0e, 0x27);
-    DEFINE_GUID(IID_IDirectDrawSurface3, 0xDA044E00, 0x69B2, 0x11D0, 0xA1, 0xD5,
-                0x00, 0xAA, 0x00, 0xB8, 0xDF, 0xBB);
-    DEFINE_GUID(IID_IDirectDrawSurface4, 0x0B2B8630, 0xAD35, 0x11D0, 0x8E, 0xA6,
-                0x00, 0x60, 0x97, 0x97, 0xEA, 0x5B);
-    DEFINE_GUID(IID_IDirectDrawSurface7, 0x06675a80, 0x3b9b, 0x11d2, 0xb9, 0x2f,
-                0x00, 0x60, 0x97, 0x97, 0xea, 0x5b);
-    DEFINE_GUID(IID_IDirectDrawPalette, 0x6C14DB84, 0xA733, 0x11CE, 0xA5, 0x21,
-                0x00, 0x20, 0xAF, 0x0B, 0xE5, 0x60);
-    DEFINE_GUID(IID_IDirectDrawClipper, 0x6C14DB85, 0xA733, 0x11CE, 0xA5, 0x21,
-                0x00, 0x20, 0xAF, 0x0B, 0xE5, 0x60);
-    DEFINE_GUID(IID_IDirectDrawColorControl, 0x4B9F0EE0, 0x0D7E, 0x11D0, 0x9B,
-                0x06, 0x00, 0xA0, 0xC9, 0x03, 0xA3, 0xB8);
-    DEFINE_GUID(IID_IDirectDrawGammaControl, 0x69C11C3E, 0xB46B, 0x11D1, 0xAD,
-                0x7A, 0x00, 0xC0, 0x4F, 0xC2, 0x9B, 0x4E);
-
-    typedef struct IDirectDraw *LPDIRECTDRAW;
-    typedef struct IDirectDraw2 *LPDIRECTDRAW2;
-    typedef struct IDirectDraw4 *LPDIRECTDRAW4;
-    typedef struct IDirectDraw7 *LPDIRECTDRAW7;
-    typedef struct IDirectDrawClipper *LPDIRECTDRAWCLIPPER;
-    typedef struct IDirectDrawPalette *LPDIRECTDRAWPALETTE;
-    typedef struct IDirectDrawSurface *LPDIRECTDRAWSURFACE;
-    typedef struct IDirectDrawSurface2 *LPDIRECTDRAWSURFACE2;
-    typedef struct IDirectDrawSurface3 *LPDIRECTDRAWSURFACE3;
-    typedef struct IDirectDrawSurface4 *LPDIRECTDRAWSURFACE4;
-    typedef struct IDirectDrawSurface7 *LPDIRECTDRAWSURFACE7;
-    typedef struct IDirectDrawColorControl *LPDIRECTDRAWCOLORCONTROL;
-    typedef struct IDirectDrawGammaControl *LPDIRECTDRAWGAMMACONTROL;
-
-#define DDENUMRET_CANCEL	0
-#define DDENUMRET_OK		1
-
-#define DD_OK			0
-
-#define _FACDD		0x876
-#define MAKE_DDHRESULT( code )  MAKE_HRESULT( 1, _FACDD, code )
-
-#define DDERR_ALREADYINITIALIZED		MAKE_DDHRESULT( 5 )
-#define DDERR_CANNOTATTACHSURFACE		MAKE_DDHRESULT( 10 )
-#define DDERR_CANNOTDETACHSURFACE		MAKE_DDHRESULT( 20 )
-#define DDERR_CURRENTLYNOTAVAIL			MAKE_DDHRESULT( 40 )
-#define DDERR_EXCEPTION				MAKE_DDHRESULT( 55 )
-#define DDERR_GENERIC				E_FAIL
-#define DDERR_HEIGHTALIGN			MAKE_DDHRESULT( 90 )
-#define DDERR_INCOMPATIBLEPRIMARY		MAKE_DDHRESULT( 95 )
-#define DDERR_INVALIDCAPS			MAKE_DDHRESULT( 100 )
-#define DDERR_INVALIDCLIPLIST			MAKE_DDHRESULT( 110 )
-#define DDERR_INVALIDMODE			MAKE_DDHRESULT( 120 )
-#define DDERR_INVALIDOBJECT			MAKE_DDHRESULT( 130 )
-#define DDERR_INVALIDPARAMS			E_INVALIDARG
-#define DDERR_INVALIDPIXELFORMAT		MAKE_DDHRESULT( 145 )
-#define DDERR_INVALIDRECT			MAKE_DDHRESULT( 150 )
-#define DDERR_LOCKEDSURFACES			MAKE_DDHRESULT( 160 )
-#define DDERR_NO3D				MAKE_DDHRESULT( 170 )
-#define DDERR_NOALPHAHW				MAKE_DDHRESULT( 180 )
-#define DDERR_NOSTEREOHARDWARE          	MAKE_DDHRESULT( 181 )
-#define DDERR_NOSURFACELEFT                     MAKE_DDHRESULT( 182 )
-#define DDERR_NOCLIPLIST			MAKE_DDHRESULT( 205 )
-#define DDERR_NOCOLORCONVHW			MAKE_DDHRESULT( 210 )
-#define DDERR_NOCOOPERATIVELEVELSET		MAKE_DDHRESULT( 212 )
-#define DDERR_NOCOLORKEY			MAKE_DDHRESULT( 215 )
-#define DDERR_NOCOLORKEYHW			MAKE_DDHRESULT( 220 )
-#define DDERR_NODIRECTDRAWSUPPORT		MAKE_DDHRESULT( 222 )
-#define DDERR_NOEXCLUSIVEMODE			MAKE_DDHRESULT( 225 )
-#define DDERR_NOFLIPHW				MAKE_DDHRESULT( 230 )
-#define DDERR_NOGDI				MAKE_DDHRESULT( 240 )
-#define DDERR_NOMIRRORHW			MAKE_DDHRESULT( 250 )
-#define DDERR_NOTFOUND				MAKE_DDHRESULT( 255 )
-#define DDERR_NOOVERLAYHW			MAKE_DDHRESULT( 260 )
-#define DDERR_OVERLAPPINGRECTS                  MAKE_DDHRESULT( 270 )
-#define DDERR_NORASTEROPHW			MAKE_DDHRESULT( 280 )
-#define DDERR_NOROTATIONHW			MAKE_DDHRESULT( 290 )
-#define DDERR_NOSTRETCHHW			MAKE_DDHRESULT( 310 )
-#define DDERR_NOT4BITCOLOR			MAKE_DDHRESULT( 316 )
-#define DDERR_NOT4BITCOLORINDEX			MAKE_DDHRESULT( 317 )
-#define DDERR_NOT8BITCOLOR			MAKE_DDHRESULT( 320 )
-#define DDERR_NOTEXTUREHW			MAKE_DDHRESULT( 330 )
-#define DDERR_NOVSYNCHW				MAKE_DDHRESULT( 335 )
-#define DDERR_NOZBUFFERHW			MAKE_DDHRESULT( 340 )
-#define DDERR_NOZOVERLAYHW			MAKE_DDHRESULT( 350 )
-#define DDERR_OUTOFCAPS				MAKE_DDHRESULT( 360 )
-#define DDERR_OUTOFMEMORY			E_OUTOFMEMORY
-#define DDERR_OUTOFVIDEOMEMORY			MAKE_DDHRESULT( 380 )
-#define DDERR_OVERLAYCANTCLIP			MAKE_DDHRESULT( 382 )
-#define DDERR_OVERLAYCOLORKEYONLYONEACTIVE	MAKE_DDHRESULT( 384 )
-#define DDERR_PALETTEBUSY			MAKE_DDHRESULT( 387 )
-#define DDERR_COLORKEYNOTSET			MAKE_DDHRESULT( 400 )
-#define DDERR_SURFACEALREADYATTACHED		MAKE_DDHRESULT( 410 )
-#define DDERR_SURFACEALREADYDEPENDENT		MAKE_DDHRESULT( 420 )
-#define DDERR_SURFACEBUSY			MAKE_DDHRESULT( 430 )
-#define DDERR_CANTLOCKSURFACE			MAKE_DDHRESULT( 435 )
-#define DDERR_SURFACEISOBSCURED			MAKE_DDHRESULT( 440 )
-#define DDERR_SURFACELOST			MAKE_DDHRESULT( 450 )
-#define DDERR_SURFACENOTATTACHED		MAKE_DDHRESULT( 460 )
-#define DDERR_TOOBIGHEIGHT			MAKE_DDHRESULT( 470 )
-#define DDERR_TOOBIGSIZE			MAKE_DDHRESULT( 480 )
-#define DDERR_TOOBIGWIDTH			MAKE_DDHRESULT( 490 )
-#define DDERR_UNSUPPORTED			E_NOTIMPL
-#define DDERR_UNSUPPORTEDFORMAT			MAKE_DDHRESULT( 510 )
-#define DDERR_UNSUPPORTEDMASK			MAKE_DDHRESULT( 520 )
-#define DDERR_INVALIDSTREAM                     MAKE_DDHRESULT( 521 )
-#define DDERR_VERTICALBLANKINPROGRESS		MAKE_DDHRESULT( 537 )
-#define DDERR_WASSTILLDRAWING			MAKE_DDHRESULT( 540 )
-#define DDERR_DDSCAPSCOMPLEXREQUIRED            MAKE_DDHRESULT( 542 )
-#define DDERR_XALIGN				MAKE_DDHRESULT( 560 )
-#define DDERR_INVALIDDIRECTDRAWGUID		MAKE_DDHRESULT( 561 )
-#define DDERR_DIRECTDRAWALREADYCREATED		MAKE_DDHRESULT( 562 )
-#define DDERR_NODIRECTDRAWHW			MAKE_DDHRESULT( 563 )
-#define DDERR_PRIMARYSURFACEALREADYEXISTS	MAKE_DDHRESULT( 564 )
-#define DDERR_NOEMULATION			MAKE_DDHRESULT( 565 )
-#define DDERR_REGIONTOOSMALL			MAKE_DDHRESULT( 566 )
-#define DDERR_CLIPPERISUSINGHWND		MAKE_DDHRESULT( 567 )
-#define DDERR_NOCLIPPERATTACHED			MAKE_DDHRESULT( 568 )
-#define DDERR_NOHWND				MAKE_DDHRESULT( 569 )
-#define DDERR_HWNDSUBCLASSED			MAKE_DDHRESULT( 570 )
-#define DDERR_HWNDALREADYSET			MAKE_DDHRESULT( 571 )
-#define DDERR_NOPALETTEATTACHED			MAKE_DDHRESULT( 572 )
-#define DDERR_NOPALETTEHW			MAKE_DDHRESULT( 573 )
-#define DDERR_BLTFASTCANTCLIP			MAKE_DDHRESULT( 574 )
-#define DDERR_NOBLTHW				MAKE_DDHRESULT( 575 )
-#define DDERR_NODDROPSHW			MAKE_DDHRESULT( 576 )
-#define DDERR_OVERLAYNOTVISIBLE			MAKE_DDHRESULT( 577 )
-#define DDERR_NOOVERLAYDEST			MAKE_DDHRESULT( 578 )
-#define DDERR_INVALIDPOSITION			MAKE_DDHRESULT( 579 )
-#define DDERR_NOTAOVERLAYSURFACE		MAKE_DDHRESULT( 580 )
-#define DDERR_EXCLUSIVEMODEALREADYSET		MAKE_DDHRESULT( 581 )
-#define DDERR_NOTFLIPPABLE			MAKE_DDHRESULT( 582 )
-#define DDERR_CANTDUPLICATE			MAKE_DDHRESULT( 583 )
-#define DDERR_NOTLOCKED				MAKE_DDHRESULT( 584 )
-#define DDERR_CANTCREATEDC			MAKE_DDHRESULT( 585 )
-#define DDERR_NODC				MAKE_DDHRESULT( 586 )
-#define DDERR_WRONGMODE				MAKE_DDHRESULT( 587 )
-#define DDERR_IMPLICITLYCREATED			MAKE_DDHRESULT( 588 )
-#define DDERR_NOTPALETTIZED			MAKE_DDHRESULT( 589 )
-#define DDERR_UNSUPPORTEDMODE			MAKE_DDHRESULT( 590 )
-#define DDERR_NOMIPMAPHW			MAKE_DDHRESULT( 591 )
-#define DDERR_INVALIDSURFACETYPE		MAKE_DDHRESULT( 592 )
-#define DDERR_NOOPTIMIZEHW			MAKE_DDHRESULT( 600 )
-#define DDERR_NOTLOADED				MAKE_DDHRESULT( 601 )
-#define DDERR_NOFOCUSWINDOW			MAKE_DDHRESULT( 602 )
-#define DDERR_NOTONMIPMAPSUBLEVEL               MAKE_DDHRESULT( 603 )
-#define DDERR_DCALREADYCREATED			MAKE_DDHRESULT( 620 )
-#define DDERR_NONONLOCALVIDMEM			MAKE_DDHRESULT( 630 )
-#define DDERR_CANTPAGELOCK			MAKE_DDHRESULT( 640 )
-#define DDERR_CANTPAGEUNLOCK			MAKE_DDHRESULT( 660 )
-#define DDERR_NOTPAGELOCKED			MAKE_DDHRESULT( 680 )
-#define DDERR_MOREDATA				MAKE_DDHRESULT( 690 )
-#define DDERR_EXPIRED                           MAKE_DDHRESULT( 691 )
-#define DDERR_TESTFINISHED                      MAKE_DDHRESULT( 692 )
-#define DDERR_NEWMODE                           MAKE_DDHRESULT( 693 )
-#define DDERR_D3DNOTINITIALIZED                 MAKE_DDHRESULT( 694 )
-#define DDERR_VIDEONOTACTIVE			MAKE_DDHRESULT( 695 )
-#define DDERR_NOMONITORINFORMATION              MAKE_DDHRESULT( 696 )
-#define DDERR_NODRIVERSUPPORT                   MAKE_DDHRESULT( 697 )
-#define DDERR_DEVICEDOESNTOWNSURFACE		MAKE_DDHRESULT( 699 )
-#define DDERR_NOTINITIALIZED			CO_E_NOTINITIALIZED
-
-/* dwFlags for Blt* */
-#define DDBLT_ALPHADEST				0x00000001
-#define DDBLT_ALPHADESTCONSTOVERRIDE		0x00000002
-#define DDBLT_ALPHADESTNEG			0x00000004
-#define DDBLT_ALPHADESTSURFACEOVERRIDE		0x00000008
-#define DDBLT_ALPHAEDGEBLEND			0x00000010
-#define DDBLT_ALPHASRC				0x00000020
-#define DDBLT_ALPHASRCCONSTOVERRIDE		0x00000040
-#define DDBLT_ALPHASRCNEG			0x00000080
-#define DDBLT_ALPHASRCSURFACEOVERRIDE		0x00000100
-#define DDBLT_ASYNC				0x00000200
-#define DDBLT_COLORFILL				0x00000400
-#define DDBLT_DDFX				0x00000800
-#define DDBLT_DDROPS				0x00001000
-#define DDBLT_KEYDEST				0x00002000
-#define DDBLT_KEYDESTOVERRIDE			0x00004000
-#define DDBLT_KEYSRC				0x00008000
-#define DDBLT_KEYSRCOVERRIDE			0x00010000
-#define DDBLT_ROP				0x00020000
-#define DDBLT_ROTATIONANGLE			0x00040000
-#define DDBLT_ZBUFFER				0x00080000
-#define DDBLT_ZBUFFERDESTCONSTOVERRIDE		0x00100000
-#define DDBLT_ZBUFFERDESTOVERRIDE		0x00200000
-#define DDBLT_ZBUFFERSRCCONSTOVERRIDE		0x00400000
-#define DDBLT_ZBUFFERSRCOVERRIDE		0x00800000
-#define DDBLT_WAIT				0x01000000
-#define DDBLT_DEPTHFILL				0x02000000
-#define DDBLT_DONOTWAIT                         0x08000000
-
-/* dwTrans for BltFast */
-#define DDBLTFAST_NOCOLORKEY			0x00000000
-#define DDBLTFAST_SRCCOLORKEY			0x00000001
-#define DDBLTFAST_DESTCOLORKEY			0x00000002
-#define DDBLTFAST_WAIT				0x00000010
-#define DDBLTFAST_DONOTWAIT                     0x00000020
-
-/* dwFlags for Flip */
-#define DDFLIP_WAIT		0x00000001
-#define DDFLIP_EVEN		0x00000002      /* only valid for overlay */
-#define DDFLIP_ODD		0x00000004      /* only valid for overlay */
-#define DDFLIP_NOVSYNC		0x00000008
-#define DDFLIP_STEREO		0x00000010
-#define DDFLIP_DONOTWAIT	0x00000020
-
-/* dwFlags for GetBltStatus */
-#define DDGBS_CANBLT				0x00000001
-#define DDGBS_ISBLTDONE				0x00000002
-
-/* dwFlags for IDirectDrawSurface7::GetFlipStatus */
-#define DDGFS_CANFLIP		1L
-#define DDGFS_ISFLIPDONE	2L
-
-/* dwFlags for IDirectDrawSurface7::SetPrivateData */
-#define DDSPD_IUNKNOWNPTR	1L
-#define DDSPD_VOLATILE		2L
-
-/* DDSCAPS.dwCaps */
-/* reserved1, was 3d capable */
-#define DDSCAPS_RESERVED1		0x00000001
-/* surface contains alpha information */
-#define DDSCAPS_ALPHA			0x00000002
-/* this surface is a backbuffer */
-#define DDSCAPS_BACKBUFFER		0x00000004
-/* complex surface structure */
-#define DDSCAPS_COMPLEX			0x00000008
-/* part of surface flipping structure */
-#define DDSCAPS_FLIP			0x00000010
-/* this surface is the frontbuffer surface */
-#define DDSCAPS_FRONTBUFFER		0x00000020
-/* this is a plain offscreen surface */
-#define DDSCAPS_OFFSCREENPLAIN		0x00000040
-/* overlay */
-#define DDSCAPS_OVERLAY			0x00000080
-/* palette objects can be created and attached to us */
-#define DDSCAPS_PALETTE			0x00000100
-/* primary surface (the one the user looks at currently)(right eye)*/
-#define DDSCAPS_PRIMARYSURFACE		0x00000200
-/* primary surface for left eye */
-#define DDSCAPS_PRIMARYSURFACELEFT	0x00000400
-/* surface exists in systemmemory */
-#define DDSCAPS_SYSTEMMEMORY		0x00000800
-/* surface can be used as a texture */
-#define DDSCAPS_TEXTURE		        0x00001000
-/* surface may be destination for 3d rendering */
-#define DDSCAPS_3DDEVICE		0x00002000
-/* surface exists in videomemory */
-#define DDSCAPS_VIDEOMEMORY		0x00004000
-/* surface changes immediately visible */
-#define DDSCAPS_VISIBLE			0x00008000
-/* write only surface */
-#define DDSCAPS_WRITEONLY		0x00010000
-/* zbuffer surface */
-#define DDSCAPS_ZBUFFER			0x00020000
-/* has its own DC */
-#define DDSCAPS_OWNDC			0x00040000
-/* surface should be able to receive live video */
-#define DDSCAPS_LIVEVIDEO		0x00080000
-/* should be able to have a hw codec decompress stuff into it */
-#define DDSCAPS_HWCODEC			0x00100000
-/* mode X (320x200 or 320x240) surface */
-#define DDSCAPS_MODEX			0x00200000
-/* one mipmap surface (1 level) */
-#define DDSCAPS_MIPMAP			0x00400000
-#define DDSCAPS_RESERVED2		0x00800000
-/* memory allocation delayed until Load() */
-#define DDSCAPS_ALLOCONLOAD		0x04000000
-/* Indicates that the surface will receive data from a video port */
-#define DDSCAPS_VIDEOPORT		0x08000000
-/* surface is in local videomemory */
-#define DDSCAPS_LOCALVIDMEM		0x10000000
-/* surface is in nonlocal videomemory */
-#define DDSCAPS_NONLOCALVIDMEM		0x20000000
-/* surface is a standard VGA mode surface (NOT ModeX) */
-#define DDSCAPS_STANDARDVGAMODE		0x40000000
-/* optimized? surface */
-#define DDSCAPS_OPTIMIZED		0x80000000
-
-    typedef struct _DDSCAPS {
-        DWORD dwCaps;           /* capabilities of surface wanted */
-    } DDSCAPS, *LPDDSCAPS;
-
-/* DDSCAPS2.dwCaps2 */
-/* indicates the surface will receive data from a video port using
-   deinterlacing hardware. */
-#define DDSCAPS2_HARDWAREDEINTERLACE	0x00000002
-/* indicates the surface will be locked very frequently. */
-#define DDSCAPS2_HINTDYNAMIC		0x00000004
-/* indicates surface can be re-ordered or retiled on load() */
-#define DDSCAPS2_HINTSTATIC             0x00000008
-/* indicates surface to be managed by directdraw/direct3D */
-#define DDSCAPS2_TEXTUREMANAGE          0x00000010
-/* reserved bits */
-#define DDSCAPS2_RESERVED1              0x00000020
-#define DDSCAPS2_RESERVED2              0x00000040
-/* indicates surface will never be locked again */
-#define DDSCAPS2_OPAQUE                 0x00000080
-/* set at CreateSurface() time to indicate antialising will be used */
-#define DDSCAPS2_HINTANTIALIASING       0x00000100
-/* set at CreateSurface() time to indicate cubic environment map */
-#define DDSCAPS2_CUBEMAP                0x00000200
-/* face flags for cube maps */
-#define DDSCAPS2_CUBEMAP_POSITIVEX      0x00000400
-#define DDSCAPS2_CUBEMAP_NEGATIVEX      0x00000800
-#define DDSCAPS2_CUBEMAP_POSITIVEY      0x00001000
-#define DDSCAPS2_CUBEMAP_NEGATIVEY      0x00002000
-#define DDSCAPS2_CUBEMAP_POSITIVEZ      0x00004000
-#define DDSCAPS2_CUBEMAP_NEGATIVEZ      0x00008000
-/* specifies all faces of a cube for CreateSurface() */
-#define DDSCAPS2_CUBEMAP_ALLFACES ( DDSCAPS2_CUBEMAP_POSITIVEX |\
-                                    DDSCAPS2_CUBEMAP_NEGATIVEX |\
-                                    DDSCAPS2_CUBEMAP_POSITIVEY |\
-                                    DDSCAPS2_CUBEMAP_NEGATIVEY |\
-                                    DDSCAPS2_CUBEMAP_POSITIVEZ |\
-                                    DDSCAPS2_CUBEMAP_NEGATIVEZ )
-/* set for mipmap sublevels on DirectX7 and later.  ignored by CreateSurface() */
-#define DDSCAPS2_MIPMAPSUBLEVEL         0x00010000
-/* indicates texture surface to be managed by Direct3D *only* */
-#define DDSCAPS2_D3DTEXTUREMANAGE       0x00020000
-/* indicates managed surface that can safely be lost */
-#define DDSCAPS2_DONOTPERSIST           0x00040000
-/* indicates surface is part of a stereo flipping chain */
-#define DDSCAPS2_STEREOSURFACELEFT      0x00080000
-
-    typedef struct _DDSCAPS2 {
-        DWORD dwCaps;           /* capabilities of surface wanted */
-        DWORD dwCaps2;          /* additional capabilities */
-        DWORD dwCaps3;          /* reserved capabilities */
-        DWORD dwCaps4;          /* more reserved capabilities */
-    } DDSCAPS2, *LPDDSCAPS2;
-
-#define	DD_ROP_SPACE	(256/32)        /* space required to store ROP array */
-
-    typedef struct _DDCAPS_DX7 {        /* DirectX 7 version of caps struct */
-        DWORD dwSize;           /* size of the DDDRIVERCAPS structure */
-        DWORD dwCaps;           /* driver specific capabilities */
-        DWORD dwCaps2;          /* more driver specific capabilites */
-        DWORD dwCKeyCaps;       /* color key capabilities of the surface */
-        DWORD dwFXCaps;         /* driver specific stretching and effects capabilites */
-        DWORD dwFXAlphaCaps;    /* alpha driver specific capabilities */
-        DWORD dwPalCaps;        /* palette capabilities */
-        DWORD dwSVCaps;         /* stereo vision capabilities */
-        DWORD dwAlphaBltConstBitDepths; /* DDBD_2,4,8 */
-        DWORD dwAlphaBltPixelBitDepths; /* DDBD_1,2,4,8 */
-        DWORD dwAlphaBltSurfaceBitDepths;       /* DDBD_1,2,4,8 */
-        DWORD dwAlphaOverlayConstBitDepths;     /* DDBD_2,4,8 */
-        DWORD dwAlphaOverlayPixelBitDepths;     /* DDBD_1,2,4,8 */
-        DWORD dwAlphaOverlaySurfaceBitDepths;   /* DDBD_1,2,4,8 */
-        DWORD dwZBufferBitDepths;       /* DDBD_8,16,24,32 */
-        DWORD dwVidMemTotal;    /* total amount of video memory */
-        DWORD dwVidMemFree;     /* amount of free video memory */
-        DWORD dwMaxVisibleOverlays;     /* maximum number of visible overlays */
-        DWORD dwCurrVisibleOverlays;    /* current number of visible overlays */
-        DWORD dwNumFourCCCodes; /* number of four cc codes */
-        DWORD dwAlignBoundarySrc;       /* source rectangle alignment */
-        DWORD dwAlignSizeSrc;   /* source rectangle byte size */
-        DWORD dwAlignBoundaryDest;      /* dest rectangle alignment */
-        DWORD dwAlignSizeDest;  /* dest rectangle byte size */
-        DWORD dwAlignStrideAlign;       /* stride alignment */
-        DWORD dwRops[DD_ROP_SPACE];     /* ROPS supported */
-        DDSCAPS ddsOldCaps;     /* old DDSCAPS - superceded for DirectX6+ */
-        DWORD dwMinOverlayStretch;      /* minimum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-        DWORD dwMaxOverlayStretch;      /* maximum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-        DWORD dwMinLiveVideoStretch;    /* minimum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-        DWORD dwMaxLiveVideoStretch;    /* maximum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-        DWORD dwMinHwCodecStretch;      /* minimum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-        DWORD dwMaxHwCodecStretch;      /* maximum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-        DWORD dwReserved1;
-        DWORD dwReserved2;
-        DWORD dwReserved3;
-        DWORD dwSVBCaps;        /* driver specific capabilities for System->Vmem blts */
-        DWORD dwSVBCKeyCaps;    /* driver color key capabilities for System->Vmem blts */
-        DWORD dwSVBFXCaps;      /* driver FX capabilities for System->Vmem blts */
-        DWORD dwSVBRops[DD_ROP_SPACE];  /* ROPS supported for System->Vmem blts */
-        DWORD dwVSBCaps;        /* driver specific capabilities for Vmem->System blts */
-        DWORD dwVSBCKeyCaps;    /* driver color key capabilities for Vmem->System blts */
-        DWORD dwVSBFXCaps;      /* driver FX capabilities for Vmem->System blts */
-        DWORD dwVSBRops[DD_ROP_SPACE];  /* ROPS supported for Vmem->System blts */
-        DWORD dwSSBCaps;        /* driver specific capabilities for System->System blts */
-        DWORD dwSSBCKeyCaps;    /* driver color key capabilities for System->System blts */
-        DWORD dwSSBFXCaps;      /* driver FX capabilities for System->System blts */
-        DWORD dwSSBRops[DD_ROP_SPACE];  /* ROPS supported for System->System blts */
-        DWORD dwMaxVideoPorts;  /* maximum number of usable video ports */
-        DWORD dwCurrVideoPorts; /* current number of video ports used */
-        DWORD dwSVBCaps2;       /* more driver specific capabilities for System->Vmem blts */
-        DWORD dwNLVBCaps;       /* driver specific capabilities for non-local->local vidmem blts */
-        DWORD dwNLVBCaps2;      /* more driver specific capabilities non-local->local vidmem blts */
-        DWORD dwNLVBCKeyCaps;   /* driver color key capabilities for non-local->local vidmem blts */
-        DWORD dwNLVBFXCaps;     /* driver FX capabilities for non-local->local blts */
-        DWORD dwNLVBRops[DD_ROP_SPACE]; /* ROPS supported for non-local->local blts */
-        DDSCAPS2 ddsCaps;       /* surface capabilities */
-    } DDCAPS_DX7, *LPDDCAPS_DX7;
-
-    typedef struct _DDCAPS_DX6 {        /* DirectX 6 version of caps struct */
-        DWORD dwSize;           /* size of the DDDRIVERCAPS structure */
-        DWORD dwCaps;           /* driver specific capabilities */
-        DWORD dwCaps2;          /* more driver specific capabilites */
-        DWORD dwCKeyCaps;       /* color key capabilities of the surface */
-        DWORD dwFXCaps;         /* driver specific stretching and effects capabilites */
-        DWORD dwFXAlphaCaps;    /* alpha driver specific capabilities */
-        DWORD dwPalCaps;        /* palette capabilities */
-        DWORD dwSVCaps;         /* stereo vision capabilities */
-        DWORD dwAlphaBltConstBitDepths; /* DDBD_2,4,8 */
-        DWORD dwAlphaBltPixelBitDepths; /* DDBD_1,2,4,8 */
-        DWORD dwAlphaBltSurfaceBitDepths;       /* DDBD_1,2,4,8 */
-        DWORD dwAlphaOverlayConstBitDepths;     /* DDBD_2,4,8 */
-        DWORD dwAlphaOverlayPixelBitDepths;     /* DDBD_1,2,4,8 */
-        DWORD dwAlphaOverlaySurfaceBitDepths;   /* DDBD_1,2,4,8 */
-        DWORD dwZBufferBitDepths;       /* DDBD_8,16,24,32 */
-        DWORD dwVidMemTotal;    /* total amount of video memory */
-        DWORD dwVidMemFree;     /* amount of free video memory */
-        DWORD dwMaxVisibleOverlays;     /* maximum number of visible overlays */
-        DWORD dwCurrVisibleOverlays;    /* current number of visible overlays */
-        DWORD dwNumFourCCCodes; /* number of four cc codes */
-        DWORD dwAlignBoundarySrc;       /* source rectangle alignment */
-        DWORD dwAlignSizeSrc;   /* source rectangle byte size */
-        DWORD dwAlignBoundaryDest;      /* dest rectangle alignment */
-        DWORD dwAlignSizeDest;  /* dest rectangle byte size */
-        DWORD dwAlignStrideAlign;       /* stride alignment */
-        DWORD dwRops[DD_ROP_SPACE];     /* ROPS supported */
-        DDSCAPS ddsOldCaps;     /* old DDSCAPS - superceded for DirectX6+ */
-        DWORD dwMinOverlayStretch;      /* minimum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-        DWORD dwMaxOverlayStretch;      /* maximum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-        DWORD dwMinLiveVideoStretch;    /* minimum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-        DWORD dwMaxLiveVideoStretch;    /* maximum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-        DWORD dwMinHwCodecStretch;      /* minimum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-        DWORD dwMaxHwCodecStretch;      /* maximum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-        DWORD dwReserved1;
-        DWORD dwReserved2;
-        DWORD dwReserved3;
-        DWORD dwSVBCaps;        /* driver specific capabilities for System->Vmem blts */
-        DWORD dwSVBCKeyCaps;    /* driver color key capabilities for System->Vmem blts */
-        DWORD dwSVBFXCaps;      /* driver FX capabilities for System->Vmem blts */
-        DWORD dwSVBRops[DD_ROP_SPACE];  /* ROPS supported for System->Vmem blts */
-        DWORD dwVSBCaps;        /* driver specific capabilities for Vmem->System blts */
-        DWORD dwVSBCKeyCaps;    /* driver color key capabilities for Vmem->System blts */
-        DWORD dwVSBFXCaps;      /* driver FX capabilities for Vmem->System blts */
-        DWORD dwVSBRops[DD_ROP_SPACE];  /* ROPS supported for Vmem->System blts */
-        DWORD dwSSBCaps;        /* driver specific capabilities for System->System blts */
-        DWORD dwSSBCKeyCaps;    /* driver color key capabilities for System->System blts */
-        DWORD dwSSBFXCaps;      /* driver FX capabilities for System->System blts */
-        DWORD dwSSBRops[DD_ROP_SPACE];  /* ROPS supported for System->System blts */
-        DWORD dwMaxVideoPorts;  /* maximum number of usable video ports */
-        DWORD dwCurrVideoPorts; /* current number of video ports used */
-        DWORD dwSVBCaps2;       /* more driver specific capabilities for System->Vmem blts */
-        DWORD dwNLVBCaps;       /* driver specific capabilities for non-local->local vidmem blts */
-        DWORD dwNLVBCaps2;      /* more driver specific capabilities non-local->local vidmem blts */
-        DWORD dwNLVBCKeyCaps;   /* driver color key capabilities for non-local->local vidmem blts */
-        DWORD dwNLVBFXCaps;     /* driver FX capabilities for non-local->local blts */
-        DWORD dwNLVBRops[DD_ROP_SPACE]; /* ROPS supported for non-local->local blts */
-        /* and one new member for DirectX 6 */
-        DDSCAPS2 ddsCaps;       /* surface capabilities */
-    } DDCAPS_DX6, *LPDDCAPS_DX6;
-
-    typedef struct _DDCAPS_DX5 {        /* DirectX5 version of caps struct */
-        DWORD dwSize;           /* size of the DDDRIVERCAPS structure */
-        DWORD dwCaps;           /* driver specific capabilities */
-        DWORD dwCaps2;          /* more driver specific capabilites */
-        DWORD dwCKeyCaps;       /* color key capabilities of the surface */
-        DWORD dwFXCaps;         /* driver specific stretching and effects capabilites */
-        DWORD dwFXAlphaCaps;    /* alpha driver specific capabilities */
-        DWORD dwPalCaps;        /* palette capabilities */
-        DWORD dwSVCaps;         /* stereo vision capabilities */
-        DWORD dwAlphaBltConstBitDepths; /* DDBD_2,4,8 */
-        DWORD dwAlphaBltPixelBitDepths; /* DDBD_1,2,4,8 */
-        DWORD dwAlphaBltSurfaceBitDepths;       /* DDBD_1,2,4,8 */
-        DWORD dwAlphaOverlayConstBitDepths;     /* DDBD_2,4,8 */
-        DWORD dwAlphaOverlayPixelBitDepths;     /* DDBD_1,2,4,8 */
-        DWORD dwAlphaOverlaySurfaceBitDepths;   /* DDBD_1,2,4,8 */
-        DWORD dwZBufferBitDepths;       /* DDBD_8,16,24,32 */
-        DWORD dwVidMemTotal;    /* total amount of video memory */
-        DWORD dwVidMemFree;     /* amount of free video memory */
-        DWORD dwMaxVisibleOverlays;     /* maximum number of visible overlays */
-        DWORD dwCurrVisibleOverlays;    /* current number of visible overlays */
-        DWORD dwNumFourCCCodes; /* number of four cc codes */
-        DWORD dwAlignBoundarySrc;       /* source rectangle alignment */
-        DWORD dwAlignSizeSrc;   /* source rectangle byte size */
-        DWORD dwAlignBoundaryDest;      /* dest rectangle alignment */
-        DWORD dwAlignSizeDest;  /* dest rectangle byte size */
-        DWORD dwAlignStrideAlign;       /* stride alignment */
-        DWORD dwRops[DD_ROP_SPACE];     /* ROPS supported */
-        DDSCAPS ddsCaps;        /* DDSCAPS structure has all the general capabilities */
-        DWORD dwMinOverlayStretch;      /* minimum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-        DWORD dwMaxOverlayStretch;      /* maximum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-        DWORD dwMinLiveVideoStretch;    /* minimum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-        DWORD dwMaxLiveVideoStretch;    /* maximum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-        DWORD dwMinHwCodecStretch;      /* minimum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-        DWORD dwMaxHwCodecStretch;      /* maximum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-        DWORD dwReserved1;
-        DWORD dwReserved2;
-        DWORD dwReserved3;
-        DWORD dwSVBCaps;        /* driver specific capabilities for System->Vmem blts */
-        DWORD dwSVBCKeyCaps;    /* driver color key capabilities for System->Vmem blts */
-        DWORD dwSVBFXCaps;      /* driver FX capabilities for System->Vmem blts */
-        DWORD dwSVBRops[DD_ROP_SPACE];  /* ROPS supported for System->Vmem blts */
-        DWORD dwVSBCaps;        /* driver specific capabilities for Vmem->System blts */
-        DWORD dwVSBCKeyCaps;    /* driver color key capabilities for Vmem->System blts */
-        DWORD dwVSBFXCaps;      /* driver FX capabilities for Vmem->System blts */
-        DWORD dwVSBRops[DD_ROP_SPACE];  /* ROPS supported for Vmem->System blts */
-        DWORD dwSSBCaps;        /* driver specific capabilities for System->System blts */
-        DWORD dwSSBCKeyCaps;    /* driver color key capabilities for System->System blts */
-        DWORD dwSSBFXCaps;      /* driver FX capabilities for System->System blts */
-        DWORD dwSSBRops[DD_ROP_SPACE];  /* ROPS supported for System->System blts */
-        /* the following are the new DirectX 5 members */
-        DWORD dwMaxVideoPorts;  /* maximum number of usable video ports */
-        DWORD dwCurrVideoPorts; /* current number of video ports used */
-        DWORD dwSVBCaps2;       /* more driver specific capabilities for System->Vmem blts */
-        DWORD dwNLVBCaps;       /* driver specific capabilities for non-local->local vidmem blts */
-        DWORD dwNLVBCaps2;      /* more driver specific capabilities non-local->local vidmem blts */
-        DWORD dwNLVBCKeyCaps;   /* driver color key capabilities for non-local->local vidmem blts */
-        DWORD dwNLVBFXCaps;     /* driver FX capabilities for non-local->local blts */
-        DWORD dwNLVBRops[DD_ROP_SPACE]; /* ROPS supported for non-local->local blts */
-    } DDCAPS_DX5, *LPDDCAPS_DX5;
-
-    typedef struct _DDCAPS_DX3 {        /* DirectX3 version of caps struct */
-        DWORD dwSize;           /* size of the DDDRIVERCAPS structure */
-        DWORD dwCaps;           /* driver specific capabilities */
-        DWORD dwCaps2;          /* more driver specific capabilites */
-        DWORD dwCKeyCaps;       /* color key capabilities of the surface */
-        DWORD dwFXCaps;         /* driver specific stretching and effects capabilites */
-        DWORD dwFXAlphaCaps;    /* alpha driver specific capabilities */
-        DWORD dwPalCaps;        /* palette capabilities */
-        DWORD dwSVCaps;         /* stereo vision capabilities */
-        DWORD dwAlphaBltConstBitDepths; /* DDBD_2,4,8 */
-        DWORD dwAlphaBltPixelBitDepths; /* DDBD_1,2,4,8 */
-        DWORD dwAlphaBltSurfaceBitDepths;       /* DDBD_1,2,4,8 */
-        DWORD dwAlphaOverlayConstBitDepths;     /* DDBD_2,4,8 */
-        DWORD dwAlphaOverlayPixelBitDepths;     /* DDBD_1,2,4,8 */
-        DWORD dwAlphaOverlaySurfaceBitDepths;   /* DDBD_1,2,4,8 */
-        DWORD dwZBufferBitDepths;       /* DDBD_8,16,24,32 */
-        DWORD dwVidMemTotal;    /* total amount of video memory */
-        DWORD dwVidMemFree;     /* amount of free video memory */
-        DWORD dwMaxVisibleOverlays;     /* maximum number of visible overlays */
-        DWORD dwCurrVisibleOverlays;    /* current number of visible overlays */
-        DWORD dwNumFourCCCodes; /* number of four cc codes */
-        DWORD dwAlignBoundarySrc;       /* source rectangle alignment */
-        DWORD dwAlignSizeSrc;   /* source rectangle byte size */
-        DWORD dwAlignBoundaryDest;      /* dest rectangle alignment */
-        DWORD dwAlignSizeDest;  /* dest rectangle byte size */
-        DWORD dwAlignStrideAlign;       /* stride alignment */
-        DWORD dwRops[DD_ROP_SPACE];     /* ROPS supported */
-        DDSCAPS ddsCaps;        /* DDSCAPS structure has all the general capabilities */
-        DWORD dwMinOverlayStretch;      /* minimum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-        DWORD dwMaxOverlayStretch;      /* maximum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-        DWORD dwMinLiveVideoStretch;    /* minimum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-        DWORD dwMaxLiveVideoStretch;    /* maximum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-        DWORD dwMinHwCodecStretch;      /* minimum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-        DWORD dwMaxHwCodecStretch;      /* maximum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-        DWORD dwReserved1;
-        DWORD dwReserved2;
-        DWORD dwReserved3;
-        DWORD dwSVBCaps;        /* driver specific capabilities for System->Vmem blts */
-        DWORD dwSVBCKeyCaps;    /* driver color key capabilities for System->Vmem blts */
-        DWORD dwSVBFXCaps;      /* driver FX capabilities for System->Vmem blts */
-        DWORD dwSVBRops[DD_ROP_SPACE];  /* ROPS supported for System->Vmem blts */
-        DWORD dwVSBCaps;        /* driver specific capabilities for Vmem->System blts */
-        DWORD dwVSBCKeyCaps;    /* driver color key capabilities for Vmem->System blts */
-        DWORD dwVSBFXCaps;      /* driver FX capabilities for Vmem->System blts */
-        DWORD dwVSBRops[DD_ROP_SPACE];  /* ROPS supported for Vmem->System blts */
-        DWORD dwSSBCaps;        /* driver specific capabilities for System->System blts */
-        DWORD dwSSBCKeyCaps;    /* driver color key capabilities for System->System blts */
-        DWORD dwSSBFXCaps;      /* driver FX capabilities for System->System blts */
-        DWORD dwSSBRops[DD_ROP_SPACE];  /* ROPS supported for System->System blts */
-        DWORD dwReserved4;
-        DWORD dwReserved5;
-        DWORD dwReserved6;
-    } DDCAPS_DX3, *LPDDCAPS_DX3;
-
-/* set caps struct according to DIRECTDRAW_VERSION */
-
-#if DIRECTDRAW_VERSION <= 0x300
-    typedef DDCAPS_DX3 DDCAPS;
-#elif DIRECTDRAW_VERSION <= 0x500
-    typedef DDCAPS_DX5 DDCAPS;
-#elif DIRECTDRAW_VERSION <= 0x600
-    typedef DDCAPS_DX6 DDCAPS;
-#else
-    typedef DDCAPS_DX7 DDCAPS;
-#endif
-
-    typedef DDCAPS *LPDDCAPS;
-
-/* DDCAPS.dwCaps */
-#define DDCAPS_3D			0x00000001
-#define DDCAPS_ALIGNBOUNDARYDEST	0x00000002
-#define DDCAPS_ALIGNSIZEDEST		0x00000004
-#define DDCAPS_ALIGNBOUNDARYSRC		0x00000008
-#define DDCAPS_ALIGNSIZESRC		0x00000010
-#define DDCAPS_ALIGNSTRIDE		0x00000020
-#define DDCAPS_BLT			0x00000040
-#define DDCAPS_BLTQUEUE			0x00000080
-#define DDCAPS_BLTFOURCC		0x00000100
-#define DDCAPS_BLTSTRETCH		0x00000200
-#define DDCAPS_GDI			0x00000400
-#define DDCAPS_OVERLAY			0x00000800
-#define DDCAPS_OVERLAYCANTCLIP		0x00001000
-#define DDCAPS_OVERLAYFOURCC		0x00002000
-#define DDCAPS_OVERLAYSTRETCH		0x00004000
-#define DDCAPS_PALETTE			0x00008000
-#define DDCAPS_PALETTEVSYNC		0x00010000
-#define DDCAPS_READSCANLINE		0x00020000
-#define DDCAPS_STEREOVIEW		0x00040000
-#define DDCAPS_VBI			0x00080000
-#define DDCAPS_ZBLTS			0x00100000
-#define DDCAPS_ZOVERLAYS		0x00200000
-#define DDCAPS_COLORKEY			0x00400000
-#define DDCAPS_ALPHA			0x00800000
-#define DDCAPS_COLORKEYHWASSIST		0x01000000
-#define DDCAPS_NOHARDWARE		0x02000000
-#define DDCAPS_BLTCOLORFILL		0x04000000
-#define DDCAPS_BANKSWITCHED		0x08000000
-#define DDCAPS_BLTDEPTHFILL		0x10000000
-#define DDCAPS_CANCLIP			0x20000000
-#define DDCAPS_CANCLIPSTRETCHED		0x40000000
-#define DDCAPS_CANBLTSYSMEM		0x80000000
-
-/* DDCAPS.dwCaps2 */
-#define DDCAPS2_CERTIFIED		0x00000001
-#define DDCAPS2_NO2DDURING3DSCENE       0x00000002
-#define DDCAPS2_VIDEOPORT		0x00000004
-#define DDCAPS2_AUTOFLIPOVERLAY		0x00000008
-#define DDCAPS2_CANBOBINTERLEAVED	0x00000010
-#define DDCAPS2_CANBOBNONINTERLEAVED	0x00000020
-#define DDCAPS2_COLORCONTROLOVERLAY	0x00000040
-#define DDCAPS2_COLORCONTROLPRIMARY	0x00000080
-#define DDCAPS2_CANDROPZ16BIT		0x00000100
-#define DDCAPS2_NONLOCALVIDMEM		0x00000200
-#define DDCAPS2_NONLOCALVIDMEMCAPS	0x00000400
-#define DDCAPS2_NOPAGELOCKREQUIRED	0x00000800
-#define DDCAPS2_WIDESURFACES		0x00001000
-#define DDCAPS2_CANFLIPODDEVEN		0x00002000
-#define DDCAPS2_CANBOBHARDWARE		0x00004000
-#define DDCAPS2_COPYFOURCC              0x00008000
-#define DDCAPS2_PRIMARYGAMMA            0x00020000
-#define DDCAPS2_CANRENDERWINDOWED       0x00080000
-#define DDCAPS2_CANCALIBRATEGAMMA       0x00100000
-#define DDCAPS2_FLIPINTERVAL            0x00200000
-#define DDCAPS2_FLIPNOVSYNC             0x00400000
-#define DDCAPS2_CANMANAGETEXTURE        0x00800000
-#define DDCAPS2_TEXMANINNONLOCALVIDMEM  0x01000000
-#define DDCAPS2_STEREO                  0x02000000
-#define DDCAPS2_SYSTONONLOCAL_AS_SYSTOLOCAL   0x04000000
-
-/* Set/Get Colour Key Flags */
-#define DDCKEY_COLORSPACE  0x00000001   /* Struct is single colour space */
-#define DDCKEY_DESTBLT     0x00000002   /* To be used as dest for blt */
-#define DDCKEY_DESTOVERLAY 0x00000004   /* To be used as dest for CK overlays */
-#define DDCKEY_SRCBLT      0x00000008   /* To be used as src for blt */
-#define DDCKEY_SRCOVERLAY  0x00000010   /* To be used as src for CK overlays */
-
-    typedef struct _DDCOLORKEY {
-        DWORD dwColorSpaceLowValue;     /* low boundary of color space that is to
-                                         * be treated as Color Key, inclusive
-                                         */
-        DWORD dwColorSpaceHighValue;    /* high boundary of color space that is
-                                         * to be treated as Color Key, inclusive
-                                         */
-    } DDCOLORKEY, *LPDDCOLORKEY;
-
-/* ddCKEYCAPS bits */
-#define DDCKEYCAPS_DESTBLT			0x00000001
-#define DDCKEYCAPS_DESTBLTCLRSPACE		0x00000002
-#define DDCKEYCAPS_DESTBLTCLRSPACEYUV		0x00000004
-#define DDCKEYCAPS_DESTBLTYUV			0x00000008
-#define DDCKEYCAPS_DESTOVERLAY			0x00000010
-#define DDCKEYCAPS_DESTOVERLAYCLRSPACE		0x00000020
-#define DDCKEYCAPS_DESTOVERLAYCLRSPACEYUV	0x00000040
-#define DDCKEYCAPS_DESTOVERLAYONEACTIVE		0x00000080
-#define DDCKEYCAPS_DESTOVERLAYYUV		0x00000100
-#define DDCKEYCAPS_SRCBLT			0x00000200
-#define DDCKEYCAPS_SRCBLTCLRSPACE		0x00000400
-#define DDCKEYCAPS_SRCBLTCLRSPACEYUV		0x00000800
-#define DDCKEYCAPS_SRCBLTYUV			0x00001000
-#define DDCKEYCAPS_SRCOVERLAY			0x00002000
-#define DDCKEYCAPS_SRCOVERLAYCLRSPACE		0x00004000
-#define DDCKEYCAPS_SRCOVERLAYCLRSPACEYUV	0x00008000
-#define DDCKEYCAPS_SRCOVERLAYONEACTIVE		0x00010000
-#define DDCKEYCAPS_SRCOVERLAYYUV		0x00020000
-#define DDCKEYCAPS_NOCOSTOVERLAY		0x00040000
-
-    typedef struct _DDPIXELFORMAT {
-        DWORD dwSize;           /* 0: size of structure */
-        DWORD dwFlags;          /* 4: pixel format flags */
-        DWORD dwFourCC;         /* 8: (FOURCC code) */
-        union {
-            DWORD dwRGBBitCount;        /* C: how many bits per pixel */
-            DWORD dwYUVBitCount;        /* C: how many bits per pixel */
-            DWORD dwZBufferBitDepth;    /* C: how many bits for z buffers */
-            DWORD dwAlphaBitDepth;      /* C: how many bits for alpha channels */
-            DWORD dwLuminanceBitCount;
-            DWORD dwBumpBitCount;
-        } DUMMYUNIONNAME1;
-        union {
-            DWORD dwRBitMask;   /* 10: mask for red bit */
-            DWORD dwYBitMask;   /* 10: mask for Y bits */
-            DWORD dwStencilBitDepth;
-            DWORD dwLuminanceBitMask;
-            DWORD dwBumpDuBitMask;
-        } DUMMYUNIONNAME2;
-        union {
-            DWORD dwGBitMask;   /* 14: mask for green bits */
-            DWORD dwUBitMask;   /* 14: mask for U bits */
-            DWORD dwZBitMask;
-            DWORD dwBumpDvBitMask;
-        } DUMMYUNIONNAME3;
-        union {
-            DWORD dwBBitMask;   /* 18: mask for blue bits */
-            DWORD dwVBitMask;   /* 18: mask for V bits */
-            DWORD dwStencilBitMask;
-            DWORD dwBumpLuminanceBitMask;
-        } DUMMYUNIONNAME4;
-        union {
-            DWORD dwRGBAlphaBitMask;    /* 1C: mask for alpha channel */
-            DWORD dwYUVAlphaBitMask;    /* 1C: mask for alpha channel */
-            DWORD dwLuminanceAlphaBitMask;
-            DWORD dwRGBZBitMask;        /* 1C: mask for Z channel */
-            DWORD dwYUVZBitMask;        /* 1C: mask for Z channel */
-        } DUMMYUNIONNAME5;
-        /* 20: next structure */
-    } DDPIXELFORMAT, *LPDDPIXELFORMAT;
-
-/* DDCAPS.dwFXCaps */
-#define DDFXCAPS_BLTALPHA               0x00000001
-#define DDFXCAPS_OVERLAYALPHA           0x00000004
-#define DDFXCAPS_BLTARITHSTRETCHYN	0x00000010
-#define DDFXCAPS_BLTARITHSTRETCHY	0x00000020
-#define DDFXCAPS_BLTMIRRORLEFTRIGHT	0x00000040
-#define DDFXCAPS_BLTMIRRORUPDOWN	0x00000080
-#define DDFXCAPS_BLTROTATION		0x00000100
-#define DDFXCAPS_BLTROTATION90		0x00000200
-#define DDFXCAPS_BLTSHRINKX		0x00000400
-#define DDFXCAPS_BLTSHRINKXN		0x00000800
-#define DDFXCAPS_BLTSHRINKY		0x00001000
-#define DDFXCAPS_BLTSHRINKYN		0x00002000
-#define DDFXCAPS_BLTSTRETCHX		0x00004000
-#define DDFXCAPS_BLTSTRETCHXN		0x00008000
-#define DDFXCAPS_BLTSTRETCHY		0x00010000
-#define DDFXCAPS_BLTSTRETCHYN		0x00020000
-#define DDFXCAPS_OVERLAYARITHSTRETCHY	0x00040000
-#define DDFXCAPS_OVERLAYARITHSTRETCHYN	0x00000008
-#define DDFXCAPS_OVERLAYSHRINKX		0x00080000
-#define DDFXCAPS_OVERLAYSHRINKXN	0x00100000
-#define DDFXCAPS_OVERLAYSHRINKY		0x00200000
-#define DDFXCAPS_OVERLAYSHRINKYN	0x00400000
-#define DDFXCAPS_OVERLAYSTRETCHX	0x00800000
-#define DDFXCAPS_OVERLAYSTRETCHXN	0x01000000
-#define DDFXCAPS_OVERLAYSTRETCHY	0x02000000
-#define DDFXCAPS_OVERLAYSTRETCHYN	0x04000000
-#define DDFXCAPS_OVERLAYMIRRORLEFTRIGHT	0x08000000
-#define DDFXCAPS_OVERLAYMIRRORUPDOWN	0x10000000
-
-#define DDFXCAPS_OVERLAYFILTER          DDFXCAPS_OVERLAYARITHSTRETCHY
-
-/* DDCAPS.dwFXAlphaCaps */
-#define DDFXALPHACAPS_BLTALPHAEDGEBLEND		0x00000001
-#define DDFXALPHACAPS_BLTALPHAPIXELS		0x00000002
-#define DDFXALPHACAPS_BLTALPHAPIXELSNEG		0x00000004
-#define DDFXALPHACAPS_BLTALPHASURFACES		0x00000008
-#define DDFXALPHACAPS_BLTALPHASURFACESNEG	0x00000010
-#define DDFXALPHACAPS_OVERLAYALPHAEDGEBLEND	0x00000020
-#define DDFXALPHACAPS_OVERLAYALPHAPIXELS	0x00000040
-#define DDFXALPHACAPS_OVERLAYALPHAPIXELSNEG	0x00000080
-#define DDFXALPHACAPS_OVERLAYALPHASURFACES	0x00000100
-#define DDFXALPHACAPS_OVERLAYALPHASURFACESNEG	0x00000200
-
-/* DDCAPS.dwPalCaps */
-#define DDPCAPS_4BIT			0x00000001
-#define DDPCAPS_8BITENTRIES		0x00000002
-#define DDPCAPS_8BIT			0x00000004
-#define DDPCAPS_INITIALIZE		0x00000008
-#define DDPCAPS_PRIMARYSURFACE		0x00000010
-#define DDPCAPS_PRIMARYSURFACELEFT	0x00000020
-#define DDPCAPS_ALLOW256		0x00000040
-#define DDPCAPS_VSYNC			0x00000080
-#define DDPCAPS_1BIT			0x00000100
-#define DDPCAPS_2BIT			0x00000200
-#define DDPCAPS_ALPHA                   0x00000400
-
-/* DDCAPS.dwSVCaps */
-/* the first 4 of these are now obsolete */
-#if DIRECTDRAW_VERSION >= 0x700 /* FIXME: I'm not sure when this switch occured */
-#define DDSVCAPS_RESERVED1		0x00000001
-#define DDSVCAPS_RESERVED2		0x00000002
-#define DDSVCAPS_RESERVED3		0x00000004
-#define DDSVCAPS_RESERVED4		0x00000008
-#else
-#define DDSVCAPS_ENIGMA			0x00000001
-#define DDSVCAPS_FLICKER		0x00000002
-#define DDSVCAPS_REDBLUE		0x00000004
-#define DDSVCAPS_SPLIT			0x00000008
-#endif
-#define DDSVCAPS_STEREOSEQUENTIAL       0x00000010
-
-/* BitDepths */
-#define DDBD_1				0x00004000
-#define DDBD_2				0x00002000
-#define DDBD_4				0x00001000
-#define DDBD_8				0x00000800
-#define DDBD_16				0x00000400
-#define DDBD_24				0x00000200
-#define DDBD_32				0x00000100
-
-/* DDOVERLAYFX.dwDDFX */
-#define DDOVERFX_ARITHSTRETCHY		0x00000001
-#define DDOVERFX_MIRRORLEFTRIGHT	0x00000002
-#define DDOVERFX_MIRRORUPDOWN		0x00000004
-
-/* UpdateOverlay flags */
-#define DDOVER_ALPHADEST                        0x00000001
-#define DDOVER_ALPHADESTCONSTOVERRIDE           0x00000002
-#define DDOVER_ALPHADESTNEG                     0x00000004
-#define DDOVER_ALPHADESTSURFACEOVERRIDE         0x00000008
-#define DDOVER_ALPHAEDGEBLEND                   0x00000010
-#define DDOVER_ALPHASRC                         0x00000020
-#define DDOVER_ALPHASRCCONSTOVERRIDE            0x00000040
-#define DDOVER_ALPHASRCNEG                      0x00000080
-#define DDOVER_ALPHASRCSURFACEOVERRIDE          0x00000100
-#define DDOVER_HIDE                             0x00000200
-#define DDOVER_KEYDEST                          0x00000400
-#define DDOVER_KEYDESTOVERRIDE                  0x00000800
-#define DDOVER_KEYSRC                           0x00001000
-#define DDOVER_KEYSRCOVERRIDE                   0x00002000
-#define DDOVER_SHOW                             0x00004000
-#define DDOVER_ADDDIRTYRECT                     0x00008000
-#define DDOVER_REFRESHDIRTYRECTS                0x00010000
-#define DDOVER_REFRESHALL                       0x00020000
-#define DDOVER_DDFX                             0x00080000
-#define DDOVER_AUTOFLIP                         0x00100000
-#define DDOVER_BOB                              0x00200000
-#define DDOVER_OVERRIDEBOBWEAVE                 0x00400000
-#define DDOVER_INTERLEAVED                      0x00800000
-
-/* DDCOLORKEY.dwFlags */
-#define DDPF_ALPHAPIXELS		0x00000001
-#define DDPF_ALPHA			0x00000002
-#define DDPF_FOURCC			0x00000004
-#define DDPF_PALETTEINDEXED4		0x00000008
-#define DDPF_PALETTEINDEXEDTO8		0x00000010
-#define DDPF_PALETTEINDEXED8		0x00000020
-#define DDPF_RGB			0x00000040
-#define DDPF_COMPRESSED			0x00000080
-#define DDPF_RGBTOYUV			0x00000100
-#define DDPF_YUV			0x00000200
-#define DDPF_ZBUFFER			0x00000400
-#define DDPF_PALETTEINDEXED1		0x00000800
-#define DDPF_PALETTEINDEXED2		0x00001000
-#define DDPF_ZPIXELS			0x00002000
-#define DDPF_STENCILBUFFER              0x00004000
-#define DDPF_ALPHAPREMULT               0x00008000
-#define DDPF_LUMINANCE                  0x00020000
-#define DDPF_BUMPLUMINANCE              0x00040000
-#define DDPF_BUMPDUDV                   0x00080000
-
-/* SetCooperativeLevel dwFlags */
-#define DDSCL_FULLSCREEN		0x00000001
-#define DDSCL_ALLOWREBOOT		0x00000002
-#define DDSCL_NOWINDOWCHANGES		0x00000004
-#define DDSCL_NORMAL			0x00000008
-#define DDSCL_EXCLUSIVE			0x00000010
-#define DDSCL_ALLOWMODEX		0x00000040
-#define DDSCL_SETFOCUSWINDOW		0x00000080
-#define DDSCL_SETDEVICEWINDOW		0x00000100
-#define DDSCL_CREATEDEVICEWINDOW	0x00000200
-#define DDSCL_MULTITHREADED             0x00000400
-#define DDSCL_FPUSETUP                  0x00000800
-#define DDSCL_FPUPRESERVE               0x00001000
-
-/* DDSURFACEDESC.dwFlags */
-#define	DDSD_CAPS		0x00000001
-#define	DDSD_HEIGHT		0x00000002
-#define	DDSD_WIDTH		0x00000004
-#define	DDSD_PITCH		0x00000008
-#define	DDSD_BACKBUFFERCOUNT	0x00000020
-#define	DDSD_ZBUFFERBITDEPTH	0x00000040
-#define	DDSD_ALPHABITDEPTH	0x00000080
-#define	DDSD_LPSURFACE		0x00000800
-#define	DDSD_PIXELFORMAT	0x00001000
-#define	DDSD_CKDESTOVERLAY	0x00002000
-#define	DDSD_CKDESTBLT		0x00004000
-#define	DDSD_CKSRCOVERLAY	0x00008000
-#define	DDSD_CKSRCBLT		0x00010000
-#define	DDSD_MIPMAPCOUNT	0x00020000
-#define	DDSD_REFRESHRATE	0x00040000
-#define	DDSD_LINEARSIZE		0x00080000
-#define DDSD_TEXTURESTAGE       0x00100000
-#define DDSD_FVF                0x00200000
-#define DDSD_SRCVBHANDLE        0x00400000
-#define	DDSD_ALL		0x007ff9ee
-
-/* EnumSurfaces flags */
-#define DDENUMSURFACES_ALL          0x00000001
-#define DDENUMSURFACES_MATCH        0x00000002
-#define DDENUMSURFACES_NOMATCH      0x00000004
-#define DDENUMSURFACES_CANBECREATED 0x00000008
-#define DDENUMSURFACES_DOESEXIST    0x00000010
-
-/* SetDisplayMode flags */
-#define DDSDM_STANDARDVGAMODE	0x00000001
-
-/* EnumDisplayModes flags */
-#define DDEDM_REFRESHRATES	0x00000001
-#define DDEDM_STANDARDVGAMODES	0x00000002
-
-/* WaitForVerticalDisplay flags */
-
-#define DDWAITVB_BLOCKBEGIN		0x00000001
-#define DDWAITVB_BLOCKBEGINEVENT	0x00000002
-#define DDWAITVB_BLOCKEND		0x00000004
-
-    typedef struct _DDSURFACEDESC {
-        DWORD dwSize;           /* 0: size of the DDSURFACEDESC structure */
-        DWORD dwFlags;          /* 4: determines what fields are valid */
-        DWORD dwHeight;         /* 8: height of surface to be created */
-        DWORD dwWidth;          /* C: width of input surface */
-        union {
-            LONG lPitch;        /* 10: distance to start of next line (return value only) */
-            DWORD dwLinearSize;
-        } DUMMYUNIONNAME1;
-        DWORD dwBackBufferCount;        /* 14: number of back buffers requested */
-        union {
-            DWORD dwMipMapCount;        /* 18:number of mip-map levels requested */
-            DWORD dwZBufferBitDepth;    /*18: depth of Z buffer requested */
-            DWORD dwRefreshRate;        /* 18:refresh rate (used when display mode is described) */
-        } DUMMYUNIONNAME2;
-        DWORD dwAlphaBitDepth;  /* 1C:depth of alpha buffer requested */
-        DWORD dwReserved;       /* 20:reserved */
-        LPVOID lpSurface;       /* 24:pointer to the associated surface memory */
-        DDCOLORKEY ddckCKDestOverlay;   /* 28: CK for dest overlay use */
-        DDCOLORKEY ddckCKDestBlt;       /* 30: CK for destination blt use */
-        DDCOLORKEY ddckCKSrcOverlay;    /* 38: CK for source overlay use */
-        DDCOLORKEY ddckCKSrcBlt;        /* 40: CK for source blt use */
-        DDPIXELFORMAT ddpfPixelFormat;  /* 48: pixel format description of the surface */
-        DDSCAPS ddsCaps;        /* 68: direct draw surface caps */
-    } DDSURFACEDESC, *LPDDSURFACEDESC;
-
-    typedef struct _DDSURFACEDESC2 {
-        DWORD dwSize;           /* 0: size of the DDSURFACEDESC structure */
-        DWORD dwFlags;          /* 4: determines what fields are valid */
-        DWORD dwHeight;         /* 8: height of surface to be created */
-        DWORD dwWidth;          /* C: width of input surface */
-        union {
-            LONG lPitch;        /*10: distance to start of next line (return value only) */
-            DWORD dwLinearSize; /*10: formless late-allocated optimized surface size */
-        } DUMMYUNIONNAME1;
-        DWORD dwBackBufferCount;        /* 14: number of back buffers requested */
-        union {
-            DWORD dwMipMapCount;        /* 18:number of mip-map levels requested */
-            DWORD dwRefreshRate;        /* 18:refresh rate (used when display mode is described) */
-            DWORD dwSrcVBHandle;        /* 18:source used in VB::Optimize */
-        } DUMMYUNIONNAME2;
-        DWORD dwAlphaBitDepth;  /* 1C:depth of alpha buffer requested */
-        DWORD dwReserved;       /* 20:reserved */
-        LPVOID lpSurface;       /* 24:pointer to the associated surface memory */
-        union {
-            DDCOLORKEY ddckCKDestOverlay;       /* 28: CK for dest overlay use */
-            DWORD dwEmptyFaceColor;     /* 28: color for empty cubemap faces */
-        } DUMMYUNIONNAME3;
-        DDCOLORKEY ddckCKDestBlt;       /* 30: CK for destination blt use */
-        DDCOLORKEY ddckCKSrcOverlay;    /* 38: CK for source overlay use */
-        DDCOLORKEY ddckCKSrcBlt;        /* 40: CK for source blt use */
-
-        union {
-            DDPIXELFORMAT ddpfPixelFormat;      /* 48: pixel format description of the surface */
-            DWORD dwFVF;        /* 48: vertex format description of vertex buffers */
-        } DUMMYUNIONNAME4;
-        DDSCAPS2 ddsCaps;       /* 68: DDraw surface caps */
-        DWORD dwTextureStage;   /* 78: stage in multitexture cascade */
-    } DDSURFACEDESC2, *LPDDSURFACEDESC2;
-
-/* DDCOLORCONTROL.dwFlags */
-#define DDCOLOR_BRIGHTNESS	0x00000001
-#define DDCOLOR_CONTRAST	0x00000002
-#define DDCOLOR_HUE		0x00000004
-#define DDCOLOR_SATURATION	0x00000008
-#define DDCOLOR_SHARPNESS	0x00000010
-#define DDCOLOR_GAMMA		0x00000020
-#define DDCOLOR_COLORENABLE	0x00000040
-
-    typedef struct {
-        DWORD dwSize;
-        DWORD dwFlags;
-        LONG lBrightness;
-        LONG lContrast;
-        LONG lHue;
-        LONG lSaturation;
-        LONG lSharpness;
-        LONG lGamma;
-        LONG lColorEnable;
-        DWORD dwReserved1;
-    } DDCOLORCONTROL, *LPDDCOLORCONTROL;
-
-    typedef struct {
-        WORD red[256];
-        WORD green[256];
-        WORD blue[256];
-    } DDGAMMARAMP, *LPDDGAMMARAMP;
-
-    typedef BOOL CALLBACK(*LPDDENUMCALLBACKA) (GUID *, LPSTR, LPSTR, LPVOID);
-    typedef BOOL CALLBACK(*LPDDENUMCALLBACKW) (GUID *, LPWSTR, LPWSTR, LPVOID);
-     DECL_WINELIB_TYPE_AW(LPDDENUMCALLBACK)
-
-    typedef HRESULT CALLBACK(*LPDDENUMMODESCALLBACK) (LPDDSURFACEDESC, LPVOID);
-    typedef HRESULT CALLBACK(*LPDDENUMMODESCALLBACK2) (LPDDSURFACEDESC2,
-                                                       LPVOID);
-    typedef HRESULT CALLBACK(*LPDDENUMSURFACESCALLBACK) (LPDIRECTDRAWSURFACE,
-                                                         LPDDSURFACEDESC,
-                                                         LPVOID);
-    typedef HRESULT CALLBACK(*LPDDENUMSURFACESCALLBACK2) (LPDIRECTDRAWSURFACE4,
-                                                          LPDDSURFACEDESC2,
-                                                          LPVOID);
-    typedef HRESULT CALLBACK(*LPDDENUMSURFACESCALLBACK7) (LPDIRECTDRAWSURFACE7,
-                                                          LPDDSURFACEDESC2,
-                                                          LPVOID);
-
-    typedef BOOL CALLBACK(*LPDDENUMCALLBACKEXA) (GUID *, LPSTR, LPSTR, LPVOID,
-                                                 HMONITOR);
-    typedef BOOL CALLBACK(*LPDDENUMCALLBACKEXW) (GUID *, LPWSTR, LPWSTR, LPVOID,
-                                                 HMONITOR);
-     DECL_WINELIB_TYPE_AW(LPDDENUMCALLBACKEX)
-
-    HRESULT WINAPI DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA lpCallback,
-                                          LPVOID lpContext, DWORD dwFlags);
-    HRESULT WINAPI DirectDrawEnumerateExW(LPDDENUMCALLBACKEXW lpCallback,
-                                          LPVOID lpContext, DWORD dwFlags);
-#define DirectDrawEnumerateEx WINELIB_NAME_AW(DirectDrawEnumerateEx)
-
-/* flags for DirectDrawEnumerateEx */
-#define DDENUM_ATTACHEDSECONDARYDEVICES	0x00000001
-#define DDENUM_DETACHEDSECONDARYDEVICES	0x00000002
-#define DDENUM_NONDISPLAYDEVICES	0x00000004
-
-/* flags for DirectDrawCreate or IDirectDraw::Initialize */
-#define DDCREATE_HARDWAREONLY	1L
-#define DDCREATE_EMULATIONONLY	2L
-
-    typedef struct _DDBLTFX {
-        DWORD dwSize;           /* size of structure */
-        DWORD dwDDFX;           /* FX operations */
-        DWORD dwROP;            /* Win32 raster operations */
-        DWORD dwDDROP;          /* Raster operations new for DirectDraw */
-        DWORD dwRotationAngle;  /* Rotation angle for blt */
-        DWORD dwZBufferOpCode;  /* ZBuffer compares */
-        DWORD dwZBufferLow;     /* Low limit of Z buffer */
-        DWORD dwZBufferHigh;    /* High limit of Z buffer */
-        DWORD dwZBufferBaseDest;        /* Destination base value */
-        DWORD dwZDestConstBitDepth;     /* Bit depth used to specify Z constant for destination */
-        union {
-            DWORD dwZDestConst; /* Constant to use as Z buffer for dest */
-            LPDIRECTDRAWSURFACE lpDDSZBufferDest;       /* Surface to use as Z buffer for dest */
-        } DUMMYUNIONNAME1;
-        DWORD dwZSrcConstBitDepth;      /* Bit depth used to specify Z constant for source */
-        union {
-            DWORD dwZSrcConst;  /* Constant to use as Z buffer for src */
-            LPDIRECTDRAWSURFACE lpDDSZBufferSrc;        /* Surface to use as Z buffer for src */
-        } DUMMYUNIONNAME2;
-        DWORD dwAlphaEdgeBlendBitDepth; /* Bit depth used to specify constant for alpha edge blend */
-        DWORD dwAlphaEdgeBlend; /* Alpha for edge blending */
-        DWORD dwReserved;
-        DWORD dwAlphaDestConstBitDepth; /* Bit depth used to specify alpha constant for destination */
-        union {
-            DWORD dwAlphaDestConst;     /* Constant to use as Alpha Channel */
-            LPDIRECTDRAWSURFACE lpDDSAlphaDest; /* Surface to use as Alpha Channel */
-        } DUMMYUNIONNAME3;
-        DWORD dwAlphaSrcConstBitDepth;  /* Bit depth used to specify alpha constant for source */
-        union {
-            DWORD dwAlphaSrcConst;      /* Constant to use as Alpha Channel */
-            LPDIRECTDRAWSURFACE lpDDSAlphaSrc;  /* Surface to use as Alpha Channel */
-        } DUMMYUNIONNAME4;
-        union {
-            DWORD dwFillColor;  /* color in RGB or Palettized */
-            DWORD dwFillDepth;  /* depth value for z-buffer */
-            DWORD dwFillPixel;  /* pixel val for RGBA or RGBZ */
-            LPDIRECTDRAWSURFACE lpDDSPattern;   /* Surface to use as pattern */
-        } DUMMYUNIONNAME5;
-        DDCOLORKEY ddckDestColorkey;    /* DestColorkey override */
-        DDCOLORKEY ddckSrcColorkey;     /* SrcColorkey override */
-    } DDBLTFX, *LPDDBLTFX;
-
-/* dwDDFX */
-/* arithmetic stretching along y axis */
-#define DDBLTFX_ARITHSTRETCHY			0x00000001
-/* mirror on y axis */
-#define DDBLTFX_MIRRORLEFTRIGHT			0x00000002
-/* mirror on x axis */
-#define DDBLTFX_MIRRORUPDOWN			0x00000004
-/* do not tear */
-#define DDBLTFX_NOTEARING			0x00000008
-/* 180 degrees clockwise rotation */
-#define DDBLTFX_ROTATE180			0x00000010
-/* 270 degrees clockwise rotation */
-#define DDBLTFX_ROTATE270			0x00000020
-/* 90 degrees clockwise rotation */
-#define DDBLTFX_ROTATE90			0x00000040
-/* dwZBufferLow and dwZBufferHigh specify limits to the copied Z values */
-#define DDBLTFX_ZBUFFERRANGE			0x00000080
-/* add dwZBufferBaseDest to every source z value before compare */
-#define DDBLTFX_ZBUFFERBASEDEST			0x00000100
-
-    typedef struct _DDOVERLAYFX {
-        DWORD dwSize;           /* size of structure */
-        DWORD dwAlphaEdgeBlendBitDepth; /* Bit depth used to specify constant for alpha edge blend */
-        DWORD dwAlphaEdgeBlend; /* Constant to use as alpha for edge blend */
-        DWORD dwReserved;
-        DWORD dwAlphaDestConstBitDepth; /* Bit depth used to specify alpha constant for destination */
-        union {
-            DWORD dwAlphaDestConst;     /* Constant to use as alpha channel for dest */
-            LPDIRECTDRAWSURFACE lpDDSAlphaDest; /* Surface to use as alpha channel for dest */
-        } DUMMYUNIONNAME1;
-        DWORD dwAlphaSrcConstBitDepth;  /* Bit depth used to specify alpha constant for source */
-        union {
-            DWORD dwAlphaSrcConst;      /* Constant to use as alpha channel for src */
-            LPDIRECTDRAWSURFACE lpDDSAlphaSrc;  /* Surface to use as alpha channel for src */
-        } DUMMYUNIONNAME2;
-        DDCOLORKEY dckDestColorkey;     /* DestColorkey override */
-        DDCOLORKEY dckSrcColorkey;      /* DestColorkey override */
-        DWORD dwDDFX;           /* Overlay FX */
-        DWORD dwFlags;          /* flags */
-    } DDOVERLAYFX, *LPDDOVERLAYFX;
-
-    typedef struct _DDBLTBATCH {
-        LPRECT lprDest;
-        LPDIRECTDRAWSURFACE lpDDSSrc;
-        LPRECT lprSrc;
-        DWORD dwFlags;
-        LPDDBLTFX lpDDBltFx;
-    } DDBLTBATCH, *LPDDBLTBATCH;
-
-#define MAX_DDDEVICEID_STRING          512
-
-    typedef struct tagDDDEVICEIDENTIFIER {
-        char szDriver[MAX_DDDEVICEID_STRING];
-        char szDescription[MAX_DDDEVICEID_STRING];
-        LARGE_INTEGER liDriverVersion;
-        DWORD dwVendorId;
-        DWORD dwDeviceId;
-        DWORD dwSubSysId;
-        DWORD dwRevision;
-        GUID guidDeviceIdentifier;
-    } DDDEVICEIDENTIFIER, *LPDDDEVICEIDENTIFIER;
-
-    typedef struct tagDDDEVICEIDENTIFIER2 {
-        char szDriver[MAX_DDDEVICEID_STRING];   /* user readable driver name */
-        char szDescription[MAX_DDDEVICEID_STRING];      /* user readable description */
-        LARGE_INTEGER liDriverVersion;  /* driver version */
-        DWORD dwVendorId;       /* vendor ID, zero if unknown */
-        DWORD dwDeviceId;       /* chipset ID, zero if unknown */
-        DWORD dwSubSysId;       /* board ID, zero if unknown */
-        DWORD dwRevision;       /* chipset version, zero if unknown */
-        GUID guidDeviceIdentifier;      /* unique ID for this driver/chipset combination */
-        DWORD dwWHQLLevel;      /* Windows Hardware Quality Lab certification level */
-    } DDDEVICEIDENTIFIER2, *LPDDDEVICEIDENTIFIER2;
-
-/*****************************************************************************
- * IDirectDrawPalette interface
- */
-#undef INTERFACE
-#define INTERFACE IDirectDrawPalette
-     DECLARE_INTERFACE_(IDirectDrawPalette, IUnknown) {
-        STDMETHOD(QueryInterface) (THIS_ REFIID, PVOID *) PURE;
-        STDMETHOD_(ULONG, AddRef) (THIS) PURE;
-        STDMETHOD_(ULONG, Release) (THIS) PURE;
-        STDMETHOD(GetCaps) (THIS_ LPDWORD lpdwCaps) PURE;
-        STDMETHOD(GetEntries) (THIS_ DWORD dwFlags, DWORD dwBase,
-                               DWORD dwNumEntries,
-                               LPPALETTEENTRY lpEntries) PURE;
-        STDMETHOD(Initialize) (THIS_ LPDIRECTDRAW lpDD, DWORD dwFlags,
-                               LPPALETTEENTRY lpDDColorTable) PURE;
-        STDMETHOD(SetEntries) (THIS_ DWORD dwFlags, DWORD dwStartingEntry,
-                               DWORD dwCount, LPPALETTEENTRY lpEntries) PURE;
-    };
-
-    /*** IUnknown methods ***/
-#define IDirectDrawPalette_QueryInterface(p,a,b) ICOM_CALL_(QueryInterface,p,(p,a,b))
-#define IDirectDrawPalette_AddRef(p)             ICOM_CALL_(AddRef,p,(p))
-#define IDirectDrawPalette_Release(p)            ICOM_CALL_(Release,p,(p))
-    /*** IDirectDrawPalette methods ***/
-#define IDirectDrawPalette_GetCaps(p,a)          ICOM_CALL_(GetCaps,p,(p,a))
-#define IDirectDrawPalette_GetEntries(p,a,b,c,d) ICOM_CALL_(GetEntries,p,(p,a,b,c,d))
-#define IDirectDrawPalette_Initialize(p,a,b,c)   ICOM_CALL_(Initialize,p,(p,a,b,c))
-#define IDirectDrawPalette_SetEntries(p,a,b,c,d) ICOM_CALL_(SetEntries,p,(p,a,b,c,d))
-
-/*****************************************************************************
- * IDirectDrawClipper interface
- */
-#undef INTERFACE
-#define INTERFACE IDirectDrawClipper
-    DECLARE_INTERFACE_(IDirectDrawClipper, IUnknown) {
-        STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE;
-        STDMETHOD_(ULONG, AddRef) (THIS) PURE;
-        STDMETHOD_(ULONG, Release) (THIS) PURE;
-        STDMETHOD(GetClipList) (THIS_ LPRECT lpRect, LPRGNDATA lpClipList,
-                                LPDWORD lpdwSize) PURE;
-        STDMETHOD(GetHWnd) (THIS_ HWND * lphWnd) PURE;
-        STDMETHOD(Initialize) (THIS_ LPDIRECTDRAW lpDD, DWORD dwFlags) PURE;
-        STDMETHOD(IsClipListChanged) (THIS_ BOOL * lpbChanged) PURE;
-        STDMETHOD(SetClipList) (THIS_ LPRGNDATA lpClipList, DWORD dwFlags) PURE;
-        STDMETHOD(SetHWnd) (THIS_ DWORD dwFlags, HWND hWnd) PURE;
-    };
-
-    /*** IUnknown methods ***/
-#define IDirectDrawClipper_QueryInterface(p,a,b) ICOM_CALL_(QueryInterface,p,(p,a,b))
-#define IDirectDrawClipper_AddRef(p)             ICOM_CALL_(AddRef,p,(p))
-#define IDirectDrawClipper_Release(p)            ICOM_CALL_(Release,p,(p))
-    /*** IDirectDrawClipper methods ***/
-#define IDirectDrawClipper_GetClipList(p,a,b,c)   ICOM_CALL_(GetClipList,p,(p,a,b,c))
-#define IDirectDrawClipper_GetHWnd(p,a)           ICOM_CALL_(GetHWnd,p,(p,a))
-#define IDirectDrawClipper_Initialize(p,a,b)      ICOM_CALL_(Initialize,p,(p,a,b))
-#define IDirectDrawClipper_IsClipListChanged(p,a) ICOM_CALL_(IsClipListChanged,p,(p,a))
-#define IDirectDrawClipper_SetClipList(p,a,b)     ICOM_CALL_(SetClipList,p,(p,a,b))
-#define IDirectDrawClipper_SetHWnd(p,a,b)         ICOM_CALL_(SetHWnd,p,(p,a,b))
-
-/*****************************************************************************
- * IDirectDraw interface
- */
-#undef INTERFACE
-#define INTERFACE IDirectDraw
-    DECLARE_INTERFACE_(IDirectDraw, IUnknown) {
-        STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE;
-        STDMETHOD_(ULONG, AddRef) (THIS) PURE;
-        STDMETHOD_(ULONG, Release) (THIS) PURE;
-        STDMETHOD(Compact) (THIS) PURE;
-        STDMETHOD(CreateClipper) (THIS_ DWORD dwFlags,
-                                  LPDIRECTDRAWCLIPPER * lplpDDClipper,
-                                  IUnknown * pUnkOuter) PURE;
-        STDMETHOD(CreatePalette) (THIS_ DWORD dwFlags,
-                                  LPPALETTEENTRY lpColorTable,
-                                  LPDIRECTDRAWPALETTE * lplpDDPalette,
-                                  IUnknown * pUnkOuter) PURE;
-        STDMETHOD(CreateSurface) (THIS_ LPDDSURFACEDESC lpDDSurfaceDesc,
-                                  LPDIRECTDRAWSURFACE * lplpDDSurface,
-                                  IUnknown * pUnkOuter) PURE;
-        STDMETHOD(DuplicateSurface) (THIS_ LPDIRECTDRAWSURFACE lpDDSurface,
-                                     LPDIRECTDRAWSURFACE *
-                                     lplpDupDDSurface) PURE;
-        STDMETHOD(EnumDisplayModes) (THIS_ DWORD dwFlags,
-                                     LPDDSURFACEDESC lpDDSurfaceDesc,
-                                     LPVOID lpContext,
-                                     LPDDENUMMODESCALLBACK lpEnumModesCallback)
-            PURE;
-        STDMETHOD(EnumSurfaces) (THIS_ DWORD dwFlags, LPDDSURFACEDESC lpDDSD,
-                                 LPVOID lpContext,
-                                 LPDDENUMSURFACESCALLBACK
-                                 lpEnumSurfacesCallback) PURE;
-        STDMETHOD(FlipToGDISurface) (THIS) PURE;
-        STDMETHOD(GetCaps) (THIS_ LPDDCAPS lpDDDriverCaps,
-                            LPDDCAPS lpDDHELCaps) PURE;
-        STDMETHOD(GetDisplayMode) (THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE;
-        STDMETHOD(GetFourCCCodes) (THIS_ LPDWORD lpNumCodes,
-                                   LPDWORD lpCodes) PURE;
-        STDMETHOD(GetGDISurface) (THIS_ LPDIRECTDRAWSURFACE *
-                                  lplpGDIDDSurface) PURE;
-        STDMETHOD(GetMonitorFrequency) (THIS_ LPDWORD lpdwFrequency) PURE;
-        STDMETHOD(GetScanLine) (THIS_ LPDWORD lpdwScanLine) PURE;
-        STDMETHOD(GetVerticalBlankStatus) (THIS_ BOOL * lpbIsInVB) PURE;
-        STDMETHOD(Initialize) (THIS_ GUID * lpGUID) PURE;
-        STDMETHOD(RestoreDisplayMode) (THIS) PURE;
-        STDMETHOD(SetCooperativeLevel) (THIS_ HWND hWnd, DWORD dwFlags) PURE;
-        STDMETHOD(SetDisplayMode) (THIS_ DWORD, DWORD, DWORD) PURE;
-        STDMETHOD(WaitForVerticalBlank) (THIS_ DWORD dwFlags,
-                                         HANDLE hEvent) PURE;
-    };
-
-    /*** IUnknown methods ***/
-#define IDirectDraw_QueryInterface(p,a,b) ICOM_CALL_(QueryInterface,p,(p,a,b))
-#define IDirectDraw_AddRef(p)             ICOM_CALL_(AddRef,p,(p))
-#define IDirectDraw_Release(p)            ICOM_CALL_(Release,p,(p))
-    /*** IDirectDraw methods ***/
-#define IDirectDraw_Compact(p)                  ICOM_CALL_(Compact,p,(p))
-#define IDirectDraw_CreateClipper(p,a,b,c)      ICOM_CALL_(CreateClipper,p,(p,a,b,c))
-#define IDirectDraw_CreatePalette(p,a,b,c,d)    ICOM_CALL_(CreatePalette,p,(p,a,b,c,d))
-#define IDirectDraw_CreateSurface(p,a,b,c)      ICOM_CALL_(CreateSurface,p,(p,a,b,c))
-#define IDirectDraw_DuplicateSurface(p,a,b)     ICOM_CALL_(DuplicateSurface,p,(p,a,b))
-#define IDirectDraw_EnumDisplayModes(p,a,b,c,d) ICOM_CALL_(EnumDisplayModes,p,(p,a,b,c,d))
-#define IDirectDraw_EnumSurfaces(p,a,b,c,d)     ICOM_CALL_(EnumSurfaces,p,(p,a,b,c,d))
-#define IDirectDraw_FlipToGDISurface(p)         ICOM_CALL_(FlipToGDISurface,p,(p))
-#define IDirectDraw_GetCaps(p,a,b)              ICOM_CALL_(GetCaps,p,(p,a,b))
-#define IDirectDraw_GetDisplayMode(p,a)         ICOM_CALL_(GetDisplayMode,p,(p,a))
-#define IDirectDraw_GetFourCCCodes(p,a,b)       ICOM_CALL_(GetFourCCCodes,p,(p,a,b))
-#define IDirectDraw_GetGDISurface(p,a)          ICOM_CALL_(GetGDISurface,p,(p,a))
-#define IDirectDraw_GetMonitorFrequency(p,a)    ICOM_CALL_(GetMonitorFrequency,p,(p,a))
-#define IDirectDraw_GetScanLine(p,a)            ICOM_CALL_(GetScanLine,p,(p,a))
-#define IDirectDraw_GetVerticalBlankStatus(p,a) ICOM_CALL_(GetVerticalBlankStatus,p,(p,a))
-#define IDirectDraw_Initialize(p,a)             ICOM_CALL_(Initialize,p,(p,a))
-#define IDirectDraw_RestoreDisplayMode(p)       ICOM_CALL_(RestoreDisplayMode,p,(p))
-#define IDirectDraw_SetCooperativeLevel(p,a,b)  ICOM_CALL_(SetCooperativeLevel,p,(p,a,b))
-#define IDirectDraw_SetDisplayMode(p,a,b,c)     ICOM_CALL_(SetDisplayMode,p,(p,a,b,c))
-#define IDirectDraw_WaitForVerticalBlank(p,a,b) ICOM_CALL_(WaitForVerticalBlank,p,(p,a,b))
-
-/* flags for Lock() */
-#define DDLOCK_SURFACEMEMORYPTR	0x00000000
-#define DDLOCK_WAIT		0x00000001
-#define DDLOCK_EVENT		0x00000002
-#define DDLOCK_READONLY		0x00000010
-#define DDLOCK_WRITEONLY	0x00000020
-#define DDLOCK_NOSYSLOCK	0x00000800
-
-/*****************************************************************************
- * IDirectDraw2 interface
- */
-/* Note: IDirectDraw2 cannot derive from IDirectDraw because the number of 
- * arguments of SetDisplayMode has changed !
- */
-#undef INTERFACE
-#define INTERFACE IDirectDraw2
-    DECLARE_INTERFACE_(IDirectDraw2, IUnknown) {
-        STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE;
-        STDMETHOD_(ULONG, AddRef) (THIS) PURE;
-        STDMETHOD_(ULONG, Release) (THIS) PURE;
-        STDMETHOD(Compact) (THIS) PURE;
-        STDMETHOD(CreateClipper) (THIS_ DWORD dwFlags,
-                                  LPDIRECTDRAWCLIPPER * lplpDDClipper,
-                                  IUnknown * pUnkOuter) PURE;
-        STDMETHOD(CreatePalette) (THIS_ DWORD dwFlags,
-                                  LPPALETTEENTRY lpColorTable,
-                                  LPDIRECTDRAWPALETTE * lplpDDPalette,
-                                  IUnknown * pUnkOuter) PURE;
-        STDMETHOD(CreateSurface) (THIS_ LPDDSURFACEDESC lpDDSurfaceDesc,
-                                  LPDIRECTDRAWSURFACE2 * lplpDDSurface,
-                                  IUnknown * pUnkOuter) PURE;
-        STDMETHOD(DuplicateSurface) (THIS_ LPDIRECTDRAWSURFACE2 lpDDSurface,
-                                     LPDIRECTDRAWSURFACE2 *
-                                     lplpDupDDSurface) PURE;
-        STDMETHOD(EnumDisplayModes) (THIS_ DWORD dwFlags,
-                                     LPDDSURFACEDESC lpDDSurfaceDesc,
-                                     LPVOID lpContext,
-                                     LPDDENUMMODESCALLBACK lpEnumModesCallback)
-            PURE;
-        STDMETHOD(EnumSurfaces) (THIS_ DWORD dwFlags, LPDDSURFACEDESC lpDDSD,
-                                 LPVOID lpContext,
-                                 LPDDENUMSURFACESCALLBACK
-                                 lpEnumSurfacesCallback) PURE;
-        STDMETHOD(FlipToGDISurface) (THIS) PURE;
-        STDMETHOD(GetCaps) (THIS_ LPDDCAPS lpDDDriverCaps,
-                            LPDDCAPS lpDDHELCaps) PURE;
-        STDMETHOD(GetDisplayMode) (THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE;
-        STDMETHOD(GetFourCCCodes) (THIS_ LPDWORD lpNumCodes,
-                                   LPDWORD lpCodes) PURE;
-        STDMETHOD(GetGDISurface) (THIS_ LPDIRECTDRAWSURFACE2 *
-                                  lplpGDIDDSurface) PURE;
-        STDMETHOD(GetMonitorFrequency) (THIS_ LPDWORD lpdwFrequency) PURE;
-        STDMETHOD(GetScanLine) (THIS_ LPDWORD lpdwScanLine) PURE;
-        STDMETHOD(GetVerticalBlankStatus) (THIS_ BOOL * lpbIsInVB) PURE;
-        STDMETHOD(Initialize) (THIS_ GUID * lpGUID) PURE;
-        STDMETHOD(RestoreDisplayMode) (THIS) PURE;
-        STDMETHOD(SetCooperativeLevel) (THIS_ HWND hWnd, DWORD dwFlags) PURE;
-        STDMETHOD(SetDisplayMode) (THIS_ DWORD dwWidth, DWORD dwHeight,
-                                   DWORD dwBPP, DWORD dwRefreshRate,
-                                   DWORD dwFlags) PURE;
-        STDMETHOD(WaitForVerticalBlank) (THIS_ DWORD dwFlags,
-                                         HANDLE hEvent) PURE;
-
-        STDMETHOD(GetAvailableVidMem) (THIS_ LPDDSCAPS lpDDCaps,
-                                       LPDWORD lpdwTotal,
-                                       LPDWORD lpdwFree) PURE;
-    };
-
-    /*** IUnknown methods ***/
-#define IDirectDraw2_QueryInterface(p,a,b) ICOM_CALL_(QueryInterface,p,(p,a,b))
-#define IDirectDraw2_AddRef(p)             ICOM_CALL_(AddRef,p,(p))
-#define IDirectDraw2_Release(p)            ICOM_CALL_(Release,p,(p))
-    /*** IDirectDraw methods ***/
-#define IDirectDraw2_Compact(p)                  ICOM_CALL_(Compact,p,(p))
-#define IDirectDraw2_CreateClipper(p,a,b,c)      ICOM_CALL_(CreateClipper,p,(p,a,b,c))
-#define IDirectDraw2_CreatePalette(p,a,b,c,d)    ICOM_CALL_(CreatePalette,p,(p,a,b,c,d))
-#define IDirectDraw2_CreateSurface(p,a,b,c)      ICOM_CALL_(CreateSurface,p,(p,a,b,c))
-#define IDirectDraw2_DuplicateSurface(p,a,b)     ICOM_CALL_(DuplicateSurface,p,(p,a,b))
-#define IDirectDraw2_EnumDisplayModes(p,a,b,c,d) ICOM_CALL_(EnumDisplayModes,p,(p,a,b,c,d))
-#define IDirectDraw2_EnumSurfaces(p,a,b,c,d)     ICOM_CALL_(EnumSurfaces,p,(p,a,b,c,d))
-#define IDirectDraw2_FlipToGDISurface(p)         ICOM_CALL_(FlipToGDISurface,p,(p))
-#define IDirectDraw2_GetCaps(p,a,b)              ICOM_CALL_(GetCaps,p,(p,a,b))
-#define IDirectDraw2_GetDisplayMode(p,a)         ICOM_CALL_(GetDisplayMode,p,(p,a))
-#define IDirectDraw2_GetFourCCCodes(p,a,b)       ICOM_CALL_(GetFourCCCodes,p,(p,a,b))
-#define IDirectDraw2_GetGDISurface(p,a)          ICOM_CALL_(GetGDISurface,p,(p,a))
-#define IDirectDraw2_GetMonitorFrequency(p,a)    ICOM_CALL_(GetMonitorFrequency,p,(p,a))
-#define IDirectDraw2_GetScanLine(p,a)            ICOM_CALL_(GetScanLine,p,(p,a))
-#define IDirectDraw2_GetVerticalBlankStatus(p,a) ICOM_CALL_(GetVerticalBlankStatus,p,(p,a))
-#define IDirectDraw2_Initialize(p,a)             ICOM_CALL_(Initialize,p,(p,a))
-#define IDirectDraw2_RestoreDisplayMode(p)       ICOM_CALL_(RestoreDisplayMode,p,(p))
-#define IDirectDraw2_SetCooperativeLevel(p,a,b)  ICOM_CALL_(SetCooperativeLevel,p,(p,a,b))
-#define IDirectDraw2_SetDisplayMode(p,a,b,c,d,e) ICOM_CALL_(SetDisplayMode,p,(p,a,b,c,d,e))
-#define IDirectDraw2_WaitForVerticalBlank(p,a,b) ICOM_CALL_(WaitForVerticalBlank,p,(p,a,b))
-/*** IDirectDraw2 methods ***/
-#define IDirectDraw2_GetAvailableVidMem(p,a,b,c) ICOM_CALL_(GetAvailableVidMem,p,(p,a,b,c))
-
-/*****************************************************************************
- * IDirectDraw4 interface
- */
-#undef INTERFACE
-#define INTERFACE IDirectDraw4
-    DECLARE_INTERFACE_(IDirectDraw4, IUnknown) {
-        STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE;
-        STDMETHOD_(ULONG, AddRef) (THIS) PURE;
-        STDMETHOD_(ULONG, Release) (THIS) PURE;
-        STDMETHOD(Compact) (THIS) PURE;
-        STDMETHOD(CreateClipper) (THIS_ DWORD dwFlags,
-                                  LPDIRECTDRAWCLIPPER * lplpDDClipper,
-                                  IUnknown * pUnkOuter) PURE;
-        STDMETHOD(CreatePalette) (THIS_ DWORD dwFlags,
-                                  LPPALETTEENTRY lpColorTable,
-                                  LPDIRECTDRAWPALETTE * lplpDDPalette,
-                                  IUnknown * pUnkOuter) PURE;
-        STDMETHOD(CreateSurface) (THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc,
-                                  LPDIRECTDRAWSURFACE4 * lplpDDSurface,
-                                  IUnknown * pUnkOuter) PURE;
-        STDMETHOD(DuplicateSurface) (THIS_ LPDIRECTDRAWSURFACE4 lpDDSurface,
-                                     LPDIRECTDRAWSURFACE4 *
-                                     lplpDupDDSurface) PURE;
-        STDMETHOD(EnumDisplayModes) (THIS_ DWORD dwFlags,
-                                     LPDDSURFACEDESC2 lpDDSurfaceDesc,
-                                     LPVOID lpContext,
-                                     LPDDENUMMODESCALLBACK2 lpEnumModesCallback)
-            PURE;
-        STDMETHOD(EnumSurfaces) (THIS_ DWORD dwFlags, LPDDSURFACEDESC2 lpDDSD,
-                                 LPVOID lpContext,
-                                 LPDDENUMSURFACESCALLBACK2
-                                 lpEnumSurfacesCallback) PURE;
-        STDMETHOD(FlipToGDISurface) (THIS) PURE;
-        STDMETHOD(GetCaps) (THIS_ LPDDCAPS lpDDDriverCaps,
-                            LPDDCAPS lpDDHELCaps) PURE;
-        STDMETHOD(GetDisplayMode) (THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc) PURE;
-        STDMETHOD(GetFourCCCodes) (THIS_ LPDWORD lpNumCodes,
-                                   LPDWORD lpCodes) PURE;
-        STDMETHOD(GetGDISurface) (THIS_ LPDIRECTDRAWSURFACE4 *
-                                  lplpGDIDDSurface) PURE;
-        STDMETHOD(GetMonitorFrequency) (THIS_ LPDWORD lpdwFrequency) PURE;
-        STDMETHOD(GetScanLine) (THIS_ LPDWORD lpdwScanLine) PURE;
-        STDMETHOD(GetVerticalBlankStatus) (THIS_ BOOL * lpbIsInVB) PURE;
-        STDMETHOD(Initialize) (THIS_ GUID * lpGUID) PURE;
-        STDMETHOD(RestoreDisplayMode) (THIS) PURE;
-        STDMETHOD(SetCooperativeLevel) (THIS_ HWND hWnd, DWORD dwFlags) PURE;
-        STDMETHOD(SetDisplayMode) (THIS_ DWORD dwWidth, DWORD dwHeight,
-                                   DWORD dwBPP, DWORD dwRefreshRate,
-                                   DWORD dwFlags) PURE;
-        STDMETHOD(WaitForVerticalBlank) (THIS_ DWORD dwFlags,
-                                         HANDLE hEvent) PURE;
-
-        STDMETHOD(GetAvailableVidMem) (THIS_ LPDDSCAPS2 lpDDCaps,
-                                       LPDWORD lpdwTotal,
-                                       LPDWORD lpdwFree) PURE;
-
-        STDMETHOD(GetSurfaceFromDC) (THIS_ HDC, LPDIRECTDRAWSURFACE4 *) PURE;
-        STDMETHOD(RestoreAllSurfaces) (THIS) PURE;
-        STDMETHOD(TestCooperativeLevel) (THIS) PURE;
-        STDMETHOD(GetDeviceIdentifier) (THIS_ LPDDDEVICEIDENTIFIER, DWORD) PURE;
-    };
-
-    /*** IUnknown methods ***/
-#define IDirectDraw4_QueryInterface(p,a,b) ICOM_CALL_(QueryInterface,p,(p,a,b))
-#define IDirectDraw4_AddRef(p)             ICOM_CALL_(AddRef,p,(p))
-#define IDirectDraw4_Release(p)            ICOM_CALL_(Release,p,(p))
-    /*** IDirectDraw methods ***/
-#define IDirectDraw4_Compact(p)                  ICOM_CALL_(Compact,p,(p))
-#define IDirectDraw4_CreateClipper(p,a,b,c)      ICOM_CALL_(CreateClipper,p,(p,a,b,c))
-#define IDirectDraw4_CreatePalette(p,a,b,c,d)    ICOM_CALL_(CreatePalette,p,(p,a,b,c,d))
-#define IDirectDraw4_CreateSurface(p,a,b,c)      ICOM_CALL_(CreateSurface,p,(p,a,b,c))
-#define IDirectDraw4_DuplicateSurface(p,a,b)     ICOM_CALL_(DuplicateSurface,p,(p,a,b))
-#define IDirectDraw4_EnumDisplayModes(p,a,b,c,d) ICOM_CALL_(EnumDisplayModes,p,(p,a,b,c,d))
-#define IDirectDraw4_EnumSurfaces(p,a,b,c,d)     ICOM_CALL_(EnumSurfaces,p,(p,a,b,c,d))
-#define IDirectDraw4_FlipToGDISurface(p)         ICOM_CALL_(FlipToGDISurface,p,(p))
-#define IDirectDraw4_GetCaps(p,a,b)              ICOM_CALL_(GetCaps,p,(p,a,b))
-#define IDirectDraw4_GetDisplayMode(p,a)         ICOM_CALL_(GetDisplayMode,p,(p,a))
-#define IDirectDraw4_GetFourCCCodes(p,a,b)       ICOM_CALL_(GetFourCCCodes,p,(p,a,b))
-#define IDirectDraw4_GetGDISurface(p,a)          ICOM_CALL_(GetGDISurface,p,(p,a))
-#define IDirectDraw4_GetMonitorFrequency(p,a)    ICOM_CALL_(GetMonitorFrequency,p,(p,a))
-#define IDirectDraw4_GetScanLine(p,a)            ICOM_CALL_(GetScanLine,p,(p,a))
-#define IDirectDraw4_GetVerticalBlankStatus(p,a) ICOM_CALL_(GetVerticalBlankStatus,p,(p,a))
-#define IDirectDraw4_Initialize(p,a)             ICOM_CALL_(Initialize,p,(p,a))
-#define IDirectDraw4_RestoreDisplayMode(p)       ICOM_CALL_(RestoreDisplayMode,p,(p))
-#define IDirectDraw4_SetCooperativeLevel(p,a,b)  ICOM_CALL_(SetCooperativeLevel,p,(p,a,b))
-#define IDirectDraw4_SetDisplayMode(p,a,b,c,d,e) ICOM_CALL_(SetDisplayMode,p,(p,a,b,c,d,e))
-#define IDirectDraw4_WaitForVerticalBlank(p,a,b) ICOM_CALL_(WaitForVerticalBlank,p,(p,a,b))
-/*** IDirectDraw2 methods ***/
-#define IDirectDraw4_GetAvailableVidMem(p,a,b,c) ICOM_CALL_(GetAvailableVidMem,p,(p,a,b,c))
-/*** IDirectDraw4 methods ***/
-#define IDirectDraw4_GetSurfaceFromDC(p,a,b)    ICOM_CALL_(GetSurfaceFromDC,p,(p,a,b))
-#define IDirectDraw4_RestoreAllSurfaces(p)      ICOM_CALL_(RestoreAllSurfaces,p,(p))
-#define IDirectDraw4_TestCooperativeLevel(p)    ICOM_CALL_(TestCooperativeLevel,p,(p))
-#define IDirectDraw4_GetDeviceIdentifier(p,a,b) ICOM_CALL_(GetDeviceIdentifier,p,(p,a,b))
-
-/*****************************************************************************
- * IDirectDraw7 interface
- */
-/* Note: IDirectDraw7 cannot derive from IDirectDraw4; it is even documented
- * as not interchangeable with earlier DirectDraw interfaces.
- */
-#undef INTERFACE
-#define INTERFACE IDirectDraw7
-    DECLARE_INTERFACE_(IDirectDraw7, IUnknown) {
-        STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE;
-        STDMETHOD_(ULONG, AddRef) (THIS) PURE;
-        STDMETHOD_(ULONG, Release) (THIS) PURE;
-        STDMETHOD(Compact) (THIS) PURE;
-        STDMETHOD(CreateClipper) (THIS_ DWORD dwFlags,
-                                  LPDIRECTDRAWCLIPPER * lplpDDClipper,
-                                  IUnknown * pUnkOuter) PURE;
-        STDMETHOD(CreatePalette) (THIS_ DWORD dwFlags,
-                                  LPPALETTEENTRY lpColorTable,
-                                  LPDIRECTDRAWPALETTE * lplpDDPalette,
-                                  IUnknown * pUnkOuter) PURE;
-        STDMETHOD(CreateSurface) (THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc,
-                                  LPDIRECTDRAWSURFACE7 * lplpDDSurface,
-                                  IUnknown * pUnkOuter) PURE;
-        STDMETHOD(DuplicateSurface) (THIS_ LPDIRECTDRAWSURFACE7 lpDDSurface,
-                                     LPDIRECTDRAWSURFACE7 *
-                                     lplpDupDDSurface) PURE;
-        STDMETHOD(EnumDisplayModes) (THIS_ DWORD dwFlags,
-                                     LPDDSURFACEDESC2 lpDDSurfaceDesc,
-                                     LPVOID lpContext,
-                                     LPDDENUMMODESCALLBACK2 lpEnumModesCallback)
-            PURE;
-        STDMETHOD(EnumSurfaces) (THIS_ DWORD dwFlags, LPDDSURFACEDESC2 lpDDSD,
-                                 LPVOID lpContext,
-                                 LPDDENUMSURFACESCALLBACK7
-                                 lpEnumSurfacesCallback) PURE;
-        STDMETHOD(FlipToGDISurface) (THIS) PURE;
-        STDMETHOD(GetCaps) (THIS_ LPDDCAPS lpDDDriverCaps,
-                            LPDDCAPS lpDDHELCaps) PURE;
-        STDMETHOD(GetDisplayMode) (THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc) PURE;
-        STDMETHOD(GetFourCCCodes) (THIS_ LPDWORD lpNumCodes,
-                                   LPDWORD lpCodes) PURE;
-        STDMETHOD(GetGDISurface) (THIS_ LPDIRECTDRAWSURFACE7 *
-                                  lplpGDIDDSurface) PURE;
-        STDMETHOD(GetMonitorFrequency) (THIS_ LPDWORD lpdwFrequency) PURE;
-        STDMETHOD(GetScanLine) (THIS_ LPDWORD lpdwScanLine) PURE;
-        STDMETHOD(GetVerticalBlankStatus) (THIS_ BOOL * lpbIsInVB) PURE;
-        STDMETHOD(Initialize) (THIS_ GUID * lpGUID) PURE;
-        STDMETHOD(RestoreDisplayMode) (THIS) PURE;
-        STDMETHOD(SetCooperativeLevel) (THIS_ HWND hWnd, DWORD dwFlags) PURE;
-        STDMETHOD(SetDisplayMode) (THIS_ DWORD dwWidth, DWORD dwHeight,
-                                   DWORD dwBPP, DWORD dwRefreshRate,
-                                   DWORD dwFlags) PURE;
-        STDMETHOD(WaitForVerticalBlank) (THIS_ DWORD dwFlags,
-                                         HANDLE hEvent) PURE;
-
-        STDMETHOD(GetAvailableVidMem) (THIS_ LPDDSCAPS2 lpDDCaps,
-                                       LPDWORD lpdwTotal,
-                                       LPDWORD lpdwFree) PURE;
-
-        STDMETHOD(GetSurfaceFromDC) (THIS_ HDC, LPDIRECTDRAWSURFACE7 *) PURE;
-        STDMETHOD(RestoreAllSurfaces) (THIS) PURE;
-        STDMETHOD(TestCooperativeLevel) (THIS) PURE;
-        STDMETHOD(GetDeviceIdentifier) (THIS_ LPDDDEVICEIDENTIFIER2,
-                                        DWORD) PURE;
-
-        STDMETHOD(StartModeTest) (THIS_ LPSIZE, DWORD, DWORD) PURE;
-        STDMETHOD(EvaluateMode) (THIS_ DWORD, DWORD *) PURE;
-    };
-
-    /*** IUnknown methods ***/
-#define IDirectDraw7_QueryInterface(p,a,b) ICOM_CALL_(QueryInterface,p,(p,a,b))
-#define IDirectDraw7_AddRef(p)             ICOM_CALL_(AddRef,p,(p))
-#define IDirectDraw7_Release(p)            ICOM_CALL_(Release,p,(p))
-    /*** IDirectDraw methods ***/
-#define IDirectDraw7_Compact(p)                  ICOM_CALL_(Compact,p,(p))
-#define IDirectDraw7_CreateClipper(p,a,b,c)      ICOM_CALL_(CreateClipper,p,(p,a,b,c))
-#define IDirectDraw7_CreatePalette(p,a,b,c,d)    ICOM_CALL_(CreatePalette,p,(p,a,b,c,d))
-#define IDirectDraw7_CreateSurface(p,a,b,c)      ICOM_CALL_(CreateSurface,p,(p,a,b,c))
-#define IDirectDraw7_DuplicateSurface(p,a,b)     ICOM_CALL_(DuplicateSurface,p,(p,a,b))
-#define IDirectDraw7_EnumDisplayModes(p,a,b,c,d) ICOM_CALL_(EnumDisplayModes,p,(p,a,b,c,d))
-#define IDirectDraw7_EnumSurfaces(p,a,b,c,d)     ICOM_CALL_(EnumSurfaces,p,(p,a,b,c,d))
-#define IDirectDraw7_FlipToGDISurface(p)         ICOM_CALL_(FlipToGDISurface,p,(p))
-#define IDirectDraw7_GetCaps(p,a,b)              ICOM_CALL_(GetCaps,p,(p,a,b))
-#define IDirectDraw7_GetDisplayMode(p,a)         ICOM_CALL_(GetDisplayMode,p,(p,a))
-#define IDirectDraw7_GetFourCCCodes(p,a,b)       ICOM_CALL_(GetFourCCCodes,p,(p,a,b))
-#define IDirectDraw7_GetGDISurface(p,a)          ICOM_CALL_(GetGDISurface,p,(p,a))
-#define IDirectDraw7_GetMonitorFrequency(p,a)    ICOM_CALL_(GetMonitorFrequency,p,(p,a))
-#define IDirectDraw7_GetScanLine(p,a)            ICOM_CALL_(GetScanLine,p,(p,a))
-#define IDirectDraw7_GetVerticalBlankStatus(p,a) ICOM_CALL_(GetVerticalBlankStatus,p,(p,a))
-#define IDirectDraw7_Initialize(p,a)             ICOM_CALL_(Initialize,p,(p,a))
-#define IDirectDraw7_RestoreDisplayMode(p)       ICOM_CALL_(RestoreDisplayMode,p,(p))
-#define IDirectDraw7_SetCooperativeLevel(p,a,b)  ICOM_CALL_(SetCooperativeLevel,p,(p,a,b))
-#define IDirectDraw7_SetDisplayMode(p,a,b,c,d,e) ICOM_CALL_(SetDisplayMode,p,(p,a,b,c,d,e))
-#define IDirectDraw7_WaitForVerticalBlank(p,a,b) ICOM_CALL_(WaitForVerticalBlank,p,(p,a,b))
-/*** added in IDirectDraw2 ***/
-#define IDirectDraw7_GetAvailableVidMem(p,a,b,c) ICOM_CALL_(GetAvailableVidMem,p,(p,a,b,c))
-/*** added in IDirectDraw4 ***/
-#define IDirectDraw7_GetSurfaceFromDC(p,a,b)    ICOM_CALL_(GetSurfaceFromDC,p,(p,a,b))
-#define IDirectDraw7_RestoreAllSurfaces(p)     ICOM_CALL_(RestoreAllSurfaces,p,(p))
-#define IDirectDraw7_TestCooperativeLevel(p)    ICOM_CALL_(TestCooperativeLevel,p,(p))
-#define IDirectDraw7_GetDeviceIdentifier(p,a,b) ICOM_CALL_(GetDeviceIdentifier,p,(p,a,b))
-/*** added in IDirectDraw 7 ***/
-#define IDirectDraw7_StartModeTest(p,a,b,c)     ICOM_CALL_(StartModeTest,p,(p,a,b,c))
-#define IDirectDraw7_EvaluateMode(p,a,b)        ICOM_CALL_(EvaluateMode,p,(p,a,b))
-
-/*****************************************************************************
- * IDirectDrawSurface interface
- */
-#undef INTERFACE
-#define INTERFACE IDirectDrawSurface
-    DECLARE_INTERFACE_(IDirectDrawSurface, IUnknown) {
-        STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE;
-        STDMETHOD_(ULONG, AddRef) (THIS) PURE;
-        STDMETHOD_(ULONG, Release) (THIS) PURE;
-        STDMETHOD(AddAttachedSurface) (THIS_ LPDIRECTDRAWSURFACE
-                                       lpDDSAttachedSurface) PURE;
-        STDMETHOD(AddOverlayDirtyRect) (THIS_ LPRECT lpRect) PURE;
-        STDMETHOD(Blt) (THIS_ LPRECT lpDestRect,
-                        LPDIRECTDRAWSURFACE lpDDSrcSurface, LPRECT lpSrcRect,
-                        DWORD dwFlags, LPDDBLTFX lpDDBltFx) PURE;
-        STDMETHOD(BltBatch) (THIS_ LPDDBLTBATCH lpDDBltBatch, DWORD dwCount,
-                             DWORD dwFlags) PURE;
-        STDMETHOD(BltFast) (THIS_ DWORD dwX, DWORD dwY,
-                            LPDIRECTDRAWSURFACE lpDDSrcSurface,
-                            LPRECT lpSrcRect, DWORD dwTrans) PURE;
-        STDMETHOD(DeleteAttachedSurface) (THIS_ DWORD dwFlags,
-                                          LPDIRECTDRAWSURFACE
-                                          lpDDSAttachedSurface) PURE;
-        STDMETHOD(EnumAttachedSurfaces) (THIS_ LPVOID lpContext,
-                                         LPDDENUMSURFACESCALLBACK
-                                         lpEnumSurfacesCallback) PURE;
-        STDMETHOD(EnumOverlayZOrders) (THIS_ DWORD dwFlags, LPVOID lpContext,
-                                       LPDDENUMSURFACESCALLBACK lpfnCallback)
-            PURE;
-        STDMETHOD(Flip) (THIS_ LPDIRECTDRAWSURFACE lpDDSurfaceTargetOverride,
-                         DWORD dwFlags) PURE;
-        STDMETHOD(GetAttachedSurface) (THIS_ LPDDSCAPS lpDDSCaps,
-                                       LPDIRECTDRAWSURFACE *
-                                       lplpDDAttachedSurface) PURE;
-        STDMETHOD(GetBltStatus) (THIS_ DWORD dwFlags) PURE;
-        STDMETHOD(GetCaps) (THIS_ LPDDSCAPS lpDDSCaps) PURE;
-        STDMETHOD(GetClipper) (THIS_ LPDIRECTDRAWCLIPPER * lplpDDClipper) PURE;
-        STDMETHOD(GetColorKey) (THIS_ DWORD dwFlags,
-                                LPDDCOLORKEY lpDDColorKey) PURE;
-        STDMETHOD(GetDC) (THIS_ HDC * lphDC) PURE;
-        STDMETHOD(GetFlipStatus) (THIS_ DWORD dwFlags) PURE;
-        STDMETHOD(GetOverlayPosition) (THIS_ LPLONG lplX, LPLONG lplY) PURE;
-        STDMETHOD(GetPalette) (THIS_ LPDIRECTDRAWPALETTE * lplpDDPalette) PURE;
-        STDMETHOD(GetPixelFormat) (THIS_ LPDDPIXELFORMAT lpDDPixelFormat) PURE;
-        STDMETHOD(GetSurfaceDesc) (THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE;
-        STDMETHOD(Initialize) (THIS_ LPDIRECTDRAW lpDD,
-                               LPDDSURFACEDESC lpDDSurfaceDesc) PURE;
-        STDMETHOD(IsLost) (THIS) PURE;
-        STDMETHOD(Lock) (THIS_ LPRECT lpDestRect,
-                         LPDDSURFACEDESC lpDDSurfaceDesc, DWORD dwFlags,
-                         HANDLE hEvent) PURE;
-        STDMETHOD(ReleaseDC) (THIS_ HDC hDC) PURE;
-        STDMETHOD(Restore) (THIS) PURE;
-        STDMETHOD(SetClipper) (THIS_ LPDIRECTDRAWCLIPPER lpDDClipper) PURE;
-        STDMETHOD(SetColorKey) (THIS_ DWORD dwFlags,
-                                LPDDCOLORKEY lpDDColorKey) PURE;
-        STDMETHOD(SetOverlayPosition) (THIS_ LONG lX, LONG lY) PURE;
-        STDMETHOD(SetPalette) (THIS_ LPDIRECTDRAWPALETTE lpDDPalette) PURE;
-        STDMETHOD(Unlock) (THIS_ LPVOID lpSurfaceData) PURE;
-        STDMETHOD(UpdateOverlay) (THIS_ LPRECT lpSrcRect,
-                                  LPDIRECTDRAWSURFACE lpDDDestSurface,
-                                  LPRECT lpDestRect, DWORD dwFlags,
-                                  LPDDOVERLAYFX lpDDOverlayFx) PURE;
-        STDMETHOD(UpdateOverlayDisplay) (THIS_ DWORD dwFlags) PURE;
-        STDMETHOD(UpdateOverlayZOrder) (THIS_ DWORD dwFlags,
-                                        LPDIRECTDRAWSURFACE lpDDSReference)
-            PURE;
-    };
-
-    /*** IUnknown methods ***/
-#define IDirectDrawSurface_QueryInterface(p,a,b) ICOM_CALL_(QueryInterface,p,(p,a,b))
-#define IDirectDrawSurface_AddRef(p)             ICOM_CALL_(AddRef,p,(p))
-#define IDirectDrawSurface_Release(p)            ICOM_CALL_(Release,p,(p))
-    /*** IDirectDrawSurface methods ***/
-#define IDirectDrawSurface_AddAttachedSurface(p,a)      ICOM_CALL_(AddAttachedSurface,p,(p,a))
-#define IDirectDrawSurface_AddOverlayDirtyRect(p,a)     ICOM_CALL_(AddOverlayDirtyRect,p,(p,a))
-#define IDirectDrawSurface_Blt(p,a,b,c,d,e)             ICOM_CALL_(Blt,p,(p,a,b,c,d,e))
-#define IDirectDrawSurface_BltBatch(p,a,b,c)            ICOM_CALL_(BltBatch,p,(p,a,b,c))
-#define IDirectDrawSurface_BltFast(p,a,b,c,d,e)         ICOM_CALL_(BltFast,p,(p,a,b,c,d,e))
-#define IDirectDrawSurface_DeleteAttachedSurface(p,a,b) ICOM_CALL_(DeleteAttachedSurface,p,(p,a,b))
-#define IDirectDrawSurface_EnumAttachedSurfaces(p,a,b)  ICOM_CALL_(EnumAttachedSurfaces,p,(p,a,b))
-#define IDirectDrawSurface_EnumOverlayZOrders(p,a,b,c)  ICOM_CALL_(EnumOverlayZOrders,p,(p,a,b,c))
-#define IDirectDrawSurface_Flip(p,a,b)                  ICOM_CALL_(Flip,p,(p,a,b))
-#define IDirectDrawSurface_GetAttachedSurface(p,a,b)    ICOM_CALL_(GetAttachedSurface,p,(p,a,b))
-#define IDirectDrawSurface_GetBltStatus(p,a)            ICOM_CALL_(GetBltStatus,p,(p,a))
-#define IDirectDrawSurface_GetCaps(p,a)                 ICOM_CALL_(GetCaps,p,(p,a))
-#define IDirectDrawSurface_GetClipper(p,a)              ICOM_CALL_(GetClipper,p,(p,a))
-#define IDirectDrawSurface_GetColorKey(p,a,b)           ICOM_CALL_(GetColorKey,p,(p,a,b))
-#define IDirectDrawSurface_GetDC(p,a)                   ICOM_CALL_(GetDC,p,(p,a))
-#define IDirectDrawSurface_GetFlipStatus(p,a)           ICOM_CALL_(GetFlipStatus,p,(p,a))
-#define IDirectDrawSurface_GetOverlayPosition(p,a,b)    ICOM_CALL_(GetOverlayPosition,p,(p,a,b))
-#define IDirectDrawSurface_GetPalette(p,a)              ICOM_CALL_(GetPalette,p,(p,a))
-#define IDirectDrawSurface_GetPixelFormat(p,a)          ICOM_CALL_(GetPixelFormat,p,(p,a))
-#define IDirectDrawSurface_GetSurfaceDesc(p,a)          ICOM_CALL_(GetSurfaceDesc,p,(p,a))
-#define IDirectDrawSurface_Initialize(p,a,b)            ICOM_CALL_(Initialize,p,(p,a,b))
-#define IDirectDrawSurface_IsLost(p)                    ICOM_CALL_(IsLost,p,(p))
-#define IDirectDrawSurface_Lock(p,a,b,c,d)              ICOM_CALL_(Lock,p,(p,a,b,c,d))
-#define IDirectDrawSurface_ReleaseDC(p,a)               ICOM_CALL_(ReleaseDC,p,(p,a))
-#define IDirectDrawSurface_Restore(p)                   ICOM_CALL_(Restore,p,(p))
-#define IDirectDrawSurface_SetClipper(p,a)              ICOM_CALL_(SetClipper,p,(p,a))
-#define IDirectDrawSurface_SetColorKey(p,a,b)           ICOM_CALL_(SetColorKey,p,(p,a,b))
-#define IDirectDrawSurface_SetOverlayPosition(p,a,b)    ICOM_CALL_(SetOverlayPosition,p,(p,a,b))
-#define IDirectDrawSurface_SetPalette(p,a)              ICOM_CALL_(SetPalette,p,(p,a))
-#define IDirectDrawSurface_Unlock(p,a)                  ICOM_CALL_(Unlock,p,(p,a))
-#define IDirectDrawSurface_UpdateOverlay(p,a,b,c,d,e)   ICOM_CALL_(UpdateOverlay,p,(p,a,b,c,d,e))
-#define IDirectDrawSurface_UpdateOverlayDisplay(p,a)    ICOM_CALL_(UpdateOverlayDisplay,p,(p,a))
-#define IDirectDrawSurface_UpdateOverlayZOrder(p,a,b)   ICOM_CALL_(UpdateOverlayZOrder,p,(p,a,b))
-
-/*****************************************************************************
- * IDirectDrawSurface2 interface
- */
-/* Cannot inherit from IDirectDrawSurface because the LPDIRECTDRAWSURFACE parameters 
- * have been converted to LPDIRECTDRAWSURFACE2.
- */
-#undef INTERFACE
-#define INTERFACE IDirectDrawSurface2
-    DECLARE_INTERFACE_(IDirectDrawSurface2, IUnknown) {
-        STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE;
-        STDMETHOD_(ULONG, AddRef) (THIS) PURE;
-        STDMETHOD_(ULONG, Release) (THIS) PURE;
-        STDMETHOD(AddAttachedSurface) (THIS_ LPDIRECTDRAWSURFACE2
-                                       lpDDSAttachedSurface) PURE;
-        STDMETHOD(AddOverlayDirtyRect) (THIS_ LPRECT lpRect) PURE;
-        STDMETHOD(Blt) (THIS_ LPRECT lpDestRect,
-                        LPDIRECTDRAWSURFACE2 lpDDSrcSurface, LPRECT lpSrcRect,
-                        DWORD dwFlags, LPDDBLTFX lpDDBltFx) PURE;
-        STDMETHOD(BltBatch) (THIS_ LPDDBLTBATCH lpDDBltBatch, DWORD dwCount,
-                             DWORD dwFlags) PURE;
-        STDMETHOD(BltFast) (THIS_ DWORD dwX, DWORD dwY,
-                            LPDIRECTDRAWSURFACE2 lpDDSrcSurface,
-                            LPRECT lpSrcRect, DWORD dwTrans) PURE;
-        STDMETHOD(DeleteAttachedSurface) (THIS_ DWORD dwFlags,
-                                          LPDIRECTDRAWSURFACE2
-                                          lpDDSAttachedSurface) PURE;
-        STDMETHOD(EnumAttachedSurfaces) (THIS_ LPVOID lpContext,
-                                         LPDDENUMSURFACESCALLBACK
-                                         lpEnumSurfacesCallback) PURE;
-        STDMETHOD(EnumOverlayZOrders) (THIS_ DWORD dwFlags, LPVOID lpContext,
-                                       LPDDENUMSURFACESCALLBACK lpfnCallback)
-            PURE;
-        STDMETHOD(Flip) (THIS_ LPDIRECTDRAWSURFACE2 lpDDSurfaceTargetOverride,
-                         DWORD dwFlags) PURE;
-        STDMETHOD(GetAttachedSurface) (THIS_ LPDDSCAPS lpDDSCaps,
-                                       LPDIRECTDRAWSURFACE2 *
-                                       lplpDDAttachedSurface) PURE;
-        STDMETHOD(GetBltStatus) (THIS_ DWORD dwFlags) PURE;
-        STDMETHOD(GetCaps) (THIS_ LPDDSCAPS lpDDSCaps) PURE;
-        STDMETHOD(GetClipper) (THIS_ LPDIRECTDRAWCLIPPER * lplpDDClipper) PURE;
-        STDMETHOD(GetColorKey) (THIS_ DWORD dwFlags,
-                                LPDDCOLORKEY lpDDColorKey) PURE;
-        STDMETHOD(GetDC) (THIS_ HDC * lphDC) PURE;
-        STDMETHOD(GetFlipStatus) (THIS_ DWORD dwFlags) PURE;
-        STDMETHOD(GetOverlayPosition) (THIS_ LPLONG lplX, LPLONG lplY) PURE;
-        STDMETHOD(GetPalette) (THIS_ LPDIRECTDRAWPALETTE * lplpDDPalette) PURE;
-        STDMETHOD(GetPixelFormat) (THIS_ LPDDPIXELFORMAT lpDDPixelFormat) PURE;
-        STDMETHOD(GetSurfaceDesc) (THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE;
-        STDMETHOD(Initialize) (THIS_ LPDIRECTDRAW lpDD,
-                               LPDDSURFACEDESC lpDDSurfaceDesc) PURE;
-        STDMETHOD(IsLost) (THIS) PURE;
-        STDMETHOD(Lock) (THIS_ LPRECT lpDestRect,
-                         LPDDSURFACEDESC lpDDSurfaceDesc, DWORD dwFlags,
-                         HANDLE hEvent) PURE;
-        STDMETHOD(ReleaseDC) (THIS_ HDC hDC) PURE;
-        STDMETHOD(Restore) (THIS) PURE;
-        STDMETHOD(SetClipper) (THIS_ LPDIRECTDRAWCLIPPER lpDDClipper) PURE;
-        STDMETHOD(SetColorKey) (THIS_ DWORD dwFlags,
-                                LPDDCOLORKEY lpDDColorKey) PURE;
-        STDMETHOD(SetOverlayPosition) (THIS_ LONG lX, LONG lY) PURE;
-        STDMETHOD(SetPalette) (THIS_ LPDIRECTDRAWPALETTE lpDDPalette) PURE;
-        STDMETHOD(Unlock) (THIS_ LPVOID lpSurfaceData) PURE;
-        STDMETHOD(UpdateOverlay) (THIS_ LPRECT lpSrcRect,
-                                  LPDIRECTDRAWSURFACE2 lpDDDestSurface,
-                                  LPRECT lpDestRect, DWORD dwFlags,
-                                  LPDDOVERLAYFX lpDDOverlayFx) PURE;
-        STDMETHOD(UpdateOverlayDisplay) (THIS_ DWORD dwFlags) PURE;
-        STDMETHOD(UpdateOverlayZOrder) (THIS_ DWORD dwFlags,
-                                        LPDIRECTDRAWSURFACE2 lpDDSReference)
-            PURE;
-        /* added in v2 */
-        STDMETHOD(GetDDInterface) (THIS_ LPVOID * lplpDD) PURE;
-        STDMETHOD(PageLock) (THIS_ DWORD dwFlags) PURE;
-        STDMETHOD(PageUnlock) (THIS_ DWORD dwFlags) PURE;
-    };
-
-    /*** IUnknown methods ***/
-#define IDirectDrawSurface2_QueryInterface(p,a,b) ICOM_CALL_(QueryInterface,p,(p,a,b))
-#define IDirectDrawSurface2_AddRef(p)             ICOM_CALL_(AddRef,p,(p))
-#define IDirectDrawSurface2_Release(p)            ICOM_CALL_(Release,p,(p))
-/*** IDirectDrawSurface methods (almost) ***/
-#define IDirectDrawSurface2_AddAttachedSurface(p,a)      ICOM_CALL_(AddAttachedSurface,p,(p,a))
-#define IDirectDrawSurface2_AddOverlayDirtyRect(p,a)     ICOM_CALL_(AddOverlayDirtyRect,p,(p,a))
-#define IDirectDrawSurface2_Blt(p,a,b,c,d,e)             ICOM_CALL_(Blt,p,(p,a,b,c,d,e))
-#define IDirectDrawSurface2_BltBatch(p,a,b,c)            ICOM_CALL_(BltBatch,p,(p,a,b,c))
-#define IDirectDrawSurface2_BltFast(p,a,b,c,d,e)         ICOM_CALL_(BltFast,p,(p,a,b,c,d,e))
-#define IDirectDrawSurface2_DeleteAttachedSurface(p,a,b) ICOM_CALL_(DeleteAttachedSurface,p,(p,a,b))
-#define IDirectDrawSurface2_EnumAttachedSurfaces(p,a,b)  ICOM_CALL_(EnumAttachedSurfaces,p,(p,a,b))
-#define IDirectDrawSurface2_EnumOverlayZOrders(p,a,b,c)  ICOM_CALL_(EnumOverlayZOrders,p,(p,a,b,c))
-#define IDirectDrawSurface2_Flip(p,a,b)                  ICOM_CALL_(Flip,p,(p,a,b))
-#define IDirectDrawSurface2_GetAttachedSurface(p,a,b)    ICOM_CALL_(GetAttachedSurface,p,(p,a,b))
-#define IDirectDrawSurface2_GetBltStatus(p,a)            ICOM_CALL_(GetBltStatus,p,(p,a))
-#define IDirectDrawSurface2_GetCaps(p,a)                 ICOM_CALL_(GetCaps,p,(p,a))
-#define IDirectDrawSurface2_GetClipper(p,a)              ICOM_CALL_(GetClipper,p,(p,a))
-#define IDirectDrawSurface2_GetColorKey(p,a,b)           ICOM_CALL_(GetColorKey,p,(p,a,b))
-#define IDirectDrawSurface2_GetDC(p,a)                   ICOM_CALL_(GetDC,p,(p,a))
-#define IDirectDrawSurface2_GetFlipStatus(p,a)           ICOM_CALL_(GetFlipStatus,p,(p,a))
-#define IDirectDrawSurface2_GetOverlayPosition(p,a,b)    ICOM_CALL_(GetOverlayPosition,p,(p,a,b))
-#define IDirectDrawSurface2_GetPalette(p,a)              ICOM_CALL_(GetPalette,p,(p,a))
-#define IDirectDrawSurface2_GetPixelFormat(p,a)          ICOM_CALL_(GetPixelFormat,p,(p,a))
-#define IDirectDrawSurface2_GetSurfaceDesc(p,a)          ICOM_CALL_(GetSurfaceDesc,p,(p,a))
-#define IDirectDrawSurface2_Initialize(p,a,b)            ICOM_CALL_(Initialize,p,(p,a,b))
-#define IDirectDrawSurface2_IsLost(p)                    ICOM_CALL_(IsLost,p,(p))
-#define IDirectDrawSurface2_Lock(p,a,b,c,d)              ICOM_CALL_(Lock,p,(p,a,b,c,d))
-#define IDirectDrawSurface2_ReleaseDC(p,a)               ICOM_CALL_(ReleaseDC,p,(p,a))
-#define IDirectDrawSurface2_Restore(p)                   ICOM_CALL_(Restore,p,(p))
-#define IDirectDrawSurface2_SetClipper(p,a)              ICOM_CALL_(SetClipper,p,(p,a))
-#define IDirectDrawSurface2_SetColorKey(p,a,b)           ICOM_CALL_(SetColorKey,p,(p,a,b))
-#define IDirectDrawSurface2_SetOverlayPosition(p,a,b)    ICOM_CALL_(SetOverlayPosition,p,(p,a,b))
-#define IDirectDrawSurface2_SetPalette(p,a)              ICOM_CALL_(SetPalette,p,(p,a))
-#define IDirectDrawSurface2_Unlock(p,a)                  ICOM_CALL_(Unlock,p,(p,a))
-#define IDirectDrawSurface2_UpdateOverlay(p,a,b,c,d,e)   ICOM_CALL_(UpdateOverlay,p,(p,a,b,c,d,e))
-#define IDirectDrawSurface2_UpdateOverlayDisplay(p,a)    ICOM_CALL_(UpdateOverlayDisplay,p,(p,a))
-#define IDirectDrawSurface2_UpdateOverlayZOrder(p,a,b)   ICOM_CALL_(UpdateOverlayZOrder,p,(p,a,b))
-/*** IDirectDrawSurface2 methods ***/
-#define IDirectDrawSurface2_GetDDInterface(p,a) ICOM_CALL_(GetDDInterface,p,(p,a))
-#define IDirectDrawSurface2_PageLock(p,a)       ICOM_CALL_(PageLock,p,(p,a))
-#define IDirectDrawSurface2_PageUnlock(p,a)     ICOM_CALL_(PageUnlock,p,(p,a))
-
-/*****************************************************************************
- * IDirectDrawSurface3 interface
- */
-/* Cannot inherit from IDirectDrawSurface2 because the LPDIRECTDRAWSURFACE2 parameters 
- * have been converted to LPDIRECTDRAWSURFACE3.
- */
-#undef INTERFACE
-#define INTERFACE IDirectDrawSurface3
-    DECLARE_INTERFACE_(IDirectDrawSurface3, IUnknown) {
-        STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE;
-        STDMETHOD_(ULONG, AddRef) (THIS) PURE;
-        STDMETHOD_(ULONG, Release) (THIS) PURE;
-        STDMETHOD(AddAttachedSurface) (THIS_ LPDIRECTDRAWSURFACE3
-                                       lpDDSAttachedSurface) PURE;
-        STDMETHOD(AddOverlayDirtyRect) (THIS_ LPRECT lpRect) PURE;
-        STDMETHOD(Blt) (THIS_ LPRECT lpDestRect,
-                        LPDIRECTDRAWSURFACE3 lpDDSrcSurface, LPRECT lpSrcRect,
-                        DWORD dwFlags, LPDDBLTFX lpDDBltFx) PURE;
-        STDMETHOD(BltBatch) (THIS_ LPDDBLTBATCH lpDDBltBatch, DWORD dwCount,
-                             DWORD dwFlags) PURE;
-        STDMETHOD(BltFast) (THIS_ DWORD dwX, DWORD dwY,
-                            LPDIRECTDRAWSURFACE3 lpDDSrcSurface,
-                            LPRECT lpSrcRect, DWORD dwTrans) PURE;
-        STDMETHOD(DeleteAttachedSurface) (THIS_ DWORD dwFlags,
-                                          LPDIRECTDRAWSURFACE3
-                                          lpDDSAttachedSurface) PURE;
-        STDMETHOD(EnumAttachedSurfaces) (THIS_ LPVOID lpContext,
-                                         LPDDENUMSURFACESCALLBACK
-                                         lpEnumSurfacesCallback) PURE;
-        STDMETHOD(EnumOverlayZOrders) (THIS_ DWORD dwFlags, LPVOID lpContext,
-                                       LPDDENUMSURFACESCALLBACK lpfnCallback)
-            PURE;
-        STDMETHOD(Flip) (THIS_ LPDIRECTDRAWSURFACE3 lpDDSurfaceTargetOverride,
-                         DWORD dwFlags) PURE;
-        STDMETHOD(GetAttachedSurface) (THIS_ LPDDSCAPS lpDDSCaps,
-                                       LPDIRECTDRAWSURFACE3 *
-                                       lplpDDAttachedSurface) PURE;
-        STDMETHOD(GetBltStatus) (THIS_ DWORD dwFlags) PURE;
-        STDMETHOD(GetCaps) (THIS_ LPDDSCAPS lpDDSCaps) PURE;
-        STDMETHOD(GetClipper) (THIS_ LPDIRECTDRAWCLIPPER * lplpDDClipper) PURE;
-        STDMETHOD(GetColorKey) (THIS_ DWORD dwFlags,
-                                LPDDCOLORKEY lpDDColorKey) PURE;
-        STDMETHOD(GetDC) (THIS_ HDC * lphDC) PURE;
-        STDMETHOD(GetFlipStatus) (THIS_ DWORD dwFlags) PURE;
-        STDMETHOD(GetOverlayPosition) (THIS_ LPLONG lplX, LPLONG lplY) PURE;
-        STDMETHOD(GetPalette) (THIS_ LPDIRECTDRAWPALETTE * lplpDDPalette) PURE;
-        STDMETHOD(GetPixelFormat) (THIS_ LPDDPIXELFORMAT lpDDPixelFormat) PURE;
-        STDMETHOD(GetSurfaceDesc) (THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE;
-        STDMETHOD(Initialize) (THIS_ LPDIRECTDRAW lpDD,
-                               LPDDSURFACEDESC lpDDSurfaceDesc) PURE;
-        STDMETHOD(IsLost) (THIS) PURE;
-        STDMETHOD(Lock) (THIS_ LPRECT lpDestRect,
-                         LPDDSURFACEDESC lpDDSurfaceDesc, DWORD dwFlags,
-                         HANDLE hEvent) PURE;
-        STDMETHOD(ReleaseDC) (THIS_ HDC hDC) PURE;
-        STDMETHOD(Restore) (THIS) PURE;
-        STDMETHOD(SetClipper) (THIS_ LPDIRECTDRAWCLIPPER lpDDClipper) PURE;
-        STDMETHOD(SetColorKey) (THIS_ DWORD dwFlags,
-                                LPDDCOLORKEY lpDDColorKey) PURE;
-        STDMETHOD(SetOverlayPosition) (THIS_ LONG lX, LONG lY) PURE;
-        STDMETHOD(SetPalette) (THIS_ LPDIRECTDRAWPALETTE lpDDPalette) PURE;
-        STDMETHOD(Unlock) (THIS_ LPVOID lpSurfaceData) PURE;
-        STDMETHOD(UpdateOverlay) (THIS_ LPRECT lpSrcRect,
-                                  LPDIRECTDRAWSURFACE3 lpDDDestSurface,
-                                  LPRECT lpDestRect, DWORD dwFlags,
-                                  LPDDOVERLAYFX lpDDOverlayFx) PURE;
-        STDMETHOD(UpdateOverlayDisplay) (THIS_ DWORD dwFlags) PURE;
-        STDMETHOD(UpdateOverlayZOrder) (THIS_ DWORD dwFlags,
-                                        LPDIRECTDRAWSURFACE3 lpDDSReference)
-            PURE;
-        /* added in v2 */
-        STDMETHOD(GetDDInterface) (THIS_ LPVOID * lplpDD) PURE;
-        STDMETHOD(PageLock) (THIS_ DWORD dwFlags) PURE;
-        STDMETHOD(PageUnlock) (THIS_ DWORD dwFlags) PURE;
-        /* added in v3 */
-        STDMETHOD(SetSurfaceDesc) (THIS_ LPDDSURFACEDESC lpDDSD,
-                                   DWORD dwFlags) PURE;
-    };
-
-    /*** IUnknown methods ***/
-#define IDirectDrawSurface3_QueryInterface(p,a,b) ICOM_CALL_(QueryInterface,p,(p,a,b))
-#define IDirectDrawSurface3_AddRef(p)             ICOM_CALL_(AddRef,p,(p))
-#define IDirectDrawSurface3_Release(p)            ICOM_CALL_(Release,p,(p))
-/*** IDirectDrawSurface methods (almost) ***/
-#define IDirectDrawSurface3_AddAttachedSurface(p,a)      ICOM_CALL_(AddAttachedSurface,p,(p,a))
-#define IDirectDrawSurface3_AddOverlayDirtyRect(p,a)     ICOM_CALL_(AddOverlayDirtyRect,p,(p,a))
-#define IDirectDrawSurface3_Blt(p,a,b,c,d,e)             ICOM_CALL_(Blt,p,(p,a,b,c,d,e))
-#define IDirectDrawSurface3_BltBatch(p,a,b,c)            ICOM_CALL_(BltBatch,p,(p,a,b,c))
-#define IDirectDrawSurface3_BltFast(p,a,b,c,d,e)         ICOM_CALL_(BltFast,p,(p,a,b,c,d,e))
-#define IDirectDrawSurface3_DeleteAttachedSurface(p,a,b) ICOM_CALL_(DeleteAttachedSurface,p,(p,a,b))
-#define IDirectDrawSurface3_EnumAttachedSurfaces(p,a,b)  ICOM_CALL_(EnumAttachedSurfaces,p,(p,a,b))
-#define IDirectDrawSurface3_EnumOverlayZOrders(p,a,b,c)  ICOM_CALL_(EnumOverlayZOrders,p,(p,a,b,c))
-#define IDirectDrawSurface3_Flip(p,a,b)                  ICOM_CALL_(Flip,p,(p,a,b))
-#define IDirectDrawSurface3_GetAttachedSurface(p,a,b)    ICOM_CALL_(GetAttachedSurface,p,(p,a,b))
-#define IDirectDrawSurface3_GetBltStatus(p,a)            ICOM_CALL_(GetBltStatus,p,(p,a))
-#define IDirectDrawSurface3_GetCaps(p,a)                 ICOM_CALL_(GetCaps,p,(p,a))
-#define IDirectDrawSurface3_GetClipper(p,a)              ICOM_CALL_(GetClipper,p,(p,a))
-#define IDirectDrawSurface3_GetColorKey(p,a,b)           ICOM_CALL_(GetColorKey,p,(p,a,b))
-#define IDirectDrawSurface3_GetDC(p,a)                   ICOM_CALL_(GetDC,p,(p,a))
-#define IDirectDrawSurface3_GetFlipStatus(p,a)           ICOM_CALL_(GetFlipStatus,p,(p,a))
-#define IDirectDrawSurface3_GetOverlayPosition(p,a,b)    ICOM_CALL_(GetOverlayPosition,p,(p,a,b))
-#define IDirectDrawSurface3_GetPalette(p,a)              ICOM_CALL_(GetPalette,p,(p,a))
-#define IDirectDrawSurface3_GetPixelFormat(p,a)          ICOM_CALL_(GetPixelFormat,p,(p,a))
-#define IDirectDrawSurface3_GetSurfaceDesc(p,a)          ICOM_CALL_(GetSurfaceDesc,p,(p,a))
-#define IDirectDrawSurface3_Initialize(p,a,b)            ICOM_CALL_(Initialize,p,(p,a,b))
-#define IDirectDrawSurface3_IsLost(p)                    ICOM_CALL_(IsLost,p,(p))
-#define IDirectDrawSurface3_Lock(p,a,b,c,d)              ICOM_CALL_(Lock,p,(p,a,b,c,d))
-#define IDirectDrawSurface3_ReleaseDC(p,a)               ICOM_CALL_(ReleaseDC,p,(p,a))
-#define IDirectDrawSurface3_Restore(p)                   ICOM_CALL_(Restore,p,(p))
-#define IDirectDrawSurface3_SetClipper(p,a)              ICOM_CALL_(SetClipper,p,(p,a))
-#define IDirectDrawSurface3_SetColorKey(p,a,b)           ICOM_CALL_(SetColorKey,p,(p,a,b))
-#define IDirectDrawSurface3_SetOverlayPosition(p,a,b)    ICOM_CALL_(SetOverlayPosition,p,(p,a,b))
-#define IDirectDrawSurface3_SetPalette(p,a)              ICOM_CALL_(SetPalette,p,(p,a))
-#define IDirectDrawSurface3_Unlock(p,a)                  ICOM_CALL_(Unlock,p,(p,a))
-#define IDirectDrawSurface3_UpdateOverlay(p,a,b,c,d,e)   ICOM_CALL_(UpdateOverlay,p,(p,a,b,c,d,e))
-#define IDirectDrawSurface3_UpdateOverlayDisplay(p,a)    ICOM_CALL_(UpdateOverlayDisplay,p,(p,a))
-#define IDirectDrawSurface3_UpdateOverlayZOrder(p,a,b)   ICOM_CALL_(UpdateOverlayZOrder,p,(p,a,b))
-/*** IDirectDrawSurface2 methods ***/
-#define IDirectDrawSurface3_GetDDInterface(p,a) ICOM_CALL_(GetDDInterface,p,(p,a))
-#define IDirectDrawSurface3_PageLock(p,a)       ICOM_CALL_(PageLock,p,(p,a))
-#define IDirectDrawSurface3_PageUnlock(p,a)     ICOM_CALL_(PageUnlock,p,(p,a))
-/*** IDirectDrawSurface3 methods ***/
-#define IDirectDrawSurface3_SetSurfaceDesc(p,a,b) ICOM_CALL_(SetSurfaceDesc,p,(p,a,b))
-
-/*****************************************************************************
- * IDirectDrawSurface4 interface
- */
-/* Cannot inherit from IDirectDrawSurface2 because DDSCAPS changed to DDSCAPS2.
- */
-#undef INTERFACE
-#define INTERFACE IDirectDrawSurface4
-    DECLARE_INTERFACE_(IDirectDrawSurface4, IUnknown) {
-        STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE;
-        STDMETHOD_(ULONG, AddRef) (THIS) PURE;
-        STDMETHOD_(ULONG, Release) (THIS) PURE;
-        STDMETHOD(AddAttachedSurface) (THIS_ LPDIRECTDRAWSURFACE4
-                                       lpDDSAttachedSurface) PURE;
-        STDMETHOD(AddOverlayDirtyRect) (THIS_ LPRECT lpRect) PURE;
-        STDMETHOD(Blt) (THIS_ LPRECT lpDestRect,
-                        LPDIRECTDRAWSURFACE4 lpDDSrcSurface, LPRECT lpSrcRect,
-                        DWORD dwFlags, LPDDBLTFX lpDDBltFx) PURE;
-        STDMETHOD(BltBatch) (THIS_ LPDDBLTBATCH lpDDBltBatch, DWORD dwCount,
-                             DWORD dwFlags) PURE;
-        STDMETHOD(BltFast) (THIS_ DWORD dwX, DWORD dwY,
-                            LPDIRECTDRAWSURFACE4 lpDDSrcSurface,
-                            LPRECT lpSrcRect, DWORD dwTrans) PURE;
-        STDMETHOD(DeleteAttachedSurface) (THIS_ DWORD dwFlags,
-                                          LPDIRECTDRAWSURFACE4
-                                          lpDDSAttachedSurface) PURE;
-        STDMETHOD(EnumAttachedSurfaces) (THIS_ LPVOID lpContext,
-                                         LPDDENUMSURFACESCALLBACK
-                                         lpEnumSurfacesCallback) PURE;
-        STDMETHOD(EnumOverlayZOrders) (THIS_ DWORD dwFlags, LPVOID lpContext,
-                                       LPDDENUMSURFACESCALLBACK lpfnCallback)
-            PURE;
-        STDMETHOD(Flip) (THIS_ LPDIRECTDRAWSURFACE4 lpDDSurfaceTargetOverride,
-                         DWORD dwFlags) PURE;
-        STDMETHOD(GetAttachedSurface) (THIS_ LPDDSCAPS2 lpDDSCaps,
-                                       LPDIRECTDRAWSURFACE4 *
-                                       lplpDDAttachedSurface) PURE;
-        STDMETHOD(GetBltStatus) (THIS_ DWORD dwFlags) PURE;
-        STDMETHOD(GetCaps) (THIS_ LPDDSCAPS2 lpDDSCaps) PURE;
-        STDMETHOD(GetClipper) (THIS_ LPDIRECTDRAWCLIPPER * lplpDDClipper) PURE;
-        STDMETHOD(GetColorKey) (THIS_ DWORD dwFlags,
-                                LPDDCOLORKEY lpDDColorKey) PURE;
-        STDMETHOD(GetDC) (THIS_ HDC * lphDC) PURE;
-        STDMETHOD(GetFlipStatus) (THIS_ DWORD dwFlags) PURE;
-        STDMETHOD(GetOverlayPosition) (THIS_ LPLONG lplX, LPLONG lplY) PURE;
-        STDMETHOD(GetPalette) (THIS_ LPDIRECTDRAWPALETTE * lplpDDPalette) PURE;
-        STDMETHOD(GetPixelFormat) (THIS_ LPDDPIXELFORMAT lpDDPixelFormat) PURE;
-        STDMETHOD(GetSurfaceDesc) (THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE;
-        STDMETHOD(Initialize) (THIS_ LPDIRECTDRAW lpDD,
-                               LPDDSURFACEDESC lpDDSurfaceDesc) PURE;
-        STDMETHOD(IsLost) (THIS) PURE;
-        STDMETHOD(Lock) (THIS_ LPRECT lpDestRect,
-                         LPDDSURFACEDESC lpDDSurfaceDesc, DWORD dwFlags,
-                         HANDLE hEvent) PURE;
-        STDMETHOD(ReleaseDC) (THIS_ HDC hDC) PURE;
-        STDMETHOD(Restore) (THIS) PURE;
-        STDMETHOD(SetClipper) (THIS_ LPDIRECTDRAWCLIPPER lpDDClipper) PURE;
-        STDMETHOD(SetColorKey) (THIS_ DWORD dwFlags,
-                                LPDDCOLORKEY lpDDColorKey) PURE;
-        STDMETHOD(SetOverlayPosition) (THIS_ LONG lX, LONG lY) PURE;
-        STDMETHOD(SetPalette) (THIS_ LPDIRECTDRAWPALETTE lpDDPalette) PURE;
-        STDMETHOD(Unlock) (THIS_ LPRECT lpSurfaceData) PURE;
-        STDMETHOD(UpdateOverlay) (THIS_ LPRECT lpSrcRect,
-                                  LPDIRECTDRAWSURFACE4 lpDDDestSurface,
-                                  LPRECT lpDestRect, DWORD dwFlags,
-                                  LPDDOVERLAYFX lpDDOverlayFx) PURE;
-        STDMETHOD(UpdateOverlayDisplay) (THIS_ DWORD dwFlags) PURE;
-        STDMETHOD(UpdateOverlayZOrder) (THIS_ DWORD dwFlags,
-                                        LPDIRECTDRAWSURFACE4 lpDDSReference)
-            PURE;
-        /* added in v2 */
-        STDMETHOD(GetDDInterface) (THIS_ LPVOID * lplpDD) PURE;
-        STDMETHOD(PageLock) (THIS_ DWORD dwFlags) PURE;
-        STDMETHOD(PageUnlock) (THIS_ DWORD dwFlags) PURE;
-        /* added in v3 */
-        STDMETHOD(SetSurfaceDesc) (THIS_ LPDDSURFACEDESC lpDDSD,
-                                   DWORD dwFlags) PURE;
-        /* added in v4 */
-        STDMETHOD(SetPrivateData) (THIS_ REFGUID, LPVOID, DWORD, DWORD) PURE;
-        STDMETHOD(GetPrivateData) (THIS_ REFGUID, LPVOID, LPDWORD) PURE;
-        STDMETHOD(FreePrivateData) (THIS_ REFGUID) PURE;
-        STDMETHOD(GetUniquenessValue) (THIS_ LPDWORD) PURE;
-        STDMETHOD(ChangeUniquenessValue) (THIS) PURE;
-    };
-
-    /*** IUnknown methods ***/
-#define IDirectDrawSurface4_QueryInterface(p,a,b) ICOM_CALL_(QueryInterface,p,(p,a,b))
-#define IDirectDrawSurface4_AddRef(p)             ICOM_CALL_(AddRef,p,(p))
-#define IDirectDrawSurface4_Release(p)            ICOM_CALL_(Release,p,(p))
-/*** IDirectDrawSurface (almost) methods ***/
-#define IDirectDrawSurface4_AddAttachedSurface(p,a)      ICOM_CALL_(AddAttachedSurface,p,(p,a))
-#define IDirectDrawSurface4_AddOverlayDirtyRect(p,a)     ICOM_CALL_(AddOverlayDirtyRect,p,(p,a))
-#define IDirectDrawSurface4_Blt(p,a,b,c,d,e)             ICOM_CALL_(Blt,p,(p,a,b,c,d,e))
-#define IDirectDrawSurface4_BltBatch(p,a,b,c)            ICOM_CALL_(BltBatch,p,(p,a,b,c))
-#define IDirectDrawSurface4_BltFast(p,a,b,c,d,e)         ICOM_CALL_(BltFast,p,(p,a,b,c,d,e))
-#define IDirectDrawSurface4_DeleteAttachedSurface(p,a,b) ICOM_CALL_(DeleteAttachedSurface,p,(p,a,b))
-#define IDirectDrawSurface4_EnumAttachedSurfaces(p,a,b)  ICOM_CALL_(EnumAttachedSurfaces,p,(p,a,b))
-#define IDirectDrawSurface4_EnumOverlayZOrders(p,a,b,c)  ICOM_CALL_(EnumOverlayZOrders,p,(p,a,b,c))
-#define IDirectDrawSurface4_Flip(p,a,b)                  ICOM_CALL_(Flip,p,(p,a,b))
-#define IDirectDrawSurface4_GetAttachedSurface(p,a,b)    ICOM_CALL_(GetAttachedSurface,p,(p,a,b))
-#define IDirectDrawSurface4_GetBltStatus(p,a)            ICOM_CALL_(GetBltStatus,p,(p,a))
-#define IDirectDrawSurface4_GetCaps(p,a)                 ICOM_CALL_(GetCaps,p,(p,a))
-#define IDirectDrawSurface4_GetClipper(p,a)              ICOM_CALL_(GetClipper,p,(p,a))
-#define IDirectDrawSurface4_GetColorKey(p,a,b)           ICOM_CALL_(GetColorKey,p,(p,a,b))
-#define IDirectDrawSurface4_GetDC(p,a)                   ICOM_CALL_(GetDC,p,(p,a))
-#define IDirectDrawSurface4_GetFlipStatus(p,a)           ICOM_CALL_(GetFlipStatus,p,(p,a))
-#define IDirectDrawSurface4_GetOverlayPosition(p,a,b)    ICOM_CALL_(GetOverlayPosition,p,(p,a,b))
-#define IDirectDrawSurface4_GetPalette(p,a)              ICOM_CALL_(GetPalette,p,(p,a))
-#define IDirectDrawSurface4_GetPixelFormat(p,a)          ICOM_CALL_(GetPixelFormat,p,(p,a))
-#define IDirectDrawSurface4_GetSurfaceDesc(p,a)          ICOM_CALL_(GetSurfaceDesc,p,(p,a))
-#define IDirectDrawSurface4_Initialize(p,a,b)            ICOM_CALL_(Initialize,p,(p,a,b))
-#define IDirectDrawSurface4_IsLost(p)                    ICOM_CALL_(IsLost,p,(p))
-#define IDirectDrawSurface4_Lock(p,a,b,c,d)              ICOM_CALL_(Lock,p,(p,a,b,c,d))
-#define IDirectDrawSurface4_ReleaseDC(p,a)               ICOM_CALL_(ReleaseDC,p,(p,a))
-#define IDirectDrawSurface4_Restore(p)                   ICOM_CALL_(Restore,p,(p))
-#define IDirectDrawSurface4_SetClipper(p,a)              ICOM_CALL_(SetClipper,p,(p,a))
-#define IDirectDrawSurface4_SetColorKey(p,a,b)           ICOM_CALL_(SetColorKey,p,(p,a,b))
-#define IDirectDrawSurface4_SetOverlayPosition(p,a,b)    ICOM_CALL_(SetOverlayPosition,p,(p,a,b))
-#define IDirectDrawSurface4_SetPalette(p,a)              ICOM_CALL_(SetPalette,p,(p,a))
-#define IDirectDrawSurface4_Unlock(p,a)                  ICOM_CALL_(Unlock,p,(p,a))
-#define IDirectDrawSurface4_UpdateOverlay(p,a,b,c,d,e)   ICOM_CALL_(UpdateOverlay,p,(p,a,b,c,d,e))
-#define IDirectDrawSurface4_UpdateOverlayDisplay(p,a)    ICOM_CALL_(UpdateOverlayDisplay,p,(p,a))
-#define IDirectDrawSurface4_UpdateOverlayZOrder(p,a,b)   ICOM_CALL_(UpdateOverlayZOrder,p,(p,a,b))
-/*** IDirectDrawSurface2 methods ***/
-#define IDirectDrawSurface4_GetDDInterface(p,a) ICOM_CALL_(GetDDInterface,p,(p,a))
-#define IDirectDrawSurface4_PageLock(p,a)       ICOM_CALL_(PageLock,p,(p,a))
-#define IDirectDrawSurface4_PageUnlock(p,a)     ICOM_CALL_(PageUnlock,p,(p,a))
-/*** IDirectDrawSurface3 methods ***/
-#define IDirectDrawSurface4_SetSurfaceDesc(p,a,b) ICOM_CALL_(SetSurfaceDesc,p,(p,a,b))
-/*** IDirectDrawSurface4 methods ***/
-#define IDirectDrawSurface4_SetPrivateData(p,a,b,c,d) ICOM_CALL_(SetPrivateData,p,(p,a,b,c,d))
-#define IDirectDrawSurface4_GetPrivateData(p,a,b,c)   ICOM_CALL_(GetPrivateData,p,(p,a,b,c))
-#define IDirectDrawSurface4_FreePrivateData(p,a)      ICOM_CALL_(FreePrivateData,p,(p,a))
-#define IDirectDrawSurface4_GetUniquenessValue(p,a)   ICOM_CALL_(GetUniquenessValue,p,(p,a))
-#define IDirectDrawSurface4_ChangeUniquenessValue(p)  ICOM_CALL_(ChangeUniquenessValue,p,(p))
-
-/*****************************************************************************
- * IDirectDrawSurface7 interface
- */
-#undef INTERFACE
-#define INTERFACE IDirectDrawSurface7
-    DECLARE_INTERFACE_(IDirectDrawSurface7, IUnknown) {
-        STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE;
-        STDMETHOD_(ULONG, AddRef) (THIS) PURE;
-        STDMETHOD_(ULONG, Release) (THIS) PURE;
-        STDMETHOD(AddAttachedSurface) (THIS_ LPDIRECTDRAWSURFACE7
-                                       lpDDSAttachedSurface) PURE;
-        STDMETHOD(AddOverlayDirtyRect) (THIS_ LPRECT lpRect) PURE;
-        STDMETHOD(Blt) (THIS_ LPRECT lpDestRect,
-                        LPDIRECTDRAWSURFACE7 lpDDSrcSurface, LPRECT lpSrcRect,
-                        DWORD dwFlags, LPDDBLTFX lpDDBltFx) PURE;
-        STDMETHOD(BltBatch) (THIS_ LPDDBLTBATCH lpDDBltBatch, DWORD dwCount,
-                             DWORD dwFlags) PURE;
-        STDMETHOD(BltFast) (THIS_ DWORD dwX, DWORD dwY,
-                            LPDIRECTDRAWSURFACE7 lpDDSrcSurface,
-                            LPRECT lpSrcRect, DWORD dwTrans) PURE;
-        STDMETHOD(DeleteAttachedSurface) (THIS_ DWORD dwFlags,
-                                          LPDIRECTDRAWSURFACE7
-                                          lpDDSAttachedSurface) PURE;
-        STDMETHOD(EnumAttachedSurfaces) (THIS_ LPVOID lpContext,
-                                         LPDDENUMSURFACESCALLBACK7
-                                         lpEnumSurfacesCallback) PURE;
-        STDMETHOD(EnumOverlayZOrders) (THIS_ DWORD dwFlags, LPVOID lpContext,
-                                       LPDDENUMSURFACESCALLBACK7 lpfnCallback)
-            PURE;
-        STDMETHOD(Flip) (THIS_ LPDIRECTDRAWSURFACE7 lpDDSurfaceTargetOverride,
-                         DWORD dwFlags) PURE;
-        STDMETHOD(GetAttachedSurface) (THIS_ LPDDSCAPS2 lpDDSCaps,
-                                       LPDIRECTDRAWSURFACE7 *
-                                       lplpDDAttachedSurface) PURE;
-        STDMETHOD(GetBltStatus) (THIS_ DWORD dwFlags) PURE;
-        STDMETHOD(GetCaps) (THIS_ LPDDSCAPS2 lpDDSCaps) PURE;
-        STDMETHOD(GetClipper) (THIS_ LPDIRECTDRAWCLIPPER * lplpDDClipper) PURE;
-        STDMETHOD(GetColorKey) (THIS_ DWORD dwFlags,
-                                LPDDCOLORKEY lpDDColorKey) PURE;
-        STDMETHOD(GetDC) (THIS_ HDC * lphDC) PURE;
-        STDMETHOD(GetFlipStatus) (THIS_ DWORD dwFlags) PURE;
-        STDMETHOD(GetOverlayPosition) (THIS_ LPLONG lplX, LPLONG lplY) PURE;
-        STDMETHOD(GetPalette) (THIS_ LPDIRECTDRAWPALETTE * lplpDDPalette) PURE;
-        STDMETHOD(GetPixelFormat) (THIS_ LPDDPIXELFORMAT lpDDPixelFormat) PURE;
-        STDMETHOD(GetSurfaceDesc) (THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc) PURE;
-        STDMETHOD(Initialize) (THIS_ LPDIRECTDRAW lpDD,
-                               LPDDSURFACEDESC2 lpDDSurfaceDesc) PURE;
-        STDMETHOD(IsLost) (THIS) PURE;
-        STDMETHOD(Lock) (THIS_ LPRECT lpDestRect,
-                         LPDDSURFACEDESC2 lpDDSurfaceDesc, DWORD dwFlags,
-                         HANDLE hEvent) PURE;
-        STDMETHOD(ReleaseDC) (THIS_ HDC hDC) PURE;
-        STDMETHOD(Restore) (THIS) PURE;
-        STDMETHOD(SetClipper) (THIS_ LPDIRECTDRAWCLIPPER lpDDClipper) PURE;
-        STDMETHOD(SetColorKey) (THIS_ DWORD dwFlags,
-                                LPDDCOLORKEY lpDDColorKey) PURE;
-        STDMETHOD(SetOverlayPosition) (THIS_ LONG lX, LONG lY) PURE;
-        STDMETHOD(SetPalette) (THIS_ LPDIRECTDRAWPALETTE lpDDPalette) PURE;
-        STDMETHOD(Unlock) (THIS_ LPRECT lpSurfaceData) PURE;
-        STDMETHOD(UpdateOverlay) (THIS_ LPRECT lpSrcRect,
-                                  LPDIRECTDRAWSURFACE7 lpDDDestSurface,
-                                  LPRECT lpDestRect, DWORD dwFlags,
-                                  LPDDOVERLAYFX lpDDOverlayFx) PURE;
-        STDMETHOD(UpdateOverlayDisplay) (THIS_ DWORD dwFlags) PURE;
-        STDMETHOD(UpdateOverlayZOrder) (THIS_ DWORD dwFlags,
-                                        LPDIRECTDRAWSURFACE7 lpDDSReference)
-            PURE;
-        /* added in v2 */
-        STDMETHOD(GetDDInterface) (THIS_ LPVOID * lplpDD) PURE;
-        STDMETHOD(PageLock) (THIS_ DWORD dwFlags) PURE;
-        STDMETHOD(PageUnlock) (THIS_ DWORD dwFlags) PURE;
-        /* added in v3 */
-        STDMETHOD(SetSurfaceDesc) (THIS_ LPDDSURFACEDESC2 lpDDSD,
-                                   DWORD dwFlags) PURE;
-        /* added in v4 */
-        STDMETHOD(SetPrivateData) (THIS_ REFGUID, LPVOID, DWORD, DWORD) PURE;
-        STDMETHOD(GetPrivateData) (THIS_ REFGUID, LPVOID, LPDWORD) PURE;
-        STDMETHOD(FreePrivateData) (THIS_ REFGUID) PURE;
-        STDMETHOD(GetUniquenessValue) (THIS_ LPDWORD) PURE;
-        STDMETHOD(ChangeUniquenessValue) (THIS) PURE;
-        /* added in v7 */
-        STDMETHOD(SetPriority) (THIS_ DWORD prio) PURE;
-        STDMETHOD(GetPriority) (THIS_ LPDWORD prio) PURE;
-        STDMETHOD(SetLOD) (THIS_ DWORD lod) PURE;
-        STDMETHOD(GetLOD) (THIS_ LPDWORD lod) PURE;
-    };
-
-    /*** IUnknown methods ***/
-#define IDirectDrawSurface7_QueryInterface(p,a,b) ICOM_CALL_(QueryInterface,p,(p,a,b))
-#define IDirectDrawSurface7_AddRef(p)             ICOM_CALL_(AddRef,p,(p))
-#define IDirectDrawSurface7_Release(p)            ICOM_CALL_(Release,p,(p))
-/*** IDirectDrawSurface (almost) methods ***/
-#define IDirectDrawSurface7_AddAttachedSurface(p,a)      ICOM_CALL_(AddAttachedSurface,p,(p,a))
-#define IDirectDrawSurface7_AddOverlayDirtyRect(p,a)     ICOM_CALL_(AddOverlayDirtyRect,p,(p,a))
-#define IDirectDrawSurface7_Blt(p,a,b,c,d,e)             ICOM_CALL_(Blt,p,(p,a,b,c,d,e))
-#define IDirectDrawSurface7_BltBatch(p,a,b,c)            ICOM_CALL_(BltBatch,p,(p,a,b,c))
-#define IDirectDrawSurface7_BltFast(p,a,b,c,d,e)         ICOM_CALL_(BltFast,p,(p,a,b,c,d,e))
-#define IDirectDrawSurface7_DeleteAttachedSurface(p,a,b) ICOM_CALL_(DeleteAttachedSurface,p,(p,a,b))
-#define IDirectDrawSurface7_EnumAttachedSurfaces(p,a,b)  ICOM_CALL_(EnumAttachedSurfaces,p,(p,a,b))
-#define IDirectDrawSurface7_EnumOverlayZOrders(p,a,b,c)  ICOM_CALL_(EnumOverlayZOrders,p,(p,a,b,c))
-#define IDirectDrawSurface7_Flip(p,a,b)                  ICOM_CALL_(Flip,p,(p,a,b))
-#define IDirectDrawSurface7_GetAttachedSurface(p,a,b)    ICOM_CALL_(GetAttachedSurface,p,(p,a,b))
-#define IDirectDrawSurface7_GetBltStatus(p,a)            ICOM_CALL_(GetBltStatus,p,(p,a))
-#define IDirectDrawSurface7_GetCaps(p,a)                 ICOM_CALL_(GetCaps,p,(p,a))
-#define IDirectDrawSurface7_GetClipper(p,a)              ICOM_CALL_(GetClipper,p,(p,a))
-#define IDirectDrawSurface7_GetColorKey(p,a,b)           ICOM_CALL_(GetColorKey,p,(p,a,b))
-#define IDirectDrawSurface7_GetDC(p,a)                   ICOM_CALL_(GetDC,p,(p,a))
-#define IDirectDrawSurface7_GetFlipStatus(p,a)           ICOM_CALL_(GetFlipStatus,p,(p,a))
-#define IDirectDrawSurface7_GetOverlayPosition(p,a,b)    ICOM_CALL_(GetOverlayPosition,p,(p,a,b))
-#define IDirectDrawSurface7_GetPalette(p,a)              ICOM_CALL_(GetPalette,p,(p,a))
-#define IDirectDrawSurface7_GetPixelFormat(p,a)          ICOM_CALL_(GetPixelFormat,p,(p,a))
-#define IDirectDrawSurface7_GetSurfaceDesc(p,a)          ICOM_CALL_(GetSurfaceDesc,p,(p,a))
-#define IDirectDrawSurface7_Initialize(p,a,b)            ICOM_CALL_(Initialize,p,(p,a,b))
-#define IDirectDrawSurface7_IsLost(p)                    ICOM_CALL_(IsLost,p,(p))
-#define IDirectDrawSurface7_Lock(p,a,b,c,d)              ICOM_CALL_(Lock,p,(p,a,b,c,d))
-#define IDirectDrawSurface7_ReleaseDC(p,a)               ICOM_CALL_(ReleaseDC,p,(p,a))
-#define IDirectDrawSurface7_Restore(p)                   ICOM_CALL_(Restore,p,(p))
-#define IDirectDrawSurface7_SetClipper(p,a)              ICOM_CALL_(SetClipper,p,(p,a))
-#define IDirectDrawSurface7_SetColorKey(p,a,b)           ICOM_CALL_(SetColorKey,p,(p,a,b))
-#define IDirectDrawSurface7_SetOverlayPosition(p,a,b)    ICOM_CALL_(SetOverlayPosition,p,(p,a,b))
-#define IDirectDrawSurface7_SetPalette(p,a)              ICOM_CALL_(SetPalette,p,(p,a))
-#define IDirectDrawSurface7_Unlock(p,a)                  ICOM_CALL_(Unlock,p,(p,a))
-#define IDirectDrawSurface7_UpdateOverlay(p,a,b,c,d,e)   ICOM_CALL_(UpdateOverlay,p,(p,a,b,c,d,e))
-#define IDirectDrawSurface7_UpdateOverlayDisplay(p,a)    ICOM_CALL_(UpdateOverlayDisplay,p,(p,a))
-#define IDirectDrawSurface7_UpdateOverlayZOrder(p,a,b)   ICOM_CALL_(UpdateOverlayZOrder,p,(p,a,b))
-/*** IDirectDrawSurface2 methods ***/
-#define IDirectDrawSurface7_GetDDInterface(p,a) ICOM_CALL_(GetDDInterface,p,(p,a))
-#define IDirectDrawSurface7_PageLock(p,a)       ICOM_CALL_(PageLock,p,(p,a))
-#define IDirectDrawSurface7_PageUnlock(p,a)     ICOM_CALL_(PageUnlock,p,(p,a))
-/*** IDirectDrawSurface3 methods ***/
-#define IDirectDrawSurface7_SetSurfaceDesc(p,a,b) ICOM_CALL_(SetSurfaceDesc,p,(p,a,b))
-/*** IDirectDrawSurface4 methods ***/
-#define IDirectDrawSurface7_SetPrivateData(p,a,b,c,d) ICOM_CALL_(SetPrivateData,p,(p,a,b,c,d))
-#define IDirectDrawSurface7_GetPrivateData(p,a,b,c)   ICOM_CALL_(GetPrivateData,p,(p,a,b,c))
-#define IDirectDrawSurface7_FreePrivateData(p,a)      ICOM_CALL_(FreePrivateData,p,(p,a))
-#define IDirectDrawSurface7_GetUniquenessValue(p,a)   ICOM_CALL_(GetUniquenessValue,p,(p,a))
-#define IDirectDrawSurface7_ChangeUniquenessValue(p)  ICOM_CALL_(ChangeUniquenessValue,p,(p))
-/*** IDirectDrawSurface7 methods ***/
-#define IDirectDrawSurface7_SetPriority(p,a)          ICOM_CALL_(SetPriority,p,(p,a))
-#define IDirectDrawSurface7_GetPriority(p,a)          ICOM_CALL_(GetPriority,p,(p,a))
-#define IDirectDrawSurface7_SetLOD(p,a)               ICOM_CALL_(SetLOD,p,(p,a))
-#define IDirectDrawSurface7_GetLOD(p,a)               ICOM_CALL_(GetLOD,p,(p,a))
-
-/*****************************************************************************
- * IDirectDrawColorControl interface
- */
-#undef INTERFACE
-#define INTERFACE IDirectDrawColorControl
-    DECLARE_INTERFACE_(IDirectDrawColorControl, IUnknown) {
-        STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE;
-        STDMETHOD_(ULONG, AddRef) (THIS) PURE;
-        STDMETHOD_(ULONG, Release) (THIS) PURE;
-        STDMETHOD(GetColorControls) (THIS_ LPDDCOLORCONTROL lpColorControl)
-            PURE;
-        STDMETHOD(SetColorControls) (THIS_ LPDDCOLORCONTROL lpColorControl)
-            PURE;
-    };
-
-        /*** IUnknown methods ***/
-#define IDirectDrawColorControl_QueryInterface(p,a,b) ICOM_CALL_(QueryInterface,p,(p,a,b))
-#define IDirectDrawColorControl_AddRef(p)             ICOM_CALL_(AddRef,p,(p))
-#define IDirectDrawColorControl_Release(p)            ICOM_CALL_(Release,p,(p))
-        /*** IDirectDrawColorControl methods ***/
-#define IDirectDrawColorControl_GetColorControls(p,a) ICOM_CALL_(GetColorControls,p,(p,a))
-#define IDirectDrawColorControl_SetColorControls(p,a) ICOM_CALL_(SetColorControls,p,(p,a))
-
-/*****************************************************************************
- * IDirectDrawGammaControl interface
- */
-#undef INTERFACE
-#define INTERFACE IDirectDrawGammaControl
-    DECLARE_INTERFACE_(IDirectDrawGammaControl, IUnknown) {
-        STDMETHOD(QueryInterface) (THIS_ REFIID, LPVOID *) PURE;
-        STDMETHOD_(ULONG, AddRef) (THIS) PURE;
-        STDMETHOD_(ULONG, Release) (THIS) PURE;
-        STDMETHOD(GetGammaRamp) (THIS_ DWORD dwFlags,
-                                 LPDDGAMMARAMP lpGammaRamp) PURE;
-        STDMETHOD(SetGammaRamp) (THIS_ DWORD dwFlags,
-                                 LPDDGAMMARAMP lpGammaRamp) PURE;
-    };
-
-        /*** IUnknown methods ***/
-#define IDirectDrawGammaControl_QueryInterface(p,a,b) ICOM_CALL_(QueryInterface,p,(p,a,b))
-#define IDirectDrawGammaControl_AddRef(p)             ICOM_CALL_(AddRef,p,(p))
-#define IDirectDrawGammaControl_Release(p)            ICOM_CALL_(Release,p,(p))
-        /*** IDirectDrawGammaControl methods ***/
-#define IDirectDrawGammaControl_GetGammaRamp(p,a,b)   ICOM_CALL_(GetGammaRamp,p,(p,a,b))
-#define IDirectDrawGammaControl_SetGammaRamp(p,a,b)   ICOM_CALL_(SetGammaRamp,p,(p,a,b))
-
-    HRESULT WINAPI DirectDrawCreate(LPGUID, LPDIRECTDRAW *, LPUNKNOWN);
-    HRESULT WINAPI DirectDrawCreateEx(LPGUID, LPVOID *, REFIID, LPUNKNOWN);
-    HRESULT WINAPI DirectDrawEnumerateA(LPDDENUMCALLBACKA, LPVOID);
-    HRESULT WINAPI DirectDrawEnumerateW(LPDDENUMCALLBACKW, LPVOID);
-
-#define DirectDrawEnumerate WINELIB_NAME_AW(DirectDrawEnumerate)
-    HRESULT WINAPI DirectDrawCreateClipper(DWORD, LPDIRECTDRAWCLIPPER *,
-                                           LPUNKNOWN);
-
-#ifdef __cplusplus
-}                               /* extern "C" */
-#endif                          /* defined(__cplusplus) */
-
-#endif                          /* __XWIN_DDRAW_H */
diff --git a/xorg-server/hw/xwin/doflexbison.bat b/xorg-server/hw/xwin/doflexbison.bat
new file mode 100755
index 000000000..a29508bcb
--- /dev/null
+++ b/xorg-server/hw/xwin/doflexbison.bat
@@ -0,0 +1,18 @@
+@echo off

+setlocal

+

+cd "%~dp0"

+

+set M4=..\..\..\tools\mhmake\m4.exe

+set BISON_PKGDATADIR=../../../tools/mhmake/src/bisondata

+

+set path=..\..\..\tools\mhmake;%path%

+

+..\..\..\tools\mhmake\bison.exe -d -o%1/winprefsyacc.c winprefsyacc.y

+

+copy "..\..\..\tools\mhmake\flex++.exe" flex.exe

+flex.exe -i -o%1/winprefslex.c winprefslex.l

+del flex.exe

+

+endlocal

+

diff --git a/xorg-server/hw/xwin/glx/buildsimpledib.bat b/xorg-server/hw/xwin/glx/buildsimpledib.bat
new file mode 100755
index 000000000..1e1286bdd
--- /dev/null
+++ b/xorg-server/hw/xwin/glx/buildsimpledib.bat
@@ -0,0 +1 @@
+cl /Zi simpledib.c kernel32.lib user32.lib gdi32.lib opengl32.lib
\ No newline at end of file
diff --git a/xorg-server/hw/xwin/glx/gen_gl_wrappers.py b/xorg-server/hw/xwin/glx/gen_gl_wrappers.py
index 2273589c9..6e92e9edb 100644
--- a/xorg-server/hw/xwin/glx/gen_gl_wrappers.py
+++ b/xorg-server/hw/xwin/glx/gen_gl_wrappers.py
@@ -67,7 +67,7 @@ if dispatchheader :
         fh = open(dispatchheader)
         dispatchh = fh.readlines()
 
-        dispatch_regex = re.compile(r'^SET_(\S*)\(')
+        dispatch_regex = re.compile(r'(?:#define|static\s+INLINE\s+void)\s+SET_([^\()]+)\(')
 
         for line in dispatchh :
                 line = line.strip()
@@ -222,6 +222,8 @@ for w in sorted(wrappers.keys()) :
                         if l[2] == 'in' :
                                 if l[3] == 'array' :
                                         arg = 'const ' + typemap[l[1]] + ' *' + l[0]
+                                elif l[3] == 'reference' :
+                                        arg = 'const ' + typemap[l[1]] + ' *' + l[0]
                                 else :
                                         arg = typemap[l[1]] + ' ' + l[0]
                         elif l[2] == 'out' :
@@ -237,10 +239,12 @@ for w in sorted(wrappers.keys()) :
         if wrappers[w]['category'].startswith('VERSION_1_0') or wrappers[w]['category'].startswith('VERSION_1_1') :
                 if staticwrappers :
                         print 'static',
-                print returntype + ' ' + funcname + 'Wrapper(' + arglist + ')'
+                print returntype + ' __stdcall ' + funcname + 'Wrapper(' + arglist + ')'
                 print '{'
+                print '#ifdef _DEBUG'
                 print '  if (glxWinDebugSettings.enable' + prefix.upper() + 'callTrace) ErrorF("'+ funcname + '\\n");'
                 print '  glWinDirectProcCalls++;'
+                print '#endif'
                 if returntype.lower() == 'void' :
                         print '  ' +  funcname + '(',
                 else :
@@ -255,7 +259,7 @@ for w in sorted(wrappers.keys()) :
         else:
                 if staticwrappers :
                         print 'static',
-                print returntype + ' ' + funcname + 'Wrapper(' + arglist + ')'
+                print returntype + ' __stdcall ' + funcname + 'Wrapper(' + arglist + ')'
                 print '{'
 
                 stringname = funcname
@@ -285,11 +289,15 @@ for w in sorted(wrappers.keys()) :
 
                 if returntype.lower() == 'void' :
                         print '  RESOLVE(' + pfntypename + ', "' + stringname + '");'
+                        print '#ifdef _DEBUG'
                         print '  if (glxWinDebugSettings.enable' + prefix.upper() + 'callTrace) ErrorF("'+ funcname + '\\n");'
+                        print '#endif'
                         print '  RESOLVED_PROC(' + pfntypename + ')(',
                 else :
                         print '  RESOLVE_RET(' + pfntypename + ', "' + stringname + '", FALSE);'
+                        print '#ifdef _DEBUG'
                         print '  if (glxWinDebugSettings.enable' + prefix.upper() + 'callTrace) ErrorF("'+ funcname + '\\n");'
+                        print '#endif'
                         print '  return RESOLVED_PROC(' + pfntypename + ')(',
 
                 if arglist != 'void' :
@@ -306,20 +314,12 @@ for w in sorted(wrappers.keys()) :
 if dispatchheader :
         print 'void glWinSetupDispatchTable(void)'
         print '{'
-        print '  static struct _glapi_table *disp = NULL;'
-        print ''
-        print '  if (!disp)'
-        print '    {'
-        print '      disp = calloc(sizeof(void *), _glapi_get_dispatch_table_size());'
-        print '      assert(disp);'
+        print '  struct _glapi_table *disp = _glapi_get_dispatch();'
 
         for d in sorted(dispatch.keys()) :
                 if wrappers.has_key(d) :
                         print '      SET_'+ d + '(disp, (void *)' + prefix + d + 'Wrapper);'
                 else :
-                        print '#warning  No wrapper for ' + prefix + d + ' !'
+                        print '#pragma message("No wrapper for ' + prefix + d + ' !")'
 
-        print '    }'
-        print ''
-        print '  _glapi_set_dispatch(disp);'
         print '}'
diff --git a/xorg-server/hw/xwin/glx/gl.spec b/xorg-server/hw/xwin/glx/gl.spec
new file mode 100644
index 000000000..55e2d3b4c
--- /dev/null
+++ b/xorg-server/hw/xwin/glx/gl.spec
@@ -0,0 +1,34247 @@
+# gl.spec file
+# DON'T REMOVE PREVIOUS LINE!!! libspec depends on it!
+#
+# Copyright (c) 1991-2005 Silicon Graphics, Inc. All Rights Reserved.
+# Copyright (c) 2006-2012 The Khronos Group Inc.
+#
+# This document is licensed under the SGI Free Software B License Version
+# 2.0. For details, see http://oss.sgi.com/projects/FreeB/ .
+#
+# $Revision: 19329 $ on $Date: 2012-09-28 12:26:05 -0700 (Fri, 28 Sep 2012) $
+
+required-props:
+# Description of a parameter
+param:		retval retained
+# Display list flags
+dlflags:	notlistable handcode prepad
+# GLX implementation flags
+glxflags:	client-intercept client-handcode server-handcode EXT SGI ignore ARB
+# Vector ('v') equivalent form of a command taking 1-4 explicit xyzw/rgba arguments
+vectorequiv:	*
+# Category a function falls in. While there are many categories for
+# early GL 1.0 functions, later functions just have a core version
+# (e.g. VERSION_major_minor) or extension name for the category.
+category: display-list drawing drawing-control feedback framebuf misc modeling pixel-op pixel-rw state-req xform
+category: VERSION_1_0 VERSION_1_1 VERSION_1_2 VERSION_1_3 VERSION_1_4 VERSION_1_5 VERSION_2_0 VERSION_2_1 VERSION_3_0 VERSION_3_1 VERSION_3_2 VERSION_3_3 VERSION_4_0 VERSION_4_1 VERSION_4_2 VERSION_4_3
+category: 3DFX_tbuffer
+category: AMD_conservative_depth AMD_debug_output AMD_draw_buffers_blend AMD_multi_draw_indirect AMD_name_gen_delete AMD_performance_monitor AMD_sample_positions AMD_sparse_texture AMD_stencil_operation_extended AMD_vertex_shader_tesselator
+category: APPLE_aux_depth_stencil APPLE_element_array APPLE_fence APPLE_float_pixels APPLE_flush_buffer_range APPLE_object_purgeable APPLE_row_bytes APPLE_texture_range APPLE_vertex_array_object APPLE_vertex_array_range APPLE_vertex_program_evaluators
+category: ARB_ES2_compatibility ARB_base_instance ARB_blend_func_extended ARB_cl_event ARB_color_buffer_float ARB_copy_buffer ARB_debug_output ARB_depth_buffer_float ARB_draw_buffers ARB_draw_buffers_blend ARB_draw_elements_base_vertex ARB_draw_indirect ARB_draw_instanced ARB_fragment_program ARB_fragment_shader ARB_framebuffer_object ARB_framebuffer_sRGB ARB_geometry_shader4 ARB_get_program_binary ARB_gpu_shader_fp64 ARB_half_float_vertex ARB_instanced_arrays ARB_internalformat_query ARB_map_buffer_range ARB_matrix_palette ARB_multisample ARB_multitexture ARB_occlusion_query ARB_point_parameters ARB_provoking_vertex ARB_robustness ARB_sample_shading ARB_sampler_objects ARB_separate_shader_objects ARB_shader_atomic_counters ARB_shader_image_load_store ARB_shader_objects ARB_shader_subroutine ARB_shading_language_include ARB_sync ARB_tessellation_shader ARB_texture_buffer_object ARB_texture_compression ARB_texture_compression_rgtc ARB_texture_multisample ARB_texture_rectangle ARB_texture_rg ARB_texture_storage ARB_timer_query ARB_transform_feedback2 ARB_transform_feedback3 ARB_transform_feedback_instanced ARB_transpose_matrix ARB_uniform_buffer_object ARB_vertex_array_object ARB_vertex_attrib_64bit ARB_vertex_blend ARB_vertex_buffer_object ARB_vertex_program ARB_vertex_shader ARB_vertex_type_2_10_10_10_rev ARB_viewport_array ARB_window_pos
+category: ARB_clear_buffer_object ARB_compute_shader ARB_copy_image ARB_framebuffer_no_attachments ARB_internalformat_query2 ARB_invalidate_subdata ARB_multi_draw_indirect ARB_program_interface_query ARB_shader_storage_buffer_object ARB_texture_buffer_range ARB_texture_storage_multisample ARB_texture_view ARB_vertex_attrib_binding
+category: ATI_draw_buffers ATI_draw_buffers ATI_element_array ATI_envmap_bumpmap ATI_fragment_shader ATI_map_object_buffer ATI_meminfo ATI_pn_triangles ATI_separate_stencil ATI_texture_env_combine3 ATI_texture_float ATI_vertex_array_object ATI_vertex_attrib_array_object ATI_vertex_streams
+category: EXT_bindable_uniform EXT_blend_color EXT_blend_equation_separate EXT_blend_func_separate EXT_blend_minmax EXT_color_subtable EXT_compiled_vertex_array EXT_convolution EXT_coordinate_frame EXT_copy_texture EXT_cull_vertex EXT_depth_bounds_test EXT_direct_state_access EXT_draw_buffers2 EXT_draw_instanced EXT_draw_range_elements EXT_fog_coord EXT_framebuffer_blit EXT_framebuffer_multisample EXT_framebuffer_object EXT_geometry_shader4 EXT_gpu_program_parameters EXT_gpu_shader4 EXT_histogram EXT_index_func EXT_index_material EXT_light_texture EXT_multi_draw_arrays EXT_multisample EXT_paletted_texture EXT_pixel_transform EXT_point_parameters EXT_polygon_offset EXT_provoking_vertex EXT_secondary_color EXT_separate_shader_objects EXT_shader_image_load_store EXT_stencil_clear_tag EXT_stencil_two_side EXT_subtexture EXT_texture3D EXT_texture_buffer_object EXT_texture_integer EXT_texture_object EXT_texture_perturb_normal EXT_texture_snorm EXT_texture_swizzle EXT_timer_query EXT_transform_feedback EXT_vertex_array EXT_vertex_array_bgra EXT_vertex_attrib_64bit EXT_vertex_shader EXT_vertex_weighting EXT_x11_sync_object
+category: GREMEDY_frame_terminator GREMEDY_string_marker
+category: HP_image_transform
+category: IBM_multimode_draw_arrays IBM_vertex_array_lists
+category: INGR_blend_func_separate
+category: INTEL_parallel_arrays
+category: KHR_debug
+category: MESAX_texture_stack MESA_resize_buffers MESA_window_pos
+category: NV_bindless_texture NV_conditional_render NV_copy_image NV_depth_buffer_float NV_evaluators NV_explicit_multisample NV_fence NV_float_buffer NV_fragment_program NV_fragment_program NV_framebuffer_multisample_coverage NV_geometry_program4 NV_gpu_program4 NV_gpu_program5 NV_gpu_shader5 NV_half_float NV_half_float NV_occlusion_query NV_parameter_buffer_object NV_parameter_buffer_object2 NV_path_rendering NV_pixel_data_range NV_pixel_data_range NV_point_sprite NV_present_video NV_primitive_restart NV_primitive_restart NV_register_combiners NV_register_combiners2 NV_shader_buffer_load NV_texture_barrier NV_texture_expand_normal NV_texture_expand_normal NV_texture_multisample NV_transform_feedback NV_transform_feedback2 NV_vdpau_interop NV_vdpau_interop NV_vertex_array_range NV_vertex_attrib_integer_64bit NV_vertex_buffer_unified_memory NV_vertex_program NV_vertex_program1_1_dcc NV_vertex_program2 NV_vertex_program4 NV_video_capture
+category: PGI_misc_hints
+category: S3_s3tc
+category: SGIS_detail_texture SGIS_fog_function SGIS_multisample SGIS_pixel_texture SGIS_point_parameters SGIS_sharpen_texture SGIS_texture4D SGIS_texture_color_mask SGIS_texture_filter4 SGIX_async SGIX_flush_raster SGIX_fragment_lighting SGIX_framezoom SGIX_igloo_interface SGIX_instruments SGIX_list_priority SGIX_pixel_texture SGIX_polynomial_ffd SGIX_reference_plane SGIX_sprite SGIX_tag_sample_buffer SGI_color_table
+category: SUNX_constant_data SUN_global_alpha SUN_mesh_array SUN_triangle_list SUN_vertex
+
+# Categories for extensions with no functions - need not be included now
+#
+# 3DFX_multisample 3DFX_texture_compression_FXT1
+# AMD_blend_minmax_factor AMD_pinned_memory AMD_seamless_cubemap_per_texture AMD_shader_stencil_export AMD_vertex_shader_layer AMD_vertex_shader_viewport_index
+# APPLE_specular_vector APPLE_transform_hint
+# ARB_ES3_compatibility ARB_arrays_of_arrays ARB_compressed_texture_pixel_storage ARB_conservative_depth ARB_debug_output2 ARB_depth_clamp ARB_explicit_uniform_location ARB_fragment_coord_conventions ARB_fragment_layer_viewport ARB_half_float_pixel ARB_map_buffer_alignment ARB_pixel_buffer_object ARB_point_sprite ARB_robust_buffer_access_behavior ARB_robustness_isolation ARB_seamless_cube_map ARB_shader_image_size ARB_shading_language_100 ARB_shading_language_420pack ARB_shading_language_packing ARB_stencil_texturing ARB_texture_border_clamp ARB_texture_cube_map ARB_texture_cube_map_array ARB_texture_env_add ARB_texture_float ARB_texture_gather ARB_texture_non_power_of_two ARB_texture_query_levels ARB_texture_query_lod ARB_vertex_array_bgra
+# EXT_422_pixels EXT_abgr EXT_bgra EXT_blend_logic_op EXT_blend_subtract EXT_clip_volume_hint EXT_cmyka EXT_framebuffer_sRGB EXT_index_array_formats EXT_index_texture EXT_misc_attribute EXT_packed_float EXT_packed_pixels EXT_pixel_transform_color_table EXT_rescale_normal EXT_separate_specular_color EXT_shadow_funcs EXT_shared_texture_palette EXT_stencil_wrap EXT_texture EXT_texture_array EXT_texture_compression_latc EXT_texture_compression_rgtc EXT_texture_env EXT_texture_env_add EXT_texture_env_combine EXT_texture_filter_anisotropic EXT_texture_lod_bias EXT_texture_shared_exponent EXT_vertex_array_bgra
+# HP_convolution_border_modes HP_occlusion_test HP_texture_lighting
+# IBM_cull_vertex IBM_rasterpos_clip
+# INGR_color_clamp INGR_interlace_read
+# KHR_texture_compression_astc_ldr
+# MESA_pack_invert MESA_ycbcr_texture
+# NV_blend_square NV_fog_distance NV_fragment_program4 NV_geometry_shader4 NV_light_max_exponent NV_packed_depth_stencil NV_shader_atomic_float NV_texgen_emboss NV_texgen_reflection NV_texture_compression_vtc NV_texture_env_combine4 NV_texture_rectangle NV_texture_shader NV_texture_shader2 NV_vertex_array_range2
+# PGI_vertex_hints
+# REND_screen_coordinates
+# SGIS_generate_mipmap SGIS_texture_border_clamp SGIS_texture_edge_clamp SGIS_texture_lod SGIX_async_histogram SGIX_async_pixel SGIX_blend_alpha_minmax SGIX_calligraphic_fragment SGIX_clipmap SGIX_convolution_accuracy SGIX_depth_pass_instrument SGIX_depth_texture SGIX_fog_offset SGIX_fog_scale SGIX_interlace SGIX_ir_instrument1 SGIX_pixel_tiles SGIX_resample SGIX_scalebias_hint SGIX_shadow SGIX_shadow_ambient SGIX_subsample SGIX_texture_add_env SGIX_texture_coordinate_clamp SGIX_texture_lod_bias SGIX_texture_multi_buffer SGIX_texture_scale_bias SGIX_texture_select SGIX_vertex_preclip SGIX_ycrcb SGIX_ycrcb_subsample SGIX_ycrcba SGI_color_matrix SGI_texture_color_table
+# SUN_convolution_border_modes SUN_slice_accum
+# WIN_phong_shading WIN_specular_fog
+
+# Core version in which a function was introduced, or against
+# which an extension can be implemented
+version:	1.0 1.1 1.2 1.3 1.4 1.5 2.0 2.1 3.0 3.1 3.2 3.3 4.0 4.1 4.2 4.3
+# Core version in which a function was removed
+deprecated:	3.1
+# API profile - should only be compatibility since there are no core-only
+# functions for now.
+profile:	compatibility
+# GLX Single, Rendering, or Vendor Private opcode
+glxsingle:	*
+glxropcode:	*
+glxvendorpriv:	*
+# WGL implementation flags (incomplete)
+wglflags:	client-handcode server-handcode small-data batchable
+# Drivers in which this is implemented (very incomplete)
+extension:	future not_implemented soft WINSOFT NV10 NV20 NV50
+# Function this aliases (indistinguishable to the GL)
+alias:		*
+# Mesa dispatch table offset (incomplete)
+offset:		*
+# These properties are picked up from NVIDIA .spec files, we don't use them
+glfflags:	*
+beginend:	*
+glxvectorequiv: *
+subcategory:	*
+glextmask:	*
+
+###############################################################################
+#
+# glxsingle, glxropcode, and other GLX allocations to vendors
+# are used here, but the master registry for GLX is in
+# /repos/ogl/trunk/doc/registry/extensions.reserved
+#
+# XFree86 dispatch offsets:	0-645
+#				578-641     NV_vertex_program
+# GLS opcodes:			0x0030-0x0269
+#
+###############################################################################
+
+###############################################################################
+#
+# things to remember when adding an extension command
+#
+# - append new ARB and non-ARB extensions to the appropriate portion of
+#   the spec file, in extension number order.
+# - leading tabs are suggested. Whitespace of any sort may be used elsewhere.
+# - set glxflags to "ignore" until GLX is updated to support the new command
+# - add new data types to typemaps/spec2wire.map
+# - add extension name in alphabetical order to category list
+# - add commands within an extension in spec order
+# - use existing command entries as a model (where possible)
+# - when reserving new glxropcodes, update extensions.reserved (per above)
+#
+###############################################################################
+
+# New type declarations
+
+passthru: #include <stddef.h>
+
+passthru: #ifndef GL_VERSION_2_0
+passthru: /* GL type for program/shader text */
+passthru: typedef char GLchar;
+passthru: #endif
+passthru:
+passthru: #ifndef GL_VERSION_1_5
+passthru: /* GL types for handling large vertex buffer objects */
+passthru: typedef ptrdiff_t GLintptr;
+passthru: typedef ptrdiff_t GLsizeiptr;
+passthru: #endif
+passthru:
+passthru: #ifndef GL_ARB_vertex_buffer_object
+passthru: /* GL types for handling large vertex buffer objects */
+passthru: typedef ptrdiff_t GLintptrARB;
+passthru: typedef ptrdiff_t GLsizeiptrARB;
+passthru: #endif
+passthru:
+passthru: #ifndef GL_ARB_shader_objects
+passthru: /* GL types for program/shader text and shader object handles */
+passthru: typedef char GLcharARB;
+passthru: typedef unsigned int GLhandleARB;
+passthru: #endif
+passthru:
+passthru: /* GL type for "half" precision (s10e5) float data in host memory */
+passthru: #ifndef GL_ARB_half_float_pixel
+passthru: typedef unsigned short GLhalfARB;
+passthru: #endif
+passthru:
+passthru: #ifndef GL_NV_half_float
+passthru: typedef unsigned short GLhalfNV;
+passthru: #endif
+passthru:
+passthru: #ifndef GLEXT_64_TYPES_DEFINED
+passthru: /* This code block is duplicated in glxext.h, so must be protected */
+passthru: #define GLEXT_64_TYPES_DEFINED
+passthru: /* Define int32_t, int64_t, and uint64_t types for UST/MSC */
+passthru: /* (as used in the GL_EXT_timer_query extension). */
+passthru: #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+passthru: #include <inttypes.h>
+passthru: #elif defined(__sun__) || defined(__digital__)
+passthru: #include <inttypes.h>
+passthru: #if defined(__STDC__)
+passthru: #if defined(__arch64__) || defined(_LP64)
+passthru: typedef long int int64_t;
+passthru: typedef unsigned long int uint64_t;
+passthru: #else
+passthru: typedef long long int int64_t;
+passthru: typedef unsigned long long int uint64_t;
+passthru: #endif /* __arch64__ */
+passthru: #endif /* __STDC__ */
+passthru: #elif defined( __VMS ) || defined(__sgi)
+passthru: #include <inttypes.h>
+passthru: #elif defined(__SCO__) || defined(__USLC__)
+passthru: #include <stdint.h>
+passthru: #elif defined(__UNIXOS2__) || defined(__SOL64__)
+passthru: typedef long int int32_t;
+passthru: typedef long long int int64_t;
+passthru: typedef unsigned long long int uint64_t;
+passthru: #elif defined(_WIN32) && defined(__GNUC__)
+passthru: #include <stdint.h>
+passthru: #elif defined(_WIN32)
+passthru: typedef __int32 int32_t;
+passthru: typedef __int64 int64_t;
+passthru: typedef unsigned __int64 uint64_t;
+passthru: #else
+passthru: /* Fallback if nothing above works */
+passthru: #include <inttypes.h>
+passthru: #endif
+passthru: #endif
+passthru:
+passthru: #ifndef GL_EXT_timer_query
+passthru: typedef int64_t GLint64EXT;
+passthru: typedef uint64_t GLuint64EXT;
+passthru: #endif
+passthru:
+passthru: #ifndef GL_ARB_sync
+passthru: typedef int64_t GLint64;
+passthru: typedef uint64_t GLuint64;
+passthru: typedef struct __GLsync *GLsync;
+passthru: #endif
+passthru:
+passthru: #ifndef GL_ARB_cl_event
+passthru: /* These incomplete types let us declare types compatible with OpenCL's cl_context and cl_event */
+passthru: struct _cl_context;
+passthru: struct _cl_event;
+passthru: #endif
+passthru:
+passthru: #ifndef GL_ARB_debug_output
+passthru: typedef void (APIENTRY *GLDEBUGPROCARB)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,GLvoid *userParam);
+passthru: #endif
+passthru:
+passthru: #ifndef GL_AMD_debug_output
+passthru: typedef void (APIENTRY *GLDEBUGPROCAMD)(GLuint id,GLenum category,GLenum severity,GLsizei length,const GLchar *message,GLvoid *userParam);
+passthru: #endif
+passthru:
+passthru: #ifndef GL_KHR_debug
+passthru: typedef void (APIENTRY *GLDEBUGPROC)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,GLvoid *userParam);
+passthru: #endif
+passthru:
+passthru: #ifndef GL_NV_vdpau_interop
+passthru: typedef GLintptr GLvdpauSurfaceNV;
+passthru: #endif
+passthru:
+
+###############################################################################
+###############################################################################
+#
+# OpenGL 1.0 commands
+#
+###############################################################################
+###############################################################################
+
+###############################################################################
+#
+# drawing-control commands
+#
+###############################################################################
+
+CullFace(mode)
+	return		void
+	param		mode		CullFaceMode in value
+	category	VERSION_1_0		   # old: drawing-control
+	version		1.0
+	glxropcode	79
+	offset		152
+
+FrontFace(mode)
+	return		void
+	param		mode		FrontFaceDirection in value
+	category	VERSION_1_0		   # old: drawing-control
+	version		1.0
+	glxropcode	84
+	offset		157
+
+Hint(target, mode)
+	return		void
+	param		target		HintTarget in value
+	param		mode		HintMode in value
+	category	VERSION_1_0		   # old: drawing-control
+	version		1.0
+	glxropcode	85
+	offset		158
+
+LineWidth(width)
+	return		void
+	param		width		CheckedFloat32 in value
+	category	VERSION_1_0		   # old: drawing-control
+	version		1.0
+	glxropcode	95
+	offset		168
+
+PointSize(size)
+	return		void
+	param		size		CheckedFloat32 in value
+	category	VERSION_1_0		   # old: drawing-control
+	version		1.0
+	glxropcode	100
+	offset		173
+
+PolygonMode(face, mode)
+	return		void
+	param		face		MaterialFace in value
+	param		mode		PolygonMode in value
+	category	VERSION_1_0		   # old: drawing-control
+	version		1.0
+	glxropcode	101
+	offset		174
+
+Scissor(x, y, width, height)
+	return		void
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	category	VERSION_1_0		   # old: drawing-control
+	version		1.0
+	glxropcode	103
+	offset		176
+
+TexParameterf(target, pname, param)
+	return		void
+	param		target		TextureTarget in value
+	param		pname		TextureParameterName in value
+	param		param		CheckedFloat32 in value
+	category	VERSION_1_0		   # old: drawing-control
+	version		1.0
+	glxropcode	105
+	wglflags	small-data
+	offset		178
+
+TexParameterfv(target, pname, params)
+	return		void
+	param		target		TextureTarget in value
+	param		pname		TextureParameterName in value
+	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: drawing-control
+	version		1.0
+	glxropcode	106
+	wglflags	small-data
+	offset		179
+
+TexParameteri(target, pname, param)
+	return		void
+	param		target		TextureTarget in value
+	param		pname		TextureParameterName in value
+	param		param		CheckedInt32 in value
+	category	VERSION_1_0		   # old: drawing-control
+	version		1.0
+	glxropcode	107
+	wglflags	small-data
+	offset		180
+
+TexParameteriv(target, pname, params)
+	return		void
+	param		target		TextureTarget in value
+	param		pname		TextureParameterName in value
+	param		params		CheckedInt32 in array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: drawing-control
+	version		1.0
+	glxropcode	108
+	wglflags	small-data
+	offset		181
+
+TexImage1D(target, level, internalformat, width, border, format, type, pixels)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	TextureComponentCount in value
+	param		width		SizeI in value
+	param		border		CheckedInt32 in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void in array [COMPSIZE(format/type/width)]
+	category	VERSION_1_0		   # old: drawing-control
+	dlflags		handcode
+	glxflags	client-handcode server-handcode
+	version		1.0
+	glxropcode	109
+	wglflags	client-handcode server-handcode
+	offset		182
+
+TexImage2D(target, level, internalformat, width, height, border, format, type, pixels)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	TextureComponentCount in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		border		CheckedInt32 in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void in array [COMPSIZE(format/type/width/height)]
+	category	VERSION_1_0		   # old: drawing-control
+	dlflags		handcode
+	glxflags	client-handcode server-handcode
+	version		1.0
+	glxropcode	110
+	wglflags	client-handcode server-handcode
+	offset		183
+
+###############################################################################
+#
+# framebuf commands
+#
+###############################################################################
+
+DrawBuffer(mode)
+	return		void
+	param		mode		DrawBufferMode in value
+	category	VERSION_1_0		   # old: framebuf
+	version		1.0
+	glxropcode	126
+	offset		202
+
+Clear(mask)
+	return		void
+	param		mask		ClearBufferMask in value
+	category	VERSION_1_0		   # old: framebuf
+	version		1.0
+	glxropcode	127
+	offset		203
+
+ClearColor(red, green, blue, alpha)
+	return		void
+	param		red		ColorF in value
+	param		green		ColorF in value
+	param		blue		ColorF in value
+	param		alpha		ColorF in value
+	category	VERSION_1_0		   # old: framebuf
+	version		1.0
+	glxropcode	130
+	offset		206
+
+ClearStencil(s)
+	return		void
+	param		s		StencilValue in value
+	category	VERSION_1_0		   # old: framebuf
+	version		1.0
+	glxropcode	131
+	offset		207
+
+ClearDepth(depth)
+	return		void
+	param		depth		Float64 in value
+	category	VERSION_1_0		   # old: framebuf
+	version		1.0
+	glxropcode	132
+	offset		208
+
+StencilMask(mask)
+	return		void
+	param		mask		MaskedStencilValue in value
+	category	VERSION_1_0		   # old: framebuf
+	version		1.0
+	glxropcode	133
+	offset		209
+
+ColorMask(red, green, blue, alpha)
+	return		void
+	param		red		Boolean in value
+	param		green		Boolean in value
+	param		blue		Boolean in value
+	param		alpha		Boolean in value
+	category	VERSION_1_0		   # old: framebuf
+	version		1.0
+	glxropcode	134
+	offset		210
+
+DepthMask(flag)
+	return		void
+	param		flag		Boolean in value
+	category	VERSION_1_0		   # old: framebuf
+	version		1.0
+	glxropcode	135
+	offset		211
+
+###############################################################################
+#
+# misc commands
+#
+###############################################################################
+
+Disable(cap)
+	return		void
+	param		cap		EnableCap in value
+	category	VERSION_1_0		   # old: misc
+	version		1.0
+	dlflags		handcode
+	glxflags	client-handcode client-intercept
+	glxropcode	138
+	offset		214
+
+Enable(cap)
+	return		void
+	param		cap		EnableCap in value
+	category	VERSION_1_0		   # old: misc
+	version		1.0
+	dlflags		handcode
+	glxflags	client-handcode client-intercept
+	glxropcode	139
+	offset		215
+
+Finish()
+	return		void
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode
+	category	VERSION_1_0		   # old: misc
+	version		1.0
+	glxsingle	108
+	offset		216
+
+Flush()
+	return		void
+	dlflags		notlistable
+	glxflags	client-handcode client-intercept server-handcode
+	category	VERSION_1_0		   # old: misc
+	version		1.0
+	glxsingle	142
+	offset		217
+
+###############################################################################
+#
+# pixel-op commands
+#
+###############################################################################
+
+BlendFunc(sfactor, dfactor)
+	return		void
+	param		sfactor		BlendingFactorSrc in value
+	param		dfactor		BlendingFactorDest in value
+	category	VERSION_1_0		   # old: pixel-op
+	version		1.0
+	glxropcode	160
+	offset		241
+
+LogicOp(opcode)
+	return		void
+	param		opcode		LogicOp in value
+	category	VERSION_1_0		   # old: pixel-op
+	version		1.0
+	glxropcode	161
+	offset		242
+
+StencilFunc(func, ref, mask)
+	return		void
+	param		func		StencilFunction in value
+	param		ref		StencilValue in value
+	param		mask		MaskedStencilValue in value
+	category	VERSION_1_0		   # old: pixel-op
+	version		1.0
+	glxropcode	162
+	offset		243
+
+StencilOp(fail, zfail, zpass)
+	return		void
+	param		fail		StencilOp in value
+	param		zfail		StencilOp in value
+	param		zpass		StencilOp in value
+	category	VERSION_1_0		   # old: pixel-op
+	version		1.0
+	glxropcode	163
+	offset		244
+
+DepthFunc(func)
+	return		void
+	param		func		DepthFunction in value
+	category	VERSION_1_0		   # old: pixel-op
+	version		1.0
+	glxropcode	164
+	offset		245
+
+###############################################################################
+#
+# pixel-rw commands
+#
+###############################################################################
+
+PixelStoref(pname, param)
+	return		void
+	param		pname		PixelStoreParameter in value
+	param		param		CheckedFloat32 in value
+	dlflags		notlistable
+	glxflags	client-handcode
+	category	VERSION_1_0		   # old: pixel-rw
+	version		1.0
+	glxsingle	109
+	wglflags	batchable
+	offset		249
+
+PixelStorei(pname, param)
+	return		void
+	param		pname		PixelStoreParameter in value
+	param		param		CheckedInt32 in value
+	dlflags		notlistable
+	glxflags	client-handcode
+	category	VERSION_1_0		   # old: pixel-rw
+	version		1.0
+	glxsingle	110
+	wglflags	batchable
+	offset		250
+
+ReadBuffer(mode)
+	return		void
+	param		mode		ReadBufferMode in value
+	category	VERSION_1_0		   # old: pixel-rw
+	version		1.0
+	glxropcode	171
+	offset		254
+
+ReadPixels(x, y, width, height, format, type, pixels)
+	return		void
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void out array [COMPSIZE(format/type/width/height)]
+	category	VERSION_1_0		   # old: pixel-rw
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode
+	version		1.0
+	glxsingle	111
+	wglflags	client-handcode server-handcode
+	offset		256
+
+###############################################################################
+#
+# state-req commands
+#
+###############################################################################
+
+GetBooleanv(pname, params)
+	return		void
+	param		pname		GetPName in value
+	param		params		Boolean out array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	glxflags	client-handcode
+	version		1.0
+	glxsingle	112
+	wglflags	small-data
+	offset		258
+
+GetDoublev(pname, params)
+	return		void
+	param		pname		GetPName in value
+	param		params		Float64 out array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	glxflags	client-handcode
+	version		1.0
+	glxsingle	114
+	wglflags	small-data
+	offset		260
+
+GetError()
+	return		ErrorCode
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	glxflags	client-handcode
+	version		1.0
+	glxsingle	115
+	offset		261
+
+GetFloatv(pname, params)
+	return		void
+	param		pname		GetPName in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	glxflags	client-handcode
+	version		1.0
+	glxsingle	116
+	wglflags	small-data
+	offset		262
+
+GetIntegerv(pname, params)
+	return		void
+	param		pname		GetPName in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	glxflags	client-handcode
+	version		1.0
+	glxsingle	117
+	wglflags	small-data
+	offset		263
+
+GetString(name)
+	return		String
+	param		name		StringName in value
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode
+	version		1.0
+	glxsingle	129
+	wglflags	client-handcode server-handcode
+	offset		275
+
+GetTexImage(target, level, format, type, pixels)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void out array [COMPSIZE(target/level/format/type)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode
+	version		1.0
+	glxsingle	135
+	wglflags	client-handcode server-handcode
+	offset		281
+
+GetTexParameterfv(target, pname, params)
+	return		void
+	param		target		TextureTarget in value
+	param		pname		GetTextureParameter in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	version		1.0
+	glxsingle	136
+	wglflags	small-data
+	offset		282
+
+GetTexParameteriv(target, pname, params)
+	return		void
+	param		target		TextureTarget in value
+	param		pname		GetTextureParameter in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	version		1.0
+	glxsingle	137
+	wglflags	small-data
+	offset		283
+
+GetTexLevelParameterfv(target, level, pname, params)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		pname		GetTextureParameter in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	version		1.0
+	glxsingle	138
+	wglflags	small-data
+	offset		284
+
+GetTexLevelParameteriv(target, level, pname, params)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		pname		GetTextureParameter in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	version		1.0
+	glxsingle	139
+	wglflags	small-data
+	offset		285
+
+IsEnabled(cap)
+	return		Boolean
+	param		cap		EnableCap in value
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	version		1.0
+	glxflags	client-handcode client-intercept
+	glxsingle	140
+	offset		286
+
+###############################################################################
+#
+# xform commands
+#
+###############################################################################
+
+DepthRange(near, far)
+	return		void
+	param		near		Float64 in value
+	param		far		Float64 in value
+	category	VERSION_1_0		   # old: xform
+	version		1.0
+	glxropcode	174
+	offset		288
+
+Viewport(x, y, width, height)
+	return		void
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	category	VERSION_1_0		   # old: xform
+	version		1.0
+	glxropcode	191
+	offset		305
+
+###############################################################################
+###############################################################################
+#
+# OpenGL 1.0 deprecated commands
+#
+###############################################################################
+###############################################################################
+
+# display-list commands
+
+NewList(list, mode)
+	return		void
+	param		list		List in value
+	param		mode		ListMode in value
+	dlflags		notlistable
+	category	VERSION_1_0		   # old: display-list
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxsingle	101
+	wglflags	batchable
+	offset		0
+
+EndList()
+	return		void
+	dlflags		notlistable
+	category	VERSION_1_0		   # old: display-list
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxsingle	102
+	wglflags	batchable
+	offset		1
+
+CallList(list)
+	return		void
+	param		list		List in value
+	category	VERSION_1_0		   # old: display-list
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	1
+	offset		2
+
+CallLists(n, type, lists)
+	return		void
+	param		n		SizeI in value
+	param		type		ListNameType in value
+	param		lists		Void in array [COMPSIZE(n/type)]
+	category	VERSION_1_0		   # old: display-list
+	glxflags	client-handcode server-handcode
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	2
+	offset		3
+
+DeleteLists(list, range)
+	return		void
+	param		list		List in value
+	param		range		SizeI in value
+	dlflags		notlistable
+	category	VERSION_1_0		   # old: display-list
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxsingle	103
+	wglflags	batchable
+	offset		4
+
+GenLists(range)
+	return		List
+	param		range		SizeI in value
+	dlflags		notlistable
+	category	VERSION_1_0		   # old: display-list
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxsingle	104
+	offset		5
+
+ListBase(base)
+	return		void
+	param		base		List in value
+	category	VERSION_1_0		   # old: display-list
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	3
+	offset		6
+
+# drawing commands
+
+Begin(mode)
+	return		void
+	param		mode		BeginMode in value
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	4
+	offset		7
+
+Bitmap(width, height, xorig, yorig, xmove, ymove, bitmap)
+	return		void
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		xorig		CoordF in value
+	param		yorig		CoordF in value
+	param		xmove		CoordF in value
+	param		ymove		CoordF in value
+	param		bitmap		UInt8 in array [COMPSIZE(width/height)]
+	category	VERSION_1_0		   # old: drawing
+	dlflags		handcode
+	glxflags	client-handcode server-handcode
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	5
+	wglflags	client-handcode server-handcode
+	offset		8
+
+Color3b(red, green, blue)
+	return		void
+	param		red		ColorB in value
+	param		green		ColorB in value
+	param		blue		ColorB in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Color3bv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		9
+
+Color3bv(v)
+	return		void
+	param		v		ColorB in array [3]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	6
+	offset		10
+
+Color3d(red, green, blue)
+	return		void
+	param		red		ColorD in value
+	param		green		ColorD in value
+	param		blue		ColorD in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Color3dv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		11
+
+Color3dv(v)
+	return		void
+	param		v		ColorD in array [3]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	7
+	offset		12
+
+Color3f(red, green, blue)
+	return		void
+	param		red		ColorF in value
+	param		green		ColorF in value
+	param		blue		ColorF in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Color3fv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		13
+
+Color3fv(v)
+	return		void
+	param		v		ColorF in array [3]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	8
+	offset		14
+
+Color3i(red, green, blue)
+	return		void
+	param		red		ColorI in value
+	param		green		ColorI in value
+	param		blue		ColorI in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Color3iv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		15
+
+Color3iv(v)
+	return		void
+	param		v		ColorI in array [3]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	9
+	offset		16
+
+Color3s(red, green, blue)
+	return		void
+	param		red		ColorS in value
+	param		green		ColorS in value
+	param		blue		ColorS in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Color3sv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		17
+
+Color3sv(v)
+	return		void
+	param		v		ColorS in array [3]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	10
+	offset		18
+
+Color3ub(red, green, blue)
+	return		void
+	param		red		ColorUB in value
+	param		green		ColorUB in value
+	param		blue		ColorUB in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Color3ubv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		19
+
+Color3ubv(v)
+	return		void
+	param		v		ColorUB in array [3]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	11
+	offset		20
+
+Color3ui(red, green, blue)
+	return		void
+	param		red		ColorUI in value
+	param		green		ColorUI in value
+	param		blue		ColorUI in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Color3uiv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		21
+
+Color3uiv(v)
+	return		void
+	param		v		ColorUI in array [3]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	12
+	offset		22
+
+Color3us(red, green, blue)
+	return		void
+	param		red		ColorUS in value
+	param		green		ColorUS in value
+	param		blue		ColorUS in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Color3usv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		23
+
+Color3usv(v)
+	return		void
+	param		v		ColorUS in array [3]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	13
+	offset		24
+
+Color4b(red, green, blue, alpha)
+	return		void
+	param		red		ColorB in value
+	param		green		ColorB in value
+	param		blue		ColorB in value
+	param		alpha		ColorB in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Color4bv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		25
+
+Color4bv(v)
+	return		void
+	param		v		ColorB in array [4]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	14
+	offset		26
+
+Color4d(red, green, blue, alpha)
+	return		void
+	param		red		ColorD in value
+	param		green		ColorD in value
+	param		blue		ColorD in value
+	param		alpha		ColorD in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Color4dv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		27
+
+Color4dv(v)
+	return		void
+	param		v		ColorD in array [4]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	15
+	offset		28
+
+Color4f(red, green, blue, alpha)
+	return		void
+	param		red		ColorF in value
+	param		green		ColorF in value
+	param		blue		ColorF in value
+	param		alpha		ColorF in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Color4fv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		29
+
+Color4fv(v)
+	return		void
+	param		v		ColorF in array [4]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	16
+	offset		30
+
+Color4i(red, green, blue, alpha)
+	return		void
+	param		red		ColorI in value
+	param		green		ColorI in value
+	param		blue		ColorI in value
+	param		alpha		ColorI in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Color4iv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		31
+
+Color4iv(v)
+	return		void
+	param		v		ColorI in array [4]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	17
+	offset		32
+
+Color4s(red, green, blue, alpha)
+	return		void
+	param		red		ColorS in value
+	param		green		ColorS in value
+	param		blue		ColorS in value
+	param		alpha		ColorS in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Color4sv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		33
+
+Color4sv(v)
+	return		void
+	param		v		ColorS in array [4]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	18
+	offset		34
+
+Color4ub(red, green, blue, alpha)
+	return		void
+	param		red		ColorUB in value
+	param		green		ColorUB in value
+	param		blue		ColorUB in value
+	param		alpha		ColorUB in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Color4ubv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		35
+
+Color4ubv(v)
+	return		void
+	param		v		ColorUB in array [4]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	19
+	offset		36
+
+Color4ui(red, green, blue, alpha)
+	return		void
+	param		red		ColorUI in value
+	param		green		ColorUI in value
+	param		blue		ColorUI in value
+	param		alpha		ColorUI in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Color4uiv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		37
+
+Color4uiv(v)
+	return		void
+	param		v		ColorUI in array [4]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	20
+	offset		38
+
+Color4us(red, green, blue, alpha)
+	return		void
+	param		red		ColorUS in value
+	param		green		ColorUS in value
+	param		blue		ColorUS in value
+	param		alpha		ColorUS in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Color4usv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		39
+
+Color4usv(v)
+	return		void
+	param		v		ColorUS in array [4]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	21
+	offset		40
+
+EdgeFlag(flag)
+	return		void
+	param		flag		Boolean in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	EdgeFlagv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		41
+
+EdgeFlagv(flag)
+	return		void
+	param		flag		Boolean in reference
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	22
+	offset		42
+
+End()
+	return		void
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	23
+	offset		43
+
+Indexd(c)
+	return		void
+	param		c		ColorIndexValueD in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Indexdv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		44
+
+Indexdv(c)
+	return		void
+	param		c		ColorIndexValueD in array [1]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	24
+	offset		45
+
+Indexf(c)
+	return		void
+	param		c		ColorIndexValueF in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Indexfv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		46
+
+Indexfv(c)
+	return		void
+	param		c		ColorIndexValueF in array [1]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	25
+	offset		47
+
+Indexi(c)
+	return		void
+	param		c		ColorIndexValueI in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Indexiv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		48
+
+Indexiv(c)
+	return		void
+	param		c		ColorIndexValueI in array [1]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	26
+	offset		49
+
+Indexs(c)
+	return		void
+	param		c		ColorIndexValueS in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Indexsv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		50
+
+Indexsv(c)
+	return		void
+	param		c		ColorIndexValueS in array [1]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	27
+	offset		51
+
+Normal3b(nx, ny, nz)
+	return		void
+	param		nx		Int8 in value
+	param		ny		Int8 in value
+	param		nz		Int8 in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Normal3bv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		52
+
+Normal3bv(v)
+	return		void
+	param		v		Int8 in array [3]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	28
+	offset		53
+
+Normal3d(nx, ny, nz)
+	return		void
+	param		nx		CoordD in value
+	param		ny		CoordD in value
+	param		nz		CoordD in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Normal3dv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		54
+
+Normal3dv(v)
+	return		void
+	param		v		CoordD in array [3]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	29
+	offset		55
+
+Normal3f(nx, ny, nz)
+	return		void
+	param		nx		CoordF in value
+	param		ny		CoordF in value
+	param		nz		CoordF in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Normal3fv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		56
+
+Normal3fv(v)
+	return		void
+	param		v		CoordF in array [3]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	30
+	offset		57
+
+Normal3i(nx, ny, nz)
+	return		void
+	param		nx		Int32 in value
+	param		ny		Int32 in value
+	param		nz		Int32 in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Normal3iv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		58
+
+Normal3iv(v)
+	return		void
+	param		v		Int32 in array [3]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	31
+	offset		59
+
+Normal3s(nx, ny, nz)
+	return		void
+	param		nx		Int16 in value
+	param		ny		Int16 in value
+	param		nz		Int16 in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Normal3sv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		60
+
+Normal3sv(v)
+	return		void
+	param		v		Int16 in array [3]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	32
+	offset		61
+
+RasterPos2d(x, y)
+	return		void
+	param		x		CoordD in value
+	param		y		CoordD in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	RasterPos2dv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		62
+
+RasterPos2dv(v)
+	return		void
+	param		v		CoordD in array [2]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	33
+	offset		63
+
+RasterPos2f(x, y)
+	return		void
+	param		x		CoordF in value
+	param		y		CoordF in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	RasterPos2fv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		64
+
+RasterPos2fv(v)
+	return		void
+	param		v		CoordF in array [2]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	34
+	offset		65
+
+RasterPos2i(x, y)
+	return		void
+	param		x		CoordI in value
+	param		y		CoordI in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	RasterPos2iv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		66
+
+RasterPos2iv(v)
+	return		void
+	param		v		CoordI in array [2]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	35
+	offset		67
+
+RasterPos2s(x, y)
+	return		void
+	param		x		CoordS in value
+	param		y		CoordS in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	RasterPos2sv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		68
+
+RasterPos2sv(v)
+	return		void
+	param		v		CoordS in array [2]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	36
+	offset		69
+
+RasterPos3d(x, y, z)
+	return		void
+	param		x		CoordD in value
+	param		y		CoordD in value
+	param		z		CoordD in value
+	vectorequiv	RasterPos3dv
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		70
+
+RasterPos3dv(v)
+	return		void
+	param		v		CoordD in array [3]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	37
+	offset		71
+
+RasterPos3f(x, y, z)
+	return		void
+	param		x		CoordF in value
+	param		y		CoordF in value
+	param		z		CoordF in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	RasterPos3fv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		72
+
+RasterPos3fv(v)
+	return		void
+	param		v		CoordF in array [3]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	38
+	offset		73
+
+RasterPos3i(x, y, z)
+	return		void
+	param		x		CoordI in value
+	param		y		CoordI in value
+	param		z		CoordI in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	RasterPos3iv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		74
+
+RasterPos3iv(v)
+	return		void
+	param		v		CoordI in array [3]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	39
+	offset		75
+
+RasterPos3s(x, y, z)
+	return		void
+	param		x		CoordS in value
+	param		y		CoordS in value
+	param		z		CoordS in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	RasterPos3sv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		76
+
+RasterPos3sv(v)
+	return		void
+	param		v		CoordS in array [3]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	40
+	offset		77
+
+RasterPos4d(x, y, z, w)
+	return		void
+	param		x		CoordD in value
+	param		y		CoordD in value
+	param		z		CoordD in value
+	param		w		CoordD in value
+	vectorequiv	RasterPos4dv
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		78
+
+RasterPos4dv(v)
+	return		void
+	param		v		CoordD in array [4]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	41
+	offset		79
+
+RasterPos4f(x, y, z, w)
+	return		void
+	param		x		CoordF in value
+	param		y		CoordF in value
+	param		z		CoordF in value
+	param		w		CoordF in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	RasterPos4fv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		80
+
+RasterPos4fv(v)
+	return		void
+	param		v		CoordF in array [4]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	42
+	offset		81
+
+RasterPos4i(x, y, z, w)
+	return		void
+	param		x		CoordI in value
+	param		y		CoordI in value
+	param		z		CoordI in value
+	param		w		CoordI in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	RasterPos4iv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		82
+
+RasterPos4iv(v)
+	return		void
+	param		v		CoordI in array [4]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	43
+	offset		83
+
+RasterPos4s(x, y, z, w)
+	return		void
+	param		x		CoordS in value
+	param		y		CoordS in value
+	param		z		CoordS in value
+	param		w		CoordS in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	RasterPos4sv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		84
+
+RasterPos4sv(v)
+	return		void
+	param		v		CoordS in array [4]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	44
+	offset		85
+
+Rectd(x1, y1, x2, y2)
+	return		void
+	param		x1		CoordD in value
+	param		y1		CoordD in value
+	param		x2		CoordD in value
+	param		y2		CoordD in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Rectdv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		86
+
+Rectdv(v1, v2)
+	return		void
+	param		v1		CoordD in array [2]
+	param		v2		CoordD in array [2]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	45
+	offset		87
+
+Rectf(x1, y1, x2, y2)
+	return		void
+	param		x1		CoordF in value
+	param		y1		CoordF in value
+	param		x2		CoordF in value
+	param		y2		CoordF in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Rectfv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		88
+
+Rectfv(v1, v2)
+	return		void
+	param		v1		CoordF in array [2]
+	param		v2		CoordF in array [2]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	46
+	offset		89
+
+Recti(x1, y1, x2, y2)
+	return		void
+	param		x1		CoordI in value
+	param		y1		CoordI in value
+	param		x2		CoordI in value
+	param		y2		CoordI in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Rectiv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		90
+
+Rectiv(v1, v2)
+	return		void
+	param		v1		CoordI in array [2]
+	param		v2		CoordI in array [2]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	47
+	offset		91
+
+Rects(x1, y1, x2, y2)
+	return		void
+	param		x1		CoordS in value
+	param		y1		CoordS in value
+	param		x2		CoordS in value
+	param		y2		CoordS in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Rectsv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		92
+
+Rectsv(v1, v2)
+	return		void
+	param		v1		CoordS in array [2]
+	param		v2		CoordS in array [2]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	48
+	offset		93
+
+TexCoord1d(s)
+	return		void
+	param		s		CoordD in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	TexCoord1dv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		94
+
+TexCoord1dv(v)
+	return		void
+	param		v		CoordD in array [1]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	49
+	offset		95
+
+TexCoord1f(s)
+	return		void
+	param		s		CoordF in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	TexCoord1fv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		96
+
+TexCoord1fv(v)
+	return		void
+	param		v		CoordF in array [1]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	50
+	offset		97
+
+TexCoord1i(s)
+	return		void
+	param		s		CoordI in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	TexCoord1iv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		98
+
+TexCoord1iv(v)
+	return		void
+	param		v		CoordI in array [1]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	51
+	offset		99
+
+TexCoord1s(s)
+	return		void
+	param		s		CoordS in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	TexCoord1sv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		100
+
+TexCoord1sv(v)
+	return		void
+	param		v		CoordS in array [1]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	52
+	offset		101
+
+TexCoord2d(s, t)
+	return		void
+	param		s		CoordD in value
+	param		t		CoordD in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	TexCoord2dv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		102
+
+TexCoord2dv(v)
+	return		void
+	param		v		CoordD in array [2]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	53
+	offset		103
+
+TexCoord2f(s, t)
+	return		void
+	param		s		CoordF in value
+	param		t		CoordF in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	TexCoord2fv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		104
+
+TexCoord2fv(v)
+	return		void
+	param		v		CoordF in array [2]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	54
+	offset		105
+
+TexCoord2i(s, t)
+	return		void
+	param		s		CoordI in value
+	param		t		CoordI in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	TexCoord2iv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		106
+
+TexCoord2iv(v)
+	return		void
+	param		v		CoordI in array [2]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	55
+	offset		107
+
+TexCoord2s(s, t)
+	return		void
+	param		s		CoordS in value
+	param		t		CoordS in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	TexCoord2sv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		108
+
+TexCoord2sv(v)
+	return		void
+	param		v		CoordS in array [2]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	56
+	offset		109
+
+TexCoord3d(s, t, r)
+	return		void
+	param		s		CoordD in value
+	param		t		CoordD in value
+	param		r		CoordD in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	TexCoord3dv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		110
+
+TexCoord3dv(v)
+	return		void
+	param		v		CoordD in array [3]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	57
+	offset		111
+
+TexCoord3f(s, t, r)
+	return		void
+	param		s		CoordF in value
+	param		t		CoordF in value
+	param		r		CoordF in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	TexCoord3fv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		112
+
+TexCoord3fv(v)
+	return		void
+	param		v		CoordF in array [3]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	58
+	offset		113
+
+TexCoord3i(s, t, r)
+	return		void
+	param		s		CoordI in value
+	param		t		CoordI in value
+	param		r		CoordI in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	TexCoord3iv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		114
+
+TexCoord3iv(v)
+	return		void
+	param		v		CoordI in array [3]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	59
+	offset		115
+
+TexCoord3s(s, t, r)
+	return		void
+	param		s		CoordS in value
+	param		t		CoordS in value
+	param		r		CoordS in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	TexCoord3sv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		116
+
+TexCoord3sv(v)
+	return		void
+	param		v		CoordS in array [3]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	60
+	offset		117
+
+TexCoord4d(s, t, r, q)
+	return		void
+	param		s		CoordD in value
+	param		t		CoordD in value
+	param		r		CoordD in value
+	param		q		CoordD in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	TexCoord4dv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		118
+
+TexCoord4dv(v)
+	return		void
+	param		v		CoordD in array [4]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	61
+	offset		119
+
+TexCoord4f(s, t, r, q)
+	return		void
+	param		s		CoordF in value
+	param		t		CoordF in value
+	param		r		CoordF in value
+	param		q		CoordF in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	TexCoord4fv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		120
+
+TexCoord4fv(v)
+	return		void
+	param		v		CoordF in array [4]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	62
+	offset		121
+
+TexCoord4i(s, t, r, q)
+	return		void
+	param		s		CoordI in value
+	param		t		CoordI in value
+	param		r		CoordI in value
+	param		q		CoordI in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	TexCoord4iv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		122
+
+TexCoord4iv(v)
+	return		void
+	param		v		CoordI in array [4]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	63
+	offset		123
+
+TexCoord4s(s, t, r, q)
+	return		void
+	param		s		CoordS in value
+	param		t		CoordS in value
+	param		r		CoordS in value
+	param		q		CoordS in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	TexCoord4sv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		124
+
+TexCoord4sv(v)
+	return		void
+	param		v		CoordS in array [4]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	64
+	offset		125
+
+Vertex2d(x, y)
+	return		void
+	param		x		CoordD in value
+	param		y		CoordD in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Vertex2dv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		126
+
+Vertex2dv(v)
+	return		void
+	param		v		CoordD in array [2]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	65
+	offset		127
+
+Vertex2f(x, y)
+	return		void
+	param		x		CoordF in value
+	param		y		CoordF in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Vertex2fv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		128
+
+Vertex2fv(v)
+	return		void
+	param		v		CoordF in array [2]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	66
+	offset		129
+
+Vertex2i(x, y)
+	return		void
+	param		x		CoordI in value
+	param		y		CoordI in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Vertex2iv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		130
+
+Vertex2iv(v)
+	return		void
+	param		v		CoordI in array [2]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	67
+	offset		131
+
+Vertex2s(x, y)
+	return		void
+	param		x		CoordS in value
+	param		y		CoordS in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Vertex2sv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		132
+
+Vertex2sv(v)
+	return		void
+	param		v		CoordS in array [2]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	68
+	offset		133
+
+Vertex3d(x, y, z)
+	return		void
+	param		x		CoordD in value
+	param		y		CoordD in value
+	param		z		CoordD in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Vertex3dv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		134
+
+Vertex3dv(v)
+	return		void
+	param		v		CoordD in array [3]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	69
+	offset		135
+
+Vertex3f(x, y, z)
+	return		void
+	param		x		CoordF in value
+	param		y		CoordF in value
+	param		z		CoordF in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Vertex3fv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		136
+
+Vertex3fv(v)
+	return		void
+	param		v		CoordF in array [3]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	70
+	offset		137
+
+Vertex3i(x, y, z)
+	return		void
+	param		x		CoordI in value
+	param		y		CoordI in value
+	param		z		CoordI in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Vertex3iv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		138
+
+Vertex3iv(v)
+	return		void
+	param		v		CoordI in array [3]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	71
+	offset		139
+
+Vertex3s(x, y, z)
+	return		void
+	param		x		CoordS in value
+	param		y		CoordS in value
+	param		z		CoordS in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Vertex3sv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		140
+
+Vertex3sv(v)
+	return		void
+	param		v		CoordS in array [3]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	72
+	offset		141
+
+Vertex4d(x, y, z, w)
+	return		void
+	param		x		CoordD in value
+	param		y		CoordD in value
+	param		z		CoordD in value
+	param		w		CoordD in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Vertex4dv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		142
+
+Vertex4dv(v)
+	return		void
+	param		v		CoordD in array [4]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	73
+	offset		143
+
+Vertex4f(x, y, z, w)
+	return		void
+	param		x		CoordF in value
+	param		y		CoordF in value
+	param		z		CoordF in value
+	param		w		CoordF in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Vertex4fv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		144
+
+Vertex4fv(v)
+	return		void
+	param		v		CoordF in array [4]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	74
+	offset		145
+
+Vertex4i(x, y, z, w)
+	return		void
+	param		x		CoordI in value
+	param		y		CoordI in value
+	param		z		CoordI in value
+	param		w		CoordI in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Vertex4iv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		146
+
+Vertex4iv(v)
+	return		void
+	param		v		CoordI in array [4]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	75
+	offset		147
+
+Vertex4s(x, y, z, w)
+	return		void
+	param		x		CoordS in value
+	param		y		CoordS in value
+	param		z		CoordS in value
+	param		w		CoordS in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Vertex4sv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		148
+
+Vertex4sv(v)
+	return		void
+	param		v		CoordS in array [4]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	76
+	offset		149
+
+ClipPlane(plane, equation)
+	return		void
+	param		plane		ClipPlaneName in value
+	param		equation	Float64 in array [4]
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	77
+	offset		150
+
+ColorMaterial(face, mode)
+	return		void
+	param		face		MaterialFace in value
+	param		mode		ColorMaterialParameter in value
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	78
+	offset		151
+
+Fogf(pname, param)
+	return		void
+	param		pname		FogParameter in value
+	param		param		CheckedFloat32 in value
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	80
+	wglflags	small-data
+	offset		153
+
+Fogfv(pname, params)
+	return		void
+	param		pname		FogParameter in value
+	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	81
+	wglflags	small-data
+	offset		154
+
+Fogi(pname, param)
+	return		void
+	param		pname		FogParameter in value
+	param		param		CheckedInt32 in value
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	82
+	wglflags	small-data
+	offset		155
+
+Fogiv(pname, params)
+	return		void
+	param		pname		FogParameter in value
+	param		params		CheckedInt32 in array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	83
+	wglflags	small-data
+	offset		156
+
+Lightf(light, pname, param)
+	return		void
+	param		light		LightName in value
+	param		pname		LightParameter in value
+	param		param		CheckedFloat32 in value
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	86
+	wglflags	small-data
+	offset		159
+
+Lightfv(light, pname, params)
+	return		void
+	param		light		LightName in value
+	param		pname		LightParameter in value
+	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	87
+	wglflags	small-data
+	offset		160
+
+Lighti(light, pname, param)
+	return		void
+	param		light		LightName in value
+	param		pname		LightParameter in value
+	param		param		CheckedInt32 in value
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	88
+	wglflags	small-data
+	offset		161
+
+Lightiv(light, pname, params)
+	return		void
+	param		light		LightName in value
+	param		pname		LightParameter in value
+	param		params		CheckedInt32 in array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	89
+	wglflags	small-data
+	offset		162
+
+LightModelf(pname, param)
+	return		void
+	param		pname		LightModelParameter in value
+	param		param		Float32 in value
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	90
+	wglflags	small-data
+	offset		163
+
+LightModelfv(pname, params)
+	return		void
+	param		pname		LightModelParameter in value
+	param		params		Float32 in array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	91
+	wglflags	small-data
+	offset		164
+
+LightModeli(pname, param)
+	return		void
+	param		pname		LightModelParameter in value
+	param		param		Int32 in value
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	92
+	wglflags	small-data
+	offset		165
+
+LightModeliv(pname, params)
+	return		void
+	param		pname		LightModelParameter in value
+	param		params		Int32 in array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	93
+	wglflags	small-data
+	offset		166
+
+LineStipple(factor, pattern)
+	return		void
+	param		factor		CheckedInt32 in value
+	param		pattern		LineStipple in value
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	94
+	offset		167
+
+Materialf(face, pname, param)
+	return		void
+	param		face		MaterialFace in value
+	param		pname		MaterialParameter in value
+	param		param		CheckedFloat32 in value
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	96
+	wglflags	small-data
+	offset		169
+
+Materialfv(face, pname, params)
+	return		void
+	param		face		MaterialFace in value
+	param		pname		MaterialParameter in value
+	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	97
+	wglflags	small-data
+	offset		170
+
+Materiali(face, pname, param)
+	return		void
+	param		face		MaterialFace in value
+	param		pname		MaterialParameter in value
+	param		param		CheckedInt32 in value
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	98
+	wglflags	small-data
+	offset		171
+
+Materialiv(face, pname, params)
+	return		void
+	param		face		MaterialFace in value
+	param		pname		MaterialParameter in value
+	param		params		CheckedInt32 in array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	99
+	wglflags	small-data
+	offset		172
+
+PolygonStipple(mask)
+	return		void
+	param		mask		UInt8 in array [COMPSIZE()]
+	category	VERSION_1_0		   # old: drawing-control
+	dlflags		handcode
+	glxflags	client-handcode server-handcode
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	102
+	wglflags	client-handcode server-handcode
+	offset		175
+
+ShadeModel(mode)
+	return		void
+	param		mode		ShadingModel in value
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	104
+	offset		177
+
+TexEnvf(target, pname, param)
+	return		void
+	param		target		TextureEnvTarget in value
+	param		pname		TextureEnvParameter in value
+	param		param		CheckedFloat32 in value
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	111
+	wglflags	small-data
+	offset		184
+
+TexEnvfv(target, pname, params)
+	return		void
+	param		target		TextureEnvTarget in value
+	param		pname		TextureEnvParameter in value
+	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	112
+	wglflags	small-data
+	offset		185
+
+TexEnvi(target, pname, param)
+	return		void
+	param		target		TextureEnvTarget in value
+	param		pname		TextureEnvParameter in value
+	param		param		CheckedInt32 in value
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	113
+	wglflags	small-data
+	offset		186
+
+TexEnviv(target, pname, params)
+	return		void
+	param		target		TextureEnvTarget in value
+	param		pname		TextureEnvParameter in value
+	param		params		CheckedInt32 in array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	114
+	wglflags	small-data
+	offset		187
+
+TexGend(coord, pname, param)
+	return		void
+	param		coord		TextureCoordName in value
+	param		pname		TextureGenParameter in value
+	param		param		Float64 in value
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	115
+	wglflags	small-data
+	offset		188
+
+TexGendv(coord, pname, params)
+	return		void
+	param		coord		TextureCoordName in value
+	param		pname		TextureGenParameter in value
+	param		params		Float64 in array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	116
+	wglflags	small-data
+	offset		189
+
+TexGenf(coord, pname, param)
+	return		void
+	param		coord		TextureCoordName in value
+	param		pname		TextureGenParameter in value
+	param		param		CheckedFloat32 in value
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	117
+	wglflags	small-data
+	offset		190
+
+TexGenfv(coord, pname, params)
+	return		void
+	param		coord		TextureCoordName in value
+	param		pname		TextureGenParameter in value
+	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	118
+	wglflags	small-data
+	offset		191
+
+TexGeni(coord, pname, param)
+	return		void
+	param		coord		TextureCoordName in value
+	param		pname		TextureGenParameter in value
+	param		param		CheckedInt32 in value
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	119
+	wglflags	small-data
+	offset		192
+
+TexGeniv(coord, pname, params)
+	return		void
+	param		coord		TextureCoordName in value
+	param		pname		TextureGenParameter in value
+	param		params		CheckedInt32 in array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	120
+	wglflags	small-data
+	offset		193
+
+# feedback commands
+
+FeedbackBuffer(size, type, buffer)
+	return		void
+	param		size		SizeI in value
+	param		type		FeedbackType in value
+	param		buffer		FeedbackElement out array [size] retained
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode
+	category	VERSION_1_0		   # old: feedback
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxsingle	105
+	wglflags	client-handcode server-handcode batchable
+	offset		194
+
+SelectBuffer(size, buffer)
+	return		void
+	param		size		SizeI in value
+	param		buffer		SelectName out array [size] retained
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode
+	category	VERSION_1_0		   # old: feedback
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxsingle	106
+	wglflags	client-handcode server-handcode batchable
+	offset		195
+
+RenderMode(mode)
+	return		Int32
+	param		mode		RenderingMode in value
+	category	VERSION_1_0		   # old: feedback
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxsingle	107
+	wglflags	client-handcode server-handcode
+	offset		196
+
+InitNames()
+	return		void
+	category	VERSION_1_0		   # old: feedback
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	121
+	offset		197
+
+LoadName(name)
+	return		void
+	param		name		SelectName in value
+	category	VERSION_1_0		   # old: feedback
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	122
+	offset		198
+
+PassThrough(token)
+	return		void
+	param		token		FeedbackElement in value
+	category	VERSION_1_0		   # old: feedback
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	123
+	offset		199
+
+PopName()
+	return		void
+	category	VERSION_1_0		   # old: feedback
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	124
+	offset		200
+
+PushName(name)
+	return		void
+	param		name		SelectName in value
+	category	VERSION_1_0		   # old: feedback
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	125
+	offset		201
+
+ClearAccum(red, green, blue, alpha)
+	return		void
+	param		red		Float32 in value
+	param		green		Float32 in value
+	param		blue		Float32 in value
+	param		alpha		Float32 in value
+	category	VERSION_1_0		   # old: framebuf
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	128
+	offset		204
+
+ClearIndex(c)
+	return		void
+	param		c		MaskedColorIndexValueF in value
+	category	VERSION_1_0		   # old: framebuf
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	129
+	offset		205
+
+IndexMask(mask)
+	return		void
+	param		mask		MaskedColorIndexValueI in value
+	category	VERSION_1_0		   # old: framebuf
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	136
+	offset		212
+
+Accum(op, value)
+	return		void
+	param		op		AccumOp in value
+	param		value		CoordF in value
+	category	VERSION_1_0		   # old: misc
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	137
+	offset		213
+
+PopAttrib()
+	return		void
+	category	VERSION_1_0		   # old: misc
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	141
+	offset		218
+
+PushAttrib(mask)
+	return		void
+	param		mask		AttribMask in value
+	category	VERSION_1_0		   # old: misc
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	142
+	offset		219
+
+# modeling commands
+
+Map1d(target, u1, u2, stride, order, points)
+	return		void
+	param		target		MapTarget in value
+	param		u1		CoordD in value
+	param		u2		CoordD in value
+	param		stride		Int32 in value
+	param		order		CheckedInt32 in value
+	param		points		CoordD in array [COMPSIZE(target/stride/order)]
+	category	VERSION_1_0		   # old: modeling
+	dlflags		handcode
+	glxflags	client-handcode server-handcode
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	143
+	wglflags	client-handcode server-handcode
+	offset		220
+
+Map1f(target, u1, u2, stride, order, points)
+	return		void
+	param		target		MapTarget in value
+	param		u1		CoordF in value
+	param		u2		CoordF in value
+	param		stride		Int32 in value
+	param		order		CheckedInt32 in value
+	param		points		CoordF in array [COMPSIZE(target/stride/order)]
+	category	VERSION_1_0		   # old: modeling
+	dlflags		handcode
+	glxflags	client-handcode server-handcode
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	144
+	wglflags	client-handcode server-handcode
+	offset		221
+
+Map2d(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points)
+	return		void
+	param		target		MapTarget in value
+	param		u1		CoordD in value
+	param		u2		CoordD in value
+	param		ustride		Int32 in value
+	param		uorder		CheckedInt32 in value
+	param		v1		CoordD in value
+	param		v2		CoordD in value
+	param		vstride		Int32 in value
+	param		vorder		CheckedInt32 in value
+	param		points		CoordD in array [COMPSIZE(target/ustride/uorder/vstride/vorder)]
+	category	VERSION_1_0		   # old: modeling
+	dlflags		handcode
+	glxflags	client-handcode server-handcode
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	145
+	wglflags	client-handcode server-handcode
+	offset		222
+
+Map2f(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points)
+	return		void
+	param		target		MapTarget in value
+	param		u1		CoordF in value
+	param		u2		CoordF in value
+	param		ustride		Int32 in value
+	param		uorder		CheckedInt32 in value
+	param		v1		CoordF in value
+	param		v2		CoordF in value
+	param		vstride		Int32 in value
+	param		vorder		CheckedInt32 in value
+	param		points		CoordF in array [COMPSIZE(target/ustride/uorder/vstride/vorder)]
+	category	VERSION_1_0		   # old: modeling
+	dlflags		handcode
+	glxflags	client-handcode server-handcode
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	146
+	wglflags	client-handcode server-handcode
+	offset		223
+
+MapGrid1d(un, u1, u2)
+	return		void
+	param		un		Int32 in value
+	param		u1		CoordD in value
+	param		u2		CoordD in value
+	category	VERSION_1_0		   # old: modeling
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	147
+	offset		224
+
+MapGrid1f(un, u1, u2)
+	return		void
+	param		un		Int32 in value
+	param		u1		CoordF in value
+	param		u2		CoordF in value
+	category	VERSION_1_0		   # old: modeling
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	148
+	offset		225
+
+MapGrid2d(un, u1, u2, vn, v1, v2)
+	return		void
+	param		un		Int32 in value
+	param		u1		CoordD in value
+	param		u2		CoordD in value
+	param		vn		Int32 in value
+	param		v1		CoordD in value
+	param		v2		CoordD in value
+	category	VERSION_1_0		   # old: modeling
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	149
+	offset		226
+
+MapGrid2f(un, u1, u2, vn, v1, v2)
+	return		void
+	param		un		Int32 in value
+	param		u1		CoordF in value
+	param		u2		CoordF in value
+	param		vn		Int32 in value
+	param		v1		CoordF in value
+	param		v2		CoordF in value
+	category	VERSION_1_0		   # old: modeling
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	150
+	offset		227
+
+EvalCoord1d(u)
+	return		void
+	param		u		CoordD in value
+	category	VERSION_1_0		   # old: modeling
+	vectorequiv	EvalCoord1dv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		228
+
+EvalCoord1dv(u)
+	return		void
+	param		u		CoordD in array [1]
+	category	VERSION_1_0		   # old: modeling
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	151
+	offset		229
+
+EvalCoord1f(u)
+	return		void
+	param		u		CoordF in value
+	category	VERSION_1_0		   # old: modeling
+	vectorequiv	EvalCoord1fv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		230
+
+EvalCoord1fv(u)
+	return		void
+	param		u		CoordF in array [1]
+	category	VERSION_1_0		   # old: modeling
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	152
+	offset		231
+
+EvalCoord2d(u, v)
+	return		void
+	param		u		CoordD in value
+	param		v		CoordD in value
+	category	VERSION_1_0		   # old: modeling
+	vectorequiv	EvalCoord2dv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		232
+
+EvalCoord2dv(u)
+	return		void
+	param		u		CoordD in array [2]
+	category	VERSION_1_0		   # old: modeling
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	153
+	offset		233
+
+EvalCoord2f(u, v)
+	return		void
+	param		u		CoordF in value
+	param		v		CoordF in value
+	category	VERSION_1_0		   # old: modeling
+	vectorequiv	EvalCoord2fv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		234
+
+EvalCoord2fv(u)
+	return		void
+	param		u		CoordF in array [2]
+	category	VERSION_1_0		   # old: modeling
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	154
+	offset		235
+
+EvalMesh1(mode, i1, i2)
+	return		void
+	param		mode		MeshMode1 in value
+	param		i1		CheckedInt32 in value
+	param		i2		CheckedInt32 in value
+	category	VERSION_1_0		   # old: modeling
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	155
+	offset		236
+
+EvalPoint1(i)
+	return		void
+	param		i		Int32 in value
+	category	VERSION_1_0		   # old: modeling
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	156
+	offset		237
+
+EvalMesh2(mode, i1, i2, j1, j2)
+	return		void
+	param		mode		MeshMode2 in value
+	param		i1		CheckedInt32 in value
+	param		i2		CheckedInt32 in value
+	param		j1		CheckedInt32 in value
+	param		j2		CheckedInt32 in value
+	category	VERSION_1_0		   # old: modeling
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	157
+	offset		238
+
+EvalPoint2(i, j)
+	return		void
+	param		i		CheckedInt32 in value
+	param		j		CheckedInt32 in value
+	category	VERSION_1_0		   # old: modeling
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	158
+	offset		239
+
+AlphaFunc(func, ref)
+	return		void
+	param		func		AlphaFunction in value
+	param		ref		Float32 in value
+	category	VERSION_1_0		   # old: pixel-op
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	159
+	offset		240
+
+PixelZoom(xfactor, yfactor)
+	return		void
+	param		xfactor		Float32 in value
+	param		yfactor		Float32 in value
+	category	VERSION_1_0		   # old: pixel-rw
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	165
+	offset		246
+
+PixelTransferf(pname, param)
+	return		void
+	param		pname		PixelTransferParameter in value
+	param		param		CheckedFloat32 in value
+	category	VERSION_1_0		   # old: pixel-rw
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	166
+	offset		247
+
+PixelTransferi(pname, param)
+	return		void
+	param		pname		PixelTransferParameter in value
+	param		param		CheckedInt32 in value
+	category	VERSION_1_0		   # old: pixel-rw
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	167
+	offset		248
+
+PixelMapfv(map, mapsize, values)
+	return		void
+	param		map		PixelMap in value
+	param		mapsize		CheckedInt32 in value
+	param		values		Float32 in array [mapsize]
+	category	VERSION_1_0		   # old: pixel-rw
+	glxflags	client-handcode
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	168
+	offset		251
+
+PixelMapuiv(map, mapsize, values)
+	return		void
+	param		map		PixelMap in value
+	param		mapsize		CheckedInt32 in value
+	param		values		UInt32 in array [mapsize]
+	category	VERSION_1_0		   # old: pixel-rw
+	glxflags	client-handcode
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	169
+	offset		252
+
+PixelMapusv(map, mapsize, values)
+	return		void
+	param		map		PixelMap in value
+	param		mapsize		CheckedInt32 in value
+	param		values		UInt16 in array [mapsize]
+	category	VERSION_1_0		   # old: pixel-rw
+	glxflags	client-handcode
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	170
+	offset		253
+
+CopyPixels(x, y, width, height, type)
+	return		void
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		type		PixelCopyType in value
+	category	VERSION_1_0		   # old: pixel-rw
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	172
+	offset		255
+
+DrawPixels(width, height, format, type, pixels)
+	return		void
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void in array [COMPSIZE(format/type/width/height)]
+	category	VERSION_1_0		   # old: pixel-rw
+	dlflags		handcode
+	glxflags	client-handcode server-handcode
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	173
+	wglflags	client-handcode server-handcode
+	offset		257
+
+GetClipPlane(plane, equation)
+	return		void
+	param		plane		ClipPlaneName in value
+	param		equation	Float64 out array [4]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxsingle	113
+	glxflags	client-handcode server-handcode
+	offset		259
+
+GetLightfv(light, pname, params)
+	return		void
+	param		light		LightName in value
+	param		pname		LightParameter in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxsingle	118
+	wglflags	small-data
+	offset		264
+
+GetLightiv(light, pname, params)
+	return		void
+	param		light		LightName in value
+	param		pname		LightParameter in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxsingle	119
+	wglflags	small-data
+	offset		265
+
+GetMapdv(target, query, v)
+	return		void
+	param		target		MapTarget in value
+	param		query		GetMapQuery in value
+	param		v		Float64 out array [COMPSIZE(target/query)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxsingle	120
+	offset		266
+
+GetMapfv(target, query, v)
+	return		void
+	param		target		MapTarget in value
+	param		query		GetMapQuery in value
+	param		v		Float32 out array [COMPSIZE(target/query)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxsingle	121
+	offset		267
+
+GetMapiv(target, query, v)
+	return		void
+	param		target		MapTarget in value
+	param		query		GetMapQuery in value
+	param		v		Int32 out array [COMPSIZE(target/query)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxsingle	122
+	offset		268
+
+GetMaterialfv(face, pname, params)
+	return		void
+	param		face		MaterialFace in value
+	param		pname		MaterialParameter in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxsingle	123
+	wglflags	small-data
+	offset		269
+
+GetMaterialiv(face, pname, params)
+	return		void
+	param		face		MaterialFace in value
+	param		pname		MaterialParameter in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxsingle	124
+	wglflags	small-data
+	offset		270
+
+GetPixelMapfv(map, values)
+	return		void
+	param		map		PixelMap in value
+	param		values		Float32 out array [COMPSIZE(map)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxsingle	125
+	offset		271
+
+GetPixelMapuiv(map, values)
+	return		void
+	param		map		PixelMap in value
+	param		values		UInt32 out array [COMPSIZE(map)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxsingle	126
+	offset		272
+
+GetPixelMapusv(map, values)
+	return		void
+	param		map		PixelMap in value
+	param		values		UInt16 out array [COMPSIZE(map)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxsingle	127
+	offset		273
+
+GetPolygonStipple(mask)
+	return		void
+	param		mask		UInt8 out array [COMPSIZE()]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxsingle	128
+	wglflags	client-handcode server-handcode
+	offset		274
+
+GetTexEnvfv(target, pname, params)
+	return		void
+	param		target		TextureEnvTarget in value
+	param		pname		TextureEnvParameter in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxsingle	130
+	wglflags	small-data
+	offset		276
+
+GetTexEnviv(target, pname, params)
+	return		void
+	param		target		TextureEnvTarget in value
+	param		pname		TextureEnvParameter in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxsingle	131
+	wglflags	small-data
+	offset		277
+
+GetTexGendv(coord, pname, params)
+	return		void
+	param		coord		TextureCoordName in value
+	param		pname		TextureGenParameter in value
+	param		params		Float64 out array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxsingle	132
+	wglflags	small-data
+	offset		278
+
+GetTexGenfv(coord, pname, params)
+	return		void
+	param		coord		TextureCoordName in value
+	param		pname		TextureGenParameter in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxsingle	133
+	wglflags	small-data
+	offset		279
+
+GetTexGeniv(coord, pname, params)
+	return		void
+	param		coord		TextureCoordName in value
+	param		pname		TextureGenParameter in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxsingle	134
+	wglflags	small-data
+	offset		280
+
+IsList(list)
+	return		Boolean
+	param		list		List in value
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxsingle	141
+	offset		287
+
+Frustum(left, right, bottom, top, zNear, zFar)
+	return		void
+	param		left		Float64 in value
+	param		right		Float64 in value
+	param		bottom		Float64 in value
+	param		top		Float64 in value
+	param		zNear		Float64 in value
+	param		zFar		Float64 in value
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	175
+	offset		289
+
+LoadIdentity()
+	return		void
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	176
+	offset		290
+
+LoadMatrixf(m)
+	return		void
+	param		m		Float32 in array [16]
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	177
+	offset		291
+
+LoadMatrixd(m)
+	return		void
+	param		m		Float64 in array [16]
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	178
+	offset		292
+
+MatrixMode(mode)
+	return		void
+	param		mode		MatrixMode in value
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	179
+	offset		293
+
+MultMatrixf(m)
+	return		void
+	param		m		Float32 in array [16]
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	180
+	offset		294
+
+MultMatrixd(m)
+	return		void
+	param		m		Float64 in array [16]
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	181
+	offset		295
+
+Ortho(left, right, bottom, top, zNear, zFar)
+	return		void
+	param		left		Float64 in value
+	param		right		Float64 in value
+	param		bottom		Float64 in value
+	param		top		Float64 in value
+	param		zNear		Float64 in value
+	param		zFar		Float64 in value
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	182
+	offset		296
+
+PopMatrix()
+	return		void
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	183
+	offset		297
+
+PushMatrix()
+	return		void
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	184
+	offset		298
+
+Rotated(angle, x, y, z)
+	return		void
+	param		angle		Float64 in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	param		z		Float64 in value
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	185
+	offset		299
+
+Rotatef(angle, x, y, z)
+	return		void
+	param		angle		Float32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	186
+	offset		300
+
+Scaled(x, y, z)
+	return		void
+	param		x		Float64 in value
+	param		y		Float64 in value
+	param		z		Float64 in value
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	187
+	offset		301
+
+Scalef(x, y, z)
+	return		void
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	188
+	offset		302
+
+Translated(x, y, z)
+	return		void
+	param		x		Float64 in value
+	param		y		Float64 in value
+	param		z		Float64 in value
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	189
+	offset		303
+
+Translatef(x, y, z)
+	return		void
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	190
+	offset		304
+
+###############################################################################
+###############################################################################
+#
+# OpenGL 1.1 commands
+#
+###############################################################################
+###############################################################################
+
+DrawArrays(mode, first, count)
+	return		void
+	param		mode		BeginMode in value
+	param		first		Int32 in value
+	param		count		SizeI in value
+	category	VERSION_1_1
+	dlflags		handcode
+	glxflags	client-handcode client-intercept server-handcode
+	version		1.1
+	glxropcode	193
+	offset		310
+
+DrawElements(mode, count, type, indices)
+	return		void
+	param		mode		BeginMode in value
+	param		count		SizeI in value
+	param		type		DrawElementsType in value
+	param		indices		Void in array [COMPSIZE(count/type)]
+	category	VERSION_1_1
+	dlflags		handcode
+	glxflags	client-handcode client-intercept server-handcode
+	version		1.1
+	offset		311
+
+GetPointerv(pname, params)
+	return		void
+	param		pname		GetPointervPName in value
+	param		params		VoidPointer out reference
+	category	VERSION_1_1
+	dlflags		notlistable
+	glxflags	client-handcode client-intercept server-handcode
+	version		1.1
+	offset		329
+
+PolygonOffset(factor, units)
+	return		void
+	param		factor		Float32 in value
+	param		units		Float32 in value
+	category	VERSION_1_1
+	version		1.1
+	glxropcode	192
+	offset		319
+
+# Arguably TexelInternalFormat, not PixelInternalFormat
+CopyTexImage1D(target, level, internalformat, x, y, width, border)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	PixelInternalFormat in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	param		border		CheckedInt32 in value
+	category	VERSION_1_1
+	version		1.1
+	glxropcode	4119
+	glxflags	EXT
+	offset		323
+
+# Arguably TexelInternalFormat, not PixelInternalFormat
+CopyTexImage2D(target, level, internalformat, x, y, width, height, border)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	PixelInternalFormat in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		border		CheckedInt32 in value
+	category	VERSION_1_1
+	version		1.1
+	glxropcode	4120
+	glxflags	EXT
+	offset		324
+
+CopyTexSubImage1D(target, level, xoffset, x, y, width)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	category	VERSION_1_1
+	version		1.1
+	glxropcode	4121
+	glxflags	EXT
+	offset		325
+
+CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		yoffset		CheckedInt32 in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	category	VERSION_1_1
+	version		1.1
+	glxropcode	4122
+	glxflags	EXT
+	offset		326
+
+TexSubImage1D(target, level, xoffset, width, format, type, pixels)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		width		SizeI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void in array [COMPSIZE(format/type/width)]
+	category	VERSION_1_1
+	dlflags		handcode
+	glxflags	EXT client-handcode server-handcode
+	version		1.1
+	glxropcode	4099
+	offset		332
+
+TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		yoffset		CheckedInt32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void in array [COMPSIZE(format/type/width/height)]
+	category	VERSION_1_1
+	dlflags		handcode
+	glxflags	EXT client-handcode server-handcode
+	version		1.1
+	glxropcode	4100
+	offset		333
+
+BindTexture(target, texture)
+	return		void
+	param		target		TextureTarget in value
+	param		texture		Texture in value
+	category	VERSION_1_1
+	version		1.1
+	glxropcode	4117
+	glxflags	EXT
+	offset		307
+
+DeleteTextures(n, textures)
+	return		void
+	param		n		SizeI in value
+	param		textures	Texture in array [n]
+	category	VERSION_1_1
+	dlflags		notlistable
+	version		1.1
+	glxsingle	144
+	offset		327
+
+GenTextures(n, textures)
+	return		void
+	param		n		SizeI in value
+	param		textures	Texture out array [n]
+	category	VERSION_1_1
+	dlflags		notlistable
+	version		1.1
+	glxsingle	145
+	offset		328
+
+IsTexture(texture)
+	return		Boolean
+	param		texture		Texture in value
+	category	VERSION_1_1
+	dlflags		notlistable
+	version		1.1
+	glxsingle	146
+	offset		330
+
+###############################################################################
+###############################################################################
+#
+# OpenGL 1.1 deprecated commands
+#
+###############################################################################
+###############################################################################
+
+ArrayElement(i)
+	return		void
+	param		i		Int32 in value
+	category	VERSION_1_1
+	profile		compatibility
+	dlflags		handcode
+	glxflags	client-handcode client-intercept server-handcode
+	version		1.1
+	deprecated	3.1
+	offset		306
+
+ColorPointer(size, type, stride, pointer)
+	return		void
+	param		size		Int32 in value
+	param		type		ColorPointerType in value
+	param		stride		SizeI in value
+	param		pointer		Void in array [COMPSIZE(size/type/stride)] retained
+	category	VERSION_1_1
+	profile		compatibility
+	dlflags		notlistable
+	glxflags	client-handcode client-intercept server-handcode
+	version		1.1
+	deprecated	3.1
+	offset		308
+
+DisableClientState(array)
+	return		void
+	param		array		EnableCap in value
+	category	VERSION_1_1
+	profile		compatibility
+	version		1.1
+	deprecated	3.1
+	dlflags		notlistable
+	glxflags	client-handcode client-intercept server-handcode
+	offset		309
+
+EdgeFlagPointer(stride, pointer)
+	return		void
+	param		stride		SizeI in value
+	param		pointer		Void in array [COMPSIZE(stride)] retained
+	category	VERSION_1_1
+	profile		compatibility
+	dlflags		notlistable
+	glxflags	client-handcode client-intercept server-handcode
+	version		1.1
+	deprecated	3.1
+	offset		312
+
+EnableClientState(array)
+	return		void
+	param		array		EnableCap in value
+	category	VERSION_1_1
+	profile		compatibility
+	dlflags		notlistable
+	glxflags	client-handcode client-intercept server-handcode
+	version		1.1
+	deprecated	3.1
+	offset		313
+
+IndexPointer(type, stride, pointer)
+	return		void
+	param		type		IndexPointerType in value
+	param		stride		SizeI in value
+	param		pointer		Void in array [COMPSIZE(type/stride)] retained
+	category	VERSION_1_1
+	profile		compatibility
+	dlflags		notlistable
+	glxflags	client-handcode client-intercept server-handcode
+	version		1.1
+	deprecated	3.1
+	offset		314
+
+InterleavedArrays(format, stride, pointer)
+	return		void
+	param		format		InterleavedArrayFormat in value
+	param		stride		SizeI in value
+	param		pointer		Void in array [COMPSIZE(format/stride)] retained
+	category	VERSION_1_1
+	profile		compatibility
+	dlflags		notlistable
+	glxflags	client-handcode client-intercept server-handcode
+	version		1.1
+	deprecated	3.1
+	offset		317
+
+NormalPointer(type, stride, pointer)
+	return		void
+	param		type		NormalPointerType in value
+	param		stride		SizeI in value
+	param		pointer		Void in array [COMPSIZE(type/stride)] retained
+	category	VERSION_1_1
+	profile		compatibility
+	dlflags		notlistable
+	glxflags	client-handcode client-intercept server-handcode
+	version		1.1
+	deprecated	3.1
+	offset		318
+
+TexCoordPointer(size, type, stride, pointer)
+	return		void
+	param		size		Int32 in value
+	param		type		TexCoordPointerType in value
+	param		stride		SizeI in value
+	param		pointer		Void in array [COMPSIZE(size/type/stride)] retained
+	category	VERSION_1_1
+	profile		compatibility
+	dlflags		notlistable
+	glxflags	client-handcode client-intercept server-handcode
+	version		1.1
+	deprecated	3.1
+	offset		320
+
+VertexPointer(size, type, stride, pointer)
+	return		void
+	param		size		Int32 in value
+	param		type		VertexPointerType in value
+	param		stride		SizeI in value
+	param		pointer		Void in array [COMPSIZE(size/type/stride)] retained
+	category	VERSION_1_1
+	profile		compatibility
+	dlflags		notlistable
+	glxflags	client-handcode client-intercept server-handcode
+	version		1.1
+	deprecated	3.1
+	offset		321
+
+AreTexturesResident(n, textures, residences)
+	return		Boolean
+	param		n		SizeI in value
+	param		textures	Texture in array [n]
+	param		residences	Boolean out array [n]
+	category	VERSION_1_1
+	profile		compatibility
+	glxsingle	143
+	dlflags		notlistable
+	version		1.1
+	deprecated	3.1
+	offset		322
+
+PrioritizeTextures(n, textures, priorities)
+	return		void
+	param		n		SizeI in value
+	param		textures	Texture in array [n]
+	param		priorities	Float32 in array [n]
+	category	VERSION_1_1
+	profile		compatibility
+	version		1.1
+	deprecated	3.1
+	glxropcode	4118
+	glxflags	EXT
+	offset		331
+
+Indexub(c)
+	return		void
+	param		c		ColorIndexValueUB in value
+	category	VERSION_1_1
+	profile		compatibility
+	vectorequiv	Indexubv
+	version		1.1
+	offset		315
+
+Indexubv(c)
+	return		void
+	param		c		ColorIndexValueUB in array [1]
+	category	VERSION_1_1
+	profile		compatibility
+	version		1.1
+	glxropcode	194
+	offset		316
+
+PopClientAttrib()
+	return		void
+	category	VERSION_1_1
+	profile		compatibility
+	version		1.1
+	deprecated	3.1
+	dlflags		notlistable
+	glxflags	client-handcode client-intercept server-handcode
+	offset		334
+
+PushClientAttrib(mask)
+	return		void
+	param		mask		ClientAttribMask in value
+	category	VERSION_1_1
+	profile		compatibility
+	version		1.1
+	deprecated	3.1
+	dlflags		notlistable
+	glxflags	client-handcode client-intercept server-handcode
+	offset		335
+
+###############################################################################
+###############################################################################
+#
+# OpenGL 1.2 commands
+#
+###############################################################################
+###############################################################################
+
+BlendColor(red, green, blue, alpha)
+	return		void
+	param		red		ColorF in value
+	param		green		ColorF in value
+	param		blue		ColorF in value
+	param		alpha		ColorF in value
+	category	VERSION_1_2
+	glxflags	EXT
+	version		1.2
+	glxropcode	4096
+	offset		336
+
+BlendEquation(mode)
+	return		void
+	param		mode		BlendEquationMode in value
+	category	VERSION_1_2
+	glxflags	EXT
+	version		1.2
+	glxropcode	4097
+	offset		337
+
+DrawRangeElements(mode, start, end, count, type, indices)
+	return		void
+	param		mode		BeginMode in value
+	param		start		UInt32 in value
+	param		end		UInt32 in value
+	param		count		SizeI in value
+	param		type		DrawElementsType in value
+	param		indices		Void in array [COMPSIZE(count/type)]
+	category	VERSION_1_2
+	dlflags		handcode
+	glxflags	client-handcode client-intercept server-handcode
+	version		1.2
+	offset		338
+
+# OpenGL 1.2 (EXT_texture3D) commands
+
+# Arguably TexelInternalFormat, not PixelInternalFormat
+TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	TextureComponentCount in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		border		CheckedInt32 in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void in array [COMPSIZE(format/type/width/height/depth)]
+	category	VERSION_1_2
+	dlflags		handcode
+	glxflags	client-handcode server-handcode EXT
+	version		1.2
+	deprecated	3.1
+	glxropcode	4114
+	offset		371
+
+TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		yoffset		CheckedInt32 in value
+	param		zoffset		CheckedInt32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void in array [COMPSIZE(format/type/width/height/depth)]
+	category	VERSION_1_2
+	dlflags		handcode
+	glxflags	client-handcode server-handcode EXT
+	version		1.2
+	glxropcode	4115
+	offset		372
+
+# OpenGL 1.2 (EXT_copy_texture) commands (specific to texture3D)
+
+CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		yoffset		CheckedInt32 in value
+	param		zoffset		CheckedInt32 in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	category	VERSION_1_2
+	glxflags	EXT
+	version		1.2
+	glxropcode	4123
+	offset		373
+
+###############################################################################
+###############################################################################
+#
+# OpenGL 1.2 deprecated commands
+#
+###############################################################################
+###############################################################################
+
+# OpenGL 1.2 (SGI_color_table) commands
+
+ColorTable(target, internalformat, width, format, type, table)
+	return		void
+	param		target		ColorTableTarget in value
+	param		internalformat	PixelInternalFormat in value
+	param		width		SizeI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		table		Void in array [COMPSIZE(format/type/width)]
+	category	VERSION_1_2
+	profile		compatibility
+	dlflags		handcode
+	glxflags	client-handcode server-handcode EXT
+	version		1.2
+	deprecated	3.1
+	glxropcode	2053
+	offset		339
+
+ColorTableParameterfv(target, pname, params)
+	return		void
+	param		target		ColorTableTarget in value
+	param		pname		ColorTableParameterPName in value
+	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
+	category	VERSION_1_2
+	profile		compatibility
+	glxflags	EXT
+	version		1.2
+	deprecated	3.1
+	glxropcode	2054
+	offset		340
+
+ColorTableParameteriv(target, pname, params)
+	return		void
+	param		target		ColorTableTarget in value
+	param		pname		ColorTableParameterPName in value
+	param		params		CheckedInt32 in array [COMPSIZE(pname)]
+	category	VERSION_1_2
+	profile		compatibility
+	glxflags	EXT
+	version		1.2
+	deprecated	3.1
+	glxropcode	2055
+	offset		341
+
+CopyColorTable(target, internalformat, x, y, width)
+	return		void
+	param		target		ColorTableTarget in value
+	param		internalformat	PixelInternalFormat in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	category	VERSION_1_2
+	profile		compatibility
+	glxflags	EXT
+	version		1.2
+	deprecated	3.1
+	glxropcode	2056
+	offset		342
+
+GetColorTable(target, format, type, table)
+	return		void
+	param		target		ColorTableTarget in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		table		Void out array [COMPSIZE(target/format/type)]
+	category	VERSION_1_2
+	profile		compatibility
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode
+	version		1.2
+	deprecated	3.1
+	glxsingle	147
+	offset		343
+
+GetColorTableParameterfv(target, pname, params)
+	return		void
+	param		target		ColorTableTarget in value
+	param		pname		GetColorTableParameterPName in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	VERSION_1_2
+	profile		compatibility
+	dlflags		notlistable
+	version		1.2
+	deprecated	3.1
+	glxsingle	148
+	offset		344
+
+GetColorTableParameteriv(target, pname, params)
+	return		void
+	param		target		ColorTableTarget in value
+	param		pname		GetColorTableParameterPName in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	VERSION_1_2
+	profile		compatibility
+	dlflags		notlistable
+	version		1.2
+	deprecated	3.1
+	glxsingle	149
+	offset		345
+
+# OpenGL 1.2 (EXT_color_subtable) commands
+
+ColorSubTable(target, start, count, format, type, data)
+	return		void
+	param		target		ColorTableTarget in value
+	param		start		SizeI in value
+	param		count		SizeI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		data		Void in array [COMPSIZE(format/type/count)]
+	category	VERSION_1_2
+	profile		compatibility
+	dlflags		handcode
+	glxflags	client-handcode server-handcode
+	version		1.2
+	deprecated	3.1
+	glxropcode	195
+	offset		346
+
+CopyColorSubTable(target, start, x, y, width)
+	return		void
+	param		target		ColorTableTarget in value
+	param		start		SizeI in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	category	VERSION_1_2
+	profile		compatibility
+	version		1.2
+	deprecated	3.1
+	glxropcode	196
+	offset		347
+
+# OpenGL 1.2 (EXT_convolution) commands
+
+ConvolutionFilter1D(target, internalformat, width, format, type, image)
+	return		void
+	param		target		ConvolutionTarget in value
+	param		internalformat	PixelInternalFormat in value
+	param		width		SizeI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		image		Void in array [COMPSIZE(format/type/width)]
+	category	VERSION_1_2
+	profile		compatibility
+	dlflags		handcode
+	glxflags	client-handcode server-handcode EXT
+	version		1.2
+	deprecated	3.1
+	glxropcode	4101
+	offset		348
+
+ConvolutionFilter2D(target, internalformat, width, height, format, type, image)
+	return		void
+	param		target		ConvolutionTarget in value
+	param		internalformat	PixelInternalFormat in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		image		Void in array [COMPSIZE(format/type/width/height)]
+	category	VERSION_1_2
+	profile		compatibility
+	dlflags		handcode
+	glxflags	client-handcode server-handcode EXT
+	version		1.2
+	deprecated	3.1
+	glxropcode	4102
+	offset		349
+
+ConvolutionParameterf(target, pname, params)
+	return		void
+	param		target		ConvolutionTarget in value
+	param		pname		ConvolutionParameter in value
+	param		params		CheckedFloat32 in value
+	category	VERSION_1_2
+	profile		compatibility
+	glxflags	EXT
+	version		1.2
+	deprecated	3.1
+	glxropcode	4103
+	offset		350
+
+ConvolutionParameterfv(target, pname, params)
+	return		void
+	param		target		ConvolutionTarget in value
+	param		pname		ConvolutionParameter in value
+	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
+	category	VERSION_1_2
+	profile		compatibility
+	glxflags	EXT
+	version		1.2
+	deprecated	3.1
+	glxropcode	4104
+	offset		351
+
+ConvolutionParameteri(target, pname, params)
+	return		void
+	param		target		ConvolutionTarget in value
+	param		pname		ConvolutionParameter in value
+	param		params		CheckedInt32 in value
+	category	VERSION_1_2
+	profile		compatibility
+	glxflags	EXT
+	version		1.2
+	deprecated	3.1
+	glxropcode	4105
+	offset		352
+
+ConvolutionParameteriv(target, pname, params)
+	return		void
+	param		target		ConvolutionTarget in value
+	param		pname		ConvolutionParameter in value
+	param		params		CheckedInt32 in array [COMPSIZE(pname)]
+	category	VERSION_1_2
+	profile		compatibility
+	glxflags	EXT
+	version		1.2
+	deprecated	3.1
+	glxropcode	4106
+	offset		353
+
+CopyConvolutionFilter1D(target, internalformat, x, y, width)
+	return		void
+	param		target		ConvolutionTarget in value
+	param		internalformat	PixelInternalFormat in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	category	VERSION_1_2
+	profile		compatibility
+	glxflags	EXT
+	version		1.2
+	deprecated	3.1
+	glxropcode	4107
+	offset		354
+
+CopyConvolutionFilter2D(target, internalformat, x, y, width, height)
+	return		void
+	param		target		ConvolutionTarget in value
+	param		internalformat	PixelInternalFormat in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	category	VERSION_1_2
+	profile		compatibility
+	glxflags	EXT
+	version		1.2
+	deprecated	3.1
+	glxropcode	4108
+	offset		355
+
+GetConvolutionFilter(target, format, type, image)
+	return		void
+	param		target		ConvolutionTarget in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		image		Void out array [COMPSIZE(target/format/type)]
+	category	VERSION_1_2
+	profile		compatibility
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode
+	version		1.2
+	deprecated	3.1
+	glxsingle	150
+	offset		356
+
+GetConvolutionParameterfv(target, pname, params)
+	return		void
+	param		target		ConvolutionTarget in value
+	param		pname		GetConvolutionParameterPName in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	VERSION_1_2
+	profile		compatibility
+	dlflags		notlistable
+	version		1.2
+	deprecated	3.1
+	glxsingle	151
+	offset		357
+
+GetConvolutionParameteriv(target, pname, params)
+	return		void
+	param		target		ConvolutionTarget in value
+	param		pname		GetConvolutionParameterPName in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	VERSION_1_2
+	profile		compatibility
+	dlflags		notlistable
+	version		1.2
+	deprecated	3.1
+	glxsingle	152
+	offset		358
+
+GetSeparableFilter(target, format, type, row, column, span)
+	return		void
+	param		target		SeparableTarget in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		row		Void out array [COMPSIZE(target/format/type)]
+	param		column		Void out array [COMPSIZE(target/format/type)]
+	param		span		Void out array [COMPSIZE(target/format/type)]
+	category	VERSION_1_2
+	profile		compatibility
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode
+	version		1.2
+	deprecated	3.1
+	glxsingle	153
+	offset		359
+
+SeparableFilter2D(target, internalformat, width, height, format, type, row, column)
+	return		void
+	param		target		SeparableTarget in value
+	param		internalformat	PixelInternalFormat in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		row		Void in array [COMPSIZE(target/format/type/width)]
+	param		column		Void in array [COMPSIZE(target/format/type/height)]
+	category	VERSION_1_2
+	profile		compatibility
+	dlflags		handcode
+	glxflags	client-handcode server-handcode EXT
+	version		1.2
+	deprecated	3.1
+	glxropcode	4109
+	offset		360
+
+# OpenGL 1.2 (EXT_histogram) commands
+
+GetHistogram(target, reset, format, type, values)
+	return		void
+	param		target		HistogramTarget in value
+	param		reset		Boolean in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		values		Void out array [COMPSIZE(target/format/type)]
+	category	VERSION_1_2
+	profile		compatibility
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode
+	version		1.2
+	deprecated	3.1
+	glxsingle	154
+	offset		361
+
+GetHistogramParameterfv(target, pname, params)
+	return		void
+	param		target		HistogramTarget in value
+	param		pname		GetHistogramParameterPName in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	VERSION_1_2
+	profile		compatibility
+	dlflags		notlistable
+	version		1.2
+	deprecated	3.1
+	glxsingle	155
+	offset		362
+
+GetHistogramParameteriv(target, pname, params)
+	return		void
+	param		target		HistogramTarget in value
+	param		pname		GetHistogramParameterPName in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	VERSION_1_2
+	profile		compatibility
+	dlflags		notlistable
+	version		1.2
+	deprecated	3.1
+	glxsingle	156
+	offset		363
+
+GetMinmax(target, reset, format, type, values)
+	return		void
+	param		target		MinmaxTarget in value
+	param		reset		Boolean in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		values		Void out array [COMPSIZE(target/format/type)]
+	category	VERSION_1_2
+	profile		compatibility
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode
+	version		1.2
+	deprecated	3.1
+	glxsingle	157
+	offset		364
+
+GetMinmaxParameterfv(target, pname, params)
+	return		void
+	param		target		MinmaxTarget in value
+	param		pname		GetMinmaxParameterPName in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	VERSION_1_2
+	profile		compatibility
+	dlflags		notlistable
+	version		1.2
+	deprecated	3.1
+	glxsingle	158
+	offset		365
+
+GetMinmaxParameteriv(target, pname, params)
+	return		void
+	param		target		MinmaxTarget in value
+	param		pname		GetMinmaxParameterPName in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	VERSION_1_2
+	profile		compatibility
+	dlflags		notlistable
+	version		1.2
+	deprecated	3.1
+	glxsingle	159
+	offset		366
+
+Histogram(target, width, internalformat, sink)
+	return		void
+	param		target		HistogramTarget in value
+	param		width		SizeI in value
+	param		internalformat	PixelInternalFormat in value
+	param		sink		Boolean in value
+	category	VERSION_1_2
+	profile		compatibility
+	dlflags		handcode
+	glxflags	EXT
+	version		1.2
+	deprecated	3.1
+	glxropcode	4110
+	offset		367
+
+Minmax(target, internalformat, sink)
+	return		void
+	param		target		MinmaxTarget in value
+	param		internalformat	PixelInternalFormat in value
+	param		sink		Boolean in value
+	category	VERSION_1_2
+	profile		compatibility
+	glxflags	EXT
+	version		1.2
+	deprecated	3.1
+	glxropcode	4111
+	offset		368
+
+ResetHistogram(target)
+	return		void
+	param		target		HistogramTarget in value
+	category	VERSION_1_2
+	profile		compatibility
+	glxflags	EXT
+	version		1.2
+	deprecated	3.1
+	glxropcode	4112
+	offset		369
+
+ResetMinmax(target)
+	return		void
+	param		target		MinmaxTarget in value
+	category	VERSION_1_2
+	profile		compatibility
+	glxflags	EXT
+	version		1.2
+	deprecated	3.1
+	glxropcode	4113
+	offset		370
+
+###############################################################################
+###############################################################################
+#
+# OpenGL 1.3 commands
+#
+###############################################################################
+###############################################################################
+
+# OpenGL 1.3 (ARB_multitexture) commands
+
+ActiveTexture(texture)
+	return		void
+	param		texture		TextureUnit in value
+	category	VERSION_1_3
+	glxflags	ARB
+	version		1.3
+	glxropcode	197
+	offset		374
+
+# OpenGL 1.3 (ARB_multisample) commands
+
+SampleCoverage(value, invert)
+	return		void
+	param		value		Float32 in value
+	param		invert		Boolean in value
+	category	VERSION_1_3
+	glxflags	ARB
+	version		1.3
+	glxropcode	229
+	offset		412
+
+# OpenGL 1.3 (ARB_texture_compression) commands
+
+# Arguably TexelInternalFormat, not PixelInternalFormat
+CompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	PixelInternalFormat in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		border		CheckedInt32 in value
+	param		imageSize	SizeI in value
+	param		data		CompressedTextureARB in array [imageSize]
+	category	VERSION_1_3
+	dlflags		handcode
+	glxflags	ARB client-handcode server-handcode
+	version		1.3
+	glxropcode	216
+	wglflags	client-handcode server-handcode
+	offset		554
+
+# Arguably TexelInternalFormat, not PixelInternalFormat
+CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	PixelInternalFormat in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		border		CheckedInt32 in value
+	param		imageSize	SizeI in value
+	param		data		CompressedTextureARB in array [imageSize]
+	category	VERSION_1_3
+	dlflags		handcode
+	glxflags	ARB client-handcode server-handcode
+	version		1.3
+	glxropcode	215
+	wglflags	client-handcode server-handcode
+	offset		555
+
+# Arguably TexelInternalFormat, not PixelInternalFormat
+CompressedTexImage1D(target, level, internalformat, width, border, imageSize, data)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	PixelInternalFormat in value
+	param		width		SizeI in value
+	param		border		CheckedInt32 in value
+	param		imageSize	SizeI in value
+	param		data		CompressedTextureARB in array [imageSize]
+	category	VERSION_1_3
+	dlflags		handcode
+	glxflags	ARB client-handcode server-handcode
+	version		1.3
+	glxropcode	214
+	wglflags	client-handcode server-handcode
+	offset		556
+
+CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		yoffset		CheckedInt32 in value
+	param		zoffset		CheckedInt32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		format		PixelFormat in value
+	param		imageSize	SizeI in value
+	param		data		CompressedTextureARB in array [imageSize]
+	category	VERSION_1_3
+	dlflags		handcode
+	glxflags	ARB client-handcode server-handcode
+	version		1.3
+	glxropcode	219
+	wglflags	client-handcode server-handcode
+	offset		557
+
+CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		yoffset		CheckedInt32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		format		PixelFormat in value
+	param		imageSize	SizeI in value
+	param		data		CompressedTextureARB in array [imageSize]
+	category	VERSION_1_3
+	dlflags		handcode
+	glxflags	ARB client-handcode server-handcode
+	version		1.3
+	glxropcode	218
+	wglflags	client-handcode server-handcode
+	offset		558
+
+CompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		width		SizeI in value
+	param		format		PixelFormat in value
+	param		imageSize	SizeI in value
+	param		data		CompressedTextureARB in array [imageSize]
+	category	VERSION_1_3
+	dlflags		handcode
+	glxflags	ARB client-handcode server-handcode
+	version		1.3
+	glxropcode	217
+	wglflags	client-handcode server-handcode
+	offset		559
+
+GetCompressedTexImage(target, level, img)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		img		CompressedTextureARB out array [COMPSIZE(target/level)]
+	category	VERSION_1_3
+	dlflags		notlistable
+	glxflags	ARB client-handcode server-handcode
+	version		1.3
+	glxsingle	160
+	wglflags	client-handcode server-handcode
+	offset		560
+
+###############################################################################
+###############################################################################
+#
+# OpenGL 1.3 deprecated commands
+#
+###############################################################################
+###############################################################################
+
+ClientActiveTexture(texture)
+	return		void
+	param		texture		TextureUnit in value
+	category	VERSION_1_3
+	profile		compatibility
+	dlflags		notlistable
+	glxflags	ARB client-handcode client-intercept server-handcode
+	version		1.3
+	deprecated	3.1
+	offset		375
+
+MultiTexCoord1d(target, s)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordD in value
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	vectorequiv	MultiTexCoord1dv
+	offset		376
+
+MultiTexCoord1dv(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordD in array [1]
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	glxropcode	198
+	offset		377
+
+MultiTexCoord1f(target, s)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordF in value
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	vectorequiv	MultiTexCoord1fv
+	offset		378
+
+MultiTexCoord1fv(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordF in array [1]
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	glxropcode	199
+	offset		379
+
+MultiTexCoord1i(target, s)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordI in value
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	vectorequiv	MultiTexCoord1iv
+	offset		380
+
+MultiTexCoord1iv(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordI in array [1]
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	glxropcode	200
+	offset		381
+
+MultiTexCoord1s(target, s)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordS in value
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	vectorequiv	MultiTexCoord1sv
+	offset		382
+
+MultiTexCoord1sv(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordS in array [1]
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	glxropcode	201
+	offset		383
+
+MultiTexCoord2d(target, s, t)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordD in value
+	param		t		CoordD in value
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	vectorequiv	MultiTexCoord2dv
+	offset		384
+
+MultiTexCoord2dv(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordD in array [2]
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	glxropcode	202
+	offset		385
+
+MultiTexCoord2f(target, s, t)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordF in value
+	param		t		CoordF in value
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	vectorequiv	MultiTexCoord2fv
+	offset		386
+
+MultiTexCoord2fv(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordF in array [2]
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	glxropcode	203
+	offset		387
+
+MultiTexCoord2i(target, s, t)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordI in value
+	param		t		CoordI in value
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	vectorequiv	MultiTexCoord2iv
+	offset		388
+
+MultiTexCoord2iv(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordI in array [2]
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	glxropcode	204
+	offset		389
+
+MultiTexCoord2s(target, s, t)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordS in value
+	param		t		CoordS in value
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	vectorequiv	MultiTexCoord2sv
+	offset		390
+
+MultiTexCoord2sv(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordS in array [2]
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	glxropcode	205
+	offset		391
+
+MultiTexCoord3d(target, s, t, r)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordD in value
+	param		t		CoordD in value
+	param		r		CoordD in value
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	vectorequiv	MultiTexCoord3dv
+	offset		392
+
+MultiTexCoord3dv(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordD in array [3]
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	glxropcode	206
+	offset		393
+
+MultiTexCoord3f(target, s, t, r)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordF in value
+	param		t		CoordF in value
+	param		r		CoordF in value
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	vectorequiv	MultiTexCoord3fv
+	offset		394
+
+MultiTexCoord3fv(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordF in array [3]
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	glxropcode	207
+	offset		395
+
+MultiTexCoord3i(target, s, t, r)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordI in value
+	param		t		CoordI in value
+	param		r		CoordI in value
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	vectorequiv	MultiTexCoord3iv
+	offset		396
+
+MultiTexCoord3iv(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordI in array [3]
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	glxropcode	208
+	offset		397
+
+MultiTexCoord3s(target, s, t, r)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordS in value
+	param		t		CoordS in value
+	param		r		CoordS in value
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	vectorequiv	MultiTexCoord3sv
+	offset		398
+
+MultiTexCoord3sv(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordS in array [3]
+	category	VERSION_1_3
+	profile		compatibility
+	version		1.3
+	deprecated	3.1
+	glxflags	ARB
+	glxropcode	209
+	offset		399
+
+MultiTexCoord4d(target, s, t, r, q)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordD in value
+	param		t		CoordD in value
+	param		r		CoordD in value
+	param		q		CoordD in value
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	vectorequiv	MultiTexCoord4dv
+	offset		400
+
+MultiTexCoord4dv(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordD in array [4]
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	glxropcode	210
+	offset		401
+
+MultiTexCoord4f(target, s, t, r, q)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordF in value
+	param		t		CoordF in value
+	param		r		CoordF in value
+	param		q		CoordF in value
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	vectorequiv	MultiTexCoord4fv
+	offset		402
+
+MultiTexCoord4fv(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordF in array [4]
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	glxropcode	211
+	offset		403
+
+MultiTexCoord4i(target, s, t, r, q)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordI in value
+	param		t		CoordI in value
+	param		r		CoordI in value
+	param		q		CoordI in value
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	vectorequiv	MultiTexCoord4iv
+	offset		404
+
+MultiTexCoord4iv(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordI in array [4]
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	glxropcode	212
+	offset		405
+
+MultiTexCoord4s(target, s, t, r, q)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordS in value
+	param		t		CoordS in value
+	param		r		CoordS in value
+	param		q		CoordS in value
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	vectorequiv	MultiTexCoord4sv
+	offset		406
+
+MultiTexCoord4sv(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordS in array [4]
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	glxropcode	213
+	offset		407
+
+# OpenGL 1.3 (ARB_transpose_matrix) commands
+
+LoadTransposeMatrixf(m)
+	return		void
+	param		m		Float32 in array [16]
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB client-handcode client-intercept server-handcode
+	version		1.3
+	deprecated	3.1
+	offset		408
+
+LoadTransposeMatrixd(m)
+	return		void
+	param		m		Float64 in array [16]
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB client-handcode client-intercept server-handcode
+	version		1.3
+	deprecated	3.1
+	offset		409
+
+MultTransposeMatrixf(m)
+	return		void
+	param		m		Float32 in array [16]
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB client-handcode client-intercept server-handcode
+	version		1.3
+	deprecated	3.1
+	offset		410
+
+MultTransposeMatrixd(m)
+	return		void
+	param		m		Float64 in array [16]
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB client-handcode client-intercept server-handcode
+	version		1.3
+	deprecated	3.1
+	offset		411
+
+###############################################################################
+###############################################################################
+#
+# OpenGL 1.4 commands
+#
+###############################################################################
+###############################################################################
+
+# OpenGL 1.4 (EXT_blend_func_separate) commands
+
+BlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha)
+	return		void
+	param		sfactorRGB	BlendFuncSeparateParameterEXT in value
+	param		dfactorRGB	BlendFuncSeparateParameterEXT in value
+	param		sfactorAlpha	BlendFuncSeparateParameterEXT in value
+	param		dfactorAlpha	BlendFuncSeparateParameterEXT in value
+	category	VERSION_1_4
+	glxropcode	4134
+	version		1.4
+	extension
+	offset		537
+
+# OpenGL 1.4 (EXT_multi_draw_arrays) commands
+
+# first and count are really 'in'
+MultiDrawArrays(mode, first, count, drawcount)
+	return		void
+	param		mode		BeginMode in value
+	param		first		Int32 in array [COMPSIZE(count)]
+	param		count		SizeI in array [COMPSIZE(drawcount)]
+	param		drawcount	SizeI in value
+	category	VERSION_1_4
+	version		1.4
+	glxropcode	?
+	offset		644
+
+MultiDrawElements(mode, count, type, indices, drawcount)
+	return		void
+	param		mode		BeginMode in value
+	param		count		SizeI in array [COMPSIZE(drawcount)]
+	param		type		DrawElementsType in value
+	param		indices		ConstVoidPointer in array [COMPSIZE(drawcount)]
+	param		drawcount	SizeI in value
+	category	VERSION_1_4
+	version		1.4
+	glxropcode	?
+	offset		645
+
+# OpenGL 1.4 (ARB_point_parameters, NV_point_sprite) commands
+
+PointParameterf(pname, param)
+	return		void
+	param		pname		PointParameterNameARB in value
+	param		param		CheckedFloat32 in value
+	category	VERSION_1_4
+	version		1.4
+	glxropcode	2065
+	extension
+	offset		458
+
+PointParameterfv(pname, params)
+	return		void
+	param		pname		PointParameterNameARB in value
+	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
+	category	VERSION_1_4
+	version		1.4
+	glxropcode	2066
+	extension
+	offset		459
+
+PointParameteri(pname, param)
+	return		void
+	param		pname		PointParameterNameARB in value
+	param		param		Int32 in value
+	category	VERSION_1_4
+	version		1.4
+	extension	soft WINSOFT NV20
+	glxropcode	4221
+	offset		642
+
+PointParameteriv(pname, params)
+	return		void
+	param		pname		PointParameterNameARB in value
+	param		params		Int32 in array [COMPSIZE(pname)]
+	category	VERSION_1_4
+	version		1.4
+	extension	soft WINSOFT NV20
+	glxropcode	4222re
+	offset		643
+
+###############################################################################
+###############################################################################
+#
+# OpenGL 1.4 deprecated commands
+#
+###############################################################################
+###############################################################################
+
+# OpenGL 1.4 (EXT_fog_coord) commands
+
+FogCoordf(coord)
+	return		void
+	param		coord		CoordF in value
+	category	VERSION_1_4
+	profile		compatibility
+	vectorequiv	FogCoordfv
+	version		1.4
+	deprecated	3.1
+	offset		545
+
+FogCoordfv(coord)
+	return		void
+	param		coord		CoordF in array [1]
+	category	VERSION_1_4
+	profile		compatibility
+	version		1.4
+	deprecated	3.1
+	glxropcode	4124
+	offset		546
+
+FogCoordd(coord)
+	return		void
+	param		coord		CoordD in value
+	category	VERSION_1_4
+	profile		compatibility
+	vectorequiv	FogCoorddv
+	version		1.4
+	deprecated	3.1
+	offset		547
+
+FogCoorddv(coord)
+	return		void
+	param		coord		CoordD in array [1]
+	category	VERSION_1_4
+	profile		compatibility
+	version		1.4
+	deprecated	3.1
+	glxropcode	4125
+	offset		548
+
+FogCoordPointer(type, stride, pointer)
+	return		void
+	param		type		FogPointerTypeEXT in value
+	param		stride		SizeI in value
+	param		pointer		Void in array [COMPSIZE(type/stride)] retained
+	category	VERSION_1_4
+	profile		compatibility
+	dlflags		notlistable
+	version		1.4
+	deprecated	3.1
+	glxflags	client-handcode server-handcode
+	offset		549
+
+# OpenGL 1.4 (EXT_secondary_color) commands
+
+SecondaryColor3b(red, green, blue)
+	return		void
+	param		red		ColorB in value
+	param		green		ColorB in value
+	param		blue		ColorB in value
+	category	VERSION_1_4
+	profile		compatibility
+	vectorequiv	SecondaryColor3bv
+	version		1.4
+	deprecated	3.1
+	offset		561
+
+SecondaryColor3bv(v)
+	return		void
+	param		v		ColorB in array [3]
+	category	VERSION_1_4
+	profile		compatibility
+	version		1.4
+	deprecated	3.1
+	glxropcode	4126
+	offset		562
+
+SecondaryColor3d(red, green, blue)
+	return		void
+	param		red		ColorD in value
+	param		green		ColorD in value
+	param		blue		ColorD in value
+	category	VERSION_1_4
+	profile		compatibility
+	vectorequiv	SecondaryColor3dv
+	version		1.4
+	deprecated	3.1
+	offset		563
+
+SecondaryColor3dv(v)
+	return		void
+	param		v		ColorD in array [3]
+	category	VERSION_1_4
+	profile		compatibility
+	version		1.4
+	deprecated	3.1
+	glxropcode	4130
+	offset		564
+
+SecondaryColor3f(red, green, blue)
+	return		void
+	param		red		ColorF in value
+	param		green		ColorF in value
+	param		blue		ColorF in value
+	category	VERSION_1_4
+	profile		compatibility
+	vectorequiv	SecondaryColor3fv
+	version		1.4
+	deprecated	3.1
+	offset		565
+
+SecondaryColor3fv(v)
+	return		void
+	param		v		ColorF in array [3]
+	category	VERSION_1_4
+	profile		compatibility
+	version		1.4
+	deprecated	3.1
+	glxropcode	4129
+	offset		566
+
+SecondaryColor3i(red, green, blue)
+	return		void
+	param		red		ColorI in value
+	param		green		ColorI in value
+	param		blue		ColorI in value
+	category	VERSION_1_4
+	profile		compatibility
+	vectorequiv	SecondaryColor3iv
+	version		1.4
+	deprecated	3.1
+	offset		567
+
+SecondaryColor3iv(v)
+	return		void
+	param		v		ColorI in array [3]
+	category	VERSION_1_4
+	profile		compatibility
+	version		1.4
+	deprecated	3.1
+	glxropcode	4128
+	offset		568
+
+SecondaryColor3s(red, green, blue)
+	return		void
+	param		red		ColorS in value
+	param		green		ColorS in value
+	param		blue		ColorS in value
+	category	VERSION_1_4
+	profile		compatibility
+	vectorequiv	SecondaryColor3sv
+	version		1.4
+	deprecated	3.1
+	offset		569
+
+SecondaryColor3sv(v)
+	return		void
+	param		v		ColorS in array [3]
+	category	VERSION_1_4
+	profile		compatibility
+	version		1.4
+	deprecated	3.1
+	glxropcode	4127
+	offset		570
+
+SecondaryColor3ub(red, green, blue)
+	return		void
+	param		red		ColorUB in value
+	param		green		ColorUB in value
+	param		blue		ColorUB in value
+	category	VERSION_1_4
+	profile		compatibility
+	vectorequiv	SecondaryColor3ubv
+	version		1.4
+	deprecated	3.1
+	offset		571
+
+SecondaryColor3ubv(v)
+	return		void
+	param		v		ColorUB in array [3]
+	category	VERSION_1_4
+	profile		compatibility
+	version		1.4
+	deprecated	3.1
+	glxropcode	4131
+	offset		572
+
+SecondaryColor3ui(red, green, blue)
+	return		void
+	param		red		ColorUI in value
+	param		green		ColorUI in value
+	param		blue		ColorUI in value
+	category	VERSION_1_4
+	profile		compatibility
+	vectorequiv	SecondaryColor3uiv
+	version		1.4
+	deprecated	3.1
+	offset		573
+
+SecondaryColor3uiv(v)
+	return		void
+	param		v		ColorUI in array [3]
+	category	VERSION_1_4
+	profile		compatibility
+	version		1.4
+	deprecated	3.1
+	glxropcode	4133
+	offset		574
+
+SecondaryColor3us(red, green, blue)
+	return		void
+	param		red		ColorUS in value
+	param		green		ColorUS in value
+	param		blue		ColorUS in value
+	category	VERSION_1_4
+	profile		compatibility
+	vectorequiv	SecondaryColor3usv
+	version		1.4
+	deprecated	3.1
+	offset		575
+
+SecondaryColor3usv(v)
+	return		void
+	param		v		ColorUS in array [3]
+	category	VERSION_1_4
+	profile		compatibility
+	version		1.4
+	deprecated	3.1
+	glxropcode	4132
+	offset		576
+
+SecondaryColorPointer(size, type, stride, pointer)
+	return		void
+	param		size		Int32 in value
+	param		type		ColorPointerType in value
+	param		stride		SizeI in value
+	param		pointer		Void in array [COMPSIZE(size/type/stride)] retained
+	category	VERSION_1_4
+	profile		compatibility
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode
+	version		1.4
+	deprecated	3.1
+	extension
+	offset		577
+
+# OpenGL 1.4 (ARB_window_pos) commands
+# Note: all WindowPos* entry points use glxropcode ropcode 230, with 3 float parameters
+
+WindowPos2d(x, y)
+	return		void
+	param		x		CoordD in value
+	param		y		CoordD in value
+	category	VERSION_1_4
+	profile		compatibility
+	vectorequiv	WindowPos2dv
+	version		1.4
+	deprecated	3.1
+	offset		513
+
+WindowPos2dv(v)
+	return		void
+	param		v		CoordD in array [2]
+	category	VERSION_1_4
+	profile		compatibility
+	version		1.4
+	deprecated	3.1
+	glxropcode	230
+	glxflags	client-handcode server-handcode
+	offset		514
+
+WindowPos2f(x, y)
+	return		void
+	param		x		CoordF in value
+	param		y		CoordF in value
+	category	VERSION_1_4
+	profile		compatibility
+	vectorequiv	WindowPos2fv
+	version		1.4
+	deprecated	3.1
+	offset		515
+
+WindowPos2fv(v)
+	return		void
+	param		v		CoordF in array [2]
+	category	VERSION_1_4
+	profile		compatibility
+	version		1.4
+	deprecated	3.1
+	glxropcode	230
+	glxflags	client-handcode server-handcode
+	offset		516
+
+WindowPos2i(x, y)
+	return		void
+	param		x		CoordI in value
+	param		y		CoordI in value
+	category	VERSION_1_4
+	profile		compatibility
+	vectorequiv	WindowPos2iv
+	version		1.4
+	deprecated	3.1
+	offset		517
+
+WindowPos2iv(v)
+	return		void
+	param		v		CoordI in array [2]
+	category	VERSION_1_4
+	profile		compatibility
+	version		1.4
+	deprecated	3.1
+	glxropcode	230
+	glxflags	client-handcode server-handcode
+	offset		518
+
+WindowPos2s(x, y)
+	return		void
+	param		x		CoordS in value
+	param		y		CoordS in value
+	category	VERSION_1_4
+	profile		compatibility
+	vectorequiv	WindowPos2sv
+	version		1.4
+	deprecated	3.1
+	offset		519
+
+WindowPos2sv(v)
+	return		void
+	param		v		CoordS in array [2]
+	category	VERSION_1_4
+	profile		compatibility
+	version		1.4
+	deprecated	3.1
+	glxropcode	230
+	glxflags	client-handcode server-handcode
+	offset		520
+
+WindowPos3d(x, y, z)
+	return		void
+	param		x		CoordD in value
+	param		y		CoordD in value
+	param		z		CoordD in value
+	vectorequiv	WindowPos3dv
+	category	VERSION_1_4
+	profile		compatibility
+	version		1.4
+	deprecated	3.1
+	offset		521
+
+WindowPos3dv(v)
+	return		void
+	param		v		CoordD in array [3]
+	category	VERSION_1_4
+	profile		compatibility
+	version		1.4
+	deprecated	3.1
+	glxropcode	230
+	glxflags	client-handcode server-handcode
+	offset		522
+
+WindowPos3f(x, y, z)
+	return		void
+	param		x		CoordF in value
+	param		y		CoordF in value
+	param		z		CoordF in value
+	category	VERSION_1_4
+	profile		compatibility
+	vectorequiv	WindowPos3fv
+	version		1.4
+	deprecated	3.1
+	offset		523
+
+WindowPos3fv(v)
+	return		void
+	param		v		CoordF in array [3]
+	category	VERSION_1_4
+	profile		compatibility
+	version		1.4
+	deprecated	3.1
+	glxropcode	230
+	glxflags	client-handcode server-handcode
+	offset		524
+
+WindowPos3i(x, y, z)
+	return		void
+	param		x		CoordI in value
+	param		y		CoordI in value
+	param		z		CoordI in value
+	category	VERSION_1_4
+	profile		compatibility
+	vectorequiv	WindowPos3iv
+	version		1.4
+	deprecated	3.1
+	offset		525
+
+WindowPos3iv(v)
+	return		void
+	param		v		CoordI in array [3]
+	category	VERSION_1_4
+	profile		compatibility
+	version		1.4
+	deprecated	3.1
+	glxropcode	230
+	glxflags	client-handcode server-handcode
+	offset		526
+
+WindowPos3s(x, y, z)
+	return		void
+	param		x		CoordS in value
+	param		y		CoordS in value
+	param		z		CoordS in value
+	category	VERSION_1_4
+	profile		compatibility
+	vectorequiv	WindowPos3sv
+	version		1.4
+	deprecated	3.1
+	offset		527
+
+WindowPos3sv(v)
+	return		void
+	param		v		CoordS in array [3]
+	category	VERSION_1_4
+	profile		compatibility
+	version		1.4
+	deprecated	3.1
+	glxropcode	230
+	glxflags	client-handcode server-handcode
+	offset		528
+
+###############################################################################
+###############################################################################
+#
+# OpenGL 1.5 commands
+#
+###############################################################################
+###############################################################################
+
+# OpenGL 1.5 (ARB_occlusion_query) commands
+
+GenQueries(n, ids)
+	return		void
+	param		n		SizeI in value
+	param		ids		UInt32 out array [n]
+	category	VERSION_1_5
+	version		1.5
+	extension
+	glxsingle	162
+	glxflags	ignore
+	offset		700
+
+DeleteQueries(n, ids)
+	return		void
+	param		n		SizeI in value
+	param		ids		UInt32 in array [n]
+	category	VERSION_1_5
+	version		1.5
+	extension
+	glxsingle	161
+	glxflags	ignore
+	offset		701
+
+IsQuery(id)
+	return		Boolean
+	param		id		UInt32 in value
+	category	VERSION_1_5
+	version		1.5
+	extension
+	glxsingle	163
+	glxflags	ignore
+	offset		702
+
+BeginQuery(target, id)
+	return		void
+	param		target		GLenum in value
+	param		id		UInt32 in value
+	category	VERSION_1_5
+	version		1.5
+	extension
+	glxropcode	231
+	glxflags	ignore
+	offset		703
+
+EndQuery(target)
+	return		void
+	param		target		GLenum in value
+	category	VERSION_1_5
+	version		1.5
+	extension
+	glxropcode	232
+	glxflags	ignore
+	offset		704
+
+GetQueryiv(target, pname, params)
+	return		void
+	param		target		GLenum in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [pname]
+	category	VERSION_1_5
+	dlflags		notlistable
+	version		1.5
+	extension
+	glxsingle	164
+	glxflags	ignore
+	offset		705
+
+GetQueryObjectiv(id, pname, params)
+	return		void
+	param		id		UInt32 in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [pname]
+	category	VERSION_1_5
+	dlflags		notlistable
+	version		1.5
+	extension
+	glxsingle	165
+	glxflags	ignore
+	offset		706
+
+GetQueryObjectuiv(id, pname, params)
+	return		void
+	param		id		UInt32 in value
+	param		pname		GLenum in value
+	param		params		UInt32 out array [pname]
+	category	VERSION_1_5
+	dlflags		notlistable
+	version		1.5
+	extension
+	glxsingle	166
+	glxflags	ignore
+	offset		707
+
+# OpenGL 1.5 (ARB_vertex_buffer_object) commands
+
+BindBuffer(target, buffer)
+	return		void
+	param		target		BufferTargetARB in value
+	param		buffer		UInt32 in value
+	category	VERSION_1_5
+	version		1.5
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		688
+
+DeleteBuffers(n, buffers)
+	return		void
+	param		n		SizeI in value
+	param		buffers		ConstUInt32 in array [n]
+	category	VERSION_1_5
+	version		1.5
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		691
+
+GenBuffers(n, buffers)
+	return		void
+	param		n		SizeI in value
+	param		buffers		UInt32 out array [n]
+	category	VERSION_1_5
+	version		1.5
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		692
+
+IsBuffer(buffer)
+	return		Boolean
+	param		buffer		UInt32 in value
+	category	VERSION_1_5
+	version		1.5
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		696
+
+BufferData(target, size, data, usage)
+	return		void
+	param		target		BufferTargetARB in value
+	param		size		BufferSize in value
+	param		data		ConstVoid in array [size]
+	param		usage		BufferUsageARB in value
+	category	VERSION_1_5
+	version		1.5
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		689
+
+BufferSubData(target, offset, size, data)
+	return		void
+	param		target		BufferTargetARB in value
+	param		offset		BufferOffset in value
+	param		size		BufferSize in value
+	param		data		ConstVoid in array [size]
+	category	VERSION_1_5
+	version		1.5
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		690
+
+GetBufferSubData(target, offset, size, data)
+	return		void
+	param		target		BufferTargetARB in value
+	param		offset		BufferOffset in value
+	param		size		BufferSize in value
+	param		data		Void out array [size]
+	category	VERSION_1_5
+	dlflags		notlistable
+	version		1.5
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		695
+
+MapBuffer(target, access)
+	return		VoidPointer
+	param		target		BufferTargetARB in value
+	param		access		BufferAccessARB in value
+	category	VERSION_1_5
+	version		1.5
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		697
+
+UnmapBuffer(target)
+	return		Boolean
+	param		target		BufferTargetARB in value
+	category	VERSION_1_5
+	version		1.5
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		698
+
+GetBufferParameteriv(target, pname, params)
+	return		void
+	param		target		BufferTargetARB in value
+	param		pname		BufferPNameARB in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	VERSION_1_5
+	dlflags		notlistable
+	version		1.5
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		693
+
+GetBufferPointerv(target, pname, params)
+	return		void
+	param		target		BufferTargetARB in value
+	param		pname		BufferPointerNameARB in value
+	param		params		VoidPointer out array [1]
+	category	VERSION_1_5
+	dlflags		notlistable
+	version		1.5
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		694
+
+# OpenGL 1.5 (EXT_shadow_funcs) commands - none
+
+
+###############################################################################
+###############################################################################
+#
+# OpenGL 2.0 commands
+#
+###############################################################################
+###############################################################################
+
+# OpenGL 2.0 (EXT_blend_equation_separate) commands
+
+BlendEquationSeparate(modeRGB, modeAlpha)
+	return		void
+	param		modeRGB		BlendEquationModeEXT in value
+	param		modeAlpha	BlendEquationModeEXT in value
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	4228
+
+# OpenGL 2.0 (ARB_draw_buffers) commands
+
+DrawBuffers(n, bufs)
+	return		void
+	param		n		SizeI in value
+	param		bufs		DrawBufferModeATI in array [n]
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	233
+	glxflags	ignore
+	offset		?
+
+# OpenGL 2.0 (ARB_stencil_two_side) commands
+
+StencilOpSeparate(face, sfail, dpfail, dppass)
+	return		void
+	param		face		StencilFaceDirection in value
+	param		sfail		StencilOp in value
+	param		dpfail		StencilOp in value
+	param		dppass		StencilOp in value
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+StencilFuncSeparate(face, func, ref, mask)
+	return		void
+	param		face		StencilFaceDirection in value
+	param		func		StencilFunction in value
+	param		ref		StencilValue in value
+	param		mask		MaskedStencilValue in value
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+StencilMaskSeparate(face, mask)
+	return		void
+	param		face		StencilFaceDirection in value
+	param		mask		MaskedStencilValue in value
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+# OpenGL 2.0 (ARB_shader_objects / ARB_vertex_shader / ARB_fragment_shader) commands
+
+AttachShader(program, shader)
+	return		void
+	param		program		UInt32 in value
+	param		shader		UInt32 in value
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+BindAttribLocation(program, index, name)
+	return		void
+	param		program		UInt32 in value
+	param		index		UInt32 in value
+	param		name		Char in array []
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+CompileShader(shader)
+	return		void
+	param		shader		UInt32 in value
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+CreateProgram()
+	return		UInt32
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+CreateShader(type)
+	return		UInt32
+	param		type		GLenum in value
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DeleteProgram(program)
+	return		void
+	param		program		UInt32 in value
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxsingle	202
+	offset		?
+
+DeleteShader(shader)
+	return		void
+	param		shader		UInt32 in value
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxsingle	195
+	offset		?
+
+DetachShader(program, shader)
+	return		void
+	param		program		UInt32 in value
+	param		shader		UInt32 in value
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DisableVertexAttribArray(index)
+	return		void
+	param		index		UInt32 in value
+	dlflags		notlistable
+	category	VERSION_2_0
+	version		2.0
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		666
+
+EnableVertexAttribArray(index)
+	return		void
+	param		index		UInt32 in value
+	dlflags		notlistable
+	category	VERSION_2_0
+	version		2.0
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		665
+
+GetActiveAttrib(program, index, bufSize, length, size, type, name)
+	return		void
+	param		program		UInt32 in value
+	param		index		UInt32 in value
+	param		bufSize		SizeI in value
+	param		length		SizeI out array [1]
+	param		size		Int32 out array [1]
+	param		type		GLenum out array [1]
+	param		name		Char out array []
+	category	VERSION_2_0
+	dlflags		notlistable
+	version		2.0
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetActiveUniform(program, index, bufSize, length, size, type, name)
+	return		void
+	param		program		UInt32 in value
+	param		index		UInt32 in value
+	param		bufSize		SizeI in value
+	param		length		SizeI out array [1]
+	param		size		Int32 out array [1]
+	param		type		GLenum out array [1]
+	param		name		Char out array []
+	category	VERSION_2_0
+	dlflags		notlistable
+	version		2.0
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetAttachedShaders(program, maxCount, count, obj)
+	return		void
+	param		program		UInt32 in value
+	param		maxCount	SizeI in value
+	param		count		SizeI out array [1]
+	param		obj		UInt32 out array [count]
+	category	VERSION_2_0
+	dlflags		notlistable
+	version		2.0
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetAttribLocation(program, name)
+	return		Int32
+	param		program		UInt32 in value
+	param		name		Char in array []
+	category	VERSION_2_0
+	dlflags		notlistable
+	version		2.0
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetProgramiv(program, pname, params)
+	return		void
+	param		program		UInt32 in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [pname]
+	category	VERSION_2_0
+	dlflags		notlistable
+	version		2.0
+	extension
+	glxsingle	199
+	offset		?
+
+GetProgramInfoLog(program, bufSize, length, infoLog)
+	return		void
+	param		program		UInt32 in value
+	param		bufSize		SizeI in value
+	param		length		SizeI out array [1]
+	param		infoLog		Char out array [length]
+	category	VERSION_2_0
+	dlflags		notlistable
+	version		2.0
+	extension
+	glxsingle	201
+	offset		?
+
+GetShaderiv(shader, pname, params)
+	return		void
+	param		shader		UInt32 in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [pname]
+	category	VERSION_2_0
+	dlflags		notlistable
+	version		2.0
+	extension
+	glxsingle	198
+	offset		?
+
+GetShaderInfoLog(shader, bufSize, length, infoLog)
+	return		void
+	param		shader		UInt32 in value
+	param		bufSize		SizeI in value
+	param		length		SizeI out array [1]
+	param		infoLog		Char out array [length]
+	category	VERSION_2_0
+	dlflags		notlistable
+	version		2.0
+	extension
+	glxsingle	200
+	offset		?
+
+GetShaderSource(shader, bufSize, length, source)
+	return		void
+	param		shader		UInt32 in value
+	param		bufSize		SizeI in value
+	param		length		SizeI out array [1]
+	param		source		Char out array [length]
+	category	VERSION_2_0
+	dlflags		notlistable
+	version		2.0
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetUniformLocation(program, name)
+	return		Int32
+	param		program		UInt32 in value
+	param		name		Char in array []
+	category	VERSION_2_0
+	dlflags		notlistable
+	version		2.0
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetUniformfv(program, location, params)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		params		Float32 out array [COMPSIZE(location)]
+	category	VERSION_2_0
+	dlflags		notlistable
+	version		2.0
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetUniformiv(program, location, params)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		params		Int32 out array [COMPSIZE(location)]
+	category	VERSION_2_0
+	dlflags		notlistable
+	version		2.0
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetVertexAttribdv(index, pname, params)
+	return		void
+	param		index		UInt32 in value
+	param		pname		VertexAttribPropertyARB in value
+	param		params		Float64 out array [4]
+	dlflags		notlistable
+	category	VERSION_2_0
+	version		2.0
+	extension	soft WINSOFT NV10
+	glxvendorpriv	1301
+	offset		588
+
+GetVertexAttribfv(index, pname, params)
+	return		void
+	param		index		UInt32 in value
+	param		pname		VertexAttribPropertyARB in value
+	param		params		Float32 out array [4]
+	dlflags		notlistable
+	category	VERSION_2_0
+	version		2.0
+	extension	soft WINSOFT NV10
+	glxvendorpriv	1302
+	offset		589
+
+GetVertexAttribiv(index, pname, params)
+	return		void
+	param		index		UInt32 in value
+	param		pname		VertexAttribPropertyARB in value
+	param		params		Int32 out array [4]
+	dlflags		notlistable
+	category	VERSION_2_0
+	version		2.0
+	extension	soft WINSOFT NV10
+	glxvendorpriv	1303
+	offset		590
+
+GetVertexAttribPointerv(index, pname, pointer)
+	return		void
+	param		index		UInt32 in value
+	param		pname		VertexAttribPointerPropertyARB in value
+	param		pointer		VoidPointer out array [1]
+	dlflags		notlistable
+	category	VERSION_2_0
+	version		2.0
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		591
+
+IsProgram(program)
+	return		Boolean
+	param		program		UInt32 in value
+	dlflags		notlistable
+	category	VERSION_2_0
+	version		2.0
+	extension	soft WINSOFT NV10
+	glxsingle	197
+	offset		592
+
+IsShader(shader)
+	return		Boolean
+	param		shader		UInt32 in value
+	dlflags		notlistable
+	category	VERSION_2_0
+	version		2.0
+	extension	soft WINSOFT NV10
+	glxsingle	196
+	offset		?
+
+LinkProgram(program)
+	return		void
+	param		program		UInt32 in value
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ShaderSource(shader, count, string, length)
+	return		void
+	param		shader		UInt32 in value
+	param		count		SizeI in value
+	param		string		ConstCharPointer in array [count]
+	param		length		Int32 in array [1]
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+UseProgram(program)
+	return		void
+	param		program		UInt32 in value
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform1f(location, v0)
+	return		void
+	param		location	Int32 in value
+	param		v0		Float32 in value
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform2f(location, v0, v1)
+	return		void
+	param		location	Int32 in value
+	param		v0		Float32 in value
+	param		v1		Float32 in value
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform3f(location, v0, v1, v2)
+	return		void
+	param		location	Int32 in value
+	param		v0		Float32 in value
+	param		v1		Float32 in value
+	param		v2		Float32 in value
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform4f(location, v0, v1, v2, v3)
+	return		void
+	param		location	Int32 in value
+	param		v0		Float32 in value
+	param		v1		Float32 in value
+	param		v2		Float32 in value
+	param		v3		Float32 in value
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform1i(location, v0)
+	return		void
+	param		location	Int32 in value
+	param		v0		Int32 in value
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform2i(location, v0, v1)
+	return		void
+	param		location	Int32 in value
+	param		v0		Int32 in value
+	param		v1		Int32 in value
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform3i(location, v0, v1, v2)
+	return		void
+	param		location	Int32 in value
+	param		v0		Int32 in value
+	param		v1		Int32 in value
+	param		v2		Int32 in value
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform4i(location, v0, v1, v2, v3)
+	return		void
+	param		location	Int32 in value
+	param		v0		Int32 in value
+	param		v1		Int32 in value
+	param		v2		Int32 in value
+	param		v3		Int32 in value
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform1fv(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float32 in array [count]
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform2fv(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float32 in array [count]
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform3fv(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float32 in array [count]
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform4fv(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float32 in array [count]
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform1iv(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Int32 in array [count]
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform2iv(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Int32 in array [count]
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform3iv(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Int32 in array [count]
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform4iv(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Int32 in array [count]
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+UniformMatrix2fv(location, count, transpose, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [count]
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+UniformMatrix3fv(location, count, transpose, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [count]
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+UniformMatrix4fv(location, count, transpose, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [count]
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ValidateProgram(program)
+	return		void
+	param		program		UInt32 in value
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttrib1d(index, x)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float64 in value
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	vectorequiv	VertexAttrib1dv
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		603
+
+VertexAttrib1dv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float64 in array [1]
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	extension	soft WINSOFT NV10
+	glxropcode	4197
+	offset		604
+
+VertexAttrib1f(index, x)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float32 in value
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	vectorequiv	VertexAttrib1fv
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		605
+
+VertexAttrib1fv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float32 in array [1]
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	extension	soft WINSOFT NV10
+	glxropcode	4193
+	offset		606
+
+VertexAttrib1s(index, x)
+	return		void
+	param		index		UInt32 in value
+	param		x		Int16 in value
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	vectorequiv	VertexAttrib1sv
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		607
+
+VertexAttrib1sv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int16 in array [1]
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	extension	soft WINSOFT NV10
+	glxropcode	4189
+	offset		608
+
+VertexAttrib2d(index, x, y)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	vectorequiv	VertexAttrib2dv
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		609
+
+VertexAttrib2dv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float64 in array [2]
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	extension	soft WINSOFT NV10
+	glxropcode	4198
+	offset		610
+
+VertexAttrib2f(index, x, y)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	vectorequiv	VertexAttrib2fv
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		611
+
+VertexAttrib2fv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float32 in array [2]
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	extension	soft WINSOFT NV10
+	glxropcode	4194
+	offset		612
+
+VertexAttrib2s(index, x, y)
+	return		void
+	param		index		UInt32 in value
+	param		x		Int16 in value
+	param		y		Int16 in value
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	vectorequiv	VertexAttrib2sv
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		613
+
+VertexAttrib2sv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int16 in array [2]
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	extension	soft WINSOFT NV10
+	glxropcode	4190
+	offset		614
+
+VertexAttrib3d(index, x, y, z)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	param		z		Float64 in value
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	vectorequiv	VertexAttrib3dv
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		615
+
+VertexAttrib3dv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float64 in array [3]
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	extension	soft WINSOFT NV10
+	glxropcode	4199
+	offset		616
+
+VertexAttrib3f(index, x, y, z)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	vectorequiv	VertexAttrib3fv
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		617
+
+VertexAttrib3fv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float32 in array [3]
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	extension	soft WINSOFT NV10
+	glxropcode	4195
+	offset		618
+
+VertexAttrib3s(index, x, y, z)
+	return		void
+	param		index		UInt32 in value
+	param		x		Int16 in value
+	param		y		Int16 in value
+	param		z		Int16 in value
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	vectorequiv	VertexAttrib3sv
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		619
+
+VertexAttrib3sv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int16 in array [3]
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	extension	soft WINSOFT NV10
+	glxropcode	4191
+	offset		620
+
+VertexAttrib4Nbv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int8 in array [4]
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		659
+
+VertexAttrib4Niv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int32 in array [4]
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		661
+
+VertexAttrib4Nsv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int16 in array [4]
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		660
+
+VertexAttrib4Nub(index, x, y, z, w)
+	return		void
+	param		index		UInt32 in value
+	param		x		UInt8 in value
+	param		y		UInt8 in value
+	param		z		UInt8 in value
+	param		w		UInt8 in value
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		627
+
+VertexAttrib4Nubv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt8 in array [4]
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	glxropcode	4201
+	offset		628
+
+VertexAttrib4Nuiv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt32 in array [4]
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		663
+
+VertexAttrib4Nusv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt16 in array [4]
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		662
+
+VertexAttrib4bv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int8 in array [4]
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		654
+
+VertexAttrib4d(index, x, y, z, w)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	param		z		Float64 in value
+	param		w		Float64 in value
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	vectorequiv	VertexAttrib4dv
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		621
+
+VertexAttrib4dv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float64 in array [4]
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	extension	soft WINSOFT NV10
+	glxropcode	4200
+	offset		622
+
+VertexAttrib4f(index, x, y, z, w)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	param		w		Float32 in value
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	vectorequiv	VertexAttrib4fv
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		623
+
+VertexAttrib4fv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float32 in array [4]
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	extension	soft WINSOFT NV10
+	glxropcode	4196
+	offset		624
+
+VertexAttrib4iv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int32 in array [4]
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		655
+
+VertexAttrib4s(index, x, y, z, w)
+	return		void
+	param		index		UInt32 in value
+	param		x		Int16 in value
+	param		y		Int16 in value
+	param		z		Int16 in value
+	param		w		Int16 in value
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	vectorequiv	VertexAttrib4sv
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		625
+
+VertexAttrib4sv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int16 in array [4]
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	glxropcode	4192
+	offset		626
+
+VertexAttrib4ubv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt8 in array [4]
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		656
+
+VertexAttrib4uiv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt32 in array [4]
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		658
+
+VertexAttrib4usv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt16 in array [4]
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		657
+
+VertexAttribPointer(index, size, type, normalized, stride, pointer)
+	return		void
+	param		index		UInt32 in value
+	param		size		Int32 in value
+	param		type		VertexAttribPointerTypeARB in value
+	param		normalized	Boolean in value
+	param		stride		SizeI in value
+	param		pointer		Void in array [COMPSIZE(size/type/stride)] retained
+	dlflags		notlistable
+	category	VERSION_2_0
+	version		2.0
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		664
+
+
+###############################################################################
+###############################################################################
+#
+# OpenGL 2.1 commands
+#
+###############################################################################
+###############################################################################
+
+# OpenGL 2.1 (ARB_pixel_buffer_object) commands - none
+
+# OpenGL 2.1 (EXT_texture_sRGB) commands - none
+
+# New commands in OpenGL 2.1
+
+UniformMatrix2x3fv(location, count, transpose, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [6]
+	category	VERSION_2_1
+	version		2.1
+	extension
+	glxropcode	305
+	glxflags	ignore
+	offset		?
+
+UniformMatrix3x2fv(location, count, transpose, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [6]
+	category	VERSION_2_1
+	version		2.1
+	extension
+	glxropcode	306
+	offset		?
+
+UniformMatrix2x4fv(location, count, transpose, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [8]
+	category	VERSION_2_1
+	version		2.1
+	extension
+	glxropcode	307
+	offset		?
+
+UniformMatrix4x2fv(location, count, transpose, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [8]
+	category	VERSION_2_1
+	version		2.1
+	extension
+	glxropcode	308
+	offset		?
+
+UniformMatrix3x4fv(location, count, transpose, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [12]
+	category	VERSION_2_1
+	version		2.1
+	extension
+	glxropcode	309
+	offset		?
+
+UniformMatrix4x3fv(location, count, transpose, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [12]
+	category	VERSION_2_1
+	version		2.1
+	extension
+	glxropcode	310
+	offset		?
+
+###############################################################################
+###############################################################################
+#
+# OpenGL 3.0 commands
+#
+###############################################################################
+###############################################################################
+
+# OpenGL 3.0 (EXT_draw_buffers2) commands
+
+ColorMaski(index, r, g, b, a)
+	return		void
+	param		index		UInt32 in value
+	param		r		Boolean in value
+	param		g		Boolean in value
+	param		b		Boolean in value
+	param		a		Boolean in value
+	category	VERSION_3_0
+	version		3.0
+	extension
+	glxflags	ignore
+	glfflags	ignore
+
+GetBooleani_v(target, index, data)
+	return		void
+	param		target		GLenum in value
+	param		index		UInt32 in value
+	param		data		Boolean out array [COMPSIZE(target)]
+	category	VERSION_3_0
+	version		3.0
+	extension
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+
+GetIntegeri_v(target, index, data)
+	return		void
+	param		target		GLenum in value
+	param		index		UInt32 in value
+	param		data		Int32 out array [COMPSIZE(target)]
+	category	VERSION_3_0
+	version		3.0
+	extension
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+
+Enablei(target, index)
+	return		void
+	param		target		GLenum in value
+	param		index		UInt32 in value
+	category	VERSION_3_0
+	version		3.0
+	extension
+	glxflags	ignore
+	glfflags	ignore
+
+Disablei(target, index)
+	return		void
+	param		target		GLenum in value
+	param		index		UInt32 in value
+	category	VERSION_3_0
+	version		3.0
+	extension
+	glxflags	ignore
+	glfflags	ignore
+
+IsEnabledi(target, index)
+	return		Boolean
+	param		target		GLenum in value
+	param		index		UInt32 in value
+	category	VERSION_3_0
+	version		3.0
+	extension
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+
+# OpenGL 3.0 (EXT_transform_feedback) commands
+
+BeginTransformFeedback(primitiveMode)
+	return		void
+	param		primitiveMode	GLenum in value
+	category	VERSION_3_0
+	version		3.0
+	extension
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+
+EndTransformFeedback()
+	return		void
+	category	VERSION_3_0
+	version		3.0
+	extension
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+
+BindBufferRange(target, index, buffer, offset, size)
+	return		void
+	param		target		GLenum in value
+	param		index		UInt32 in value
+	param		buffer		UInt32 in value
+	param		offset		BufferOffset in value
+	param		size		BufferSize in value
+	category	VERSION_3_0
+	version		3.0
+	extension
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+
+BindBufferBase(target, index, buffer)
+	return		void
+	param		target		GLenum in value
+	param		index		UInt32 in value
+	param		buffer		UInt32 in value
+	category	VERSION_3_0
+	version		3.0
+	extension
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+
+TransformFeedbackVaryings(program, count, varyings, bufferMode)
+	return		void
+	param		program		UInt32 in value
+	param		count		SizeI in value
+	param		varyings	ConstCharPointer in array [count]
+	param		bufferMode	GLenum in value
+	category	VERSION_3_0
+	version		3.0
+	extension
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+
+GetTransformFeedbackVarying(program, index, bufSize, length, size, type, name)
+	return		void
+	param		program		UInt32 in value
+	param		index		UInt32 in value
+	param		bufSize		SizeI in value
+	param		length		SizeI out array [1]
+	param		size		SizeI out array [1]
+	param		type		GLenum out array [1]
+	param		name		Char out array [COMPSIZE(length)]
+	category	VERSION_3_0
+	dlflags		notlistable
+	version		3.0
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+ClampColor(target, clamp)
+	return		void
+	param		target		ClampColorTargetARB in value
+	param		clamp		ClampColorModeARB in value
+	category	VERSION_3_0
+	version		3.0
+	extension
+	glxropcode	234
+	glxflags	ignore
+	offset		?
+
+BeginConditionalRender(id, mode)
+	return		void
+	param		id		UInt32 in value
+	param		mode		TypeEnum in value
+	category	VERSION_3_0
+	version		3.0
+	glfflags	ignore
+	glxflags	ignore
+
+EndConditionalRender()
+	return		void
+	category	VERSION_3_0
+	version		3.0
+	glfflags	ignore
+	glxflags	ignore
+
+VertexAttribIPointer(index, size, type, stride, pointer)
+	return		void
+	param		index		UInt32 in value
+	param		size		Int32 in value
+	param		type		VertexAttribEnum in value
+	param		stride		SizeI in value
+	param		pointer		Void in array [COMPSIZE(size/type/stride)] retained
+	category	VERSION_3_0
+	version		3.0
+	dlflags		notlistable
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+GetVertexAttribIiv(index, pname, params)
+	return		void
+	param		index		UInt32 in value
+	param		pname		VertexAttribEnum in value
+	param		params		Int32 out array [1]
+	category	VERSION_3_0
+	version		3.0
+	dlflags		notlistable
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+GetVertexAttribIuiv(index, pname, params)
+	return		void
+	param		index		UInt32 in value
+	param		pname		VertexAttribEnum in value
+	param		params		UInt32 out array [1]
+	category	VERSION_3_0
+	version		3.0
+	dlflags		notlistable
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+# OpenGL 3.0 (NV_vertex_program4) commands
+
+VertexAttribI1i(index, x)
+	return		void
+	param		index		UInt32 in value
+	param		x		Int32 in value
+	category	VERSION_3_0
+	version		3.0
+	deprecated	3.1
+	beginend	allow-inside
+	vectorequiv	VertexAttribI1iv
+	glxvectorequiv	VertexAttribI1iv
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+VertexAttribI2i(index, x, y)
+	return		void
+	param		index		UInt32 in value
+	param		x		Int32 in value
+	param		y		Int32 in value
+	category	VERSION_3_0
+	version		3.0
+	deprecated	3.1
+	beginend	allow-inside
+	vectorequiv	VertexAttribI2iv
+	glxvectorequiv	VertexAttribI2iv
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+VertexAttribI3i(index, x, y, z)
+	return		void
+	param		index		UInt32 in value
+	param		x		Int32 in value
+	param		y		Int32 in value
+	param		z		Int32 in value
+	category	VERSION_3_0
+	version		3.0
+	deprecated	3.1
+	beginend	allow-inside
+	vectorequiv	VertexAttribI3iv
+	glxvectorequiv	VertexAttribI3iv
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+VertexAttribI4i(index, x, y, z, w)
+	return		void
+	param		index		UInt32 in value
+	param		x		Int32 in value
+	param		y		Int32 in value
+	param		z		Int32 in value
+	param		w		Int32 in value
+	category	VERSION_3_0
+	version		3.0
+	deprecated	3.1
+	beginend	allow-inside
+	vectorequiv	VertexAttribI4iv
+	glxvectorequiv	VertexAttribI4iv
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+VertexAttribI1ui(index, x)
+	return		void
+	param		index		UInt32 in value
+	param		x		UInt32 in value
+	category	VERSION_3_0
+	version		3.0
+	deprecated	3.1
+	beginend	allow-inside
+	vectorequiv	VertexAttribI1uiv
+	glxvectorequiv	VertexAttribI1uiv
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+VertexAttribI2ui(index, x, y)
+	return		void
+	param		index		UInt32 in value
+	param		x		UInt32 in value
+	param		y		UInt32 in value
+	category	VERSION_3_0
+	version		3.0
+	deprecated	3.1
+	beginend	allow-inside
+	vectorequiv	VertexAttribI2uiv
+	glxvectorequiv	VertexAttribI2uiv
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+VertexAttribI3ui(index, x, y, z)
+	return		void
+	param		index		UInt32 in value
+	param		x		UInt32 in value
+	param		y		UInt32 in value
+	param		z		UInt32 in value
+	category	VERSION_3_0
+	version		3.0
+	deprecated	3.1
+	beginend	allow-inside
+	vectorequiv	VertexAttribI3uiv
+	glxvectorequiv	VertexAttribI3uiv
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+VertexAttribI4ui(index, x, y, z, w)
+	return		void
+	param		index		UInt32 in value
+	param		x		UInt32 in value
+	param		y		UInt32 in value
+	param		z		UInt32 in value
+	param		w		UInt32 in value
+	category	VERSION_3_0
+	version		3.0
+	deprecated	3.1
+	beginend	allow-inside
+	vectorequiv	VertexAttribI4uiv
+	glxvectorequiv	VertexAttribI4uiv
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+VertexAttribI1iv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int32 in array [1]
+	category	VERSION_3_0
+	version		3.0
+	deprecated	3.1
+	beginend	allow-inside
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+VertexAttribI2iv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int32 in array [2]
+	category	VERSION_3_0
+	version		3.0
+	deprecated	3.1
+	beginend	allow-inside
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+VertexAttribI3iv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int32 in array [3]
+	category	VERSION_3_0
+	version		3.0
+	deprecated	3.1
+	beginend	allow-inside
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+VertexAttribI4iv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int32 in array [4]
+	category	VERSION_3_0
+	version		3.0
+	deprecated	3.1
+	beginend	allow-inside
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+VertexAttribI1uiv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt32 in array [1]
+	category	VERSION_3_0
+	version		3.0
+	deprecated	3.1
+	beginend	allow-inside
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+VertexAttribI2uiv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt32 in array [2]
+	category	VERSION_3_0
+	version		3.0
+	deprecated	3.1
+	beginend	allow-inside
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+VertexAttribI3uiv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt32 in array [3]
+	category	VERSION_3_0
+	version		3.0
+	deprecated	3.1
+	beginend	allow-inside
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+VertexAttribI4uiv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt32 in array [4]
+	category	VERSION_3_0
+	version		3.0
+	deprecated	3.1
+	beginend	allow-inside
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+VertexAttribI4bv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int8 in array [4]
+	category	VERSION_3_0
+	version		3.0
+	deprecated	3.1
+	beginend	allow-inside
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+VertexAttribI4sv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int16 in array [4]
+	category	VERSION_3_0
+	version		3.0
+	deprecated	3.1
+	beginend	allow-inside
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+VertexAttribI4ubv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt8 in array [4]
+	category	VERSION_3_0
+	version		3.0
+	deprecated	3.1
+	beginend	allow-inside
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+VertexAttribI4usv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt16 in array [4]
+	category	VERSION_3_0
+	version		3.0
+	deprecated	3.1
+	beginend	allow-inside
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+# OpenGL 3.0 (EXT_gpu_shader4) commands
+
+GetUniformuiv(program, location, params)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		params		UInt32 out array [COMPSIZE(program/location)]
+	category	VERSION_3_0
+	dlflags		notlistable
+	version		3.0
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+BindFragDataLocation(program, color, name)
+	return		void
+	param		program		UInt32 in value
+	param		color		UInt32 in value
+	param		name		Char in array [COMPSIZE(name)]
+	category	VERSION_3_0
+	dlflags		notlistable
+	version		3.0
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+GetFragDataLocation(program, name)
+	return		Int32
+	param		program		UInt32 in value
+	param		name		Char in array [COMPSIZE(name)]
+	category	VERSION_3_0
+	dlflags		notlistable
+	version		3.0
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+Uniform1ui(location, v0)
+	return		void
+	param		location	Int32 in value
+	param		v0		UInt32 in value
+	category	VERSION_3_0
+	version		3.0
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+Uniform2ui(location, v0, v1)
+	return		void
+	param		location	Int32 in value
+	param		v0		UInt32 in value
+	param		v1		UInt32 in value
+	category	VERSION_3_0
+	version		3.0
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+Uniform3ui(location, v0, v1, v2)
+	return		void
+	param		location	Int32 in value
+	param		v0		UInt32 in value
+	param		v1		UInt32 in value
+	param		v2		UInt32 in value
+	category	VERSION_3_0
+	version		3.0
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+Uniform4ui(location, v0, v1, v2, v3)
+	return		void
+	param		location	Int32 in value
+	param		v0		UInt32 in value
+	param		v1		UInt32 in value
+	param		v2		UInt32 in value
+	param		v3		UInt32 in value
+	category	VERSION_3_0
+	version		3.0
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+Uniform1uiv(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt32 in array [count]
+	category	VERSION_3_0
+	version		3.0
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+Uniform2uiv(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt32 in array [count*2]
+	category	VERSION_3_0
+	version		3.0
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+Uniform3uiv(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt32 in array [count*3]
+	category	VERSION_3_0
+	version		3.0
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+Uniform4uiv(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt32 in array [count*4]
+	category	VERSION_3_0
+	version		3.0
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+# OpenGL 3.0 (EXT_texture_integer) commands
+
+TexParameterIiv(target, pname, params)
+	return		void
+	param		target		TextureTarget in value
+	param		pname		TextureParameterName in value
+	param		params		Int32 in array [COMPSIZE(pname)]
+	category	VERSION_3_0
+	version		3.0
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+TexParameterIuiv(target, pname, params)
+	return		void
+	param		target		TextureTarget in value
+	param		pname		TextureParameterName in value
+	param		params		UInt32 in array [COMPSIZE(pname)]
+	category	VERSION_3_0
+	version		3.0
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+GetTexParameterIiv(target, pname, params)
+	return		void
+	param		target		TextureTarget in value
+	param		pname		GetTextureParameter in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	VERSION_3_0
+	dlflags		notlistable
+	version		3.0
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+GetTexParameterIuiv(target, pname, params)
+	return		void
+	param		target		TextureTarget in value
+	param		pname		GetTextureParameter in value
+	param		params		UInt32 out array [COMPSIZE(pname)]
+	category	VERSION_3_0
+	dlflags		notlistable
+	version		3.0
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+# New commands in OpenGL 3.0
+
+ClearBufferiv(buffer, drawbuffer, value)
+	return		void
+	param		buffer		GLenum in value
+	param		drawbuffer	DrawBufferName in value
+	param		value		Int32 in array [COMPSIZE(buffer)]
+	category	VERSION_3_0
+	version		3.0
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+ClearBufferuiv(buffer, drawbuffer, value)
+	return		void
+	param		buffer		GLenum in value
+	param		drawbuffer	DrawBufferName in value
+	param		value		UInt32 in array [COMPSIZE(buffer)]
+	category	VERSION_3_0
+	version		3.0
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+ClearBufferfv(buffer, drawbuffer, value)
+	return		void
+	param		buffer		GLenum in value
+	param		drawbuffer	DrawBufferName in value
+	param		value		Float32 in array [COMPSIZE(buffer)]
+	category	VERSION_3_0
+	version		3.0
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+ClearBufferfi(buffer, drawbuffer, depth, stencil)
+	return		void
+	param		buffer		GLenum in value
+	param		drawbuffer	DrawBufferName in value
+	param		depth		Float32 in value
+	param		stencil		Int32 in value
+	category	VERSION_3_0
+	version		3.0
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+GetStringi(name, index)
+	return		String
+	param		name		GLenum in value
+	param		index		UInt32 in value
+	category	VERSION_3_0
+	version		3.0
+	extension
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode
+	glfflags	ignore
+	glxsingle	?
+
+passthru: /* OpenGL 3.0 also reuses entry points from these extensions: */
+passthru: /* ARB_framebuffer_object */
+passthru: /* ARB_map_buffer_range */
+passthru: /* ARB_vertex_array_object */
+
+###############################################################################
+###############################################################################
+#
+# OpenGL 3.0 deprecated commands
+#
+###############################################################################
+###############################################################################
+
+# (none - VertexAttribI* were moved back into non-deprecated)
+
+
+###############################################################################
+###############################################################################
+#
+# OpenGL 3.1 commands
+#
+###############################################################################
+###############################################################################
+
+# New commands in OpenGL 3.1 - none
+
+# OpenGL 3.1 (ARB_draw_instanced) commands
+
+DrawArraysInstanced(mode, first, count, instancecount)
+	return		void
+	param		mode		BeginMode in value
+	param		first		Int32 in value
+	param		count		SizeI in value
+	param		instancecount	SizeI in value
+	category	VERSION_3_1
+	version		3.1
+	extension
+	dlflags		notlistable
+	vectorequiv	ArrayElement
+	glfflags	ignore
+	glxflags	ignore
+
+DrawElementsInstanced(mode, count, type, indices, instancecount)
+	return		void
+	param		mode		BeginMode in value
+	param		count		SizeI in value
+	param		type		DrawElementsType in value
+	param		indices		Void in array [COMPSIZE(count/type)]
+	param		instancecount	SizeI in value
+	category	VERSION_3_1
+	version		3.1
+	extension
+	dlflags		notlistable
+	vectorequiv	ArrayElement
+	glfflags	ignore
+	glxflags	ignore
+
+# OpenGL 3.1 (ARB_texture_buffer_object) commands
+
+TexBuffer(target, internalformat, buffer)
+	return		void
+	param		target		TextureTarget in value
+	param		internalformat	GLenum in value
+	param		buffer		UInt32 in value
+	category	VERSION_3_1
+	version		3.1
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+# OpenGL 3.1 (ARB_texture_rectangle) commands - none
+
+# OpenGL 3.1 (SNORM texture) commands - none
+
+# OpenGL 3.1 (NV_primitive_restart) commands
+# This is *not* an alias of PrimitiveRestartIndexNV, since it sets
+# server instead of client state.
+
+PrimitiveRestartIndex(index)
+	return		void
+	param		index		UInt32 in value
+	category	VERSION_3_1
+	version		3.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+passthru: /* OpenGL 3.1 also reuses entry points from these extensions: */
+passthru: /* ARB_copy_buffer */
+passthru: /* ARB_uniform_buffer_object */
+
+
+###############################################################################
+###############################################################################
+#
+# OpenGL 3.2 commands
+#
+###############################################################################
+###############################################################################
+
+# New commands in OpenGL 3.2
+
+GetInteger64i_v(target, index, data)
+	return		void
+	param		target		GLenum in value
+	param		index		UInt32 in value
+	param		data		Int64 out array [COMPSIZE(target)]
+	category	VERSION_3_2
+	version		3.2
+	extension
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+
+
+GetBufferParameteri64v(target, pname, params)
+	return		void
+	param		target		BufferTargetARB in value
+	param		pname		BufferPNameARB in value
+	param		params		Int64 out array [COMPSIZE(pname)]
+	category	VERSION_3_2
+	dlflags		notlistable
+	version		3.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+
+# OpenGL 3.2 (ARB_depth_clamp) commands - none
+# OpenGL 3.2 (ARB_fragment_coord_conventions) commands - none
+
+# OpenGL 3.2 (ARB_geometry_shader4) commands
+# ProgramParameteriARB was NOT promoted to core 3.2, but
+# IS part of core 4.1 through other ARB extensions.
+
+FramebufferTexture(target, attachment, texture, level)
+	return		void
+	param		target		GLenum in value
+	param		attachment	GLenum in value
+	param		texture		UInt32 in value
+	param		level		Int32 in value
+	category	VERSION_3_2
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+# FramebufferTextureLayer already declared in ARB_framebuffer_object
+# FramebufferTextureLayer(target, attachment, texture, level, layer)
+
+# Not promoted to the core along with the rest
+# FramebufferTextureFace(target, attachment, texture, level, face)
+
+# OpenGL 3.2  (ARB_seamless_cube_map) commands - none
+# OpenGL 3.2  (ARB_vertex_array_bgra) commands - none
+
+passthru: /* OpenGL 3.2 also reuses entry points from these extensions: */
+passthru: /* ARB_draw_elements_base_vertex */
+passthru: /* ARB_provoking_vertex */
+passthru: /* ARB_sync */
+passthru: /* ARB_texture_multisample */
+
+
+###############################################################################
+###############################################################################
+#
+# OpenGL 3.3 commands
+#
+###############################################################################
+###############################################################################
+
+# New commands in OpenGL 3.3
+
+# OpenGL 3.3 (ARB_instanced_arrays) commands
+
+VertexAttribDivisor(index, divisor)
+	return		void
+	param		index		UInt32 in value
+	param		divisor		UInt32 in value
+	category	VERSION_3_3
+	version		1.1
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+passthru: /* OpenGL 3.3 also reuses entry points from these extensions: */
+passthru: /* ARB_blend_func_extended */
+passthru: /* ARB_sampler_objects */
+passthru: /* ARB_explicit_attrib_location, but it has none */
+passthru: /* ARB_occlusion_query2 (no entry points) */
+passthru: /* ARB_shader_bit_encoding (no entry points) */
+passthru: /* ARB_texture_rgb10_a2ui (no entry points) */
+passthru: /* ARB_texture_swizzle (no entry points) */
+passthru: /* ARB_timer_query */
+passthru: /* ARB_vertex_type_2_10_10_10_rev */
+
+
+###############################################################################
+###############################################################################
+#
+# OpenGL 4.0 commands
+#
+###############################################################################
+###############################################################################
+
+# New commands in OpenGL 4.0
+
+# OpenGL 4.0 (ARB_sample_shading) commands
+
+MinSampleShading(value)
+	return		void
+	param		value		ColorF in value
+	category	VERSION_4_0
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+# OpenGL 4.0 (ARB_draw_buffers_blend) commands
+
+BlendEquationi(buf, mode)
+	return		void
+	param		buf		UInt32 in value
+	param		mode		GLenum in value
+	category	VERSION_4_0
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+BlendEquationSeparatei(buf, modeRGB, modeAlpha)
+	return		void
+	param		buf		UInt32 in value
+	param		modeRGB		GLenum in value
+	param		modeAlpha	GLenum in value
+	category	VERSION_4_0
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+BlendFunci(buf, src, dst)
+	return		void
+	param		buf		UInt32 in value
+	param		src		GLenum in value
+	param		dst		GLenum in value
+	category	VERSION_4_0
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+BlendFuncSeparatei(buf, srcRGB, dstRGB, srcAlpha, dstAlpha)
+	return		void
+	param		buf		UInt32 in value
+	param		srcRGB		GLenum in value
+	param		dstRGB		GLenum in value
+	param		srcAlpha	GLenum in value
+	param		dstAlpha	GLenum in value
+	category	VERSION_4_0
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+passthru: /* OpenGL 4.0 also reuses entry points from these extensions: */
+passthru: /* ARB_texture_query_lod (no entry points) */
+passthru: /* ARB_draw_indirect */
+passthru: /* ARB_gpu_shader5 (no entry points) */
+passthru: /* ARB_gpu_shader_fp64 */
+passthru: /* ARB_shader_subroutine */
+passthru: /* ARB_tessellation_shader */
+passthru: /* ARB_texture_buffer_object_rgb32 (no entry points) */
+passthru: /* ARB_texture_cube_map_array (no entry points) */
+passthru: /* ARB_texture_gather (no entry points) */
+passthru: /* ARB_transform_feedback2 */
+passthru: /* ARB_transform_feedback3 */
+
+
+###############################################################################
+###############################################################################
+#
+# OpenGL 4.1 commands
+#
+###############################################################################
+###############################################################################
+
+# New commands in OpenGL 4.1 - none
+newcategory: VERSION_4_1
+
+passthru: /* OpenGL 4.1 reuses entry points from these extensions: */
+passthru: /* ARB_ES2_compatibility */
+passthru: /* ARB_get_program_binary */
+passthru: /* ARB_separate_shader_objects */
+passthru: /* ARB_shader_precision (no entry points) */
+passthru: /* ARB_vertex_attrib_64bit */
+passthru: /* ARB_viewport_array */
+
+
+###############################################################################
+###############################################################################
+#
+# OpenGL 4.2 commands
+#
+###############################################################################
+###############################################################################
+
+# New commands in OpenGL 4.2 - none
+newcategory: VERSION_4_2
+
+passthru: /* OpenGL 4.2 reuses entry points from these extensions: */
+passthru: /* ARB_base_instance */
+passthru: /* ARB_shading_language_420pack (no entry points) */
+passthru: /* ARB_transform_feedback_instanced */
+passthru: /* ARB_compressed_texture_pixel_storage (no entry points) */
+passthru: /* ARB_conservative_depth (no entry points) */
+passthru: /* ARB_internalformat_query */
+passthru: /* ARB_map_buffer_alignment (no entry points) */
+passthru: /* ARB_shader_atomic_counters */
+passthru: /* ARB_shader_image_load_store */
+passthru: /* ARB_shading_language_packing (no entry points) */
+passthru: /* ARB_texture_storage */
+
+
+###############################################################################
+###############################################################################
+#
+# OpenGL 4.3 commands
+#
+###############################################################################
+###############################################################################
+
+# New commands in OpenGL 4.3 - none
+newcategory: VERSION_4_3
+
+passthru: /* OpenGL 4.3 reuses entry points from these extensions: */
+passthru: /* ARB_arrays_of_arrays (no entry points, GLSL only) */
+passthru: /* ARB_fragment_layer_viewport (no entry points, GLSL only) */
+passthru: /* ARB_shader_image_size (no entry points, GLSL only) */
+passthru: /* ARB_ES3_compatibility (no entry points) */
+passthru: /* ARB_clear_buffer_object */
+passthru: /* ARB_compute_shader */
+passthru: /* ARB_copy_image */
+passthru: /* KHR_debug (includes ARB_debug_output commands promoted to KHR without suffixes) */
+passthru: /* ARB_explicit_uniform_location (no entry points) */
+passthru: /* ARB_framebuffer_no_attachments */
+passthru: /* ARB_internalformat_query2 */
+passthru: /* ARB_invalidate_subdata */
+passthru: /* ARB_multi_draw_indirect */
+passthru: /* ARB_program_interface_query */
+passthru: /* ARB_robust_buffer_access_behavior (no entry points) */
+passthru: /* ARB_shader_storage_buffer_object */
+passthru: /* ARB_stencil_texturing (no entry points) */
+passthru: /* ARB_texture_buffer_range */
+passthru: /* ARB_texture_query_levels (no entry points) */
+passthru: /* ARB_texture_storage_multisample */
+passthru: /* ARB_texture_view */
+passthru: /* ARB_vertex_attrib_binding */
+
+###############################################################################
+###############################################################################
+#
+# ARB extensions, in order by ARB extension number
+#
+###############################################################################
+###############################################################################
+
+###############################################################################
+#
+# ARB Extension #1
+# ARB_multitexture commands
+#
+###############################################################################
+
+ActiveTextureARB(texture)
+	return		void
+	param		texture		TextureUnit in value
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	glxropcode	197
+	alias		ActiveTexture
+
+ClientActiveTextureARB(texture)
+	return		void
+	param		texture		TextureUnit in value
+	category	ARB_multitexture
+	dlflags		notlistable
+	glxflags	ARB client-handcode client-intercept server-handcode
+	version		1.2
+	alias		ClientActiveTexture
+
+MultiTexCoord1dARB(target, s)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordD in value
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	vectorequiv	MultiTexCoord1dv
+
+MultiTexCoord1dvARB(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordD in array [1]
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	glxropcode	198
+	alias		MultiTexCoord1dv
+
+MultiTexCoord1fARB(target, s)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordF in value
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	vectorequiv	MultiTexCoord1fv
+
+MultiTexCoord1fvARB(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordF in array [1]
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	glxropcode	199
+	alias		MultiTexCoord1fv
+
+MultiTexCoord1iARB(target, s)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordI in value
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	vectorequiv	MultiTexCoord1iv
+
+MultiTexCoord1ivARB(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordI in array [1]
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	glxropcode	200
+	alias		MultiTexCoord1iv
+
+MultiTexCoord1sARB(target, s)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordS in value
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	vectorequiv	MultiTexCoord1sv
+
+MultiTexCoord1svARB(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordS in array [1]
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	glxropcode	201
+	alias		MultiTexCoord1sv
+
+MultiTexCoord2dARB(target, s, t)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordD in value
+	param		t		CoordD in value
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	vectorequiv	MultiTexCoord2dv
+
+MultiTexCoord2dvARB(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordD in array [2]
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	glxropcode	202
+	alias		MultiTexCoord2dv
+
+MultiTexCoord2fARB(target, s, t)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordF in value
+	param		t		CoordF in value
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	vectorequiv	MultiTexCoord2fv
+
+MultiTexCoord2fvARB(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordF in array [2]
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	glxropcode	203
+	alias		MultiTexCoord2fv
+
+MultiTexCoord2iARB(target, s, t)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordI in value
+	param		t		CoordI in value
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	vectorequiv	MultiTexCoord2iv
+
+MultiTexCoord2ivARB(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordI in array [2]
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	glxropcode	204
+	alias		MultiTexCoord2iv
+
+MultiTexCoord2sARB(target, s, t)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordS in value
+	param		t		CoordS in value
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	vectorequiv	MultiTexCoord2sv
+
+MultiTexCoord2svARB(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordS in array [2]
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	glxropcode	205
+	alias		MultiTexCoord2sv
+
+MultiTexCoord3dARB(target, s, t, r)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordD in value
+	param		t		CoordD in value
+	param		r		CoordD in value
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	vectorequiv	MultiTexCoord3dv
+
+MultiTexCoord3dvARB(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordD in array [3]
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	glxropcode	206
+	alias		MultiTexCoord3dv
+
+MultiTexCoord3fARB(target, s, t, r)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordF in value
+	param		t		CoordF in value
+	param		r		CoordF in value
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	vectorequiv	MultiTexCoord3fv
+
+MultiTexCoord3fvARB(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordF in array [3]
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	glxropcode	207
+	alias		MultiTexCoord3fv
+
+MultiTexCoord3iARB(target, s, t, r)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordI in value
+	param		t		CoordI in value
+	param		r		CoordI in value
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	vectorequiv	MultiTexCoord3iv
+
+MultiTexCoord3ivARB(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordI in array [3]
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	glxropcode	208
+	alias		MultiTexCoord3iv
+
+MultiTexCoord3sARB(target, s, t, r)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordS in value
+	param		t		CoordS in value
+	param		r		CoordS in value
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	vectorequiv	MultiTexCoord3sv
+
+MultiTexCoord3svARB(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordS in array [3]
+	category	ARB_multitexture
+	version		1.2
+	glxflags	ARB
+	glxropcode	209
+	alias		MultiTexCoord3sv
+
+MultiTexCoord4dARB(target, s, t, r, q)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordD in value
+	param		t		CoordD in value
+	param		r		CoordD in value
+	param		q		CoordD in value
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	vectorequiv	MultiTexCoord4dv
+
+MultiTexCoord4dvARB(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordD in array [4]
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	glxropcode	210
+	alias		MultiTexCoord4dv
+
+MultiTexCoord4fARB(target, s, t, r, q)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordF in value
+	param		t		CoordF in value
+	param		r		CoordF in value
+	param		q		CoordF in value
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	vectorequiv	MultiTexCoord4fv
+
+MultiTexCoord4fvARB(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordF in array [4]
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	glxropcode	211
+	alias		MultiTexCoord4fv
+
+MultiTexCoord4iARB(target, s, t, r, q)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordI in value
+	param		t		CoordI in value
+	param		r		CoordI in value
+	param		q		CoordI in value
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	vectorequiv	MultiTexCoord4iv
+
+MultiTexCoord4ivARB(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordI in array [4]
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	glxropcode	212
+	alias		MultiTexCoord4iv
+
+MultiTexCoord4sARB(target, s, t, r, q)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordS in value
+	param		t		CoordS in value
+	param		r		CoordS in value
+	param		q		CoordS in value
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	vectorequiv	MultiTexCoord4sv
+
+MultiTexCoord4svARB(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordS in array [4]
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	glxropcode	213
+	alias		MultiTexCoord4sv
+
+################################################################################
+#
+# ARB Extension #2 - GLX_ARB_get_proc_address
+#
+###############################################################################
+
+################################################################################
+#
+# ARB Extension #3
+# ARB_transpose_matrix commands
+#
+###############################################################################
+
+LoadTransposeMatrixfARB(m)
+	return		void
+	param		m		Float32 in array [16]
+	category	ARB_transpose_matrix
+	glxflags	ARB client-handcode client-intercept server-handcode
+	version		1.2
+	alias		LoadTransposeMatrixf
+
+LoadTransposeMatrixdARB(m)
+	return		void
+	param		m		Float64 in array [16]
+	category	ARB_transpose_matrix
+	glxflags	ARB client-handcode client-intercept server-handcode
+	version		1.2
+	alias		LoadTransposeMatrixd
+
+MultTransposeMatrixfARB(m)
+	return		void
+	param		m		Float32 in array [16]
+	category	ARB_transpose_matrix
+	glxflags	ARB client-handcode client-intercept server-handcode
+	version		1.2
+	alias		MultTransposeMatrixf
+
+MultTransposeMatrixdARB(m)
+	return		void
+	param		m		Float64 in array [16]
+	category	ARB_transpose_matrix
+	glxflags	ARB client-handcode client-intercept server-handcode
+	version		1.2
+	alias		MultTransposeMatrixd
+
+################################################################################
+#
+# ARB Extension #4 - WGL_ARB_buffer_region
+#
+###############################################################################
+
+################################################################################
+#
+# ARB Extension #5
+# ARB_multisample commands
+#
+###############################################################################
+
+SampleCoverageARB(value, invert)
+	return		void
+	param		value		Float32 in value
+	param		invert		Boolean in value
+	category	ARB_multisample
+	glxflags	ARB
+	version		1.2
+	alias		SampleCoverage
+
+################################################################################
+#
+# ARB Extension #6
+# ARB_texture_env_add commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_texture_env_add
+
+################################################################################
+#
+# ARB Extension #7
+# ARB_texture_cube_map commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_texture_cube_map
+
+################################################################################
+#
+# ARB Extension #8 - WGL_ARB_extensions_string
+# ARB Extension #9 - WGL_ARB_pixel_format commands
+# ARB Extension #10 - WGL_ARB_make_current_read commands
+# ARB Extension #11 - WGL_ARB_pbuffer
+#
+###############################################################################
+
+################################################################################
+#
+# ARB Extension #12
+# ARB_texture_compression commands
+#
+###############################################################################
+
+# Arguably TexelInternalFormat, not PixelInternalFormat
+CompressedTexImage3DARB(target, level, internalformat, width, height, depth, border, imageSize, data)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	PixelInternalFormat in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		border		CheckedInt32 in value
+	param		imageSize	SizeI in value
+	param		data		CompressedTextureARB in array [imageSize]
+	category	ARB_texture_compression
+	dlflags		handcode
+	glxflags	ARB client-handcode server-handcode
+	version		1.2
+	glxropcode	216
+	alias		CompressedTexImage3D
+	wglflags	client-handcode server-handcode
+
+# Arguably TexelInternalFormat, not PixelInternalFormat
+CompressedTexImage2DARB(target, level, internalformat, width, height, border, imageSize, data)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	PixelInternalFormat in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		border		CheckedInt32 in value
+	param		imageSize	SizeI in value
+	param		data		CompressedTextureARB in array [imageSize]
+	category	ARB_texture_compression
+	dlflags		handcode
+	glxflags	ARB client-handcode server-handcode
+	version		1.2
+	glxropcode	215
+	alias		CompressedTexImage2D
+	wglflags	client-handcode server-handcode
+
+# Arguably TexelInternalFormat, not PixelInternalFormat
+CompressedTexImage1DARB(target, level, internalformat, width, border, imageSize, data)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	PixelInternalFormat in value
+	param		width		SizeI in value
+	param		border		CheckedInt32 in value
+	param		imageSize	SizeI in value
+	param		data		CompressedTextureARB in array [imageSize]
+	category	ARB_texture_compression
+	dlflags		handcode
+	glxflags	ARB client-handcode server-handcode
+	version		1.2
+	glxropcode	214
+	alias		CompressedTexImage1D
+	wglflags	client-handcode server-handcode
+
+CompressedTexSubImage3DARB(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		yoffset		CheckedInt32 in value
+	param		zoffset		CheckedInt32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		format		PixelFormat in value
+	param		imageSize	SizeI in value
+	param		data		CompressedTextureARB in array [imageSize]
+	category	ARB_texture_compression
+	dlflags		handcode
+	glxflags	ARB client-handcode server-handcode
+	version		1.2
+	glxropcode	219
+	alias		CompressedTexSubImage3D
+	wglflags	client-handcode server-handcode
+
+CompressedTexSubImage2DARB(target, level, xoffset, yoffset, width, height, format, imageSize, data)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		yoffset		CheckedInt32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		format		PixelFormat in value
+	param		imageSize	SizeI in value
+	param		data		CompressedTextureARB in array [imageSize]
+	category	ARB_texture_compression
+	dlflags		handcode
+	glxflags	ARB client-handcode server-handcode
+	version		1.2
+	glxropcode	218
+	alias		CompressedTexSubImage2D
+	wglflags	client-handcode server-handcode
+
+CompressedTexSubImage1DARB(target, level, xoffset, width, format, imageSize, data)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		width		SizeI in value
+	param		format		PixelFormat in value
+	param		imageSize	SizeI in value
+	param		data		CompressedTextureARB in array [imageSize]
+	category	ARB_texture_compression
+	dlflags		handcode
+	glxflags	ARB client-handcode server-handcode
+	version		1.2
+	glxropcode	217
+	alias		CompressedTexSubImage1D
+	wglflags	client-handcode server-handcode
+
+GetCompressedTexImageARB(target, level, img)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		img		CompressedTextureARB out array [COMPSIZE(target/level)]
+	category	ARB_texture_compression
+	dlflags		notlistable
+	glxflags	ARB client-handcode server-handcode
+	version		1.2
+	glxsingle	160
+	alias		GetCompressedTexImage
+	wglflags	client-handcode server-handcode
+
+################################################################################
+#
+# ARB Extension #13
+# ARB_texture_border_clamp commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_texture_border_clamp
+
+###############################################################################
+#
+# ARB Extension #14
+# ARB_point_parameters commands
+#
+###############################################################################
+
+PointParameterfARB(pname, param)
+	return		void
+	param		pname		PointParameterNameARB in value
+	param		param		CheckedFloat32 in value
+	category	ARB_point_parameters
+	version		1.0
+	glxflags	ARB
+	glxropcode	2065
+	extension
+	alias		PointParameterf
+
+PointParameterfvARB(pname, params)
+	return		void
+	param		pname		PointParameterNameARB in value
+	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
+	category	ARB_point_parameters
+	version		1.0
+	glxflags	ARB
+	glxropcode	2066
+	extension
+	alias		PointParameterfv
+
+################################################################################
+#
+# ARB Extension #15
+# ARB_vertex_blend commands
+#
+###############################################################################
+
+WeightbvARB(size, weights)
+	return		void
+	param		size		Int32 in value
+	param		weights		Int8 in array [size]
+	category	ARB_vertex_blend
+	version		1.1
+	extension
+	glxropcode	220
+	glxflags	ignore
+	offset		?
+
+WeightsvARB(size, weights)
+	return		void
+	param		size		Int32 in value
+	param		weights		Int16 in array [size]
+	category	ARB_vertex_blend
+	version		1.1
+	extension
+	glxropcode	222
+	glxflags	ignore
+	offset		?
+
+WeightivARB(size, weights)
+	return		void
+	param		size		Int32 in value
+	param		weights		Int32 in array [size]
+	category	ARB_vertex_blend
+	version		1.1
+	extension
+	glxropcode	224
+	glxflags	ignore
+	offset		?
+
+WeightfvARB(size, weights)
+	return		void
+	param		size		Int32 in value
+	param		weights		Float32 in array [size]
+	category	ARB_vertex_blend
+	version		1.1
+	extension
+	glxropcode	227
+	glxflags	ignore
+	offset		?
+
+WeightdvARB(size, weights)
+	return		void
+	param		size		Int32 in value
+	param		weights		Float64 in array [size]
+	category	ARB_vertex_blend
+	version		1.1
+	extension
+	glxropcode	228
+	glxflags	ignore
+	offset		?
+
+WeightubvARB(size, weights)
+	return		void
+	param		size		Int32 in value
+	param		weights		UInt8 in array [size]
+	category	ARB_vertex_blend
+	version		1.1
+	extension
+	glxropcode	221
+	glxflags	ignore
+	offset		?
+
+WeightusvARB(size, weights)
+	return		void
+	param		size		Int32 in value
+	param		weights		UInt16 in array [size]
+	category	ARB_vertex_blend
+	version		1.1
+	extension
+	glxropcode	223
+	glxflags	ignore
+	offset		?
+
+WeightuivARB(size, weights)
+	return		void
+	param		size		Int32 in value
+	param		weights		UInt32 in array [size]
+	category	ARB_vertex_blend
+	version		1.1
+	extension
+	glxropcode	225
+	glxflags	ignore
+	offset		?
+
+WeightPointerARB(size, type, stride, pointer)
+	return		void
+	param		size		Int32 in value
+	param		type		WeightPointerTypeARB in value
+	param		stride		SizeI in value
+	param		pointer		Void in array [COMPSIZE(type/stride)] retained
+	category	ARB_vertex_blend
+	version		1.1
+	extension
+	dlflags		notlistable
+	glxflags	ignore
+	offset		?
+
+VertexBlendARB(count)
+	return		void
+	param		count		Int32 in value
+	category	ARB_vertex_blend
+	version		1.1
+	extension
+	glxropcode	226
+	glxflags	ignore
+	offset		?
+
+################################################################################
+#
+# ARB Extension #16
+# ARB_matrix_palette commands
+#
+###############################################################################
+
+CurrentPaletteMatrixARB(index)
+	return		void
+	param		index		Int32 in value
+	category	ARB_matrix_palette
+	version		1.1
+	extension
+	glxropcode	4329
+	glxflags	ignore
+	offset		?
+
+MatrixIndexubvARB(size, indices)
+	return		void
+	param		size		Int32 in value
+	param		indices		UInt8 in array [size]
+	category	ARB_matrix_palette
+	version		1.1
+	extension
+	glxropcode	4326
+	glxflags	ignore
+	offset		?
+
+MatrixIndexusvARB(size, indices)
+	return		void
+	param		size		Int32 in value
+	param		indices		UInt16 in array [size]
+	category	ARB_matrix_palette
+	version		1.1
+	extension
+	glxropcode	4327
+	glxflags	ignore
+	offset		?
+
+MatrixIndexuivARB(size, indices)
+	return		void
+	param		size		Int32 in value
+	param		indices		UInt32 in array [size]
+	category	ARB_matrix_palette
+	version		1.1
+	extension
+	glxropcode	4328
+	glxflags	ignore
+	offset		?
+
+MatrixIndexPointerARB(size, type, stride, pointer)
+	return		void
+	param		size		Int32 in value
+	param		type		MatrixIndexPointerTypeARB in value
+	param		stride		SizeI in value
+	param		pointer		Void in array [COMPSIZE(type/stride)] retained
+	category	ARB_matrix_palette
+	version		1.1
+	extension
+	dlflags		notlistable
+	glxflags	ignore
+	offset		?
+
+################################################################################
+#
+# ARB Extension #17
+# ARB_texture_env_combine commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_texture_env_combine
+
+################################################################################
+#
+# ARB Extension #18
+# ARB_texture_env_crossbar commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_texture_env_crossbar
+
+################################################################################
+#
+# ARB Extension #19
+# ARB_texture_env_dot3 commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_texture_env_dot3
+
+###############################################################################
+#
+# ARB Extension #20 - WGL_ARB_render_texture
+#
+###############################################################################
+
+###############################################################################
+#
+# ARB Extension #21
+# ARB_texture_mirrored_repeat commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_texture_mirrored_repeat
+
+###############################################################################
+#
+# ARB Extension #22
+# ARB_depth_texture commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_depth_texture
+
+###############################################################################
+#
+# ARB Extension #23
+# ARB_shadow commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_shadow
+
+###############################################################################
+#
+# ARB Extension #24
+# ARB_shadow_ambient commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_shadow_ambient
+
+###############################################################################
+#
+# ARB Extension #25
+# ARB_window_pos commands
+# Note: all entry points use glxropcode ropcode 230, with 3 float parameters
+#
+###############################################################################
+
+WindowPos2dARB(x, y)
+	return		void
+	param		x		CoordD in value
+	param		y		CoordD in value
+	category	ARB_window_pos
+	vectorequiv	WindowPos2dvARB
+	version		1.0
+	alias		WindowPos2d
+
+WindowPos2dvARB(v)
+	return		void
+	param		v		CoordD in array [2]
+	category	ARB_window_pos
+	version		1.0
+	glxropcode	230
+	glxflags	client-handcode server-handcode
+	alias		WindowPos2dv
+
+WindowPos2fARB(x, y)
+	return		void
+	param		x		CoordF in value
+	param		y		CoordF in value
+	category	ARB_window_pos
+	vectorequiv	WindowPos2fvARB
+	version		1.0
+	alias		WindowPos2f
+
+WindowPos2fvARB(v)
+	return		void
+	param		v		CoordF in array [2]
+	category	ARB_window_pos
+	version		1.0
+	glxropcode	230
+	glxflags	client-handcode server-handcode
+	alias		WindowPos2fv
+
+WindowPos2iARB(x, y)
+	return		void
+	param		x		CoordI in value
+	param		y		CoordI in value
+	category	ARB_window_pos
+	vectorequiv	WindowPos2ivARB
+	version		1.0
+	alias		WindowPos2i
+
+WindowPos2ivARB(v)
+	return		void
+	param		v		CoordI in array [2]
+	category	ARB_window_pos
+	version		1.0
+	glxropcode	230
+	glxflags	client-handcode server-handcode
+	alias		WindowPos2iv
+
+WindowPos2sARB(x, y)
+	return		void
+	param		x		CoordS in value
+	param		y		CoordS in value
+	category	ARB_window_pos
+	vectorequiv	WindowPos2svARB
+	version		1.0
+	alias		WindowPos2s
+
+WindowPos2svARB(v)
+	return		void
+	param		v		CoordS in array [2]
+	category	ARB_window_pos
+	version		1.0
+	glxropcode	230
+	glxflags	client-handcode server-handcode
+	alias		WindowPos2sv
+
+WindowPos3dARB(x, y, z)
+	return		void
+	param		x		CoordD in value
+	param		y		CoordD in value
+	param		z		CoordD in value
+	vectorequiv	WindowPos3dvARB
+	category	ARB_window_pos
+	version		1.0
+	alias		WindowPos3d
+
+WindowPos3dvARB(v)
+	return		void
+	param		v		CoordD in array [3]
+	category	ARB_window_pos
+	version		1.0
+	glxropcode	230
+	glxflags	client-handcode server-handcode
+	alias		WindowPos3dv
+
+WindowPos3fARB(x, y, z)
+	return		void
+	param		x		CoordF in value
+	param		y		CoordF in value
+	param		z		CoordF in value
+	category	ARB_window_pos
+	vectorequiv	WindowPos3fvARB
+	version		1.0
+	alias		WindowPos3f
+
+WindowPos3fvARB(v)
+	return		void
+	param		v		CoordF in array [3]
+	category	ARB_window_pos
+	version		1.0
+	glxropcode	230
+	glxflags	client-handcode server-handcode
+	alias		WindowPos3fv
+
+WindowPos3iARB(x, y, z)
+	return		void
+	param		x		CoordI in value
+	param		y		CoordI in value
+	param		z		CoordI in value
+	category	ARB_window_pos
+	vectorequiv	WindowPos3ivARB
+	version		1.0
+	alias		WindowPos3i
+
+WindowPos3ivARB(v)
+	return		void
+	param		v		CoordI in array [3]
+	category	ARB_window_pos
+	version		1.0
+	glxropcode	230
+	glxflags	client-handcode server-handcode
+	alias		WindowPos3iv
+
+WindowPos3sARB(x, y, z)
+	return		void
+	param		x		CoordS in value
+	param		y		CoordS in value
+	param		z		CoordS in value
+	category	ARB_window_pos
+	vectorequiv	WindowPos3svARB
+	version		1.0
+	alias		WindowPos3s
+
+WindowPos3svARB(v)
+	return		void
+	param		v		CoordS in array [3]
+	category	ARB_window_pos
+	version		1.0
+	glxropcode	230
+	glxflags	client-handcode server-handcode
+	alias		WindowPos3sv
+
+###############################################################################
+#
+# ARB Extension #26
+# ARB_vertex_program commands
+#
+###############################################################################
+
+VertexAttrib1dARB(index, x)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float64 in value
+	category	ARB_vertex_program
+	version		1.3
+	vectorequiv	VertexAttrib1dvARB
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib1d
+
+VertexAttrib1dvARB(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float64 in array [1]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxropcode	4197
+	alias		VertexAttrib1dv
+
+VertexAttrib1fARB(index, x)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float32 in value
+	category	ARB_vertex_program
+	version		1.3
+	vectorequiv	VertexAttrib1fvARB
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib1f
+
+VertexAttrib1fvARB(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float32 in array [1]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxropcode	4193
+	alias		VertexAttrib1fv
+
+VertexAttrib1sARB(index, x)
+	return		void
+	param		index		UInt32 in value
+	param		x		Int16 in value
+	category	ARB_vertex_program
+	version		1.3
+	vectorequiv	VertexAttrib1svARB
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib1s
+
+VertexAttrib1svARB(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int16 in array [1]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxropcode	4189
+	alias		VertexAttrib1sv
+
+VertexAttrib2dARB(index, x, y)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	category	ARB_vertex_program
+	version		1.3
+	vectorequiv	VertexAttrib2dvARB
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib2d
+
+VertexAttrib2dvARB(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float64 in array [2]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxropcode	4198
+	alias		VertexAttrib2dv
+
+VertexAttrib2fARB(index, x, y)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	category	ARB_vertex_program
+	version		1.3
+	vectorequiv	VertexAttrib2fvARB
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib2f
+
+VertexAttrib2fvARB(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float32 in array [2]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxropcode	4194
+	alias		VertexAttrib2fv
+
+VertexAttrib2sARB(index, x, y)
+	return		void
+	param		index		UInt32 in value
+	param		x		Int16 in value
+	param		y		Int16 in value
+	category	ARB_vertex_program
+	version		1.3
+	vectorequiv	VertexAttrib2svARB
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib2s
+
+VertexAttrib2svARB(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int16 in array [2]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxropcode	4190
+	alias		VertexAttrib2sv
+
+VertexAttrib3dARB(index, x, y, z)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	param		z		Float64 in value
+	category	ARB_vertex_program
+	version		1.3
+	vectorequiv	VertexAttrib3dvARB
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib3d
+
+VertexAttrib3dvARB(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float64 in array [3]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxropcode	4199
+	alias		VertexAttrib3dv
+
+VertexAttrib3fARB(index, x, y, z)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	category	ARB_vertex_program
+	version		1.3
+	vectorequiv	VertexAttrib3fvARB
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib3f
+
+VertexAttrib3fvARB(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float32 in array [3]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxropcode	4195
+	alias		VertexAttrib3fv
+
+VertexAttrib3sARB(index, x, y, z)
+	return		void
+	param		index		UInt32 in value
+	param		x		Int16 in value
+	param		y		Int16 in value
+	param		z		Int16 in value
+	category	ARB_vertex_program
+	version		1.3
+	vectorequiv	VertexAttrib3svARB
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib3s
+
+VertexAttrib3svARB(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int16 in array [3]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxropcode	4191
+	alias		VertexAttrib3sv
+
+VertexAttrib4NbvARB(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int8 in array [4]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib4Nbv
+
+VertexAttrib4NivARB(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int32 in array [4]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib4Niv
+
+VertexAttrib4NsvARB(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int16 in array [4]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib4Nsv
+
+VertexAttrib4NubARB(index, x, y, z, w)
+	return		void
+	param		index		UInt32 in value
+	param		x		UInt8 in value
+	param		y		UInt8 in value
+	param		z		UInt8 in value
+	param		w		UInt8 in value
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib4Nub
+
+VertexAttrib4NubvARB(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt8 in array [4]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxropcode	4201
+	alias		VertexAttrib4Nubv
+
+VertexAttrib4NuivARB(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt32 in array [4]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib4Nuiv
+
+VertexAttrib4NusvARB(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt16 in array [4]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib4Nusv
+
+VertexAttrib4bvARB(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int8 in array [4]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib4bv
+
+VertexAttrib4dARB(index, x, y, z, w)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	param		z		Float64 in value
+	param		w		Float64 in value
+	category	ARB_vertex_program
+	version		1.3
+	vectorequiv	VertexAttrib4dvARB
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib4d
+
+VertexAttrib4dvARB(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float64 in array [4]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxropcode	4200
+	alias		VertexAttrib4dv
+
+VertexAttrib4fARB(index, x, y, z, w)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	param		w		Float32 in value
+	category	ARB_vertex_program
+	version		1.3
+	vectorequiv	VertexAttrib4fvARB
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib4f
+
+VertexAttrib4fvARB(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float32 in array [4]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxropcode	4196
+	alias		VertexAttrib4fv
+
+VertexAttrib4ivARB(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int32 in array [4]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib4iv
+
+VertexAttrib4sARB(index, x, y, z, w)
+	return		void
+	param		index		UInt32 in value
+	param		x		Int16 in value
+	param		y		Int16 in value
+	param		z		Int16 in value
+	param		w		Int16 in value
+	category	ARB_vertex_program
+	version		1.3
+	vectorequiv	VertexAttrib4svARB
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib4s
+
+VertexAttrib4svARB(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int16 in array [4]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxropcode	4192
+	alias		VertexAttrib4sv
+
+VertexAttrib4ubvARB(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt8 in array [4]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib4ubv
+
+VertexAttrib4uivARB(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt32 in array [4]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib4uiv
+
+VertexAttrib4usvARB(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt16 in array [4]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib4usv
+
+VertexAttribPointerARB(index, size, type, normalized, stride, pointer)
+	return		void
+	param		index		UInt32 in value
+	param		size		Int32 in value
+	param		type		VertexAttribPointerTypeARB in value
+	param		normalized	Boolean in value
+	param		stride		SizeI in value
+	param		pointer		Void in array [COMPSIZE(size/type/stride)] retained
+	dlflags		notlistable
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	alias		VertexAttribPointer
+
+EnableVertexAttribArrayARB(index)
+	return		void
+	param		index		UInt32 in value
+	dlflags		notlistable
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	alias		EnableVertexAttribArray
+
+DisableVertexAttribArrayARB(index)
+	return		void
+	param		index		UInt32 in value
+	dlflags		notlistable
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	alias		DisableVertexAttribArray
+
+ProgramStringARB(target, format, len, string)
+	return		void
+	param		target		ProgramTargetARB in value
+	param		format		ProgramFormatARB in value
+	param		len		SizeI in value
+	param		string		Void in array [len]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		667
+
+BindProgramARB(target, program)
+	return		void
+	param		target		ProgramTargetARB in value
+	param		program		UInt32 in value
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxropcode	4180
+	offset		579
+
+DeleteProgramsARB(n, programs)
+	return		void
+	param		n		SizeI in value
+	param		programs	UInt32 in array [n]
+	dlflags		notlistable
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxvendorpriv	1294
+	offset		580
+
+GenProgramsARB(n, programs)
+	return		void
+	param		n		SizeI in value
+	param		programs	UInt32 out array [n]
+	dlflags		notlistable
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxvendorpriv	1295
+	offset		582
+
+ProgramEnvParameter4dARB(target, index, x, y, z, w)
+	return		void
+	param		target		ProgramTargetARB in value
+	param		index		UInt32 in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	param		z		Float64 in value
+	param		w		Float64 in value
+	category	ARB_vertex_program
+	version		1.3
+	vectorequiv	ProgramEnvParameter4dvARB
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		668
+
+ProgramEnvParameter4dvARB(target, index, params)
+	return		void
+	param		target		ProgramTargetARB in value
+	param		index		UInt32 in value
+	param		params		Float64 in array [4]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		669
+
+ProgramEnvParameter4fARB(target, index, x, y, z, w)
+	return		void
+	param		target		ProgramTargetARB in value
+	param		index		UInt32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	param		w		Float32 in value
+	category	ARB_vertex_program
+	version		1.3
+	vectorequiv	ProgramEnvParameter4fvARB
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		670
+
+ProgramEnvParameter4fvARB(target, index, params)
+	return		void
+	param		target		ProgramTargetARB in value
+	param		index		UInt32 in value
+	param		params		Float32 in array [4]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		671
+
+ProgramLocalParameter4dARB(target, index, x, y, z, w)
+	return		void
+	param		target		ProgramTargetARB in value
+	param		index		UInt32 in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	param		z		Float64 in value
+	param		w		Float64 in value
+	category	ARB_vertex_program
+	version		1.3
+	vectorequiv	ProgramLocalParameter4dvARB
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		672
+
+ProgramLocalParameter4dvARB(target, index, params)
+	return		void
+	param		target		ProgramTargetARB in value
+	param		index		UInt32 in value
+	param		params		Float64 in array [4]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		673
+
+ProgramLocalParameter4fARB(target, index, x, y, z, w)
+	return		void
+	param		target		ProgramTargetARB in value
+	param		index		UInt32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	param		w		Float32 in value
+	category	ARB_vertex_program
+	version		1.3
+	vectorequiv	ProgramLocalParameter4fvARB
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		674
+
+ProgramLocalParameter4fvARB(target, index, params)
+	return		void
+	param		target		ProgramTargetARB in value
+	param		index		UInt32 in value
+	param		params		Float32 in array [4]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		675
+
+GetProgramEnvParameterdvARB(target, index, params)
+	return		void
+	param		target		ProgramTargetARB in value
+	param		index		UInt32 in value
+	param		params		Float64 out array [4]
+	dlflags		notlistable
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		676
+
+GetProgramEnvParameterfvARB(target, index, params)
+	return		void
+	param		target		ProgramTargetARB in value
+	param		index		UInt32 in value
+	param		params		Float32 out array [4]
+	dlflags		notlistable
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		677
+
+GetProgramLocalParameterdvARB(target, index, params)
+	return		void
+	param		target		ProgramTargetARB in value
+	param		index		UInt32 in value
+	param		params		Float64 out array [4]
+	dlflags		notlistable
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		678
+
+GetProgramLocalParameterfvARB(target, index, params)
+	return		void
+	param		target		ProgramTargetARB in value
+	param		index		UInt32 in value
+	param		params		Float32 out array [4]
+	dlflags		notlistable
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		679
+
+GetProgramivARB(target, pname, params)
+	return		void
+	param		target		ProgramTargetARB in value
+	param		pname		ProgramPropertyARB in value
+	param		params		Int32 out array [1]
+	dlflags		notlistable
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		680
+
+GetProgramStringARB(target, pname, string)
+	return		void
+	param		target		ProgramTargetARB in value
+	param		pname		ProgramStringPropertyARB in value
+	param		string		Void out array [COMPSIZE(target,pname)]
+	dlflags		notlistable
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		681
+
+GetVertexAttribdvARB(index, pname, params)
+	return		void
+	param		index		UInt32 in value
+	param		pname		VertexAttribPropertyARB in value
+	param		params		Float64 out array [4]
+	dlflags		notlistable
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxvendorpriv	1301
+	alias		GetVertexAttribdv
+
+GetVertexAttribfvARB(index, pname, params)
+	return		void
+	param		index		UInt32 in value
+	param		pname		VertexAttribPropertyARB in value
+	param		params		Float32 out array [4]
+	dlflags		notlistable
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxvendorpriv	1302
+	alias		GetVertexAttribfv
+
+GetVertexAttribivARB(index, pname, params)
+	return		void
+	param		index		UInt32 in value
+	param		pname		VertexAttribPropertyARB in value
+	param		params		Int32 out array [4]
+	dlflags		notlistable
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxvendorpriv	1303
+	alias		GetVertexAttribiv
+
+GetVertexAttribPointervARB(index, pname, pointer)
+	return		void
+	param		index		UInt32 in value
+	param		pname		VertexAttribPointerPropertyARB in value
+	param		pointer		VoidPointer out array [1]
+	dlflags		notlistable
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	alias		GetVertexAttribPointerv
+
+IsProgramARB(program)
+	return		Boolean
+	param		program		UInt32 in value
+	dlflags		notlistable
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxvendorpriv	1304
+	alias		IsProgram
+
+
+###############################################################################
+#
+# ARB Extension #27
+# ARB_fragment_program commands
+#
+###############################################################################
+
+# All ARB_fragment_program entry points are shared with ARB_vertex_program,
+#   and are only included in that #define block, for now.
+newcategory: ARB_fragment_program
+passthru: /* All ARB_fragment_program entry points are shared with ARB_vertex_program. */
+
+###############################################################################
+#
+# ARB Extension #28
+# ARB_vertex_buffer_object commands
+#
+###############################################################################
+
+BindBufferARB(target, buffer)
+	return		void
+	param		target		BufferTargetARB in value
+	param		buffer		UInt32 in value
+	category	ARB_vertex_buffer_object
+	version		1.2
+	extension
+	alias		BindBuffer
+
+DeleteBuffersARB(n, buffers)
+	return		void
+	param		n		SizeI in value
+	param		buffers		ConstUInt32 in array [n]
+	category	ARB_vertex_buffer_object
+	version		1.2
+	extension
+	alias		DeleteBuffers
+
+GenBuffersARB(n, buffers)
+	return		void
+	param		n		SizeI in value
+	param		buffers		UInt32 out array [n]
+	category	ARB_vertex_buffer_object
+	version		1.2
+	extension
+	alias		GenBuffers
+
+IsBufferARB(buffer)
+	return		Boolean
+	param		buffer		UInt32 in value
+	category	ARB_vertex_buffer_object
+	version		1.2
+	extension
+	alias		IsBuffer
+
+BufferDataARB(target, size, data, usage)
+	return		void
+	param		target		BufferTargetARB in value
+	param		size		BufferSizeARB in value
+	param		data		ConstVoid in array [size]
+	param		usage		BufferUsageARB in value
+	category	ARB_vertex_buffer_object
+	version		1.2
+	extension
+	alias		BufferData
+
+BufferSubDataARB(target, offset, size, data)
+	return		void
+	param		target		BufferTargetARB in value
+	param		offset		BufferOffsetARB in value
+	param		size		BufferSizeARB in value
+	param		data		ConstVoid in array [size]
+	category	ARB_vertex_buffer_object
+	version		1.2
+	extension
+	alias		BufferSubData
+
+GetBufferSubDataARB(target, offset, size, data)
+	return		void
+	param		target		BufferTargetARB in value
+	param		offset		BufferOffsetARB in value
+	param		size		BufferSizeARB in value
+	param		data		Void out array [size]
+	category	ARB_vertex_buffer_object
+	dlflags		notlistable
+	version		1.2
+	extension
+	alias		GetBufferSubData
+
+MapBufferARB(target, access)
+	return		VoidPointer
+	param		target		BufferTargetARB in value
+	param		access		BufferAccessARB in value
+	category	ARB_vertex_buffer_object
+	version		1.2
+	extension
+	alias		MapBuffer
+
+UnmapBufferARB(target)
+	return		Boolean
+	param		target		BufferTargetARB in value
+	category	ARB_vertex_buffer_object
+	version		1.2
+	extension
+	alias		UnmapBuffer
+
+GetBufferParameterivARB(target, pname, params)
+	return		void
+	param		target		BufferTargetARB in value
+	param		pname		BufferPNameARB in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	ARB_vertex_buffer_object
+	dlflags		notlistable
+	version		1.2
+	extension
+	alias		GetBufferParameteriv
+
+GetBufferPointervARB(target, pname, params)
+	return		void
+	param		target		BufferTargetARB in value
+	param		pname		BufferPointerNameARB in value
+	param		params		VoidPointer out array [1]
+	category	ARB_vertex_buffer_object
+	dlflags		notlistable
+	version		1.2
+	extension
+	alias		GetBufferPointerv
+
+###############################################################################
+#
+# ARB Extension #29
+# ARB_occlusion_query commands
+#
+###############################################################################
+
+GenQueriesARB(n, ids)
+	return		void
+	param		n		SizeI in value
+	param		ids		UInt32 out array [n]
+	category	ARB_occlusion_query
+	version		1.5
+	extension
+	alias		GenQueries
+
+DeleteQueriesARB(n, ids)
+	return		void
+	param		n		SizeI in value
+	param		ids		UInt32 in array [n]
+	category	ARB_occlusion_query
+	version		1.5
+	extension
+	alias		DeleteQueries
+
+IsQueryARB(id)
+	return		Boolean
+	param		id		UInt32 in value
+	category	ARB_occlusion_query
+	version		1.5
+	extension
+	alias		IsQuery
+
+BeginQueryARB(target, id)
+	return		void
+	param		target		GLenum in value
+	param		id		UInt32 in value
+	category	ARB_occlusion_query
+	version		1.5
+	extension
+	alias		BeginQuery
+
+EndQueryARB(target)
+	return		void
+	param		target		GLenum in value
+	category	ARB_occlusion_query
+	version		1.5
+	extension
+	alias		EndQuery
+
+GetQueryivARB(target, pname, params)
+	return		void
+	param		target		GLenum in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [pname]
+	category	ARB_occlusion_query
+	dlflags		notlistable
+	version		1.5
+	extension
+	alias		GetQueryiv
+
+GetQueryObjectivARB(id, pname, params)
+	return		void
+	param		id		UInt32 in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [pname]
+	category	ARB_occlusion_query
+	dlflags		notlistable
+	version		1.5
+	extension
+	alias		GetQueryObjectiv
+
+GetQueryObjectuivARB(id, pname, params)
+	return		void
+	param		id		UInt32 in value
+	param		pname		GLenum in value
+	param		params		UInt32 out array [pname]
+	category	ARB_occlusion_query
+	dlflags		notlistable
+	version		1.5
+	extension
+	alias		GetQueryObjectuiv
+
+###############################################################################
+#
+# ARB Extension #30
+# ARB_shader_objects commands
+#
+###############################################################################
+
+DeleteObjectARB(obj)
+	return		void
+	param		obj		handleARB in value
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetHandleARB(pname)
+	return		handleARB
+	param		pname		GLenum in value
+	category	ARB_shader_objects
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+DetachObjectARB(containerObj, attachedObj)
+	return		void
+	param		containerObj	handleARB in value
+	param		attachedObj	handleARB in value
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		DetachShader
+
+CreateShaderObjectARB(shaderType)
+	return		handleARB
+	param		shaderType	GLenum in value
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		CreateShader
+
+ShaderSourceARB(shaderObj, count, string, length)
+	return		void
+	param		shaderObj	handleARB in value
+	param		count		SizeI in value
+	param		string		charPointerARB in array [count]
+	param		length		Int32 in array [1]
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		ShaderSource
+
+CompileShaderARB(shaderObj)
+	return		void
+	param		shaderObj	handleARB in value
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		CompileShader
+
+CreateProgramObjectARB()
+	return		handleARB
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		CreateProgram
+
+AttachObjectARB(containerObj, obj)
+	return		void
+	param		containerObj	handleARB in value
+	param		obj		handleARB in value
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		AttachShader
+
+LinkProgramARB(programObj)
+	return		void
+	param		programObj	handleARB in value
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		LinkProgram
+
+UseProgramObjectARB(programObj)
+	return		void
+	param		programObj	handleARB in value
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		UseProgram
+
+ValidateProgramARB(programObj)
+	return		void
+	param		programObj	handleARB in value
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		ValidateProgram
+
+Uniform1fARB(location, v0)
+	return		void
+	param		location	Int32 in value
+	param		v0		Float32 in value
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		Uniform1f
+
+Uniform2fARB(location, v0, v1)
+	return		void
+	param		location	Int32 in value
+	param		v0		Float32 in value
+	param		v1		Float32 in value
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		Uniform2f
+
+Uniform3fARB(location, v0, v1, v2)
+	return		void
+	param		location	Int32 in value
+	param		v0		Float32 in value
+	param		v1		Float32 in value
+	param		v2		Float32 in value
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		Uniform3f
+
+Uniform4fARB(location, v0, v1, v2, v3)
+	return		void
+	param		location	Int32 in value
+	param		v0		Float32 in value
+	param		v1		Float32 in value
+	param		v2		Float32 in value
+	param		v3		Float32 in value
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		Uniform4f
+
+Uniform1iARB(location, v0)
+	return		void
+	param		location	Int32 in value
+	param		v0		Int32 in value
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		Uniform1i
+
+Uniform2iARB(location, v0, v1)
+	return		void
+	param		location	Int32 in value
+	param		v0		Int32 in value
+	param		v1		Int32 in value
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		Uniform2i
+
+Uniform3iARB(location, v0, v1, v2)
+	return		void
+	param		location	Int32 in value
+	param		v0		Int32 in value
+	param		v1		Int32 in value
+	param		v2		Int32 in value
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		Uniform3i
+
+Uniform4iARB(location, v0, v1, v2, v3)
+	return		void
+	param		location	Int32 in value
+	param		v0		Int32 in value
+	param		v1		Int32 in value
+	param		v2		Int32 in value
+	param		v3		Int32 in value
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		Uniform4i
+
+Uniform1fvARB(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float32 in array [count]
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		Uniform1fv
+
+Uniform2fvARB(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float32 in array [count]
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		Uniform2fv
+
+Uniform3fvARB(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float32 in array [count]
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		Uniform3fv
+
+Uniform4fvARB(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float32 in array [count]
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		Uniform4fv
+
+Uniform1ivARB(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Int32 in array [count]
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		Uniform1iv
+
+Uniform2ivARB(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Int32 in array [count]
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		Uniform2iv
+
+Uniform3ivARB(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Int32 in array [count]
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		Uniform3iv
+
+Uniform4ivARB(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Int32 in array [count]
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		Uniform4iv
+
+UniformMatrix2fvARB(location, count, transpose, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [count]
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		UniformMatrix2fv
+
+UniformMatrix3fvARB(location, count, transpose, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [count]
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		UniformMatrix3fv
+
+UniformMatrix4fvARB(location, count, transpose, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [count]
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		UniformMatrix4fv
+
+GetObjectParameterfvARB(obj, pname, params)
+	return		void
+	param		obj		handleARB in value
+	param		pname		GLenum in value
+	param		params		Float32 out array [pname]
+	category	ARB_shader_objects
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetObjectParameterivARB(obj, pname, params)
+	return		void
+	param		obj		handleARB in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [pname]
+	category	ARB_shader_objects
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetInfoLogARB(obj, maxLength, length, infoLog)
+	return		void
+	param		obj		handleARB in value
+	param		maxLength	SizeI in value
+	param		length		SizeI out array [1]
+	param		infoLog		charARB out array [length]
+	category	ARB_shader_objects
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetAttachedObjectsARB(containerObj, maxCount, count, obj)
+	return		void
+	param		containerObj	handleARB in value
+	param		maxCount	SizeI in value
+	param		count		SizeI out array [1]
+	param		obj		handleARB out array [count]
+	category	ARB_shader_objects
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	alias		GetAttachedShaders
+
+GetUniformLocationARB(programObj, name)
+	return		Int32
+	param		programObj	handleARB in value
+	param		name		charARB in array []
+	category	ARB_shader_objects
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	alias		GetUniformLocation
+
+GetActiveUniformARB(programObj, index, maxLength, length, size, type, name)
+	return		void
+	param		programObj	handleARB in value
+	param		index		UInt32 in value
+	param		maxLength	SizeI in value
+	param		length		SizeI out array [1]
+	param		size		Int32 out array [1]
+	param		type		GLenum out array [1]
+	param		name		charARB out array []
+	category	ARB_shader_objects
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	alias		GetActiveUniform
+
+GetUniformfvARB(programObj, location, params)
+	return		void
+	param		programObj	handleARB in value
+	param		location	Int32 in value
+	param		params		Float32 out array [COMPSIZE(location)]
+	category	ARB_shader_objects
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	alias		GetUniformfv
+
+GetUniformivARB(programObj, location, params)
+	return		void
+	param		programObj	handleARB in value
+	param		location	Int32 in value
+	param		params		Int32 out array [COMPSIZE(location)]
+	category	ARB_shader_objects
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	alias		GetUniformiv
+
+GetShaderSourceARB(obj, maxLength, length, source)
+	return		void
+	param		obj		handleARB in value
+	param		maxLength	SizeI in value
+	param		length		SizeI out array [1]
+	param		source		charARB out array [length]
+	category	ARB_shader_objects
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	alias		GetShaderSource
+
+
+###############################################################################
+#
+# ARB Extension #31
+# ARB_vertex_shader commands
+#
+###############################################################################
+
+BindAttribLocationARB(programObj, index, name)
+	return		void
+	param		programObj	handleARB in value
+	param		index		UInt32 in value
+	param		name		charARB in array []
+	category	ARB_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		BindAttribLocation
+
+GetActiveAttribARB(programObj, index, maxLength, length, size, type, name)
+	return		void
+	param		programObj	handleARB in value
+	param		index		UInt32 in value
+	param		maxLength	SizeI in value
+	param		length		SizeI out array [1]
+	param		size		Int32 out array [1]
+	param		type		GLenum out array [1]
+	param		name		charARB out array []
+	category	ARB_vertex_shader
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	alias		GetActiveAttrib
+
+GetAttribLocationARB(programObj, name)
+	return		Int32
+	param		programObj	handleARB in value
+	param		name		charARB in array []
+	category	ARB_vertex_shader
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	alias		GetAttribLocation
+
+###############################################################################
+#
+# ARB Extension #32
+# ARB_fragment_shader commands
+#
+###############################################################################
+
+#  (none)
+newcategory: ARB_fragment_shader
+
+###############################################################################
+#
+# ARB Extension #33
+# ARB_shading_language_100 commands
+#
+###############################################################################
+
+#  (none)
+newcategory: ARB_shading_language_100
+
+###############################################################################
+#
+# ARB Extension #34
+# ARB_texture_non_power_of_two commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_texture_non_power_of_two
+
+###############################################################################
+#
+# ARB Extension #35
+# ARB_point_sprite commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_point_sprite
+
+###############################################################################
+#
+# ARB Extension #36
+# ARB_fragment_program_shadow commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_fragment_program_shadow
+
+###############################################################################
+#
+# ARB Extension #37
+# ARB_draw_buffers commands
+#
+###############################################################################
+
+DrawBuffersARB(n, bufs)
+	return		void
+	param		n		SizeI in value
+	param		bufs		DrawBufferModeATI in array [n]
+	category	ARB_draw_buffers
+	version		1.5
+	extension
+	alias		DrawBuffers
+
+###############################################################################
+#
+# ARB Extension #38
+# ARB_texture_rectangle commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_texture_rectangle
+
+###############################################################################
+#
+# ARB Extension #39
+# ARB_color_buffer_float commands
+#
+###############################################################################
+
+ClampColorARB(target, clamp)
+	return		void
+	param		target		ClampColorTargetARB in value
+	param		clamp		ClampColorModeARB in value
+	category	ARB_color_buffer_float
+	version		1.5
+	extension
+	glxropcode	234
+	glxflags	ignore
+	alias		ClampColor
+
+###############################################################################
+#
+# ARB Extension #40
+# ARB_half_float_pixel commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_half_float_pixel
+
+###############################################################################
+#
+# ARB Extension #41
+# ARB_texture_float commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_texture_float
+
+###############################################################################
+#
+# ARB Extension #42
+# ARB_pixel_buffer_object commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_pixel_buffer_object
+
+###############################################################################
+#
+# ARB Extension #43
+# ARB_depth_buffer_float commands (also OpenGL 3.0)
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_depth_buffer_float
+
+###############################################################################
+#
+# ARB Extension #44
+# ARB_draw_instanced commands
+#
+###############################################################################
+
+DrawArraysInstancedARB(mode, first, count, primcount)
+	return		void
+	param		mode		BeginMode in value
+	param		first		Int32 in value
+	param		count		SizeI in value
+	param		primcount	SizeI in value
+	category	ARB_draw_instanced
+	version		2.0
+	extension	soft WINSOFT
+	dlflags		notlistable
+	vectorequiv	ArrayElement
+	glfflags	ignore
+	glxflags	ignore
+	alias		DrawArraysInstanced
+
+DrawElementsInstancedARB(mode, count, type, indices, primcount)
+	return		void
+	param		mode		BeginMode in value
+	param		count		SizeI in value
+	param		type		DrawElementsType in value
+	param		indices		Void in array [COMPSIZE(count/type)]
+	param		primcount	SizeI in value
+	category	ARB_draw_instanced
+	version		2.0
+	extension	soft WINSOFT
+	dlflags		notlistable
+	vectorequiv	ArrayElement
+	glfflags	ignore
+	glxflags	ignore
+	alias		DrawElementsInstanced
+
+###############################################################################
+#
+# ARB Extension #45
+# ARB_framebuffer_object commands (also OpenGL 3.0)
+#
+###############################################################################
+
+# Promoted from EXT_framebuffer_object
+IsRenderbuffer(renderbuffer)
+	return		Boolean
+	param		renderbuffer	UInt32 in value
+	category	ARB_framebuffer_object
+	version		3.0
+	extension
+	glxvendorpriv	1422
+	glxflags	ignore
+	offset		?
+
+# GLX opcode changed so it can be differentiated from BindRenderbufferEXT
+# (see ARB_framebuffer_object extension spec revision 23)
+BindRenderbuffer(target, renderbuffer)
+	return		void
+	param		target		RenderbufferTarget in value
+	param		renderbuffer	UInt32 in value
+	category	ARB_framebuffer_object
+	version		3.0
+	extension
+	glxropcode	235
+	glxflags	ignore
+	offset		?
+
+DeleteRenderbuffers(n, renderbuffers)
+	return		void
+	param		n		SizeI in value
+	param		renderbuffers	UInt32 in array [n]
+	category	ARB_framebuffer_object
+	version		3.0
+	extension
+	glxropcode	4317
+	glxflags	ignore
+	offset		?
+
+GenRenderbuffers(n, renderbuffers)
+	return		void
+	param		n		SizeI in value
+	param		renderbuffers	UInt32 out array [n]
+	category	ARB_framebuffer_object
+	version		3.0
+	extension
+	glxvendorpriv	1423
+	glxflags	ignore
+	offset		?
+
+RenderbufferStorage(target, internalformat, width, height)
+	return		void
+	param		target		RenderbufferTarget in value
+	param		internalformat	GLenum in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	category	ARB_framebuffer_object
+	version		3.0
+	extension
+	glxropcode	4318
+	glxflags	ignore
+	offset		?
+
+GetRenderbufferParameteriv(target, pname, params)
+	return		void
+	param		target		RenderbufferTarget in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	ARB_framebuffer_object
+	dlflags		notlistable
+	version		3.0
+	extension
+	glxvendorpriv	1424
+	glxflags	ignore
+	offset		?
+
+IsFramebuffer(framebuffer)
+	return		Boolean
+	param		framebuffer	UInt32 in value
+	category	ARB_framebuffer_object
+	version		3.0
+	extension
+	glxvendorpriv	1425
+	glxflags	ignore
+	offset		?
+
+# GLX opcode changed so it can be differentiated from BindFramebufferEXT
+# (see ARB_framebuffer_object extension spec revision 23)
+BindFramebuffer(target, framebuffer)
+	return		void
+	param		target		FramebufferTarget in value
+	param		framebuffer	UInt32 in value
+	category	ARB_framebuffer_object
+	version		3.0
+	extension
+	glxropcode	236
+	glxflags	ignore
+	offset		?
+
+DeleteFramebuffers(n, framebuffers)
+	return		void
+	param		n		SizeI in value
+	param		framebuffers	UInt32 in array [n]
+	category	ARB_framebuffer_object
+	version		3.0
+	extension
+	glxropcode	4320
+	glxflags	ignore
+	offset		?
+
+GenFramebuffers(n, framebuffers)
+	return		void
+	param		n		SizeI in value
+	param		framebuffers	UInt32 out array [n]
+	category	ARB_framebuffer_object
+	version		3.0
+	extension
+	glxvendorpriv	1426
+	glxflags	ignore
+	offset		?
+
+CheckFramebufferStatus(target)
+	return		GLenum
+	param		target		FramebufferTarget in value
+	category	ARB_framebuffer_object
+	version		3.0
+	extension
+	glxvendorpriv	1427
+	glxflags	ignore
+	offset		?
+
+FramebufferTexture1D(target, attachment, textarget, texture, level)
+	return		void
+	param		target		FramebufferTarget in value
+	param		attachment	FramebufferAttachment in value
+	param		textarget	GLenum in value
+	param		texture		UInt32 in value
+	param		level		Int32 in value
+	category	ARB_framebuffer_object
+	version		3.0
+	extension
+	glxropcode	4321
+	glxflags	ignore
+	offset		?
+
+FramebufferTexture2D(target, attachment, textarget, texture, level)
+	return		void
+	param		target		FramebufferTarget in value
+	param		attachment	FramebufferAttachment in value
+	param		textarget	GLenum in value
+	param		texture		UInt32 in value
+	param		level		Int32 in value
+	category	ARB_framebuffer_object
+	version		3.0
+	extension
+	glxropcode	4322
+	glxflags	ignore
+	offset		?
+
+FramebufferTexture3D(target, attachment, textarget, texture, level, zoffset)
+	return		void
+	param		target		FramebufferTarget in value
+	param		attachment	FramebufferAttachment in value
+	param		textarget	GLenum in value
+	param		texture		UInt32 in value
+	param		level		Int32 in value
+	param		zoffset		Int32 in value
+	category	ARB_framebuffer_object
+	version		3.0
+	extension
+	glxropcode	4323
+	glxflags	ignore
+	offset		?
+
+FramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer)
+	return		void
+	param		target		FramebufferTarget in value
+	param		attachment	FramebufferAttachment in value
+	param		renderbuffertarget	RenderbufferTarget in value
+	param		renderbuffer	UInt32 in value
+	category	ARB_framebuffer_object
+	version		3.0
+	extension
+	glxropcode	4324
+	glxflags	ignore
+	offset		?
+
+GetFramebufferAttachmentParameteriv(target, attachment, pname, params)
+	return		void
+	param		target		FramebufferTarget in value
+	param		attachment	FramebufferAttachment in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	ARB_framebuffer_object
+	dlflags		notlistable
+	version		3.0
+	extension
+	glxvendorpriv	1428
+	glxflags	ignore
+	offset		?
+
+GenerateMipmap(target)
+	return		void
+	param		target		GLenum in value
+	category	ARB_framebuffer_object
+	version		3.0
+	extension
+	glxropcode	4325
+	glxflags	ignore
+	offset		?
+
+# Promoted from EXT_framebuffer_blit
+BlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter)
+	return		void
+	param		srcX0		Int32 in value
+	param		srcY0		Int32 in value
+	param		srcX1		Int32 in value
+	param		srcY1		Int32 in value
+	param		dstX0		Int32 in value
+	param		dstY0		Int32 in value
+	param		dstX1		Int32 in value
+	param		dstY1		Int32 in value
+	param		mask		ClearBufferMask in value
+	param		filter		GLenum in value
+	category	ARB_framebuffer_object
+	version		3.0
+	glxropcode	4330
+	offset		?
+
+# Promoted from EXT_framebuffer_multisample
+RenderbufferStorageMultisample(target, samples, internalformat, width, height)
+	return		void
+	param		target		GLenum in value
+	param		samples		SizeI in value
+	param		internalformat	GLenum in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	category	ARB_framebuffer_object
+	version		3.0
+	glxropcode	4331
+	offset		?
+
+# Promoted from ARB_geometry_shader4
+FramebufferTextureLayer(target, attachment, texture, level, layer)
+	return		void
+	param		target		FramebufferTarget in value
+	param		attachment	FramebufferAttachment in value
+	param		texture		Texture in value
+	param		level		CheckedInt32 in value
+	param		layer		CheckedInt32 in value
+	category	ARB_framebuffer_object
+	version		3.0
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glfflags	ignore
+	glxropcode	237
+	offset		?
+
+
+###############################################################################
+#
+# ARB Extension #46
+# ARB_framebuffer_sRGB commands (also OpenGL 3.0)
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_framebuffer_sRGB
+
+###############################################################################
+#
+# ARB Extension #47
+# ARB_geometry_shader4 commands
+#
+###############################################################################
+
+ProgramParameteriARB(program, pname, value)
+	return		void
+	param		program		UInt32 in value
+	param		pname		ProgramParameterPName in value
+	param		value		Int32 in value
+	category	ARB_geometry_shader4
+	version		3.0
+	extension	soft WINSOFT
+	glfflags	ignore
+	glxflags	ignore
+	alias		ProgramParameteri
+
+FramebufferTextureARB(target, attachment, texture, level)
+	return		void
+	param		target		FramebufferTarget in value
+	param		attachment	FramebufferAttachment in value
+	param		texture		Texture in value
+	param		level		CheckedInt32 in value
+	category	ARB_geometry_shader4
+	version		3.0
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+
+FramebufferTextureLayerARB(target, attachment, texture, level, layer)
+	return		void
+	param		target		FramebufferTarget in value
+	param		attachment	FramebufferAttachment in value
+	param		texture		Texture in value
+	param		level		CheckedInt32 in value
+	param		layer		CheckedInt32 in value
+	category	ARB_geometry_shader4
+	version		3.0
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+	alias		FramebufferTextureLayer
+
+FramebufferTextureFaceARB(target, attachment, texture, level, face)
+	return		void
+	param		target		FramebufferTarget in value
+	param		attachment	FramebufferAttachment in value
+	param		texture		Texture in value
+	param		level		CheckedInt32 in value
+	param		face		TextureTarget in value
+	category	ARB_geometry_shader4
+	version		3.0
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+
+###############################################################################
+#
+# ARB Extension #48
+# ARB_half_float_vertex commands (also OpenGL 3.0)
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_half_float_vertex
+
+###############################################################################
+#
+# ARB Extension #49
+# ARB_instanced_arrays commands
+#
+###############################################################################
+
+VertexAttribDivisorARB(index, divisor)
+	return		void
+	param		index		UInt32 in value
+	param		divisor		UInt32 in value
+	category	ARB_instanced_arrays
+	version		2.0
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+###############################################################################
+#
+# ARB Extension #50
+# ARB_map_buffer_range commands (also OpenGL 3.0)
+#
+###############################################################################
+
+MapBufferRange(target, offset, length, access)
+	return		VoidPointer
+	param		target		BufferTargetARB in value
+	param		offset		BufferOffset in value
+	param		length		BufferSize in value
+	param		access		BufferAccessMask in value
+	category	ARB_map_buffer_range
+	version		3.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+# Promoted from APPLE_flush_buffer_range
+FlushMappedBufferRange(target, offset, length)
+	return		void
+	param		target		BufferTargetARB in value
+	param		offset		BufferOffset in value
+	param		length		BufferSize in value
+	category	ARB_map_buffer_range
+	version		3.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #51
+# ARB_texture_buffer_object commands
+#
+###############################################################################
+
+TexBufferARB(target, internalformat, buffer)
+	return		void
+	param		target		TextureTarget in value
+	param		internalformat	GLenum in value
+	param		buffer		UInt32 in value
+	category	ARB_texture_buffer_object
+	version		3.0
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	alias		TexBuffer
+
+###############################################################################
+#
+# ARB Extension #52
+# ARB_texture_compression_rgtc commands (also OpenGL 3.0)
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_texture_compression_rgtc
+
+###############################################################################
+#
+# ARB Extension #53
+# ARB_texture_rg commands (also OpenGL 3.0)
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_texture_rg
+
+###############################################################################
+#
+# ARB Extension #54
+# ARB_vertex_array_object commands (also OpenGL 3.0)
+#
+###############################################################################
+
+# Promoted from APPLE_vertex_array_object
+BindVertexArray(array)
+	return		void
+	param		array		UInt32 in value
+	category	ARB_vertex_array_object
+	version		3.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DeleteVertexArrays(n, arrays)
+	return		void
+	param		n		SizeI in value
+	param		arrays		UInt32 in array [n]
+	category	ARB_vertex_array_object
+	version		3.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GenVertexArrays(n, arrays)
+	return		void
+	param		n		SizeI in value
+	param		arrays		UInt32 out array [n]
+	category	ARB_vertex_array_object
+	version		3.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+IsVertexArray(array)
+	return		Boolean
+	param		array		UInt32 in value
+	category	ARB_vertex_array_object
+	version		3.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #55 - WGL_ARB_create_context
+# ARB Extension #56 - GLX_ARB_create_context
+#
+###############################################################################
+
+###############################################################################
+#
+# ARB Extension #57
+# ARB_uniform_buffer_object commands
+#
+###############################################################################
+
+GetUniformIndices(program, uniformCount, uniformNames, uniformIndices)
+	return		void
+	param		program		UInt32 in value
+	param		uniformCount	SizeI in value
+	param		uniformNames	ConstCharPointer in array [COMPSIZE(uniformCount)]
+	param		uniformIndices	UInt32 out array [COMPSIZE(uniformCount)]
+	category	ARB_uniform_buffer_object
+	dlflags		notlistable
+	version		2.0
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetActiveUniformsiv(program, uniformCount, uniformIndices, pname, params)
+	return		void
+	param		program		UInt32 in value
+	param		uniformCount	SizeI in value
+	param		uniformIndices	UInt32 in array [COMPSIZE(uniformCount)]
+	param		pname		GLenum in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	ARB_uniform_buffer_object
+	dlflags		notlistable
+	version		2.0
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetActiveUniformName(program, uniformIndex, bufSize, length, uniformName)
+	return		void
+	param		program		UInt32 in value
+	param		uniformIndex	UInt32 in value
+	param		bufSize		SizeI in value
+	param		length		SizeI out array [1]
+	param		uniformName	Char out array [bufSize]
+	category	ARB_uniform_buffer_object
+	dlflags		notlistable
+	version		2.0
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetUniformBlockIndex(program, uniformBlockName)
+	return		UInt32
+	param		program		UInt32 in value
+	param		uniformBlockName	Char in array [COMPSIZE()]
+	category	ARB_uniform_buffer_object
+	dlflags		notlistable
+	version		2.0
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetActiveUniformBlockiv(program, uniformBlockIndex, pname, params)
+	return		void
+	param		program		UInt32 in value
+	param		uniformBlockIndex	UInt32 in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	ARB_uniform_buffer_object
+	dlflags		notlistable
+	version		2.0
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetActiveUniformBlockName(program, uniformBlockIndex, bufSize, length, uniformBlockName)
+	return		void
+	param		program		UInt32 in value
+	param		uniformBlockIndex	UInt32 in value
+	param		bufSize		SizeI in value
+	param		length		SizeI out array [1]
+	param		uniformBlockName	Char out array [bufSize]
+	category	ARB_uniform_buffer_object
+	dlflags		notlistable
+	version		2.0
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+UniformBlockBinding(program, uniformBlockIndex, uniformBlockBinding)
+	return		void
+	param		program		UInt32 in value
+	param		uniformBlockIndex	UInt32 in value
+	param		uniformBlockBinding	UInt32 in value
+	category	ARB_uniform_buffer_object
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+
+###############################################################################
+#
+# ARB Extension #58
+# ARB_compatibility commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_compatibility
+
+###############################################################################
+#
+# ARB Extension #59
+# ARB_copy_buffer commands
+#
+###############################################################################
+
+CopyBufferSubData(readTarget, writeTarget, readOffset, writeOffset, size)
+	return		void
+	param		readTarget	GLenum in value
+	param		writeTarget	GLenum in value
+	param		readOffset	BufferOffset in value
+	param		writeOffset	BufferOffset in value
+	param		size		BufferSize in value
+	category	ARB_copy_buffer
+	version		3.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #60
+# ARB_shader_texture_lod commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_shader_texture_lod
+
+###############################################################################
+#
+# ARB Extension #61
+# ARB_depth_clamp commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_depth_clamp
+
+###############################################################################
+#
+# ARB Extension #62
+# ARB_draw_elements_base_vertex commands
+#
+###############################################################################
+
+DrawElementsBaseVertex(mode, count, type, indices, basevertex)
+	return		void
+	param		mode		GLenum in value
+	param		count		SizeI in value
+	param		type		DrawElementsType in value
+	param		indices		Void in array [COMPSIZE(count/type)]
+	param		basevertex	Int32 in value
+	category	ARB_draw_elements_base_vertex
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DrawRangeElementsBaseVertex(mode, start, end, count, type, indices, basevertex)
+	return		void
+	param		mode		GLenum in value
+	param		start		UInt32 in value
+	param		end		UInt32 in value
+	param		count		SizeI in value
+	param		type		DrawElementsType in value
+	param		indices		Void in array [COMPSIZE(count/type)]
+	param		basevertex	Int32 in value
+	category	ARB_draw_elements_base_vertex
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DrawElementsInstancedBaseVertex(mode, count, type, indices, instancecount, basevertex)
+	return		void
+	param		mode		GLenum in value
+	param		count		SizeI in value
+	param		type		DrawElementsType in value
+	param		indices		Void in array [COMPSIZE(count/type)]
+	param		instancecount	SizeI in value
+	param		basevertex	Int32 in value
+	category	ARB_draw_elements_base_vertex
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MultiDrawElementsBaseVertex(mode, count, type, indices, drawcount, basevertex)
+	return		void
+	param		mode		GLenum in value
+	param		count		SizeI in array [COMPSIZE(drawcount)]
+	param		type		DrawElementsType in value
+	param		indices		ConstVoidPointer in array [COMPSIZE(drawcount)]
+	param		drawcount	SizeI in value
+	param		basevertex	Int32 in array [COMPSIZE(drawcount)]
+	category	ARB_draw_elements_base_vertex
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #63
+# ARB_fragment_coord_conventions commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_fragment_coord_conventions
+
+###############################################################################
+#
+# ARB Extension #64
+# ARB_provoking_vertex commands
+#
+###############################################################################
+
+ProvokingVertex(mode)
+	return		void
+	param		mode		GLenum in value
+	category	ARB_provoking_vertex
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #65
+# ARB_seamless_cube_map commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_seamless_cube_map
+
+###############################################################################
+#
+# ARB Extension #66
+# ARB_sync commands
+#
+###############################################################################
+
+FenceSync(condition, flags)
+	return		sync
+	param		condition	GLenum in value
+	param		flags		GLbitfield in value
+	category	ARB_sync
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+IsSync(sync)
+	return		Boolean
+	param		sync		sync in value
+	category	ARB_sync
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DeleteSync(sync)
+	return		void
+	param		sync		sync in value
+	category	ARB_sync
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ClientWaitSync(sync, flags, timeout)
+	return		GLenum
+	param		sync		sync in value
+	param		flags		GLbitfield in value
+	param		timeout		UInt64 in value
+	category	ARB_sync
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+WaitSync(sync, flags, timeout)
+	return		void
+	param		sync		sync in value
+	param		flags		GLbitfield in value
+	param		timeout		UInt64 in value
+	category	ARB_sync
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetInteger64v(pname, params)
+	return		void
+	param		pname		GLenum in value
+	param		params		Int64 out array [COMPSIZE(pname)]
+	category	ARB_sync
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetSynciv(sync, pname, bufSize, length, values)
+	return		void
+	param		sync		sync in value
+	param		pname		GLenum in value
+	param		bufSize		SizeI in value
+	param		length		SizeI out array [1]
+	param		values		Int32 out array [length]
+	category	ARB_sync
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #67
+# ARB_texture_multisample commands
+#
+###############################################################################
+
+TexImage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations)
+	return		void
+	param		target		GLenum in value
+	param		samples		SizeI in value
+	param		internalformat	Int32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		fixedsamplelocations	Boolean in value
+	category	ARB_texture_multisample
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TexImage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations)
+	return		void
+	param		target		GLenum in value
+	param		samples		SizeI in value
+	param		internalformat	Int32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		fixedsamplelocations	Boolean in value
+	category	ARB_texture_multisample
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetMultisamplefv(pname, index, val)
+	return		void
+	param		pname		GLenum in value
+	param		index		UInt32 in value
+	param		val		Float32 out array [COMPSIZE(pname)]
+	category	ARB_texture_multisample
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+SampleMaski(index, mask)
+	return		void
+	param		index		UInt32 in value
+	param		mask		GLbitfield in value
+	category	ARB_texture_multisample
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #68
+# ARB_vertex_array_bgra commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_vertex_array_bgra
+
+###############################################################################
+#
+# ARB Extension #69
+# ARB_draw_buffers_blend commands
+#
+###############################################################################
+
+BlendEquationiARB(buf, mode)
+	return		void
+	param		buf		UInt32 in value
+	param		mode		GLenum in value
+	category	ARB_draw_buffers_blend
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+	alias		BlendEquationi
+
+BlendEquationSeparateiARB(buf, modeRGB, modeAlpha)
+	return		void
+	param		buf		UInt32 in value
+	param		modeRGB		GLenum in value
+	param		modeAlpha	GLenum in value
+	category	ARB_draw_buffers_blend
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+	alias		BlendEquationSeparatei
+
+BlendFunciARB(buf, src, dst)
+	return		void
+	param		buf		UInt32 in value
+	param		src		GLenum in value
+	param		dst		GLenum in value
+	category	ARB_draw_buffers_blend
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+	alias		BlendFunci
+
+BlendFuncSeparateiARB(buf, srcRGB, dstRGB, srcAlpha, dstAlpha)
+	return		void
+	param		buf		UInt32 in value
+	param		srcRGB		GLenum in value
+	param		dstRGB		GLenum in value
+	param		srcAlpha	GLenum in value
+	param		dstAlpha	GLenum in value
+	category	ARB_draw_buffers_blend
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+	alias		BlendFuncSeparatei
+
+###############################################################################
+#
+# ARB Extension #70
+# ARB_sample_shading commands
+#
+###############################################################################
+
+MinSampleShadingARB(value)
+	return		void
+	param		value		ColorF in value
+	category	ARB_sample_shading
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+	alias		MinSampleShading
+
+###############################################################################
+#
+# ARB Extension #71
+# ARB_texture_cube_map_array commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_texture_cube_map_array
+
+###############################################################################
+#
+# ARB Extension #72
+# ARB_texture_gather commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_texture_gather
+
+###############################################################################
+#
+# ARB Extension #73
+# ARB_texture_query_lod commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_texture_query_lod
+
+###############################################################################
+#
+# ARB Extension #74 - WGL_ARB_create_context_profile
+# ARB Extension #75 - GLX_ARB_create_context_profile
+#
+###############################################################################
+
+###############################################################################
+#
+# ARB Extension #76
+# ARB_shading_language_include commands
+#
+###############################################################################
+
+NamedStringARB(type, namelen, name, stringlen, string)
+	return		void
+	param		type		GLenum in value
+	param		namelen		Int32 in value
+	param		name		Char in array [namelen]
+	param		stringlen	Int32 in value
+	param		string		Char in array [stringlen]
+	category	ARB_shading_language_include
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DeleteNamedStringARB(namelen, name)
+	return		void
+	param		namelen		Int32 in value
+	param		name		Char in array [namelen]
+	category	ARB_shading_language_include
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+CompileShaderIncludeARB(shader, count, path, length)
+	return		void
+	param		shader		UInt32 in value
+	param		count		SizeI in value
+	param		path		CharPointer in array [count]
+	param		length		Int32 in array [count]
+	category	ARB_shading_language_include
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+IsNamedStringARB(namelen, name)
+	return		Boolean
+	param		namelen		Int32 in value
+	param		name		Char in array [namelen]
+	category	ARB_shading_language_include
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetNamedStringARB(namelen, name, bufSize, stringlen, string)
+	return		void
+	param		namelen		Int32 in value
+	param		name		Char in array [namelen]
+	param		bufSize		SizeI in value
+	param		stringlen	Int32 out array [1]
+	param		string		Char out array [bufSize]
+	category	ARB_shading_language_include
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetNamedStringivARB(namelen, name, pname, params)
+	return		void
+	param		namelen		Int32 in value
+	param		name		Char in array [namelen]
+	param		pname		GLenum in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	ARB_shading_language_include
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #77
+# ARB_texture_compression_bptc commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_texture_compression_bptc
+
+###############################################################################
+#
+# ARB Extension #78
+# ARB_blend_func_extended commands
+#
+###############################################################################
+
+BindFragDataLocationIndexed(program, colorNumber, index, name)
+	return		void
+	param		program		UInt32 in value
+	param		colorNumber	UInt32 in value
+	param		index		UInt32 in value
+	param		name		Char in array []
+	category	ARB_blend_func_extended
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetFragDataIndex(program, name)
+	return		Int32
+	param		program		UInt32 in value
+	param		name		Char in array []
+	category	ARB_blend_func_extended
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #79
+# ARB_explicit_attrib_location commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_explicit_attrib_location
+
+###############################################################################
+#
+# ARB Extension #80
+# ARB_occlusion_query2 commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_occlusion_query2
+
+###############################################################################
+#
+# ARB Extension #81
+# ARB_sampler_objects commands
+#
+###############################################################################
+
+GenSamplers(count, samplers)
+	return		void
+	param		count		SizeI in value
+	param		samplers	UInt32 out array [count]
+	category	ARB_sampler_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DeleteSamplers(count, samplers)
+	return		void
+	param		count		SizeI in value
+	param		samplers	UInt32 in array [count]
+	category	ARB_sampler_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+IsSampler(sampler)
+	return		Boolean
+	param		sampler		UInt32 in value
+	category	ARB_sampler_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+BindSampler(unit, sampler)
+	return		void
+	param		unit		UInt32 in value
+	param		sampler		UInt32 in value
+	category	ARB_sampler_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+SamplerParameteri(sampler, pname, param)
+	return		void
+	param		sampler		UInt32 in value
+	param		pname		GLenum in value
+	param		param		Int32 in value
+	category	ARB_sampler_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+SamplerParameteriv(sampler, pname, param)
+	return		void
+	param		sampler		UInt32 in value
+	param		pname		GLenum in value
+	param		param		Int32 in array [COMPSIZE(pname)]
+	category	ARB_sampler_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+SamplerParameterf(sampler, pname, param)
+	return		void
+	param		sampler		UInt32 in value
+	param		pname		GLenum in value
+	param		param		Float32 in value
+	category	ARB_sampler_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+SamplerParameterfv(sampler, pname, param)
+	return		void
+	param		sampler		UInt32 in value
+	param		pname		GLenum in value
+	param		param		Float32 in array [COMPSIZE(pname)]
+	category	ARB_sampler_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+SamplerParameterIiv(sampler, pname, param)
+	return		void
+	param		sampler		UInt32 in value
+	param		pname		GLenum in value
+	param		param		Int32 in array [COMPSIZE(pname)]
+	category	ARB_sampler_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+SamplerParameterIuiv(sampler, pname, param)
+	return		void
+	param		sampler		UInt32 in value
+	param		pname		GLenum in value
+	param		param		UInt32 in array [COMPSIZE(pname)]
+	category	ARB_sampler_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetSamplerParameteriv(sampler, pname, params)
+	return		void
+	param		sampler		UInt32 in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	ARB_sampler_objects
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetSamplerParameterIiv(sampler, pname, params)
+	return		void
+	param		sampler		UInt32 in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	ARB_sampler_objects
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetSamplerParameterfv(sampler, pname, params)
+	return		void
+	param		sampler		UInt32 in value
+	param		pname		GLenum in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	ARB_sampler_objects
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetSamplerParameterIuiv(sampler, pname, params)
+	return		void
+	param		sampler		UInt32 in value
+	param		pname		GLenum in value
+	param		params		UInt32 out array [COMPSIZE(pname)]
+	category	ARB_sampler_objects
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #82
+# ARB_shader_bit_encoding commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_shader_bit_encoding
+
+###############################################################################
+#
+# ARB Extension #83
+# ARB_texture_rgb10_a2ui commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_texture_rgb10_a2ui
+
+###############################################################################
+#
+# ARB Extension #84
+# ARB_texture_swizzle commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_texture_swizzle
+
+###############################################################################
+#
+# ARB Extension #85
+# ARB_timer_query commands
+#
+###############################################################################
+
+QueryCounter(id, target)
+	return		void
+	param		id		UInt32 in value
+	param		target		GLenum in value
+	category	ARB_timer_query
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetQueryObjecti64v(id, pname, params)
+	return		void
+	param		id		UInt32 in value
+	param		pname		GLenum in value
+	param		params		Int64 out array [COMPSIZE(pname)]
+	category	ARB_timer_query
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetQueryObjectui64v(id, pname, params)
+	return		void
+	param		id		UInt32 in value
+	param		pname		GLenum in value
+	param		params		UInt64 out array [COMPSIZE(pname)]
+	category	ARB_timer_query
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #86
+# ARB_vertex_type_2_10_10_10_rev commands
+#
+###############################################################################
+
+VertexP2ui(type, value)
+	return		void
+	param		type		GLenum in value
+	param		value		UInt32 in value
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexP2uiv(type, value)
+	return		void
+	param		type		GLenum in value
+	param		value		UInt32 in array [1]
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexP3ui(type, value)
+	return		void
+	param		type		GLenum in value
+	param		value		UInt32 in value
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexP3uiv(type, value)
+	return		void
+	param		type		GLenum in value
+	param		value		UInt32 in array [1]
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexP4ui(type, value)
+	return		void
+	param		type		GLenum in value
+	param		value		UInt32 in value
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexP4uiv(type, value)
+	return		void
+	param		type		GLenum in value
+	param		value		UInt32 in array [1]
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TexCoordP1ui(type, coords)
+	return		void
+	param		type		GLenum in value
+	param		coords		UInt32 in value
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TexCoordP1uiv(type, coords)
+	return		void
+	param		type		GLenum in value
+	param		coords		UInt32 in array [1]
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TexCoordP2ui(type, coords)
+	return		void
+	param		type		GLenum in value
+	param		coords		UInt32 in value
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TexCoordP2uiv(type, coords)
+	return		void
+	param		type		GLenum in value
+	param		coords		UInt32 in array [1]
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TexCoordP3ui(type, coords)
+	return		void
+	param		type		GLenum in value
+	param		coords		UInt32 in value
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TexCoordP3uiv(type, coords)
+	return		void
+	param		type		GLenum in value
+	param		coords		UInt32 in array [1]
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TexCoordP4ui(type, coords)
+	return		void
+	param		type		GLenum in value
+	param		coords		UInt32 in value
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TexCoordP4uiv(type, coords)
+	return		void
+	param		type		GLenum in value
+	param		coords		UInt32 in array [1]
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MultiTexCoordP1ui(texture, type, coords)
+	return		void
+	param		texture		GLenum in value
+	param		type		GLenum in value
+	param		coords		UInt32 in value
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MultiTexCoordP1uiv(texture, type, coords)
+	return		void
+	param		texture		GLenum in value
+	param		type		GLenum in value
+	param		coords		UInt32 in array [1]
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MultiTexCoordP2ui(texture, type, coords)
+	return		void
+	param		texture		GLenum in value
+	param		type		GLenum in value
+	param		coords		UInt32 in value
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MultiTexCoordP2uiv(texture, type, coords)
+	return		void
+	param		texture		GLenum in value
+	param		type		GLenum in value
+	param		coords		UInt32 in array [1]
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MultiTexCoordP3ui(texture, type, coords)
+	return		void
+	param		texture		GLenum in value
+	param		type		GLenum in value
+	param		coords		UInt32 in value
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MultiTexCoordP3uiv(texture, type, coords)
+	return		void
+	param		texture		GLenum in value
+	param		type		GLenum in value
+	param		coords		UInt32 in array [1]
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MultiTexCoordP4ui(texture, type, coords)
+	return		void
+	param		texture		GLenum in value
+	param		type		GLenum in value
+	param		coords		UInt32 in value
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MultiTexCoordP4uiv(texture, type, coords)
+	return		void
+	param		texture		GLenum in value
+	param		type		GLenum in value
+	param		coords		UInt32 in array [1]
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+NormalP3ui(type, coords)
+	return		void
+	param		type		GLenum in value
+	param		coords		UInt32 in value
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+NormalP3uiv(type, coords)
+	return		void
+	param		type		GLenum in value
+	param		coords		UInt32 in array [1]
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ColorP3ui(type, color)
+	return		void
+	param		type		GLenum in value
+	param		color		UInt32 in value
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ColorP3uiv(type, color)
+	return		void
+	param		type		GLenum in value
+	param		color		UInt32 in array [1]
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ColorP4ui(type, color)
+	return		void
+	param		type		GLenum in value
+	param		color		UInt32 in value
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ColorP4uiv(type, color)
+	return		void
+	param		type		GLenum in value
+	param		color		UInt32 in array [1]
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+SecondaryColorP3ui(type, color)
+	return		void
+	param		type		GLenum in value
+	param		color		UInt32 in value
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+SecondaryColorP3uiv(type, color)
+	return		void
+	param		type		GLenum in value
+	param		color		UInt32 in array [1]
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribP1ui(index, type, normalized, value)
+	return		void
+	param		index		UInt32 in value
+	param		type		GLenum in value
+	param		normalized	Boolean in value
+	param		value		UInt32 in value
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribP1uiv(index, type, normalized, value)
+	return		void
+	param		index		UInt32 in value
+	param		type		GLenum in value
+	param		normalized	Boolean in value
+	param		value		UInt32 in array [1]
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribP2ui(index, type, normalized, value)
+	return		void
+	param		index		UInt32 in value
+	param		type		GLenum in value
+	param		normalized	Boolean in value
+	param		value		UInt32 in value
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribP2uiv(index, type, normalized, value)
+	return		void
+	param		index		UInt32 in value
+	param		type		GLenum in value
+	param		normalized	Boolean in value
+	param		value		UInt32 in array [1]
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribP3ui(index, type, normalized, value)
+	return		void
+	param		index		UInt32 in value
+	param		type		GLenum in value
+	param		normalized	Boolean in value
+	param		value		UInt32 in value
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribP3uiv(index, type, normalized, value)
+	return		void
+	param		index		UInt32 in value
+	param		type		GLenum in value
+	param		normalized	Boolean in value
+	param		value		UInt32 in array [1]
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribP4ui(index, type, normalized, value)
+	return		void
+	param		index		UInt32 in value
+	param		type		GLenum in value
+	param		normalized	Boolean in value
+	param		value		UInt32 in value
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribP4uiv(index, type, normalized, value)
+	return		void
+	param		index		UInt32 in value
+	param		type		GLenum in value
+	param		normalized	Boolean in value
+	param		value		UInt32 in array [1]
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #87
+# ARB_draw_indirect commands
+#
+###############################################################################
+
+DrawArraysIndirect(mode, indirect)
+	return		void
+	param		mode		GLenum in value
+	param		indirect	Void in array []
+	category	ARB_draw_indirect
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DrawElementsIndirect(mode, type, indirect)
+	return		void
+	param		mode		GLenum in value
+	param		type		GLenum in value
+	param		indirect	Void in array []
+	category	ARB_draw_indirect
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #88
+# ARB_gpu_shader5 commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_gpu_shader5
+
+###############################################################################
+#
+# ARB Extension #89
+# ARB_gpu_shader_fp64 commands
+#
+###############################################################################
+
+Uniform1d(location, x)
+	return		void
+	param		location	Int32 in value
+	param		x		Float64 in value
+	category	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform2d(location, x, y)
+	return		void
+	param		location	Int32 in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	category	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform3d(location, x, y, z)
+	return		void
+	param		location	Int32 in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	param		z		Float64 in value
+	category	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform4d(location, x, y, z, w)
+	return		void
+	param		location	Int32 in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	param		z		Float64 in value
+	param		w		Float64 in value
+	category	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform1dv(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float64 in array [count]
+	category	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform2dv(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float64 in array [count]
+	category	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform3dv(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float64 in array [count]
+	category	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform4dv(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float64 in array [count]
+	category	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+UniformMatrix2dv(location, count, transpose, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float64 in array [count]
+	category	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+UniformMatrix3dv(location, count, transpose, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float64 in array [count]
+	category	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+UniformMatrix4dv(location, count, transpose, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float64 in array [count]
+	category	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+UniformMatrix2x3dv(location, count, transpose, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float64 in array [count]
+	category	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+UniformMatrix2x4dv(location, count, transpose, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float64 in array [count]
+	category	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+UniformMatrix3x2dv(location, count, transpose, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float64 in array [count]
+	category	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+UniformMatrix3x4dv(location, count, transpose, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float64 in array [count]
+	category	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+UniformMatrix4x2dv(location, count, transpose, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float64 in array [count]
+	category	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+UniformMatrix4x3dv(location, count, transpose, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float64 in array [count]
+	category	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetUniformdv(program, location, params)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		params		Float64 out array [COMPSIZE(location)]
+	category	ARB_gpu_shader_fp64
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #90
+# ARB_shader_subroutine commands
+#
+###############################################################################
+
+GetSubroutineUniformLocation(program, shadertype, name)
+	return		Int32
+	param		program		UInt32 in value
+	param		shadertype	GLenum in value
+	param		name		Char in array []
+	category	ARB_shader_subroutine
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetSubroutineIndex(program, shadertype, name)
+	return		UInt32
+	param		program		UInt32 in value
+	param		shadertype	GLenum in value
+	param		name		Char in array []
+	category	ARB_shader_subroutine
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetActiveSubroutineUniformiv(program, shadertype, index, pname, values)
+	return		void
+	param		program		UInt32 in value
+	param		shadertype	GLenum in value
+	param		index		UInt32 in value
+	param		pname		GLenum in value
+	param		values		Int32 out array [COMPSIZE(pname)]
+	category	ARB_shader_subroutine
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetActiveSubroutineUniformName(program, shadertype, index, bufsize, length, name)
+	return		void
+	param		program		UInt32 in value
+	param		shadertype	GLenum in value
+	param		index		UInt32 in value
+	param		bufsize		SizeI in value
+	param		length		SizeI out array [1]
+	param		name		Char out array [bufsize]
+	category	ARB_shader_subroutine
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetActiveSubroutineName(program, shadertype, index, bufsize, length, name)
+	return		void
+	param		program		UInt32 in value
+	param		shadertype	GLenum in value
+	param		index		UInt32 in value
+	param		bufsize		SizeI in value
+	param		length		SizeI out array [1]
+	param		name		Char out array [bufsize]
+	category	ARB_shader_subroutine
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+UniformSubroutinesuiv(shadertype, count, indices)
+	return		void
+	param		shadertype	GLenum in value
+	param		count		SizeI in value
+	param		indices		UInt32 in array [count]
+	category	ARB_shader_subroutine
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetUniformSubroutineuiv(shadertype, location, params)
+	return		void
+	param		shadertype	GLenum in value
+	param		location	Int32 in value
+	param		params		UInt32 out array [1]
+	category	ARB_shader_subroutine
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetProgramStageiv(program, shadertype, pname, values)
+	return		void
+	param		program		UInt32 in value
+	param		shadertype	GLenum in value
+	param		pname		GLenum in value
+	param		values		Int32 out array [1]
+	category	ARB_shader_subroutine
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #91
+# ARB_tessellation_shader commands
+#
+###############################################################################
+
+PatchParameteri(pname, value)
+	return		void
+	param		pname		GLenum in value
+	param		value		Int32 in value
+	category	ARB_tessellation_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+PatchParameterfv(pname, values)
+	return		void
+	param		pname		GLenum in value
+	param		values		Float32 in array [COMPSIZE(pname)]
+	category	ARB_tessellation_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #92
+# ARB_texture_buffer_object_rgb32 commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_texture_buffer_object_rgb32
+
+###############################################################################
+#
+# ARB Extension #93
+# ARB_transform_feedback2 commands
+#
+###############################################################################
+
+BindTransformFeedback(target, id)
+	return		void
+	param		target		GLenum in value
+	param		id		UInt32 in value
+	category	ARB_transform_feedback2
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DeleteTransformFeedbacks(n, ids)
+	return		void
+	param		n		SizeI in value
+	param		ids		UInt32 in array [n]
+	category	ARB_transform_feedback2
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GenTransformFeedbacks(n, ids)
+	return		void
+	param		n		SizeI in value
+	param		ids		UInt32 out array [n]
+	category	ARB_transform_feedback2
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+IsTransformFeedback(id)
+	return		Boolean
+	param		id		UInt32 in value
+	category	ARB_transform_feedback2
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+PauseTransformFeedback()
+	return		void
+	category	ARB_transform_feedback2
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ResumeTransformFeedback()
+	return		void
+	category	ARB_transform_feedback2
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DrawTransformFeedback(mode, id)
+	return		void
+	param		mode		GLenum in value
+	param		id		UInt32 in value
+	category	ARB_transform_feedback2
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #94
+# ARB_transform_feedback3 commands
+#
+###############################################################################
+
+DrawTransformFeedbackStream(mode, id, stream)
+	return		void
+	param		mode		GLenum in value
+	param		id		UInt32 in value
+	param		stream		UInt32 in value
+	category	ARB_transform_feedback3
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+BeginQueryIndexed(target, index, id)
+	return		void
+	param		target		GLenum in value
+	param		index		UInt32 in value
+	param		id		UInt32 in value
+	category	ARB_transform_feedback3
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+EndQueryIndexed(target, index)
+	return		void
+	param		target		GLenum in value
+	param		index		UInt32 in value
+	category	ARB_transform_feedback3
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetQueryIndexediv(target, index, pname, params)
+	return		void
+	param		target		GLenum in value
+	param		index		UInt32 in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	ARB_transform_feedback3
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #95
+# ARB_ES2_compatibility commands
+#
+###############################################################################
+
+ReleaseShaderCompiler()
+	return		void
+	category	ARB_ES2_compatibility
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ShaderBinary(count, shaders, binaryformat, binary, length)
+	return		void
+	param		count		SizeI in value
+	param		shaders		UInt32 in array [count]
+	param		binaryformat	GLenum in value
+	param		binary		Void in array [length]
+	param		length		SizeI in value
+	category	ARB_ES2_compatibility
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetShaderPrecisionFormat(shadertype, precisiontype, range, precision)
+	return		void
+	param		shadertype	GLenum in value
+	param		precisiontype	GLenum in value
+	param		range		Int32 out array [2]
+	param		precision	Int32 out array [2]
+	category	ARB_ES2_compatibility
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+DepthRangef(n, f)
+	return		void
+	param		n		Float32 in value
+	param		f		Float32 in value
+	category	ARB_ES2_compatibility
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ClearDepthf(d)
+	return		void
+	param		d		Float32 in value
+	category	ARB_ES2_compatibility
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #96
+# ARB_get_program_binary commands
+#
+###############################################################################
+
+GetProgramBinary(program, bufSize, length, binaryFormat, binary)
+	return		void
+	param		program		UInt32 in value
+	param		bufSize		SizeI in value
+	param		length		SizeI out array [1]
+	param		binaryFormat	GLenum out array [1]
+	param		binary		Void out array [COMPSIZE(length)]
+	category	ARB_get_program_binary
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+ProgramBinary(program, binaryFormat, binary, length)
+	return		void
+	param		program		UInt32 in value
+	param		binaryFormat	GLenum in value
+	param		binary		Void in array [length]
+	param		length		SizeI in value
+	category	ARB_get_program_binary
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramParameteri(program, pname, value)
+	return		void
+	param		program		UInt32 in value
+	param		pname		ProgramParameterPName in value
+	param		value		Int32 in value
+	category	ARB_get_program_binary
+	version		3.0
+	extension	soft WINSOFT
+	glfflags	ignore
+	glxflags	ignore
+
+###############################################################################
+#
+# ARB Extension #97
+# ARB_separate_shader_objects commands
+#
+###############################################################################
+
+UseProgramStages(pipeline, stages, program)
+	return		void
+	param		pipeline	UInt32 in value
+	param		stages		GLbitfield in value
+	param		program		UInt32 in value
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ActiveShaderProgram(pipeline, program)
+	return		void
+	param		pipeline	UInt32 in value
+	param		program		UInt32 in value
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+CreateShaderProgramv(type, count, strings)
+	return		UInt32
+	param		type		GLenum in value
+	param		count		SizeI in value
+	param		strings		ConstCharPointer in array [count]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+BindProgramPipeline(pipeline)
+	return		void
+	param		pipeline	UInt32 in value
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DeleteProgramPipelines(n, pipelines)
+	return		void
+	param		n		SizeI in value
+	param		pipelines	UInt32 in array [n]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GenProgramPipelines(n, pipelines)
+	return		void
+	param		n		SizeI in value
+	param		pipelines	UInt32 out array [n]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+IsProgramPipeline(pipeline)
+	return		Boolean
+	param		pipeline	UInt32 in value
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+#@ ProgramParameteri also in ARB_get_program_binary
+
+GetProgramPipelineiv(pipeline, pname, params)
+	return		void
+	param		pipeline	UInt32 in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	ARB_separate_shader_objects
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform1i(program, location, v0)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		Int32 in value
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform1iv(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Int32 in array [1]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform1f(program, location, v0)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		Float32 in value
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform1fv(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float32 in array [1]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform1d(program, location, v0)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		Float64 in value
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform1dv(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float64 in array [1]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform1ui(program, location, v0)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		UInt32 in value
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform1uiv(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt32 in array [1]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform2i(program, location, v0, v1)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		Int32 in value
+	param		v1		Int32 in value
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform2iv(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Int32 in array [2]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform2f(program, location, v0, v1)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		Float32 in value
+	param		v1		Float32 in value
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform2fv(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float32 in array [2]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform2d(program, location, v0, v1)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		Float64 in value
+	param		v1		Float64 in value
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform2dv(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float64 in array [2]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform2ui(program, location, v0, v1)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		UInt32 in value
+	param		v1		UInt32 in value
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform2uiv(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt32 in array [2]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform3i(program, location, v0, v1, v2)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		Int32 in value
+	param		v1		Int32 in value
+	param		v2		Int32 in value
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform3iv(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Int32 in array [3]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform3f(program, location, v0, v1, v2)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		Float32 in value
+	param		v1		Float32 in value
+	param		v2		Float32 in value
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform3fv(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float32 in array [3]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform3d(program, location, v0, v1, v2)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		Float64 in value
+	param		v1		Float64 in value
+	param		v2		Float64 in value
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform3dv(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float64 in array [3]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform3ui(program, location, v0, v1, v2)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		UInt32 in value
+	param		v1		UInt32 in value
+	param		v2		UInt32 in value
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform3uiv(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt32 in array [3]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform4i(program, location, v0, v1, v2, v3)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		Int32 in value
+	param		v1		Int32 in value
+	param		v2		Int32 in value
+	param		v3		Int32 in value
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform4iv(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Int32 in array [4]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform4f(program, location, v0, v1, v2, v3)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		Float32 in value
+	param		v1		Float32 in value
+	param		v2		Float32 in value
+	param		v3		Float32 in value
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform4fv(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float32 in array [4]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform4d(program, location, v0, v1, v2, v3)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		Float64 in value
+	param		v1		Float64 in value
+	param		v2		Float64 in value
+	param		v3		Float64 in value
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform4dv(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float64 in array [4]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform4ui(program, location, v0, v1, v2, v3)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		UInt32 in value
+	param		v1		UInt32 in value
+	param		v2		UInt32 in value
+	param		v3		UInt32 in value
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform4uiv(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt32 in array [4]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformMatrix2fv(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [2]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformMatrix3fv(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [3]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformMatrix4fv(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [4]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformMatrix2dv(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float64 in array [2]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformMatrix3dv(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float64 in array [3]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformMatrix4dv(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float64 in array [4]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformMatrix2x3fv(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [count]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformMatrix3x2fv(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [count]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformMatrix2x4fv(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [count]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformMatrix4x2fv(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [count]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformMatrix3x4fv(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [count]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformMatrix4x3fv(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [count]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformMatrix2x3dv(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float64 in array [count]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformMatrix3x2dv(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float64 in array [count]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformMatrix2x4dv(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float64 in array [count]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformMatrix4x2dv(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float64 in array [count]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformMatrix3x4dv(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float64 in array [count]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformMatrix4x3dv(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float64 in array [count]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ValidateProgramPipeline(pipeline)
+	return		void
+	param		pipeline	UInt32 in value
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetProgramPipelineInfoLog(pipeline, bufSize, length, infoLog)
+	return		void
+	param		pipeline	UInt32 in value
+	param		bufSize		SizeI in value
+	param		length		SizeI out array [1]
+	param		infoLog		Char out array [COMPSIZE(length)]
+	category	ARB_separate_shader_objects
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #98
+# ARB_shader_precision commands
+#
+###############################################################################
+
+###############################################################################
+#
+# ARB Extension #99
+# ARB_vertex_attrib_64bit commands
+#
+###############################################################################
+
+VertexAttribL1d(index, x)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float64 in value
+	category	ARB_vertex_attrib_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL2d(index, x, y)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	category	ARB_vertex_attrib_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL3d(index, x, y, z)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	param		z		Float64 in value
+	category	ARB_vertex_attrib_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL4d(index, x, y, z, w)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	param		z		Float64 in value
+	param		w		Float64 in value
+	category	ARB_vertex_attrib_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL1dv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float64 in array [1]
+	category	ARB_vertex_attrib_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL2dv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float64 in array [2]
+	category	ARB_vertex_attrib_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL3dv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float64 in array [3]
+	category	ARB_vertex_attrib_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL4dv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float64 in array [4]
+	category	ARB_vertex_attrib_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribLPointer(index, size, type, stride, pointer)
+	return		void
+	param		index		UInt32 in value
+	param		size		Int32 in value
+	param		type		GLenum in value
+	param		stride		SizeI in value
+	param		pointer		Void in array [size]
+	category	ARB_vertex_attrib_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetVertexAttribLdv(index, pname, params)
+	return		void
+	param		index		UInt32 in value
+	param		pname		GLenum in value
+	param		params		Float64 out array [COMPSIZE(pname)]
+	category	ARB_vertex_attrib_64bit
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+#@ VertexArrayVertexAttribLOffsetEXT also in EXT_vertex_attrib_64bit
+
+###############################################################################
+#
+# ARB Extension #100
+# ARB_viewport_array commands
+#
+###############################################################################
+
+ViewportArrayv(first, count, v)
+	return		void
+	param		first		UInt32 in value
+	param		count		SizeI in value
+	param		v		Float32 in array [COMPSIZE(count)]
+	category	ARB_viewport_array
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ViewportIndexedf(index, x, y, w, h)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		w		Float32 in value
+	param		h		Float32 in value
+	category	ARB_viewport_array
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ViewportIndexedfv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float32 in array [4]
+	category	ARB_viewport_array
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ScissorArrayv(first, count, v)
+	return		void
+	param		first		UInt32 in value
+	param		count		SizeI in value
+	param		v		Int32 in array [COMPSIZE(count)]
+	category	ARB_viewport_array
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ScissorIndexed(index, left, bottom, width, height)
+	return		void
+	param		index		UInt32 in value
+	param		left		Int32 in value
+	param		bottom		Int32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	category	ARB_viewport_array
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ScissorIndexedv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int32 in array [4]
+	category	ARB_viewport_array
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DepthRangeArrayv(first, count, v)
+	return		void
+	param		first		UInt32 in value
+	param		count		SizeI in value
+	param		v		Float64 in array [COMPSIZE(count)]
+	category	ARB_viewport_array
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DepthRangeIndexed(index, n, f)
+	return		void
+	param		index		UInt32 in value
+	param		n		Float64 in value
+	param		f		Float64 in value
+	category	ARB_viewport_array
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetFloati_v(target, index, data)
+	return		void
+	param		target		GLenum in value
+	param		index		UInt32 in value
+	param		data		Float32 out array [COMPSIZE(target)]
+	category	ARB_viewport_array
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetDoublei_v(target, index, data)
+	return		void
+	param		target		GLenum in value
+	param		index		UInt32 in value
+	param		data		Float64 out array [COMPSIZE(target)]
+	category	ARB_viewport_array
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #101 - GLX_ARB_create_context_robustness
+# ARB Extension #102 - WGL_ARB_create_context_robustness
+#
+###############################################################################
+
+###############################################################################
+#
+# ARB Extension #103
+# ARB_cl_event commands
+#
+###############################################################################
+
+CreateSyncFromCLeventARB(context, event, flags)
+	return		sync
+	param		context		cl_context in value
+	param		event		cl_event in value
+	param		flags		GLbitfield in value
+	category	ARB_cl_event
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #104
+# ARB_debug_output commands
+#
+###############################################################################
+
+DebugMessageControlARB(source, type, severity, count, ids, enabled)
+	return		void
+	param		source		GLenum in value
+	param		type		GLenum in value
+	param		severity	GLenum in value
+	param		count		SizeI in value
+	param		ids		UInt32 in array [count]
+	param		enabled		Boolean in value
+	category	ARB_debug_output
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DebugMessageInsertARB(source, type, id, severity, length, buf)
+	return		void
+	param		source		GLenum in value
+	param		type		GLenum in value
+	param		id		UInt32 in value
+	param		severity	GLenum in value
+	param		length		SizeI in value
+	param		buf		Char in array [length]
+	category	ARB_debug_output
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DebugMessageCallbackARB(callback, userParam)
+	return		void
+	param		callback	GLDEBUGPROCARB in value
+	param		userParam	Void in array [COMPSIZE(callback)]
+	category	ARB_debug_output
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetDebugMessageLogARB(count, bufsize, sources, types, ids, severities, lengths, messageLog)
+	return		UInt32
+	param		count		UInt32 in value
+	param		bufsize		SizeI in value
+	param		sources		GLenum out array [count]
+	param		types		GLenum out array [count]
+	param		ids		UInt32 out array [count]
+	param		severities	GLenum out array [count]
+	param		lengths		SizeI out array [count]
+	param		messageLog	Char out array [COMPSIZE(lengths)]
+	category	ARB_debug_output
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+# GetPointerv is redeclared in this extension
+
+###############################################################################
+#
+# ARB Extension #105
+# ARB_robustness commands
+#
+###############################################################################
+
+GetGraphicsResetStatusARB()
+	return		GLenum
+	category	ARB_robustness
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetnMapdvARB(target, query, bufSize, v)
+	return		void
+	param		target		GLenum in value
+	param		query		GLenum in value
+	param		bufSize		SizeI in value
+	param		v		Float64 out array [bufSize]
+	category	ARB_robustness
+	profile		compatibility
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetnMapfvARB(target, query, bufSize, v)
+	return		void
+	param		target		GLenum in value
+	param		query		GLenum in value
+	param		bufSize		SizeI in value
+	param		v		Float32 out array [bufSize]
+	category	ARB_robustness
+	profile		compatibility
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetnMapivARB(target, query, bufSize, v)
+	return		void
+	param		target		GLenum in value
+	param		query		GLenum in value
+	param		bufSize		SizeI in value
+	param		v		Int32 out array [bufSize]
+	category	ARB_robustness
+	profile		compatibility
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetnPixelMapfvARB(map, bufSize, values)
+	return		void
+	param		map		GLenum in value
+	param		bufSize		SizeI in value
+	param		values		Float32 out array [bufSize]
+	category	ARB_robustness
+	profile		compatibility
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetnPixelMapuivARB(map, bufSize, values)
+	return		void
+	param		map		GLenum in value
+	param		bufSize		SizeI in value
+	param		values		UInt32 out array [bufSize]
+	category	ARB_robustness
+	profile		compatibility
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetnPixelMapusvARB(map, bufSize, values)
+	return		void
+	param		map		GLenum in value
+	param		bufSize		SizeI in value
+	param		values		UInt16 out array [bufSize]
+	category	ARB_robustness
+	profile		compatibility
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetnPolygonStippleARB(bufSize, pattern)
+	return		void
+	param		bufSize		SizeI in value
+	param		pattern		UInt8 out array [bufSize]
+	category	ARB_robustness
+	profile		compatibility
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetnColorTableARB(target, format, type, bufSize, table)
+	return		void
+	param		target		GLenum in value
+	param		format		GLenum in value
+	param		type		GLenum in value
+	param		bufSize		SizeI in value
+	param		table		Void out array [bufSize]
+	category	ARB_robustness
+	profile		compatibility
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetnConvolutionFilterARB(target, format, type, bufSize, image)
+	return		void
+	param		target		GLenum in value
+	param		format		GLenum in value
+	param		type		GLenum in value
+	param		bufSize		SizeI in value
+	param		image		Void out array [bufSize]
+	category	ARB_robustness
+	profile		compatibility
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetnSeparableFilterARB(target, format, type, rowBufSize, row, columnBufSize, column, span)
+	return		void
+	param		target		GLenum in value
+	param		format		GLenum in value
+	param		type		GLenum in value
+	param		rowBufSize	SizeI in value
+	param		row		Void out array [rowBufSize]
+	param		columnBufSize	SizeI in value
+	param		column		Void out array [columnBufSize]
+	param		span		Void out array [0]
+	category	ARB_robustness
+	profile		compatibility
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetnHistogramARB(target, reset, format, type, bufSize, values)
+	return		void
+	param		target		GLenum in value
+	param		reset		Boolean in value
+	param		format		GLenum in value
+	param		type		GLenum in value
+	param		bufSize		SizeI in value
+	param		values		Void out array [bufSize]
+	category	ARB_robustness
+	profile		compatibility
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetnMinmaxARB(target, reset, format, type, bufSize, values)
+	return		void
+	param		target		GLenum in value
+	param		reset		Boolean in value
+	param		format		GLenum in value
+	param		type		GLenum in value
+	param		bufSize		SizeI in value
+	param		values		Void out array [bufSize]
+	category	ARB_robustness
+	profile		compatibility
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetnTexImageARB(target, level, format, type, bufSize, img)
+	return		void
+	param		target		GLenum in value
+	param		level		Int32 in value
+	param		format		GLenum in value
+	param		type		GLenum in value
+	param		bufSize		SizeI in value
+	param		img		Void out array [bufSize]
+	category	ARB_robustness
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+ReadnPixelsARB(x, y, width, height, format, type, bufSize, data)
+	return		void
+	param		x		Int32 in value
+	param		y		Int32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		format		GLenum in value
+	param		type		GLenum in value
+	param		bufSize		SizeI in value
+	param		data		Void out array [bufSize]
+	category	ARB_robustness
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetnCompressedTexImageARB(target, lod, bufSize, img)
+	return		void
+	param		target		GLenum in value
+	param		lod		Int32 in value
+	param		bufSize		SizeI in value
+	param		img		Void out array [bufSize]
+	category	ARB_robustness
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetnUniformfvARB(program, location, bufSize, params)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		bufSize		SizeI in value
+	param		params		Float32 out array [bufSize]
+	category	ARB_robustness
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetnUniformivARB(program, location, bufSize, params)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		bufSize		SizeI in value
+	param		params		Int32 out array [bufSize]
+	category	ARB_robustness
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetnUniformuivARB(program, location, bufSize, params)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		bufSize		SizeI in value
+	param		params		UInt32 out array [bufSize]
+	category	ARB_robustness
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetnUniformdvARB(program, location, bufSize, params)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		bufSize		SizeI in value
+	param		params		Float64 out array [bufSize]
+	category	ARB_robustness
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #106
+# ARB_shader_stencil_export commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_shader_stencil_export
+
+###############################################################################
+#
+# ARB Extension #107
+# ARB_base_instance commands
+#
+###############################################################################
+
+DrawArraysInstancedBaseInstance(mode, first, count, instancecount, baseinstance)
+	return		void
+	param		mode		GLenum in value
+	param		first		Int32 in value
+	param		count		SizeI in value
+	param		instancecount	SizeI in value
+	param		baseinstance	UInt32 in value
+	category	ARB_base_instance
+	version		4.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DrawElementsInstancedBaseInstance(mode, count, type, indices, instancecount, baseinstance)
+	return		void
+	param		mode		GLenum in value
+	param		count		SizeI in value
+	param		type		GLenum in value
+	param		indices		void in array [count]
+	param		instancecount	SizeI in value
+	param		baseinstance	UInt32 in value
+	category	ARB_base_instance
+	version		4.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DrawElementsInstancedBaseVertexBaseInstance(mode, count, type, indices, instancecount, basevertex, baseinstance)
+	return		void
+	param		mode		GLenum in value
+	param		count		SizeI in value
+	param		type		GLenum in value
+	param		indices		void in array [count]
+	param		instancecount	SizeI in value
+	param		basevertex	Int32 in value
+	param		baseinstance	UInt32 in value
+	category	ARB_base_instance
+	version		4.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #108
+# ARB_shading_language_420pack commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_shading_language_420pack
+
+###############################################################################
+#
+# ARB Extension #109
+# ARB_transform_feedback_instanced commands
+#
+###############################################################################
+
+DrawTransformFeedbackInstanced(mode, id, instancecount)
+	return		void
+	param		mode		GLenum in value
+	param		id		UInt32 in value
+	param		instancecount	SizeI in value
+	category	ARB_transform_feedback_instanced
+	version		4.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DrawTransformFeedbackStreamInstanced(mode, id, stream, instancecount)
+	return		void
+	param		mode		GLenum in value
+	param		id		UInt32 in value
+	param		stream		UInt32 in value
+	param		instancecount	SizeI in value
+	category	ARB_transform_feedback_instanced
+	version		4.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #110
+# ARB_compressed_texture_pixel_storage commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_compressed_texture_pixel_storage
+
+###############################################################################
+#
+# ARB Extension #111
+# ARB_conservative_depth commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_conservative_depth
+
+###############################################################################
+#
+# ARB Extension #112
+# ARB_internalformat_query commands
+#
+###############################################################################
+
+GetInternalformativ(target, internalformat, pname, bufSize, params)
+	return		void
+	param		target		GLenum in value
+	param		internalformat	GLenum in value
+	param		pname		GLenum in value
+	param		bufSize		SizeI in value
+	param		params		Int32 out array [bufSize]
+	category	ARB_internalformat_query
+	dlflags		notlistable
+	version		4.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #113
+# ARB_map_buffer_alignment commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_map_buffer_alignment
+
+###############################################################################
+#
+# ARB Extension #114
+# ARB_shader_atomic_counters commands
+#
+###############################################################################
+
+GetActiveAtomicCounterBufferiv(program, bufferIndex, pname, params)
+	return		void
+	param		program		UInt32 in value
+	param		bufferIndex	UInt32 in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	ARB_shader_atomic_counters
+	dlflags		notlistable
+	version		4.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #115
+# ARB_shader_image_load_store commands
+#
+###############################################################################
+
+BindImageTexture(unit, texture, level, layered, layer, access, format)
+	return		void
+	param		unit		UInt32 in value
+	param		texture		UInt32 in value
+	param		level		Int32 in value
+	param		layered		Boolean in value
+	param		layer		Int32 in value
+	param		access		GLenum in value
+	param		format		GLenum in value
+	category	ARB_shader_image_load_store
+	version		4.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MemoryBarrier(barriers)
+	return		void
+	param		barriers	GLbitfield in value
+	category	ARB_shader_image_load_store
+	version		4.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #116
+# ARB_shading_language_packing commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_shading_language_packing
+
+###############################################################################
+#
+# ARB Extension #117
+# ARB_texture_storage commands
+#
+###############################################################################
+
+TexStorage1D(target, levels, internalformat, width)
+	return		void
+	param		target		GLenum in value
+	param		levels		SizeI in value
+	param		internalformat	GLenum in value
+	param		width		SizeI in value
+	category	ARB_texture_storage
+	version		4.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TexStorage2D(target, levels, internalformat, width, height)
+	return		void
+	param		target		GLenum in value
+	param		levels		SizeI in value
+	param		internalformat	GLenum in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	category	ARB_texture_storage
+	version		4.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TexStorage3D(target, levels, internalformat, width, height, depth)
+	return		void
+	param		target		GLenum in value
+	param		levels		SizeI in value
+	param		internalformat	GLenum in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	category	ARB_texture_storage
+	version		4.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TextureStorage1DEXT(texture, target, levels, internalformat, width)
+	return		void
+	param		texture		UInt32 in value
+	param		target		GLenum in value
+	param		levels		SizeI in value
+	param		internalformat	GLenum in value
+	param		width		SizeI in value
+	category	ARB_texture_storage
+	version		4.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TextureStorage2DEXT(texture, target, levels, internalformat, width, height)
+	return		void
+	param		texture		UInt32 in value
+	param		target		GLenum in value
+	param		levels		SizeI in value
+	param		internalformat	GLenum in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	category	ARB_texture_storage
+	version		4.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TextureStorage3DEXT(texture, target, levels, internalformat, width, height, depth)
+	return		void
+	param		texture		UInt32 in value
+	param		target		GLenum in value
+	param		levels		SizeI in value
+	param		internalformat	GLenum in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	category	ARB_texture_storage
+	version		4.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #ARB118
+# KHR_texture_compression_astc_ldr commands
+#
+###############################################################################
+
+# (none)
+newcategory: KHR_texture_compression_astc_ldr
+
+###############################################################################
+#
+# Extension #ARB119
+# KHR_debug commands
+#
+###############################################################################
+
+# Promoted from ARB_debug_output
+DebugMessageControl(source, type, severity, count, ids, enabled)
+	return		void
+	param		source		GLenum in value
+	param		type		GLenum in value
+	param		severity	GLenum in value
+	param		count		SizeI in value
+	param		ids		UInt32 in array [count]
+	param		enabled		Boolean in value
+	category	KHR_debug
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DebugMessageInsert(source, type, id, severity, length, buf)
+	return		void
+	param		source		GLenum in value
+	param		type		GLenum in value
+	param		id		UInt32 in value
+	param		severity	GLenum in value
+	param		length		SizeI in value
+	param		buf		Char in array [COMPSIZE(buf/length)]
+	category	KHR_debug
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DebugMessageCallback(callback, userParam)
+	return		void
+	param		callback	GLDEBUGPROC in value
+	param		userParam	void in reference
+	category	KHR_debug
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+# bufsize -> logSize? (Bug 9178)
+GetDebugMessageLog(count, bufsize, sources, types, ids, severities, lengths, messageLog)
+	return		UInt32
+	param		count		UInt32 in value
+	param		bufsize		SizeI in value
+	param		sources		GLenum out array [COMPSIZE(count)]
+	param		types		GLenum out array [COMPSIZE(count)]
+	param		ids		UInt32 out array [COMPSIZE(count)]
+	param		severities	GLenum out array [COMPSIZE(count)]
+	param		lengths		SizeI out array [COMPSIZE(count)]
+	param		messageLog	Char out array [COMPSIZE(bufsize)]
+	category	KHR_debug
+	dlflags		notlistable
+	version		4.3
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+PushDebugGroup(source, id, length, message)
+	return		void
+	param		source		GLenum in value
+	param		id		UInt32 in value
+	param		length		SizeI in value
+	param		message		Char in array [COMPSIZE(message/length)]
+	category	KHR_debug
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+PopDebugGroup()
+	return		void
+	category	KHR_debug
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ObjectLabel(identifier, name, length, label)
+	return		void
+	param		identifier	GLenum in value
+	param		name		UInt32 in value
+	param		length		SizeI in value
+	param		label		Char in array [COMPSIZE(label/length)]
+	category	KHR_debug
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetObjectLabel(identifier, name, bufSize, length, label)
+	return		void
+	param		identifier	GLenum in value
+	param		name		UInt32 in value
+	param		bufSize		SizeI in value
+	param		length		SizeI out reference
+	param		label		Char out array [bufSize]
+	category	KHR_debug
+	dlflags		notlistable
+	version		4.3
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+ObjectPtrLabel(ptr, length, label)
+	return		void
+	param		ptr		void in reference
+	param		length		SizeI in value
+	param		label		Char in array [COMPSIZE(label/length)]
+	category	KHR_debug
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetObjectPtrLabel(ptr, bufSize, length, label)
+	return		void
+	param		ptr		void in reference
+	param		bufSize		SizeI in value
+	param		length		SizeI out reference
+	param		label		Char out array [bufSize]
+	category	KHR_debug
+	dlflags		notlistable
+	version		4.3
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+# Also includes GetPointerv (only for OpenGL ES 2, however)
+
+###############################################################################
+#
+# Extension #ARB120
+# ARB_arrays_of_arrays commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_arrays_of_arrays
+
+###############################################################################
+#
+# Extension #ARB121
+# ARB_clear_buffer_object commands
+#
+###############################################################################
+
+ClearBufferData(target, internalformat, format, type, data)
+	return		void
+	param		target		GLenum in value
+	param		internalformat	GLenum in value
+	param		format		GLenum in value
+	param		type		GLenum in value
+	param		data		void in array [COMPSIZE(format/type)]
+	category	ARB_clear_buffer_object
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ClearBufferSubData(target, internalformat, offset, size, format, type, data)
+	return		void
+	param		target		GLenum in value
+	param		internalformat	GLenum in value
+	param		offset		BufferOffset in value
+	param		size		BufferSize in value
+	param		format		GLenum in value
+	param		type		GLenum in value
+	param		data		void in array [COMPSIZE(format/type)]
+	category	ARB_clear_buffer_object
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+# Only for use with DSA extensions
+
+ClearNamedBufferDataEXT(buffer, internalformat, format, type, data)
+	return		void
+	param		buffer		UInt32 in value
+	param		internalformat	GLenum in value
+	param		format		GLenum in value
+	param		type		GLenum in value
+	param		data		void in array [COMPSIZE(format/type)]
+	category	ARB_clear_buffer_object
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ClearNamedBufferSubDataEXT(buffer, internalformat, format, type, offset, size, data)
+	return		void
+	param		buffer		UInt32 in value
+	param		internalformat	GLenum in value
+	param		offset		BufferSize in value
+	param		size		BufferSize in value
+	param		format		GLenum in value
+	param		type		GLenum in value
+	param		data		void in array [COMPSIZE(format/type)]
+	category	ARB_clear_buffer_object
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #ARB122
+# ARB_compute_shader commands
+#
+###############################################################################
+
+DispatchCompute(num_groups_x, num_groups_y, num_groups_z)
+	return		void
+	param		num_groups_x	UInt32 in value
+	param		num_groups_y	UInt32 in value
+	param		num_groups_z	UInt32 in value
+	category	ARB_compute_shader
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DispatchComputeIndirect(indirect)
+	return		void
+	param		indirect	BufferOffset in value
+	category	ARB_compute_shader
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #ARB123
+# ARB_copy_image commands
+#
+###############################################################################
+
+CopyImageSubData(srcName, srcTarget, srcLevel, srcX, srcY, srcZ, dstName, dstTarget, dstLevel, dstX, dstY, dstZ, srcWidth, srcHeight, srcDepth)
+	return		void
+	param		srcName		UInt32 in value
+	param		srcTarget	GLenum in value
+	param		srcLevel	Int32 in value
+	param		srcX		Int32 in value
+	param		srcY		Int32 in value
+	param		srcZ		Int32 in value
+	param		dstName		UInt32 in value
+	param		dstTarget	GLenum in value
+	param		dstLevel	Int32 in value
+	param		dstX		Int32 in value
+	param		dstY		Int32 in value
+	param		dstZ		Int32 in value
+	param		srcWidth	SizeI in value
+	param		srcHeight	SizeI in value
+	param		srcDepth	SizeI in value
+	category	ARB_copy_image
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #ARB124 (renumbered from 142)
+# ARB_texture_view commands
+#
+###############################################################################
+
+TextureView(texture, target, origtexture, internalformat, minlevel, numlevels, minlayer, numlayers)
+	return		void
+	param		texture		UInt32 in value
+	param		target		GLenum in value
+	param		origtexture	UInt32 in value
+	param		internalformat	GLenum in value
+	param		minlevel	UInt32 in value
+	param		numlevels	UInt32 in value
+	param		minlayer	UInt32 in value
+	param		numlayers	UInt32 in value
+	category	ARB_texture_view
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #ARB125 (renumbered from 143)
+# ARB_vertex_attrib_binding commands
+#
+###############################################################################
+
+BindVertexBuffer(bindingindex, buffer, offset, stride)
+	return		void
+	param		bindingindex	UInt32 in value
+	param		buffer		UInt32 in value
+	param		offset		BufferOffset in value
+	param		stride		SizeI in value
+	category	ARB_vertex_attrib_binding
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribFormat(attribindex, size, type, normalized, relativeoffset)
+	return		void
+	param		attribindex	UInt32 in value
+	param		size		Int32 in value
+	param		type		GLenum in value
+	param		normalized	Boolean in value
+	param		relativeoffset	UInt32 in value
+	category	ARB_vertex_attrib_binding
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribIFormat(attribindex, size, type, relativeoffset)
+	return		void
+	param		attribindex	UInt32 in value
+	param		size		Int32 in value
+	param		type		GLenum in value
+	param		relativeoffset	UInt32 in value
+	category	ARB_vertex_attrib_binding
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribLFormat(attribindex, size, type, relativeoffset)
+	return		void
+	param		attribindex	UInt32 in value
+	param		size		Int32 in value
+	param		type		GLenum in value
+	param		relativeoffset	UInt32 in value
+	category	ARB_vertex_attrib_binding
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribBinding(attribindex, bindingindex)
+	return		void
+	param		attribindex	UInt32 in value
+	param		bindingindex	UInt32 in value
+	category	ARB_vertex_attrib_binding
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexBindingDivisor(bindingindex, divisor)
+	return		void
+	param		bindingindex	UInt32 in value
+	param		divisor		UInt32 in value
+	category	ARB_vertex_attrib_binding
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexArrayBindVertexBufferEXT(vaobj, bindingindex, buffer, offset, stride)
+	return		void
+	param		vaobj		UInt32 in value
+	param		bindingindex	UInt32 in value
+	param		buffer		UInt32 in value
+	param		offset		BufferOffset in value
+	param		stride		SizeI in value
+	category	ARB_vertex_attrib_binding
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexArrayVertexAttribFormatEXT(vaobj, attribindex, size, type, normalized, relativeoffset)
+	return		void
+	param		vaobj		UInt32 in value
+	param		attribindex	UInt32 in value
+	param		size		Int32 in value
+	param		type		GLenum in value
+	param		normalized	Boolean in value
+	param		relativeoffset	UInt32 in value
+	category	ARB_vertex_attrib_binding
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexArrayVertexAttribIFormatEXT(vaobj, attribindex, size, type, relativeoffset)
+	return		void
+	param		vaobj		UInt32 in value
+	param		attribindex	UInt32 in value
+	param		size		Int32 in value
+	param		type		GLenum in value
+	param		relativeoffset	UInt32 in value
+	category	ARB_vertex_attrib_binding
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexArrayVertexAttribLFormatEXT(vaobj, attribindex, size, type, relativeoffset)
+	return		void
+	param		vaobj		UInt32 in value
+	param		attribindex	UInt32 in value
+	param		size		Int32 in value
+	param		type		GLenum in value
+	param		relativeoffset	UInt32 in value
+	category	ARB_vertex_attrib_binding
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexArrayVertexAttribBindingEXT(vaobj, attribindex, bindingindex)
+	return		void
+	param		vaobj		UInt32 in value
+	param		attribindex	UInt32 in value
+	param		bindingindex	UInt32 in value
+	category	ARB_vertex_attrib_binding
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexArrayVertexBindingDivisorEXT(vaobj, bindingindex, divisor)
+	return		void
+	param		vaobj		UInt32 in value
+	param		bindingindex	UInt32 in value
+	param		divisor		UInt32 in value
+	category	ARB_vertex_attrib_binding
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #ARB126 (renumbered from 144)
+# ARB_robustness_isolation commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_robustness_isolation
+
+###############################################################################
+#
+# Extension #ARB127
+# ARB_ES3_compatibility commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_ES3_compatibility
+
+###############################################################################
+#
+# Extension #ARB128
+# ARB_explicit_uniform_location commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_explicit_uniform_location
+
+###############################################################################
+#
+# Extension #ARB129
+# ARB_fragment_layer_viewport commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_fragment_layer_viewport
+
+###############################################################################
+#
+# Extension #ARB130
+# ARB_framebuffer_no_attachments commands
+#
+###############################################################################
+
+FramebufferParameteri(target, pname, param)
+	return		void
+	param		target		GLenum in value
+	param		pname		GLenum in value
+	param		param		Int32 in value
+	category	ARB_framebuffer_no_attachments
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetFramebufferParameteriv(target, pname, params)
+	return		void
+	param		target		GLenum in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	ARB_framebuffer_no_attachments
+	dlflags		notlistable
+	version		4.3
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+NamedFramebufferParameteriEXT(framebuffer, pname, param)
+	return		void
+	param		framebuffer	UInt32 in value
+	param		pname		GLenum in value
+	param		param		Int32 in value
+	category	ARB_framebuffer_no_attachments
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetNamedFramebufferParameterivEXT(framebuffer, pname, params)
+	return		void
+	param		framebuffer	UInt32 in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	ARB_framebuffer_no_attachments
+	dlflags		notlistable
+	version		4.3
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #ARB131
+# ARB_internalformat_query2 commands
+#
+###############################################################################
+
+GetInternalformati64v(target, internalformat, pname, bufSize, params)
+	return		void
+	param		target		GLenum in value
+	param		internalformat	GLenum in value
+	param		pname		GLenum in value
+	param		bufSize		SizeI in value
+	param		params		Int64 out array [bufSize]
+	category	ARB_internalformat_query2
+	dlflags		notlistable
+	version		4.3
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #ARB132
+# ARB_invalidate_subdata commands
+#
+###############################################################################
+
+InvalidateTexSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth)
+	return		void
+	param		texture		UInt32 in value
+	param		level		Int32 in value
+	param		xoffset		Int32 in value
+	param		yoffset		Int32 in value
+	param		zoffset		Int32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	category	ARB_invalidate_subdata
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+InvalidateTexImage(texture, level)
+	return		void
+	param		texture		UInt32 in value
+	param		level		Int32 in value
+	category	ARB_invalidate_subdata
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+InvalidateBufferSubData(buffer, offset, length)
+	return		void
+	param		buffer		UInt32 in value
+	param		offset		BufferOffset in value
+	param		length		BufferSize in value
+	category	ARB_invalidate_subdata
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+InvalidateBufferData(buffer)
+	return		void
+	param		buffer		UInt32 in value
+	category	ARB_invalidate_subdata
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+InvalidateFramebuffer(target, numAttachments, attachments)
+	return		void
+	param		target		GLenum in value
+	param		numAttachments	SizeI in value
+	param		attachments	GLenum in array [numAttachments]
+	category	ARB_invalidate_subdata
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+InvalidateSubFramebuffer(target, numAttachments, attachments, x, y, width, height)
+	return		void
+	param		target		GLenum in value
+	param		numAttachments	SizeI in value
+	param		attachments	GLenum in array [numAttachments]
+	param		x		Int32 in value
+	param		y		Int32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	category	ARB_invalidate_subdata
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #ARB133
+# ARB_multi_draw_indirect commands
+#
+###############################################################################
+
+MultiDrawArraysIndirect(mode, indirect, drawcount, stride)
+	return		void
+	param		mode		GLenum in value
+	param		indirect	void in array [COMPSIZE(drawcount/stride)]
+	param		drawcount	SizeI in value
+	param		stride		SizeI in value
+	category	ARB_multi_draw_indirect
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MultiDrawElementsIndirect(mode, type, indirect, drawcount, stride)
+	return		void
+	param		mode		GLenum in value
+	param		type		GLenum in value
+	param		indirect	void in array [COMPSIZE(drawcount/stride)]
+	param		drawcount	SizeI in value
+	param		stride		SizeI in value
+	category	ARB_multi_draw_indirect
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #ARB134
+# ARB_program_interface_query commands
+#
+###############################################################################
+
+GetProgramInterfaceiv(program, programInterface, pname, params)
+	return		void
+	param		program		UInt32 in value
+	param		programInterface	GLenum in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	ARB_program_interface_query
+	dlflags		notlistable
+	version		4.3
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetProgramResourceIndex(program, programInterface, name)
+	return		UInt32
+	param		program		UInt32 in value
+	param		programInterface	GLenum in value
+	param		name		Char in array [COMPSIZE(name)]
+	category	ARB_program_interface_query
+	dlflags		notlistable
+	version		4.3
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetProgramResourceName(program, programInterface, index, bufSize, length, name)
+	return		void
+	param		program		UInt32 in value
+	param		programInterface	GLenum in value
+	param		index		UInt32 in value
+	param		bufSize		SizeI in value
+	param		length		SizeI out reference
+	param		name		Char out array [bufSize]
+	category	ARB_program_interface_query
+	dlflags		notlistable
+	version		4.3
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetProgramResourceiv(program, programInterface, index, propCount, props, bufSize, length, params)
+	return		void
+	param		program		UInt32 in value
+	param		programInterface	GLenum in value
+	param		index		UInt32 in value
+	param		propCount	SizeI in value
+	param		props		GLenum in array [propCount]
+	param		bufSize		SizeI in value
+	param		length		SizeI out reference
+	param		params		Int32 out array [bufSize]
+	category	ARB_program_interface_query
+	dlflags		notlistable
+	version		4.3
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetProgramResourceLocation(program, programInterface, name)
+	return		Int32
+	param		program		UInt32 in value
+	param		programInterface	GLenum in value
+	param		name		Char in array [COMPSIZE(name)]
+	category	ARB_program_interface_query
+	dlflags		notlistable
+	version		4.3
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetProgramResourceLocationIndex(program, programInterface, name)
+	return		Int32
+	param		program		UInt32 in value
+	param		programInterface	GLenum in value
+	param		name		Char in array [COMPSIZE(name)]
+	category	ARB_program_interface_query
+	dlflags		notlistable
+	version		4.3
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #ARB135
+# ARB_robust_buffer_access_behavior commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_robust_buffer_access_behavior
+
+###############################################################################
+#
+# Extension #ARB136
+# ARB_shader_image_size commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_shader_image_size
+
+###############################################################################
+#
+# Extension #ARB137
+# ARB_shader_storage_buffer_object commands
+#
+###############################################################################
+
+ShaderStorageBlockBinding(program, storageBlockIndex, storageBlockBinding)
+	return		void
+	param		program		UInt32 in value
+	param		storageBlockIndex	UInt32 in value
+	param		storageBlockBinding	UInt32 in value
+	category	ARB_shader_storage_buffer_object
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #ARB138
+# ARB_stencil_texturing commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_stencil_texturing
+
+###############################################################################
+#
+# Extension #ARB139
+# ARB_texture_buffer_range commands
+#
+###############################################################################
+
+TexBufferRange(target, internalformat, buffer, offset, size)
+	return		void
+	param		target		GLenum in value
+	param		internalformat	GLenum in value
+	param		buffer		UInt32 in value
+	param		offset		BufferOffset in value
+	param		size		BufferSize in value
+	category	ARB_texture_buffer_range
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TextureBufferRangeEXT(texture, target, internalformat, buffer, offset, size)
+	return		void
+	param		texture		UInt32 in value
+	param		target		GLenum in value
+	param		internalformat	GLenum in value
+	param		buffer		UInt32 in value
+	param		offset		BufferOffset in value
+	param		size		BufferSize in value
+	category	ARB_texture_buffer_range
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #ARB140
+# ARB_texture_query_levels commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_texture_query_levels
+
+###############################################################################
+#
+# Extension #ARB141
+# ARB_texture_storage_multisample commands
+#
+###############################################################################
+
+TexStorage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations)
+	return		void
+	param		target		GLenum in value
+	param		samples		SizeI in value
+	param		internalformat	GLenum in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		fixedsamplelocations	Boolean in value
+	category	ARB_texture_storage_multisample
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TexStorage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations)
+	return		void
+	param		target		GLenum in value
+	param		samples		SizeI in value
+	param		internalformat	GLenum in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		fixedsamplelocations	Boolean in value
+	category	ARB_texture_storage_multisample
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TextureStorage2DMultisampleEXT(texture, target, samples, internalformat, width, height, fixedsamplelocations)
+	return		void
+	param		texture		UInt32 in value
+	param		target		GLenum in value
+	param		samples		SizeI in value
+	param		internalformat	GLenum in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		fixedsamplelocations	Boolean in value
+	category	ARB_texture_storage_multisample
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TextureStorage3DMultisampleEXT(texture, target, samples, internalformat, width, height, depth, fixedsamplelocations)
+	return		void
+	param		texture		UInt32 in value
+	param		target		GLenum in value
+	param		samples		SizeI in value
+	param		internalformat	GLenum in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		fixedsamplelocations	Boolean in value
+	category	ARB_texture_storage_multisample
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+
+###############################################################################
+###############################################################################
+#
+# Non-ARB extensions, in order by registry extension number
+#
+###############################################################################
+###############################################################################
+
+###############################################################################
+#
+# Extension #1
+# EXT_abgr commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_abgr
+
+###############################################################################
+#
+# Extension #2
+# EXT_blend_color commands
+#
+###############################################################################
+
+BlendColorEXT(red, green, blue, alpha)
+	return		void
+	param		red		ColorF in value
+	param		green		ColorF in value
+	param		blue		ColorF in value
+	param		alpha		ColorF in value
+	category	EXT_blend_color
+	version		1.0
+	glxropcode	4096
+	glxflags	EXT
+	extension	soft
+	alias		BlendColor
+
+###############################################################################
+#
+# Extension #3
+# EXT_polygon_offset commands
+#
+###############################################################################
+
+PolygonOffsetEXT(factor, bias)
+	return		void
+	param		factor		Float32 in value
+	param		bias		Float32 in value
+	category	EXT_polygon_offset
+	version		1.0
+	glxropcode	4098
+	glxflags	EXT
+	extension	soft
+	offset		414
+
+###############################################################################
+#
+# Extension #4
+# EXT_texture commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_texture
+
+###############################################################################
+#
+# Extension #5 - skipped
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #6
+# EXT_texture3D commands
+#
+###############################################################################
+
+# Arguably TexelInternalFormat, not PixelInternalFormat
+TexImage3DEXT(target, level, internalformat, width, height, depth, border, format, type, pixels)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	PixelInternalFormat in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		border		CheckedInt32 in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void in array [COMPSIZE(format/type/width/height/depth)]
+	category	EXT_texture3D
+	dlflags		handcode
+	glxflags	client-handcode server-handcode EXT
+	version		1.0
+	glxropcode	4114
+	extension
+	alias		TexImage3D
+
+TexSubImage3DEXT(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		yoffset		CheckedInt32 in value
+	param		zoffset		CheckedInt32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void in array [COMPSIZE(format/type/width/height/depth)]
+	category	EXT_texture3D
+	dlflags		handcode
+	glxflags	client-handcode server-handcode EXT
+	version		1.0
+	glxropcode	4115
+	extension
+	alias		TexSubImage3D
+
+###############################################################################
+#
+# Extension #7
+# SGIS_texture_filter4 commands
+#
+###############################################################################
+
+GetTexFilterFuncSGIS(target, filter, weights)
+	return		void
+	param		target		TextureTarget in value
+	param		filter		TextureFilterSGIS in value
+	param		weights		Float32 out array [COMPSIZE(target/filter)]
+	category	SGIS_texture_filter4
+	dlflags		notlistable
+	version		1.0
+	glxflags	SGI
+	glxvendorpriv	4101
+	extension
+	offset		415
+
+TexFilterFuncSGIS(target, filter, n, weights)
+	return		void
+	param		target		TextureTarget in value
+	param		filter		TextureFilterSGIS in value
+	param		n		SizeI in value
+	param		weights		Float32 in array [n]
+	category	SGIS_texture_filter4
+	glxflags	SGI
+	version		1.0
+	glxropcode	2064
+	extension
+	offset		416
+
+###############################################################################
+#
+# Extension #8 - skipped
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #9
+# EXT_subtexture commands
+#
+###############################################################################
+
+TexSubImage1DEXT(target, level, xoffset, width, format, type, pixels)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		width		SizeI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void in array [COMPSIZE(format/type/width)]
+	category	EXT_subtexture
+	dlflags		handcode
+	glxflags	client-handcode server-handcode EXT
+	version		1.0
+	glxropcode	4099
+	extension
+	alias		TexSubImage1D
+
+TexSubImage2DEXT(target, level, xoffset, yoffset, width, height, format, type, pixels)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		yoffset		CheckedInt32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void in array [COMPSIZE(format/type/width/height)]
+	category	EXT_subtexture
+	dlflags		handcode
+	glxflags	client-handcode server-handcode EXT
+	version		1.0
+	glxropcode	4100
+	extension
+	alias		TexSubImage2D
+
+###############################################################################
+#
+# Extension #10
+# EXT_copy_texture commands
+#
+###############################################################################
+
+# Arguably TexelInternalFormat, not PixelInternalFormat
+CopyTexImage1DEXT(target, level, internalformat, x, y, width, border)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	PixelInternalFormat in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	param		border		CheckedInt32 in value
+	category	EXT_copy_texture
+	version		1.0
+	glxflags	EXT
+	glxropcode	4119
+	extension
+	alias		CopyTexImage1D
+
+# Arguably TexelInternalFormat, not PixelInternalFormat
+CopyTexImage2DEXT(target, level, internalformat, x, y, width, height, border)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	PixelInternalFormat in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		border		CheckedInt32 in value
+	category	EXT_copy_texture
+	version		1.0
+	glxflags	EXT
+	glxropcode	4120
+	extension
+	alias		CopyTexImage2D
+
+CopyTexSubImage1DEXT(target, level, xoffset, x, y, width)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	category	EXT_copy_texture
+	version		1.0
+	glxflags	EXT
+	glxropcode	4121
+	extension
+	alias		CopyTexSubImage1D
+
+CopyTexSubImage2DEXT(target, level, xoffset, yoffset, x, y, width, height)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		yoffset		CheckedInt32 in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	category	EXT_copy_texture
+	version		1.0
+	glxflags	EXT
+	glxropcode	4122
+	extension
+	alias		CopyTexSubImage2D
+
+CopyTexSubImage3DEXT(target, level, xoffset, yoffset, zoffset, x, y, width, height)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		yoffset		CheckedInt32 in value
+	param		zoffset		CheckedInt32 in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	category	EXT_copy_texture
+	version		1.0
+	glxflags	EXT
+	glxropcode	4123
+	extension
+	alias		CopyTexSubImage3D
+
+###############################################################################
+#
+# Extension #11
+# EXT_histogram commands
+#
+###############################################################################
+
+GetHistogramEXT(target, reset, format, type, values)
+	return		void
+	param		target		HistogramTargetEXT in value
+	param		reset		Boolean in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		values		Void out array [COMPSIZE(target/format/type)]
+	category	EXT_histogram
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode EXT
+	version		1.0
+	glxvendorpriv	5
+	extension
+	offset		417
+
+GetHistogramParameterfvEXT(target, pname, params)
+	return		void
+	param		target		HistogramTargetEXT in value
+	param		pname		GetHistogramParameterPNameEXT in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	EXT_histogram
+	dlflags		notlistable
+	version		1.0
+	glxvendorpriv	6
+	glxflags	EXT
+	extension
+	offset		418
+
+GetHistogramParameterivEXT(target, pname, params)
+	return		void
+	param		target		HistogramTargetEXT in value
+	param		pname		GetHistogramParameterPNameEXT in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	EXT_histogram
+	dlflags		notlistable
+	version		1.0
+	glxvendorpriv	7
+	glxflags	EXT
+	extension
+	offset		419
+
+GetMinmaxEXT(target, reset, format, type, values)
+	return		void
+	param		target		MinmaxTargetEXT in value
+	param		reset		Boolean in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		values		Void out array [COMPSIZE(target/format/type)]
+	category	EXT_histogram
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode EXT
+	version		1.0
+	glxvendorpriv	8
+	extension
+	offset		420
+
+GetMinmaxParameterfvEXT(target, pname, params)
+	return		void
+	param		target		MinmaxTargetEXT in value
+	param		pname		GetMinmaxParameterPNameEXT in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	EXT_histogram
+	dlflags		notlistable
+	version		1.0
+	glxvendorpriv	9
+	glxflags	EXT
+	extension
+	offset		421
+
+GetMinmaxParameterivEXT(target, pname, params)
+	return		void
+	param		target		MinmaxTargetEXT in value
+	param		pname		GetMinmaxParameterPNameEXT in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	EXT_histogram
+	dlflags		notlistable
+	version		1.0
+	glxvendorpriv	10
+	glxflags	EXT
+	extension
+	offset		422
+
+HistogramEXT(target, width, internalformat, sink)
+	return		void
+	param		target		HistogramTargetEXT in value
+	param		width		SizeI in value
+	param		internalformat	PixelInternalFormat in value
+	param		sink		Boolean in value
+	category	EXT_histogram
+	version		1.0
+	glxropcode	4110
+	glxflags	EXT
+	extension
+	alias		Histogram
+
+MinmaxEXT(target, internalformat, sink)
+	return		void
+	param		target		MinmaxTargetEXT in value
+	param		internalformat	PixelInternalFormat in value
+	param		sink		Boolean in value
+	category	EXT_histogram
+	version		1.0
+	glxropcode	4111
+	glxflags	EXT
+	extension
+	alias		Minmax
+
+ResetHistogramEXT(target)
+	return		void
+	param		target		HistogramTargetEXT in value
+	category	EXT_histogram
+	version		1.0
+	glxropcode	4112
+	glxflags	EXT
+	extension
+	alias		ResetHistogram
+
+ResetMinmaxEXT(target)
+	return		void
+	param		target		MinmaxTargetEXT in value
+	category	EXT_histogram
+	version		1.0
+	glxropcode	4113
+	glxflags	EXT
+	extension
+	alias		ResetMinmax
+
+###############################################################################
+#
+# Extension #12
+# EXT_convolution commands
+#
+###############################################################################
+
+ConvolutionFilter1DEXT(target, internalformat, width, format, type, image)
+	return		void
+	param		target		ConvolutionTargetEXT in value
+	param		internalformat	PixelInternalFormat in value
+	param		width		SizeI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		image		Void in array [COMPSIZE(format/type/width)]
+	category	EXT_convolution
+	dlflags		handcode
+	glxflags	client-handcode server-handcode EXT
+	version		1.0
+	glxropcode	4101
+	extension
+	alias		ConvolutionFilter1D
+
+ConvolutionFilter2DEXT(target, internalformat, width, height, format, type, image)
+	return		void
+	param		target		ConvolutionTargetEXT in value
+	param		internalformat	PixelInternalFormat in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		image		Void in array [COMPSIZE(format/type/width/height)]
+	category	EXT_convolution
+	dlflags		handcode
+	glxflags	client-handcode server-handcode EXT
+	version		1.0
+	glxropcode	4102
+	extension
+	alias		ConvolutionFilter2D
+
+ConvolutionParameterfEXT(target, pname, params)
+	return		void
+	param		target		ConvolutionTargetEXT in value
+	param		pname		ConvolutionParameterEXT in value
+	param		params		CheckedFloat32 in value
+	category	EXT_convolution
+	version		1.0
+	glxropcode	4103
+	glxflags	EXT
+	extension
+	alias		ConvolutionParameterf
+
+ConvolutionParameterfvEXT(target, pname, params)
+	return		void
+	param		target		ConvolutionTargetEXT in value
+	param		pname		ConvolutionParameterEXT in value
+	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
+	category	EXT_convolution
+	version		1.0
+	glxropcode	4104
+	glxflags	EXT
+	extension
+	alias		ConvolutionParameterfv
+
+ConvolutionParameteriEXT(target, pname, params)
+	return		void
+	param		target		ConvolutionTargetEXT in value
+	param		pname		ConvolutionParameterEXT in value
+	param		params		CheckedInt32 in value
+	category	EXT_convolution
+	version		1.0
+	glxropcode	4105
+	glxflags	EXT
+	extension
+	alias		ConvolutionParameteri
+
+ConvolutionParameterivEXT(target, pname, params)
+	return		void
+	param		target		ConvolutionTargetEXT in value
+	param		pname		ConvolutionParameterEXT in value
+	param		params		CheckedInt32 in array [COMPSIZE(pname)]
+	category	EXT_convolution
+	version		1.0
+	glxropcode	4106
+	glxflags	EXT
+	extension
+	alias		ConvolutionParameteriv
+
+CopyConvolutionFilter1DEXT(target, internalformat, x, y, width)
+	return		void
+	param		target		ConvolutionTargetEXT in value
+	param		internalformat	PixelInternalFormat in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	category	EXT_convolution
+	version		1.0
+	glxropcode	4107
+	glxflags	EXT
+	extension
+	alias		CopyConvolutionFilter1D
+
+CopyConvolutionFilter2DEXT(target, internalformat, x, y, width, height)
+	return		void
+	param		target		ConvolutionTargetEXT in value
+	param		internalformat	PixelInternalFormat in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	category	EXT_convolution
+	version		1.0
+	glxropcode	4108
+	glxflags	EXT
+	extension
+	alias		CopyConvolutionFilter2D
+
+GetConvolutionFilterEXT(target, format, type, image)
+	return		void
+	param		target		ConvolutionTargetEXT in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		image		Void out array [COMPSIZE(target/format/type)]
+	category	EXT_convolution
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode EXT
+	version		1.0
+	glxvendorpriv	1
+	extension
+	offset		423
+
+GetConvolutionParameterfvEXT(target, pname, params)
+	return		void
+	param		target		ConvolutionTargetEXT in value
+	param		pname		ConvolutionParameterEXT in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	EXT_convolution
+	dlflags		notlistable
+	version		1.0
+	glxvendorpriv	2
+	glxflags	EXT
+	extension
+	offset		424
+
+GetConvolutionParameterivEXT(target, pname, params)
+	return		void
+	param		target		ConvolutionTargetEXT in value
+	param		pname		ConvolutionParameterEXT in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	EXT_convolution
+	dlflags		notlistable
+	version		1.0
+	glxvendorpriv	3
+	glxflags	EXT
+	extension
+	offset		425
+
+GetSeparableFilterEXT(target, format, type, row, column, span)
+	return		void
+	param		target		SeparableTargetEXT in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		row		Void out array [COMPSIZE(target/format/type)]
+	param		column		Void out array [COMPSIZE(target/format/type)]
+	param		span		Void out array [COMPSIZE(target/format/type)]
+	category	EXT_convolution
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode EXT
+	version		1.0
+	glxvendorpriv	4
+	extension
+	offset		426
+
+SeparableFilter2DEXT(target, internalformat, width, height, format, type, row, column)
+	return		void
+	param		target		SeparableTargetEXT in value
+	param		internalformat	PixelInternalFormat in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		row		Void in array [COMPSIZE(target/format/type/width)]
+	param		column		Void in array [COMPSIZE(target/format/type/height)]
+	category	EXT_convolution
+	dlflags		handcode
+	glxflags	client-handcode server-handcode EXT
+	version		1.0
+	glxropcode	4109
+	extension
+	alias		SeparableFilter2D
+
+###############################################################################
+#
+# Extension #13
+# SGI_color_matrix commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGI_color_matrix
+
+###############################################################################
+#
+# Extension #14
+# SGI_color_table commands
+#
+###############################################################################
+
+ColorTableSGI(target, internalformat, width, format, type, table)
+	return		void
+	param		target		ColorTableTargetSGI in value
+	param		internalformat	PixelInternalFormat in value
+	param		width		SizeI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		table		Void in array [COMPSIZE(format/type/width)]
+	category	SGI_color_table
+	dlflags		handcode
+	glxflags	client-handcode server-handcode SGI
+	version		1.0
+	glxropcode	2053
+	extension
+	alias		ColorTable
+
+ColorTableParameterfvSGI(target, pname, params)
+	return		void
+	param		target		ColorTableTargetSGI in value
+	param		pname		ColorTableParameterPNameSGI in value
+	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
+	category	SGI_color_table
+	version		1.0
+	glxropcode	2054
+	glxflags	SGI
+	extension
+	alias		ColorTableParameterfv
+
+ColorTableParameterivSGI(target, pname, params)
+	return		void
+	param		target		ColorTableTargetSGI in value
+	param		pname		ColorTableParameterPNameSGI in value
+	param		params		CheckedInt32 in array [COMPSIZE(pname)]
+	category	SGI_color_table
+	version		1.0
+	glxropcode	2055
+	glxflags	SGI
+	extension
+	alias		ColorTableParameteriv
+
+CopyColorTableSGI(target, internalformat, x, y, width)
+	return		void
+	param		target		ColorTableTargetSGI in value
+	param		internalformat	PixelInternalFormat in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	category	SGI_color_table
+	version		1.0
+	glxropcode	2056
+	glxflags	SGI
+	extension
+	alias		CopyColorTable
+
+GetColorTableSGI(target, format, type, table)
+	return		void
+	param		target		ColorTableTargetSGI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		table		Void out array [COMPSIZE(target/format/type)]
+	category	SGI_color_table
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode SGI
+	version		1.0
+	glxvendorpriv	4098
+	extension
+	offset		427
+
+GetColorTableParameterfvSGI(target, pname, params)
+	return		void
+	param		target		ColorTableTargetSGI in value
+	param		pname		GetColorTableParameterPNameSGI in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	SGI_color_table
+	dlflags		notlistable
+	version		1.0
+	glxflags	SGI
+	glxvendorpriv	4099
+	extension
+	offset		428
+
+GetColorTableParameterivSGI(target, pname, params)
+	return		void
+	param		target		ColorTableTargetSGI in value
+	param		pname		GetColorTableParameterPNameSGI in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	SGI_color_table
+	dlflags		notlistable
+	version		1.0
+	glxflags	SGI
+	glxvendorpriv	4100
+	extension
+	offset		429
+
+###############################################################################
+#
+# Extension #15
+# SGIX_pixel_texture commands
+#
+###############################################################################
+
+PixelTexGenSGIX(mode)
+	return		void
+	param		mode		PixelTexGenModeSGIX in value
+	category	SGIX_pixel_texture
+	version		1.0
+	glxflags	SGI
+	glxropcode	2059
+	extension
+	offset		430
+
+###############################################################################
+#
+# Extension #15 (variant)
+# SGIS_pixel_texture commands
+# Both SGIS and SGIX forms have extension #15!
+#
+###############################################################################
+
+PixelTexGenParameteriSGIS(pname, param)
+	return		void
+	param		pname		PixelTexGenParameterNameSGIS in value
+	param		param		CheckedInt32 in value
+	category	SGIS_pixel_texture
+	version		1.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		431
+
+PixelTexGenParameterivSGIS(pname, params)
+	return		void
+	param		pname		PixelTexGenParameterNameSGIS in value
+	param		params		CheckedInt32 in array [COMPSIZE(pname)]
+	category	SGIS_pixel_texture
+	version		1.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		432
+
+PixelTexGenParameterfSGIS(pname, param)
+	return		void
+	param		pname		PixelTexGenParameterNameSGIS in value
+	param		param		CheckedFloat32 in value
+	category	SGIS_pixel_texture
+	version		1.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		433
+
+PixelTexGenParameterfvSGIS(pname, params)
+	return		void
+	param		pname		PixelTexGenParameterNameSGIS in value
+	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
+	category	SGIS_pixel_texture
+	version		1.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		434
+
+GetPixelTexGenParameterivSGIS(pname, params)
+	return		void
+	param		pname		PixelTexGenParameterNameSGIS in value
+	param		params		CheckedInt32 out array [COMPSIZE(pname)]
+	dlflags		notlistable
+	category	SGIS_pixel_texture
+	version		1.0
+	extension
+	glxvendorpriv	?
+	glxflags	ignore
+	offset		435
+
+GetPixelTexGenParameterfvSGIS(pname, params)
+	return		void
+	param		pname		PixelTexGenParameterNameSGIS in value
+	param		params		CheckedFloat32 out array [COMPSIZE(pname)]
+	dlflags		notlistable
+	category	SGIS_pixel_texture
+	version		1.0
+	extension
+	glxvendorpriv	?
+	glxflags	ignore
+	offset		436
+
+###############################################################################
+#
+# Extension #16
+# SGIS_texture4D commands
+#
+###############################################################################
+
+TexImage4DSGIS(target, level, internalformat, width, height, depth, size4d, border, format, type, pixels)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	PixelInternalFormat in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		size4d		SizeI in value
+	param		border		CheckedInt32 in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void in array [COMPSIZE(format/type/width/height/depth/size4d)]
+	category	SGIS_texture4D
+	dlflags		handcode
+	glxflags	client-handcode server-handcode SGI
+	version		1.0
+	glxropcode	2057
+	extension
+	offset		437
+
+TexSubImage4DSGIS(target, level, xoffset, yoffset, zoffset, woffset, width, height, depth, size4d, format, type, pixels)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		yoffset		CheckedInt32 in value
+	param		zoffset		CheckedInt32 in value
+	param		woffset		CheckedInt32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		size4d		SizeI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void in array [COMPSIZE(format/type/width/height/depth/size4d)]
+	category	SGIS_texture4D
+	dlflags		handcode
+	glxflags	client-handcode server-handcode SGI
+	version		1.0
+	glxropcode	2058
+	extension
+	offset		438
+
+###############################################################################
+#
+# Extension #17
+# SGI_texture_color_table commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGI_texture_color_table
+
+###############################################################################
+#
+# Extension #18
+# EXT_cmyka commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_cmyka
+
+###############################################################################
+#
+# Extension #19 - skipped
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #20
+# EXT_texture_object commands
+#
+###############################################################################
+
+AreTexturesResidentEXT(n, textures, residences)
+	return		Boolean
+	param		n		SizeI in value
+	param		textures	Texture in array [n]
+	param		residences	Boolean out array [n]
+	category	EXT_texture_object
+	glxflags	EXT
+	glxvendorpriv	11
+	dlflags		notlistable
+	version		1.0
+	extension
+	offset		439
+
+BindTextureEXT(target, texture)
+	return		void
+	param		target	TextureTarget in value
+	param		texture Texture in value
+	category	EXT_texture_object
+	version		1.0
+	glxflags	EXT
+	glxropcode	4117
+	extension
+	alias		BindTexture
+
+DeleteTexturesEXT(n, textures)
+	return		void
+	param		n		SizeI in value
+	param		textures	Texture in array [n]
+	category	EXT_texture_object
+	dlflags		notlistable
+	version		1.0
+	glxflags	EXT
+	glxvendorpriv	12
+	extension
+	offset		561
+
+GenTexturesEXT(n, textures)
+	return		void
+	param		n		SizeI in value
+	param		textures	Texture out array [n]
+	category	EXT_texture_object
+	dlflags		notlistable
+	version		1.0
+	glxflags	EXT
+	glxvendorpriv	13
+	extension
+	offset		440
+
+IsTextureEXT(texture)
+	return		Boolean
+	param		texture Texture in value
+	category	EXT_texture_object
+	dlflags		notlistable
+	version		1.0
+	glxflags	EXT
+	glxvendorpriv	14
+	extension
+	offset		441
+
+PrioritizeTexturesEXT(n, textures, priorities)
+	return		void
+	param		n		SizeI in value
+	param		textures	Texture in array [n]
+	param		priorities	ClampedFloat32 in array [n]
+	category	EXT_texture_object
+	glxflags	EXT
+	version		1.0
+	glxropcode	4118
+	extension
+	alias		PrioritizeTextures
+
+###############################################################################
+#
+# Extension #21
+# SGIS_detail_texture commands
+#
+###############################################################################
+
+DetailTexFuncSGIS(target, n, points)
+	return		void
+	param		target		TextureTarget in value
+	param		n		SizeI in value
+	param		points		Float32 in array [n*2]
+	category	SGIS_detail_texture
+	glxflags	SGI
+	version		1.0
+	glxropcode	2051
+	extension
+	offset		442
+
+GetDetailTexFuncSGIS(target, points)
+	return		void
+	param		target		TextureTarget in value
+	param		points		Float32 out array [COMPSIZE(target)]
+	category	SGIS_detail_texture
+	dlflags		notlistable
+	version		1.0
+	glxflags	SGI
+	glxvendorpriv	4096
+	extension
+	offset		443
+
+###############################################################################
+#
+# Extension #22
+# SGIS_sharpen_texture commands
+#
+###############################################################################
+
+SharpenTexFuncSGIS(target, n, points)
+	return		void
+	param		target		TextureTarget in value
+	param		n		SizeI in value
+	param		points		Float32 in array [n*2]
+	category	SGIS_sharpen_texture
+	glxflags	SGI
+	version		1.0
+	glxropcode	2052
+	extension
+	offset		444
+
+GetSharpenTexFuncSGIS(target, points)
+	return		void
+	param		target		TextureTarget in value
+	param		points		Float32 out array [COMPSIZE(target)]
+	category	SGIS_sharpen_texture
+	dlflags		notlistable
+	version		1.0
+	glxflags	SGI
+	glxvendorpriv	4097
+	extension
+	offset		445
+
+###############################################################################
+#
+# EXT_packed_pixels commands
+# Extension #23
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_packed_pixels
+
+###############################################################################
+#
+# Extension #24
+# SGIS_texture_lod commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIS_texture_lod
+
+###############################################################################
+#
+# Extension #25
+# SGIS_multisample commands
+#
+###############################################################################
+
+SampleMaskSGIS(value, invert)
+	return		void
+	param		value		ClampedFloat32 in value
+	param		invert		Boolean in value
+	category	SGIS_multisample
+	version		1.1
+	glxropcode	2048
+	glxflags	SGI
+	extension
+	alias		SampleMaskEXT
+
+SamplePatternSGIS(pattern)
+	return		void
+	param		pattern		SamplePatternSGIS in value
+	category	SGIS_multisample
+	version		1.0
+	glxropcode	2049
+	glxflags	SGI
+	extension
+	alias		SamplePatternEXT
+
+###############################################################################
+#
+# Extension #26 - no specification?
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #27
+# EXT_rescale_normal commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_rescale_normal
+
+###############################################################################
+#
+# Extension #28 - GLX_EXT_visual_info
+# Extension #29 - skipped
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #30
+# EXT_vertex_array commands
+#
+###############################################################################
+
+ArrayElementEXT(i)
+	return		void
+	param		i		Int32 in value
+	category	EXT_vertex_array
+	dlflags		handcode
+	glxflags	client-handcode server-handcode EXT
+	version		1.0
+	extension
+	alias		ArrayElement
+
+ColorPointerEXT(size, type, stride, count, pointer)
+	return		void
+	param		size		Int32 in value
+	param		type		ColorPointerType in value
+	param		stride		SizeI in value
+	param		count		SizeI in value
+	param		pointer		Void in array [COMPSIZE(size/type/stride/count)] retained
+	category	EXT_vertex_array
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode EXT
+	version		1.0
+	extension
+	offset		448
+
+DrawArraysEXT(mode, first, count)
+	return		void
+	param		mode		BeginMode in value
+	param		first		Int32 in value
+	param		count		SizeI in value
+	category	EXT_vertex_array
+	dlflags		handcode
+	glxflags	client-handcode server-handcode EXT
+	version		1.0
+	glxropcode	4116
+	extension
+	alias		DrawArrays
+
+EdgeFlagPointerEXT(stride, count, pointer)
+	return		void
+	param		stride		SizeI in value
+	param		count		SizeI in value
+	param		pointer		Boolean in array [COMPSIZE(stride/count)] retained
+	category	EXT_vertex_array
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode EXT
+	version		1.0
+	extension
+	offset		449
+
+GetPointervEXT(pname, params)
+	return		void
+	param		pname		GetPointervPName in value
+	param		params		VoidPointer out array [1]
+	category	EXT_vertex_array
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode EXT
+	version		1.0
+	extension
+	alias		GetPointerv
+
+IndexPointerEXT(type, stride, count, pointer)
+	return		void
+	param		type		IndexPointerType in value
+	param		stride		SizeI in value
+	param		count		SizeI in value
+	param		pointer		Void in array [COMPSIZE(type/stride/count)] retained
+	category	EXT_vertex_array
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode EXT
+	version		1.0
+	extension
+	offset		450
+
+NormalPointerEXT(type, stride, count, pointer)
+	return		void
+	param		type		NormalPointerType in value
+	param		stride		SizeI in value
+	param		count		SizeI in value
+	param		pointer		Void in array [COMPSIZE(type/stride/count)] retained
+	category	EXT_vertex_array
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode EXT
+	version		1.0
+	extension
+	offset		451
+
+TexCoordPointerEXT(size, type, stride, count, pointer)
+	return		void
+	param		size		Int32 in value
+	param		type		TexCoordPointerType in value
+	param		stride		SizeI in value
+	param		count		SizeI in value
+	param		pointer		Void in array [COMPSIZE(size/type/stride/count)] retained
+	category	EXT_vertex_array
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode EXT
+	version		1.0
+	extension
+	offset		452
+
+VertexPointerEXT(size, type, stride, count, pointer)
+	return		void
+	param		size		Int32 in value
+	param		type		VertexPointerType in value
+	param		stride		SizeI in value
+	param		count		SizeI in value
+	param		pointer		Void in array [COMPSIZE(size/type/stride/count)] retained
+	category	EXT_vertex_array
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode EXT
+	version		1.0
+	extension
+	offset		453
+
+###############################################################################
+#
+# Extension #31
+# EXT_misc_attribute commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_misc_attribute
+
+###############################################################################
+#
+# Extension #32
+# SGIS_generate_mipmap commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIS_generate_mipmap
+
+###############################################################################
+#
+# Extension #33
+# SGIX_clipmap commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_clipmap
+
+###############################################################################
+#
+# Extension #34
+# SGIX_shadow commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_shadow
+
+###############################################################################
+#
+# Extension #35
+# SGIS_texture_edge_clamp commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIS_texture_edge_clamp
+
+###############################################################################
+#
+# Extension #36
+# SGIS_texture_border_clamp commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIS_texture_border_clamp
+
+###############################################################################
+#
+# Extension #37
+# EXT_blend_minmax commands
+#
+###############################################################################
+
+BlendEquationEXT(mode)
+	return		void
+	param		mode		BlendEquationModeEXT in value
+	category	EXT_blend_minmax
+	version		1.0
+	glxropcode	4097
+	glxflags	EXT
+	extension	soft
+	alias		BlendEquation
+
+###############################################################################
+#
+# Extension #38
+# EXT_blend_subtract commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_blend_subtract
+
+###############################################################################
+#
+# Extension #39
+# EXT_blend_logic_op commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_blend_logic_op
+
+###############################################################################
+#
+# Extension #40 - GLX_SGI_swap_control
+# Extension #41 - GLX_SGI_video_sync
+# Extension #42 - GLX_SGI_make_current_read
+# Extension #43 - GLX_SGIX_video_source
+# Extension #44 - GLX_EXT_visual_rating
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #45
+# SGIX_interlace commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_interlace
+
+###############################################################################
+#
+# Extension #46
+# SGIX_pixel_tiles commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_pixel_tiles
+
+###############################################################################
+#
+# Extension #47 - GLX_EXT_import_context
+# Extension #48 - skipped
+# Extension #49 - GLX_SGIX_fbconfig
+# Extension #50 - GLX_SGIX_pbuffer
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #51
+# SGIX_texture_select commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_texture_select
+
+###############################################################################
+#
+# Extension #52
+# SGIX_sprite commands
+#
+###############################################################################
+
+SpriteParameterfSGIX(pname, param)
+	return		void
+	param		pname		SpriteParameterNameSGIX in value
+	param		param		CheckedFloat32 in value
+	category	SGIX_sprite
+	version		1.0
+	glxflags	SGI
+	glxropcode	2060
+	extension
+	offset		454
+
+SpriteParameterfvSGIX(pname, params)
+	return		void
+	param		pname		SpriteParameterNameSGIX in value
+	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
+	category	SGIX_sprite
+	version		1.0
+	glxflags	SGI
+	glxropcode	2061
+	extension
+	offset		455
+
+SpriteParameteriSGIX(pname, param)
+	return		void
+	param		pname		SpriteParameterNameSGIX in value
+	param		param		CheckedInt32 in value
+	category	SGIX_sprite
+	version		1.0
+	glxflags	SGI
+	glxropcode	2062
+	extension
+	offset		456
+
+SpriteParameterivSGIX(pname, params)
+	return		void
+	param		pname		SpriteParameterNameSGIX in value
+	param		params		CheckedInt32 in array [COMPSIZE(pname)]
+	category	SGIX_sprite
+	version		1.0
+	glxflags	SGI
+	glxropcode	2063
+	extension
+	offset		457
+
+###############################################################################
+#
+# Extension #53
+# SGIX_texture_multi_buffer commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_texture_multi_buffer
+
+###############################################################################
+#
+# Extension #54
+# EXT_point_parameters / SGIS_point_parameters commands
+#
+###############################################################################
+
+PointParameterfEXT(pname, param)
+	return		void
+	param		pname		PointParameterNameARB in value
+	param		param		CheckedFloat32 in value
+	category	EXT_point_parameters
+	version		1.0
+	glxflags	SGI
+	extension
+	alias		PointParameterfARB
+
+PointParameterfvEXT(pname, params)
+	return		void
+	param		pname		PointParameterNameARB in value
+	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
+	category	EXT_point_parameters
+	version		1.0
+	glxflags	SGI
+	extension
+	alias		PointParameterfvARB
+
+PointParameterfSGIS(pname, param)
+	return		void
+	param		pname		PointParameterNameARB in value
+	param		param		CheckedFloat32 in value
+	category	SGIS_point_parameters
+	version		1.0
+	glxflags	SGI
+	extension
+	alias		PointParameterfARB
+
+PointParameterfvSGIS(pname, params)
+	return		void
+	param		pname		PointParameterNameARB in value
+	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
+	category	SGIS_point_parameters
+	version		1.0
+	glxflags	SGI
+	extension
+	alias		PointParameterfvARB
+
+###############################################################################
+#
+# Extension #55
+# SGIX_instruments commands
+#
+###############################################################################
+
+GetInstrumentsSGIX()
+	return		Int32
+	dlflags		notlistable
+	category	SGIX_instruments
+	version		1.0
+	glxflags	SGI
+	glxvendorpriv	4102
+	extension
+	offset		460
+
+InstrumentsBufferSGIX(size, buffer)
+	return		void
+	param		size		SizeI in value
+	param		buffer		Int32 out array [size] retained
+	dlflags		notlistable
+	category	SGIX_instruments
+	version		1.0
+	glxflags	SGI
+	glxvendorpriv	4103
+	extension
+	offset		461
+
+PollInstrumentsSGIX(marker_p)
+	return		Int32
+	param		marker_p	Int32 out array [1]
+	dlflags		notlistable
+	category	SGIX_instruments
+	version		1.0
+	glxflags	SGI
+	glxvendorpriv	4104
+	extension
+	offset		462
+
+ReadInstrumentsSGIX(marker)
+	return		void
+	param		marker		Int32 in value
+	category	SGIX_instruments
+	version		1.0
+	glxflags	SGI
+	glxropcode	2077
+	extension
+	offset		463
+
+StartInstrumentsSGIX()
+	return		void
+	category	SGIX_instruments
+	version		1.0
+	glxflags	SGI
+	glxropcode	2069
+	extension
+	offset		464
+
+StopInstrumentsSGIX(marker)
+	return		void
+	param		marker		Int32 in value
+	category	SGIX_instruments
+	version		1.0
+	glxflags	SGI
+	glxropcode	2070
+	extension
+	offset		465
+
+###############################################################################
+#
+# Extension #56
+# SGIX_texture_scale_bias commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_texture_scale_bias
+
+###############################################################################
+#
+# Extension #57
+# SGIX_framezoom commands
+#
+###############################################################################
+
+FrameZoomSGIX(factor)
+	return		void
+	param		factor		CheckedInt32 in value
+	category	SGIX_framezoom
+	version		1.0
+	glxflags	SGI
+	glxropcode	2072
+	extension
+	offset		466
+
+###############################################################################
+#
+# Extension #58
+# SGIX_tag_sample_buffer commands
+#
+###############################################################################
+
+TagSampleBufferSGIX()
+	return		void
+	category	SGIX_tag_sample_buffer
+	version		1.0
+	glxropcode	2050
+	glxflags	SGI
+	extension
+	offset		467
+
+###############################################################################
+#
+# Extension #59
+# SGIX_polynomial_ffd commands
+#
+###############################################################################
+
+DeformationMap3dSGIX(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, w1, w2, wstride, worder, points)
+	return		void
+	param		target		FfdTargetSGIX in value
+	param		u1		CoordD in value
+	param		u2		CoordD in value
+	param		ustride		Int32 in value
+	param		uorder		CheckedInt32 in value
+	param		v1		CoordD in value
+	param		v2		CoordD in value
+	param		vstride		Int32 in value
+	param		vorder		CheckedInt32 in value
+	param		w1		CoordD in value
+	param		w2		CoordD in value
+	param		wstride		Int32 in value
+	param		worder		CheckedInt32 in value
+	param		points		CoordD in array [COMPSIZE(target/ustride/uorder/vstride/vorder/wstride/worder)]
+	dlflags		handcode
+	category	SGIX_polynomial_ffd
+	version		1.0
+	glxflags	SGI ignore
+	glxropcode	2073
+	extension
+	offset		?
+
+DeformationMap3fSGIX(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, w1, w2, wstride, worder, points)
+	return		void
+	param		target		FfdTargetSGIX in value
+	param		u1		CoordF in value
+	param		u2		CoordF in value
+	param		ustride		Int32 in value
+	param		uorder		CheckedInt32 in value
+	param		v1		CoordF in value
+	param		v2		CoordF in value
+	param		vstride		Int32 in value
+	param		vorder		CheckedInt32 in value
+	param		w1		CoordF in value
+	param		w2		CoordF in value
+	param		wstride		Int32 in value
+	param		worder		CheckedInt32 in value
+	param		points		CoordF in array [COMPSIZE(target/ustride/uorder/vstride/vorder/wstride/worder)]
+	category	SGIX_polynomial_ffd
+	dlflags		handcode
+	version		1.0
+	glxflags	SGI ignore
+	glxropcode	2074
+	extension
+	offset		?
+
+DeformSGIX(mask)
+	return		void
+	param		mask		FfdMaskSGIX in value
+	category	SGIX_polynomial_ffd
+	version		1.0
+	glxflags	SGI ignore
+	glxropcode	2075
+	extension
+	offset		?
+
+LoadIdentityDeformationMapSGIX(mask)
+	return		void
+	param		mask		FfdMaskSGIX in value
+	category	SGIX_polynomial_ffd
+	version		1.0
+	glxflags	SGI ignore
+	glxropcode	2076
+	extension
+	offset		?
+
+###############################################################################
+#
+# Extension #60
+# SGIX_reference_plane commands
+#
+###############################################################################
+
+ReferencePlaneSGIX(equation)
+	return		void
+	param		equation	Float64 in array [4]
+	category	SGIX_reference_plane
+	version		1.0
+	glxflags	SGI
+	glxropcode	2071
+	extension
+	offset		468
+
+###############################################################################
+#
+# Extension #61
+# SGIX_flush_raster commands
+#
+###############################################################################
+
+FlushRasterSGIX()
+	return		void
+	category	SGIX_flush_raster
+	version		1.0
+	dlflags		notlistable
+	glxflags	SGI
+	glxvendorpriv	4105
+	extension
+	offset		469
+
+###############################################################################
+#
+# Extension #62 - GLX_SGIX_cushion
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #63
+# SGIX_depth_texture commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_depth_texture
+
+###############################################################################
+#
+# Extension #64
+# SGIS_fog_function commands
+#
+###############################################################################
+
+FogFuncSGIS(n, points)
+	return		void
+	param		n		SizeI in value
+	param		points		Float32 in array [n*2]
+	category	SGIS_fog_function
+	version		1.1
+	glxflags	SGI
+	glxropcode	2067
+	extension
+	offset
+
+# Need to insert GLX information
+GetFogFuncSGIS(points)
+	return		void
+	param		points		Float32 out array [COMPSIZE()]
+	category	SGIS_fog_function
+	version		1.1
+	dlflags		notlistable
+	glxflags	ignore
+	extension
+	offset
+
+###############################################################################
+#
+# Extension #65
+# SGIX_fog_offset commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_fog_offset
+
+###############################################################################
+#
+# Extension #66
+# HP_image_transform commands
+#
+###############################################################################
+
+ImageTransformParameteriHP(target, pname, param)
+	return		void
+	param		target		ImageTransformTargetHP in value
+	param		pname		ImageTransformPNameHP in value
+	param		param		Int32 in value
+	category	HP_image_transform
+	version		1.1
+	glxropcode	?
+	offset		?
+
+ImageTransformParameterfHP(target, pname, param)
+	return		void
+	param		target		ImageTransformTargetHP in value
+	param		pname		ImageTransformPNameHP in value
+	param		param		Float32 in value
+	category	HP_image_transform
+	version		1.1
+	glxropcode	?
+	offset		?
+
+ImageTransformParameterivHP(target, pname, params)
+	return		void
+	param		target		ImageTransformTargetHP in value
+	param		pname		ImageTransformPNameHP in value
+	param		params		Int32 in array [COMPSIZE(pname)]
+	category	HP_image_transform
+	version		1.1
+	glxropcode	?
+	offset		?
+
+ImageTransformParameterfvHP(target, pname, params)
+	return		void
+	param		target		ImageTransformTargetHP in value
+	param		pname		ImageTransformPNameHP in value
+	param		params		Float32 in array [COMPSIZE(pname)]
+	category	HP_image_transform
+	version		1.1
+	glxropcode	?
+	offset		?
+
+GetImageTransformParameterivHP(target, pname, params)
+	return		void
+	param		target		ImageTransformTargetHP in value
+	param		pname		ImageTransformPNameHP in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	dlflags		notlistable
+	category	HP_image_transform
+	version		1.1
+	glxropcode	?
+	offset		?
+
+GetImageTransformParameterfvHP(target, pname, params)
+	return		void
+	param		target		ImageTransformTargetHP in value
+	param		pname		ImageTransformPNameHP in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	HP_image_transform
+	version		1.1
+	glxropcode	?
+	offset		?
+
+###############################################################################
+#
+# Extension #67
+# HP_convolution_border_modes commands
+#
+###############################################################################
+
+# (none)
+newcategory: HP_convolution_border_modes
+
+###############################################################################
+#
+# Extension #68
+# INGR_palette_buffer commands
+#
+###############################################################################
+
+#@ (Intergraph hasn't provided a spec)
+
+###############################################################################
+#
+# Extension #69
+# SGIX_texture_add_env commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_texture_add_env
+
+###############################################################################
+#
+# Extension #70 - skipped
+# Extension #71 - skipped
+# Extension #72 - skipped
+# Extension #73 - skipped
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #74
+# EXT_color_subtable commands
+#
+# This was probably never actually shipped as an EXT - just written up as a
+# reference for OpenGL 1.2 ARB_imaging.
+#
+###############################################################################
+
+ColorSubTableEXT(target, start, count, format, type, data)
+	return		void
+	param		target		ColorTableTarget in value
+	param		start		SizeI in value
+	param		count		SizeI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		data		Void in array [COMPSIZE(format/type/count)]
+	category	EXT_color_subtable
+	version		1.2
+	alias		ColorSubTable
+
+CopyColorSubTableEXT(target, start, x, y, width)
+	return		void
+	param		target		ColorTableTarget in value
+	param		start		SizeI in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	category	EXT_color_subtable
+	version		1.2
+	alias		CopyColorSubTable
+
+###############################################################################
+#
+# Extension #75 - GLU_EXT_object_space_tess
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #76
+# PGI_vertex_hints commands
+#
+###############################################################################
+
+# (none)
+newcategory: PGI_vertex_hints
+
+###############################################################################
+#
+# Extension #77
+# PGI_misc_hints commands
+#
+###############################################################################
+
+HintPGI(target, mode)
+	return		void
+	param		target		HintTargetPGI in value
+	param		mode		Int32 in value
+	category	PGI_misc_hints
+	version		1.1
+	offset		544
+
+###############################################################################
+#
+# Extension #78
+# EXT_paletted_texture commands
+#
+###############################################################################
+
+ColorTableEXT(target, internalFormat, width, format, type, table)
+	return		void
+	param		target		ColorTableTarget in value
+	param		internalFormat	PixelInternalFormat in value
+	param		width		SizeI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		table		Void in array [COMPSIZE(format/type/width)]
+	category	EXT_paletted_texture
+	version		1.1
+	alias		ColorTable
+
+GetColorTableEXT(target, format, type, data)
+	return		void
+	param		target		ColorTableTarget in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		data		Void out array [COMPSIZE(target/format/type)]
+	category	EXT_paletted_texture
+	version		1.1
+	offset		550
+
+GetColorTableParameterivEXT(target, pname, params)
+	return		void
+	param		target		ColorTableTarget in value
+	param		pname		GetColorTableParameterPName in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	EXT_paletted_texture
+	version		1.1
+	offset		551
+
+GetColorTableParameterfvEXT(target, pname, params)
+	return		void
+	param		target		ColorTableTarget in value
+	param		pname		GetColorTableParameterPName in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	EXT_paletted_texture
+	version		1.1
+	offset		552
+
+###############################################################################
+#
+# Extension #79
+# EXT_clip_volume_hint commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_clip_volume_hint
+
+###############################################################################
+#
+# Extension #80
+# SGIX_list_priority commands
+#
+###############################################################################
+
+# @@@ Needs vendorpriv opcodes assigned
+GetListParameterfvSGIX(list, pname, params)
+	return		void
+	param		list		List in value
+	param		pname		ListParameterName in value
+	param		params		CheckedFloat32 out array [COMPSIZE(pname)]
+	dlflags		notlistable
+	glxflags	ignore
+	category	SGIX_list_priority
+	version		1.0
+	glxvendorpriv	?
+	extension
+	offset		470
+
+# @@@ Needs vendorpriv opcodes assigned
+GetListParameterivSGIX(list, pname, params)
+	return		void
+	param		list		List in value
+	param		pname		ListParameterName in value
+	param		params		CheckedInt32 out array [COMPSIZE(pname)]
+	dlflags		notlistable
+	glxflags	ignore
+	category	SGIX_list_priority
+	version		1.0
+	glxvendorpriv	?
+	extension
+	offset		471
+
+ListParameterfSGIX(list, pname, param)
+	return		void
+	param		list		List in value
+	param		pname		ListParameterName in value
+	param		param		CheckedFloat32 in value
+	dlflags		notlistable
+	glxflags	ignore
+	category	SGIX_list_priority
+	version		1.0
+	glxropcode	2078
+	extension
+	offset		472
+
+ListParameterfvSGIX(list, pname, params)
+	return		void
+	param		list		List in value
+	param		pname		ListParameterName in value
+	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
+	dlflags		notlistable
+	glxflags	ignore
+	category	SGIX_list_priority
+	version		1.0
+	glxropcode	2079
+	extension
+	offset		473
+
+ListParameteriSGIX(list, pname, param)
+	return		void
+	param		list		List in value
+	param		pname		ListParameterName in value
+	param		param		CheckedInt32 in value
+	dlflags		notlistable
+	glxflags	ignore
+	category	SGIX_list_priority
+	version		1.0
+	glxropcode	2080
+	extension
+	offset		474
+
+ListParameterivSGIX(list, pname, params)
+	return		void
+	param		list		List in value
+	param		pname		ListParameterName in value
+	param		params		CheckedInt32 in array [COMPSIZE(pname)]
+	dlflags		notlistable
+	glxflags	ignore
+	category	SGIX_list_priority
+	version		1.0
+	glxropcode	2081
+	extension
+	offset		475
+
+###############################################################################
+#
+# Extension #81
+# SGIX_ir_instrument1 commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_ir_instrument1
+
+###############################################################################
+#
+# Extension #82
+# SGIX_calligraphic_fragment commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_calligraphic_fragment
+
+###############################################################################
+#
+# Extension #83 - GLX_SGIX_video_resize
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #84
+# SGIX_texture_lod_bias commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_texture_lod_bias
+
+###############################################################################
+#
+# Extension #85 - skipped
+# Extension #86 - GLX_SGIX_dmbuffer
+# Extension #87 - skipped
+# Extension #88 - skipped
+# Extension #89 - skipped
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #90
+# SGIX_shadow_ambient commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_shadow_ambient
+
+###############################################################################
+#
+# Extension #91 - GLX_SGIX_swap_group
+# Extension #92 - GLX_SGIX_swap_barrier
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #93
+# EXT_index_texture commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_index_texture
+
+###############################################################################
+#
+# Extension #94
+# EXT_index_material commands
+#
+###############################################################################
+
+IndexMaterialEXT(face, mode)
+	return		void
+	param		face		MaterialFace in value
+	param		mode		IndexMaterialParameterEXT in value
+	category	EXT_index_material
+	version		1.1
+	extension	soft
+	glxflags	ignore
+	offset		538
+
+###############################################################################
+#
+# Extension #95
+# EXT_index_func commands
+#
+###############################################################################
+
+IndexFuncEXT(func, ref)
+	return		void
+	param		func		IndexFunctionEXT in value
+	param		ref		ClampedFloat32 in value
+	category	EXT_index_func
+	version		1.1
+	extension	soft
+	glxflags	ignore
+	offset		539
+
+###############################################################################
+#
+# Extension #96
+# EXT_index_array_formats commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_index_array_formats
+
+###############################################################################
+#
+# Extension #97
+# EXT_compiled_vertex_array commands
+#
+###############################################################################
+
+LockArraysEXT(first, count)
+	return		void
+	param		first		Int32 in value
+	param		count		SizeI in value
+	category	EXT_compiled_vertex_array
+	version		1.1
+	dlflags		notlistable
+	extension	soft
+	glxflags	ignore
+	offset		540
+
+UnlockArraysEXT()
+	return		void
+	category	EXT_compiled_vertex_array
+	version		1.1
+	dlflags		notlistable
+	extension	soft
+	glxflags	ignore
+	offset		541
+
+###############################################################################
+#
+# Extension #98
+# EXT_cull_vertex commands
+#
+###############################################################################
+
+CullParameterdvEXT(pname, params)
+	return		void
+	param		pname		CullParameterEXT in value
+	param		params		Float64 out array [4]
+	category	EXT_cull_vertex
+	version		1.1
+	dlflags		notlistable
+	extension	soft
+	glxflags	ignore
+	offset		542
+
+CullParameterfvEXT(pname, params)
+	return		void
+	param		pname		CullParameterEXT in value
+	param		params		Float32 out array [4]
+	category	EXT_cull_vertex
+	version		1.1
+	dlflags		notlistable
+	extension	soft
+	glxflags	ignore
+	offset		543
+
+###############################################################################
+#
+# Extension #99 - skipped
+# Extension #100 - GLU_EXT_nurbs_tessellator
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #101
+# SGIX_ycrcb commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_ycrcb
+
+###############################################################################
+#
+# Extension #102
+# SGIX_fragment_lighting commands
+#
+###############################################################################
+
+FragmentColorMaterialSGIX(face, mode)
+	return		void
+	param		face		MaterialFace in value
+	param		mode		MaterialParameter in value
+	category	SGIX_fragment_lighting
+	glxflags	ignore
+	version		1.0
+	extension
+	offset		476
+
+FragmentLightfSGIX(light, pname, param)
+	return		void
+	param		light		FragmentLightNameSGIX in value
+	param		pname		FragmentLightParameterSGIX in value
+	param		param		CheckedFloat32 in value
+	category	SGIX_fragment_lighting
+	glxflags	ignore
+	version		1.0
+	extension
+	offset		477
+
+FragmentLightfvSGIX(light, pname, params)
+	return		void
+	param		light		FragmentLightNameSGIX in value
+	param		pname		FragmentLightParameterSGIX in value
+	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
+	category	SGIX_fragment_lighting
+	glxflags	ignore
+	version		1.0
+	extension
+	offset		478
+
+FragmentLightiSGIX(light, pname, param)
+	return		void
+	param		light		FragmentLightNameSGIX in value
+	param		pname		FragmentLightParameterSGIX in value
+	param		param		CheckedInt32 in value
+	category	SGIX_fragment_lighting
+	glxflags	ignore
+	version		1.0
+	extension
+	offset		479
+
+FragmentLightivSGIX(light, pname, params)
+	return		void
+	param		light		FragmentLightNameSGIX in value
+	param		pname		FragmentLightParameterSGIX in value
+	param		params		CheckedInt32 in array [COMPSIZE(pname)]
+	category	SGIX_fragment_lighting
+	glxflags	ignore
+	version		1.0
+	extension
+	offset		480
+
+FragmentLightModelfSGIX(pname, param)
+	return		void
+	param		pname		FragmentLightModelParameterSGIX in value
+	param		param		CheckedFloat32 in value
+	category	SGIX_fragment_lighting
+	glxflags	ignore
+	version		1.0
+	extension
+	offset		481
+
+FragmentLightModelfvSGIX(pname, params)
+	return		void
+	param		pname		FragmentLightModelParameterSGIX in value
+	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
+	category	SGIX_fragment_lighting
+	glxflags	ignore
+	version		1.0
+	extension
+	offset		482
+
+FragmentLightModeliSGIX(pname, param)
+	return		void
+	param		pname		FragmentLightModelParameterSGIX in value
+	param		param		CheckedInt32 in value
+	category	SGIX_fragment_lighting
+	glxflags	ignore
+	version		1.0
+	extension
+	offset		483
+
+FragmentLightModelivSGIX(pname, params)
+	return		void
+	param		pname		FragmentLightModelParameterSGIX in value
+	param		params		CheckedInt32 in array [COMPSIZE(pname)]
+	category	SGIX_fragment_lighting
+	glxflags	ignore
+	version		1.0
+	extension
+	offset		484
+
+FragmentMaterialfSGIX(face, pname, param)
+	return		void
+	param		face		MaterialFace in value
+	param		pname		MaterialParameter in value
+	param		param		CheckedFloat32 in value
+	category	SGIX_fragment_lighting
+	glxflags	ignore
+	version		1.0
+	extension
+	offset		485
+
+FragmentMaterialfvSGIX(face, pname, params)
+	return		void
+	param		face		MaterialFace in value
+	param		pname		MaterialParameter in value
+	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
+	category	SGIX_fragment_lighting
+	glxflags	ignore
+	version		1.0
+	extension
+	offset		486
+
+FragmentMaterialiSGIX(face, pname, param)
+	return		void
+	param		face		MaterialFace in value
+	param		pname		MaterialParameter in value
+	param		param		CheckedInt32 in value
+	category	SGIX_fragment_lighting
+	glxflags	ignore
+	version		1.0
+	extension
+	offset		487
+
+FragmentMaterialivSGIX(face, pname, params)
+	return		void
+	param		face		MaterialFace in value
+	param		pname		MaterialParameter in value
+	param		params		CheckedInt32 in array [COMPSIZE(pname)]
+	category	SGIX_fragment_lighting
+	glxflags	ignore
+	version		1.0
+	extension
+	offset		488
+
+GetFragmentLightfvSGIX(light, pname, params)
+	return		void
+	param		light		FragmentLightNameSGIX in value
+	param		pname		FragmentLightParameterSGIX in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	SGIX_fragment_lighting
+	dlflags		notlistable
+	glxflags	ignore
+	version		1.0
+	extension
+	offset		489
+
+GetFragmentLightivSGIX(light, pname, params)
+	return		void
+	param		light		FragmentLightNameSGIX in value
+	param		pname		FragmentLightParameterSGIX in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	SGIX_fragment_lighting
+	dlflags		notlistable
+	glxflags	ignore
+	version		1.0
+	extension
+	offset		490
+
+GetFragmentMaterialfvSGIX(face, pname, params)
+	return		void
+	param		face		MaterialFace in value
+	param		pname		MaterialParameter in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	SGIX_fragment_lighting
+	dlflags		notlistable
+	glxflags	ignore
+	version		1.0
+	extension
+	offset		491
+
+GetFragmentMaterialivSGIX(face, pname, params)
+	return		void
+	param		face		MaterialFace in value
+	param		pname		MaterialParameter in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	SGIX_fragment_lighting
+	dlflags		notlistable
+	glxflags	ignore
+	version		1.0
+	extension
+	offset		492
+
+LightEnviSGIX(pname, param)
+	return		void
+	param		pname		LightEnvParameterSGIX in value
+	param		param		CheckedInt32 in value
+	category	SGIX_fragment_lighting
+	glxflags	ignore
+	version		1.0
+	extension
+	offset		493
+
+###############################################################################
+#
+# Extension #103 - skipped
+# Extension #104 - skipped
+# Extension #105 - skipped
+# Extension #106 - skipped
+# Extension #107 - skipped
+# Extension #108 - skipped
+# Extension #109 - skipped
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #110
+# IBM_rasterpos_clip commands
+#
+###############################################################################
+
+# (none)
+newcategory: IBM_rasterpos_clip
+
+###############################################################################
+#
+# Extension #111
+# HP_texture_lighting commands
+#
+###############################################################################
+
+# (none)
+newcategory: HP_texture_lighting
+
+###############################################################################
+#
+# Extension #112
+# EXT_draw_range_elements commands
+#
+###############################################################################
+
+# Spec entries to be written
+DrawRangeElementsEXT(mode, start, end, count, type, indices)
+	return		void
+	param		mode		BeginMode in value
+	param		start		UInt32 in value
+	param		end		UInt32 in value
+	param		count		SizeI in value
+	param		type		DrawElementsType in value
+	param		indices		Void in array [COMPSIZE(count/type)]
+	category	EXT_draw_range_elements
+	dlflags		handcode
+	glxflags	client-handcode client-intercept server-handcode
+	version		1.1
+	alias		DrawRangeElements
+
+###############################################################################
+#
+# Extension #113
+# WIN_phong_shading commands
+#
+###############################################################################
+
+# (none)
+newcategory: WIN_phong_shading
+
+###############################################################################
+#
+# Extension #114
+# WIN_specular_fog commands
+#
+###############################################################################
+
+# (none)
+newcategory: WIN_specular_fog
+
+###############################################################################
+#
+# Extension #115 - skipped
+# Extension #116 - skipped
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #117
+# EXT_light_texture commands
+#
+###############################################################################
+
+# Spec entries to be written
+ApplyTextureEXT(mode)
+	return		void
+	param		mode		LightTextureModeEXT in value
+	category	EXT_light_texture
+	version		1.1
+	glxropcode	?
+	offset		?
+
+TextureLightEXT(pname)
+	return		void
+	param		pname		LightTexturePNameEXT in value
+	category	EXT_light_texture
+	version		1.1
+	glxropcode	?
+	offset		?
+
+TextureMaterialEXT(face, mode)
+	return		void
+	param		face		MaterialFace in value
+	param		mode		MaterialParameter in value
+	category	EXT_light_texture
+	version		1.1
+	glxropcode	?
+	offset		?
+
+###############################################################################
+#
+# Extension #118 - skipped
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #119
+# SGIX_blend_alpha_minmax commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_blend_alpha_minmax
+
+###############################################################################
+#
+# Extension #120 - skipped
+# Extension #121 - skipped
+# Extension #122 - skipped
+# Extension #123 - skipped
+# Extension #124 - skipped
+# Extension #125 - skipped
+# Extension #126 - skipped
+# Extension #127 - skipped
+# Extension #128 - skipped
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #129
+# EXT_bgra commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_bgra
+
+###############################################################################
+#
+# Extension #130 - skipped
+# Extension #131 - skipped
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #132
+# SGIX_async commands
+#
+###############################################################################
+
+AsyncMarkerSGIX(marker)
+	return		void
+	param		marker		UInt32 in value
+	category	SGIX_async
+	version		1.0
+	glxflags	ignore
+	extension
+	offset		?
+
+FinishAsyncSGIX(markerp)
+	return		Int32
+	param		markerp		UInt32 out array [1]
+	category	SGIX_async
+	version		1.0
+	dlflags		notlistable
+	glxflags	ignore
+	extension
+	offset		?
+
+PollAsyncSGIX(markerp)
+	return		Int32
+	param		markerp		UInt32 out array [1]
+	category	SGIX_async
+	version		1.0
+	dlflags		notlistable
+	glxflags	ignore
+	extension
+	offset		?
+
+GenAsyncMarkersSGIX(range)
+	return		UInt32
+	param		range		SizeI in value
+	category	SGIX_async
+	version		1.0
+	dlflags		notlistable
+	glxflags	ignore
+	extension
+	offset		?
+
+DeleteAsyncMarkersSGIX(marker, range)
+	return		void
+	param		marker		UInt32 in value
+	param		range		SizeI in value
+	category	SGIX_async
+	version		1.0
+	dlflags		notlistable
+	glxflags	ignore
+	extension
+	offset		?
+
+IsAsyncMarkerSGIX(marker)
+	return		Boolean
+	param		marker		UInt32 in value
+	category	SGIX_async
+	version		1.0
+	dlflags		notlistable
+	glxflags	ignore
+	extension
+	offset		?
+
+###############################################################################
+#
+# Extension #133
+# SGIX_async_pixel commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_async_pixel
+
+###############################################################################
+#
+# Extension #134
+# SGIX_async_histogram commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_async_histogram
+
+###############################################################################
+#
+# Extension #135 - skipped (INTEL_texture_scissor was never implemented)
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #136
+# INTEL_parallel_arrays commands
+#
+###############################################################################
+
+VertexPointervINTEL(size, type, pointer)
+	return		void
+	param		size		Int32 in value
+	param		type		VertexPointerType in value
+	param		pointer		VoidPointer in array [4] retained
+	category	INTEL_parallel_arrays
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode EXT
+	version		1.1
+	offset		?
+
+NormalPointervINTEL(type, pointer)
+	return		void
+	param		type		NormalPointerType in value
+	param		pointer		VoidPointer in array [4] retained
+	category	INTEL_parallel_arrays
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode EXT
+	version		1.1
+	offset		?
+
+ColorPointervINTEL(size, type, pointer)
+	return		void
+	param		size		Int32 in value
+	param		type		VertexPointerType in value
+	param		pointer		VoidPointer in array [4] retained
+	category	INTEL_parallel_arrays
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode EXT
+	version		1.1
+	offset		?
+
+TexCoordPointervINTEL(size, type, pointer)
+	return		void
+	param		size		Int32 in value
+	param		type		VertexPointerType in value
+	param		pointer		VoidPointer in array [4] retained
+	category	INTEL_parallel_arrays
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode EXT
+	version		1.1
+	offset		?
+
+
+###############################################################################
+#
+# Extension #137
+# HP_occlusion_test commands
+#
+###############################################################################
+
+# (none)
+newcategory: HP_occlusion_test
+
+###############################################################################
+#
+# Extension #138
+# EXT_pixel_transform commands
+#
+###############################################################################
+
+PixelTransformParameteriEXT(target, pname, param)
+	return		void
+	param		target		PixelTransformTargetEXT in value
+	param		pname		PixelTransformPNameEXT in value
+	param		param		Int32 in value
+	category	EXT_pixel_transform
+	version		1.1
+	glxropcode	16386
+	offset		?
+
+PixelTransformParameterfEXT(target, pname, param)
+	return		void
+	param		target		PixelTransformTargetEXT in value
+	param		pname		PixelTransformPNameEXT in value
+	param		param		Float32 in value
+	category	EXT_pixel_transform
+	version		1.1
+	glxropcode	16385
+	offset		?
+
+PixelTransformParameterivEXT(target, pname, params)
+	return		void
+	param		target		PixelTransformTargetEXT in value
+	param		pname		PixelTransformPNameEXT in value
+	param		params		Int32 in array [1]
+	category	EXT_pixel_transform
+	version		1.1
+	glxropcode	?
+	offset		?
+
+PixelTransformParameterfvEXT(target, pname, params)
+	return		void
+	param		target		PixelTransformTargetEXT in value
+	param		pname		PixelTransformPNameEXT in value
+	param		params		Float32 in array [1]
+	category	EXT_pixel_transform
+	version		1.1
+	glxropcode	?
+	offset		?
+
+GetPixelTransformParameterivEXT(target, pname, params)
+	return		void
+	param		target		GLenum in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	EXT_pixel_transform
+	dlflags		notlistable
+	version		1.1
+	extension
+	glxvendorpriv	2052
+	glxflags	ignore
+	offset		?
+
+GetPixelTransformParameterfvEXT(target, pname, params)
+	return		void
+	param		target		GLenum in value
+	param		pname		GLenum in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	EXT_pixel_transform
+	dlflags		notlistable
+	version		1.1
+	extension
+	glxvendorpriv	2051
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #139
+# EXT_pixel_transform_color_table commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_pixel_transform_color_table
+
+###############################################################################
+#
+# Extension #140 - skipped
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #141
+# EXT_shared_texture_palette commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_shared_texture_palette
+
+###############################################################################
+#
+# Extension #142 - GLX_SGIS_blended_overlay
+# Extension #143 - GLX_SGIS_shared_multisample
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #144
+# EXT_separate_specular_color commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_separate_specular_color
+
+###############################################################################
+#
+# Extension #145
+# EXT_secondary_color commands
+#
+###############################################################################
+
+SecondaryColor3bEXT(red, green, blue)
+	return		void
+	param		red		ColorB in value
+	param		green		ColorB in value
+	param		blue		ColorB in value
+	category	EXT_secondary_color
+	vectorequiv	SecondaryColor3bvEXT
+	version		1.1
+	alias		SecondaryColor3b
+
+SecondaryColor3bvEXT(v)
+	return		void
+	param		v		ColorB in array [3]
+	category	EXT_secondary_color
+	version		1.1
+	glxropcode	4126
+	alias		SecondaryColor3bv
+
+SecondaryColor3dEXT(red, green, blue)
+	return		void
+	param		red		ColorD in value
+	param		green		ColorD in value
+	param		blue		ColorD in value
+	category	EXT_secondary_color
+	vectorequiv	SecondaryColor3dvEXT
+	version		1.1
+	alias		SecondaryColor3d
+
+SecondaryColor3dvEXT(v)
+	return		void
+	param		v		ColorD in array [3]
+	category	EXT_secondary_color
+	version		1.1
+	glxropcode	4130
+	alias		SecondaryColor3dv
+
+SecondaryColor3fEXT(red, green, blue)
+	return		void
+	param		red		ColorF in value
+	param		green		ColorF in value
+	param		blue		ColorF in value
+	category	EXT_secondary_color
+	vectorequiv	SecondaryColor3fvEXT
+	version		1.1
+	alias		SecondaryColor3f
+
+SecondaryColor3fvEXT(v)
+	return		void
+	param		v		ColorF in array [3]
+	category	EXT_secondary_color
+	version		1.1
+	glxropcode	4129
+	alias		SecondaryColor3fv
+
+SecondaryColor3iEXT(red, green, blue)
+	return		void
+	param		red		ColorI in value
+	param		green		ColorI in value
+	param		blue		ColorI in value
+	category	EXT_secondary_color
+	vectorequiv	SecondaryColor3ivEXT
+	version		1.1
+	alias		SecondaryColor3i
+
+SecondaryColor3ivEXT(v)
+	return		void
+	param		v		ColorI in array [3]
+	category	EXT_secondary_color
+	version		1.1
+	glxropcode	4128
+	offset		568
+	alias		SecondaryColor3iv
+
+SecondaryColor3sEXT(red, green, blue)
+	return		void
+	param		red		ColorS in value
+	param		green		ColorS in value
+	param		blue		ColorS in value
+	category	EXT_secondary_color
+	vectorequiv	SecondaryColor3svEXT
+	version		1.1
+	alias		SecondaryColor3s
+
+SecondaryColor3svEXT(v)
+	return		void
+	param		v		ColorS in array [3]
+	category	EXT_secondary_color
+	version		1.1
+	glxropcode	4127
+	alias		SecondaryColor3sv
+
+SecondaryColor3ubEXT(red, green, blue)
+	return		void
+	param		red		ColorUB in value
+	param		green		ColorUB in value
+	param		blue		ColorUB in value
+	category	EXT_secondary_color
+	vectorequiv	SecondaryColor3ubvEXT
+	version		1.1
+	alias		SecondaryColor3ub
+
+SecondaryColor3ubvEXT(v)
+	return		void
+	param		v		ColorUB in array [3]
+	category	EXT_secondary_color
+	version		1.1
+	glxropcode	4131
+	alias		SecondaryColor3ubv
+
+SecondaryColor3uiEXT(red, green, blue)
+	return		void
+	param		red		ColorUI in value
+	param		green		ColorUI in value
+	param		blue		ColorUI in value
+	category	EXT_secondary_color
+	vectorequiv	SecondaryColor3uivEXT
+	version		1.1
+	alias		SecondaryColor3ui
+
+SecondaryColor3uivEXT(v)
+	return		void
+	param		v		ColorUI in array [3]
+	category	EXT_secondary_color
+	version		1.1
+	glxropcode	4133
+	alias		SecondaryColor3uiv
+
+SecondaryColor3usEXT(red, green, blue)
+	return		void
+	param		red		ColorUS in value
+	param		green		ColorUS in value
+	param		blue		ColorUS in value
+	category	EXT_secondary_color
+	vectorequiv	SecondaryColor3usvEXT
+	version		1.1
+	alias		SecondaryColor3us
+
+SecondaryColor3usvEXT(v)
+	return		void
+	param		v		ColorUS in array [3]
+	category	EXT_secondary_color
+	version		1.1
+	glxropcode	4132
+	alias		SecondaryColor3usv
+
+SecondaryColorPointerEXT(size, type, stride, pointer)
+	return		void
+	param		size		Int32 in value
+	param		type		ColorPointerType in value
+	param		stride		SizeI in value
+	param		pointer		Void in array [COMPSIZE(size/type/stride)] retained
+	category	EXT_secondary_color
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode EXT
+	version		1.1
+	extension
+	alias		SecondaryColorPointer
+
+###############################################################################
+#
+# Extension #146
+# EXT_texture_env commands
+#
+###############################################################################
+
+# Dead extension - never implemented (removed from registry!)
+# (none)
+# newcategory: EXT_texture_env
+
+###############################################################################
+#
+# Extension #147
+# EXT_texture_perturb_normal commands
+#
+###############################################################################
+
+TextureNormalEXT(mode)
+	return		void
+	param		mode		TextureNormalModeEXT in value
+	category	EXT_texture_perturb_normal
+	version		1.1
+	glxropcode	?
+	offset		?
+
+###############################################################################
+#
+# Extension #148
+# EXT_multi_draw_arrays commands
+#
+###############################################################################
+
+# first and count are really 'in'
+MultiDrawArraysEXT(mode, first, count, primcount)
+	return		void
+	param		mode		BeginMode in value
+	param		first		Int32 in array [COMPSIZE(primcount)]
+	param		count		SizeI in array [COMPSIZE(primcount)]
+	param		primcount	SizeI in value
+	category	EXT_multi_draw_arrays
+	version		1.1
+	glxropcode	?
+	alias		MultiDrawArrays
+
+MultiDrawElementsEXT(mode, count, type, indices, primcount)
+	return		void
+	param		mode		BeginMode in value
+	param		count		SizeI in array [COMPSIZE(primcount)]
+	param		type		DrawElementsType in value
+	param		indices		VoidPointer in array [COMPSIZE(primcount)]
+	param		primcount	SizeI in value
+	category	EXT_multi_draw_arrays
+	version		1.1
+	glxropcode	?
+	alias		MultiDrawElements
+
+###############################################################################
+#
+# Extension #149
+# EXT_fog_coord commands
+#
+###############################################################################
+
+FogCoordfEXT(coord)
+	return		void
+	param		coord		CoordF in value
+	category	EXT_fog_coord
+	vectorequiv	FogCoordfvEXT
+	version		1.1
+	alias		FogCoordf
+
+FogCoordfvEXT(coord)
+	return		void
+	param		coord		CoordF in array [1]
+	category	EXT_fog_coord
+	version		1.1
+	glxropcode	4124
+	alias		FogCoordfv
+
+FogCoorddEXT(coord)
+	return		void
+	param		coord		CoordD in value
+	category	EXT_fog_coord
+	vectorequiv	FogCoorddvEXT
+	version		1.1
+	alias		FogCoordd
+
+FogCoorddvEXT(coord)
+	return		void
+	param		coord		CoordD in array [1]
+	category	EXT_fog_coord
+	version		1.1
+	glxropcode	4125
+	alias		FogCoorddv
+
+FogCoordPointerEXT(type, stride, pointer)
+	return		void
+	param		type		FogPointerTypeEXT in value
+	param		stride		SizeI in value
+	param		pointer		Void in array [COMPSIZE(type/stride)] retained
+	category	EXT_fog_coord
+	dlflags		notlistable
+	version		1.1
+	glxflags	client-handcode server-handcode EXT
+	alias		FogCoordPointer
+
+###############################################################################
+#
+# Extension #150 - skipped
+# Extension #151 - skipped
+# Extension #152 - skipped
+# Extension #153 - skipped
+# Extension #154 - skipped
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #155
+# REND_screen_coordinates commands
+#
+###############################################################################
+
+# (none)
+newcategory: REND_screen_coordinates
+
+###############################################################################
+#
+# Extension #156
+# EXT_coordinate_frame commands
+#
+###############################################################################
+
+Tangent3bEXT(tx, ty, tz)
+	return		void
+	param		tx		Int8 in value
+	param		ty		Int8 in value
+	param		tz		Int8 in value
+	category	EXT_coordinate_frame
+	vectorequiv	Tangent3bvEXT
+	version		1.1
+	offset		?
+
+Tangent3bvEXT(v)
+	return		void
+	param		v		Int8 in array [3]
+	category	EXT_coordinate_frame
+	version		1.1
+	glxropcode	?
+	offset		?
+
+Tangent3dEXT(tx, ty, tz)
+	return		void
+	param		tx		CoordD in value
+	param		ty		CoordD in value
+	param		tz		CoordD in value
+	category	EXT_coordinate_frame
+	vectorequiv	Tangent3dvEXT
+	version		1.1
+	offset		?
+
+Tangent3dvEXT(v)
+	return		void
+	param		v		CoordD in array [3]
+	category	EXT_coordinate_frame
+	version		1.1
+	glxropcode	?
+	offset		?
+
+Tangent3fEXT(tx, ty, tz)
+	return		void
+	param		tx		CoordF in value
+	param		ty		CoordF in value
+	param		tz		CoordF in value
+	category	EXT_coordinate_frame
+	vectorequiv	Tangent3fvEXT
+	version		1.1
+	offset		?
+
+Tangent3fvEXT(v)
+	return		void
+	param		v		CoordF in array [3]
+	category	EXT_coordinate_frame
+	version		1.1
+	glxropcode	?
+	offset		?
+
+Tangent3iEXT(tx, ty, tz)
+	return		void
+	param		tx		Int32 in value
+	param		ty		Int32 in value
+	param		tz		Int32 in value
+	category	EXT_coordinate_frame
+	vectorequiv	Tangent3ivEXT
+	version		1.1
+	offset		?
+
+Tangent3ivEXT(v)
+	return		void
+	param		v		Int32 in array [3]
+	category	EXT_coordinate_frame
+	version		1.1
+	glxropcode	?
+	offset		?
+
+Tangent3sEXT(tx, ty, tz)
+	return		void
+	param		tx		Int16 in value
+	param		ty		Int16 in value
+	param		tz		Int16 in value
+	category	EXT_coordinate_frame
+	vectorequiv	Tangent3svEXT
+	version		1.1
+	offset		?
+
+Tangent3svEXT(v)
+	return		void
+	param		v		Int16 in array [3]
+	category	EXT_coordinate_frame
+	version		1.1
+	glxropcode	?
+	offset		?
+
+Binormal3bEXT(bx, by, bz)
+	return		void
+	param		bx		Int8 in value
+	param		by		Int8 in value
+	param		bz		Int8 in value
+	category	EXT_coordinate_frame
+	vectorequiv	Binormal3bvEXT
+	version		1.1
+	offset		?
+
+Binormal3bvEXT(v)
+	return		void
+	param		v		Int8 in array [3]
+	category	EXT_coordinate_frame
+	version		1.1
+	glxropcode	?
+	offset		?
+
+Binormal3dEXT(bx, by, bz)
+	return		void
+	param		bx		CoordD in value
+	param		by		CoordD in value
+	param		bz		CoordD in value
+	category	EXT_coordinate_frame
+	vectorequiv	Binormal3dvEXT
+	version		1.1
+	offset		?
+
+Binormal3dvEXT(v)
+	return		void
+	param		v		CoordD in array [3]
+	category	EXT_coordinate_frame
+	version		1.1
+	glxropcode	?
+	offset		?
+
+Binormal3fEXT(bx, by, bz)
+	return		void
+	param		bx		CoordF in value
+	param		by		CoordF in value
+	param		bz		CoordF in value
+	category	EXT_coordinate_frame
+	vectorequiv	Binormal3fvEXT
+	version		1.1
+	offset		?
+
+Binormal3fvEXT(v)
+	return		void
+	param		v		CoordF in array [3]
+	category	EXT_coordinate_frame
+	version		1.1
+	glxropcode	?
+	offset		?
+
+Binormal3iEXT(bx, by, bz)
+	return		void
+	param		bx		Int32 in value
+	param		by		Int32 in value
+	param		bz		Int32 in value
+	category	EXT_coordinate_frame
+	vectorequiv	Binormal3ivEXT
+	version		1.1
+	offset		?
+
+Binormal3ivEXT(v)
+	return		void
+	param		v		Int32 in array [3]
+	category	EXT_coordinate_frame
+	version		1.1
+	glxropcode	?
+	offset		?
+
+Binormal3sEXT(bx, by, bz)
+	return		void
+	param		bx		Int16 in value
+	param		by		Int16 in value
+	param		bz		Int16 in value
+	category	EXT_coordinate_frame
+	vectorequiv	Binormal3svEXT
+	version		1.1
+	offset		?
+
+Binormal3svEXT(v)
+	return		void
+	param		v		Int16 in array [3]
+	category	EXT_coordinate_frame
+	version		1.1
+	glxropcode	?
+	offset		?
+
+TangentPointerEXT(type, stride, pointer)
+	return		void
+	param		type		TangentPointerTypeEXT in value
+	param		stride		SizeI in value
+	param		pointer		Void in array [COMPSIZE(type/stride)] retained
+	category	EXT_coordinate_frame
+	dlflags		notlistable
+	glxflags	client-handcode client-intercept server-handcode
+	version		1.1
+	offset		?
+
+BinormalPointerEXT(type, stride, pointer)
+	return		void
+	param		type		BinormalPointerTypeEXT in value
+	param		stride		SizeI in value
+	param		pointer		Void in array [COMPSIZE(type/stride)] retained
+	category	EXT_coordinate_frame
+	dlflags		notlistable
+	glxflags	client-handcode client-intercept server-handcode
+	version		1.1
+	offset		?
+
+###############################################################################
+#
+# Extension #157 - skipped
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #158
+# EXT_texture_env_combine commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_texture_env_combine
+
+###############################################################################
+#
+# Extension #159
+# APPLE_specular_vector commands
+#
+###############################################################################
+
+# (none)
+newcategory: APPLE_specular_vector
+
+###############################################################################
+#
+# Extension #160
+# APPLE_transform_hint commands
+#
+###############################################################################
+
+# (none)
+newcategory: APPLE_transform_hint
+
+###############################################################################
+#
+# Extension #161
+# SGIX_fog_scale commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_fog_scale
+
+###############################################################################
+#
+# Extension #162 - skipped
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #163
+# SUNX_constant_data commands
+#
+###############################################################################
+
+FinishTextureSUNX()
+	return		void
+	category	SUNX_constant_data
+	version		1.1
+	glxropcode	?
+	offset		?
+
+###############################################################################
+#
+# Extension #164
+# SUN_global_alpha commands
+#
+###############################################################################
+
+GlobalAlphaFactorbSUN(factor)
+	return		void
+	param		factor		Int8 in value
+	category	SUN_global_alpha
+	version		1.1
+	glxropcode	?
+	offset		?
+
+GlobalAlphaFactorsSUN(factor)
+	return		void
+	param		factor		Int16 in value
+	category	SUN_global_alpha
+	version		1.1
+	glxropcode	?
+	offset		?
+
+GlobalAlphaFactoriSUN(factor)
+	return		void
+	param		factor		Int32 in value
+	category	SUN_global_alpha
+	version		1.1
+	glxropcode	?
+	offset		?
+
+GlobalAlphaFactorfSUN(factor)
+	return		void
+	param		factor		Float32 in value
+	category	SUN_global_alpha
+	version		1.1
+	glxropcode	?
+	offset		?
+
+GlobalAlphaFactordSUN(factor)
+	return		void
+	param		factor		Float64 in value
+	category	SUN_global_alpha
+	version		1.1
+	glxropcode	?
+	offset		?
+
+GlobalAlphaFactorubSUN(factor)
+	return		void
+	param		factor		UInt8 in value
+	category	SUN_global_alpha
+	version		1.1
+	glxropcode	?
+	offset		?
+
+GlobalAlphaFactorusSUN(factor)
+	return		void
+	param		factor		UInt16 in value
+	category	SUN_global_alpha
+	version		1.1
+	glxropcode	?
+	offset		?
+
+GlobalAlphaFactoruiSUN(factor)
+	return		void
+	param		factor		UInt32 in value
+	category	SUN_global_alpha
+	version		1.1
+	glxropcode	?
+	offset		?
+
+###############################################################################
+#
+# Extension #165
+# SUN_triangle_list commands
+#
+###############################################################################
+
+ReplacementCodeuiSUN(code)
+	return		void
+	param		code		UInt32 in value
+	category	SUN_triangle_list
+	version		1.1
+	glxropcode	?
+	offset		?
+
+ReplacementCodeusSUN(code)
+	return		void
+	param		code		UInt16 in value
+	category	SUN_triangle_list
+	version		1.1
+	glxropcode	?
+	offset		?
+
+ReplacementCodeubSUN(code)
+	return		void
+	param		code		UInt8 in value
+	category	SUN_triangle_list
+	version		1.1
+	glxropcode	?
+	offset		?
+
+ReplacementCodeuivSUN(code)
+	return		void
+	param		code		UInt32 in array [COMPSIZE()]
+	category	SUN_triangle_list
+	version		1.1
+	glxropcode	?
+	offset		?
+
+ReplacementCodeusvSUN(code)
+	return		void
+	param		code		UInt16 in array [COMPSIZE()]
+	category	SUN_triangle_list
+	version		1.1
+	glxropcode	?
+	offset		?
+
+ReplacementCodeubvSUN(code)
+	return		void
+	param		code		UInt8 in array [COMPSIZE()]
+	category	SUN_triangle_list
+	version		1.1
+	glxropcode	?
+	offset		?
+
+ReplacementCodePointerSUN(type, stride, pointer)
+	return		void
+	param		type		ReplacementCodeTypeSUN in value
+	param		stride		SizeI in value
+	param		pointer		VoidPointer in array [COMPSIZE(type/stride)] retained
+	category	SUN_triangle_list
+	version		1.1
+	glxropcode	?
+	offset		?
+
+###############################################################################
+#
+# Extension #166
+# SUN_vertex commands
+#
+###############################################################################
+
+Color4ubVertex2fSUN(r, g, b, a, x, y)
+	return		void
+	param		r		UInt8 in value
+	param		g		UInt8 in value
+	param		b		UInt8 in value
+	param		a		UInt8 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+Color4ubVertex2fvSUN(c, v)
+	return		void
+	param		c		UInt8 in array [4]
+	param		v		Float32 in array [2]
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+Color4ubVertex3fSUN(r, g, b, a, x, y, z)
+	return		void
+	param		r		UInt8 in value
+	param		g		UInt8 in value
+	param		b		UInt8 in value
+	param		a		UInt8 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+Color4ubVertex3fvSUN(c, v)
+	return		void
+	param		c		UInt8 in array [4]
+	param		v		Float32 in array [3]
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+Color3fVertex3fSUN(r, g, b, x, y, z)
+	return		void
+	param		r		Float32 in value
+	param		g		Float32 in value
+	param		b		Float32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+Color3fVertex3fvSUN(c, v)
+	return		void
+	param		c		Float32 in array [3]
+	param		v		Float32 in array [3]
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+Normal3fVertex3fSUN(nx, ny, nz, x, y, z)
+	return		void
+	param		nx		Float32 in value
+	param		ny		Float32 in value
+	param		nz		Float32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+Normal3fVertex3fvSUN(n, v)
+	return		void
+	param		n		Float32 in array [3]
+	param		v		Float32 in array [3]
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+Color4fNormal3fVertex3fSUN(r, g, b, a, nx, ny, nz, x, y, z)
+	return		void
+	param		r		Float32 in value
+	param		g		Float32 in value
+	param		b		Float32 in value
+	param		a		Float32 in value
+	param		nx		Float32 in value
+	param		ny		Float32 in value
+	param		nz		Float32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+Color4fNormal3fVertex3fvSUN(c, n, v)
+	return		void
+	param		c		Float32 in array [4]
+	param		n		Float32 in array [3]
+	param		v		Float32 in array [3]
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+TexCoord2fVertex3fSUN(s, t, x, y, z)
+	return		void
+	param		s		Float32 in value
+	param		t		Float32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+TexCoord2fVertex3fvSUN(tc, v)
+	return		void
+	param		tc		Float32 in array [2]
+	param		v		Float32 in array [3]
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+TexCoord4fVertex4fSUN(s, t, p, q, x, y, z, w)
+	return		void
+	param		s		Float32 in value
+	param		t		Float32 in value
+	param		p		Float32 in value
+	param		q		Float32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	param		w		Float32 in value
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+TexCoord4fVertex4fvSUN(tc, v)
+	return		void
+	param		tc		Float32 in array [4]
+	param		v		Float32 in array [4]
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+TexCoord2fColor4ubVertex3fSUN(s, t, r, g, b, a, x, y, z)
+	return		void
+	param		s		Float32 in value
+	param		t		Float32 in value
+	param		r		UInt8 in value
+	param		g		UInt8 in value
+	param		b		UInt8 in value
+	param		a		UInt8 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+TexCoord2fColor4ubVertex3fvSUN(tc, c, v)
+	return		void
+	param		tc		Float32 in array [2]
+	param		c		UInt8 in array [4]
+	param		v		Float32 in array [3]
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+TexCoord2fColor3fVertex3fSUN(s, t, r, g, b, x, y, z)
+	return		void
+	param		s		Float32 in value
+	param		t		Float32 in value
+	param		r		Float32 in value
+	param		g		Float32 in value
+	param		b		Float32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+TexCoord2fColor3fVertex3fvSUN(tc, c, v)
+	return		void
+	param		tc		Float32 in array [2]
+	param		c		Float32 in array [3]
+	param		v		Float32 in array [3]
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+TexCoord2fNormal3fVertex3fSUN(s, t, nx, ny, nz, x, y, z)
+	return		void
+	param		s		Float32 in value
+	param		t		Float32 in value
+	param		nx		Float32 in value
+	param		ny		Float32 in value
+	param		nz		Float32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+TexCoord2fNormal3fVertex3fvSUN(tc, n, v)
+	return		void
+	param		tc		Float32 in array [2]
+	param		n		Float32 in array [3]
+	param		v		Float32 in array [3]
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+TexCoord2fColor4fNormal3fVertex3fSUN(s, t, r, g, b, a, nx, ny, nz, x, y, z)
+	return		void
+	param		s		Float32 in value
+	param		t		Float32 in value
+	param		r		Float32 in value
+	param		g		Float32 in value
+	param		b		Float32 in value
+	param		a		Float32 in value
+	param		nx		Float32 in value
+	param		ny		Float32 in value
+	param		nz		Float32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+TexCoord2fColor4fNormal3fVertex3fvSUN(tc, c, n, v)
+	return		void
+	param		tc		Float32 in array [2]
+	param		c		Float32 in array [4]
+	param		n		Float32 in array [3]
+	param		v		Float32 in array [3]
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+TexCoord4fColor4fNormal3fVertex4fSUN(s, t, p, q, r, g, b, a, nx, ny, nz, x, y, z, w)
+	return		void
+	param		s		Float32 in value
+	param		t		Float32 in value
+	param		p		Float32 in value
+	param		q		Float32 in value
+	param		r		Float32 in value
+	param		g		Float32 in value
+	param		b		Float32 in value
+	param		a		Float32 in value
+	param		nx		Float32 in value
+	param		ny		Float32 in value
+	param		nz		Float32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	param		w		Float32 in value
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+TexCoord4fColor4fNormal3fVertex4fvSUN(tc, c, n, v)
+	return		void
+	param		tc		Float32 in array [4]
+	param		c		Float32 in array [4]
+	param		n		Float32 in array [3]
+	param		v		Float32 in array [4]
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+ReplacementCodeuiVertex3fSUN(rc, x, y, z)
+	return		void
+	param		rc		ReplacementCodeSUN in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+ReplacementCodeuiVertex3fvSUN(rc, v)
+	return		void
+	param		rc		ReplacementCodeSUN in array [1]
+	param		v		Float32 in array [3]
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+ReplacementCodeuiColor4ubVertex3fSUN(rc, r, g, b, a, x, y, z)
+	return		void
+	param		rc		ReplacementCodeSUN in value
+	param		r		UInt8 in value
+	param		g		UInt8 in value
+	param		b		UInt8 in value
+	param		a		UInt8 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+ReplacementCodeuiColor4ubVertex3fvSUN(rc, c, v)
+	return		void
+	param		rc		ReplacementCodeSUN in array [1]
+	param		c		UInt8 in array [4]
+	param		v		Float32 in array [3]
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+ReplacementCodeuiColor3fVertex3fSUN(rc, r, g, b, x, y, z)
+	return		void
+	param		rc		ReplacementCodeSUN in value
+	param		r		Float32 in value
+	param		g		Float32 in value
+	param		b		Float32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+ReplacementCodeuiColor3fVertex3fvSUN(rc, c, v)
+	return		void
+	param		rc		ReplacementCodeSUN in array [1]
+	param		c		Float32 in array [3]
+	param		v		Float32 in array [3]
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+ReplacementCodeuiNormal3fVertex3fSUN(rc, nx, ny, nz, x, y, z)
+	return		void
+	param		rc		ReplacementCodeSUN in value
+	param		nx		Float32 in value
+	param		ny		Float32 in value
+	param		nz		Float32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+ReplacementCodeuiNormal3fVertex3fvSUN(rc, n, v)
+	return		void
+	param		rc		ReplacementCodeSUN in array [1]
+	param		n		Float32 in array [3]
+	param		v		Float32 in array [3]
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+ReplacementCodeuiColor4fNormal3fVertex3fSUN(rc, r, g, b, a, nx, ny, nz, x, y, z)
+	return		void
+	param		rc		ReplacementCodeSUN in value
+	param		r		Float32 in value
+	param		g		Float32 in value
+	param		b		Float32 in value
+	param		a		Float32 in value
+	param		nx		Float32 in value
+	param		ny		Float32 in value
+	param		nz		Float32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+ReplacementCodeuiColor4fNormal3fVertex3fvSUN(rc, c, n, v)
+	return		void
+	param		rc		ReplacementCodeSUN in array [1]
+	param		c		Float32 in array [4]
+	param		n		Float32 in array [3]
+	param		v		Float32 in array [3]
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+ReplacementCodeuiTexCoord2fVertex3fSUN(rc, s, t, x, y, z)
+	return		void
+	param		rc		ReplacementCodeSUN in value
+	param		s		Float32 in value
+	param		t		Float32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+ReplacementCodeuiTexCoord2fVertex3fvSUN(rc, tc, v)
+	return		void
+	param		rc		ReplacementCodeSUN in array [1]
+	param		tc		Float32 in array [2]
+	param		v		Float32 in array [3]
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN(rc, s, t, nx, ny, nz, x, y, z)
+	return		void
+	param		rc		ReplacementCodeSUN in value
+	param		s		Float32 in value
+	param		t		Float32 in value
+	param		nx		Float32 in value
+	param		ny		Float32 in value
+	param		nz		Float32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN(rc, tc, n, v)
+	return		void
+	param		rc		ReplacementCodeSUN in array [1]
+	param		tc		Float32 in array [2]
+	param		n		Float32 in array [3]
+	param		v		Float32 in array [3]
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN(rc, s, t, r, g, b, a, nx, ny, nz, x, y, z)
+	return		void
+	param		rc		ReplacementCodeSUN in value
+	param		s		Float32 in value
+	param		t		Float32 in value
+	param		r		Float32 in value
+	param		g		Float32 in value
+	param		b		Float32 in value
+	param		a		Float32 in value
+	param		nx		Float32 in value
+	param		ny		Float32 in value
+	param		nz		Float32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN(rc, tc, c, n, v)
+	return		void
+	param		rc		ReplacementCodeSUN in array [1]
+	param		tc		Float32 in array [2]
+	param		c		Float32 in array [4]
+	param		n		Float32 in array [3]
+	param		v		Float32 in array [3]
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+###############################################################################
+#
+# Extension #167 - WGL_EXT_display_color_table
+# Extension #168 - WGL_EXT_extensions_string
+# Extension #169 - WGL_EXT_make_current_read
+# Extension #170 - WGL_EXT_pixel_format
+# Extension #171 - WGL_EXT_pbuffer
+# Extension #172 - WGL_EXT_swap_control
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #173
+# EXT_blend_func_separate commands (also INGR_blend_func_separate)
+#
+###############################################################################
+
+BlendFuncSeparateEXT(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha)
+	return		void
+	param		sfactorRGB	BlendFuncSeparateParameterEXT in value
+	param		dfactorRGB	BlendFuncSeparateParameterEXT in value
+	param		sfactorAlpha	BlendFuncSeparateParameterEXT in value
+	param		dfactorAlpha	BlendFuncSeparateParameterEXT in value
+	category	EXT_blend_func_separate
+	glxropcode	4134
+	version		1.0
+	extension
+	alias		BlendFuncSeparate
+
+BlendFuncSeparateINGR(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha)
+	return		void
+	param		sfactorRGB	BlendFuncSeparateParameterEXT in value
+	param		dfactorRGB	BlendFuncSeparateParameterEXT in value
+	param		sfactorAlpha	BlendFuncSeparateParameterEXT in value
+	param		dfactorAlpha	BlendFuncSeparateParameterEXT in value
+	category	INGR_blend_func_separate
+	glxropcode	4134
+	version		1.0
+	extension
+	alias		BlendFuncSeparateEXT
+
+###############################################################################
+#
+# Extension #174
+# INGR_color_clamp commands
+#
+###############################################################################
+
+# (none)
+newcategory: INGR_color_clamp
+
+###############################################################################
+#
+# Extension #175
+# INGR_interlace_read commands
+#
+###############################################################################
+
+# (none)
+newcategory: INGR_interlace_read
+
+###############################################################################
+#
+# Extension #176
+# EXT_stencil_wrap commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_stencil_wrap
+
+###############################################################################
+#
+# Extension #177 - skipped
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #178
+# EXT_422_pixels commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_422_pixels
+
+###############################################################################
+#
+# Extension #179
+# NV_texgen_reflection commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_texgen_reflection
+
+###############################################################################
+#
+# Extension #???
+# @   EXT_texture_cube_map commands
+#
+###############################################################################
+
+# (none)
+
+###############################################################################
+#
+# Extension #180 - skipped
+# Extension #181 - skipped
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #182
+# SUN_convolution_border_modes commands
+#
+###############################################################################
+
+# (none)
+newcategory: SUN_convolution_border_modes
+
+###############################################################################
+#
+# Extension #183 - GLX_SUN_get_transparent_index
+# Extension #184 - skipped
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #185
+# EXT_texture_env_add commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_texture_env_add
+
+###############################################################################
+#
+# Extension #186
+# EXT_texture_lod_bias commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_texture_lod_bias
+
+###############################################################################
+#
+# Extension #187
+# EXT_texture_filter_anisotropic commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_texture_filter_anisotropic
+
+###############################################################################
+#
+# Extension #188
+# EXT_vertex_weighting commands
+#
+###############################################################################
+
+# GLX stuff to be written
+VertexWeightfEXT(weight)
+	return		void
+	param		weight		Float32 in value
+	category	EXT_vertex_weighting
+	vectorequiv	VertexWeightfvEXT
+	version		1.1
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		494
+
+VertexWeightfvEXT(weight)
+	return		void
+	param		weight		Float32 in array [1]
+	category	EXT_vertex_weighting
+	version		1.1
+	extension	soft WINSOFT NV10
+	glxropcode	4135
+	glxflags	ignore
+	offset		495
+
+VertexWeightPointerEXT(size, type, stride, pointer)
+	return		void
+	param		size		Int32 in value
+	param		type		VertexWeightPointerTypeEXT in value
+	param		stride		SizeI in value
+	param		pointer		Void in array [COMPSIZE(type/stride)] retained
+	category	EXT_vertex_weighting
+	version		1.1
+	extension	soft WINSOFT NV10
+	dlflags		notlistable
+	glxflags	ignore
+	offset		496
+
+###############################################################################
+#
+# Extension #189
+# NV_light_max_exponent commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_light_max_exponent
+
+###############################################################################
+#
+# Extension #190
+# NV_vertex_array_range commands
+#
+###############################################################################
+
+FlushVertexArrayRangeNV()
+	return		void
+	category	NV_vertex_array_range
+	version		1.1
+	extension	soft WINSOFT NV10
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode ignore
+	offset		497
+
+VertexArrayRangeNV(length, pointer)
+	return		void
+	param		length		SizeI in value
+	param		pointer		Void in array [COMPSIZE(length)] retained
+	category	NV_vertex_array_range
+	version		1.1
+	extension	soft WINSOFT NV10
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode ignore
+	offset		498
+
+###############################################################################
+#
+# Extension #191
+# NV_register_combiners commands
+#
+###############################################################################
+
+CombinerParameterfvNV(pname, params)
+	return		void
+	param		pname		CombinerParameterNV in value
+	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
+	category	NV_register_combiners
+	version		1.1
+	extension	soft WINSOFT NV10
+	glxropcode	4137
+	glxflags	ignore
+	offset		499
+
+CombinerParameterfNV(pname, param)
+	return		void
+	param		pname		CombinerParameterNV in value
+	param		param		Float32 in value
+	category	NV_register_combiners
+	version		1.1
+	extension	soft WINSOFT NV10
+	glxropcode	4136
+	glxflags	ignore
+	offset		500
+
+CombinerParameterivNV(pname, params)
+	return		void
+	param		pname		CombinerParameterNV in value
+	param		params		CheckedInt32 in array [COMPSIZE(pname)]
+	category	NV_register_combiners
+	version		1.1
+	extension	soft WINSOFT NV10
+	glxropcode	4139
+	glxflags	ignore
+	offset		501
+
+CombinerParameteriNV(pname, param)
+	return		void
+	param		pname		CombinerParameterNV in value
+	param		param		Int32 in value
+	category	NV_register_combiners
+	version		1.1
+	extension	soft WINSOFT NV10
+	glxropcode	4138
+	glxflags	ignore
+	offset		502
+
+CombinerInputNV(stage, portion, variable, input, mapping, componentUsage)
+	return		void
+	param		stage		CombinerStageNV in value
+	param		portion		CombinerPortionNV in value
+	param		variable	CombinerVariableNV in value
+	param		input		CombinerRegisterNV in value
+	param		mapping		CombinerMappingNV in value
+	param		componentUsage	CombinerComponentUsageNV in value
+	category	NV_register_combiners
+	version		1.1
+	extension	soft WINSOFT NV10
+	glxropcode	4140
+	glxflags	ignore
+	offset		503
+
+CombinerOutputNV(stage, portion, abOutput, cdOutput, sumOutput, scale, bias, abDotProduct, cdDotProduct, muxSum)
+	return		void
+	param		stage		CombinerStageNV in value
+	param		portion		CombinerPortionNV in value
+	param		abOutput	CombinerRegisterNV in value
+	param		cdOutput	CombinerRegisterNV in value
+	param		sumOutput	CombinerRegisterNV in value
+	param		scale		CombinerScaleNV in value
+	param		bias		CombinerBiasNV in value
+	param		abDotProduct	Boolean in value
+	param		cdDotProduct	Boolean in value
+	param		muxSum		Boolean in value
+	category	NV_register_combiners
+	version		1.1
+	extension	soft WINSOFT NV10
+	glxropcode	4141
+	glxflags	ignore
+	offset		504
+
+FinalCombinerInputNV(variable, input, mapping, componentUsage)
+	return		void
+	param		variable	CombinerVariableNV in value
+	param		input		CombinerRegisterNV in value
+	param		mapping		CombinerMappingNV in value
+	param		componentUsage	CombinerComponentUsageNV in value
+	category	NV_register_combiners
+	version		1.1
+	extension	soft WINSOFT NV10
+	glxropcode	4142
+	glxflags	ignore
+	offset		505
+
+GetCombinerInputParameterfvNV(stage, portion, variable, pname, params)
+	return		void
+	param		stage		CombinerStageNV in value
+	param		portion		CombinerPortionNV in value
+	param		variable	CombinerVariableNV in value
+	param		pname		CombinerParameterNV in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	dlflags		notlistable
+	category	NV_register_combiners
+	version		1.1
+	extension	soft WINSOFT NV10
+	glxvendorpriv	1270
+	glxflags	ignore
+	offset		506
+
+GetCombinerInputParameterivNV(stage, portion, variable, pname, params)
+	return		void
+	param		stage		CombinerStageNV in value
+	param		portion		CombinerPortionNV in value
+	param		variable	CombinerVariableNV in value
+	param		pname		CombinerParameterNV in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	dlflags		notlistable
+	category	NV_register_combiners
+	version		1.1
+	extension	soft WINSOFT NV10
+	glxvendorpriv	1271
+	glxflags	ignore
+	offset		507
+
+GetCombinerOutputParameterfvNV(stage, portion, pname, params)
+	return		void
+	param		stage		CombinerStageNV in value
+	param		portion		CombinerPortionNV in value
+	param		pname		CombinerParameterNV in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	dlflags		notlistable
+	category	NV_register_combiners
+	version		1.1
+	extension	soft WINSOFT NV10
+	glxvendorpriv	1272
+	glxflags	ignore
+	offset		508
+
+GetCombinerOutputParameterivNV(stage, portion, pname, params)
+	return		void
+	param		stage		CombinerStageNV in value
+	param		portion		CombinerPortionNV in value
+	param		pname		CombinerParameterNV in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	dlflags		notlistable
+	category	NV_register_combiners
+	version		1.1
+	extension	soft WINSOFT NV10
+	glxvendorpriv	1273
+	glxflags	ignore
+	offset		509
+
+GetFinalCombinerInputParameterfvNV(variable, pname, params)
+	return		void
+	param		variable	CombinerVariableNV in value
+	param		pname		CombinerParameterNV in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	dlflags		notlistable
+	category	NV_register_combiners
+	version		1.1
+	extension	soft WINSOFT NV10
+	glxvendorpriv	1274
+	glxflags	ignore
+	offset		510
+
+GetFinalCombinerInputParameterivNV(variable, pname, params)
+	return		void
+	param		variable	CombinerVariableNV in value
+	param		pname		CombinerParameterNV in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	dlflags		notlistable
+	category	NV_register_combiners
+	version		1.1
+	extension	soft WINSOFT NV10
+	glxvendorpriv	1275
+	glxflags	ignore
+	offset		511
+
+###############################################################################
+#
+# Extension #192
+# NV_fog_distance commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_fog_distance
+
+###############################################################################
+#
+# Extension #193
+# NV_texgen_emboss commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_texgen_emboss
+
+###############################################################################
+#
+# Extension #194
+# NV_blend_square commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_blend_square
+
+###############################################################################
+#
+# Extension #195
+# NV_texture_env_combine4 commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_texture_env_combine4
+
+###############################################################################
+#
+# Extension #196
+# MESA_resize_buffers commands
+#
+###############################################################################
+
+ResizeBuffersMESA()
+	return		void
+	category	MESA_resize_buffers
+	version		1.0
+	glxropcode	?
+	offset		512
+
+###############################################################################
+#
+# Extension #197
+# MESA_window_pos commands
+#
+# Note that the 2- and 3-component versions are now aliases of ARB
+# entry points.
+#
+###############################################################################
+
+WindowPos2dMESA(x, y)
+	return		void
+	param		x		CoordD in value
+	param		y		CoordD in value
+	category	MESA_window_pos
+	vectorequiv	WindowPos2dvMESA
+	version		1.0
+	alias		WindowPos2dARB
+
+WindowPos2dvMESA(v)
+	return		void
+	param		v		CoordD in array [2]
+	category	MESA_window_pos
+	version		1.0
+	glxropcode	?
+	alias		WindowPos2dvARB
+
+WindowPos2fMESA(x, y)
+	return		void
+	param		x		CoordF in value
+	param		y		CoordF in value
+	category	MESA_window_pos
+	vectorequiv	WindowPos2fvMESA
+	version		1.0
+	alias		WindowPos2fARB
+
+WindowPos2fvMESA(v)
+	return		void
+	param		v		CoordF in array [2]
+	category	MESA_window_pos
+	version		1.0
+	glxropcode	?
+	alias		WindowPos2fvARB
+
+WindowPos2iMESA(x, y)
+	return		void
+	param		x		CoordI in value
+	param		y		CoordI in value
+	category	MESA_window_pos
+	vectorequiv	WindowPos2ivMESA
+	version		1.0
+	alias		WindowPos2iARB
+
+WindowPos2ivMESA(v)
+	return		void
+	param		v		CoordI in array [2]
+	category	MESA_window_pos
+	version		1.0
+	glxropcode	?
+	alias		WindowPos2ivARB
+
+WindowPos2sMESA(x, y)
+	return		void
+	param		x		CoordS in value
+	param		y		CoordS in value
+	category	MESA_window_pos
+	vectorequiv	WindowPos2svMESA
+	version		1.0
+	alias		WindowPos2sARB
+
+WindowPos2svMESA(v)
+	return		void
+	param		v		CoordS in array [2]
+	category	MESA_window_pos
+	version		1.0
+	glxropcode	?
+	alias		WindowPos2svARB
+
+WindowPos3dMESA(x, y, z)
+	return		void
+	param		x		CoordD in value
+	param		y		CoordD in value
+	param		z		CoordD in value
+	vectorequiv	WindowPos3dvMESA
+	category	MESA_window_pos
+	version		1.0
+	alias		WindowPos3dARB
+
+WindowPos3dvMESA(v)
+	return		void
+	param		v		CoordD in array [3]
+	category	MESA_window_pos
+	version		1.0
+	glxropcode	?
+	alias		WindowPos3dvARB
+
+WindowPos3fMESA(x, y, z)
+	return		void
+	param		x		CoordF in value
+	param		y		CoordF in value
+	param		z		CoordF in value
+	category	MESA_window_pos
+	vectorequiv	WindowPos3fvMESA
+	version		1.0
+	alias		WindowPos3fARB
+
+WindowPos3fvMESA(v)
+	return		void
+	param		v		CoordF in array [3]
+	category	MESA_window_pos
+	version		1.0
+	glxropcode	?
+	alias		WindowPos3fvARB
+
+WindowPos3iMESA(x, y, z)
+	return		void
+	param		x		CoordI in value
+	param		y		CoordI in value
+	param		z		CoordI in value
+	category	MESA_window_pos
+	vectorequiv	WindowPos3ivMESA
+	version		1.0
+	alias		WindowPos3iARB
+
+WindowPos3ivMESA(v)
+	return		void
+	param		v		CoordI in array [3]
+	category	MESA_window_pos
+	version		1.0
+	glxropcode	?
+	alias		WindowPos3ivARB
+
+WindowPos3sMESA(x, y, z)
+	return		void
+	param		x		CoordS in value
+	param		y		CoordS in value
+	param		z		CoordS in value
+	category	MESA_window_pos
+	vectorequiv	WindowPos3svMESA
+	version		1.0
+	alias		WindowPos3sARB
+
+WindowPos3svMESA(v)
+	return		void
+	param		v		CoordS in array [3]
+	category	MESA_window_pos
+	version		1.0
+	glxropcode	?
+	alias		WindowPos3svARB
+
+WindowPos4dMESA(x, y, z, w)
+	return		void
+	param		x		CoordD in value
+	param		y		CoordD in value
+	param		z		CoordD in value
+	param		w		CoordD in value
+	vectorequiv	WindowPos4dvMESA
+	category	MESA_window_pos
+	version		1.0
+	offset		529
+
+WindowPos4dvMESA(v)
+	return		void
+	param		v		CoordD in array [4]
+	category	MESA_window_pos
+	version		1.0
+	glxropcode	?
+	offset		530
+
+WindowPos4fMESA(x, y, z, w)
+	return		void
+	param		x		CoordF in value
+	param		y		CoordF in value
+	param		z		CoordF in value
+	param		w		CoordF in value
+	category	MESA_window_pos
+	vectorequiv	WindowPos4fvMESA
+	version		1.0
+	offset		531
+
+WindowPos4fvMESA(v)
+	return		void
+	param		v		CoordF in array [4]
+	category	MESA_window_pos
+	version		1.0
+	glxropcode	?
+	offset		532
+
+WindowPos4iMESA(x, y, z, w)
+	return		void
+	param		x		CoordI in value
+	param		y		CoordI in value
+	param		z		CoordI in value
+	param		w		CoordI in value
+	category	MESA_window_pos
+	vectorequiv	WindowPos4ivMESA
+	version		1.0
+	offset		533
+
+WindowPos4ivMESA(v)
+	return		void
+	param		v		CoordI in array [4]
+	category	MESA_window_pos
+	version		1.0
+	glxropcode	?
+	offset		534
+
+WindowPos4sMESA(x, y, z, w)
+	return		void
+	param		x		CoordS in value
+	param		y		CoordS in value
+	param		z		CoordS in value
+	param		w		CoordS in value
+	category	MESA_window_pos
+	vectorequiv	WindowPos4svMESA
+	version		1.0
+	offset		535
+
+WindowPos4svMESA(v)
+	return		void
+	param		v		CoordS in array [4]
+	category	MESA_window_pos
+	version		1.0
+	glxropcode	?
+	offset		536
+
+###############################################################################
+#
+# Extension #198
+# EXT_texture_compression_s3tc commands
+#
+###############################################################################
+
+#@@ (none yet)
+
+###############################################################################
+#
+# Extension #199
+# IBM_cull_vertex commands
+#
+###############################################################################
+
+# (none)
+newcategory: IBM_cull_vertex
+
+###############################################################################
+#
+# Extension #200
+# IBM_multimode_draw_arrays commands
+#
+###############################################################################
+
+MultiModeDrawArraysIBM(mode, first, count, primcount, modestride)
+	return		void
+	param		mode		BeginMode in array [COMPSIZE(primcount)]
+	param		first		Int32 in array [COMPSIZE(primcount)]
+	param		count		SizeI in array [COMPSIZE(primcount)]
+	param		primcount	SizeI in value
+	param		modestride	Int32 in value
+	category	IBM_multimode_draw_arrays
+	version		1.1
+	glxropcode	?
+	offset		708
+
+
+MultiModeDrawElementsIBM(mode, count, type, indices, primcount, modestride)
+	return		void
+	param		mode		BeginMode in array [COMPSIZE(primcount)]
+	param		count		SizeI in array [COMPSIZE(primcount)]
+	param		type		DrawElementsType in value
+	param		indices		ConstVoidPointer in array [COMPSIZE(primcount)]
+	param		primcount	SizeI in value
+	param		modestride	Int32 in value
+	category	IBM_multimode_draw_arrays
+	version		1.1
+	glxropcode	?
+	offset		709
+
+###############################################################################
+#
+# Extension #201
+# IBM_vertex_array_lists commands
+#
+###############################################################################
+
+ColorPointerListIBM(size, type, stride, pointer, ptrstride)
+	return		void
+	param		size		Int32 in value
+	param		type		ColorPointerType in value
+	param		stride		Int32 in value
+	param		pointer		VoidPointer in array [COMPSIZE(size/type/stride)] retained
+	param		ptrstride	Int32 in value
+	category	IBM_vertex_array_lists
+	version		1.1
+	glxropcode	?
+	offset		?
+
+SecondaryColorPointerListIBM(size, type, stride, pointer, ptrstride)
+	return		void
+	param		size		Int32 in value
+	param		type		SecondaryColorPointerTypeIBM in value
+	param		stride		Int32 in value
+	param		pointer		VoidPointer in array [COMPSIZE(size/type/stride)] retained
+	param		ptrstride	Int32 in value
+	category	IBM_vertex_array_lists
+	version		1.1
+	glxropcode	?
+	offset		?
+
+EdgeFlagPointerListIBM(stride, pointer, ptrstride)
+	return		void
+	param		stride		Int32 in value
+	param		pointer		BooleanPointer in array [COMPSIZE(stride)] retained
+	param		ptrstride	Int32 in value
+	category	IBM_vertex_array_lists
+	version		1.1
+	glxropcode	?
+	offset		?
+
+FogCoordPointerListIBM(type, stride, pointer, ptrstride)
+	return		void
+	param		type		FogPointerTypeIBM in value
+	param		stride		Int32 in value
+	param		pointer		VoidPointer in array [COMPSIZE(type/stride)] retained
+	param		ptrstride	Int32 in value
+	category	IBM_vertex_array_lists
+	version		1.1
+	glxropcode	?
+	offset		?
+
+IndexPointerListIBM(type, stride, pointer, ptrstride)
+	return		void
+	param		type		IndexPointerType in value
+	param		stride		Int32 in value
+	param		pointer		VoidPointer in array [COMPSIZE(type/stride)] retained
+	param		ptrstride	Int32 in value
+	category	IBM_vertex_array_lists
+	version		1.1
+	glxropcode	?
+	offset		?
+
+NormalPointerListIBM(type, stride, pointer, ptrstride)
+	return		void
+	param		type		NormalPointerType in value
+	param		stride		Int32 in value
+	param		pointer		VoidPointer in array [COMPSIZE(type/stride)] retained
+	param		ptrstride	Int32 in value
+	category	IBM_vertex_array_lists
+	version		1.1
+	glxropcode	?
+	offset		?
+
+TexCoordPointerListIBM(size, type, stride, pointer, ptrstride)
+	return		void
+	param		size		Int32 in value
+	param		type		TexCoordPointerType in value
+	param		stride		Int32 in value
+	param		pointer		VoidPointer in array [COMPSIZE(size/type/stride)] retained
+	param		ptrstride	Int32 in value
+	category	IBM_vertex_array_lists
+	version		1.1
+	glxropcode	?
+	offset		?
+
+VertexPointerListIBM(size, type, stride, pointer, ptrstride)
+	return		void
+	param		size		Int32 in value
+	param		type		VertexPointerType in value
+	param		stride		Int32 in value
+	param		pointer		VoidPointer in array [COMPSIZE(size/type/stride)] retained
+	param		ptrstride	Int32 in value
+	category	IBM_vertex_array_lists
+	version		1.1
+	glxropcode	?
+	offset		?
+
+###############################################################################
+#
+# Extension #202
+# SGIX_subsample commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_subsample
+
+###############################################################################
+#
+# Extension #203
+# SGIX_ycrcba commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_ycrcba
+
+###############################################################################
+#
+# Extension #204
+# SGIX_ycrcb_subsample commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_ycrcb_subsample
+
+###############################################################################
+#
+# Extension #205
+# SGIX_depth_pass_instrument commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_depth_pass_instrument
+
+###############################################################################
+#
+# Extension #206
+# 3DFX_texture_compression_FXT1 commands
+#
+###############################################################################
+
+# (none)
+newcategory: 3DFX_texture_compression_FXT1
+
+###############################################################################
+#
+# Extension #207
+# 3DFX_multisample commands
+#
+###############################################################################
+
+# (none)
+newcategory: 3DFX_multisample
+
+###############################################################################
+#
+# Extension #208
+# 3DFX_tbuffer commands
+#
+###############################################################################
+
+TbufferMask3DFX(mask)
+	return		void
+	param		mask		UInt32 in value
+	category	3DFX_tbuffer
+	version		1.2
+	glxropcode	?
+	offset		553
+
+###############################################################################
+#
+# Extension #209
+# EXT_multisample commands
+#
+###############################################################################
+
+SampleMaskEXT(value, invert)
+	return		void
+	param		value		ClampedFloat32 in value
+	param		invert		Boolean in value
+	category	EXT_multisample
+	version		1.0
+	glxropcode	?
+	extension
+	offset		446
+
+SamplePatternEXT(pattern)
+	return		void
+	param		pattern		SamplePatternEXT in value
+	category	EXT_multisample
+	version		1.0
+	glxropcode	?
+	glxflags
+	extension
+	offset		447
+
+###############################################################################
+#
+# Extension #210
+# SGIX_vertex_preclip commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_vertex_preclip
+
+###############################################################################
+#
+# Extension #211
+# SGIX_convolution_accuracy commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_convolution_accuracy
+
+###############################################################################
+#
+# Extension #212
+# SGIX_resample commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_resample
+
+###############################################################################
+#
+# Extension #213
+# SGIS_point_line_texgen commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIS_point_line_texgen
+
+###############################################################################
+#
+# Extension #214
+# SGIS_texture_color_mask commands
+#
+###############################################################################
+
+TextureColorMaskSGIS(red, green, blue, alpha)
+	return		void
+	param		red		Boolean in value
+	param		green		Boolean in value
+	param		blue		Boolean in value
+	param		alpha		Boolean in value
+	category	SGIS_texture_color_mask
+	version		1.1
+	glxropcode	2082
+	extension
+	offset		?
+
+###############################################################################
+#
+# Extension #215 - GLX_MESA_copy_sub_buffer
+# Extension #216 - GLX_MESA_pixmap_colormap
+# Extension #217 - GLX_MESA_release_buffers
+# Extension #218 - GLX_MESA_set_3dfx_mode
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #219
+# SGIX_igloo_interface commands
+#
+###############################################################################
+
+IglooInterfaceSGIX(pname, params)
+	return		void
+	dlflags		notlistable
+	param		pname		IglooFunctionSelectSGIX in value
+	param		params		IglooParameterSGIX in array [COMPSIZE(pname)]
+	category	SGIX_igloo_interface
+	version		1.0
+	glxflags	SGI ignore
+	extension
+	glxropcode	200
+	offset		?
+
+###############################################################################
+#
+# Extension #220
+# EXT_texture_env_dot3 commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_texture_env_dot3
+
+###############################################################################
+#
+# Extension #221
+# ATI_texture_mirror_once commands
+#
+###############################################################################
+# (none)
+newcategory: ATI_texture_mirror_once
+
+###############################################################################
+#
+# Extension #222
+# NV_fence commands
+#
+###############################################################################
+
+DeleteFencesNV(n, fences)
+	return		void
+	param		n		SizeI in value
+	param		fences		FenceNV in array [n]
+	category	NV_fence
+	dlflags		notlistable
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxvendorpriv	1276
+	glxflags	ignore
+	offset		647
+
+GenFencesNV(n, fences)
+	return		void
+	param		n		SizeI in value
+	param		fences		FenceNV out array [n]
+	category	NV_fence
+	dlflags		notlistable
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxvendorpriv	1277
+	glxflags	ignore
+	offset		648
+
+IsFenceNV(fence)
+	return		Boolean
+	param		fence		FenceNV in value
+	category	NV_fence
+	dlflags		notlistable
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxvendorpriv	1278
+	glxflags	ignore
+	offset		649
+
+TestFenceNV(fence)
+	return		Boolean
+	param		fence		FenceNV in value
+	category	NV_fence
+	dlflags		notlistable
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxvendorpriv	1279
+	glxflags	ignore
+	offset		650
+
+GetFenceivNV(fence, pname, params)
+	return		void
+	param		fence		FenceNV in value
+	param		pname		FenceParameterNameNV in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	NV_fence
+	dlflags		notlistable
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxvendorpriv	1280
+	glxflags	ignore
+	offset		651
+
+FinishFenceNV(fence)
+	return		void
+	param		fence		FenceNV in value
+	category	NV_fence
+	dlflags		notlistable
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxvendorpriv	1312
+	glxflags	ignore
+	offset		652
+
+SetFenceNV(fence, condition)
+	return		void
+	param		fence		FenceNV in value
+	param		condition	FenceConditionNV in value
+	category	NV_fence
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		653
+
+###############################################################################
+#
+# Extension #225
+# NV_evaluators commands
+#
+###############################################################################
+
+MapControlPointsNV(target, index, type, ustride, vstride, uorder, vorder, packed, points)
+	return		void
+	param		target		EvalTargetNV in value
+	param		index		UInt32 in value
+	param		type		MapTypeNV in value
+	param		ustride		SizeI in value
+	param		vstride		SizeI in value
+	param		uorder		CheckedInt32 in value
+	param		vorder		CheckedInt32 in value
+	param		packed		Boolean in value
+	param		points		Void in array [COMPSIZE(target/uorder/vorder)]
+	category	NV_evaluators
+	dlflags		handcode
+	version		1.1
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		?
+
+MapParameterivNV(target, pname, params)
+	return		void
+	param		target		EvalTargetNV in value
+	param		pname		MapParameterNV in value
+	param		params		CheckedInt32 in array [COMPSIZE(target/pname)]
+	category	NV_evaluators
+	version		1.1
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		?
+
+MapParameterfvNV(target, pname, params)
+	return		void
+	param		target		EvalTargetNV in value
+	param		pname		MapParameterNV in value
+	param		params		CheckedFloat32 in array [COMPSIZE(target/pname)]
+	category	NV_evaluators
+	version		1.1
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		?
+
+GetMapControlPointsNV(target, index, type, ustride, vstride, packed, points)
+	return		void
+	param		target		EvalTargetNV in value
+	param		index		UInt32 in value
+	param		type		MapTypeNV in value
+	param		ustride		SizeI in value
+	param		vstride		SizeI in value
+	param		packed		Boolean in value
+	param		points		Void out array [COMPSIZE(target)]
+	category	NV_evaluators
+	dlflags		notlistable
+	version		1.1
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		?
+
+GetMapParameterivNV(target, pname, params)
+	return		void
+	param		target		EvalTargetNV in value
+	param		pname		MapParameterNV in value
+	param		params		Int32 out array [COMPSIZE(target/pname)]
+	category	NV_evaluators
+	dlflags		notlistable
+	version		1.1
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		?
+
+GetMapParameterfvNV(target, pname, params)
+	return		void
+	param		target		EvalTargetNV in value
+	param		pname		MapParameterNV in value
+	param		params		Float32 out array [COMPSIZE(target/pname)]
+	category	NV_evaluators
+	dlflags		notlistable
+	version		1.1
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		?
+
+GetMapAttribParameterivNV(target, index, pname, params)
+	return		void
+	param		target		EvalTargetNV in value
+	param		index		UInt32 in value
+	param		pname		MapAttribParameterNV in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	NV_evaluators
+	dlflags		notlistable
+	version		1.1
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		?
+
+GetMapAttribParameterfvNV(target, index, pname, params)
+	return		void
+	param		target		EvalTargetNV in value
+	param		index		UInt32 in value
+	param		pname		MapAttribParameterNV in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	NV_evaluators
+	dlflags		notlistable
+	version		1.1
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		?
+
+EvalMapsNV(target, mode)
+	return		void
+	param		target		EvalTargetNV in value
+	param		mode		EvalMapsModeNV in value
+	category	NV_evaluators
+	version		1.1
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #226
+# NV_packed_depth_stencil commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_packed_depth_stencil
+
+###############################################################################
+#
+# Extension #227
+# NV_register_combiners2 commands
+#
+###############################################################################
+
+CombinerStageParameterfvNV(stage, pname, params)
+	return		void
+	param		stage		CombinerStageNV in value
+	param		pname		CombinerParameterNV in value
+	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
+	category	NV_register_combiners2
+	version		1.1
+	extension
+	glxflags	ignore
+	offset		?
+
+GetCombinerStageParameterfvNV(stage, pname, params)
+	return		void
+	param		stage		CombinerStageNV in value
+	param		pname		CombinerParameterNV in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	dlflags		notlistable
+	category	NV_register_combiners2
+	version		1.1
+	extension
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #228
+# NV_texture_compression_vtc commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_texture_compression_vtc
+
+###############################################################################
+#
+# Extension #229
+# NV_texture_rectangle commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_texture_rectangle
+
+###############################################################################
+#
+# Extension #230
+# NV_texture_shader commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_texture_shader
+
+###############################################################################
+#
+# Extension #231
+# NV_texture_shader2 commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_texture_shader2
+
+###############################################################################
+#
+# Extension #232
+# NV_vertex_array_range2 commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_vertex_array_range2
+
+###############################################################################
+#
+# Extension #233
+# NV_vertex_program commands
+#
+###############################################################################
+
+AreProgramsResidentNV(n, programs, residences)
+	return		Boolean
+	param		n		SizeI in value
+	param		programs	UInt32 in array [n]
+	param		residences	Boolean out array [n]
+	category	NV_vertex_program
+	dlflags		notlistable
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	glxvendorpriv	1293
+	offset		578
+
+BindProgramNV(target, id)
+	return		void
+	param		target		VertexAttribEnumNV in value
+	param		id		UInt32 in value
+	category	NV_vertex_program
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4180
+	alias		BindProgramARB
+
+DeleteProgramsNV(n, programs)
+	return		void
+	param		n		SizeI in value
+	param		programs	UInt32 in array [n]
+	category	NV_vertex_program
+	dlflags		notlistable
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxvendorpriv	1294
+	alias		DeleteProgramsARB
+
+ExecuteProgramNV(target, id, params)
+	return		void
+	param		target		VertexAttribEnumNV in value
+	param		id		UInt32 in value
+	param		params		Float32 in array [4]
+	category	NV_vertex_program
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	glxropcode	4181
+	offset		581
+
+GenProgramsNV(n, programs)
+	return		void
+	param		n		SizeI in value
+	param		programs	UInt32 out array [n]
+	category	NV_vertex_program
+	dlflags		notlistable
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxvendorpriv	1295
+	alias		GenProgramsARB
+
+GetProgramParameterdvNV(target, index, pname, params)
+	return		void
+	param		target		VertexAttribEnumNV in value
+	param		index		UInt32 in value
+	param		pname		VertexAttribEnumNV in value
+	param		params		Float64 out array [4]
+	category	NV_vertex_program
+	dlflags		notlistable
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	glxvendorpriv	1297
+	offset		583
+
+GetProgramParameterfvNV(target, index, pname, params)
+	return		void
+	param		target		VertexAttribEnumNV in value
+	param		index		UInt32 in value
+	param		pname		VertexAttribEnumNV in value
+	param		params		Float32 out array [4]
+	category	NV_vertex_program
+	dlflags		notlistable
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	glxvendorpriv	1296
+	offset		584
+
+# GetProgramParameterSigneddvNV(target, index, pname, params)
+#	  return	  void
+#	  param		  target	  VertexAttribEnumNV in value
+#	  param		  index		  Int32 in value
+#	  param		  pname		  VertexAttribEnumNV in value
+#	  param		  params	  Float64 out array [4]
+#	  category	  NV_vertex_program1_1_dcc
+#	  dlflags	  notlistable
+#	  version	  1.2
+#	  extension	  soft WINSOFT NV20
+#	  glxflags	  ignore
+#	  offset	  ?
+#
+# GetProgramParameterSignedfvNV(target, index, pname, params)
+#	  return	  void
+#	  param		  target	  VertexAttribEnumNV in value
+#	  param		  index		  Int32 in value
+#	  param		  pname		  VertexAttribEnumNV in value
+#	  param		  params	  Float32 out array [4]
+#	  category	  NV_vertex_program1_1_dcc
+#	  dlflags	  notlistable
+#	  version	  1.2
+#	  extension	  soft WINSOFT NV20
+#	  glxflags	  ignore
+#	  offset	  ?
+
+GetProgramivNV(id, pname, params)
+	return		void
+	param		id		UInt32 in value
+	param		pname		VertexAttribEnumNV in value
+	param		params		Int32 out array [4]
+	category	NV_vertex_program
+	dlflags		notlistable
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	glxvendorpriv	1298
+	offset		585
+
+GetProgramStringNV(id, pname, program)
+	return		void
+	param		id		UInt32 in value
+	param		pname		VertexAttribEnumNV in value
+	param		program		ProgramCharacterNV out array [COMPSIZE(id/pname)]
+	category	NV_vertex_program
+	dlflags		notlistable
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	glxvendorpriv	1299
+	offset		586
+
+GetTrackMatrixivNV(target, address, pname, params)
+	return		void
+	param		target		VertexAttribEnumNV in value
+	param		address		UInt32 in value
+	param		pname		VertexAttribEnumNV in value
+	param		params		Int32 out array [1]
+	category	NV_vertex_program
+	dlflags		notlistable
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	glxvendorpriv	1300
+	offset		587
+
+GetVertexAttribdvNV(index, pname, params)
+	return		void
+	param		index		UInt32 in value
+	param		pname		VertexAttribEnumNV in value
+	param		params		Float64 out array [1]
+	category	NV_vertex_program
+	dlflags		notlistable
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxvendorpriv	1301
+	alias		GetVertexAttribdv
+
+GetVertexAttribfvNV(index, pname, params)
+	return		void
+	param		index		UInt32 in value
+	param		pname		VertexAttribEnumNV in value
+	param		params		Float32 out array [1]
+	category	NV_vertex_program
+	dlflags		notlistable
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxvendorpriv	1302
+	alias		GetVertexAttribfv
+
+GetVertexAttribivNV(index, pname, params)
+	return		void
+	param		index		UInt32 in value
+	param		pname		VertexAttribEnumNV in value
+	param		params		Int32 out array [1]
+	category	NV_vertex_program
+	dlflags		notlistable
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxvendorpriv	1303
+	alias		GetVertexAttribiv
+
+GetVertexAttribPointervNV(index, pname, pointer)
+	return		void
+	param		index		UInt32 in value
+	param		pname		VertexAttribEnumNV in value
+	param		pointer		VoidPointer out array [1]
+	category	NV_vertex_program
+	dlflags		notlistable
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	alias		GetVertexAttribPointerv
+
+IsProgramNV(id)
+	return		Boolean
+	param		id		UInt32 in value
+	category	NV_vertex_program
+	dlflags		notlistable
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxvendorpriv	1304
+	alias		IsProgram
+
+LoadProgramNV(target, id, len, program)
+	return		void
+	param		target		VertexAttribEnumNV in value
+	param		id		UInt32 in value
+	param		len		SizeI in value
+	param		program		UInt8 in array [len]
+	category	NV_vertex_program
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4183
+	offset		593
+
+ProgramParameter4dNV(target, index, x, y, z, w)
+	return		void
+	param		target		VertexAttribEnumNV in value
+	param		index		UInt32 in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	param		z		Float64 in value
+	param		w		Float64 in value
+	category	NV_vertex_program
+	version		1.2
+	vectorequiv	ProgramParameter4dvNV
+	extension	soft WINSOFT NV10
+	offset		594
+
+ProgramParameter4dvNV(target, index, v)
+	return		void
+	param		target		VertexAttribEnumNV in value
+	param		index		UInt32 in value
+	param		v		Float64 in array [4]
+	category	NV_vertex_program
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4185
+	offset		595
+
+ProgramParameter4fNV(target, index, x, y, z, w)
+	return		void
+	param		target		VertexAttribEnumNV in value
+	param		index		UInt32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	param		w		Float32 in value
+	category	NV_vertex_program
+	version		1.2
+	vectorequiv	ProgramParameter4fvNV
+	extension	soft WINSOFT NV10
+	offset		596
+
+ProgramParameter4fvNV(target, index, v)
+	return		void
+	param		target		VertexAttribEnumNV in value
+	param		index		UInt32 in value
+	param		v		Float32 in array [4]
+	category	NV_vertex_program
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4184
+	offset		597
+
+ProgramParameters4dvNV(target, index, count, v)
+	return		void
+	param		target		VertexAttribEnumNV in value
+	param		index		UInt32 in value
+	param		count		SizeI in value
+	param		v		Float64 in array [count*4]
+	category	NV_vertex_program
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4187
+	offset		598
+
+ProgramParameters4fvNV(target, index, count, v)
+	return		void
+	param		target		VertexAttribEnumNV in value
+	param		index		UInt32 in value
+	param		count		SizeI in value
+	param		v		Float32 in array [count*4]
+	category	NV_vertex_program
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4186
+	offset		599
+
+# ProgramParameterSigned4dNV(target, index, x, y, z, w)
+#	  return	  void
+#	  param		  target	  VertexAttribEnumNV in value
+#	  param		  index		  Int32 in value
+#	  param		  x		  Float64 in value
+#	  param		  y		  Float64 in value
+#	  param		  z		  Float64 in value
+#	  param		  w		  Float64 in value
+#	  category	  NV_vertex_program1_1_dcc
+#	  version	  1.2
+#	  vectorequiv	  ProgramParameterSigned4dvNV
+#	  extension	  soft WINSOFT NV20
+#	  offset	  ?
+#
+# ProgramParameterSigned4dvNV(target, index, v)
+#	  return	  void
+#	  param		  target	  VertexAttribEnumNV in value
+#	  param		  index		  Int32 in value
+#	  param		  v		  Float64 in array [4]
+#	  category	  NV_vertex_program1_1_dcc
+#	  version	  1.2
+#	  extension	  soft WINSOFT NV20
+#	  glxflags	  ignore
+#	  offset	  ?
+#
+# ProgramParameterSigned4fNV(target, index, x, y, z, w)
+#	  return	  void
+#	  param		  target	  VertexAttribEnumNV in value
+#	  param		  index		  Int32 in value
+#	  param		  x		  Float32 in value
+#	  param		  y		  Float32 in value
+#	  param		  z		  Float32 in value
+#	  param		  w		  Float32 in value
+#	  category	  NV_vertex_program1_1_dcc
+#	  version	  1.2
+#	  vectorequiv	  ProgramParameterSigned4fvNV
+#	  extension	  soft WINSOFT NV20
+#	  offset	  ?
+#
+# ProgramParameterSigned4fvNV(target, index, v)
+#	  return	  void
+#	  param		  target	  VertexAttribEnumNV in value
+#	  param		  index		  Int32 in value
+#	  param		  v		  Float32 in array [4]
+#	  category	  NV_vertex_program1_1_dcc
+#	  version	  1.2
+#	  extension	  soft WINSOFT NV20
+#	  glxflags	  ignore
+#	  offset	  ?
+#
+# ProgramParametersSigned4dvNV(target, index, count, v)
+#	  return	  void
+#	  param		  target	  VertexAttribEnumNV in value
+#	  param		  index		  Int32 in value
+#	  param		  count		  SizeI in value
+#	  param		  v		  Float64 in array [count*4]
+#	  category	  NV_vertex_program1_1_dcc
+#	  version	  1.2
+#	  extension	  soft WINSOFT NV20
+#	  glxflags	  ignore
+#	  offset	  ?
+#
+# ProgramParametersSigned4fvNV(target, index, count, v)
+#	  return	  void
+#	  param		  target	  VertexAttribEnumNV in value
+#	  param		  index		  Int32 in value
+#	  param		  count		  SizeI in value
+#	  param		  v		  Float32 in array [count*4]
+#	  category	  NV_vertex_program1_1_dcc
+#	  version	  1.2
+#	  extension	  soft WINSOFT NV20
+#	  glxflags	  ignore
+#	  offset	  ?
+
+RequestResidentProgramsNV(n, programs)
+	return		void
+	param		n		SizeI in value
+	param		programs	UInt32 in array [n]
+	category	NV_vertex_program
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4182
+	offset		600
+
+TrackMatrixNV(target, address, matrix, transform)
+	return		void
+	param		target		VertexAttribEnumNV in value
+	param		address		UInt32 in value
+	param		matrix		VertexAttribEnumNV in value
+	param		transform	VertexAttribEnumNV in value
+	category	NV_vertex_program
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4188
+	offset		601
+
+VertexAttribPointerNV(index, fsize, type, stride, pointer)
+	return		void
+	param		index		UInt32 in value
+	param		fsize		Int32 in value
+	param		type		VertexAttribEnumNV in value
+	param		stride		SizeI in value
+	param		pointer		Void in array [COMPSIZE(fsize/type/stride)] retained
+	category	NV_vertex_program
+	dlflags		notlistable
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		602
+
+VertexAttrib1dNV(index, x)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float64 in value
+	category	NV_vertex_program
+	version		1.2
+	vectorequiv	VertexAttrib1dvNV
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib1d
+
+VertexAttrib1dvNV(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float64 in array [1]
+	category	NV_vertex_program
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4197
+	alias		VertexAttrib1dv
+
+VertexAttrib1fNV(index, x)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float32 in value
+	category	NV_vertex_program
+	version		1.2
+	vectorequiv	VertexAttrib1fvNV
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib1f
+
+VertexAttrib1fvNV(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float32 in array [1]
+	category	NV_vertex_program
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4193
+	alias		VertexAttrib1fv
+
+VertexAttrib1sNV(index, x)
+	return		void
+	param		index		UInt32 in value
+	param		x		Int16 in value
+	category	NV_vertex_program
+	version		1.2
+	vectorequiv	VertexAttrib1svNV
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib1s
+
+VertexAttrib1svNV(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int16 in array [1]
+	category	NV_vertex_program
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4189
+	alias		VertexAttrib1sv
+
+VertexAttrib2dNV(index, x, y)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	category	NV_vertex_program
+	version		1.2
+	vectorequiv	VertexAttrib2dvNV
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib2d
+
+VertexAttrib2dvNV(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float64 in array [2]
+	category	NV_vertex_program
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4198
+	alias		VertexAttrib2dv
+
+VertexAttrib2fNV(index, x, y)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	category	NV_vertex_program
+	version		1.2
+	vectorequiv	VertexAttrib2fvNV
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib2f
+
+VertexAttrib2fvNV(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float32 in array [2]
+	category	NV_vertex_program
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4194
+	alias		VertexAttrib2fv
+
+VertexAttrib2sNV(index, x, y)
+	return		void
+	param		index		UInt32 in value
+	param		x		Int16 in value
+	param		y		Int16 in value
+	category	NV_vertex_program
+	version		1.2
+	vectorequiv	VertexAttrib2svNV
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib2s
+
+VertexAttrib2svNV(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int16 in array [2]
+	category	NV_vertex_program
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4190
+	alias		VertexAttrib2sv
+
+VertexAttrib3dNV(index, x, y, z)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	param		z		Float64 in value
+	category	NV_vertex_program
+	version		1.2
+	vectorequiv	VertexAttrib3dvNV
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib3d
+
+VertexAttrib3dvNV(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float64 in array [3]
+	category	NV_vertex_program
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4199
+	alias		VertexAttrib3dv
+
+VertexAttrib3fNV(index, x, y, z)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	category	NV_vertex_program
+	version		1.2
+	vectorequiv	VertexAttrib3fvNV
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib3f
+
+VertexAttrib3fvNV(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float32 in array [3]
+	category	NV_vertex_program
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4195
+	alias		VertexAttrib3fv
+
+VertexAttrib3sNV(index, x, y, z)
+	return		void
+	param		index		UInt32 in value
+	param		x		Int16 in value
+	param		y		Int16 in value
+	param		z		Int16 in value
+	category	NV_vertex_program
+	version		1.2
+	vectorequiv	VertexAttrib3svNV
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib3s
+
+VertexAttrib3svNV(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int16 in array [3]
+	category	NV_vertex_program
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4191
+	alias		VertexAttrib3sv
+
+VertexAttrib4dNV(index, x, y, z, w)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	param		z		Float64 in value
+	param		w		Float64 in value
+	category	NV_vertex_program
+	version		1.2
+	vectorequiv	VertexAttrib4dvNV
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib4d
+
+VertexAttrib4dvNV(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float64 in array [4]
+	category	NV_vertex_program
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4200
+	alias		VertexAttrib4dv
+
+VertexAttrib4fNV(index, x, y, z, w)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	param		w		Float32 in value
+	category	NV_vertex_program
+	version		1.2
+	vectorequiv	VertexAttrib4fvNV
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib4f
+
+VertexAttrib4fvNV(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float32 in array [4]
+	category	NV_vertex_program
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4196
+	alias		VertexAttrib4fv
+
+VertexAttrib4sNV(index, x, y, z, w)
+	return		void
+	param		index		UInt32 in value
+	param		x		Int16 in value
+	param		y		Int16 in value
+	param		z		Int16 in value
+	param		w		Int16 in value
+	category	NV_vertex_program
+	version		1.2
+	vectorequiv	VertexAttrib4svNV
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib4s
+
+VertexAttrib4svNV(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int16 in array [4]
+	category	NV_vertex_program
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4192
+	alias		VertexAttrib4sv
+
+VertexAttrib4ubNV(index, x, y, z, w)
+	return		void
+	param		index		UInt32 in value
+	param		x		ColorUB in value
+	param		y		ColorUB in value
+	param		z		ColorUB in value
+	param		w		ColorUB in value
+	category	NV_vertex_program
+	version		1.2
+	extension	soft WINSOFT NV10
+	vectorequiv	VertexAttrib4ubvNV
+	alias		VertexAttrib4Nub
+
+VertexAttrib4ubvNV(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		ColorUB in array [4]
+	category	NV_vertex_program
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4201
+	alias		VertexAttrib4Nubv
+
+VertexAttribs1dvNV(index, count, v)
+	return		void
+	param		index		UInt32 in value
+	param		count		SizeI in value
+	param		v		Float64 in array [count]
+	category	NV_vertex_program
+	dlflags		handcode
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4210
+	offset		629
+
+VertexAttribs1fvNV(index, count, v)
+	return		void
+	param		index		UInt32 in value
+	param		count		SizeI in value
+	param		v		Float32 in array [count]
+	category	NV_vertex_program
+	dlflags		handcode
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4206
+	offset		630
+
+VertexAttribs1svNV(index, count, v)
+	return		void
+	param		index		UInt32 in value
+	param		count		SizeI in value
+	param		v		Int16 in array [count]
+	category	NV_vertex_program
+	dlflags		handcode
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4202
+	offset		631
+
+VertexAttribs2dvNV(index, count, v)
+	return		void
+	param		index		UInt32 in value
+	param		count		SizeI in value
+	param		v		Float64 in array [count*2]
+	category	NV_vertex_program
+	dlflags		handcode
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4211
+	offset		632
+
+VertexAttribs2fvNV(index, count, v)
+	return		void
+	param		index		UInt32 in value
+	param		count		SizeI in value
+	param		v		Float32 in array [count*2]
+	category	NV_vertex_program
+	dlflags		handcode
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4207
+	offset		633
+
+VertexAttribs2svNV(index, count, v)
+	return		void
+	param		index		UInt32 in value
+	param		count		SizeI in value
+	param		v		Int16 in array [count*2]
+	category	NV_vertex_program
+	dlflags		handcode
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4203
+	offset		634
+
+VertexAttribs3dvNV(index, count, v)
+	return		void
+	param		index		UInt32 in value
+	param		count		SizeI in value
+	param		v		Float64 in array [count*3]
+	category	NV_vertex_program
+	dlflags		handcode
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4212
+	offset		635
+
+VertexAttribs3fvNV(index, count, v)
+	return		void
+	param		index		UInt32 in value
+	param		count		SizeI in value
+	param		v		Float32 in array [count*3]
+	category	NV_vertex_program
+	dlflags		handcode
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4208
+	offset		636
+
+VertexAttribs3svNV(index, count, v)
+	return		void
+	param		index		UInt32 in value
+	param		count		SizeI in value
+	param		v		Int16 in array [count*3]
+	category	NV_vertex_program
+	dlflags		handcode
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4204
+	offset		637
+
+VertexAttribs4dvNV(index, count, v)
+	return		void
+	param		index		UInt32 in value
+	param		count		SizeI in value
+	param		v		Float64 in array [count*4]
+	category	NV_vertex_program
+	dlflags		handcode
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4213
+	offset		638
+
+VertexAttribs4fvNV(index, count, v)
+	return		void
+	param		index		UInt32 in value
+	param		count		SizeI in value
+	param		v		Float32 in array [count*4]
+	category	NV_vertex_program
+	dlflags		handcode
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4209
+	offset		639
+
+VertexAttribs4svNV(index, count, v)
+	return		void
+	param		index		UInt32 in value
+	param		count		SizeI in value
+	param		v		Int16 in array [count*4]
+	category	NV_vertex_program
+	dlflags		handcode
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4205
+	offset		640
+
+VertexAttribs4ubvNV(index, count, v)
+	return		void
+	param		index		UInt32 in value
+	param		count		SizeI in value
+	param		v		ColorUB in array [count*4]
+	category	NV_vertex_program
+	dlflags		handcode
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4214
+	offset		641
+
+
+###############################################################################
+#
+# Extension #234 - GLX_SGIX_visual_select_group
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #235
+# SGIX_texture_coordinate_clamp commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_texture_coordinate_clamp
+
+###############################################################################
+#
+# Extension #236
+# SGIX_scalebias_hint commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_scalebias_hint
+
+###############################################################################
+#
+# Extension #237 - GLX_OML_swap_method commands
+# Extension #238 - GLX_OML_sync_control commands
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #239
+# OML_interlace commands
+#
+###############################################################################
+
+# (none)
+newcategory: OML_interlace
+
+###############################################################################
+#
+# Extension #240
+# OML_subsample commands
+#
+###############################################################################
+
+# (none)
+newcategory: OML_subsample
+
+###############################################################################
+#
+# Extension #241
+# OML_resample commands
+#
+###############################################################################
+
+# (none)
+newcategory: OML_resample
+
+###############################################################################
+#
+# Extension #242 - WGL_OML_sync_control commands
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #243
+# NV_copy_depth_to_color commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_copy_depth_to_color
+
+###############################################################################
+#
+# Extension #244
+# ATI_envmap_bumpmap commands
+#
+###############################################################################
+
+TexBumpParameterivATI(pname, param)
+	return		void
+	param		pname		TexBumpParameterATI in value
+	param		param		Int32 in array [COMPSIZE(pname)]
+	category	ATI_envmap_bumpmap
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TexBumpParameterfvATI(pname, param)
+	return		void
+	param		pname		TexBumpParameterATI in value
+	param		param		Float32 in array [COMPSIZE(pname)]
+	category	ATI_envmap_bumpmap
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetTexBumpParameterivATI(pname, param)
+	return		void
+	param		pname		GetTexBumpParameterATI in value
+	param		param		Int32 out array [COMPSIZE(pname)]
+	category	ATI_envmap_bumpmap
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetTexBumpParameterfvATI(pname, param)
+	return		void
+	param		pname		GetTexBumpParameterATI in value
+	param		param		Float32 out array [COMPSIZE(pname)]
+	category	ATI_envmap_bumpmap
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #245
+# ATI_fragment_shader commands
+#
+###############################################################################
+
+GenFragmentShadersATI(range)
+	return		UInt32
+	param		range		UInt32 in value
+	category	ATI_fragment_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+BindFragmentShaderATI(id)
+	return		void
+	param		id		UInt32 in value
+	category	ATI_fragment_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DeleteFragmentShaderATI(id)
+	return		void
+	param		id		UInt32 in value
+	category	ATI_fragment_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+BeginFragmentShaderATI()
+	return		void
+	category	ATI_fragment_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+EndFragmentShaderATI()
+	return		void
+	category	ATI_fragment_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+PassTexCoordATI(dst, coord, swizzle)
+	return		void
+	param		dst		UInt32 in value
+	param		coord		UInt32 in value
+	param		swizzle		SwizzleOpATI in value
+	category	ATI_fragment_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+SampleMapATI(dst, interp, swizzle)
+	return		void
+	param		dst		UInt32 in value
+	param		interp		UInt32 in value
+	param		swizzle		SwizzleOpATI in value
+	category	ATI_fragment_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ColorFragmentOp1ATI(op, dst, dstMask, dstMod, arg1, arg1Rep, arg1Mod)
+	return		void
+	param		op		FragmentOpATI in value
+	param		dst		UInt32 in value
+	param		dstMask		UInt32 in value
+	param		dstMod		UInt32 in value
+	param		arg1		UInt32 in value
+	param		arg1Rep		UInt32 in value
+	param		arg1Mod		UInt32 in value
+	category	ATI_fragment_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ColorFragmentOp2ATI(op, dst, dstMask, dstMod, arg1, arg1Rep, arg1Mod, arg2, arg2Rep, arg2Mod)
+	return		void
+	param		op		FragmentOpATI in value
+	param		dst		UInt32 in value
+	param		dstMask		UInt32 in value
+	param		dstMod		UInt32 in value
+	param		arg1		UInt32 in value
+	param		arg1Rep		UInt32 in value
+	param		arg1Mod		UInt32 in value
+	param		arg2		UInt32 in value
+	param		arg2Rep		UInt32 in value
+	param		arg2Mod		UInt32 in value
+	category	ATI_fragment_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ColorFragmentOp3ATI(op, dst, dstMask, dstMod, arg1, arg1Rep, arg1Mod, arg2, arg2Rep, arg2Mod, arg3, arg3Rep, arg3Mod)
+	return		void
+	param		op		FragmentOpATI in value
+	param		dst		UInt32 in value
+	param		dstMask		UInt32 in value
+	param		dstMod		UInt32 in value
+	param		arg1		UInt32 in value
+	param		arg1Rep		UInt32 in value
+	param		arg1Mod		UInt32 in value
+	param		arg2		UInt32 in value
+	param		arg2Rep		UInt32 in value
+	param		arg2Mod		UInt32 in value
+	param		arg3		UInt32 in value
+	param		arg3Rep		UInt32 in value
+	param		arg3Mod		UInt32 in value
+	category	ATI_fragment_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+AlphaFragmentOp1ATI(op, dst, dstMod, arg1, arg1Rep, arg1Mod)
+	return		void
+	param		op		FragmentOpATI in value
+	param		dst		UInt32 in value
+	param		dstMod		UInt32 in value
+	param		arg1		UInt32 in value
+	param		arg1Rep		UInt32 in value
+	param		arg1Mod		UInt32 in value
+	category	ATI_fragment_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+AlphaFragmentOp2ATI(op, dst, dstMod, arg1, arg1Rep, arg1Mod, arg2, arg2Rep, arg2Mod)
+	return		void
+	param		op		FragmentOpATI in value
+	param		dst		UInt32 in value
+	param		dstMod		UInt32 in value
+	param		arg1		UInt32 in value
+	param		arg1Rep		UInt32 in value
+	param		arg1Mod		UInt32 in value
+	param		arg2		UInt32 in value
+	param		arg2Rep		UInt32 in value
+	param		arg2Mod		UInt32 in value
+	category	ATI_fragment_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+AlphaFragmentOp3ATI(op, dst, dstMod, arg1, arg1Rep, arg1Mod, arg2, arg2Rep, arg2Mod, arg3, arg3Rep, arg3Mod)
+	return		void
+	param		op		FragmentOpATI in value
+	param		dst		UInt32 in value
+	param		dstMod		UInt32 in value
+	param		arg1		UInt32 in value
+	param		arg1Rep		UInt32 in value
+	param		arg1Mod		UInt32 in value
+	param		arg2		UInt32 in value
+	param		arg2Rep		UInt32 in value
+	param		arg2Mod		UInt32 in value
+	param		arg3		UInt32 in value
+	param		arg3Rep		UInt32 in value
+	param		arg3Mod		UInt32 in value
+	category	ATI_fragment_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+SetFragmentShaderConstantATI(dst, value)
+	return		void
+	param		dst		UInt32 in value
+	param		value		ConstFloat32 in array [4]
+	category	ATI_fragment_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #246
+# ATI_pn_triangles commands
+#
+###############################################################################
+
+PNTrianglesiATI(pname, param)
+	return		void
+	param		pname		PNTrianglesPNameATI in value
+	param		param		Int32 in value
+	category	ATI_pn_triangles
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+PNTrianglesfATI(pname, param)
+	return		void
+	param		pname		PNTrianglesPNameATI in value
+	param		param		Float32 in value
+	category	ATI_pn_triangles
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #247
+# ATI_vertex_array_object commands
+#
+###############################################################################
+
+NewObjectBufferATI(size, pointer, usage)
+	return		UInt32
+	param		size		SizeI in value
+	param		pointer		ConstVoid in array [size]
+	param		usage		ArrayObjectUsageATI in value
+	category	ATI_vertex_array_object
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+IsObjectBufferATI(buffer)
+	return		Boolean
+	param		buffer		UInt32 in value
+	category	ATI_vertex_array_object
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+UpdateObjectBufferATI(buffer, offset, size, pointer, preserve)
+	return		void
+	param		buffer		UInt32 in value
+	param		offset		UInt32 in value
+	param		size		SizeI in value
+	param		pointer		ConstVoid in array [size]
+	param		preserve	PreserveModeATI in value
+	category	ATI_vertex_array_object
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetObjectBufferfvATI(buffer, pname, params)
+	return		void
+	param		buffer		UInt32 in value
+	param		pname		ArrayObjectPNameATI in value
+	param		params		Float32 out array [1]
+	category	ATI_vertex_array_object
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetObjectBufferivATI(buffer, pname, params)
+	return		void
+	param		buffer		UInt32 in value
+	param		pname		ArrayObjectPNameATI in value
+	param		params		Int32 out array [1]
+	category	ATI_vertex_array_object
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+FreeObjectBufferATI(buffer)
+	return		void
+	param		buffer		UInt32 in value
+	category	ATI_vertex_array_object
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ArrayObjectATI(array, size, type, stride, buffer, offset)
+	return		void
+	param		array		EnableCap in value
+	param		size		Int32 in value
+	param		type		ScalarType in value
+	param		stride		SizeI in value
+	param		buffer		UInt32 in value
+	param		offset		UInt32 in value
+	category	ATI_vertex_array_object
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetArrayObjectfvATI(array, pname, params)
+	return		void
+	param		array		EnableCap in value
+	param		pname		ArrayObjectPNameATI in value
+	param		params		Float32 out array [1]
+	category	ATI_vertex_array_object
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetArrayObjectivATI(array, pname, params)
+	return		void
+	param		array		EnableCap in value
+	param		pname		ArrayObjectPNameATI in value
+	param		params		Int32 out array [1]
+	category	ATI_vertex_array_object
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+VariantArrayObjectATI(id, type, stride, buffer, offset)
+	return		void
+	param		id		UInt32 in value
+	param		type		ScalarType in value
+	param		stride		SizeI in value
+	param		buffer		UInt32 in value
+	param		offset		UInt32 in value
+	category	ATI_vertex_array_object
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetVariantArrayObjectfvATI(id, pname, params)
+	return		void
+	param		id		UInt32 in value
+	param		pname		ArrayObjectPNameATI in value
+	param		params		Float32 out array [1]
+	category	ATI_vertex_array_object
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetVariantArrayObjectivATI(id, pname, params)
+	return		void
+	param		id		UInt32 in value
+	param		pname		ArrayObjectPNameATI in value
+	param		params		Int32 out array [1]
+	category	ATI_vertex_array_object
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #248
+# EXT_vertex_shader commands
+#
+###############################################################################
+
+BeginVertexShaderEXT()
+	return		void
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+EndVertexShaderEXT()
+	return		void
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+BindVertexShaderEXT(id)
+	return		void
+	param		id		UInt32 in value
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GenVertexShadersEXT(range)
+	return		UInt32
+	param		range		UInt32 in value
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DeleteVertexShaderEXT(id)
+	return		void
+	param		id		UInt32 in value
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ShaderOp1EXT(op, res, arg1)
+	return		void
+	param		op		VertexShaderOpEXT in value
+	param		res		UInt32 in value
+	param		arg1		UInt32 in value
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ShaderOp2EXT(op, res, arg1, arg2)
+	return		void
+	param		op		VertexShaderOpEXT in value
+	param		res		UInt32 in value
+	param		arg1		UInt32 in value
+	param		arg2		UInt32 in value
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ShaderOp3EXT(op, res, arg1, arg2, arg3)
+	return		void
+	param		op		VertexShaderOpEXT in value
+	param		res		UInt32 in value
+	param		arg1		UInt32 in value
+	param		arg2		UInt32 in value
+	param		arg3		UInt32 in value
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+SwizzleEXT(res, in, outX, outY, outZ, outW)
+	return		void
+	param		res		UInt32 in value
+	param		in		UInt32 in value
+	param		outX		VertexShaderCoordOutEXT in value
+	param		outY		VertexShaderCoordOutEXT in value
+	param		outZ		VertexShaderCoordOutEXT in value
+	param		outW		VertexShaderCoordOutEXT in value
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+WriteMaskEXT(res, in, outX, outY, outZ, outW)
+	return		void
+	param		res		UInt32 in value
+	param		in		UInt32 in value
+	param		outX		VertexShaderWriteMaskEXT in value
+	param		outY		VertexShaderWriteMaskEXT in value
+	param		outZ		VertexShaderWriteMaskEXT in value
+	param		outW		VertexShaderWriteMaskEXT in value
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+InsertComponentEXT(res, src, num)
+	return		void
+	param		res		UInt32 in value
+	param		src		UInt32 in value
+	param		num		UInt32 in value
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ExtractComponentEXT(res, src, num)
+	return		void
+	param		res		UInt32 in value
+	param		src		UInt32 in value
+	param		num		UInt32 in value
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GenSymbolsEXT(datatype, storagetype, range, components)
+	return		UInt32
+	param		datatype	DataTypeEXT in value
+	param		storagetype	VertexShaderStorageTypeEXT in value
+	param		range		ParameterRangeEXT in value
+	param		components	UInt32 in value
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+SetInvariantEXT(id, type, addr)
+	return		void
+	param		id		UInt32 in value
+	param		type		ScalarType in value
+	param		addr		Void in array [COMPSIZE(id/type)]
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+SetLocalConstantEXT(id, type, addr)
+	return		void
+	param		id		UInt32 in value
+	param		type		ScalarType in value
+	param		addr		Void in array [COMPSIZE(id/type)]
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VariantbvEXT(id, addr)
+	return		void
+	param		id		UInt32 in value
+	param		addr		Int8 in array [COMPSIZE(id)]
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VariantsvEXT(id, addr)
+	return		void
+	param		id		UInt32 in value
+	param		addr		Int16 in array [COMPSIZE(id)]
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VariantivEXT(id, addr)
+	return		void
+	param		id		UInt32 in value
+	param		addr		Int32 in array [COMPSIZE(id)]
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VariantfvEXT(id, addr)
+	return		void
+	param		id		UInt32 in value
+	param		addr		Float32 in array [COMPSIZE(id)]
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VariantdvEXT(id, addr)
+	return		void
+	param		id		UInt32 in value
+	param		addr		Float64 in array [COMPSIZE(id)]
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VariantubvEXT(id, addr)
+	return		void
+	param		id		UInt32 in value
+	param		addr		UInt8 in array [COMPSIZE(id)]
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VariantusvEXT(id, addr)
+	return		void
+	param		id		UInt32 in value
+	param		addr		UInt16 in array [COMPSIZE(id)]
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VariantuivEXT(id, addr)
+	return		void
+	param		id		UInt32 in value
+	param		addr		UInt32 in array [COMPSIZE(id)]
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VariantPointerEXT(id, type, stride, addr)
+	return		void
+	param		id		UInt32 in value
+	param		type		ScalarType in value
+	param		stride		UInt32 in value
+	param		addr		Void in array [COMPSIZE(id/type/stride)]
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+EnableVariantClientStateEXT(id)
+	return		void
+	param		id		UInt32 in value
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DisableVariantClientStateEXT(id)
+	return		void
+	param		id		UInt32 in value
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+BindLightParameterEXT(light, value)
+	return		UInt32
+	param		light		LightName in value
+	param		value		LightParameter in value
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+BindMaterialParameterEXT(face, value)
+	return		UInt32
+	param		face		MaterialFace in value
+	param		value		MaterialParameter in value
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+BindTexGenParameterEXT(unit, coord, value)
+	return		UInt32
+	param		unit		TextureUnit in value
+	param		coord		TextureCoordName in value
+	param		value		TextureGenParameter in value
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+BindTextureUnitParameterEXT(unit, value)
+	return		UInt32
+	param		unit		TextureUnit in value
+	param		value		VertexShaderTextureUnitParameter in value
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+BindParameterEXT(value)
+	return		UInt32
+	param		value		VertexShaderParameterEXT in value
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+IsVariantEnabledEXT(id, cap)
+	return		Boolean
+	param		id		UInt32 in value
+	param		cap		VariantCapEXT in value
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetVariantBooleanvEXT(id, value, data)
+	return		void
+	param		id		UInt32 in value
+	param		value		GetVariantValueEXT in value
+	param		data		Boolean out array [COMPSIZE(id)]
+	category	EXT_vertex_shader
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetVariantIntegervEXT(id, value, data)
+	return		void
+	param		id		UInt32 in value
+	param		value		GetVariantValueEXT in value
+	param		data		Int32 out array [COMPSIZE(id)]
+	category	EXT_vertex_shader
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetVariantFloatvEXT(id, value, data)
+	return		void
+	param		id		UInt32 in value
+	param		value		GetVariantValueEXT in value
+	param		data		Float32 out array [COMPSIZE(id)]
+	category	EXT_vertex_shader
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetVariantPointervEXT(id, value, data)
+	return		void
+	param		id		UInt32 in value
+	param		value		GetVariantValueEXT in value
+	param		data		VoidPointer out array [COMPSIZE(id)]
+	category	EXT_vertex_shader
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetInvariantBooleanvEXT(id, value, data)
+	return		void
+	param		id		UInt32 in value
+	param		value		GetVariantValueEXT in value
+	param		data		Boolean out array [COMPSIZE(id)]
+	category	EXT_vertex_shader
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetInvariantIntegervEXT(id, value, data)
+	return		void
+	param		id		UInt32 in value
+	param		value		GetVariantValueEXT in value
+	param		data		Int32 out array [COMPSIZE(id)]
+	category	EXT_vertex_shader
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetInvariantFloatvEXT(id, value, data)
+	return		void
+	param		id		UInt32 in value
+	param		value		GetVariantValueEXT in value
+	param		data		Float32 out array [COMPSIZE(id)]
+	category	EXT_vertex_shader
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetLocalConstantBooleanvEXT(id, value, data)
+	return		void
+	param		id		UInt32 in value
+	param		value		GetVariantValueEXT in value
+	param		data		Boolean out array [COMPSIZE(id)]
+	category	EXT_vertex_shader
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetLocalConstantIntegervEXT(id, value, data)
+	return		void
+	param		id		UInt32 in value
+	param		value		GetVariantValueEXT in value
+	param		data		Int32 out array [COMPSIZE(id)]
+	category	EXT_vertex_shader
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetLocalConstantFloatvEXT(id, value, data)
+	return		void
+	param		id		UInt32 in value
+	param		value		GetVariantValueEXT in value
+	param		data		Float32 out array [COMPSIZE(id)]
+	category	EXT_vertex_shader
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #249
+# ATI_vertex_streams commands
+#
+###############################################################################
+
+VertexStream1sATI(stream, x)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		x		Int16 in value
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream1svATI(stream, coords)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		coords		Int16 in array [1]
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream1iATI(stream, x)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		x		Int32 in value
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream1ivATI(stream, coords)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		coords		Int32 in array [1]
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream1fATI(stream, x)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		x		Float32 in value
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream1fvATI(stream, coords)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		coords		Float32 in array [1]
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream1dATI(stream, x)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		x		Float64 in value
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream1dvATI(stream, coords)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		coords		Float64 in array [1]
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream2sATI(stream, x, y)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		x		Int16 in value
+	param		y		Int16 in value
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream2svATI(stream, coords)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		coords		Int16 in array [2]
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream2iATI(stream, x, y)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		x		Int32 in value
+	param		y		Int32 in value
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream2ivATI(stream, coords)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		coords		Int32 in array [2]
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream2fATI(stream, x, y)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream2fvATI(stream, coords)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		coords		Float32 in array [2]
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream2dATI(stream, x, y)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream2dvATI(stream, coords)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		coords		Float64 in array [2]
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream3sATI(stream, x, y, z)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		x		Int16 in value
+	param		y		Int16 in value
+	param		z		Int16 in value
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream3svATI(stream, coords)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		coords		Int16 in array [3]
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream3iATI(stream, x, y, z)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		x		Int32 in value
+	param		y		Int32 in value
+	param		z		Int32 in value
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream3ivATI(stream, coords)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		coords		Int32 in array [3]
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream3fATI(stream, x, y, z)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream3fvATI(stream, coords)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		coords		Float32 in array [3]
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream3dATI(stream, x, y, z)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	param		z		Float64 in value
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream3dvATI(stream, coords)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		coords		Float64 in array [3]
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream4sATI(stream, x, y, z, w)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		x		Int16 in value
+	param		y		Int16 in value
+	param		z		Int16 in value
+	param		w		Int16 in value
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream4svATI(stream, coords)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		coords		Int16 in array [4]
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream4iATI(stream, x, y, z, w)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		x		Int32 in value
+	param		y		Int32 in value
+	param		z		Int32 in value
+	param		w		Int32 in value
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream4ivATI(stream, coords)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		coords		Int32 in array [4]
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream4fATI(stream, x, y, z, w)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	param		w		Float32 in value
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream4fvATI(stream, coords)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		coords		Float32 in array [4]
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream4dATI(stream, x, y, z, w)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	param		z		Float64 in value
+	param		w		Float64 in value
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream4dvATI(stream, coords)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		coords		Float64 in array [4]
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+NormalStream3bATI(stream, nx, ny, nz)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		nx		Int8 in value
+	param		ny		Int8 in value
+	param		nz		Int8 in value
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+NormalStream3bvATI(stream, coords)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		coords		Int8 in array [3]
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+NormalStream3sATI(stream, nx, ny, nz)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		nx		Int16 in value
+	param		ny		Int16 in value
+	param		nz		Int16 in value
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+NormalStream3svATI(stream, coords)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		coords		Int16 in array [3]
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+NormalStream3iATI(stream, nx, ny, nz)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		nx		Int32 in value
+	param		ny		Int32 in value
+	param		nz		Int32 in value
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+NormalStream3ivATI(stream, coords)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		coords		Int32 in array [3]
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+NormalStream3fATI(stream, nx, ny, nz)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		nx		Float32 in value
+	param		ny		Float32 in value
+	param		nz		Float32 in value
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+NormalStream3fvATI(stream, coords)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		coords		Float32 in array [3]
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+NormalStream3dATI(stream, nx, ny, nz)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		nx		Float64 in value
+	param		ny		Float64 in value
+	param		nz		Float64 in value
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+NormalStream3dvATI(stream, coords)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		coords		Float64 in array [3]
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ClientActiveVertexStreamATI(stream)
+	return		void
+	param		stream		VertexStreamATI in value
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexBlendEnviATI(pname, param)
+	return		void
+	param		pname		VertexStreamATI in value
+	param		param		Int32 in value
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexBlendEnvfATI(pname, param)
+	return		void
+	param		pname		VertexStreamATI in value
+	param		param		Float32 in value
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #250 - WGL_I3D_digital_video_control
+# Extension #251 - WGL_I3D_gamma
+# Extension #252 - WGL_I3D_genlock
+# Extension #253 - WGL_I3D_image_buffer
+# Extension #254 - WGL_I3D_swap_frame_lock
+# Extension #255 - WGL_I3D_swap_frame_usage
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #256
+# ATI_element_array commands
+#
+###############################################################################
+
+ElementPointerATI(type, pointer)
+	return		void
+	param		type		ElementPointerTypeATI in value
+	param		pointer		Void in array [COMPSIZE(type)] retained
+	category	ATI_element_array
+	dlflags		notlistable
+	glxflags	client-handcode client-intercept server-handcode
+	version		1.2
+	offset		?
+
+DrawElementArrayATI(mode, count)
+	return		void
+	param		mode		BeginMode in value
+	param		count		SizeI in value
+	category	ATI_element_array
+	dlflags		handcode
+	glxflags	client-handcode client-intercept server-handcode
+	version		1.2
+	offset		?
+
+DrawRangeElementArrayATI(mode, start, end, count)
+	return		void
+	param		mode		BeginMode in value
+	param		start		UInt32 in value
+	param		end		UInt32 in value
+	param		count		SizeI in value
+	category	ATI_element_array
+	dlflags		handcode
+	glxflags	client-handcode client-intercept server-handcode
+	version		1.2
+	offset		?
+
+###############################################################################
+#
+# Extension #257
+# SUN_mesh_array commands
+#
+###############################################################################
+
+DrawMeshArraysSUN(mode, first, count, width)
+	return		void
+	param		mode		BeginMode in value
+	param		first		Int32 in value
+	param		count		SizeI in value
+	param		width		SizeI in value
+	category	SUN_mesh_array
+	dlflags		handcode
+	glxflags	client-handcode client-intercept server-handcode
+	version		1.1
+	glxropcode	?
+	offset		?
+
+###############################################################################
+#
+# Extension #258
+# SUN_slice_accum commands
+#
+###############################################################################
+
+# (none)
+newcategory: SUN_slice_accum
+
+###############################################################################
+#
+# Extension #259
+# NV_multisample_filter_hint commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_multisample_filter_hint
+
+###############################################################################
+#
+# Extension #260
+# NV_depth_clamp commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_depth_clamp
+
+###############################################################################
+#
+# Extension #261
+# NV_occlusion_query commands
+#
+###############################################################################
+
+GenOcclusionQueriesNV(n, ids)
+	return		void
+	param		n		SizeI in value
+	param		ids		UInt32 out array [n]
+	dlflags		notlistable
+	category	NV_occlusion_query
+	version		1.2
+	extension	soft WINSOFT NV20
+	glxflags	ignore
+
+DeleteOcclusionQueriesNV(n, ids)
+	return		void
+	param		n		SizeI in value
+	param		ids		UInt32 in array [n]
+	dlflags		notlistable
+	category	NV_occlusion_query
+	version		1.2
+	extension	soft WINSOFT NV20
+	glxflags	ignore
+
+IsOcclusionQueryNV(id)
+	return		Boolean
+	param		id		UInt32 in value
+	dlflags		notlistable
+	category	NV_occlusion_query
+	version		1.2
+	extension	soft WINSOFT NV20
+	glxflags	ignore
+
+BeginOcclusionQueryNV(id)
+	return		void
+	param		id		UInt32 in value
+	category	NV_occlusion_query
+	version		1.2
+	extension	soft WINSOFT NV20
+	glxflags	ignore
+
+EndOcclusionQueryNV()
+	return		void
+	category	NV_occlusion_query
+	version		1.2
+	extension	soft WINSOFT NV20
+	glxflags	ignore
+
+GetOcclusionQueryivNV(id, pname, params)
+	return		void
+	param		id		UInt32 in value
+	param		pname		OcclusionQueryParameterNameNV in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	dlflags		notlistable
+	category	NV_occlusion_query
+	version		1.2
+	extension	soft WINSOFT NV20
+	glxflags	ignore
+
+GetOcclusionQueryuivNV(id, pname, params)
+	return		void
+	param		id		UInt32 in value
+	param		pname		OcclusionQueryParameterNameNV in value
+	param		params		UInt32 out array [COMPSIZE(pname)]
+	dlflags		notlistable
+	category	NV_occlusion_query
+	version		1.2
+	extension	soft WINSOFT NV20
+	glxflags	ignore
+
+###############################################################################
+#
+# Extension #262
+# NV_point_sprite commands
+#
+###############################################################################
+
+PointParameteriNV(pname, param)
+	return		void
+	param		pname		PointParameterNameARB in value
+	param		param		Int32 in value
+	category	NV_point_sprite
+	version		1.2
+	extension	soft WINSOFT NV20
+	glxropcode	4221
+	alias		PointParameteri
+
+PointParameterivNV(pname, params)
+	return		void
+	param		pname		PointParameterNameARB in value
+	param		params		Int32 in array [COMPSIZE(pname)]
+	category	NV_point_sprite
+	version		1.2
+	extension	soft WINSOFT NV20
+	glxropcode	4222
+	alias		PointParameteriv
+
+###############################################################################
+#
+# Extension #263 - WGL_NV_render_depth_texture
+# Extension #264 - WGL_NV_render_texture_rectangle
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #265
+# NV_texture_shader3 commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_texture_shader3
+
+###############################################################################
+#
+# Extension #266
+# NV_vertex_program1_1 commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_vertex_program1_1
+
+###############################################################################
+#
+# Extension #267
+# EXT_shadow_funcs commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_shadow_funcs
+
+###############################################################################
+#
+# Extension #268
+# EXT_stencil_two_side commands
+#
+###############################################################################
+
+ActiveStencilFaceEXT(face)
+	return		void
+	param		face		StencilFaceDirection in value
+	category	EXT_stencil_two_side
+	version		1.3
+	glxropcode	4220
+	offset		646
+
+###############################################################################
+#
+# Extension #269
+# ATI_text_fragment_shader commands
+#
+###############################################################################
+
+# Uses ARB_vertex_program entry points
+newcategory: ATI_text_fragment_shader
+
+###############################################################################
+#
+# Extension #270
+# APPLE_client_storage commands
+#
+###############################################################################
+
+# (none)
+newcategory: APPLE_client_storage
+
+###############################################################################
+#
+# Extension #271
+# APPLE_element_array commands
+#
+###############################################################################
+
+# @@ Need to verify/add GLX protocol
+
+# @@@ like #256 ATI_element_array
+ElementPointerAPPLE(type, pointer)
+	return		void
+	param		type		ElementPointerTypeATI in value
+	param		pointer		Void in array [type]
+	category	APPLE_element_array
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DrawElementArrayAPPLE(mode, first, count)
+	return		void
+	param		mode		BeginMode in value
+	param		first		Int32 in value
+	param		count		SizeI in value
+	category	APPLE_element_array
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DrawRangeElementArrayAPPLE(mode, start, end, first, count)
+	return		void
+	param		mode		BeginMode in value
+	param		start		UInt32 in value
+	param		end		UInt32 in value
+	param		first		Int32 in value
+	param		count		SizeI in value
+	category	APPLE_element_array
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MultiDrawElementArrayAPPLE(mode, first, count, primcount)
+	return		void
+	param		mode		BeginMode in value
+	param		first		Int32 in array [primcount]
+	param		count		SizeI in array [primcount]
+	param		primcount	SizeI in value
+	category	APPLE_element_array
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MultiDrawRangeElementArrayAPPLE(mode, start, end, first, count, primcount)
+	return		void
+	param		mode		BeginMode in value
+	param		start		UInt32 in value
+	param		end		UInt32 in value
+	param		first		Int32 in array [primcount]
+	param		count		SizeI in array [primcount]
+	param		primcount	SizeI in value
+	category	APPLE_element_array
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #272
+# APPLE_fence commands
+#
+###############################################################################
+
+# @@ Need to verify/add GLX protocol
+
+# @@@ like #222 NV_fence
+GenFencesAPPLE(n, fences)
+	return		void
+	param		n		SizeI in value
+	param		fences		FenceNV out array [n]
+	category	APPLE_fence
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DeleteFencesAPPLE(n, fences)
+	return		void
+	param		n		SizeI in value
+	param		fences		FenceNV in array [n]
+	category	APPLE_fence
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+SetFenceAPPLE(fence)
+	return		void
+	param		fence		FenceNV in value
+	category	APPLE_fence
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+IsFenceAPPLE(fence)
+	return		Boolean
+	param		fence		FenceNV in value
+	category	APPLE_fence
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TestFenceAPPLE(fence)
+	return		Boolean
+	param		fence		FenceNV in value
+	category	APPLE_fence
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+FinishFenceAPPLE(fence)
+	return		void
+	param		fence		FenceNV in value
+	category	APPLE_fence
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TestObjectAPPLE(object, name)
+	return		Boolean
+	param		object		ObjectTypeAPPLE in value
+	param		name		UInt32 in value
+	category	APPLE_fence
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+FinishObjectAPPLE(object, name)
+	return		void
+	param		object		ObjectTypeAPPLE in value
+	param		name		Int32 in value
+	category	APPLE_fence
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #273
+# APPLE_vertex_array_object commands
+#
+###############################################################################
+
+BindVertexArrayAPPLE(array)
+	return		void
+	param		array		UInt32 in value
+	category	APPLE_vertex_array_object
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		BindVertexArray
+
+DeleteVertexArraysAPPLE(n, arrays)
+	return		void
+	param		n		SizeI in value
+	param		arrays		UInt32 in array [n]
+	category	APPLE_vertex_array_object
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		DeleteVertexArrays
+
+GenVertexArraysAPPLE(n, arrays)
+	return		void
+	param		n		SizeI in value
+	param		arrays		UInt32 out array [n]
+	category	APPLE_vertex_array_object
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		GenVertexArray
+
+IsVertexArrayAPPLE(array)
+	return		Boolean
+	param		array		UInt32 in value
+	category	APPLE_vertex_array_object
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		IsVertexArray
+
+###############################################################################
+#
+# Extension #274
+# APPLE_vertex_array_range commands
+#
+###############################################################################
+
+# @@ Need to verify/add GLX protocol
+
+# @@@ like #190 NV_vertex_array_range,
+VertexArrayRangeAPPLE(length, pointer)
+	return		void
+	param		length		SizeI in value
+	param		pointer		Void out array [length]
+	category	APPLE_vertex_array_range
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+FlushVertexArrayRangeAPPLE(length, pointer)
+	return		void
+	param		length		SizeI in value
+	param		pointer		Void out array [length]
+	category	APPLE_vertex_array_range
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexArrayParameteriAPPLE(pname, param)
+	return		void
+	param		pname		VertexArrayPNameAPPLE in value
+	param		param		Int32 in value
+	category	APPLE_vertex_array_range
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #275
+# APPLE_ycbcr_422 commands
+#
+###############################################################################
+
+# (none)
+newcategory: APPLE_ycbcr_422
+
+###############################################################################
+#
+# Extension #276
+# S3_s3tc commands
+#
+###############################################################################
+
+# (none)
+newcategory: S3_s3tc
+
+###############################################################################
+#
+# Extension #277
+# ATI_draw_buffers commands
+#
+###############################################################################
+
+DrawBuffersATI(n, bufs)
+	return		void
+	param		n		SizeI in value
+	param		bufs		DrawBufferModeATI in array [n]
+	category	ATI_draw_buffers
+	version		1.2
+	extension
+	glxropcode	233
+	alias		DrawBuffers
+
+###############################################################################
+#
+# Extension #278 - WGL_ATI_pixel_format_float
+#
+###############################################################################
+newcategory: ATI_pixel_format_float
+passthru: /* This is really a WGL extension, but defines some associated GL enums.
+passthru:  * ATI does not export "GL_ATI_pixel_format_float" in the GL_EXTENSIONS string.
+passthru:  */
+
+###############################################################################
+#
+# Extension #279
+# ATI_texture_env_combine3 commands
+#
+###############################################################################
+
+# (none)
+newcategory: ATI_texture_env_combine3
+
+###############################################################################
+#
+# Extension #280
+# ATI_texture_float commands
+#
+###############################################################################
+
+# (none)
+newcategory: ATI_texture_float
+
+###############################################################################
+#
+# Extension #281 (also WGL_NV_float_buffer)
+# NV_float_buffer commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_float_buffer
+
+###############################################################################
+#
+# Extension #282
+# NV_fragment_program commands
+#
+###############################################################################
+
+# @@ Need to verify/add GLX protocol
+
+# Some NV_fragment_program entry points are shared with ARB_vertex_program,
+#   and are only included in that #define block, for now.
+newcategory: NV_fragment_program
+passthru: /* Some NV_fragment_program entry points are shared with ARB_vertex_program. */
+
+ProgramNamedParameter4fNV(id, len, name, x, y, z, w)
+	return		void
+	param		id		UInt32 in value
+	param		len		SizeI in value
+	param		name		UInt8 in array [1]
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	param		w		Float32 in value
+	category	NV_fragment_program
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		682
+
+ProgramNamedParameter4dNV(id, len, name, x, y, z, w)
+	return		void
+	param		id		UInt32 in value
+	param		len		SizeI in value
+	param		name		UInt8 in array [1]
+	param		x		Float64 in value
+	param		y		Float64 in value
+	param		z		Float64 in value
+	param		w		Float64 in value
+	category	NV_fragment_program
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		683
+
+ProgramNamedParameter4fvNV(id, len, name, v)
+	return		void
+	param		id		UInt32 in value
+	param		len		SizeI in value
+	param		name		UInt8 in array [1]
+	param		v		Float32 in array [4]
+	category	NV_fragment_program
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		684
+
+ProgramNamedParameter4dvNV(id, len, name, v)
+	return		void
+	param		id		UInt32 in value
+	param		len		SizeI in value
+	param		name		UInt8 in array [1]
+	param		v		Float64 in array [4]
+	category	NV_fragment_program
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		685
+
+GetProgramNamedParameterfvNV(id, len, name, params)
+	return		void
+	param		id		UInt32 in value
+	param		len		SizeI in value
+	param		name		UInt8 in array [1]
+	param		params		Float32 out array [4]
+	category	NV_fragment_program
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		686
+
+GetProgramNamedParameterdvNV(id, len, name, params)
+	return		void
+	param		id		UInt32 in value
+	param		len		SizeI in value
+	param		name		UInt8 in array [1]
+	param		params		Float64 out array [4]
+	category	NV_fragment_program
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		687
+
+###############################################################################
+#
+# Extension #283
+# NV_half_float commands
+#
+###############################################################################
+
+# @@ Need to verify/add GLX protocol
+
+Vertex2hNV(x, y)
+	return		void
+	param		x		Half16NV in value
+	param		y		Half16NV in value
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Vertex2hvNV(v)
+	return		void
+	param		v		Half16NV in array [2]
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Vertex3hNV(x, y, z)
+	return		void
+	param		x		Half16NV in value
+	param		y		Half16NV in value
+	param		z		Half16NV in value
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Vertex3hvNV(v)
+	return		void
+	param		v		Half16NV in array [3]
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Vertex4hNV(x, y, z, w)
+	return		void
+	param		x		Half16NV in value
+	param		y		Half16NV in value
+	param		z		Half16NV in value
+	param		w		Half16NV in value
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Vertex4hvNV(v)
+	return		void
+	param		v		Half16NV in array [4]
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Normal3hNV(nx, ny, nz)
+	return		void
+	param		nx		Half16NV in value
+	param		ny		Half16NV in value
+	param		nz		Half16NV in value
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Normal3hvNV(v)
+	return		void
+	param		v		Half16NV in array [3]
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Color3hNV(red, green, blue)
+	return		void
+	param		red		Half16NV in value
+	param		green		Half16NV in value
+	param		blue		Half16NV in value
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Color3hvNV(v)
+	return		void
+	param		v		Half16NV in array [3]
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Color4hNV(red, green, blue, alpha)
+	return		void
+	param		red		Half16NV in value
+	param		green		Half16NV in value
+	param		blue		Half16NV in value
+	param		alpha		Half16NV in value
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Color4hvNV(v)
+	return		void
+	param		v		Half16NV in array [4]
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TexCoord1hNV(s)
+	return		void
+	param		s		Half16NV in value
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TexCoord1hvNV(v)
+	return		void
+	param		v		Half16NV in array [1]
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TexCoord2hNV(s, t)
+	return		void
+	param		s		Half16NV in value
+	param		t		Half16NV in value
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TexCoord2hvNV(v)
+	return		void
+	param		v		Half16NV in array [2]
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TexCoord3hNV(s, t, r)
+	return		void
+	param		s		Half16NV in value
+	param		t		Half16NV in value
+	param		r		Half16NV in value
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TexCoord3hvNV(v)
+	return		void
+	param		v		Half16NV in array [3]
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TexCoord4hNV(s, t, r, q)
+	return		void
+	param		s		Half16NV in value
+	param		t		Half16NV in value
+	param		r		Half16NV in value
+	param		q		Half16NV in value
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TexCoord4hvNV(v)
+	return		void
+	param		v		Half16NV in array [4]
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MultiTexCoord1hNV(target, s)
+	return		void
+	param		target		TextureUnit in value
+	param		s		Half16NV in value
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MultiTexCoord1hvNV(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		Half16NV in array [1]
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MultiTexCoord2hNV(target, s, t)
+	return		void
+	param		target		TextureUnit in value
+	param		s		Half16NV in value
+	param		t		Half16NV in value
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MultiTexCoord2hvNV(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		Half16NV in array [2]
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MultiTexCoord3hNV(target, s, t, r)
+	return		void
+	param		target		TextureUnit in value
+	param		s		Half16NV in value
+	param		t		Half16NV in value
+	param		r		Half16NV in value
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MultiTexCoord3hvNV(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		Half16NV in array [3]
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MultiTexCoord4hNV(target, s, t, r, q)
+	return		void
+	param		target		TextureUnit in value
+	param		s		Half16NV in value
+	param		t		Half16NV in value
+	param		r		Half16NV in value
+	param		q		Half16NV in value
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MultiTexCoord4hvNV(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		Half16NV in array [4]
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+FogCoordhNV(fog)
+	return		void
+	param		fog		Half16NV in value
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+FogCoordhvNV(fog)
+	return		void
+	param		fog		Half16NV in array [1]
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+SecondaryColor3hNV(red, green, blue)
+	return		void
+	param		red		Half16NV in value
+	param		green		Half16NV in value
+	param		blue		Half16NV in value
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+SecondaryColor3hvNV(v)
+	return		void
+	param		v		Half16NV in array [3]
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexWeighthNV(weight)
+	return		void
+	param		weight		Half16NV in value
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexWeighthvNV(weight)
+	return		void
+	param		weight		Half16NV in array [1]
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttrib1hNV(index, x)
+	return		void
+	param		index		UInt32 in value
+	param		x		Half16NV in value
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttrib1hvNV(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Half16NV in array [1]
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttrib2hNV(index, x, y)
+	return		void
+	param		index		UInt32 in value
+	param		x		Half16NV in value
+	param		y		Half16NV in value
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttrib2hvNV(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Half16NV in array [2]
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttrib3hNV(index, x, y, z)
+	return		void
+	param		index		UInt32 in value
+	param		x		Half16NV in value
+	param		y		Half16NV in value
+	param		z		Half16NV in value
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttrib3hvNV(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Half16NV in array [3]
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttrib4hNV(index, x, y, z, w)
+	return		void
+	param		index		UInt32 in value
+	param		x		Half16NV in value
+	param		y		Half16NV in value
+	param		z		Half16NV in value
+	param		w		Half16NV in value
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttrib4hvNV(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Half16NV in array [4]
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribs1hvNV(index, n, v)
+	return		void
+	param		index		UInt32 in value
+	param		n		SizeI in value
+	param		v		Half16NV in array [n]
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribs2hvNV(index, n, v)
+	return		void
+	param		index		UInt32 in value
+	param		n		SizeI in value
+	param		v		Half16NV in array [n]
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribs3hvNV(index, n, v)
+	return		void
+	param		index		UInt32 in value
+	param		n		SizeI in value
+	param		v		Half16NV in array [n]
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribs4hvNV(index, n, v)
+	return		void
+	param		index		UInt32 in value
+	param		n		SizeI in value
+	param		v		Half16NV in array [n]
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #284
+# NV_pixel_data_range commands
+#
+###############################################################################
+
+# @@ Need to verify/add GLX protocol
+
+PixelDataRangeNV(target, length, pointer)
+	return		void
+	param		target		PixelDataRangeTargetNV in value
+	param		length		SizeI in value
+	param		pointer		Void in array [length]
+	category	NV_pixel_data_range
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+FlushPixelDataRangeNV(target)
+	return		void
+	param		target		PixelDataRangeTargetNV in value
+	category	NV_pixel_data_range
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #285
+# NV_primitive_restart commands
+#
+###############################################################################
+
+# @@ Need to verify/add GLX protocol
+
+PrimitiveRestartNV()
+	return		void
+	category	NV_primitive_restart
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+PrimitiveRestartIndexNV(index)
+	return		void
+	param		index		UInt32 in value
+	category	NV_primitive_restart
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+
+###############################################################################
+#
+# Extension #286
+# NV_texture_expand_normal commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_texture_expand_normal
+
+###############################################################################
+#
+# Extension #287
+# NV_vertex_program2 commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_vertex_program2
+
+###############################################################################
+#
+# Extension #288
+# ATI_map_object_buffer commands
+#
+###############################################################################
+
+# @@ Need to verify/add GLX protocol
+
+MapObjectBufferATI(buffer)
+	return		VoidPointer
+	param		buffer		UInt32 in value
+	category	ATI_map_object_buffer
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+UnmapObjectBufferATI(buffer)
+	return		void
+	param		buffer		UInt32 in value
+	category	ATI_map_object_buffer
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #289
+# ATI_separate_stencil commands
+#
+###############################################################################
+
+# @@ Need to verify/add GLX protocol
+
+StencilOpSeparateATI(face, sfail, dpfail, dppass)
+	return		void
+	param		face		StencilFaceDirection in value
+	param		sfail		StencilOp in value
+	param		dpfail		StencilOp in value
+	param		dppass		StencilOp in value
+	category	ATI_separate_stencil
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		StencilOpSeparate
+
+StencilFuncSeparateATI(frontfunc, backfunc, ref, mask)
+	return		void
+	param		frontfunc	StencilFunction in value
+	param		backfunc	StencilFunction in value
+	param		ref		ClampedStencilValue in value
+	param		mask		MaskedStencilValue in value
+	category	ATI_separate_stencil
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		StencilFuncSeparate
+
+###############################################################################
+#
+# Extension #290
+# ATI_vertex_attrib_array_object commands
+#
+###############################################################################
+
+# @@ Need to verify/add GLX protocol
+
+VertexAttribArrayObjectATI(index, size, type, normalized, stride, buffer, offset)
+	return		void
+	param		index		UInt32 in value
+	param		size		Int32 in value
+	param		type		VertexAttribPointerTypeARB in value
+	param		normalized	Boolean in value
+	param		stride		SizeI in value
+	param		buffer		UInt32 in value
+	param		offset		UInt32 in value
+	category	ATI_vertex_attrib_array_object
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetVertexAttribArrayObjectfvATI(index, pname, params)
+	return		void
+	param		index		UInt32 in value
+	param		pname		ArrayObjectPNameATI in value
+	param		params		Float32 out array [pname]
+	category	ATI_vertex_attrib_array_object
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetVertexAttribArrayObjectivATI(index, pname, params)
+	return		void
+	param		index		UInt32 in value
+	param		pname		ArrayObjectPNameATI in value
+	param		params		Int32 out array [pname]
+	category	ATI_vertex_attrib_array_object
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #291 - OpenGL ES only, not in glext.h
+# OES_byte_coordinates commands
+#
+###############################################################################
+
+# void Vertex{234}bOES(T coords)
+# void Vertex{234}bvOES(T *coords)
+# void TexCoord{1234}bOES(T coords)
+# void TexCoord{1234}bvOES(T *coords)
+# void MultiTexCoord{1234}bOES(enum texture, T coords)
+# void MultiTexCoord{1234}bvOES(enum texture, T *coords)
+# All are handcode - mapped to non-byte GLX protocol on client side
+
+# newcategory: OES_byte_coordinates
+
+###############################################################################
+#
+# Extension #292 - OpenGL ES only, not in glext.h
+# OES_fixed_point commands
+#
+###############################################################################
+
+# Too many to list in just a comment - see spec in the extension registry
+# All are handcode - mapped to non-byte GLX protocol on client side
+
+# newcategory: OES_fixed_point
+
+###############################################################################
+#
+# Extension #293 - OpenGL ES only, not in glext.h
+# OES_single_precision commands
+#
+###############################################################################
+
+# void DepthRangefOES(clampf n, clampf f)
+# void FrustumfOES(float l, float r, float b, float t, float n, float f)
+# void OrthofOES(float l, float r, float b, float t, float n, float f)
+# void ClipPlanefOES(enum plane, const float* equation)
+# void glClearDepthfOES(clampd depth)
+# GLX ropcodes 4308-4312 (not respectively, see extension spec)
+# void GetClipPlanefOES(enum plane, float* equation)
+# GLX vendor private 1421
+
+# newcategory: OES_single_precision
+
+###############################################################################
+#
+# Extension #294 - OpenGL ES only, not in glext.h
+# OES_compressed_paletted_texture commands
+#
+###############################################################################
+
+# (none)
+# newcategory: OES_compressed_paletted_texture
+
+###############################################################################
+#
+# Extension #295 - This is an OpenGL ES extension, but also implemented in Mesa
+# OES_read_format commands
+#
+###############################################################################
+
+# (none)
+newcategory: OES_read_format
+
+###############################################################################
+#
+# Extension #296 - OpenGL ES only, not in glext.h
+# OES_query_matrix commands
+#
+###############################################################################
+
+# bitfield queryMatrixxOES(fixed mantissa[16], int exponent[16])
+# All are handcode - mapped to non-byte GLX protocol on client side
+
+# newcategory: OES_query_matrix
+
+###############################################################################
+#
+# Extension #297
+# EXT_depth_bounds_test commands
+#
+###############################################################################
+
+DepthBoundsEXT(zmin, zmax)
+	return		void
+	param		zmin		ClampedFloat64 in value
+	param		zmax		ClampedFloat64 in value
+	category	EXT_depth_bounds_test
+	version		1.2
+	extension
+	glxropcode	4229
+	offset		699
+
+###############################################################################
+#
+# Extension #298
+# EXT_texture_mirror_clamp commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_texture_mirror_clamp
+
+###############################################################################
+#
+# Extension #299
+# EXT_blend_equation_separate commands
+#
+###############################################################################
+
+BlendEquationSeparateEXT(modeRGB, modeAlpha)
+	return		void
+	param		modeRGB		BlendEquationModeEXT in value
+	param		modeAlpha	BlendEquationModeEXT in value
+	category	EXT_blend_equation_separate
+	version		1.2
+	extension
+	glxropcode	4228
+	alias		BlendEquationSeparate
+
+###############################################################################
+#
+# Extension #300
+# MESA_pack_invert commands
+#
+###############################################################################
+
+# (none)
+newcategory: MESA_pack_invert
+
+###############################################################################
+#
+# Extension #301
+# MESA_ycbcr_texture commands
+#
+###############################################################################
+
+# (none)
+newcategory: MESA_ycbcr_texture
+
+###############################################################################
+#
+# Extension #301
+# MESA_ycbcr_texture commands
+#
+###############################################################################
+
+# (none)
+newcategory: MESA_ycbcr_texture
+
+###############################################################################
+#
+# Extension #302
+# EXT_pixel_buffer_object commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_pixel_buffer_object
+
+###############################################################################
+#
+# Extension #303
+# NV_fragment_program_option commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_fragment_program_option
+
+###############################################################################
+#
+# Extension #304
+# NV_fragment_program2 commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_fragment_program2
+
+###############################################################################
+#
+# Extension #305
+# NV_vertex_program2_option commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_vertex_program2_option
+
+###############################################################################
+#
+# Extension #306
+# NV_vertex_program3 commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_vertex_program3
+
+###############################################################################
+#
+# Extension #307 - GLX_SGIX_hyperpipe commands
+# Extension #308 - GLX_MESA_agp_offset commands
+# Extension #309 - GL_EXT_texture_compression_dxt1 (OpenGL ES only, subset of _st3c version)
+#
+###############################################################################
+
+# (none)
+# newcategory: EXT_texture_compression_dxt1
+
+###############################################################################
+#
+# Extension #310
+# EXT_framebuffer_object commands
+#
+###############################################################################
+
+IsRenderbufferEXT(renderbuffer)
+	return		Boolean
+	param		renderbuffer	UInt32 in value
+	category	EXT_framebuffer_object
+	version		1.2
+	extension
+	glxvendorpriv	1422
+	glxflags	ignore
+	alias		IsRenderbuffer
+
+# Not aliased to BindRenderbuffer
+BindRenderbufferEXT(target, renderbuffer)
+	return		void
+	param		target		RenderbufferTarget in value
+	param		renderbuffer	UInt32 in value
+	category	EXT_framebuffer_object
+	version		1.2
+	extension
+	glxropcode	4316
+	glxflags	ignore
+
+DeleteRenderbuffersEXT(n, renderbuffers)
+	return		void
+	param		n		SizeI in value
+	param		renderbuffers	UInt32 in array [n]
+	category	EXT_framebuffer_object
+	version		1.2
+	extension
+	glxropcode	4317
+	glxflags	ignore
+	alias		DeleteRenderbuffers
+
+GenRenderbuffersEXT(n, renderbuffers)
+	return		void
+	param		n		SizeI in value
+	param		renderbuffers	UInt32 out array [n]
+	category	EXT_framebuffer_object
+	version		1.2
+	extension
+	glxvendorpriv	1423
+	glxflags	ignore
+	alias		GenRenderbuffers
+
+RenderbufferStorageEXT(target, internalformat, width, height)
+	return		void
+	param		target		RenderbufferTarget in value
+	param		internalformat	GLenum in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	category	EXT_framebuffer_object
+	version		1.2
+	extension
+	glxropcode	4318
+	glxflags	ignore
+	alias		RenderbufferStorage
+
+GetRenderbufferParameterivEXT(target, pname, params)
+	return		void
+	param		target		RenderbufferTarget in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	EXT_framebuffer_object
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxvendorpriv	1424
+	glxflags	ignore
+	alias		GetRenderbufferParameteriv
+
+IsFramebufferEXT(framebuffer)
+	return		Boolean
+	param		framebuffer	UInt32 in value
+	category	EXT_framebuffer_object
+	version		1.2
+	extension
+	glxvendorpriv	1425
+	glxflags	ignore
+	alias		IsFramebuffer
+
+# Not aliased to BindFramebuffer
+BindFramebufferEXT(target, framebuffer)
+	return		void
+	param		target		FramebufferTarget in value
+	param		framebuffer	UInt32 in value
+	category	EXT_framebuffer_object
+	version		1.2
+	extension
+	glxropcode	4319
+	glxflags	ignore
+
+DeleteFramebuffersEXT(n, framebuffers)
+	return		void
+	param		n		SizeI in value
+	param		framebuffers	UInt32 in array [n]
+	category	EXT_framebuffer_object
+	version		1.2
+	extension
+	glxropcode	4320
+	glxflags	ignore
+	alias		DeleteFramebuffers
+
+GenFramebuffersEXT(n, framebuffers)
+	return		void
+	param		n		SizeI in value
+	param		framebuffers	UInt32 out array [n]
+	category	EXT_framebuffer_object
+	version		1.2
+	extension
+	glxvendorpriv	1426
+	glxflags	ignore
+	alias		GenFramebuffers
+
+CheckFramebufferStatusEXT(target)
+	return		GLenum
+	param		target		FramebufferTarget in value
+	category	EXT_framebuffer_object
+	version		1.2
+	extension
+	glxvendorpriv	1427
+	glxflags	ignore
+	alias		CheckFramebufferStatus
+
+FramebufferTexture1DEXT(target, attachment, textarget, texture, level)
+	return		void
+	param		target		FramebufferTarget in value
+	param		attachment	FramebufferAttachment in value
+	param		textarget	GLenum in value
+	param		texture		UInt32 in value
+	param		level		Int32 in value
+	category	EXT_framebuffer_object
+	version		1.2
+	extension
+	glxropcode	4321
+	glxflags	ignore
+	alias		FramebufferTexture1D
+
+FramebufferTexture2DEXT(target, attachment, textarget, texture, level)
+	return		void
+	param		target		FramebufferTarget in value
+	param		attachment	FramebufferAttachment in value
+	param		textarget	GLenum in value
+	param		texture		UInt32 in value
+	param		level		Int32 in value
+	category	EXT_framebuffer_object
+	version		1.2
+	extension
+	glxropcode	4322
+	glxflags	ignore
+	alias		FramebufferTexture2D
+
+FramebufferTexture3DEXT(target, attachment, textarget, texture, level, zoffset)
+	return		void
+	param		target		FramebufferTarget in value
+	param		attachment	FramebufferAttachment in value
+	param		textarget	GLenum in value
+	param		texture		UInt32 in value
+	param		level		Int32 in value
+	param		zoffset		Int32 in value
+	category	EXT_framebuffer_object
+	version		1.2
+	extension
+	glxropcode	4323
+	glxflags	ignore
+	alias		FramebufferTexture3D
+
+FramebufferRenderbufferEXT(target, attachment, renderbuffertarget, renderbuffer)
+	return		void
+	param		target		FramebufferTarget in value
+	param		attachment	FramebufferAttachment in value
+	param		renderbuffertarget	RenderbufferTarget in value
+	param		renderbuffer	UInt32 in value
+	category	EXT_framebuffer_object
+	version		1.2
+	extension
+	glxropcode	4324
+	glxflags	ignore
+	alias		FramebufferRenderbuffer
+
+GetFramebufferAttachmentParameterivEXT(target, attachment, pname, params)
+	return		void
+	param		target		FramebufferTarget in value
+	param		attachment	FramebufferAttachment in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	EXT_framebuffer_object
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxvendorpriv	1428
+	glxflags	ignore
+	alias		GetFramebufferAttachmentParameteriv
+
+GenerateMipmapEXT(target)
+	return		void
+	param		target		GLenum in value
+	category	EXT_framebuffer_object
+	version		1.2
+	extension
+	glxropcode	4325
+	glxflags	ignore
+	alias		GenerateMipmap
+
+
+###############################################################################
+#
+# Extension #311
+# GREMEDY_string_marker commands
+#
+###############################################################################
+
+StringMarkerGREMEDY(len, string)
+	return		void
+	param		len		SizeI in value
+	param		string		Void in array [len]
+	category	GREMEDY_string_marker
+	version		1.0
+	extension
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #312
+# EXT_packed_depth_stencil commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_packed_depth_stencil
+
+###############################################################################
+#
+# Extension #313 - WGL_3DL_stereo_control
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #314
+# EXT_stencil_clear_tag commands
+#
+###############################################################################
+
+StencilClearTagEXT(stencilTagBits, stencilClearTag)
+	return		void
+	param		stencilTagBits	SizeI in value
+	param		stencilClearTag UInt32 in value
+	category	EXT_stencil_clear_tag
+	version		1.5
+	extension
+	glxropcode	4223
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #315
+# EXT_texture_sRGB commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_texture_sRGB
+
+###############################################################################
+#
+# Extension #316
+# EXT_framebuffer_blit commands
+#
+###############################################################################
+
+BlitFramebufferEXT(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter)
+	return		void
+	param		srcX0		Int32 in value
+	param		srcY0		Int32 in value
+	param		srcX1		Int32 in value
+	param		srcY1		Int32 in value
+	param		dstX0		Int32 in value
+	param		dstY0		Int32 in value
+	param		dstX1		Int32 in value
+	param		dstY1		Int32 in value
+	param		mask		ClearBufferMask in value
+	param		filter		GLenum in value
+	category	EXT_framebuffer_blit
+	version		1.5
+	glxropcode	4330
+	alias		BlitFramebuffer
+
+###############################################################################
+#
+# Extension #317
+# EXT_framebuffer_multisample commands
+#
+###############################################################################
+
+RenderbufferStorageMultisampleEXT(target, samples, internalformat, width, height)
+	return		void
+	param		target		GLenum in value
+	param		samples		SizeI in value
+	param		internalformat	GLenum in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	category	EXT_framebuffer_multisample
+	version		1.5
+	glxropcode	4331
+	alias		RenderbufferStorageMultisample
+
+###############################################################################
+#
+# Extension #318
+# MESAX_texture_stack commands
+#
+###############################################################################
+
+# (none)
+newcategory: MESAX_texture_stack
+
+###############################################################################
+#
+# Extension #319
+# EXT_timer_query commands
+#
+###############################################################################
+
+GetQueryObjecti64vEXT(id, pname, params)
+	return		void
+	param		id		UInt32 in value
+	param		pname		GLenum in value
+	param		params		Int64EXT out array [pname]
+	category	EXT_timer_query
+	dlflags		notlistable
+	version		1.5
+	glxvendorpriv	1328
+	glxflags	ignore
+	offset		?
+
+GetQueryObjectui64vEXT(id, pname, params)
+	return		void
+	param		id		UInt32 in value
+	param		pname		GLenum in value
+	param		params		UInt64EXT out array [pname]
+	category	EXT_timer_query
+	dlflags		notlistable
+	version		1.5
+	glxvendorpriv	1329
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #320
+# EXT_gpu_program_parameters commands
+#
+###############################################################################
+
+ProgramEnvParameters4fvEXT(target, index, count, params)
+	return		void
+	param		target		ProgramTargetARB in value
+	param		index		UInt32 in value
+	param		count		SizeI in value
+	param		params		Float32 in array [count*4]
+	category	EXT_gpu_program_parameters
+	version		1.2
+	glxropcode	4281
+	offset		?
+
+ProgramLocalParameters4fvEXT(target, index, count, params)
+	return		void
+	param		target		ProgramTargetARB in value
+	param		index		UInt32 in value
+	param		count		SizeI in value
+	param		params		Float32 in array [count*4]
+	category	EXT_gpu_program_parameters
+	version		1.2
+	glxropcode	4282
+	offset		?
+
+###############################################################################
+#
+# Extension #321
+# APPLE_flush_buffer_range commands
+#
+###############################################################################
+
+BufferParameteriAPPLE(target, pname, param)
+	return		void
+	param		target		GLenum in value
+	param		pname		GLenum in value
+	param		param		Int32 in value
+	category	APPLE_flush_buffer_range
+	version		1.5
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+FlushMappedBufferRangeAPPLE(target, offset, size)
+	return		void
+	param		target		GLenum in value
+	param		offset		BufferOffset in value
+	param		size		BufferSize in value
+	category	APPLE_flush_buffer_range
+	version		1.5
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		FlushMappedBufferRange
+
+###############################################################################
+#
+# Extension #322
+# NV_gpu_program4 commands
+#
+###############################################################################
+
+ProgramLocalParameterI4iNV(target, index, x, y, z, w)
+	return		void
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		x		Int32 in value
+	param		y		Int32 in value
+	param		z		Int32 in value
+	param		w		Int32 in value
+	category	NV_gpu_program4
+	version		1.3
+	vectorequiv	ProgramLocalParameterI4ivNV
+	glxvectorequiv	ProgramLocalParameterI4ivNV
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+
+ProgramLocalParameterI4ivNV(target, index, params)
+	return		void
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		params		Int32 in array [4]
+	category	NV_gpu_program4
+	version		1.3
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+
+ProgramLocalParametersI4ivNV(target, index, count, params)
+	return		void
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		count		SizeI in value
+	param		params		Int32 in array [count*4]
+	category	NV_gpu_program4
+	version		1.3
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+
+ProgramLocalParameterI4uiNV(target, index, x, y, z, w)
+	return		void
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		x		UInt32 in value
+	param		y		UInt32 in value
+	param		z		UInt32 in value
+	param		w		UInt32 in value
+	category	NV_gpu_program4
+	version		1.3
+	vectorequiv	ProgramLocalParameterI4uivNV
+	glxvectorequiv	ProgramLocalParameterI4uivNV
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+
+ProgramLocalParameterI4uivNV(target, index, params)
+	return		void
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		params		UInt32 in array [4]
+	category	NV_gpu_program4
+	version		1.3
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+
+ProgramLocalParametersI4uivNV(target, index, count, params)
+	return		void
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		count		SizeI in value
+	param		params		UInt32 in array [count*4]
+	category	NV_gpu_program4
+	version		1.3
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+
+ProgramEnvParameterI4iNV(target, index, x, y, z, w)
+	return		void
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		x		Int32 in value
+	param		y		Int32 in value
+	param		z		Int32 in value
+	param		w		Int32 in value
+	category	NV_gpu_program4
+	version		1.3
+	vectorequiv	ProgramEnvParameterI4ivNV
+	glxvectorequiv	ProgramEnvParameterI4ivNV
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+
+ProgramEnvParameterI4ivNV(target, index, params)
+	return		void
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		params		Int32 in array [4]
+	category	NV_gpu_program4
+	version		1.3
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+
+ProgramEnvParametersI4ivNV(target, index, count, params)
+	return		void
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		count		SizeI in value
+	param		params		Int32 in array [count*4]
+	category	NV_gpu_program4
+	version		1.3
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+
+ProgramEnvParameterI4uiNV(target, index, x, y, z, w)
+	return		void
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		x		UInt32 in value
+	param		y		UInt32 in value
+	param		z		UInt32 in value
+	param		w		UInt32 in value
+	category	NV_gpu_program4
+	version		1.3
+	vectorequiv	ProgramEnvParameterI4uivNV
+	glxvectorequiv	ProgramEnvParameterI4uivNV
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+
+ProgramEnvParameterI4uivNV(target, index, params)
+	return		void
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		params		UInt32 in array [4]
+	category	NV_gpu_program4
+	version		1.3
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+
+ProgramEnvParametersI4uivNV(target, index, count, params)
+	return		void
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		count		SizeI in value
+	param		params		UInt32 in array [count*4]
+	category	NV_gpu_program4
+	version		1.3
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+
+GetProgramLocalParameterIivNV(target, index, params)
+	return		void
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		params		Int32 out array [4]
+	dlflags		notlistable
+	category	NV_gpu_program4
+	version		1.3
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+
+GetProgramLocalParameterIuivNV(target, index, params)
+	return		void
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		params		UInt32 out array [4]
+	dlflags		notlistable
+	category	NV_gpu_program4
+	version		1.3
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+
+GetProgramEnvParameterIivNV(target, index, params)
+	return		void
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		params		Int32 out array [4]
+	dlflags		notlistable
+	category	NV_gpu_program4
+	version		1.3
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+
+GetProgramEnvParameterIuivNV(target, index, params)
+	return		void
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		params		UInt32 out array [4]
+	dlflags		notlistable
+	category	NV_gpu_program4
+	version		1.3
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+
+###############################################################################
+#
+# Extension #323
+# NV_geometry_program4 commands
+#
+###############################################################################
+
+ProgramVertexLimitNV(target, limit)
+	return		void
+	param		target		ProgramTarget in value
+	param		limit		Int32 in value
+	category	NV_geometry_program4
+	version		2.0
+	extension	soft WINSOFT
+	glfflags	ignore
+	glxflags	ignore
+
+FramebufferTextureEXT(target, attachment, texture, level)
+	return		void
+	param		target		FramebufferTarget in value
+	param		attachment	FramebufferAttachment in value
+	param		texture		Texture in value
+	param		level		CheckedInt32 in value
+	category	NV_geometry_program4
+	version		2.0
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+	alias		FramebufferTextureARB
+
+FramebufferTextureLayerEXT(target, attachment, texture, level, layer)
+	return		void
+	param		target		FramebufferTarget in value
+	param		attachment	FramebufferAttachment in value
+	param		texture		Texture in value
+	param		level		CheckedInt32 in value
+	param		layer		CheckedInt32 in value
+	category	NV_geometry_program4
+	version		2.0
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+	alias		FramebufferTextureLayer
+
+FramebufferTextureFaceEXT(target, attachment, texture, level, face)
+	return		void
+	param		target		FramebufferTarget in value
+	param		attachment	FramebufferAttachment in value
+	param		texture		Texture in value
+	param		level		CheckedInt32 in value
+	param		face		TextureTarget in value
+	category	NV_geometry_program4
+	version		2.0
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+	alias		FramebufferTextureFaceARB
+
+###############################################################################
+#
+# Extension #324
+# EXT_geometry_shader4 commands
+#
+###############################################################################
+
+ProgramParameteriEXT(program, pname, value)
+	return		void
+	param		program		UInt32 in value
+	param		pname		ProgramParameterPName in value
+	param		value		Int32 in value
+	category	EXT_geometry_shader4
+	version		2.0
+	extension	soft WINSOFT
+	glfflags	ignore
+	glxflags	ignore
+	alias		ProgramParameteriARB
+
+###############################################################################
+#
+# Extension #325
+# NV_vertex_program4 commands
+#
+###############################################################################
+
+VertexAttribI1iEXT(index, x)
+	return		void
+	param		index		UInt32 in value
+	param		x		Int32 in value
+	category	NV_vertex_program4
+	beginend	allow-inside
+	vectorequiv	VertexAttribI1ivEXT
+	glxvectorequiv	VertexAttribI1ivEXT
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore
+	alias		VertexAttribI1i
+
+VertexAttribI2iEXT(index, x, y)
+	return		void
+	param		index		UInt32 in value
+	param		x		Int32 in value
+	param		y		Int32 in value
+	category	NV_vertex_program4
+	beginend	allow-inside
+	vectorequiv	VertexAttribI2ivEXT
+	glxvectorequiv	VertexAttribI2ivEXT
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore
+	alias		VertexAttribI2i
+
+VertexAttribI3iEXT(index, x, y, z)
+	return		void
+	param		index		UInt32 in value
+	param		x		Int32 in value
+	param		y		Int32 in value
+	param		z		Int32 in value
+	category	NV_vertex_program4
+	beginend	allow-inside
+	vectorequiv	VertexAttribI3ivEXT
+	glxvectorequiv	VertexAttribI3ivEXT
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore
+	alias		VertexAttribI3i
+
+VertexAttribI4iEXT(index, x, y, z, w)
+	return		void
+	param		index		UInt32 in value
+	param		x		Int32 in value
+	param		y		Int32 in value
+	param		z		Int32 in value
+	param		w		Int32 in value
+	category	NV_vertex_program4
+	beginend	allow-inside
+	vectorequiv	VertexAttribI4ivEXT
+	glxvectorequiv	VertexAttribI4ivEXT
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore
+	alias		VertexAttribI4i
+
+VertexAttribI1uiEXT(index, x)
+	return		void
+	param		index		UInt32 in value
+	param		x		UInt32 in value
+	category	NV_vertex_program4
+	beginend	allow-inside
+	vectorequiv	VertexAttribI1uivEXT
+	glxvectorequiv	VertexAttribI1uivEXT
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore
+	alias		VertexAttribI1ui
+
+VertexAttribI2uiEXT(index, x, y)
+	return		void
+	param		index		UInt32 in value
+	param		x		UInt32 in value
+	param		y		UInt32 in value
+	category	NV_vertex_program4
+	beginend	allow-inside
+	vectorequiv	VertexAttribI2uivEXT
+	glxvectorequiv	VertexAttribI2uivEXT
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore
+	alias		VertexAttribI2ui
+
+VertexAttribI3uiEXT(index, x, y, z)
+	return		void
+	param		index		UInt32 in value
+	param		x		UInt32 in value
+	param		y		UInt32 in value
+	param		z		UInt32 in value
+	category	NV_vertex_program4
+	beginend	allow-inside
+	vectorequiv	VertexAttribI3uivEXT
+	glxvectorequiv	VertexAttribI3uivEXT
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore
+	alias		VertexAttribI3ui
+
+VertexAttribI4uiEXT(index, x, y, z, w)
+	return		void
+	param		index		UInt32 in value
+	param		x		UInt32 in value
+	param		y		UInt32 in value
+	param		z		UInt32 in value
+	param		w		UInt32 in value
+	category	NV_vertex_program4
+	beginend	allow-inside
+	vectorequiv	VertexAttribI4uivEXT
+	glxvectorequiv	VertexAttribI4uivEXT
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore
+	alias		VertexAttribI4ui
+
+VertexAttribI1ivEXT(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int32 in array [1]
+	category	NV_vertex_program4
+	beginend	allow-inside
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore
+	alias		VertexAttribI1iv
+
+VertexAttribI2ivEXT(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int32 in array [2]
+	category	NV_vertex_program4
+	beginend	allow-inside
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore
+	alias		VertexAttribI2iv
+
+VertexAttribI3ivEXT(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int32 in array [3]
+	category	NV_vertex_program4
+	beginend	allow-inside
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore
+	alias		VertexAttribI3iv
+
+VertexAttribI4ivEXT(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int32 in array [4]
+	category	NV_vertex_program4
+	beginend	allow-inside
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore
+	alias		VertexAttribI4iv
+
+VertexAttribI1uivEXT(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt32 in array [1]
+	category	NV_vertex_program4
+	beginend	allow-inside
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore
+	alias		VertexAttribI1uiv
+
+VertexAttribI2uivEXT(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt32 in array [2]
+	category	NV_vertex_program4
+	beginend	allow-inside
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore
+	alias		VertexAttribI2uiv
+
+VertexAttribI3uivEXT(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt32 in array [3]
+	category	NV_vertex_program4
+	beginend	allow-inside
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore
+	alias		VertexAttribI3uiv
+
+VertexAttribI4uivEXT(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt32 in array [4]
+	category	NV_vertex_program4
+	beginend	allow-inside
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore
+	alias		VertexAttribI4uiv
+
+VertexAttribI4bvEXT(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int8 in array [4]
+	category	NV_vertex_program4
+	beginend	allow-inside
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore
+	alias		VertexAttribI4bv
+
+VertexAttribI4svEXT(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int16 in array [4]
+	category	NV_vertex_program4
+	beginend	allow-inside
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore
+	alias		VertexAttribI4sv
+
+VertexAttribI4ubvEXT(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt8 in array [4]
+	category	NV_vertex_program4
+	beginend	allow-inside
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore
+	alias		VertexAttribI4ubv
+
+VertexAttribI4usvEXT(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt16 in array [4]
+	category	NV_vertex_program4
+	beginend	allow-inside
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore
+	alias		VertexAttribI4usv
+
+VertexAttribIPointerEXT(index, size, type, stride, pointer)
+	return		void
+	param		index		UInt32 in value
+	param		size		Int32 in value
+	param		type		VertexAttribEnum in value
+	param		stride		SizeI in value
+	param		pointer		Void in array [COMPSIZE(size/type/stride)] retained
+	category	NV_vertex_program4
+	dlflags		notlistable
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore
+	alias		VertexAttribIPointer
+
+GetVertexAttribIivEXT(index, pname, params)
+	return		void
+	param		index		UInt32 in value
+	param		pname		VertexAttribEnum in value
+	param		params		Int32 out array [1]
+	category	NV_vertex_program4
+	dlflags		notlistable
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore
+	alias		GetVertexAttribIiv
+
+GetVertexAttribIuivEXT(index, pname, params)
+	return		void
+	param		index		UInt32 in value
+	param		pname		VertexAttribEnum in value
+	param		params		UInt32 out array [1]
+	category	NV_vertex_program4
+	dlflags		notlistable
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore
+	alias		GetVertexAttribIuiv
+
+###############################################################################
+#
+# Extension #326
+# EXT_gpu_shader4 commands
+#
+###############################################################################
+
+GetUniformuivEXT(program, location, params)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		params		UInt32 out array [COMPSIZE(program/location)]
+	category	EXT_gpu_shader4
+	dlflags		notlistable
+	version		2.0
+	extension	soft WINSOFT
+	glfflags	ignore
+	glxflags	ignore
+	alias		GetUniformuiv
+
+BindFragDataLocationEXT(program, color, name)
+	return		void
+	param		program		UInt32 in value
+	param		color		UInt32 in value
+	param		name		Char in array [COMPSIZE(name)]
+	category	EXT_gpu_shader4
+	dlflags		notlistable
+	version		2.0
+	extension	soft WINSOFT
+	glfflags	ignore
+	glxflags	ignore
+	alias		BindFragDataLocation
+
+GetFragDataLocationEXT(program, name)
+	return		Int32
+	param		program		UInt32 in value
+	param		name		Char in array [COMPSIZE(name)]
+	category	EXT_gpu_shader4
+	dlflags		notlistable
+	version		2.0
+	extension	soft WINSOFT
+	glfflags	ignore
+	glxflags	ignore
+	alias		GetFragDataLocation
+
+Uniform1uiEXT(location, v0)
+	return		void
+	param		location	Int32 in value
+	param		v0		UInt32 in value
+	category	EXT_gpu_shader4
+	version		2.0
+	extension	soft WINSOFT
+	glfflags	ignore
+	glxflags	ignore
+	alias		Uniform1ui
+
+Uniform2uiEXT(location, v0, v1)
+	return		void
+	param		location	Int32 in value
+	param		v0		UInt32 in value
+	param		v1		UInt32 in value
+	category	EXT_gpu_shader4
+	version		2.0
+	extension	soft WINSOFT
+	glfflags	ignore
+	glxflags	ignore
+	alias		Uniform2ui
+
+Uniform3uiEXT(location, v0, v1, v2)
+	return		void
+	param		location	Int32 in value
+	param		v0		UInt32 in value
+	param		v1		UInt32 in value
+	param		v2		UInt32 in value
+	category	EXT_gpu_shader4
+	version		2.0
+	extension	soft WINSOFT
+	glfflags	ignore
+	glxflags	ignore
+	alias		Uniform3ui
+
+Uniform4uiEXT(location, v0, v1, v2, v3)
+	return		void
+	param		location	Int32 in value
+	param		v0		UInt32 in value
+	param		v1		UInt32 in value
+	param		v2		UInt32 in value
+	param		v3		UInt32 in value
+	category	EXT_gpu_shader4
+	version		2.0
+	extension	soft WINSOFT
+	glfflags	ignore
+	glxflags	ignore
+	alias		Uniform4ui
+
+Uniform1uivEXT(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt32 in array [count]
+	category	EXT_gpu_shader4
+	version		2.0
+	extension	soft WINSOFT
+	glfflags	ignore
+	glxflags	ignore
+	alias		Uniform1uiv
+
+Uniform2uivEXT(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt32 in array [count*2]
+	category	EXT_gpu_shader4
+	version		2.0
+	extension	soft WINSOFT
+	glfflags	ignore
+	glxflags	ignore
+	alias		Uniform2uiv
+
+Uniform3uivEXT(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt32 in array [count*3]
+	category	EXT_gpu_shader4
+	version		2.0
+	extension	soft WINSOFT
+	glfflags	ignore
+	glxflags	ignore
+	alias		Uniform3uiv
+
+Uniform4uivEXT(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt32 in array [count*4]
+	category	EXT_gpu_shader4
+	version		2.0
+	extension	soft WINSOFT
+	glfflags	ignore
+	glxflags	ignore
+	alias		Uniform4uiv
+
+###############################################################################
+#
+# Extension #327
+# EXT_draw_instanced commands
+#
+###############################################################################
+
+DrawArraysInstancedEXT(mode, start, count, primcount)
+	return		void
+	param		mode		BeginMode in value
+	param		start		Int32 in value
+	param		count		SizeI in value
+	param		primcount	SizeI in value
+	category	EXT_draw_instanced
+	version		2.0
+	extension	soft WINSOFT
+	dlflags		notlistable
+	vectorequiv	ArrayElement
+	glfflags	ignore
+	glxflags	ignore
+	alias		DrawArraysInstancedARB
+
+DrawElementsInstancedEXT(mode, count, type, indices, primcount)
+	return		void
+	param		mode		BeginMode in value
+	param		count		SizeI in value
+	param		type		DrawElementsType in value
+	param		indices		Void in array [COMPSIZE(count/type)]
+	param		primcount	SizeI in value
+	category	EXT_draw_instanced
+	version		2.0
+	extension	soft WINSOFT
+	dlflags		notlistable
+	vectorequiv	ArrayElement
+	glfflags	ignore
+	glxflags	ignore
+	alias		DrawElementsInstancedARB
+
+###############################################################################
+#
+# Extension #328
+# EXT_packed_float commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_packed_float
+
+###############################################################################
+#
+# Extension #329
+# EXT_texture_array commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_texture_array
+
+###############################################################################
+#
+# Extension #330
+# EXT_texture_buffer_object commands
+#
+###############################################################################
+
+TexBufferEXT(target, internalformat, buffer)
+	return		void
+	param		target		TextureTarget in value
+	param		internalformat	GLenum in value
+	param		buffer		UInt32 in value
+	category	EXT_texture_buffer_object
+	version		2.0
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+	alias		TexBufferARB
+
+###############################################################################
+#
+# Extension #331
+# EXT_texture_compression_latc commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_texture_compression_latc
+
+###############################################################################
+#
+# Extension #332
+# EXT_texture_compression_rgtc commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_texture_compression_rgtc
+
+###############################################################################
+#
+# Extension #333
+# EXT_texture_shared_exponent commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_texture_shared_exponent
+
+###############################################################################
+#
+# Extension #334
+# NV_depth_buffer_float commands
+#
+###############################################################################
+
+DepthRangedNV(zNear, zFar)
+	return		void
+	param		zNear		Float64 in value
+	param		zFar		Float64 in value
+	category	NV_depth_buffer_float
+	extension	soft WINSOFT NV50
+	version		2.0
+	glfflags	ignore
+	glxflags	ignore
+
+ClearDepthdNV(depth)
+	return		void
+	param		depth		Float64 in value
+	category	NV_depth_buffer_float
+	extension	soft WINSOFT NV50
+	version		2.0
+	glfflags	ignore
+	glxflags	ignore
+
+DepthBoundsdNV(zmin, zmax)
+	return		void
+	param		zmin		Float64 in value
+	param		zmax		Float64 in value
+	category	NV_depth_buffer_float
+	extension	soft WINSOFT NV50
+	version		2.0
+	glfflags	ignore
+	glxflags	ignore
+
+###############################################################################
+#
+# Extension #335
+# NV_fragment_program4 commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_fragment_program4
+
+###############################################################################
+#
+# Extension #336
+# NV_framebuffer_multisample_coverage commands
+#
+###############################################################################
+
+RenderbufferStorageMultisampleCoverageNV(target, coverageSamples, colorSamples, internalformat, width, height)
+	return		void
+	param		target		RenderbufferTarget in value
+	param		coverageSamples SizeI in value
+	param		colorSamples	SizeI in value
+	param		internalformat	PixelInternalFormat in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	category	NV_framebuffer_multisample_coverage
+	version		1.5
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+
+###############################################################################
+#
+# Extension #337
+# EXT_framebuffer_sRGB commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_framebuffer_sRGB
+
+###############################################################################
+#
+# Extension #338
+# NV_geometry_shader4 commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_geometry_shader4
+
+###############################################################################
+#
+# Extension #339
+# NV_parameter_buffer_object commands
+#
+###############################################################################
+
+ProgramBufferParametersfvNV(target, buffer, index, count, params)
+	return		void
+	param		target		ProgramTarget in value
+	param		buffer		UInt32 in value
+	param		index		UInt32 in value
+	param		count		SizeI in value
+	param		params		Float32 in array [count]
+	category	NV_parameter_buffer_object
+	version		1.2
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+
+ProgramBufferParametersIivNV(target, buffer, index, count, params)
+	return		void
+	param		target		ProgramTarget in value
+	param		buffer		UInt32 in value
+	param		index		UInt32 in value
+	param		count		SizeI in value
+	param		params		Int32 in array [count]
+	category	NV_parameter_buffer_object
+	version		1.2
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+
+ProgramBufferParametersIuivNV(target, buffer, index, count, params)
+	return		void
+	param		target		ProgramTarget in value
+	param		buffer		UInt32 in value
+	param		index		UInt32 in value
+	param		count		SizeI in value
+	param		params		UInt32 in array [count]
+	category	NV_parameter_buffer_object
+	version		1.2
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+
+###############################################################################
+#
+# Extension #340
+# EXT_draw_buffers2 commands
+#
+###############################################################################
+
+ColorMaskIndexedEXT(index, r, g, b, a)
+	return		void
+	param		index		UInt32 in value
+	param		r		Boolean in value
+	param		g		Boolean in value
+	param		b		Boolean in value
+	param		a		Boolean in value
+	category	EXT_draw_buffers2
+	version		2.0
+	glxflags	ignore
+	glfflags	ignore
+	extension	soft WINSOFT
+	alias		ColorMaski
+
+GetBooleanIndexedvEXT(target, index, data)
+	return		void
+	param		target		GLenum in value
+	param		index		UInt32 in value
+	param		data		Boolean out array [COMPSIZE(target)]
+	category	EXT_draw_buffers2
+	version		2.0
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+	extension	soft WINSOFT
+	alias		GetBooleani_v
+
+GetIntegerIndexedvEXT(target, index, data)
+	return		void
+	param		target		GLenum in value
+	param		index		UInt32 in value
+	param		data		Int32 out array [COMPSIZE(target)]
+	category	EXT_draw_buffers2
+	version		2.0
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+	extension	soft WINSOFT
+	alias		GetIntegeri_v
+
+EnableIndexedEXT(target, index)
+	return		void
+	param		target		GLenum in value
+	param		index		UInt32 in value
+	category	EXT_draw_buffers2
+	version		2.0
+	glxflags	ignore
+	glfflags	ignore
+	extension	soft WINSOFT
+	alias		Enablei
+
+DisableIndexedEXT(target, index)
+	return		void
+	param		target		GLenum in value
+	param		index		UInt32 in value
+	category	EXT_draw_buffers2
+	version		2.0
+	glxflags	ignore
+	glfflags	ignore
+	extension	soft WINSOFT
+	alias		Disablei
+
+IsEnabledIndexedEXT(target, index)
+	return		Boolean
+	param		target		GLenum in value
+	param		index		UInt32 in value
+	category	EXT_draw_buffers2
+	version		2.0
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+	extension	soft WINSOFT
+	alias		IsEnabledi
+
+###############################################################################
+#
+# Extension #341
+# NV_transform_feedback commands
+#
+###############################################################################
+
+BeginTransformFeedbackNV(primitiveMode)
+	return		void
+	param		primitiveMode	GLenum in value
+	category	NV_transform_feedback
+	version		1.5
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+	extension	soft WINSOFT
+	alias		BeginTransformFeedback
+
+EndTransformFeedbackNV()
+	return		void
+	category	NV_transform_feedback
+	version		1.5
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+	extension	soft WINSOFT
+	alias		EndTransformFeedback
+
+TransformFeedbackAttribsNV(count, attribs, bufferMode)
+	return		void
+	param		count		UInt32 in value
+	param		attribs		Int32 in array [COMPSIZE(count)]
+	param		bufferMode	GLenum in value
+	category	NV_transform_feedback
+	version		1.5
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+	extension	soft WINSOFT
+
+BindBufferRangeNV(target, index, buffer, offset, size)
+	return		void
+	param		target		GLenum in value
+	param		index		UInt32 in value
+	param		buffer		UInt32 in value
+	param		offset		BufferOffset in value
+	param		size		BufferSize in value
+	category	NV_transform_feedback
+	version		1.5
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+	extension	soft WINSOFT
+	alias		BindBufferRange
+
+BindBufferOffsetNV(target, index, buffer, offset)
+	return		void
+	param		target		GLenum in value
+	param		index		UInt32 in value
+	param		buffer		UInt32 in value
+	param		offset		BufferOffset in value
+	category	NV_transform_feedback
+	version		1.5
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+	extension	soft WINSOFT
+	alias		BindBufferOffsetEXT
+
+BindBufferBaseNV(target, index, buffer)
+	return		void
+	param		target		GLenum in value
+	param		index		UInt32 in value
+	param		buffer		UInt32 in value
+	category	NV_transform_feedback
+	version		1.5
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+	extension	soft WINSOFT
+	alias		BindBufferBase
+
+TransformFeedbackVaryingsNV(program, count, locations, bufferMode)
+	return		void
+	param		program		UInt32 in value
+	param		count		SizeI in value
+	param		locations	Int32 in array [count]
+	param		bufferMode	GLenum in value
+	category	NV_transform_feedback
+	version		1.5
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+	extension	soft WINSOFT
+	alias		TransformFeedbackVaryings
+
+ActiveVaryingNV(program, name)
+	return		void
+	param		program		UInt32 in value
+	param		name		Char in array [COMPSIZE(name)]
+	category	NV_transform_feedback
+	version		1.5
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+	extension	soft WINSOFT
+
+GetVaryingLocationNV(program, name)
+	return		Int32
+	param		program		UInt32 in value
+	param		name		Char in array [COMPSIZE(name)]
+	category	NV_transform_feedback
+	dlflags		notlistable
+	version		1.5
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+
+GetActiveVaryingNV(program, index, bufSize, length, size, type, name)
+	return		void
+	param		program		UInt32 in value
+	param		index		UInt32 in value
+	param		bufSize		SizeI in value
+	param		length		SizeI out array [1]
+	param		size		SizeI out array [1]
+	param		type		GLenum out array [1]
+	param		name		Char out array [COMPSIZE(program/index/bufSize)]
+	category	NV_transform_feedback
+	dlflags		notlistable
+	version		1.5
+	extension	soft WINSOFT
+	glfflags	ignore
+	glxflags	ignore
+
+GetTransformFeedbackVaryingNV(program, index, location)
+	return		void
+	param		program		UInt32 in value
+	param		index		UInt32 in value
+	param		location	Int32 out array [1]
+	category	NV_transform_feedback
+	dlflags		notlistable
+	version		1.5
+	extension	soft WINSOFT
+	glfflags	ignore
+	glxflags	ignore
+	alias		GetTransformFeedbackVarying
+
+# These commands require ARB_transform_feedback3
+
+TransformFeedbackStreamAttribsNV(count, attribs, nbuffers, bufstreams, bufferMode)
+	return		void
+	param		count		SizeI in value
+	param		attribs		Int32 in array [count]
+	param		nbuffers	SizeI in value
+	param		bufstreams	Int32 in array [nbuffers]
+	param		bufferMode	GLenum in value
+	category	NV_transform_feedback
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+
+###############################################################################
+#
+# Extension #342
+# EXT_bindable_uniform commands
+#
+###############################################################################
+
+UniformBufferEXT(program, location, buffer)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		buffer		UInt32 in value
+	category	EXT_bindable_uniform
+	version		2.0
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+
+GetUniformBufferSizeEXT(program, location)
+	return		Int32
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	category	EXT_bindable_uniform
+	dlflags		notlistable
+	version		2.0
+	extension	soft WINSOFT
+	glfflags	ignore
+	glxflags	ignore
+
+GetUniformOffsetEXT(program, location)
+	return		BufferOffset
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	category	EXT_bindable_uniform
+	dlflags		notlistable
+	version		2.0
+	extension	soft WINSOFT
+	glfflags	ignore
+	glxflags	ignore
+
+###############################################################################
+#
+# Extension #343
+# EXT_texture_integer extension commands
+#
+###############################################################################
+
+TexParameterIivEXT(target, pname, params)
+	return		void
+	param		target		TextureTarget in value
+	param		pname		TextureParameterName in value
+	param		params		Int32 in array [COMPSIZE(pname)]
+	category	EXT_texture_integer
+	version		2.0
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+	alias		TexParameterIiv
+
+TexParameterIuivEXT(target, pname, params)
+	return		void
+	param		target		TextureTarget in value
+	param		pname		TextureParameterName in value
+	param		params		UInt32 in array [COMPSIZE(pname)]
+	category	EXT_texture_integer
+	version		2.0
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+	alias		TexParameterIuiv
+
+GetTexParameterIivEXT(target, pname, params)
+	return		void
+	param		target		TextureTarget in value
+	param		pname		GetTextureParameter in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	EXT_texture_integer
+	dlflags		notlistable
+	version		1.0
+	version		2.0
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+	alias		GetTexParameterIiv
+
+GetTexParameterIuivEXT(target, pname, params)
+	return		void
+	param		target		TextureTarget in value
+	param		pname		GetTextureParameter in value
+	param		params		UInt32 out array [COMPSIZE(pname)]
+	category	EXT_texture_integer
+	dlflags		notlistable
+	version		1.0
+	version		2.0
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+	alias		GetTexParameterIuiv
+
+ClearColorIiEXT(red, green, blue, alpha)
+	return		void
+	param		red		Int32 in value
+	param		green		Int32 in value
+	param		blue		Int32 in value
+	param		alpha		Int32 in value
+	category	EXT_texture_integer
+	version		2.0
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+
+ClearColorIuiEXT(red, green, blue, alpha)
+	return		void
+	param		red		UInt32 in value
+	param		green		UInt32 in value
+	param		blue		UInt32 in value
+	param		alpha		UInt32 in value
+	category	EXT_texture_integer
+	version		2.0
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+
+###############################################################################
+#
+# Extension #344 - GLX_EXT_texture_from_pixmap
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #345
+# GREMEDY_frame_terminator commands
+#
+###############################################################################
+
+FrameTerminatorGREMEDY()
+	return		void
+	category	GREMEDY_frame_terminator
+	version		1.0
+	extension
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #346
+# NV_conditional_render commands
+#
+###############################################################################
+
+BeginConditionalRenderNV(id, mode)
+	return		void
+	param		id		UInt32 in value
+	param		mode		TypeEnum in value
+	category	NV_conditional_render
+	glfflags	ignore
+	glxflags	ignore
+	alias		BeginConditionalRender
+
+EndConditionalRenderNV()
+	return		void
+	category	NV_conditional_render
+	glfflags	ignore
+	glxflags	ignore
+	alias		EndConditionalRender
+
+###############################################################################
+#
+# Extension #347
+# NV_present_video commands
+#
+###############################################################################
+
+# TBD
+#    void PresentFrameKeyedNV(uint video_slot, uint64EXT minPresentTime,
+#			      uint beginPresentTimeId, uint
+#			      presentDurationId, enum type, enum target0,
+#			      uint fill0, uint key0, enum target1, uint
+#			      fill1, uint key1);
+#
+#    void PresentFrameDualFillNV(uint video_slot, uint64EXT
+#				 minPresentTime, uint beginPresentTimeId,
+#				 uint presentDurationId, enum type, enum
+#				 target0, uint fill0, enum target1, uint
+#				 fill1, enum target2, uint fill2, enum
+#				 target3, uint fill3);
+#
+#    void GetVideoivNV(uint video_slot, enum pname, int *params);
+#    void GetVideouivNV(uint video_slot, enum pname, uint *params);
+#    void GetVideoi64vNV(uint video_slot, enum pname, int64EXT *params);
+#    void GetVideoui64vNV(uint video_slot, enum pname, uint64EXT *params);
+#    void VideoParameterivNV(uint video_slot, enum pname, const int *params);
+
+PresentFrameKeyedNV(video_slot, minPresentTime, beginPresentTimeId, presentDurationId, type, target0, fill0, key0, target1, fill1, key1)
+	return		void
+	param		video_slot	UInt32 in value
+	param		minPresentTime	UInt64EXT in value
+	param		beginPresentTimeId	UInt32 in value
+	param		presentDurationId	UInt32 in value
+	param		type		GLenum in value
+	param		target0		GLenum in value
+	param		fill0		UInt32 in value
+	param		key0		UInt32 in value
+	param		target1		GLenum in value
+	param		fill1		UInt32 in value
+	param		key1		UInt32 in value
+	category	NV_present_video
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+PresentFrameDualFillNV(video_slot, minPresentTime, beginPresentTimeId, presentDurationId, type, target0, fill0, target1, fill1, target2, fill2, target3, fill3)
+	return		void
+	param		video_slot	UInt32 in value
+	param		minPresentTime	UInt64EXT in value
+	param		beginPresentTimeId	UInt32 in value
+	param		presentDurationId	UInt32 in value
+	param		type		GLenum in value
+	param		target0		GLenum in value
+	param		fill0		UInt32 in value
+	param		target1		GLenum in value
+	param		fill1		UInt32 in value
+	param		target2		GLenum in value
+	param		fill2		UInt32 in value
+	param		target3		GLenum in value
+	param		fill3		UInt32 in value
+	category	NV_present_video
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetVideoivNV(video_slot, pname, params)
+	return		void
+	param		video_slot	UInt32 in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	NV_present_video
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetVideouivNV(video_slot, pname, params)
+	return		void
+	param		video_slot	UInt32 in value
+	param		pname		GLenum in value
+	param		params		UInt32 out array [COMPSIZE(pname)]
+	category	NV_present_video
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetVideoi64vNV(video_slot, pname, params)
+	return		void
+	param		video_slot	UInt32 in value
+	param		pname		GLenum in value
+	param		params		Int64EXT out array [COMPSIZE(pname)]
+	category	NV_present_video
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetVideoui64vNV(video_slot, pname, params)
+	return		void
+	param		video_slot	UInt32 in value
+	param		pname		GLenum in value
+	param		params		UInt64EXT out array [COMPSIZE(pname)]
+	category	NV_present_video
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #348 - GLX_NV_video_out
+# Extension #349 - WGL_NV_video_out
+# Extension #350 - GLX_NV_swap_group
+# Extension #351 - WGL_NV_swap_group
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #352
+# EXT_transform_feedback commands
+#
+###############################################################################
+
+# From EXT_draw_buffers2:  GetBooleanIndexedvEXT / GetIntegerIndexedvEXT
+
+BeginTransformFeedbackEXT(primitiveMode)
+	return		void
+	param		primitiveMode	GLenum in value
+	category	EXT_transform_feedback
+	version		2.0
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+	extension	soft WINSOFT
+	alias		BeginTransformFeedback
+
+EndTransformFeedbackEXT()
+	return		void
+	category	EXT_transform_feedback
+	version		2.0
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+	extension	soft WINSOFT
+	alias		EndTransformFeedback
+
+BindBufferRangeEXT(target, index, buffer, offset, size)
+	return		void
+	param		target		GLenum in value
+	param		index		UInt32 in value
+	param		buffer		UInt32 in value
+	param		offset		BufferOffset in value
+	param		size		BufferSize in value
+	category	EXT_transform_feedback
+	version		2.0
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+	extension	soft WINSOFT
+	alias		BindBufferRange
+
+# Not promoted to the OpenGL 3.0 core
+BindBufferOffsetEXT(target, index, buffer, offset)
+	return		void
+	param		target		GLenum in value
+	param		index		UInt32 in value
+	param		buffer		UInt32 in value
+	param		offset		BufferOffset in value
+	category	EXT_transform_feedback
+	version		2.0
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+	extension	soft WINSOFT
+
+BindBufferBaseEXT(target, index, buffer)
+	return		void
+	param		target		GLenum in value
+	param		index		UInt32 in value
+	param		buffer		UInt32 in value
+	category	EXT_transform_feedback
+	version		2.0
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+	extension	soft WINSOFT
+	alias		BindBufferBase
+
+TransformFeedbackVaryingsEXT(program, count, varyings, bufferMode)
+	return		void
+	param		program		UInt32 in value
+	param		count		SizeI in value
+	param		varyings	CharPointer in array [count]
+	param		bufferMode	GLenum in value
+	category	EXT_transform_feedback
+	version		2.0
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+	extension	soft WINSOFT
+	alias		TransformFeedbackVaryings
+
+GetTransformFeedbackVaryingEXT(program, index, bufSize, length, size, type, name)
+	return		void
+	param		program		UInt32 in value
+	param		index		UInt32 in value
+	param		bufSize		SizeI in value
+	param		length		SizeI out array [1]
+	param		size		SizeI out array [1]
+	param		type		GLenum out array [1]
+	param		name		Char out array [COMPSIZE(length)]
+	category	EXT_transform_feedback
+	dlflags		notlistable
+	version		2.0
+	extension	soft WINSOFT
+	glfflags	ignore
+	glxflags	ignore
+	alias		GetTransformFeedbackVarying
+
+###############################################################################
+#
+# Extension #353
+# EXT_direct_state_access commands
+#
+###############################################################################
+
+# New 1.1 client commands
+
+ClientAttribDefaultEXT(mask)
+	return		void
+	param		mask		ClientAttribMask in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glxflags	ignore ### client-handcode client-intercept server-handcode
+
+PushClientAttribDefaultEXT(mask)
+	return		void
+	param		mask		ClientAttribMask in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glxflags	ignore ### client-handcode client-intercept server-handcode
+
+# New 1.0 matrix commands
+
+MatrixLoadfEXT(mode, m)
+	return		void
+	param		mode		MatrixMode in value
+	param		m		Float32 in array [16]
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+
+MatrixLoaddEXT(mode, m)
+	return		void
+	param		mode		MatrixMode in value
+	param		m		Float64 in array [16]
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+
+MatrixMultfEXT(mode, m)
+	return		void
+	param		mode		MatrixMode in value
+	param		m		Float32 in array [16]
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+
+MatrixMultdEXT(mode, m)
+	return		void
+	param		mode		MatrixMode in value
+	param		m		Float64 in array [16]
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+
+MatrixLoadIdentityEXT(mode)
+	return		void
+	param		mode		MatrixMode in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+
+MatrixRotatefEXT(mode, angle, x, y, z)
+	return		void
+	param		mode		MatrixMode in value
+	param		angle		Float32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+
+MatrixRotatedEXT(mode, angle, x, y, z)
+	return		void
+	param		mode		MatrixMode in value
+	param		angle		Float64 in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	param		z		Float64 in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+
+MatrixScalefEXT(mode, x, y, z)
+	return		void
+	param		mode		MatrixMode in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+
+MatrixScaledEXT(mode, x, y, z)
+	return		void
+	param		mode		MatrixMode in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	param		z		Float64 in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+
+MatrixTranslatefEXT(mode, x, y, z)
+	return		void
+	param		mode		MatrixMode in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+
+MatrixTranslatedEXT(mode, x, y, z)
+	return		void
+	param		mode		MatrixMode in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	param		z		Float64 in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+
+MatrixFrustumEXT(mode, left, right, bottom, top, zNear, zFar)
+	return		void
+	param		mode		MatrixMode in value
+	param		left		Float64 in value
+	param		right		Float64 in value
+	param		bottom		Float64 in value
+	param		top		Float64 in value
+	param		zNear		Float64 in value
+	param		zFar		Float64 in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+
+MatrixOrthoEXT(mode, left, right, bottom, top, zNear, zFar)
+	return		void
+	param		mode		MatrixMode in value
+	param		left		Float64 in value
+	param		right		Float64 in value
+	param		bottom		Float64 in value
+	param		top		Float64 in value
+	param		zNear		Float64 in value
+	param		zFar		Float64 in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+
+MatrixPopEXT(mode)
+	return		void
+	param		mode		MatrixMode in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+
+MatrixPushEXT(mode)
+	return		void
+	param		mode		MatrixMode in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+
+# New 1.3 matrix transpose commands
+
+MatrixLoadTransposefEXT(mode, m)
+	return		void
+	param		mode		MatrixMode in value
+	param		m		Float32 in array [16]
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+
+MatrixLoadTransposedEXT(mode, m)
+	return		void
+	param		mode		MatrixMode in value
+	param		m		Float64 in array [16]
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+
+MatrixMultTransposefEXT(mode, m)
+	return		void
+	param		mode		MatrixMode in value
+	param		m		Float32 in array [16]
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+
+MatrixMultTransposedEXT(mode, m)
+	return		void
+	param		mode		MatrixMode in value
+	param		m		Float64 in array [16]
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+
+# New 1.1 texture object commands
+
+TextureParameterfEXT(texture, target, pname, param)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		pname		TextureParameterName in value
+	param		param		CheckedFloat32 in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+	vectorequiv	TextureParameterfvEXT
+
+TextureParameterfvEXT(texture, target, pname, params)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		pname		TextureParameterName in value
+	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+
+TextureParameteriEXT(texture, target, pname, param)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		pname		TextureParameterName in value
+	param		param		CheckedInt32 in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+	vectorequiv	TextureParameterivEXT
+
+TextureParameterivEXT(texture, target, pname, params)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		pname		TextureParameterName in value
+	param		params		CheckedInt32 in array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+
+TextureImage1DEXT(texture, target, level, internalformat, width, border, format, type, pixels)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	TextureInternalFormat in value
+	param		width		SizeI in value
+	param		border		CheckedInt32 in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void in array [COMPSIZE(format/type/width)]
+	category	EXT_direct_state_access
+	dlflags		handcode
+	glxflags	ignore ### client-handcode server-handcode
+	extension	soft WINSOFT
+	glfflags	capture-handcode decode-handcode pixel-unpack
+
+TextureImage2DEXT(texture, target, level, internalformat, width, height, border, format, type, pixels)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	TextureInternalFormat in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		border		CheckedInt32 in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void in array [COMPSIZE(format/type/width/height)]
+	category	EXT_direct_state_access
+	dlflags		handcode
+	glxflags	ignore ### client-handcode server-handcode
+	extension	soft WINSOFT
+	glfflags	capture-handcode decode-handcode pixel-unpack
+
+TextureSubImage1DEXT(texture, target, level, xoffset, width, format, type, pixels)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		width		SizeI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void in array [COMPSIZE(format/type/width)]
+	category	EXT_direct_state_access
+	dlflags		handcode
+	glxflags	ignore ### EXT client-handcode server-handcode
+	glxflags	ignore
+	extension	soft WINSOFT
+	glfflags	ignore
+
+TextureSubImage2DEXT(texture, target, level, xoffset, yoffset, width, height, format, type, pixels)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		yoffset		CheckedInt32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void in array [COMPSIZE(format/type/width/height)]
+	category	EXT_direct_state_access
+	dlflags		handcode
+	glxflags	ignore ### EXT client-handcode server-handcode
+	extension	soft WINSOFT
+	glfflags	ignore
+
+CopyTextureImage1DEXT(texture, target, level, internalformat, x, y, width, border)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	TextureInternalFormat in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	param		border		CheckedInt32 in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore ### EXT
+
+CopyTextureImage2DEXT(texture, target, level, internalformat, x, y, width, height, border)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	TextureInternalFormat in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		border		CheckedInt32 in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore ### EXT
+
+CopyTextureSubImage1DEXT(texture, target, level, xoffset, x, y, width)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore ### EXT
+
+CopyTextureSubImage2DEXT(texture, target, level, xoffset, yoffset, x, y, width, height)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		yoffset		CheckedInt32 in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore ### EXT
+
+# New 1.1 texture object queries
+
+GetTextureImageEXT(texture, target, level, format, type, pixels)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void out array [COMPSIZE(target/level/format/type)]
+	category	EXT_direct_state_access
+	dlflags		notlistable
+	glxflags	ignore ### client-handcode server-handcode
+	extension	soft WINSOFT
+	glfflags	capture-execute capture-handcode decode-handcode pixel-pack
+
+GetTextureParameterfvEXT(texture, target, pname, params)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		pname		GetTextureParameter in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	dlflags		notlistable
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	capture-execute gl-enum
+
+GetTextureParameterivEXT(texture, target, pname, params)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		pname		GetTextureParameter in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	dlflags		notlistable
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	capture-execute gl-enum
+
+GetTextureLevelParameterfvEXT(texture, target, level, pname, params)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		pname		GetTextureParameter in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	dlflags		notlistable
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	capture-execute gl-enum
+
+GetTextureLevelParameterivEXT(texture, target, level, pname, params)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		pname		GetTextureParameter in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	dlflags		notlistable
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	capture-execute gl-enum
+
+# New 1.2 3D texture object commands
+
+TextureImage3DEXT(texture, target, level, internalformat, width, height, depth, border, format, type, pixels)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	TextureInternalFormat in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		border		CheckedInt32 in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void in array [COMPSIZE(format/type/width/height/depth)]
+	category	EXT_direct_state_access
+	dlflags		handcode
+	glxflags	ignore ### client-handcode server-handcode EXT
+	extension	soft WINSOFT
+	glfflags	ignore
+
+TextureSubImage3DEXT(texture, target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		yoffset		CheckedInt32 in value
+	param		zoffset		CheckedInt32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void in array [COMPSIZE(format/type/width/height/depth)]
+	category	EXT_direct_state_access
+	dlflags		handcode
+	glxflags	ignore ### client-handcode server-handcode EXT
+	extension	soft WINSOFT
+	glfflags	ignore
+
+CopyTextureSubImage3DEXT(texture, target, level, xoffset, yoffset, zoffset, x, y, width, height)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		yoffset		CheckedInt32 in value
+	param		zoffset		CheckedInt32 in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	category	EXT_direct_state_access
+	glxflags	ignore ### EXT
+	extension	soft WINSOFT
+	glfflags	ignore
+
+# New 1.1 multitexture commands
+
+MultiTexParameterfEXT(texunit, target, pname, param)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		pname		TextureParameterName in value
+	param		param		CheckedFloat32 in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+	vectorequiv	MultiTexParameterfvEXT
+
+MultiTexParameterfvEXT(texunit, target, pname, params)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		pname		TextureParameterName in value
+	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+
+MultiTexParameteriEXT(texunit, target, pname, param)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		pname		TextureParameterName in value
+	param		param		CheckedInt32 in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+	vectorequiv	MultiTexParameterivEXT
+
+MultiTexParameterivEXT(texunit, target, pname, params)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		pname		TextureParameterName in value
+	param		params		CheckedInt32 in array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+
+MultiTexImage1DEXT(texunit, target, level, internalformat, width, border, format, type, pixels)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	TextureInternalFormat in value
+	param		width		SizeI in value
+	param		border		CheckedInt32 in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void in array [COMPSIZE(format/type/width)]
+	category	EXT_direct_state_access
+	dlflags		handcode
+	glxflags	ignore ### client-handcode server-handcode
+	extension	soft WINSOFT
+	glfflags	capture-handcode decode-handcode pixel-unpack
+
+MultiTexImage2DEXT(texunit, target, level, internalformat, width, height, border, format, type, pixels)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	TextureInternalFormat in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		border		CheckedInt32 in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void in array [COMPSIZE(format/type/width/height)]
+	category	EXT_direct_state_access
+	dlflags		handcode
+	glxflags	ignore ### client-handcode server-handcode
+	extension	soft WINSOFT
+	glfflags	capture-handcode decode-handcode pixel-unpack
+
+MultiTexSubImage1DEXT(texunit, target, level, xoffset, width, format, type, pixels)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		width		SizeI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void in array [COMPSIZE(format/type/width)]
+	category	EXT_direct_state_access
+	dlflags		handcode
+	glxflags	ignore ### EXT client-handcode server-handcode
+	extension	soft WINSOFT
+	glfflags	ignore
+
+MultiTexSubImage2DEXT(texunit, target, level, xoffset, yoffset, width, height, format, type, pixels)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		yoffset		CheckedInt32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void in array [COMPSIZE(format/type/width/height)]
+	category	EXT_direct_state_access
+	dlflags		handcode
+	glxflags	ignore ### EXT client-handcode server-handcode
+	extension	soft WINSOFT
+	glfflags	ignore
+
+CopyMultiTexImage1DEXT(texunit, target, level, internalformat, x, y, width, border)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	TextureInternalFormat in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	param		border		CheckedInt32 in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore ### EXT
+
+CopyMultiTexImage2DEXT(texunit, target, level, internalformat, x, y, width, height, border)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	TextureInternalFormat in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		border		CheckedInt32 in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore ### EXT
+
+CopyMultiTexSubImage1DEXT(texunit, target, level, xoffset, x, y, width)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore ### EXT
+
+CopyMultiTexSubImage2DEXT(texunit, target, level, xoffset, yoffset, x, y, width, height)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		yoffset		CheckedInt32 in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore ### EXT
+
+# New 1.1 multitexture queries
+
+GetMultiTexImageEXT(texunit, target, level, format, type, pixels)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void out array [COMPSIZE(target/level/format/type)]
+	category	EXT_direct_state_access
+	dlflags		notlistable
+	glxflags	ignore ### client-handcode server-handcode
+	extension	soft WINSOFT
+	glfflags	capture-execute capture-handcode decode-handcode pixel-pack
+
+GetMultiTexParameterfvEXT(texunit, target, pname, params)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		pname		GetTextureParameter in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	dlflags		notlistable
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	capture-execute gl-enum
+
+GetMultiTexParameterivEXT(texunit, target, pname, params)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		pname		GetTextureParameter in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	dlflags		notlistable
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	capture-execute gl-enum
+
+GetMultiTexLevelParameterfvEXT(texunit, target, level, pname, params)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		pname		GetTextureParameter in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	dlflags		notlistable
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	capture-execute gl-enum
+
+GetMultiTexLevelParameterivEXT(texunit, target, level, pname, params)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		pname		GetTextureParameter in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	dlflags		notlistable
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	capture-execute gl-enum
+
+# New 1.2 3D multitexture commands
+
+MultiTexImage3DEXT(texunit, target, level, internalformat, width, height, depth, border, format, type, pixels)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	TextureInternalFormat in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		border		CheckedInt32 in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void in array [COMPSIZE(format/type/width/height/depth)]
+	category	EXT_direct_state_access
+	dlflags		handcode
+	glxflags	ignore ### client-handcode server-handcode EXT
+	extension	soft WINSOFT
+	glfflags	ignore
+
+MultiTexSubImage3DEXT(texunit, target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		yoffset		CheckedInt32 in value
+	param		zoffset		CheckedInt32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void in array [COMPSIZE(format/type/width/height/depth)]
+	category	EXT_direct_state_access
+	dlflags		handcode
+	glxflags	ignore ### client-handcode server-handcode EXT
+	extension	soft WINSOFT
+	glfflags	ignore
+
+CopyMultiTexSubImage3DEXT(texunit, target, level, xoffset, yoffset, zoffset, x, y, width, height)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		yoffset		CheckedInt32 in value
+	param		zoffset		CheckedInt32 in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	category	EXT_direct_state_access
+	glxflags	ignore ### EXT
+	extension	soft WINSOFT
+	glfflags	ignore
+
+# New 1.2.1 multitexture texture commands
+
+BindMultiTextureEXT(texunit, target, texture)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		texture		Texture in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore ### EXT
+
+EnableClientStateIndexedEXT(array, index)
+	return		void
+	param		array		EnableCap in value
+	param		index		UInt32 in value
+	category	EXT_direct_state_access
+	dlflags		notlistable
+	glxflags	ignore ### client-handcode client-intercept server-handcode
+	extension	soft WINSOFT
+
+DisableClientStateIndexedEXT(array, index)
+	return		void
+	param		array		EnableCap in value
+	param		index		UInt32 in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glxflags	ignore ### client-handcode client-intercept server-handcode
+
+MultiTexCoordPointerEXT(texunit, size, type, stride, pointer)
+	return		void
+	param		texunit		TextureUnit in value
+	param		size		Int32 in value
+	param		type		TexCoordPointerType in value
+	param		stride		SizeI in value
+	param		pointer		Void in array [COMPSIZE(size/type/stride)] retained
+	category	EXT_direct_state_access
+	dlflags		notlistable
+	glxflags	ignore ### client-handcode client-intercept server-handcode
+	extension	soft WINSOFT
+	glfflags	ignore
+
+MultiTexEnvfEXT(texunit, target, pname, param)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureEnvTarget in value
+	param		pname		TextureEnvParameter in value
+	param		param		CheckedFloat32 in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	vectorequiv	MultiTexEnvfvEXT
+	glxflags	ignore
+	glfflags	gl-enum
+
+MultiTexEnvfvEXT(texunit, target, pname, params)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureEnvTarget in value
+	param		pname		TextureEnvParameter in value
+	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	gl-enum
+
+MultiTexEnviEXT(texunit, target, pname, param)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureEnvTarget in value
+	param		pname		TextureEnvParameter in value
+	param		param		CheckedInt32 in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	vectorequiv	MultiTexEnvivEXT
+	glxflags	ignore
+	glfflags	gl-enum
+
+MultiTexEnvivEXT(texunit, target, pname, params)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureEnvTarget in value
+	param		pname		TextureEnvParameter in value
+	param		params		CheckedInt32 in array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	gl-enum
+
+MultiTexGendEXT(texunit, coord, pname, param)
+	return		void
+	param		texunit		TextureUnit in value
+	param		coord		TextureCoordName in value
+	param		pname		TextureGenParameter in value
+	param		param		Float64 in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	vectorequiv	MultiTexGendvEXT
+	glxflags	ignore
+	glfflags	gl-enum
+
+MultiTexGendvEXT(texunit, coord, pname, params)
+	return		void
+	param		texunit		TextureUnit in value
+	param		coord		TextureCoordName in value
+	param		pname		TextureGenParameter in value
+	param		params		Float64 in array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	gl-enum
+
+MultiTexGenfEXT(texunit, coord, pname, param)
+	return		void
+	param		texunit		TextureUnit in value
+	param		coord		TextureCoordName in value
+	param		pname		TextureGenParameter in value
+	param		param		CheckedFloat32 in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	vectorequiv	MultiTexGenfvEXT
+	glxflags	ignore
+	glfflags	gl-enum
+
+MultiTexGenfvEXT(texunit, coord, pname, params)
+	return		void
+	param		texunit		TextureUnit in value
+	param		coord		TextureCoordName in value
+	param		pname		TextureGenParameter in value
+	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	gl-enum
+
+MultiTexGeniEXT(texunit, coord, pname, param)
+	return		void
+	param		texunit		TextureUnit in value
+	param		coord		TextureCoordName in value
+	param		pname		TextureGenParameter in value
+	param		param		CheckedInt32 in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	vectorequiv	MultiTexGenivEXT
+	glxflags	ignore
+	glfflags	gl-enum
+
+MultiTexGenivEXT(texunit, coord, pname, params)
+	return		void
+	param		texunit		TextureUnit in value
+	param		coord		TextureCoordName in value
+	param		pname		TextureGenParameter in value
+	param		params		CheckedInt32 in array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	gl-enum
+
+# New 1.2.1 multitexture texture queries
+
+GetMultiTexEnvfvEXT(texunit, target, pname, params)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureEnvTarget in value
+	param		pname		TextureEnvParameter in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	dlflags		notlistable
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	capture-execute gl-enum
+
+GetMultiTexEnvivEXT(texunit, target, pname, params)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureEnvTarget in value
+	param		pname		TextureEnvParameter in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	dlflags		notlistable
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	capture-execute gl-enum
+
+GetMultiTexGendvEXT(texunit, coord, pname, params)
+	return		void
+	param		texunit		TextureUnit in value
+	param		coord		TextureCoordName in value
+	param		pname		TextureGenParameter in value
+	param		params		Float64 out array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	dlflags		notlistable
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	capture-execute gl-enum
+
+GetMultiTexGenfvEXT(texunit, coord, pname, params)
+	return		void
+	param		texunit		TextureUnit in value
+	param		coord		TextureCoordName in value
+	param		pname		TextureGenParameter in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	dlflags		notlistable
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	capture-execute gl-enum
+
+GetMultiTexGenivEXT(texunit, coord, pname, params)
+	return		void
+	param		texunit		TextureUnit in value
+	param		coord		TextureCoordName in value
+	param		pname		TextureGenParameter in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	dlflags		notlistable
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	capture-execute gl-enum
+
+# From EXT_draw_buffers2
+# EnableIndexedEXT
+# DisableIndexedEXT
+# IsEnabledIndexedEXT
+
+GetFloatIndexedvEXT(target, index, data)
+	return		void
+	param		target		TypeEnum in value
+	param		index		UInt32 in value
+	param		data		Float32 out array [COMPSIZE(target)]
+	category	EXT_direct_state_access
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+	extension	soft WINSOFT
+
+GetDoubleIndexedvEXT(target, index, data)
+	return		void
+	param		target		TypeEnum in value
+	param		index		UInt32 in value
+	param		data		Float64 out array [COMPSIZE(target)]
+	category	EXT_direct_state_access
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+	extension	soft WINSOFT
+
+GetPointerIndexedvEXT(target, index, data)
+	return		void
+	param		target		TypeEnum in value
+	param		index		UInt32 in value
+	param		data		VoidPointer out array [COMPSIZE(target)]
+	category	EXT_direct_state_access
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+	extension	soft WINSOFT
+
+# New compressed texture commands
+
+CompressedTextureImage3DEXT(texture, target, level, internalformat, width, height, depth, border, imageSize, bits)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	TextureInternalFormat in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		border		CheckedInt32 in value
+	param		imageSize	SizeI in value
+	param		bits		Void in array [imageSize]
+	category	EXT_direct_state_access
+	dlflags		handcode
+	glxflags	ignore ### client-handcode server-handcode
+	glfflags	ignore
+	extension	soft WINSOFT
+
+CompressedTextureImage2DEXT(texture, target, level, internalformat, width, height, border, imageSize, bits)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	TextureInternalFormat in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		border		CheckedInt32 in value
+	param		imageSize	SizeI in value
+	param		bits		Void in array [imageSize]
+	category	EXT_direct_state_access
+	dlflags		handcode
+	glxflags	ignore ### client-handcode server-handcode
+	glfflags	ignore
+	extension	soft WINSOFT
+
+CompressedTextureImage1DEXT(texture, target, level, internalformat, width, border, imageSize, bits)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	TextureInternalFormat in value
+	param		width		SizeI in value
+	param		border		CheckedInt32 in value
+	param		imageSize	SizeI in value
+	param		bits		Void in array [imageSize]
+	category	EXT_direct_state_access
+	dlflags		handcode
+	glxflags	ignore ### client-handcode server-handcode
+	glfflags	ignore
+	extension	soft WINSOFT
+
+CompressedTextureSubImage3DEXT(texture, target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, bits)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		yoffset		CheckedInt32 in value
+	param		zoffset		CheckedInt32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		format		PixelFormat in value
+	param		imageSize	SizeI in value
+	param		bits		Void in array [imageSize]
+	category	EXT_direct_state_access
+	dlflags		handcode
+	glxflags	ignore ### client-handcode server-handcode
+	glfflags	ignore
+	extension	soft WINSOFT
+
+CompressedTextureSubImage2DEXT(texture, target, level, xoffset, yoffset, width, height, format, imageSize, bits)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		yoffset		CheckedInt32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		format		PixelFormat in value
+	param		imageSize	SizeI in value
+	param		bits		Void in array [imageSize]
+	category	EXT_direct_state_access
+	dlflags		handcode
+	glxflags	ignore ### client-handcode server-handcode
+	glfflags	ignore
+	extension	soft WINSOFT
+
+CompressedTextureSubImage1DEXT(texture, target, level, xoffset, width, format, imageSize, bits)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		width		SizeI in value
+	param		format		PixelFormat in value
+	param		imageSize	SizeI in value
+	param		bits		Void in array [imageSize]
+	category	EXT_direct_state_access
+	dlflags		handcode
+	glxflags	ignore ### client-handcode server-handcode
+	glfflags	ignore
+	extension	soft WINSOFT
+
+# New compressed texture query
+
+GetCompressedTextureImageEXT(texture, target, lod, img)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		lod		CheckedInt32 in value
+	param		img		Void out array [COMPSIZE(target/lod)]
+	category	EXT_direct_state_access
+	dlflags		notlistable
+	glxflags	ignore ### server-handcode
+	extension	soft WINSOFT
+
+# New compressed multitexture commands
+
+CompressedMultiTexImage3DEXT(texunit, target, level, internalformat, width, height, depth, border, imageSize, bits)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	TextureInternalFormat in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		border		CheckedInt32 in value
+	param		imageSize	SizeI in value
+	param		bits		Void in array [imageSize]
+	category	EXT_direct_state_access
+	dlflags		handcode
+	glxflags	ignore ### client-handcode server-handcode
+	glfflags	ignore
+	extension	soft WINSOFT
+
+CompressedMultiTexImage2DEXT(texunit, target, level, internalformat, width, height, border, imageSize, bits)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	TextureInternalFormat in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		border		CheckedInt32 in value
+	param		imageSize	SizeI in value
+	param		bits		Void in array [imageSize]
+	category	EXT_direct_state_access
+	dlflags		handcode
+	glxflags	ignore ### client-handcode server-handcode
+	glfflags	ignore
+	extension	soft WINSOFT
+
+CompressedMultiTexImage1DEXT(texunit, target, level, internalformat, width, border, imageSize, bits)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	TextureInternalFormat in value
+	param		width		SizeI in value
+	param		border		CheckedInt32 in value
+	param		imageSize	SizeI in value
+	param		bits		Void in array [imageSize]
+	category	EXT_direct_state_access
+	dlflags		handcode
+	glxflags	ignore ### client-handcode server-handcode
+	glfflags	ignore
+	extension	soft WINSOFT
+
+CompressedMultiTexSubImage3DEXT(texunit, target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, bits)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		yoffset		CheckedInt32 in value
+	param		zoffset		CheckedInt32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		format		PixelFormat in value
+	param		imageSize	SizeI in value
+	param		bits		Void in array [imageSize]
+	category	EXT_direct_state_access
+	dlflags		handcode
+	glxflags	ignore ### client-handcode server-handcode
+	glfflags	ignore
+	extension	soft WINSOFT
+
+CompressedMultiTexSubImage2DEXT(texunit, target, level, xoffset, yoffset, width, height, format, imageSize, bits)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		yoffset		CheckedInt32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		format		PixelFormat in value
+	param		imageSize	SizeI in value
+	param		bits		Void in array [imageSize]
+	category	EXT_direct_state_access
+	dlflags		handcode
+	glxflags	ignore ### client-handcode server-handcode
+	glfflags	ignore
+	extension	soft WINSOFT
+
+CompressedMultiTexSubImage1DEXT(texunit, target, level, xoffset, width, format, imageSize, bits)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		width		SizeI in value
+	param		format		PixelFormat in value
+	param		imageSize	SizeI in value
+	param		bits		Void in array [imageSize]
+	category	EXT_direct_state_access
+	dlflags		handcode
+	glxflags	ignore ### client-handcode server-handcode
+	glfflags	ignore
+	extension	soft WINSOFT
+
+# New compressed multitexture query
+
+GetCompressedMultiTexImageEXT(texunit, target, lod, img)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		lod		CheckedInt32 in value
+	param		img		Void out array [COMPSIZE(target/lod)]
+	category	EXT_direct_state_access
+	dlflags		notlistable
+	glxflags	ignore ### server-handcode
+	extension	soft WINSOFT
+
+# New ARB assembly program named commands
+
+NamedProgramStringEXT(program, target, format, len, string)
+	return		void
+	param		program		UInt32 in value
+	param		target		ProgramTarget in value
+	param		format		ProgramFormat in value
+	param		len		SizeI in value
+	param		string		Void in array [len]
+	category	EXT_direct_state_access
+	subcategory	ARB_vertex_program
+	extension	soft WINSOFT
+	glfflags	ignore
+	glxflags	ignore ### client-handcode server-handcode EXT
+	glextmask	GL_MASK_ARB_vertex_program|GL_MASK_ARB_fragment_program
+
+NamedProgramLocalParameter4dEXT(program, target, index, x, y, z, w)
+	return		void
+	param		program		UInt32 in value
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	param		z		Float64 in value
+	param		w		Float64 in value
+	category	EXT_direct_state_access
+	subcategory	ARB_vertex_program
+	vectorequiv	NamedProgramLocalParameter4dvEXT
+	glxvectorequiv	NamedProgramLocalParameter4dvEXT
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore ### EXT
+	glextmask	GL_MASK_ARB_vertex_program|GL_MASK_ARB_fragment_program
+
+NamedProgramLocalParameter4dvEXT(program, target, index, params)
+	return		void
+	param		program		UInt32 in value
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		params		Float64 in array [4]
+	category	EXT_direct_state_access
+	subcategory	ARB_vertex_program
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore ### EXT
+	glextmask	GL_MASK_ARB_vertex_program|GL_MASK_ARB_fragment_program
+
+NamedProgramLocalParameter4fEXT(program, target, index, x, y, z, w)
+	return		void
+	param		program		UInt32 in value
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	param		w		Float32 in value
+	category	EXT_direct_state_access
+	subcategory	ARB_vertex_program
+	vectorequiv	NamedProgramLocalParameter4fvEXT
+	glxvectorequiv	NamedProgramLocalParameter4fvEXT
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore ### EXT
+	glextmask	GL_MASK_ARB_vertex_program|GL_MASK_ARB_fragment_program
+
+NamedProgramLocalParameter4fvEXT(program, target, index, params)
+	return		void
+	param		program		UInt32 in value
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		params		Float32 in array [4]
+	category	EXT_direct_state_access
+	subcategory	ARB_vertex_program
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore ### EXT
+	glextmask	GL_MASK_ARB_vertex_program|GL_MASK_ARB_fragment_program
+
+# New ARB assembly program named queries
+
+GetNamedProgramLocalParameterdvEXT(program, target, index, params)
+	return		void
+	param		program		UInt32 in value
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		params		Float64 out array [4]
+	dlflags		notlistable
+	category	EXT_direct_state_access
+	subcategory	ARB_vertex_program
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore ### client-handcode server-handcode EXT
+	glextmask	GL_MASK_ARB_vertex_program|GL_MASK_ARB_fragment_program
+
+GetNamedProgramLocalParameterfvEXT(program, target, index, params)
+	return		void
+	param		program		UInt32 in value
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		params		Float32 out array [4]
+	dlflags		notlistable
+	category	EXT_direct_state_access
+	subcategory	ARB_vertex_program
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore ### client-handcode server-handcode EXT
+	glextmask	GL_MASK_ARB_vertex_program|GL_MASK_ARB_fragment_program
+
+GetNamedProgramivEXT(program, target, pname, params)
+	return		void
+	param		program		UInt32 in value
+	param		target		ProgramTarget in value
+	param		pname		ProgramProperty in value
+	param		params		Int32 out array [1]
+	dlflags		notlistable
+	category	EXT_direct_state_access
+	subcategory	ARB_vertex_program
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore ### client-handcode server-handcode EXT
+	glextmask	GL_MASK_ARB_vertex_program|GL_MASK_ARB_fragment_program
+
+GetNamedProgramStringEXT(program, target, pname, string)
+	return		void
+	param		program		UInt32 in value
+	param		target		ProgramTarget in value
+	param		pname		ProgramStringProperty in value
+	param		string		Void out array [COMPSIZE(program,pname)]
+	dlflags		notlistable
+	category	EXT_direct_state_access
+	subcategory	ARB_vertex_program
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore ### client-handcode server-handcode EXT
+	glextmask	GL_MASK_ARB_vertex_program|GL_MASK_ARB_fragment_program
+
+# New EXT_gpu_program_parameters command
+
+NamedProgramLocalParameters4fvEXT(program, target, index, count, params)
+	return		void
+	param		program		UInt32 in value
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		count		SizeI in value
+	param		params		Float32 in array [count*4]
+	category	EXT_direct_state_access
+	subcategory	EXT_gpu_program_parameters
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_EXT_gpu_program_parameters
+
+# New NV_gpu_program4 commands
+
+NamedProgramLocalParameterI4iEXT(program, target, index, x, y, z, w)
+	return		void
+	param		program		UInt32 in value
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		x		Int32 in value
+	param		y		Int32 in value
+	param		z		Int32 in value
+	param		w		Int32 in value
+	category	EXT_direct_state_access
+	subcategory	NV_gpu_program4
+	vectorequiv	NamedProgramLocalParameterI4ivEXT
+	glxvectorequiv	NamedProgramLocalParameterI4ivEXT
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_NV_gpu_program4
+
+NamedProgramLocalParameterI4ivEXT(program, target, index, params)
+	return		void
+	param		program		UInt32 in value
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		params		Int32 in array [4]
+	category	EXT_direct_state_access
+	subcategory	NV_gpu_program4
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_NV_gpu_program4
+
+NamedProgramLocalParametersI4ivEXT(program, target, index, count, params)
+	return		void
+	param		program		UInt32 in value
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		count		SizeI in value
+	param		params		Int32 in array [count*4]
+	category	EXT_direct_state_access
+	subcategory	NV_gpu_program4
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_NV_gpu_program4
+
+NamedProgramLocalParameterI4uiEXT(program, target, index, x, y, z, w)
+	return		void
+	param		program		UInt32 in value
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		x		UInt32 in value
+	param		y		UInt32 in value
+	param		z		UInt32 in value
+	param		w		UInt32 in value
+	category	EXT_direct_state_access
+	subcategory	NV_gpu_program4
+	vectorequiv	NamedProgramLocalParameterI4uivEXT
+	glxvectorequiv	NamedProgramLocalParameterI4uivEXT
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_NV_gpu_program4
+
+NamedProgramLocalParameterI4uivEXT(program, target, index, params)
+	return		void
+	param		program		UInt32 in value
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		params		UInt32 in array [4]
+	category	EXT_direct_state_access
+	subcategory	NV_gpu_program4
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_NV_gpu_program4
+
+NamedProgramLocalParametersI4uivEXT(program, target, index, count, params)
+	return		void
+	param		program		UInt32 in value
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		count		SizeI in value
+	param		params		UInt32 in array [count*4]
+	category	EXT_direct_state_access
+	subcategory	NV_gpu_program4
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_NV_gpu_program4
+
+GetNamedProgramLocalParameterIivEXT(program, target, index, params)
+	return		void
+	param		program		UInt32 in value
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		params		Int32 out array [4]
+	dlflags		notlistable
+	category	EXT_direct_state_access
+	subcategory	NV_gpu_program4
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_NV_gpu_program4
+
+GetNamedProgramLocalParameterIuivEXT(program, target, index, params)
+	return		void
+	param		program		UInt32 in value
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		params		UInt32 out array [4]
+	dlflags		notlistable
+	category	EXT_direct_state_access
+	subcategory	NV_gpu_program4
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_NV_gpu_program4
+
+# New EXT_texture_integer texture object commands
+
+TextureParameterIivEXT(texture, target, pname, params)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		pname		TextureParameterName in value
+	param		params		CheckedInt32 in array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	subcategory	EXT_texture_integer
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+	glextmask	GL_MASK_EXT_texture_integer
+
+TextureParameterIuivEXT(texture, target, pname, params)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		pname		TextureParameterName in value
+	param		params		UInt32 in array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	subcategory	EXT_texture_integer
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+	glextmask	GL_MASK_EXT_texture_integer
+
+# New EXT_texture_integer texture object queries
+
+GetTextureParameterIivEXT(texture, target, pname, params)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		pname		GetTextureParameter in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	subcategory	EXT_texture_integer
+	dlflags		notlistable
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	capture-execute gl-enum
+	glextmask	GL_MASK_EXT_texture_integer
+
+GetTextureParameterIuivEXT(texture, target, pname, params)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		pname		GetTextureParameter in value
+	param		params		UInt32 out array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	subcategory	EXT_texture_integer
+	dlflags		notlistable
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	capture-execute gl-enum
+	glextmask	GL_MASK_EXT_texture_integer
+
+# New EXT_texture_integer multitexture commands
+
+MultiTexParameterIivEXT(texunit, target, pname, params)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		pname		TextureParameterName in value
+	param		params		CheckedInt32 in array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	subcategory	EXT_texture_integer
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+	glextmask	GL_MASK_EXT_texture_integer
+
+MultiTexParameterIuivEXT(texunit, target, pname, params)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		pname		TextureParameterName in value
+	param		params		UInt32 in array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	subcategory	EXT_texture_integer
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+	glextmask	GL_MASK_EXT_texture_integer
+
+# New EXT_texture_integer multitexture queries
+
+GetMultiTexParameterIivEXT(texunit, target, pname, params)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		pname		GetTextureParameter in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	subcategory	EXT_texture_integer
+	dlflags		notlistable
+	extension	soft WINSOFT
+	glfflags	capture-execute gl-enum
+	glxflags	ignore
+	glextmask	GL_MASK_EXT_texture_integer
+
+GetMultiTexParameterIuivEXT(texunit, target, pname, params)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		pname		GetTextureParameter in value
+	param		params		UInt32 out array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	subcategory	EXT_texture_integer
+	dlflags		notlistable
+	extension	soft WINSOFT
+	glfflags	capture-execute gl-enum
+	glxflags	ignore
+	glextmask	GL_MASK_EXT_texture_integer
+
+# New GLSL 2.0 uniform commands
+
+ProgramUniform1fEXT(program, location, v0)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		Float32 in value
+	category	EXT_direct_state_access
+	subcategory	VERSION_2_0
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniform2fEXT(program, location, v0, v1)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		Float32 in value
+	param		v1		Float32 in value
+	category	EXT_direct_state_access
+	subcategory	VERSION_2_0
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniform3fEXT(program, location, v0, v1, v2)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		Float32 in value
+	param		v1		Float32 in value
+	param		v2		Float32 in value
+	category	EXT_direct_state_access
+	subcategory	VERSION_2_0
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniform4fEXT(program, location, v0, v1, v2, v3)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		Float32 in value
+	param		v1		Float32 in value
+	param		v2		Float32 in value
+	param		v3		Float32 in value
+	category	EXT_direct_state_access
+	subcategory	VERSION_2_0
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniform1iEXT(program, location, v0)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		Int32 in value
+	category	EXT_direct_state_access
+	subcategory	VERSION_2_0
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniform2iEXT(program, location, v0, v1)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		Int32 in value
+	param		v1		Int32 in value
+	category	EXT_direct_state_access
+	subcategory	VERSION_2_0
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniform3iEXT(program, location, v0, v1, v2)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		Int32 in value
+	param		v1		Int32 in value
+	param		v2		Int32 in value
+	category	EXT_direct_state_access
+	subcategory	VERSION_2_0
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniform4iEXT(program, location, v0, v1, v2, v3)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		Int32 in value
+	param		v1		Int32 in value
+	param		v2		Int32 in value
+	param		v3		Int32 in value
+	category	EXT_direct_state_access
+	subcategory	VERSION_2_0
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniform1fvEXT(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float32 in array [count]
+	category	EXT_direct_state_access
+	subcategory	VERSION_2_0
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniform2fvEXT(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float32 in array [count*2]
+	category	EXT_direct_state_access
+	subcategory	VERSION_2_0
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniform3fvEXT(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float32 in array [count*3]
+	category	EXT_direct_state_access
+	subcategory	VERSION_2_0
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniform4fvEXT(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float32 in array [count*4]
+	category	EXT_direct_state_access
+	subcategory	VERSION_2_0
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniform1ivEXT(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Int32 in array [count]
+	category	EXT_direct_state_access
+	subcategory	VERSION_2_0
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniform2ivEXT(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Int32 in array [count*2]
+	category	EXT_direct_state_access
+	subcategory	VERSION_2_0
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniform3ivEXT(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Int32 in array [count*3]
+	category	EXT_direct_state_access
+	subcategory	VERSION_2_0
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniform4ivEXT(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Int32 in array [count*4]
+	category	EXT_direct_state_access
+	subcategory	VERSION_2_0
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniformMatrix2fvEXT(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [count*4]
+	category	EXT_direct_state_access
+	subcategory	VERSION_2_0
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniformMatrix3fvEXT(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [count*9]
+	category	EXT_direct_state_access
+	subcategory	VERSION_2_0
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniformMatrix4fvEXT(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [count*16]
+	category	EXT_direct_state_access
+	subcategory	VERSION_2_0
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+# New GLSL 2.1 uniform commands
+
+ProgramUniformMatrix2x3fvEXT(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [count*6]
+	category	EXT_direct_state_access
+	subcategory	VERSION_2_1
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniformMatrix3x2fvEXT(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [count*6]
+	category	EXT_direct_state_access
+	subcategory	VERSION_2_1
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniformMatrix2x4fvEXT(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [count*8]
+	category	EXT_direct_state_access
+	subcategory	VERSION_2_1
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniformMatrix4x2fvEXT(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [count*8]
+	category	EXT_direct_state_access
+	subcategory	VERSION_2_1
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniformMatrix3x4fvEXT(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [count*12]
+	category	EXT_direct_state_access
+	subcategory	VERSION_2_1
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniformMatrix4x3fvEXT(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [count*12]
+	category	EXT_direct_state_access
+	subcategory	VERSION_2_1
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+# New EXT_gpu_shader4 commands
+
+ProgramUniform1uiEXT(program, location, v0)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		UInt32 in value
+	category	EXT_direct_state_access
+	subcategory	EXT_gpu_shader4
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniform2uiEXT(program, location, v0, v1)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		UInt32 in value
+	param		v1		UInt32 in value
+	category	EXT_direct_state_access
+	subcategory	EXT_gpu_shader4
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniform3uiEXT(program, location, v0, v1, v2)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		UInt32 in value
+	param		v1		UInt32 in value
+	param		v2		UInt32 in value
+	category	EXT_direct_state_access
+	subcategory	EXT_gpu_shader4
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniform4uiEXT(program, location, v0, v1, v2, v3)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		UInt32 in value
+	param		v1		UInt32 in value
+	param		v2		UInt32 in value
+	param		v3		UInt32 in value
+	category	EXT_direct_state_access
+	subcategory	EXT_gpu_shader4
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniform1uivEXT(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt32 in array [count]
+	category	EXT_direct_state_access
+	subcategory	EXT_gpu_shader4
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniform2uivEXT(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt32 in array [count*2]
+	category	EXT_direct_state_access
+	subcategory	EXT_gpu_shader4
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniform3uivEXT(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt32 in array [count*3]
+	category	EXT_direct_state_access
+	subcategory	EXT_gpu_shader4
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniform4uivEXT(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt32 in array [count*4]
+	category	EXT_direct_state_access
+	subcategory	EXT_gpu_shader4
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+# New named buffer commands
+
+NamedBufferDataEXT(buffer, size, data, usage)
+	return		void
+	param		buffer		UInt32 in value
+	param		size		Sizeiptr in value
+	param		data		Void in array [COMPSIZE(size)]
+	param		usage		VertexBufferObjectUsage in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+
+NamedBufferSubDataEXT(buffer, offset, size, data)
+	return		void
+	param		buffer		UInt32 in value
+	param		offset		Intptr in value
+	param		size		Sizeiptr in value
+	param		data		Void in array [COMPSIZE(size)]
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+
+MapNamedBufferEXT(buffer, access)
+	return		VoidPointer
+	param		buffer		UInt32 in value
+	param		access		VertexBufferObjectAccess in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+
+UnmapNamedBufferEXT(buffer)
+	return		Boolean
+	param		buffer		UInt32 in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+
+MapNamedBufferRangeEXT(buffer, offset, length, access)
+	return		VoidPointer
+	param		buffer		UInt32 in value
+	param		offset		Intptr in value
+	param		length		Sizeiptr in value
+	param		access		BufferAccessMask in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+
+FlushMappedNamedBufferRangeEXT(buffer, offset, length)
+	return		void
+	param		buffer		UInt32 in value
+	param		offset		Intptr in value
+	param		length		Sizeiptr in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+
+NamedCopyBufferSubDataEXT(readBuffer, writeBuffer, readOffset, writeOffset, size)
+	return		void
+	param		readBuffer	UInt32 in value
+	param		writeBuffer	UInt32 in value
+	param		readOffset	Intptr in value
+	param		writeOffset	Intptr in value
+	param		size		Sizeiptr in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+
+# New named buffer queries
+
+GetNamedBufferParameterivEXT(buffer, pname, params)
+	return		void
+	param		buffer		UInt32 in value
+	param		pname		VertexBufferObjectParameter in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+
+GetNamedBufferPointervEXT(buffer, pname, params)
+	return		void
+	param		buffer		UInt32 in value
+	param		pname		VertexBufferObjectParameter in value
+	param		params		VoidPointer out array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+
+GetNamedBufferSubDataEXT(buffer, offset, size, data)
+	return		void
+	param		buffer		UInt32 in value
+	param		offset		Intptr in value
+	param		size		Sizeiptr in value
+	param		data		Void out array [COMPSIZE(size)]
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+
+# New named texture buffer texture object command
+
+TextureBufferEXT(texture, target, internalformat, buffer)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		internalformat	TypeEnum in value
+	param		buffer		UInt32 in value
+	category	EXT_direct_state_access
+	subcategory	EXT_texture_buffer_object
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_EXT_texture_buffer_object
+	dlflags		notlistable
+
+# New named texture buffer multitexture command
+
+MultiTexBufferEXT(texunit, target, internalformat, buffer)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		internalformat	TypeEnum in value
+	param		buffer		UInt32 in value
+	category	EXT_direct_state_access
+	subcategory	EXT_texture_buffer_object
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_EXT_texture_buffer_object
+	dlflags		notlistable
+
+# New named frame buffer object commands
+
+NamedRenderbufferStorageEXT(renderbuffer, internalformat, width, height)
+	return		void
+	param		renderbuffer	Renderbuffer in value
+	param		internalformat	PixelInternalFormat in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	category	EXT_direct_state_access
+	subcategory	EXT_framebuffer_object
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_EXT_framebuffer_object
+
+GetNamedRenderbufferParameterivEXT(renderbuffer, pname, params)
+	return		void
+	param		renderbuffer	Renderbuffer in value
+	param		pname		RenderbufferParameterName in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	subcategory	EXT_framebuffer_object
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_EXT_framebuffer_object
+
+CheckNamedFramebufferStatusEXT(framebuffer, target)
+	return		FramebufferStatus
+	param		framebuffer	Framebuffer in value
+	param		target		FramebufferTarget in value
+	category	EXT_direct_state_access
+	subcategory	EXT_framebuffer_object
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_EXT_framebuffer_object
+
+NamedFramebufferTexture1DEXT(framebuffer, attachment, textarget, texture, level)
+	return		void
+	param		framebuffer	Framebuffer in value
+	param		attachment	FramebufferAttachment in value
+	param		textarget	TextureTarget in value
+	param		texture		Texture in value
+	param		level		CheckedInt32 in value
+	category	EXT_direct_state_access
+	subcategory	EXT_framebuffer_object
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_EXT_framebuffer_object
+
+NamedFramebufferTexture2DEXT(framebuffer, attachment, textarget, texture, level)
+	return		void
+	param		framebuffer	Framebuffer in value
+	param		attachment	FramebufferAttachment in value
+	param		textarget	TextureTarget in value
+	param		texture		Texture in value
+	param		level		CheckedInt32 in value
+	category	EXT_direct_state_access
+	subcategory	EXT_framebuffer_object
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_EXT_framebuffer_object
+
+NamedFramebufferTexture3DEXT(framebuffer, attachment, textarget, texture, level, zoffset)
+	return		void
+	param		framebuffer	Framebuffer in value
+	param		attachment	FramebufferAttachment in value
+	param		textarget	TextureTarget in value
+	param		texture		Texture in value
+	param		level		CheckedInt32 in value
+	param		zoffset		CheckedInt32 in value
+	category	EXT_direct_state_access
+	subcategory	EXT_framebuffer_object
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_EXT_framebuffer_object
+
+NamedFramebufferRenderbufferEXT(framebuffer, attachment, renderbuffertarget, renderbuffer)
+	return		void
+	param		framebuffer	Framebuffer in value
+	param		attachment	FramebufferAttachment in value
+	param		renderbuffertarget RenderbufferTarget in value
+	param		renderbuffer	Renderbuffer in value
+	category	EXT_direct_state_access
+	subcategory	EXT_framebuffer_object
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_EXT_framebuffer_object
+
+GetNamedFramebufferAttachmentParameterivEXT(framebuffer, attachment, pname, params)
+	return		void
+	param		framebuffer	Framebuffer in value
+	param		attachment	FramebufferAttachment in value
+	param		pname		FramebufferAttachmentParameterName in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	subcategory	EXT_framebuffer_object
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_EXT_framebuffer_object
+
+GenerateTextureMipmapEXT(texture, target)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	category	EXT_direct_state_access
+	subcategory	EXT_framebuffer_object
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_EXT_framebuffer_object
+
+GenerateMultiTexMipmapEXT(texunit, target)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	category	EXT_direct_state_access
+	subcategory	EXT_framebuffer_object
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_EXT_framebuffer_object
+
+FramebufferDrawBufferEXT(framebuffer, mode)
+	return		void
+	param		framebuffer	Framebuffer in value
+	param		mode		DrawBufferMode in value
+	category	EXT_direct_state_access
+	subcategory	EXT_framebuffer_object
+	extension	soft WINSOFT
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_EXT_framebuffer_object
+
+FramebufferDrawBuffersEXT(framebuffer, n, bufs)
+	return		void
+	param		framebuffer	Framebuffer in value
+	param		n		SizeI in value
+	param		bufs		DrawBufferMode in array [n]
+	category	EXT_direct_state_access
+	subcategory	EXT_framebuffer_object
+	extension	soft WINSOFT
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_EXT_framebuffer_object
+
+FramebufferReadBufferEXT(framebuffer, mode)
+	return		void
+	param		framebuffer	Framebuffer in value
+	param		mode		ReadBufferMode in value
+	category	EXT_direct_state_access
+	subcategory	EXT_framebuffer_object
+	extension	soft WINSOFT
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_EXT_framebuffer_object
+
+GetFramebufferParameterivEXT(framebuffer, pname, params)
+	return		void
+	param		framebuffer	Framebuffer in value
+	param		pname		GetFramebufferParameter in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	subcategory	EXT_framebuffer_object
+	dlflags		notlistable
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	capture-execute gl-enum
+
+# New named framebuffer multisample object commands
+
+NamedRenderbufferStorageMultisampleEXT(renderbuffer, samples, internalformat, width, height)
+	return		void
+	param		renderbuffer	Renderbuffer in value
+	param		samples		SizeI in value
+	param		internalformat	PixelInternalFormat in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	category	EXT_direct_state_access
+	subcategory	EXT_framebuffer_multisample
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_EXT_framebuffer_multisample
+
+# New named framebuffer multisample coverage object commands
+
+NamedRenderbufferStorageMultisampleCoverageEXT(renderbuffer, coverageSamples, colorSamples, internalformat, width, height)
+	return		void
+	param		renderbuffer	Renderbuffer in value
+	param		coverageSamples SizeI in value
+	param		colorSamples	SizeI in value
+	param		internalformat	PixelInternalFormat in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	category	EXT_direct_state_access
+	subcategory	NV_framebuffer_multisample_coverage
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_NV_framebuffer_multisample_coverage
+
+# New named geometry program/shader frame buffer object commands
+
+NamedFramebufferTextureEXT(framebuffer, attachment, texture, level)
+	return		void
+	param		framebuffer	Framebuffer in value
+	param		attachment	FramebufferAttachment in value
+	param		texture		Texture in value
+	param		level		CheckedInt32 in value
+	category	EXT_direct_state_access
+	subcategory	NV_gpu_program4
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_NV_gpu_program4
+
+NamedFramebufferTextureLayerEXT(framebuffer, attachment, texture, level, layer)
+	return		void
+	param		framebuffer	Framebuffer in value
+	param		attachment	FramebufferAttachment in value
+	param		texture		Texture in value
+	param		level		CheckedInt32 in value
+	param		layer		CheckedInt32 in value
+	category	EXT_direct_state_access
+	subcategory	NV_gpu_program4
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_NV_gpu_program4
+
+NamedFramebufferTextureFaceEXT(framebuffer, attachment, texture, level, face)
+	return		void
+	param		framebuffer	Framebuffer in value
+	param		attachment	FramebufferAttachment in value
+	param		texture		Texture in value
+	param		level		CheckedInt32 in value
+	param		face		TextureTarget in value
+	category	EXT_direct_state_access
+	subcategory	NV_gpu_program4
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_NV_gpu_program4
+
+# New explicit multisample query and commands
+
+TextureRenderbufferEXT(texture, target, renderbuffer)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		renderbuffer	UInt32 in value
+	category	EXT_direct_state_access
+	subcategory	NV_explicit_multisample
+	extension	soft WINSOFT NV50
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_NV_explicit_multisample
+
+MultiTexRenderbufferEXT(texunit, target, renderbuffer)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		renderbuffer	UInt32 in value
+	category	EXT_direct_state_access
+	subcategory	NV_explicit_multisample
+	extension	soft WINSOFT NV50
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_NV_explicit_multisample
+
+# New ARB_gpu_shader_fp64 commands
+
+ProgramUniform1dEXT(program, location, x)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		x		Float64 in value
+	category	EXT_direct_state_access
+	subcategory	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform2dEXT(program, location, x, y)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	category	EXT_direct_state_access
+	subcategory	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform3dEXT(program, location, x, y, z)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	param		z		Float64 in value
+	category	EXT_direct_state_access
+	subcategory	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform4dEXT(program, location, x, y, z, w)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	param		z		Float64 in value
+	param		w		Float64 in value
+	category	EXT_direct_state_access
+	subcategory	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform1dvEXT(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float64 in array [count]
+	category	EXT_direct_state_access
+	subcategory	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform2dvEXT(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float64 in array [count]
+	category	EXT_direct_state_access
+	subcategory	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform3dvEXT(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float64 in array [count]
+	category	EXT_direct_state_access
+	subcategory	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform4dvEXT(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float64 in array [count]
+	category	EXT_direct_state_access
+	subcategory	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformMatrix2dvEXT(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float64 in array [count]
+	category	EXT_direct_state_access
+	subcategory	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformMatrix3dvEXT(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float64 in array [count]
+	category	EXT_direct_state_access
+	subcategory	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformMatrix4dvEXT(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float64 in array [count]
+	category	EXT_direct_state_access
+	subcategory	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformMatrix2x3dvEXT(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float64 in array [count]
+	category	EXT_direct_state_access
+	subcategory	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformMatrix2x4dvEXT(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float64 in array [count]
+	category	EXT_direct_state_access
+	subcategory	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformMatrix3x2dvEXT(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float64 in array [count]
+	category	EXT_direct_state_access
+	subcategory	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformMatrix3x4dvEXT(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float64 in array [count]
+	category	EXT_direct_state_access
+	subcategory	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformMatrix4x2dvEXT(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float64 in array [count]
+	category	EXT_direct_state_access
+	subcategory	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformMatrix4x3dvEXT(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float64 in array [count]
+	category	EXT_direct_state_access
+	subcategory	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #354
+# EXT_vertex_array_bgra commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_vertex_array_bgra
+
+###############################################################################
+#
+# Extension #355 - WGL_NV_gpu_affinity
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #356
+# EXT_texture_swizzle commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_texture_swizzle
+
+###############################################################################
+#
+# Extension #357
+# NV_explicit_multisample commands
+#
+###############################################################################
+
+# From EXT_draw_buffers2:  GetBooleanIndexedvEXT / GetIntegerIndexedvEXT
+
+GetMultisamplefvNV(pname, index, val)
+	return		void
+	param		pname		GetMultisamplePNameNV in value
+	param		index		UInt32 in value
+	param		val		Float32 out array [2]
+	category	NV_explicit_multisample
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+
+SampleMaskIndexedNV(index, mask)
+	return		void
+	param		index		UInt32 in value
+	param		mask		SampleMaskNV in value
+	category	NV_explicit_multisample
+	glfflags	ignore
+	glxflags	ignore
+
+TexRenderbufferNV(target, renderbuffer)
+	return		void
+	param		target		TextureTarget in value
+	param		renderbuffer	UInt32 in value
+	category	NV_explicit_multisample
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+
+###############################################################################
+#
+# Extension #358
+# NV_transform_feedback2 commands
+#
+###############################################################################
+
+BindTransformFeedbackNV(target, id)
+	return		void
+	param		target		BufferTargetARB in value
+	param		id		UInt32 in value
+	category	NV_transform_feedback2
+	glfflags	ignore
+	glxflags	ignore
+
+DeleteTransformFeedbacksNV(n, ids)
+	return		void
+	param		n		SizeI in value
+	param		ids		UInt32 in array [n]
+	category	NV_transform_feedback2
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+
+GenTransformFeedbacksNV(n, ids)
+	return		void
+	param		n		SizeI in value
+	param		ids		UInt32 out array [n]
+	category	NV_transform_feedback2
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+
+IsTransformFeedbackNV(id)
+	return		Boolean
+	param		id		UInt32 in value
+	category	NV_transform_feedback2
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+
+PauseTransformFeedbackNV()
+	return		void
+	category	NV_transform_feedback2
+	glfflags	ignore
+	glxflags	ignore
+
+ResumeTransformFeedbackNV()
+	return		void
+	category	NV_transform_feedback2
+	glfflags	ignore
+	glxflags	ignore
+
+DrawTransformFeedbackNV(mode, id)
+	return		void
+	param		mode		GLenum in value
+	param		id		UInt32 in value
+	category	NV_transform_feedback2
+	glfflags	ignore
+	glxflags	ignore
+
+###############################################################################
+#
+# Extension #359
+# ATI_meminfo commands
+#
+###############################################################################
+
+# (none)
+newcategory: ATI_meminfo
+
+###############################################################################
+#
+# Extension #360
+# AMD_performance_monitor commands
+#
+###############################################################################
+
+GetPerfMonitorGroupsAMD(numGroups, groupsSize, groups)
+	return		void
+	param		numGroups	Int32 out array [1]
+	param		groupsSize	SizeI in value
+	param		groups		UInt32 out array [groupsSize]
+	category	AMD_performance_monitor
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetPerfMonitorCountersAMD(group, numCounters, maxActiveCounters, counterSize, counters)
+	return		void
+	param		group		UInt32 in value
+	param		numCounters	Int32 out array [1]
+	param		maxActiveCounters Int32 out array [1]
+	param		counterSize	SizeI in value
+	param		counters	UInt32 out array [counterSize]
+	category	AMD_performance_monitor
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetPerfMonitorGroupStringAMD(group, bufSize, length, groupString)
+	return		void
+	param		group		UInt32 in value
+	param		bufSize		SizeI in value
+	param		length		SizeI out array [1]
+	param		groupString	Char out array [bufSize]
+	category	AMD_performance_monitor
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetPerfMonitorCounterStringAMD(group, counter, bufSize, length, counterString)
+	return		void
+	param		group		UInt32 in value
+	param		counter		UInt32 in value
+	param		bufSize		SizeI in value
+	param		length		SizeI out array [1]
+	param		counterString	Char out array [bufSize]
+	category	AMD_performance_monitor
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetPerfMonitorCounterInfoAMD(group, counter, pname, data)
+	return		void
+	param		group		UInt32 in value
+	param		counter		UInt32 in value
+	param		pname		GLenum in value
+	param		data		Void out array [COMPSIZE(pname)]
+	category	AMD_performance_monitor
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GenPerfMonitorsAMD(n, monitors)
+	return		void
+	param		n		SizeI in value
+	param		monitors	UInt32 out array [n]
+	category	AMD_performance_monitor
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+# 'monitors' is actually in, not out, but extension spec doesn't use const
+DeletePerfMonitorsAMD(n, monitors)
+	return		void
+	param		n		SizeI in value
+	param		monitors	UInt32 out array [n]
+	category	AMD_performance_monitor
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+# 'counterList' is actually in, not out, but extension spec doesn't use const
+SelectPerfMonitorCountersAMD(monitor, enable, group, numCounters, counterList)
+	return		void
+	param		monitor		UInt32 in value
+	param		enable		Boolean in value
+	param		group		UInt32 in value
+	param		numCounters	Int32 in value
+	param		counterList	UInt32 out array [numCounters]
+	category	AMD_performance_monitor
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+BeginPerfMonitorAMD(monitor)
+	return		void
+	param		monitor		UInt32 in value
+	category	AMD_performance_monitor
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+EndPerfMonitorAMD(monitor)
+	return		void
+	param		monitor		UInt32 in value
+	category	AMD_performance_monitor
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetPerfMonitorCounterDataAMD(monitor, pname, dataSize, data, bytesWritten)
+	return		void
+	param		monitor		UInt32 in value
+	param		pname		GLenum in value
+	param		dataSize	SizeI in value
+	param		data		UInt32 out array [dataSize]
+	param		bytesWritten	Int32 out array [1]
+	category	AMD_performance_monitor
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #361 - WGL_AMD_gpu_association
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #362
+# AMD_texture_texture4 commands
+#
+###############################################################################
+
+# (none)
+newcategory: AMD_texture_texture4
+
+###############################################################################
+#
+# Extension #363
+# AMD_vertex_shader_tesselator commands
+#
+###############################################################################
+
+TessellationFactorAMD(factor)
+	return		void
+	param		factor		Float32 in value
+	category	AMD_vertex_shader_tesselator
+	version		2.0
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+TessellationModeAMD(mode)
+	return		void
+	param		mode		GLenum in value
+	category	AMD_vertex_shader_tesselator
+	version		2.0
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #364
+# EXT_provoking_vertex commands
+#
+###############################################################################
+
+ProvokingVertexEXT(mode)
+	return		void
+	param		mode		GLenum in value
+	category	EXT_provoking_vertex
+	version		2.1
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #365
+# EXT_texture_snorm commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_texture_snorm
+
+###############################################################################
+#
+# Extension #366
+# AMD_draw_buffers_blend commands
+#
+###############################################################################
+
+BlendFuncIndexedAMD(buf, src, dst)
+	return		void
+	param		buf		UInt32 in value
+	param		src		GLenum in value
+	param		dst		GLenum in value
+	category	AMD_draw_buffers_blend
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+BlendFuncSeparateIndexedAMD(buf, srcRGB, dstRGB, srcAlpha, dstAlpha)
+	return		void
+	param		buf		UInt32 in value
+	param		srcRGB		GLenum in value
+	param		dstRGB		GLenum in value
+	param		srcAlpha	GLenum in value
+	param		dstAlpha	GLenum in value
+	category	AMD_draw_buffers_blend
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+BlendEquationIndexedAMD(buf, mode)
+	return		void
+	param		buf		UInt32 in value
+	param		mode		GLenum in value
+	category	AMD_draw_buffers_blend
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+BlendEquationSeparateIndexedAMD(buf, modeRGB, modeAlpha)
+	return		void
+	param		buf		UInt32 in value
+	param		modeRGB		GLenum in value
+	param		modeAlpha	GLenum in value
+	category	AMD_draw_buffers_blend
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #367
+# APPLE_texture_range commands
+#
+###############################################################################
+
+TextureRangeAPPLE(target, length, pointer)
+	return		void
+	param		target		GLenum in value
+	param		length		SizeI in value
+	param		pointer		Void in array [length]
+	category	APPLE_texture_range
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetTexParameterPointervAPPLE(target, pname, params)
+	return		void
+	param		target		GLenum in value
+	param		pname		GLenum in value
+	param		params		VoidPointer out array [1]
+	category	APPLE_texture_range
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #368
+# APPLE_float_pixels commands
+#
+###############################################################################
+
+# (none)
+newcategory: APPLE_float_pixels
+
+###############################################################################
+#
+# Extension #369
+# APPLE_vertex_program_evaluators commands
+#
+###############################################################################
+
+EnableVertexAttribAPPLE(index, pname)
+	return		void
+	param		index		UInt32 in value
+	param		pname		GLenum in value
+	category	APPLE_vertex_program_evaluators
+	version		1.5
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DisableVertexAttribAPPLE(index, pname)
+	return		void
+	param		index		UInt32 in value
+	param		pname		GLenum in value
+	category	APPLE_vertex_program_evaluators
+	version		1.5
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+IsVertexAttribEnabledAPPLE(index, pname)
+	return		Boolean
+	param		index		UInt32 in value
+	param		pname		GLenum in value
+	category	APPLE_vertex_program_evaluators
+	version		1.5
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MapVertexAttrib1dAPPLE(index, size, u1, u2, stride, order, points)
+	return		void
+	param		index		UInt32 in value
+	param		size		UInt32 in value
+	param		u1		CoordD in value
+	param		u2		CoordD in value
+	param		stride		Int32 in value
+	param		order		CheckedInt32 in value
+	param		points		CoordD in array [COMPSIZE(size/stride/order)]
+	category	APPLE_vertex_program_evaluators
+	version		1.5
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MapVertexAttrib1fAPPLE(index, size, u1, u2, stride, order, points)
+	return		void
+	param		index		UInt32 in value
+	param		size		UInt32 in value
+	param		u1		CoordF in value
+	param		u2		CoordF in value
+	param		stride		Int32 in value
+	param		order		CheckedInt32 in value
+	param		points		CoordF in array [COMPSIZE(size/stride/order)]
+	category	APPLE_vertex_program_evaluators
+	version		1.5
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MapVertexAttrib2dAPPLE(index, size, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points)
+	return		void
+	param		index		UInt32 in value
+	param		size		UInt32 in value
+	param		u1		CoordD in value
+	param		u2		CoordD in value
+	param		ustride		Int32 in value
+	param		uorder		CheckedInt32 in value
+	param		v1		CoordD in value
+	param		v2		CoordD in value
+	param		vstride		Int32 in value
+	param		vorder		CheckedInt32 in value
+	param		points		CoordD in array [COMPSIZE(size/ustride/uorder/vstride/vorder)]
+	category	APPLE_vertex_program_evaluators
+	version		1.5
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MapVertexAttrib2fAPPLE(index, size, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points)
+	return		void
+	param		index		UInt32 in value
+	param		size		UInt32 in value
+	param		u1		CoordF in value
+	param		u2		CoordF in value
+	param		ustride		Int32 in value
+	param		uorder		CheckedInt32 in value
+	param		v1		CoordF in value
+	param		v2		CoordF in value
+	param		vstride		Int32 in value
+	param		vorder		CheckedInt32 in value
+	param		points		CoordF in array [COMPSIZE(size/ustride/uorder/vstride/vorder)]
+	category	APPLE_vertex_program_evaluators
+	version		1.5
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #370
+# APPLE_aux_depth_stencil commands
+#
+###############################################################################
+
+# (none)
+newcategory: APPLE_aux_depth_stencil
+
+###############################################################################
+#
+# Extension #371
+# APPLE_object_purgeable commands
+#
+###############################################################################
+
+ObjectPurgeableAPPLE(objectType, name, option)
+	return		GLenum
+	param		objectType	GLenum in value
+	param		name		UInt32 in value
+	param		option		GLenum in value
+	category	APPLE_object_purgeable
+	version		1.5
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ObjectUnpurgeableAPPLE(objectType, name, option)
+	return		GLenum
+	param		objectType	GLenum in value
+	param		name		UInt32 in value
+	param		option		GLenum in value
+	category	APPLE_object_purgeable
+	version		1.5
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetObjectParameterivAPPLE(objectType, name, pname, params)
+	return		void
+	param		objectType	GLenum in value
+	param		name		UInt32 in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	APPLE_object_purgeable
+	dlflags		notlistable
+	version		1.5
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #372
+# APPLE_row_bytes commands
+#
+###############################################################################
+
+# (none)
+newcategory: APPLE_row_bytes
+
+###############################################################################
+#
+# Extension #373
+# APPLE_rgb_422 commands
+#
+###############################################################################
+
+# (none)
+newcategory: APPLE_rgb_422
+
+###############################################################################
+#
+# Extension #374
+# NV_video_capture commands
+#
+###############################################################################
+
+BeginVideoCaptureNV(video_capture_slot)
+	return		void
+	param		video_capture_slot	UInt32 in value
+	category	NV_video_capture
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+BindVideoCaptureStreamBufferNV(video_capture_slot, stream, frame_region, offset)
+	return		void
+	param		video_capture_slot	UInt32 in value
+	param		stream		UInt32 in value
+	param		frame_region	GLenum in value
+	param		offset		BufferOffsetARB in value
+	category	NV_video_capture
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+BindVideoCaptureStreamTextureNV(video_capture_slot, stream, frame_region, target, texture)
+	return		void
+	param		video_capture_slot	UInt32 in value
+	param		stream		UInt32 in value
+	param		frame_region	GLenum in value
+	param		target		GLenum in value
+	param		texture		UInt32 in value
+	category	NV_video_capture
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+EndVideoCaptureNV(video_capture_slot)
+	return		void
+	param		video_capture_slot	UInt32 in value
+	category	NV_video_capture
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetVideoCaptureivNV(video_capture_slot, pname, params)
+	return		void
+	param		video_capture_slot	UInt32 in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	NV_video_capture
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetVideoCaptureStreamivNV(video_capture_slot, stream, pname, params)
+	return		void
+	param		video_capture_slot	UInt32 in value
+	param		stream		UInt32 in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	NV_video_capture
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetVideoCaptureStreamfvNV(video_capture_slot, stream, pname, params)
+	return		void
+	param		video_capture_slot	UInt32 in value
+	param		stream		UInt32 in value
+	param		pname		GLenum in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	NV_video_capture
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetVideoCaptureStreamdvNV(video_capture_slot, stream, pname, params)
+	return		void
+	param		video_capture_slot	UInt32 in value
+	param		stream		UInt32 in value
+	param		pname		GLenum in value
+	param		params		Float64 out array [COMPSIZE(pname)]
+	category	NV_video_capture
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+VideoCaptureNV(video_capture_slot, sequence_num, capture_time)
+	return		GLenum
+	param		video_capture_slot	UInt32 in value
+	param		sequence_num	UInt32 out reference
+	param		capture_time	UInt64EXT out reference
+	category	NV_video_capture
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VideoCaptureStreamParameterivNV(video_capture_slot, stream, pname, params)
+	return		void
+	param		video_capture_slot	UInt32 in value
+	param		stream		UInt32 in value
+	param		pname		GLenum in value
+	param		params		Int32 in array [COMPSIZE(pname)]
+	category	NV_video_capture
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VideoCaptureStreamParameterfvNV(video_capture_slot, stream, pname, params)
+	return		void
+	param		video_capture_slot	UInt32 in value
+	param		stream		UInt32 in value
+	param		pname		GLenum in value
+	param		params		Float32 in array [COMPSIZE(pname)]
+	category	NV_video_capture
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VideoCaptureStreamParameterdvNV(video_capture_slot, stream, pname, params)
+	return		void
+	param		video_capture_slot	UInt32 in value
+	param		stream		UInt32 in value
+	param		pname		GLenum in value
+	param		params		Float64 in array [COMPSIZE(pname)]
+	category	NV_video_capture
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #375 - GLX_EXT_swap_control
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #376 - also GLX_NV_copy_image, WGL_NV_copy_image
+# NV_copy_image commands
+#
+###############################################################################
+
+CopyImageSubDataNV(srcName, srcTarget, srcLevel, srcX, srcY, srcZ, dstName, dstTarget, dstLevel, dstX, dstY, dstZ, width, height, depth)
+	return		void
+	param		srcName		UInt32 in value
+	param		srcTarget	GLenum in value
+	param		srcLevel	Int32 in value
+	param		srcX		Int32 in value
+	param		srcY		Int32 in value
+	param		srcZ		Int32 in value
+	param		dstName		UInt32 in value
+	param		dstTarget	GLenum in value
+	param		dstLevel	Int32 in value
+	param		dstX		Int32 in value
+	param		dstY		Int32 in value
+	param		dstZ		Int32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	category	NV_copy_image
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #377
+# EXT_separate_shader_objects commands
+#
+###############################################################################
+
+UseShaderProgramEXT(type, program)
+	return		void
+	param		type		GLenum in value
+	param		program		UInt32 in value
+	category	EXT_separate_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ActiveProgramEXT(program)
+	return		void
+	param		program		UInt32 in value
+	category	EXT_separate_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+CreateShaderProgramEXT(type, string)
+	return		UInt32
+	param		type		GLenum in value
+	param		string		Char in array []
+	category	EXT_separate_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #378
+# NV_parameter_buffer_object2 commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_parameter_buffer_object2
+
+###############################################################################
+#
+# Extension #379
+# NV_shader_buffer_load commands
+#
+###############################################################################
+
+MakeBufferResidentNV(target, access)
+	return		void
+	param		target		GLenum in value
+	param		access		GLenum in value
+	category	NV_shader_buffer_load
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MakeBufferNonResidentNV(target)
+	return		void
+	param		target		GLenum in value
+	category	NV_shader_buffer_load
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+IsBufferResidentNV(target)
+	return		Boolean
+	param		target		GLenum in value
+	category	NV_shader_buffer_load
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MakeNamedBufferResidentNV(buffer, access)
+	return		void
+	param		buffer		UInt32 in value
+	param		access		GLenum in value
+	category	NV_shader_buffer_load
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MakeNamedBufferNonResidentNV(buffer)
+	return		void
+	param		buffer		UInt32 in value
+	category	NV_shader_buffer_load
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+IsNamedBufferResidentNV(buffer)
+	return		Boolean
+	param		buffer		UInt32 in value
+	category	NV_shader_buffer_load
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetBufferParameterui64vNV(target, pname, params)
+	return		void
+	param		target		GLenum in value
+	param		pname		GLenum in value
+	param		params		UInt64EXT out array [COMPSIZE(pname)]
+	category	NV_shader_buffer_load
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetNamedBufferParameterui64vNV(buffer, pname, params)
+	return		void
+	param		buffer		UInt32 in value
+	param		pname		GLenum in value
+	param		params		UInt64EXT out array [COMPSIZE(pname)]
+	category	NV_shader_buffer_load
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetIntegerui64vNV(value, result)
+	return		void
+	param		value		GLenum in value
+	param		result		UInt64EXT out array [COMPSIZE(value)]
+	category	NV_shader_buffer_load
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+Uniformui64NV(location, value)
+	return		void
+	param		location	Int32 in value
+	param		value		UInt64EXT in value
+	category	NV_shader_buffer_load
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniformui64vNV(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt64EXT in array [count]
+	category	NV_shader_buffer_load
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetUniformui64vNV(program, location, params)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		params		UInt64EXT out array [COMPSIZE(program/location)]
+	category	NV_shader_buffer_load
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformui64NV(program, location, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		value		UInt64EXT in value
+	category	NV_shader_buffer_load
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformui64vNV(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt64EXT in array [count]
+	category	NV_shader_buffer_load
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #380
+# NV_vertex_buffer_unified_memory commands
+#
+###############################################################################
+
+BufferAddressRangeNV(pname, index, address, length)
+	return		void
+	param		pname		GLenum in value
+	param		index		UInt32 in value
+	param		address		UInt64EXT in value
+	param		length		BufferSize in value
+	category	NV_vertex_buffer_unified_memory
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexFormatNV(size, type, stride)
+	return		void
+	param		size		Int32 in value
+	param		type		GLenum in value
+	param		stride		SizeI in value
+	category	NV_vertex_buffer_unified_memory
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+NormalFormatNV(type, stride)
+	return		void
+	param		type		GLenum in value
+	param		stride		SizeI in value
+	category	NV_vertex_buffer_unified_memory
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ColorFormatNV(size, type, stride)
+	return		void
+	param		size		Int32 in value
+	param		type		GLenum in value
+	param		stride		SizeI in value
+	category	NV_vertex_buffer_unified_memory
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+IndexFormatNV(type, stride)
+	return		void
+	param		type		GLenum in value
+	param		stride		SizeI in value
+	category	NV_vertex_buffer_unified_memory
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TexCoordFormatNV(size, type, stride)
+	return		void
+	param		size		Int32 in value
+	param		type		GLenum in value
+	param		stride		SizeI in value
+	category	NV_vertex_buffer_unified_memory
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+EdgeFlagFormatNV(stride)
+	return		void
+	param		stride		SizeI in value
+	category	NV_vertex_buffer_unified_memory
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+SecondaryColorFormatNV(size, type, stride)
+	return		void
+	param		size		Int32 in value
+	param		type		GLenum in value
+	param		stride		SizeI in value
+	category	NV_vertex_buffer_unified_memory
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+FogCoordFormatNV(type, stride)
+	return		void
+	param		type		GLenum in value
+	param		stride		SizeI in value
+	category	NV_vertex_buffer_unified_memory
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribFormatNV(index, size, type, normalized, stride)
+	return		void
+	param		index		UInt32 in value
+	param		size		Int32 in value
+	param		type		GLenum in value
+	param		normalized	Boolean in value
+	param		stride		SizeI in value
+	category	NV_vertex_buffer_unified_memory
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribIFormatNV(index, size, type, stride)
+	return		void
+	param		index		UInt32 in value
+	param		size		Int32 in value
+	param		type		GLenum in value
+	param		stride		SizeI in value
+	category	NV_vertex_buffer_unified_memory
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetIntegerui64i_vNV(value, index, result)
+	return		void
+	param		value		GLenum in value
+	param		index		UInt32 in value
+	param		result		UInt64EXT out array [COMPSIZE(value)]
+	category	NV_vertex_buffer_unified_memory
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #381
+# NV_texture_barrier commands
+#
+###############################################################################
+
+TextureBarrierNV()
+	return		void
+	category	NV_texture_barrier
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #382
+# AMD_shader_stencil_export commands
+#
+###############################################################################
+
+# (none)
+newcategory: AMD_shader_stencil_export
+
+###############################################################################
+#
+# Extension #383
+# AMD_seamless_cubemap_per_texture commands
+#
+###############################################################################
+
+# (none)
+newcategory: AMD_seamless_cubemap_per_texture
+
+###############################################################################
+#
+# Extension #384 - GLX_INTEL_swap_event
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #385
+# AMD_conservative_depth commands
+#
+###############################################################################
+
+# (none)
+newcategory: AMD_conservative_depth
+
+###############################################################################
+#
+# Extension #386
+# EXT_shader_image_load_store commands
+#
+###############################################################################
+
+BindImageTextureEXT(index, texture, level, layered, layer, access, format)
+	return		void
+	param		index		UInt32 in value
+	param		texture		UInt32 in value
+	param		level		Int32 in value
+	param		layered		Boolean in value
+	param		layer		Int32 in value
+	param		access		GLenum in value
+	param		format		Int32 in value
+	category	EXT_shader_image_load_store
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MemoryBarrierEXT(barriers)
+	return		void
+	param		barriers	GLbitfield in value
+	category	EXT_shader_image_load_store
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #387
+# EXT_vertex_attrib_64bit commands
+#
+###############################################################################
+
+VertexAttribL1dEXT(index, x)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float64 in value
+	category	EXT_vertex_attrib_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL2dEXT(index, x, y)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	category	EXT_vertex_attrib_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL3dEXT(index, x, y, z)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	param		z		Float64 in value
+	category	EXT_vertex_attrib_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL4dEXT(index, x, y, z, w)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	param		z		Float64 in value
+	param		w		Float64 in value
+	category	EXT_vertex_attrib_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL1dvEXT(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float64 in array [1]
+	category	EXT_vertex_attrib_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL2dvEXT(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float64 in array [2]
+	category	EXT_vertex_attrib_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL3dvEXT(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float64 in array [3]
+	category	EXT_vertex_attrib_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL4dvEXT(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float64 in array [4]
+	category	EXT_vertex_attrib_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribLPointerEXT(index, size, type, stride, pointer)
+	return		void
+	param		index		UInt32 in value
+	param		size		Int32 in value
+	param		type		GLenum in value
+	param		stride		SizeI in value
+	param		pointer		Void in array [size]
+	category	EXT_vertex_attrib_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetVertexAttribLdvEXT(index, pname, params)
+	return		void
+	param		index		UInt32 in value
+	param		pname		GLenum in value
+	param		params		Float64 out array [COMPSIZE(pname)]
+	category	EXT_vertex_attrib_64bit
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+# Also in ARB_vertex_array_64bit. Supposedly dependent on another
+# unregistered extension, EXT_direct_state_access_memory
+
+VertexArrayVertexAttribLOffsetEXT(vaobj, buffer, index, size, type, stride, offset)
+	return		void
+	param		vaobj		UInt32 in value
+	param		buffer		UInt32 in value
+	param		index		UInt32 in value
+	param		size		Int32 in value
+	param		type		GLenum in value
+	param		stride		SizeI in value
+	param		offset		BufferOffset in value
+	category	EXT_vertex_attrib_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #388
+# NV_gpu_program5 commands
+#
+###############################################################################
+
+# These commands require ARB_shader_subroutine
+
+ProgramSubroutineParametersuivNV(target, count, params)
+	return		void
+	param		target		GLenum in value
+	param		count		SizeI in value
+	param		params		UInt32 in array [count]
+	category	NV_gpu_program5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetProgramSubroutineParameteruivNV(target, index, param)
+	return		void
+	param		target		GLenum in value
+	param		index		UInt32 in value
+	param		param		UInt32 out array [COMPSIZE(target)]
+	category	NV_gpu_program5
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #389
+# NV_gpu_shader5 commands
+#
+###############################################################################
+
+Uniform1i64NV(location, x)
+	return		void
+	param		location	Int32 in value
+	param		x		Int64EXT in value
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform2i64NV(location, x, y)
+	return		void
+	param		location	Int32 in value
+	param		x		Int64EXT in value
+	param		y		Int64EXT in value
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform3i64NV(location, x, y, z)
+	return		void
+	param		location	Int32 in value
+	param		x		Int64EXT in value
+	param		y		Int64EXT in value
+	param		z		Int64EXT in value
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform4i64NV(location, x, y, z, w)
+	return		void
+	param		location	Int32 in value
+	param		x		Int64EXT in value
+	param		y		Int64EXT in value
+	param		z		Int64EXT in value
+	param		w		Int64EXT in value
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform1i64vNV(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Int64EXT in array [count]
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform2i64vNV(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Int64EXT in array [COMPSIZE(count*2)]
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform3i64vNV(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Int64EXT in array [COMPSIZE(count*3)]
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform4i64vNV(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Int64EXT in array [COMPSIZE(count*4)]
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform1ui64NV(location, x)
+	return		void
+	param		location	Int32 in value
+	param		x		UInt64EXT in value
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform2ui64NV(location, x, y)
+	return		void
+	param		location	Int32 in value
+	param		x		UInt64EXT in value
+	param		y		UInt64EXT in value
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform3ui64NV(location, x, y, z)
+	return		void
+	param		location	Int32 in value
+	param		x		UInt64EXT in value
+	param		y		UInt64EXT in value
+	param		z		UInt64EXT in value
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform4ui64NV(location, x, y, z, w)
+	return		void
+	param		location	Int32 in value
+	param		x		UInt64EXT in value
+	param		y		UInt64EXT in value
+	param		z		UInt64EXT in value
+	param		w		UInt64EXT in value
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform1ui64vNV(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt64EXT in array [count]
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform2ui64vNV(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt64EXT in array [COMPSIZE(count*2)]
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform3ui64vNV(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt64EXT in array [COMPSIZE(count*3)]
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform4ui64vNV(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt64EXT in array [COMPSIZE(count*4)]
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetUniformi64vNV(program, location, params)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		params		Int64EXT out array [COMPSIZE(location)]
+	category	NV_gpu_shader5
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform1i64NV(program, location, x)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		x		Int64EXT in value
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform2i64NV(program, location, x, y)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		x		Int64EXT in value
+	param		y		Int64EXT in value
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform3i64NV(program, location, x, y, z)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		x		Int64EXT in value
+	param		y		Int64EXT in value
+	param		z		Int64EXT in value
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform4i64NV(program, location, x, y, z, w)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		x		Int64EXT in value
+	param		y		Int64EXT in value
+	param		z		Int64EXT in value
+	param		w		Int64EXT in value
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform1i64vNV(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Int64EXT in array [count]
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform2i64vNV(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Int64EXT in array [COMPSIZE(count*2)]
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform3i64vNV(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Int64EXT in array [COMPSIZE(count*3)]
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform4i64vNV(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Int64EXT in array [COMPSIZE(count*4)]
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform1ui64NV(program, location, x)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		x		UInt64EXT in value
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform2ui64NV(program, location, x, y)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		x		UInt64EXT in value
+	param		y		UInt64EXT in value
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform3ui64NV(program, location, x, y, z)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		x		UInt64EXT in value
+	param		y		UInt64EXT in value
+	param		z		UInt64EXT in value
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform4ui64NV(program, location, x, y, z, w)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		x		UInt64EXT in value
+	param		y		UInt64EXT in value
+	param		z		UInt64EXT in value
+	param		w		UInt64EXT in value
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform1ui64vNV(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt64EXT in array [count]
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform2ui64vNV(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt64EXT in array [COMPSIZE(count*2)]
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform3ui64vNV(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt64EXT in array [COMPSIZE(count*3)]
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform4ui64vNV(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt64EXT in array [COMPSIZE(count*4)]
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+#@ GetUniformui64vNV also in NV_shader_buffer_load
+
+###############################################################################
+#
+# Extension #390
+# NV_shader_buffer_store commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_shader_buffer_store
+
+###############################################################################
+#
+# Extension #391
+# NV_tessellation_program5 commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_tessellation_program5
+
+###############################################################################
+#
+# Extension #392
+# NV_vertex_attrib_integer_64bit commands
+#
+###############################################################################
+
+VertexAttribL1i64NV(index, x)
+	return		void
+	param		index		UInt32 in value
+	param		x		Int64EXT in value
+	category	NV_vertex_attrib_integer_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL2i64NV(index, x, y)
+	return		void
+	param		index		UInt32 in value
+	param		x		Int64EXT in value
+	param		y		Int64EXT in value
+	category	NV_vertex_attrib_integer_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL3i64NV(index, x, y, z)
+	return		void
+	param		index		UInt32 in value
+	param		x		Int64EXT in value
+	param		y		Int64EXT in value
+	param		z		Int64EXT in value
+	category	NV_vertex_attrib_integer_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL4i64NV(index, x, y, z, w)
+	return		void
+	param		index		UInt32 in value
+	param		x		Int64EXT in value
+	param		y		Int64EXT in value
+	param		z		Int64EXT in value
+	param		w		Int64EXT in value
+	category	NV_vertex_attrib_integer_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL1i64vNV(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int64EXT in array [1]
+	category	NV_vertex_attrib_integer_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL2i64vNV(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int64EXT in array [2]
+	category	NV_vertex_attrib_integer_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL3i64vNV(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int64EXT in array [3]
+	category	NV_vertex_attrib_integer_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL4i64vNV(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int64EXT in array [4]
+	category	NV_vertex_attrib_integer_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL1ui64NV(index, x)
+	return		void
+	param		index		UInt32 in value
+	param		x		UInt64EXT in value
+	category	NV_vertex_attrib_integer_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL2ui64NV(index, x, y)
+	return		void
+	param		index		UInt32 in value
+	param		x		UInt64EXT in value
+	param		y		UInt64EXT in value
+	category	NV_vertex_attrib_integer_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL3ui64NV(index, x, y, z)
+	return		void
+	param		index		UInt32 in value
+	param		x		UInt64EXT in value
+	param		y		UInt64EXT in value
+	param		z		UInt64EXT in value
+	category	NV_vertex_attrib_integer_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL4ui64NV(index, x, y, z, w)
+	return		void
+	param		index		UInt32 in value
+	param		x		UInt64EXT in value
+	param		y		UInt64EXT in value
+	param		z		UInt64EXT in value
+	param		w		UInt64EXT in value
+	category	NV_vertex_attrib_integer_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL1ui64vNV(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt64EXT in array [1]
+	category	NV_vertex_attrib_integer_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL2ui64vNV(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt64EXT in array [2]
+	category	NV_vertex_attrib_integer_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL3ui64vNV(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt64EXT in array [3]
+	category	NV_vertex_attrib_integer_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL4ui64vNV(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt64EXT in array [4]
+	category	NV_vertex_attrib_integer_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetVertexAttribLi64vNV(index, pname, params)
+	return		void
+	param		index		UInt32 in value
+	param		pname		GLenum in value
+	param		params		Int64EXT out array [COMPSIZE(pname)]
+	category	NV_vertex_attrib_integer_64bit
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetVertexAttribLui64vNV(index, pname, params)
+	return		void
+	param		index		UInt32 in value
+	param		pname		GLenum in value
+	param		params		UInt64EXT out array [COMPSIZE(pname)]
+	category	NV_vertex_attrib_integer_64bit
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+#@ VertexAttribLFormatNV also requires NV_vertex_buffer_unified_memory
+
+VertexAttribLFormatNV(index, size, type, stride)
+	return		void
+	param		index		UInt32 in value
+	param		size		Int32 in value
+	param		type		GLenum in value
+	param		stride		SizeI in value
+	category	NV_vertex_attrib_integer_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #393
+# NV_multisample_coverage commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_multisample_coverage
+
+###############################################################################
+#
+# Extension #394
+# AMD_name_gen_delete commands
+#
+###############################################################################
+
+GenNamesAMD(identifier, num, names)
+	return		void
+	param		identifier	GLenum in value
+	param		num		UInt32 in value
+	param		names		UInt32 out array [num]
+	category	AMD_name_gen_delete
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DeleteNamesAMD(identifier, num, names)
+	return		void
+	param		identifier	GLenum in value
+	param		num		UInt32 in value
+	param		names		UInt32 in array [num]
+	category	AMD_name_gen_delete
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+IsNameAMD(identifier, name)
+	return		Boolean
+	param		identifier	GLenum in value
+	param		name		UInt32 in value
+	category	AMD_name_gen_delete
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #395
+# AMD_debug_output commands
+#
+###############################################################################
+
+DebugMessageEnableAMD(category, severity, count, ids, enabled)
+	return		void
+	param		category	GLenum in value
+	param		severity	GLenum in value
+	param		count		SizeI in value
+	param		ids		UInt32 in array [count]
+	param		enabled		Boolean in value
+	category	AMD_debug_output
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DebugMessageInsertAMD(category, severity, id, length, buf)
+	return		void
+	param		category	GLenum in value
+	param		severity	GLenum in value
+	param		id		UInt32 in value
+	param		length		SizeI in value
+	param		buf		Char in array [length]
+	category	AMD_debug_output
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DebugMessageCallbackAMD(callback, userParam)
+	return		void
+	param		callback	GLDEBUGPROCAMD in value
+	param		userParam	Void out reference
+	category	AMD_debug_output
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetDebugMessageLogAMD(count, bufsize, categories, severities, ids, lengths, message)
+	return		UInt32
+	param		count		UInt32 in value
+	param		bufsize		SizeI in value
+	param		categories	GLenum out array [count]
+	param		severities	UInt32 out array [count]
+	param		ids		UInt32 out array [count]
+	param		lengths		SizeI out array [count]
+	param		message		Char out array [bufsize]
+	category	AMD_debug_output
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #396
+# NV_vdpau_interop commands
+#
+###############################################################################
+
+VDPAUInitNV(vdpDevice, getProcAddress)
+	return		void
+	param		vdpDevice	Void in reference
+	param		getProcAddress	Void in reference
+	category	NV_vdpau_interop
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VDPAUFiniNV()
+	return		void
+	category	NV_vdpau_interop
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VDPAURegisterVideoSurfaceNV(vdpSurface, target, numTextureNames, textureNames)
+	return		vdpauSurfaceNV
+	param		vdpSurface	Void in reference
+	param		target		GLenum in value
+	param		numTextureNames SizeI in value
+	param		textureNames	UInt32 in array [numTextureNames]
+	category	NV_vdpau_interop
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VDPAURegisterOutputSurfaceNV(vdpSurface, target, numTextureNames, textureNames)
+	return		vdpauSurfaceNV
+	param		vdpSurface	Void out reference
+	param		target		GLenum in value
+	param		numTextureNames SizeI in value
+	param		textureNames	UInt32 in array [numTextureNames]
+	category	NV_vdpau_interop
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VDPAUIsSurfaceNV(surface)
+	return		void
+	param		surface		vdpauSurfaceNV in value
+	category	NV_vdpau_interop
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VDPAUUnregisterSurfaceNV(surface)
+	return		void
+	param		surface		vdpauSurfaceNV in value
+	category	NV_vdpau_interop
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VDPAUGetSurfaceivNV(surface, pname, bufSize, length, values)
+	return		void
+	param		surface		vdpauSurfaceNV in value
+	param		pname		GLenum in value
+	param		bufSize		SizeI in value
+	param		length		SizeI out reference
+	param		values		Int32 out array [length]
+	category	NV_vdpau_interop
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VDPAUSurfaceAccessNV(surface, access)
+	return		void
+	param		surface		vdpauSurfaceNV in value
+	param		access		GLenum in value
+	category	NV_vdpau_interop
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VDPAUMapSurfacesNV(numSurfaces, surfaces)
+	return		void
+	param		numSurfaces	SizeI in value
+	param		surfaces	vdpauSurfaceNV in array [numSurfaces]
+	category	NV_vdpau_interop
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VDPAUUnmapSurfacesNV(numSurface, surfaces)
+	return		void
+	param		numSurface	SizeI in value
+	param		surfaces	vdpauSurfaceNV in array [numSurface]
+	category	NV_vdpau_interop
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+
+###############################################################################
+#
+# Extension #397
+# AMD_transform_feedback3_lines_triangles commands
+#
+###############################################################################
+
+# (none)
+newcategory: AMD_transform_feedback3_lines_triangles
+
+###############################################################################
+#
+# Extension #398 - GLX_AMD_gpu_association
+# Extension #399 - GLX_EXT_create_context_es2_profile
+# Extension #400 - WGL_EXT_create_context_es2_profile
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #401
+# AMD_depth_clamp_separate commands
+#
+###############################################################################
+
+# (none)
+newcategory: AMD_depth_clamp_separate
+
+###############################################################################
+#
+# Extension #402
+# EXT_texture_sRGB_decode commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_texture_sRGB_decode
+
+###############################################################################
+#
+# Extension #403
+# NV_texture_multisample commands
+#
+###############################################################################
+
+TexImage2DMultisampleCoverageNV(target, coverageSamples, colorSamples, internalFormat, width, height, fixedSampleLocations)
+	return		void
+	param		target		GLenum in value
+	param		coverageSamples SizeI in value
+	param		colorSamples	SizeI in value
+	param		internalFormat	Int32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		fixedSampleLocations	Boolean in value
+	category	NV_texture_multisample
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TexImage3DMultisampleCoverageNV(target, coverageSamples, colorSamples, internalFormat, width, height, depth, fixedSampleLocations)
+	return		void
+	param		target		GLenum in value
+	param		coverageSamples SizeI in value
+	param		colorSamples	SizeI in value
+	param		internalFormat	Int32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		fixedSampleLocations	Boolean in value
+	category	NV_texture_multisample
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TextureImage2DMultisampleNV(texture, target, samples, internalFormat, width, height, fixedSampleLocations)
+	return		void
+	param		texture		UInt32 in value
+	param		target		GLenum in value
+	param		samples		SizeI in value
+	param		internalFormat	Int32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		fixedSampleLocations	Boolean in value
+	category	NV_texture_multisample
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TextureImage3DMultisampleNV(texture, target, samples, internalFormat, width, height, depth, fixedSampleLocations)
+	return		void
+	param		texture		UInt32 in value
+	param		target		GLenum in value
+	param		samples		SizeI in value
+	param		internalFormat	Int32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		fixedSampleLocations	Boolean in value
+	category	NV_texture_multisample
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TextureImage2DMultisampleCoverageNV(texture, target, coverageSamples, colorSamples, internalFormat, width, height, fixedSampleLocations)
+	return		void
+	param		texture		UInt32 in value
+	param		target		GLenum in value
+	param		coverageSamples SizeI in value
+	param		colorSamples	SizeI in value
+	param		internalFormat	Int32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		fixedSampleLocations	Boolean in value
+	category	NV_texture_multisample
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TextureImage3DMultisampleCoverageNV(texture, target, coverageSamples, colorSamples, internalFormat, width, height, depth, fixedSampleLocations)
+	return		void
+	param		texture		UInt32 in value
+	param		target		GLenum in value
+	param		coverageSamples SizeI in value
+	param		colorSamples	SizeI in value
+	param		internalFormat	Int32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		fixedSampleLocations	Boolean in value
+	category	NV_texture_multisample
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #404
+# AMD_blend_minmax_factor commands
+#
+###############################################################################
+
+# (none)
+newcategory: AMD_blend_minmax_factor
+
+###############################################################################
+#
+# Extension #405
+# AMD_sample_positions commands
+#
+###############################################################################
+
+SetMultisamplefvAMD(pname, index, val)
+	return		void
+	param		pname		GLenum in value
+	param		index		UInt32 in value
+	param		val		Float32 in array [2]
+	category	AMD_sample_positions
+	glxflags	ignore
+	version		3.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #406
+# EXT_x11_sync_object commands
+#
+###############################################################################
+
+ImportSyncEXT(external_sync_type, external_sync, flags)
+	return		sync
+	param		external_sync_type  GLenum in value
+	param		external_sync	Intptr in value
+	param		flags		GLbitfield in value
+	category	EXT_x11_sync_object
+	glxflags	ignore
+	version		3.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #407 - WGL_NV_DX_interop
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #408
+# AMD_multi_draw_indirect commands
+#
+###############################################################################
+
+MultiDrawArraysIndirectAMD(mode, indirect, primcount, stride)
+	return		void
+	param		mode		GLenum in value
+	param		indirect	Void in array []
+	param		primcount	SizeI in value
+	param		stride		SizeI in value
+	category	AMD_multi_draw_indirect
+	version		4.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MultiDrawElementsIndirectAMD(mode, type, indirect, primcount, stride)
+	return		void
+	param		mode		GLenum in value
+	param		type		GLenum in value
+	param		indirect	Void in array []
+	param		primcount	SizeI in value
+	param		stride		SizeI in value
+	category	AMD_multi_draw_indirect
+	version		4.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #409
+# EXT_framebuffer_multisample_blit_scaled commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_framebuffer_multisample_blit_scaled
+
+###############################################################################
+#
+# Extension #410
+# NV_path_rendering commands
+#
+###############################################################################
+
+# PATH NAME MANAGMENT
+
+GenPathsNV(range)
+	return		Path
+	param		range		    SizeI in value
+	category	NV_path_rendering
+	dlflags		notlistable
+	version		1.1
+	extension
+
+DeletePathsNV(path, range)
+	return		void
+	param		path		Path in value
+	param		range		SizeI in value
+	dlflags		notlistable
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+IsPathNV(path)
+	return		Boolean
+	param		path	     Path in value
+	dlflags		notlistable
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+# PATH SPECIFICATION COMMANDS
+
+PathCommandsNV(path, numCommands, commands, numCoords, coordType, coords)
+	return		void
+	param		path		Path in value
+	param		numCommands	SizeI in value
+	param		commands	PathCommand in array [numCommands]
+	param		numCoords	SizeI in value
+	param		coordType	PathCoordType in value
+	param		coords		Void in array [COMPSIZE(numCoords,coordType)]
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+PathCoordsNV(path, numCoords, coordType, coords)
+	return		void
+	param		path		Path in value
+	param		numCoords	SizeI in value
+	param		coordType	PathCoordType in value
+	param		coords		Void in array [COMPSIZE(numCoords,coordType)]
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+PathSubCommandsNV(path, commandStart, commandsToDelete, numCommands, commands, numCoords, coordType, coords)
+	return		void
+	param		path		Path in value
+	param		commandStart	SizeI in value
+	param		commandsToDelete SizeI in value
+	param		numCommands	SizeI in value
+	param		commands	PathCommand in array [numCommands]
+	param		numCoords	SizeI in value
+	param		coordType	PathCoordType in value
+	param		coords		Void in array [COMPSIZE(numCoords,coordType)]
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+PathSubCoordsNV(path, coordStart, numCoords, coordType, coords)
+	return		void
+	param		path		Path in value
+	param		coordStart	SizeI in value
+	param		numCoords	SizeI in value
+	param		coordType	PathCoordType in value
+	param		coords		Void in array [COMPSIZE(numCoords,coordType)]
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+PathStringNV(path, format, length, pathString)
+	return		void
+	param		path		Path in value
+	param		format		PathStringFormat in value
+	param		length		SizeI in value
+	param		pathString	Void in array [length]
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+PathGlyphsNV(firstPathName, fontTarget, fontName, fontStyle, numGlyphs, type, charcodes, handleMissingGlyphs, pathParameterTemplate, emScale)
+	return		void
+	param		firstPathName	Path in value
+	param		fontTarget	PathFontTarget in value
+	param		fontName	Void in array [COMPSIZE(fontTarget,fontName)]
+	param		fontStyle	PathFontStyle in value
+	param		numGlyphs	SizeI in value
+	param		type		PathElementType in value
+	param		charcodes	Void in array [COMPSIZE(numGlyphs,type,charcodes)]
+	param		handleMissingGlyphs PathHandleMissingGlyphs in value
+	param		pathParameterTemplate Path in value
+	param		emScale		Float32 in value
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+PathGlyphRangeNV(firstPathName, fontTarget, fontName, fontStyle, firstGlyph, numGlyphs, handleMissingGlyphs, pathParameterTemplate, emScale)
+	return		void
+	param		firstPathName	Path in value
+	param		fontTarget	PathFontTarget in value
+	param		fontName	Void in array [COMPSIZE(fontTarget,fontName)]
+	param		fontStyle	PathFontStyle in value
+	param		firstGlyph	UInt32 in value
+	param		numGlyphs	SizeI in value
+	param		handleMissingGlyphs PathHandleMissingGlyphs in value
+	param		pathParameterTemplate Path in value
+	param		emScale		Float32 in value
+	category	NV_path_rendering
+	version		1.1
+	extension
+	dlflags		prepad
+
+WeightPathsNV(resultPath, numPaths, paths, weights)
+	return		void
+	param		resultPath	Path in value
+	param		numPaths	SizeI in value
+	param		paths		Path in array [numPaths]
+	param		weights		Float32 in array [numPaths]
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+CopyPathNV(resultPath, srcPath)
+	return		void
+	param		resultPath	Path in value
+	param		srcPath		Path in value
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+InterpolatePathsNV(resultPath, pathA, pathB, weight)
+	return		void
+	param		resultPath	Path in value
+	param		pathA		Path in value
+	param		pathB		Path in value
+	param		weight		Float32 in value
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+TransformPathNV(resultPath, srcPath, transformType, transformValues)
+	return		void
+	param		resultPath	Path in value
+	param		srcPath		Path in value
+	param		transformType	PathTransformType in value
+	param		transformValues Float32 in array [COMPSIZE(transformType)]
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+PathParameterivNV(path, pname, value)
+	return		void
+	param		path		Path in value
+	param		pname		PathParameter in value
+	param		value		Int32 in array [COMPSIZE(pname)]
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+PathParameteriNV(path, pname, value)
+	return		void
+	param		path		Path in value
+	param		pname		PathParameter in value
+	param		value		Int32 in value
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+PathParameterfvNV(path, pname, value)
+	return		void
+	param		path		Path in value
+	param		pname		PathParameter in value
+	param		value		Float32 in array [COMPSIZE(pname)]
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+PathParameterfNV(path, pname, value)
+	return		void
+	param		path		Path in value
+	param		pname		PathParameter in value
+	param		value		Float32 in value
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+PathDashArrayNV(path, dashCount, dashArray)
+	return		void
+	param		path		Path in value
+	param		dashCount	SizeI in value
+	param		dashArray	Float32 in array [dashCount]
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+# PATH STENCILING
+
+PathStencilFuncNV(func, ref, mask)
+	return		void
+	param		func		StencilFunction in value
+	param		ref		ClampedStencilValue in value
+	param		mask		MaskedStencilValue in value
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+PathStencilDepthOffsetNV(factor, units)
+	return		void
+	param		factor		Float32 in value
+	param		units		Float32 in value
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+StencilFillPathNV(path, fillMode, mask)
+	return		void
+	param		path		Path in value
+	param		fillMode	PathFillMode in value
+	param		mask		MaskedStencilValue in value
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+StencilStrokePathNV(path, reference, mask)
+	return		void
+	param		path		Path in value
+	param		reference	StencilValue in value
+	param		mask		MaskedStencilValue in value
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+StencilFillPathInstancedNV(numPaths, pathNameType, paths, pathBase, fillMode, mask, transformType, transformValues)
+	return		void
+	param		numPaths	SizeI in value
+	param		pathNameType	PathElementType in value
+	param		paths		PathElement in array [COMPSIZE(numPaths,pathNameType,paths)]
+	param		pathBase	Path in value
+	param		fillMode	PathFillMode in value
+	param		mask		MaskedStencilValue in value
+	param		transformType	PathTransformType in value
+	param		transformValues Float32 in array [COMPSIZE(numPaths,transformType)]
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+StencilStrokePathInstancedNV(numPaths, pathNameType, paths, pathBase, reference, mask, transformType, transformValues)
+	return		void
+	param		numPaths	SizeI in value
+	param		pathNameType	PathElementType in value
+	param		paths		PathElement in array [COMPSIZE(numPaths,pathNameType,paths)]
+	param		pathBase	Path in value
+	param		reference	StencilValue in value
+	param		mask		MaskedStencilValue in value
+	param		transformType	PathTransformType in value
+	param		transformValues Float32 in array [COMPSIZE(numPaths,transformType)]
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+# PATH COVERING
+
+PathCoverDepthFuncNV(func)
+	return		void
+	param		func		DepthFunction in value
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+PathColorGenNV(color, genMode, colorFormat, coeffs)
+	return		void
+	param		color		PathColor in value
+	param		genMode		PathGenMode in value
+	param		colorFormat	PathColorFormat in value
+	param		coeffs		Float32 in array [COMPSIZE(genMode,colorFormat)]
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+PathTexGenNV(texCoordSet, genMode, components, coeffs)
+	return		void
+	param		texCoordSet	PathColor in value
+	param		genMode		PathGenMode in value
+	param		components	Int32 in value
+	param		coeffs		Float32 in array [COMPSIZE(genMode,components)]
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+PathFogGenNV(genMode)
+	return		void
+	param		genMode		PathGenMode in value
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+CoverFillPathNV(path, coverMode)
+	return		void
+	param		path		Path in value
+	param		coverMode	PathCoverMode in value
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+CoverStrokePathNV(path, coverMode)
+	return		void
+	param		path		Path in value
+	param		coverMode	PathCoverMode in value
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+CoverFillPathInstancedNV(numPaths, pathNameType, paths, pathBase, coverMode, transformType, transformValues)
+	return		void
+	param		numPaths	SizeI in value
+	param		pathNameType	PathElementType in value
+	param		paths		PathElement in array [COMPSIZE(numPaths,pathNameType,paths)]
+	param		pathBase	Path in value
+	param		coverMode	PathCoverMode in value
+	param		transformType	PathTransformType in value
+	param		transformValues Float32 in array [COMPSIZE(numPaths,transformType)]
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+CoverStrokePathInstancedNV(numPaths, pathNameType, paths, pathBase, coverMode, transformType, transformValues)
+	return		void
+	param		numPaths	SizeI in value
+	param		pathNameType	PathElementType in value
+	param		paths		PathElement in array [COMPSIZE(numPaths,pathNameType,paths)]
+	param		pathBase	Path in value
+	param		coverMode	PathCoverMode in value
+	param		transformType	PathTransformType in value
+	param		transformValues Float32 in array [COMPSIZE(numPaths,transformType)]
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+# PATH QUERIES
+
+GetPathParameterivNV(path, pname, value)
+	return		void
+	param		path		Path in value
+	param		pname		PathParameter in value
+	param		value		Int32 out array [4]
+	category	NV_path_rendering
+	dlflags		notlistable
+	version		1.1
+	extension
+
+GetPathParameterfvNV(path, pname, value)
+	return		void
+	param		path		Path in value
+	param		pname		PathParameter in value
+	param		value		Float32 out array [4]
+	category	NV_path_rendering
+	dlflags		notlistable
+	version		1.1
+	extension
+
+GetPathCommandsNV(path, commands)
+	return		void
+	param		path		Path in value
+	param		commands	PathCommand out array [COMPSIZE(path)]
+	category	NV_path_rendering
+	dlflags		notlistable
+	version		1.1
+	extension
+
+GetPathCoordsNV(path, coords)
+	return		void
+	param		path		Path in value
+	param		coords		Float32 out array [COMPSIZE(path)]
+	category	NV_path_rendering
+	dlflags		notlistable
+	version		1.1
+	extension
+
+GetPathDashArrayNV(path, dashArray)
+	return		void
+	param		path		Path in value
+	param		dashArray	Float32 out array [COMPSIZE(path)]
+	category	NV_path_rendering
+	dlflags		notlistable
+	version		1.1
+	extension
+
+GetPathMetricsNV(metricQueryMask, numPaths, pathNameType, paths, pathBase, stride, metrics)
+	return		void
+	param		metricQueryMask PathMetricMask in value
+	param		numPaths	SizeI in value
+	param		pathNameType	PathElementType in value
+	param		paths		PathElement in array [COMPSIZE(numPaths,pathNameType,paths)]
+	param		pathBase	Path in value
+	param		stride		SizeI in value
+	param		metrics		Float32 out array [COMPSIZE(metricQueryMask,numPaths,stride)]
+	category	NV_path_rendering
+	dlflags		notlistable
+	version		1.1
+	extension
+
+GetPathMetricRangeNV(metricQueryMask, firstPathName, numPaths, stride, metrics)
+	return		void
+	param		metricQueryMask PathMetricMask in value
+	param		firstPathName	Path in value
+	param		numPaths	SizeI in value
+	param		stride		SizeI in value
+	param		metrics		Float32 out array [COMPSIZE(metricQueryMask,numPaths,stride)]
+	category	NV_path_rendering
+	dlflags		notlistable
+	version		1.1
+	extension
+
+GetPathSpacingNV(pathListMode, numPaths, pathNameType, paths, pathBase, advanceScale, kerningScale, transformType, returnedSpacing)
+	return		void
+	param		pathListMode	PathListMode in value
+	param		numPaths	SizeI in value
+	param		pathNameType	PathElementType in value
+	param		paths		PathElement in array [COMPSIZE(numPaths,pathNameType,paths)]
+	param		pathBase	Path in value
+	param		advanceScale	Float32 in value
+	param		kerningScale	Float32 in value
+	param		transformType	PathTransformType in value
+	param		returnedSpacing Float32 out array [COMPSIZE(pathListMode,numPaths)]
+	category	NV_path_rendering
+	dlflags		notlistable
+	version		1.1
+	extension
+
+GetPathColorGenivNV(color, pname, value)
+	return		void
+	param		color		PathColor in value
+	param		pname		PathGenMode in value
+	param		value		Int32 out array [COMPSIZE(pname)]
+	category	NV_path_rendering
+	dlflags		notlistable
+	version		1.1
+	extension
+
+GetPathColorGenfvNV(color, pname, value)
+	return		void
+	param		color		PathColor in value
+	param		pname		PathGenMode in value
+	param		value		Float32 out array [COMPSIZE(pname)]
+	category	NV_path_rendering
+	dlflags		notlistable
+	version		1.1
+	extension
+
+GetPathTexGenivNV(texCoordSet, pname, value)
+	return		void
+	param		texCoordSet	TextureUnit in value
+	param		pname		PathGenMode in value
+	param		value		Int32 out array [COMPSIZE(pname)]
+	category	NV_path_rendering
+	dlflags		notlistable
+	version		1.1
+	extension
+
+GetPathTexGenfvNV(texCoordSet, pname, value)
+	return		void
+	param		texCoordSet	TextureUnit in value
+	param		pname		PathGenMode in value
+	param		value		Float32 out array [COMPSIZE(pname)]
+	category	NV_path_rendering
+	dlflags		notlistable
+	version		1.1
+	extension
+
+IsPointInFillPathNV(path, mask, x, y)
+	return		Boolean
+	param		path		Path in value
+	param		mask		MaskedStencilValue in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	category	NV_path_rendering
+	dlflags		notlistable
+	version		1.1
+	extension
+
+IsPointInStrokePathNV(path, x, y)
+	return		Boolean
+	param		path		Path in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	category	NV_path_rendering
+	dlflags		notlistable
+	version		1.1
+	extension
+
+GetPathLengthNV(path, startSegment, numSegments)
+	return		Float32
+	param		path		Path in value
+	param		startSegment	SizeI in value
+	param		numSegments	SizeI in value
+	category	NV_path_rendering
+	dlflags		notlistable
+	version		1.1
+	extension
+
+PointAlongPathNV(path, startSegment, numSegments, distance, x, y, tangentX, tangentY)
+	return		Boolean
+	param		path		Path in value
+	param		startSegment	SizeI in value
+	param		numSegments	SizeI in value
+	param		distance	Float32 in value
+	param		x		Float32 out array [1]
+	param		y		Float32 out array [1]
+	param		tangentX	Float32 out array [1]
+	param		tangentY	Float32 out array [1]
+	category	NV_path_rendering
+	dlflags		notlistable
+	version		1.1
+	extension
+
+###############################################################################
+#
+# Extension #411
+# AMD_pinned_memory commands
+#
+###############################################################################
+
+# (none)
+newcategory: AMD_pinned_memory
+
+###############################################################################
+#
+# Extension #412 - WGL_NV_DX_interop2
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #413 - AMD_stencil_operation_extended
+#
+###############################################################################
+
+StencilOpValueAMD(face, value)
+	return		void
+	param		face		StencilFaceDirection in value
+	param		value		UInt32 in value
+	category	AMD_stencil_operation_extended
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #414 - GLX_EXT_swap_control_tear
+# Extension #415 - WGL_EXT_swap_control_tear
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #416
+# AMD_vertex_shader_viewport_index commands
+#
+###############################################################################
+
+# (none)
+newcategory: AMD_vertex_shader_viewport_index
+
+###############################################################################
+#
+# Extension #417
+# AMD_vertex_shader_layer commands
+#
+###############################################################################
+
+# (none)
+newcategory: AMD_vertex_shader_layer
+
+###############################################################################
+#
+# Extension #418
+# NV_bindless_texture commands
+#
+###############################################################################
+
+GetTextureHandleNV(texture)
+	return		UInt64
+	param		texture		UInt32 in value
+	category	NV_bindless_texture
+	dlflags		notlistable
+	version		4.0
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetTextureSamplerHandleNV(texture, sampler)
+	return		UInt64
+	param		texture		UInt32 in value
+	param		sampler		UInt32 in value
+	category	NV_bindless_texture
+	dlflags		notlistable
+	version		4.0
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+MakeTextureHandleResidentNV(handle)
+	return		void
+	param		handle		UInt64 in value
+	category	NV_bindless_texture
+	version		4.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MakeTextureHandleNonResidentNV(handle)
+	return		void
+	param		handle		UInt64 in value
+	category	NV_bindless_texture
+	version		4.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetImageHandleNV(texture, level, layered, layer, format)
+	return		UInt64
+	param		texture		UInt32 in value
+	param		level		Int32 in value
+	param		layered		Boolean in value
+	param		layer		Int32 in value
+	param		format		GLenum in value
+	category	NV_bindless_texture
+	dlflags		notlistable
+	version		4.0
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+MakeImageHandleResidentNV(handle, access)
+	return		void
+	param		handle		UInt64 in value
+	param		access		GLenum in value
+	category	NV_bindless_texture
+	version		4.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MakeImageHandleNonResidentNV(handle)
+	return		void
+	param		handle		UInt64 in value
+	category	NV_bindless_texture
+	version		4.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+UniformHandleui64NV(location, value)
+	return		void
+	param		location	Int32 in value
+	param		value		UInt64 in value
+	category	NV_bindless_texture
+	version		4.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+UniformHandleui64vNV(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt64 in array [count]
+	category	NV_bindless_texture
+	version		4.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformHandleui64NV(program, location, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		value		UInt64 in value
+	category	NV_bindless_texture
+	version		4.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformHandleui64vNV(program, location, count, values)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		values		UInt64 in array [count]
+	category	NV_bindless_texture
+	version		4.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+IsTextureHandleResidentNV(handle)
+	return		Boolean
+	param		handle		UInt64 in value
+	category	NV_bindless_texture
+	version		4.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+IsImageHandleResidentNV(handle)
+	return		Boolean
+	param		handle		UInt64 in value
+	category	NV_bindless_texture
+	version		4.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #419
+# NV_shader_atomic_float commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_shader_atomic_float
+
+[###############################################################################
+#
+# Extension #420
+# AMD_query_buffer_object commands
+#
+###############################################################################
+
+# (none)
+newcategory: AMD_query_buffer_object
+
+###############################################################################
+#
+# Extension #421
+# AMD_sparse_texture commands
+#
+###############################################################################
+
+TexStorageSparseAMD(target, internalFormat, width, height, depth, layers, flags)
+	return		void
+	param		target		GLenum in value
+	param		internalFormat	GLenum in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		layers		SizeI in value
+	param		flags		GLbitfield in value
+	category	AMD_sparse_texture
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TextureStorageSparseAMD(texture, target, internalFormat, width, height, depth, layers, flags)
+	return		void
+	param		texture		UInt32 in value
+	param		target		GLenum in value
+	param		internalFormat	GLenum in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		layers		SizeI in value
+	param		flags		GLbitfield in value
+	category	AMD_sparse_texture
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
diff --git a/xorg-server/hw/xwin/glx/gl.tm b/xorg-server/hw/xwin/glx/gl.tm
new file mode 100644
index 000000000..355a1c8f6
--- /dev/null
+++ b/xorg-server/hw/xwin/glx/gl.tm
@@ -0,0 +1,349 @@
+AccumOp,*,*,			    GLenum,*,*
+AlphaFunction,*,*,		    GLenum,*,*
+AttribMask,*,*,			    GLbitfield,*,*
+BeginMode,*,*,			    GLenum,*,*
+BinormalPointerTypeEXT,*,*,	    GLenum,*,*
+BlendEquationMode,*,*,		    GLenum,*,*
+BlendEquationModeEXT,*,*,	    GLenum,*,*
+BlendFuncSeparateParameterEXT,*,*,  GLenum,*,*
+BlendingFactorDest,*,*,		    GLenum,*,*
+BlendingFactorSrc,*,*,		    GLenum,*,*
+Boolean,*,*,			    GLboolean,*,*
+BooleanPointer,*,*,		    GLboolean*,*,*
+Char,*,*,			    GLchar,*,*
+CharPointer,*,*,		    GLchar*,*,*
+ConstCharPointer,*,*,		    GLchar* const,*,*
+CheckedFloat32,*,*,		    GLfloat,*,*
+CheckedInt32,*,*,		    GLint,*,*
+ClampColorTargetARB,*,*,	    GLenum,*,*
+ClampColorModeARB,*,*,		    GLenum,*,*
+ClampedColorF,*,*,		    GLclampf,*,*
+ClampedFloat32,*,*,		    GLclampf,*,*
+ClampedFloat64,*,*,		    GLclampd,*,*
+ClampedStencilValue,*,*,	    GLint,*,*
+ClearBufferMask,*,*,		    GLbitfield,*,*
+ClientAttribMask,*,*,		    GLbitfield,*,*
+ClipPlaneName,*,*,		    GLenum,*,*
+ColorB,*,*,			    GLbyte,*,*
+ColorD,*,*,			    GLdouble,*,*
+ColorF,*,*,			    GLfloat,*,*
+ColorI,*,*,			    GLint,*,*
+ColorIndexValueD,*,*,		    GLdouble,*,*
+ColorIndexValueF,*,*,		    GLfloat,*,*
+ColorIndexValueI,*,*,		    GLint,*,*
+ColorIndexValueS,*,*,		    GLshort,*,*
+ColorIndexValueUB,*,*,		    GLubyte,*,*
+ColorMaterialParameter,*,*,	    GLenum,*,*
+ColorPointerType,*,*,		    GLenum,*,*
+ColorS,*,*,			    GLshort,*,*
+ColorTableParameterPName,*,*,	    GLenum,*,*
+ColorTableParameterPNameSGI,*,*,    GLenum,*,*
+ColorTableTarget,*,*,		    GLenum,*,*
+ColorTableTargetSGI,*,*,	    GLenum,*,*
+ColorUB,*,*,			    GLubyte,*,*
+ColorUI,*,*,			    GLuint,*,*
+ColorUS,*,*,			    GLushort,*,*
+CombinerBiasNV,*,*,		    GLenum,*,*
+CombinerComponentUsageNV,*,*,	    GLenum,*,*
+CombinerMappingNV,*,*,		    GLenum,*,*
+CombinerParameterNV,*,*,	    GLenum,*,*
+CombinerPortionNV,*,*,		    GLenum,*,*
+CombinerRegisterNV,*,*,		    GLenum,*,*
+CombinerScaleNV,*,*,		    GLenum,*,*
+CombinerStageNV,*,*,		    GLenum,*,*
+CombinerVariableNV,*,*,		    GLenum,*,*
+CompressedTextureARB,*,*,	    GLvoid,*,*
+ControlPointNV,*,*,		    GLvoid,*,*
+ControlPointTypeNV,*,*,		    GLenum,*,*
+ConvolutionParameter,*,*,	    GLenum,*,*
+ConvolutionParameterEXT,*,*,	    GLenum,*,*
+ConvolutionTarget,*,*,		    GLenum,*,*
+ConvolutionTargetEXT,*,*,	    GLenum,*,*
+CoordD,*,*,			    GLdouble,*,*
+CoordF,*,*,			    GLfloat,*,*
+CoordI,*,*,			    GLint,*,*
+CoordS,*,*,			    GLshort,*,*
+CullFaceMode,*,*,		    GLenum,*,*
+CullParameterEXT,*,*,		    GLenum,*,*
+DepthFunction,*,*,		    GLenum,*,*
+DrawBufferMode,*,*,		    GLenum,*,*
+DrawBufferName,*,*,		    GLint,*,*
+DrawElementsType,*,*,		    GLenum,*,*
+ElementPointerTypeATI,*,*,	    GLenum,*,*
+EnableCap,*,*,			    GLenum,*,*
+ErrorCode,*,*,			    GLenum,*,*
+EvalMapsModeNV,*,*,		    GLenum,*,*
+EvalTargetNV,*,*,		    GLenum,*,*
+FeedbackElement,*,*,		    GLfloat,*,*
+FeedbackType,*,*,		    GLenum,*,*
+FenceNV,*,*,			    GLuint,*,*
+FenceConditionNV,*,*,		    GLenum,*,*
+FenceParameterNameNV,*,*,	    GLenum,*,*
+FfdMaskSGIX,*,*,		    GLbitfield,*,*
+FfdTargetSGIX,*,*,		    GLenum,*,*
+Float32,*,*,			    GLfloat,*,*
+Float32Pointer,*,*,		    GLfloat*,*,*
+Float64,*,*,			    GLdouble,*,*
+Float64Pointer,*,*,		    GLdouble*,*,*
+FogParameter,*,*,		    GLenum,*,*
+FogPointerTypeEXT,*,*,		    GLenum,*,*
+FogPointerTypeIBM,*,*,		    GLenum,*,*
+FragmentLightModelParameterSGIX,*,*,GLenum,*,*
+FragmentLightNameSGIX,*,*,	    GLenum,*,*
+FragmentLightParameterSGIX,*,*,     GLenum,*,*
+FramebufferAttachment,*,*,	    GLenum,*,*
+FramebufferTarget,*,*,		    GLenum,*,*
+FrontFaceDirection,*,*,		    GLenum,*,*
+FunctionPointer,*,*,		    _GLfuncptr,*,*
+GetColorTableParameterPName,*,*,    GLenum,*,*
+GetColorTableParameterPNameSGI,*,*, GLenum,*,*
+GetConvolutionParameterPName,*,*,   GLenum,*,*
+GetHistogramParameterPName,*,*,     GLenum,*,*
+GetHistogramParameterPNameEXT,*,*,  GLenum,*,*
+GetMapQuery,*,*,		    GLenum,*,*
+GetMinmaxParameterPName,*,*,	    GLenum,*,*
+GetMinmaxParameterPNameEXT,*,*,     GLenum,*,*
+GetPName,*,*,			    GLenum,*,*
+GetPointervPName,*,*,		    GLenum,*,*
+GetTextureParameter,*,*,	    GLenum,*,*
+HintMode,*,*,			    GLenum,*,*
+HintTarget,*,*,			    GLenum,*,*
+HintTargetPGI,*,*,		    GLenum,*,*
+HistogramTarget,*,*,		    GLenum,*,*
+HistogramTargetEXT,*,*,		    GLenum,*,*
+IglooFunctionSelectSGIX,*,*,	    GLenum,*,*
+IglooParameterSGIX,*,*,		    GLvoid,*,*
+ImageTransformPNameHP,*,*,	    GLenum,*,*
+ImageTransformTargetHP,*,*,	    GLenum,*,*
+IndexFunctionEXT,*,*,		    GLenum,*,*
+IndexMaterialParameterEXT,*,*,	    GLenum,*,*
+IndexPointerType,*,*,		    GLenum,*,*
+Int16,*,*,			    GLshort,*,*
+Int32,*,*,			    GLint,*,*
+Int8,*,*,			    GLbyte,*,*
+InterleavedArrayFormat,*,*,	    GLenum,*,*
+LightEnvParameterSGIX,*,*,	    GLenum,*,*
+LightModelParameter,*,*,	    GLenum,*,*
+LightName,*,*,			    GLenum,*,*
+LightParameter,*,*,		    GLenum,*,*
+LightTextureModeEXT,*,*,	    GLenum,*,*
+LightTexturePNameEXT,*,*,	    GLenum,*,*
+LineStipple,*,*,		    GLushort,*,*
+List,*,*,			    GLuint,*,*
+ListMode,*,*,			    GLenum,*,*
+ListNameType,*,*,		    GLenum,*,*
+ListParameterName,*,*,		    GLenum,*,*
+LogicOp,*,*,			    GLenum,*,*
+MapAttribParameterNV,*,*,	    GLenum,*,*
+MapParameterNV,*,*,		    GLenum,*,*
+MapTarget,*,*,			    GLenum,*,*
+MapTargetNV,*,*,		    GLenum,*,*
+MapTypeNV,*,*,			    GLenum,*,*
+MaskedColorIndexValueF,*,*,	    GLfloat,*,*
+MaskedColorIndexValueI,*,*,	    GLuint,*,*
+MaskedStencilValue,*,*,		    GLuint,*,*
+MaterialFace,*,*,		    GLenum,*,*
+MaterialParameter,*,*,		    GLenum,*,*
+MatrixIndexPointerTypeARB,*,*,	    GLenum,*,*
+MatrixMode,*,*,			    GLenum,*,*
+MatrixTransformNV,*,*,		    GLenum,*,*
+MeshMode1,*,*,			    GLenum,*,*
+MeshMode2,*,*,			    GLenum,*,*
+MinmaxTarget,*,*,		    GLenum,*,*
+MinmaxTargetEXT,*,*,		    GLenum,*,*
+NormalPointerType,*,*,		    GLenum,*,*
+NurbsCallback,*,*,		    GLenum,*,*
+NurbsObj,*,*,			    GLUnurbs*,*,*
+NurbsProperty,*,*,		    GLenum,*,*
+NurbsTrim,*,*,			    GLenum,*,*
+OcclusionQueryParameterNameNV,*,*,  GLenum,*,*
+PixelCopyType,*,*,		    GLenum,*,*
+PixelFormat,*,*,		    GLenum,*,*
+PixelInternalFormat,*,*,	    GLenum,*,*
+PixelMap,*,*,			    GLenum,*,*
+PixelStoreParameter,*,*,	    GLenum,*,*
+PixelTexGenModeSGIX,*,*,	    GLenum,*,*
+PixelTexGenParameterNameSGIS,*,*,   GLenum,*,*
+PixelTransferParameter,*,*,	    GLenum,*,*
+PixelTransformPNameEXT,*,*,	    GLenum,*,*
+PixelTransformTargetEXT,*,*,	    GLenum,*,*
+PixelType,*,*,			    GLenum,*,*
+PointParameterNameARB,*,*,	    GLenum,*,*
+PolygonMode,*,*,		    GLenum,*,*
+ProgramNV,*,*,			    GLuint,*,*
+ProgramCharacterNV,*,*,		    GLubyte,*,*
+ProgramParameterNV,*,*,		    GLenum,*,*
+ProgramParameterPName,*,*,	    GLenum,*,*
+QuadricCallback,*,*,		    GLenum,*,*
+QuadricDrawStyle,*,*,		    GLenum,*,*
+QuadricNormal,*,*,		    GLenum,*,*
+QuadricObj,*,*,			    GLUquadric*,*,*
+QuadricOrientation,*,*,		    GLenum,*,*
+ReadBufferMode,*,*,		    GLenum,*,*
+RenderbufferTarget,*,*,		    GLenum,*,*
+RenderingMode,*,*,		    GLenum,*,*
+ReplacementCodeSUN,*,*,		    GLuint,*,*
+ReplacementCodeTypeSUN,*,*,	    GLenum,*,*
+SamplePassARB,*,*,		    GLenum,*,*
+SamplePatternEXT,*,*,		    GLenum,*,*
+SamplePatternSGIS,*,*,		    GLenum,*,*
+SecondaryColorPointerTypeIBM,*,*,   GLenum,*,*
+SelectName,*,*,			    GLuint,*,*
+SeparableTarget,*,*,		    GLenum,*,*
+SeparableTargetEXT,*,*,		    GLenum,*,*
+ShadingModel,*,*,		    GLenum,*,*
+SizeI,*,*,			    GLsizei,*,*
+SpriteParameterNameSGIX,*,*,	    GLenum,*,*
+StencilFunction,*,*,		    GLenum,*,*
+StencilFaceDirection,*,*,	    GLenum,*,*
+StencilOp,*,*,			    GLenum,*,*
+StencilValue,*,*,		    GLint,*,*
+String,*,*,			    const GLubyte *,*,*
+StringName,*,*,			    GLenum,*,*
+TangentPointerTypeEXT,*,*,	    GLenum,*,*
+TessCallback,*,*,		    GLenum,*,*
+TessContour,*,*,		    GLenum,*,*
+TessProperty,*,*,		    GLenum,*,*
+TesselatorObj,*,*,		    GLUtesselator*,*,*
+TexCoordPointerType,*,*,	    GLenum,*,*
+Texture,*,*,			    GLuint,*,*
+TextureComponentCount,*,*,	    GLint,*,*
+TextureCoordName,*,*,		    GLenum,*,*
+TextureEnvParameter,*,*,	    GLenum,*,*
+TextureEnvTarget,*,*,		    GLenum,*,*
+TextureFilterSGIS,*,*,		    GLenum,*,*
+TextureGenParameter,*,*,	    GLenum,*,*
+TextureNormalModeEXT,*,*,	    GLenum,*,*
+TextureParameterName,*,*,	    GLenum,*,*
+TextureTarget,*,*,		    GLenum,*,*
+TextureUnit,*,*,		    GLenum,*,*
+UInt16,*,*,			    GLushort,*,*
+UInt32,*,*,			    GLuint,*,*
+UInt8,*,*,			    GLubyte,*,*
+VertexAttribEnum,*,*,		    GLenum,*,*
+VertexAttribEnumNV,*,*,		    GLenum,*,*
+VertexAttribPointerTypeNV,*,*,	    GLenum,*,*
+VertexPointerType,*,*,		    GLenum,*,*
+VertexWeightPointerTypeEXT,*,*,     GLenum,*,*
+Void,*,*,			    GLvoid,*,*
+VoidPointer,*,*,		    GLvoid*,*,*
+ConstVoidPointer,*,*,		    GLvoid* const,*,*
+WeightPointerTypeARB,*,*,	    GLenum,*,*
+WinCoord,*,*,			    GLint,*,*
+void,*,*,			    *,*,*
+ArrayObjectPNameATI,*,*,	    GLenum,*,*
+ArrayObjectUsageATI,*,*,	    GLenum,*,*,
+ConstFloat32,*,*,		    GLfloat,*,*
+ConstInt32,*,*,			    GLint,*,*
+ConstUInt32,*,*,		    GLuint,*,*
+ConstVoid,*,*,			    GLvoid,*,*
+DataTypeEXT,*,*,		    GLenum,*,*
+FragmentOpATI,*,*,		    GLenum,*,*
+GetTexBumpParameterATI,*,*,	    GLenum,*,*
+GetVariantValueEXT,*,*,		    GLenum,*,*
+ParameterRangeEXT,*,*,		    GLenum,*,*
+PreserveModeATI,*,*,		    GLenum,*,*
+ProgramFormatARB,*,*,		    GLenum,*,*
+ProgramTargetARB,*,*,		    GLenum,*,*
+ProgramTarget,*,*,		    GLenum,*,*
+ProgramPropertyARB,*,*,		    GLenum,*,*
+ProgramStringPropertyARB,*,*,	    GLenum,*,*
+ScalarType,*,*,			    GLenum,*,*
+SwizzleOpATI,*,*,		    GLenum,*,*
+TexBumpParameterATI,*,*,	    GLenum,*,*
+VariantCapEXT,*,*,		    GLenum,*,*
+VertexAttribPointerPropertyARB,*,*, GLenum,*,*
+VertexAttribPointerTypeARB,*,*,     GLenum,*,*
+VertexAttribPropertyARB,*,*,	    GLenum,*,*
+VertexShaderCoordOutEXT,*,*,	    GLenum,*,*
+VertexShaderOpEXT,*,*,		    GLenum,*,*
+VertexShaderParameterEXT,*,*,	    GLenum,*,*
+VertexShaderStorageTypeEXT,*,*,     GLenum,*,*
+VertexShaderTextureUnitParameter,*,*,	GLenum,*,*
+VertexShaderWriteMaskEXT,*,*,	    GLenum,*,*
+VertexStreamATI,*,*,		    GLenum,*,*
+PNTrianglesPNameATI,*,*,	    GLenum,*,*
+# ARB_vertex_buffer_object types and core equivalents for new types
+BufferOffset,*,*,		    GLintptr,*,*
+BufferSize,*,*,			    GLsizeiptr,*,*
+BufferAccessARB,*,*,		    GLenum,*,*
+BufferOffsetARB,*,*,		    GLintptrARB,*,*
+BufferPNameARB,*,*,		    GLenum,*,*
+BufferPointerNameARB,*,*,	    GLenum,*,*
+BufferSizeARB,*,*,		    GLsizeiptrARB,*,*
+BufferTargetARB,*,*,		    GLenum,*,*
+BufferUsageARB,*,*,		    GLenum,*,*
+# APPLE_fence
+ObjectTypeAPPLE,*,*,		    GLenum,*,*
+# APPLE_vertex_array_range
+VertexArrayPNameAPPLE,*,*,	    GLenum,*,*
+# ATI_draw_buffers
+DrawBufferModeATI,*,*,		    GLenum,*,*
+# NV_half
+Half16NV,*,*,			    GLhalfNV,*,*
+# NV_pixel_data_range
+PixelDataRangeTargetNV,*,*,	    GLenum,*,*
+# Generic types for as-yet-unspecified enums
+TypeEnum,*,*,			    GLenum,*,*
+GLbitfield,*,*,			    GLbitfield,*,*
+GLenum,*,*,			    GLenum,*,*
+Int64,*,*,			    GLint64,*,*
+UInt64,*,*,			    GLuint64,*,*
+# Object handle & data pointers
+handleARB,*,*,			    GLhandleARB,*,*
+charARB,*,*,			    GLcharARB,*,*
+charPointerARB,*,*,		    GLcharARB*,*,*
+sync,*,*,			    GLsync,*,*,
+# EXT_timer_query
+Int64EXT,*,*,			    GLint64EXT,*,*
+UInt64EXT,*,*,			    GLuint64EXT,*,*
+# EXT_direct_state_access
+FramebufferAttachmentParameterName,*,*, GLenum,*,*
+Framebuffer,*,*,		    GLuint,*,*
+FramebufferStatus,*,*,		    GLenum,*,*
+GetFramebufferParameter,*,*,	    GLenum,*,*
+Intptr,*,*,			    GLintptr,*,*
+ProgramFormat,*,*,		    GLenum,*,*
+ProgramProperty,*,*,		    GLenum,*,*
+ProgramStringProperty,*,*,	    GLenum,*,*
+Renderbuffer,*,*,		    GLuint,*,*
+RenderbufferParameterName,*,*,	    GLenum,*,*
+Sizeiptr,*,*,			    GLsizeiptr,*,*
+TextureInternalFormat,*,*,	    GLenum,*,*
+VertexBufferObjectAccess,*,*,	    GLenum,*,*
+VertexBufferObjectParameter,*,*,    GLenum,*,*
+VertexBufferObjectUsage,*,*,	    GLenum,*,*
+# ARB_map_buffer_range
+BufferAccessMask,*,*,		    GLbitfield,*,*
+# NV_explicit_multisample
+GetMultisamplePNameNV,*,*,	    GLenum,*,*
+SampleMaskNV,*,*,		    GLbitfield,*,*
+# ARB_debug_output
+GLDEBUGPROC,*,*,		    GLDEBUGPROC,*,*
+# ARB_debug_output
+GLDEBUGPROCARB,*,*,		    GLDEBUGPROCARB,*,*
+# AMD_debug_output
+GLDEBUGPROCAMD,*,*,		    GLDEBUGPROCAMD,*,*
+# NV_vdpau_interop
+vdpauSurfaceNV,*,*,		    GLvdpauSurfaceNV,*,*,
+# External API types
+cl_context,*,*,			    struct _cl_context *,*,*
+cl_event,*,*,			    struct _cl_event *,*,*
+Path,*,*,			    GLuint,*,*
+PathColor,*,*,			    GLenum,*,*
+PathColorFormat,*,*,		    GLenum,*,*
+PathCommand,*,*,		    GLubyte,*,*
+PathCoordType,*,*,		    GLenum,*,*
+PathCoverMode,*,*,		    GLenum,*,*
+PathElementType,*,*,		    GLenum,*,*
+PathElement,*,*,		    GLvoid,*,*
+PathFillMode,*,*,		    GLenum,*,*
+PathFontStyle,*,*,		    GLbitfield,*,*
+PathFontTarget,*,*,		    GLenum,*,*
+PathGenMode,*,*,		    GLenum,*,*
+PathListMode,*,*,		    GLenum,*,*
+PathMetricMask,*,*,		    GLbitfield,*,*
+PathParameter,*,*,		    GLenum,*,*
+PathStringFormat,*,*,		    GLenum,*,*
+PathTransformType,*,*,		    GLenum,*,*
+PathHandleMissingGlyphs,*,*,	    GLenum,*,*
diff --git a/xorg-server/hw/xwin/glx/glwindows.h b/xorg-server/hw/xwin/glx/glwindows.h
index ec1d1f51b..42adc5b60 100644
--- a/xorg-server/hw/xwin/glx/glwindows.h
+++ b/xorg-server/hw/xwin/glx/glwindows.h
@@ -49,9 +49,15 @@ void glAddSwapHintRectWINWrapperNonstatic(GLint x, GLint y, GLsizei width,
                                           GLsizei height);
 void glWinSetupDispatchTable(void);
 
-#if 1
+#ifdef _DEBUG
+#ifdef _MSC_VER
+#define GLWIN_TRACE_MSG(msg, ...) if (glxWinDebugSettings.enableTrace) ErrorF(msg " [%s:%d]\n" , __VA_ARGS__ , __FUNCTION__, __LINE__ )
+#define GLWIN_DEBUG_MSG(msg, ...) if (glxWinDebugSettings.enableDebug) ErrorF(msg " [%s:%d]\n" , __VA_ARGS__ , __FUNCTION__, __LINE__ )
+#else
 #define GLWIN_TRACE_MSG(msg, args...) if (glxWinDebugSettings.enableTrace) ErrorF(msg " [%s:%d]\n" , ##args , __FUNCTION__, __LINE__ )
 #define GLWIN_DEBUG_MSG(msg, args...) if (glxWinDebugSettings.enableDebug) ErrorF(msg " [%s:%d]\n" , ##args , __FUNCTION__, __LINE__ )
+#endif
+
 #else
 #define GLWIN_TRACE_MSG(a, ...)
 #define GLWIN_DEBUG_MSG(a, ...)
diff --git a/xorg-server/hw/xwin/glx/glwrap.c b/xorg-server/hw/xwin/glx/glwrap.c
index 73cff3cc1..9733e7526 100644
--- a/xorg-server/hw/xwin/glx/glwrap.c
+++ b/xorg-server/hw/xwin/glx/glwrap.c
@@ -39,12 +39,15 @@
 #include <X11/Xwindows.h>
 #include <GL/gl.h>
 #include <GL/glext.h>
+#include <glx/glheader.h>
 #include <glx/glxserver.h>
 #include <glx/glxext.h>
 #include <glx/glapi.h>
 #include <glx/dispatch.h>
 #include <glwindows.h>
+#include <winmsg.h>
 
+#ifdef _DEBUG
 static unsigned int glWinIndirectProcCalls = 0;
 static unsigned int glWinDirectProcCalls = 0;
 
@@ -65,6 +68,7 @@ glWinCallDelta(void)
         glWinIndirectProcCallsLast = glWinIndirectProcCalls;
     }
 }
+#endif
 
 static PROC
 glWinResolveHelper(PROC * cache, const char *symbol)
@@ -75,11 +79,11 @@ glWinResolveHelper(PROC * cache, const char *symbol)
     if ((*cache) == NULL) {
         proc = wglGetProcAddress(symbol);
         if (proc == NULL) {
-            ErrorF("glwrap: Can't resolve \"%s\"\n", symbol);
+            winDebug("glwrap: Can't resolve \"%s\"\n", symbol);
             (*cache) = (PROC) - 1;
         }
         else {
-            ErrorF("glwrap: Resolved \"%s\"\n", symbol);
+            winDebug("glwrap: Resolved \"%s\"\n", symbol);
             (*cache) = proc;
         }
     }
@@ -95,14 +99,20 @@ glWinResolveHelper(PROC * cache, const char *symbol)
     return proc;
 }
 
+#ifdef _DEBUG
+#define INCPROCCALLS   glWinIndirectProcCalls++;
+#else
+#define INCPROCCALLS
+#endif
+
 #define RESOLVE_RET(proctype, symbol, retval) \
     static PROC cache = NULL; \
-    __stdcall proctype proc = (proctype)glWinResolveHelper(&cache, symbol); \
+    proctype proc = (proctype)glWinResolveHelper(&cache, symbol); \
     if (proc == NULL) { \
         __glXErrorCallBack(0); \
         return retval; \
     } \
-    glWinIndirectProcCalls++;
+    INCPROCCALLS
 
 #define RESOLVE(proctype, symbol) RESOLVE_RET(proctype, symbol,)
 
diff --git a/xorg-server/hw/xwin/glx/indirect.c b/xorg-server/hw/xwin/glx/indirect.c
index 00cef3673..37a03ff00 100644..100755
--- a/xorg-server/hw/xwin/glx/indirect.c
+++ b/xorg-server/hw/xwin/glx/indirect.c
@@ -79,13 +79,18 @@
 #endif
 
 #include "glwindows.h"
+#include <glx/glheader.h>
 #include <glx/glxserver.h>
 #include <glx/glxutil.h>
 #include <glx/extension_string.h>
 #include <GL/glxtokens.h>
+#include <glx/glapitable.h>
+#include <glx/glapi.h>
 
 #include <winpriv.h>
 #include <wgl_ext_api.h>
+#include "win.h"
+#include <winmsg.h>
 #include <winglobals.h>
 
 #define NUM_ELEMENTS(x) (sizeof(x)/ sizeof(x[1]))
@@ -114,14 +119,17 @@ typedef struct __GLXWinConfig GLXWinConfig;
 struct __GLXWinContext {
     __GLXcontext base;
     HGLRC ctx;                  /* Windows GL Context */
+    HDC hDC;                           /* Windows device context */
+    HDC hreadDC;                     /* Windows device read context */
     __GLXWinContext *shareContext;      /* Context with which we will share display lists and textures */
     HWND hwnd;                  /* For detecting when HWND has changed */
+    HWND hreadwnd;
+    struct _glapi_table *Dispatch;
 };
 
 struct __GLXWinDrawable {
     __GLXdrawable base;
     __GLXWinContext *drawContext;
-    __GLXWinContext *readContext;
 
     /* If this drawable is GLX_DRAWABLE_PBUFFER */
     HPBUFFERARB hPbuffer;
@@ -147,7 +155,9 @@ struct __GLXWinScreen {
     /* wrapped screen functions */
     RealizeWindowProcPtr RealizeWindow;
     UnrealizeWindowProcPtr UnrealizeWindow;
+    DestroyWindowProcPtr DestroyWindow;
     CopyWindowProcPtr CopyWindow;
+    PositionWindowProcPtr PositionWindow;
 };
 
 struct __GLXWinConfig {
@@ -160,12 +170,33 @@ struct __GLXWinConfig {
  * Various debug helpers
  */
 
-#define GLWIN_DEBUG_HWND(hwnd)  \
-    if (glxWinDebugSettings.dumpHWND) { \
-        char buffer[1024]; \
-        if (GetWindowText(hwnd, buffer, sizeof(buffer))==0) *buffer=0; \
-        GLWIN_DEBUG_MSG("Got HWND %p for window '%s'", hwnd, buffer); \
+#ifdef _DEBUG
+void GLWIN_DEBUG_HWND(HWND hwnd)
+{
+    if (glxWinDebugSettings.dumpHWND) {
+        char buffer[1024];
+        RECT Rect;
+        HDC hDc=GetDC(hwnd);
+
+        if (GetWindowText(hwnd, buffer, sizeof(buffer))==0) *buffer=0;
+        GetWindowRect(hwnd,&Rect);
+
+        GLWIN_DEBUG_MSG("Got HWND %p (hdc %p) for window '%s' (%d,%d,%d,%d)", hwnd, hDc, buffer, Rect.left, Rect.top, Rect.right, Rect.bottom);
+        ReleaseDC(hwnd,hDc);
     }
+}
+
+void GLWIN_HDC_DEBUG_MSG(const char *Message, HDC hDc, HWND hwnd)
+{
+    char buffer[1024];
+    RECT Rect;
+
+    if (GetWindowText(hwnd, buffer, sizeof(buffer))==0) *buffer=0;
+    GetWindowRect(hwnd,&Rect);
+
+    GLWIN_DEBUG_MSG("Got HDC %p (hwnd %p) for window '%s' (%d,%d,%d,%d)", hDc, hwnd, buffer, Rect.left, Rect.top, Rect.right, Rect.bottom);
+
+}
 
 glxWinDebugSettingsRec glxWinDebugSettings = { 0, 0, 0, 0, 0, 0 };
 
@@ -213,6 +244,7 @@ glxWinInitDebugSettings(void)
         glxWinDebugSettings.enableWGLcallTrace = 1;
     }
 }
+#endif
 
 static
 const char *
@@ -239,6 +271,8 @@ glxWinErrorMessage(void)
 
 static void pfdOut(const PIXELFORMATDESCRIPTOR * pfd);
 
+#ifdef _DEBUG
+
 #define DUMP_PFD_FLAG(flag) \
     if (pfd->dwFlags & flag) { \
         ErrorF("%s%s", pipesym, #flag); \
@@ -394,6 +428,7 @@ fbConfigsDump(unsigned int n, __GLXconfig * c)
         c = c->next;
     }
 }
+#endif
 
 /* ---------------------------------------------------------------------- */
 /*
@@ -415,11 +450,13 @@ static __GLXdrawable *glxWinCreateDrawable(ClientPtr client,
 
 static Bool glxWinRealizeWindow(WindowPtr pWin);
 static Bool glxWinUnrealizeWindow(WindowPtr pWin);
+static Bool glxWinDestroyWindow(WindowPtr pWin);
 static void glxWinCopyWindow(WindowPtr pWindow, DDXPointRec ptOldOrg,
                              RegionPtr prgnSrc);
+static Bool glxWinPositionWindow(WindowPtr pWindow, int x, int y);
 
 static HDC glxWinMakeDC(__GLXWinContext * gc, __GLXWinDrawable * draw,
-                        HDC * hdc, HWND * hwnd);
+                        HWND * hwnd);
 static void glxWinReleaseDC(HWND hwnd, HDC hdc, __GLXWinDrawable * draw);
 
 static void glxWinCreateConfigs(HDC dc, glxWinScreen * screen);
@@ -445,7 +482,8 @@ __GLXprovider __glXWGLProvider = {
 void
 glxWinPushNativeProvider(void)
 {
-    GlxPushProvider(&__glXWGLProvider);
+  if (g_fNativeGl)
+      GlxPushProvider(&__glXWGLProvider);
 }
 
 /* ---------------------------------------------------------------------- */
@@ -473,6 +511,15 @@ glxWinScreenSwapInterval(__GLXdrawable * drawable, int interval)
     return ret;
 }
 
+static LRESULT CALLBACK GlxWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+    if (uMsg== WM_NCHITTEST) {
+        return HTTRANSPARENT;
+    }
+    else
+        return DefWindowProc(hwnd, uMsg, wParam, lParam);
+}
+
 /*
   Report the extensions split and formatted to avoid overflowing a line
  */
@@ -491,7 +538,8 @@ glxLogExtensions(const char *prefix, const char *extensions)
     strl = strtok(str, " ");
     if (strl == NULL)
         strl = "";
-    ErrorF("%s%s", prefix, strl);
+    winDebug("%s%s", prefix, strl);
+
     length = strlen(prefix) + strlen(strl);
 
     while (1) {
@@ -500,20 +548,20 @@ glxLogExtensions(const char *prefix, const char *extensions)
             break;
 
         if (length + strlen(strl) + 1 > 120) {
-            ErrorF("\n");
-            ErrorF("%s", prefix);
+            winDebug("\n");
+            winDebug("%s", prefix);
             length = strlen(prefix);
         }
         else {
-            ErrorF(" ");
+            winDebug(" ");
             length++;
         }
 
-        ErrorF("%s", strl);
+        winDebug("%s", strl);
         length = length + strlen(strl);
     }
 
-    ErrorF("\n");
+    winDebug("\n");
 
     free(str);
 }
@@ -532,7 +580,9 @@ glxWinScreenProbe(ScreenPtr pScreen)
 
     GLWIN_DEBUG_MSG("glxWinScreenProbe");
 
+#ifdef _DEBUG
     glxWinInitDebugSettings();
+#endif
 
     if (pScreen == NULL)
         return NULL;
@@ -551,24 +601,23 @@ glxWinScreenProbe(ScreenPtr pScreen)
     /* Dump out some useful information about the native renderer */
 
     // create window class
-#define WIN_GL_TEST_WINDOW_CLASS "XWinGLTest"
     {
         static wATOM glTestWndClass = 0;
 
         if (glTestWndClass == 0) {
             WNDCLASSEX wc;
-
+            glTestWndClass=1;
             wc.cbSize = sizeof(WNDCLASSEX);
-            wc.style = CS_HREDRAW | CS_VREDRAW;
-            wc.lpfnWndProc = DefWindowProc;
+            wc.style = CS_OWNDC ;
+            wc.lpfnWndProc = GlxWindowProc;
             wc.cbClsExtra = 0;
             wc.cbWndExtra = 0;
-            wc.hInstance = GetModuleHandle(NULL);
+            wc.hInstance = g_hInstance;
             wc.hIcon = 0;
             wc.hCursor = 0;
-            wc.hbrBackground = (HBRUSH) GetStockObject(WHITE_BRUSH);
+            wc.hbrBackground = 0;
             wc.lpszMenuName = NULL;
-            wc.lpszClassName = WIN_GL_TEST_WINDOW_CLASS;
+            wc.lpszClassName = WIN_GL_WINDOW_CLASS;
             wc.hIconSm = 0;
             RegisterClassEx(&wc);
         }
@@ -576,7 +625,7 @@ glxWinScreenProbe(ScreenPtr pScreen)
 
     // create an invisible window for a scratch DC
     hwnd = CreateWindowExA(0,
-                           WIN_GL_TEST_WINDOW_CLASS,
+                           WIN_GL_WINDOW_CLASS,
                            "XWin GL Renderer Capabilities Test Window",
                            0, 0, 0, 0, 0, NULL, NULL, GetModuleHandle(NULL),
                            NULL);
@@ -589,16 +638,19 @@ glxWinScreenProbe(ScreenPtr pScreen)
     // we must set a pixel format before we can create a context, just use the first one...
     SetPixelFormat(hdc, 1, NULL);
     hglrc = wglCreateContext(hdc);
-    wglMakeCurrent(hdc, hglrc);
+    if (!wglMakeCurrent(hdc, hglrc)) {
+        DWORD ErrorCode=GetLastError();
+        ErrorF("wglMakeCurrent error: %x dc %p ctx %p\n", ErrorCode,hdc,hglrc);
+    }
 
     // initialize wgl extension proc pointers (don't call them before here...)
     // (but we need to have a current context for them to be resolvable)
     wglResolveExtensionProcs();
 
-    ErrorF("GL_VERSION:     %s\n", glGetStringWrapperNonstatic(GL_VERSION));
-    ErrorF("GL_VENDOR:      %s\n", glGetStringWrapperNonstatic(GL_VENDOR));
+    winDebug("GL_VERSION:     %s\n", glGetStringWrapperNonstatic(GL_VERSION));
+    winDebug("GL_VENDOR:      %s\n", glGetStringWrapperNonstatic(GL_VENDOR));
     gl_renderer = (const char *) glGetStringWrapperNonstatic(GL_RENDERER);
-    ErrorF("GL_RENDERER:    %s\n", gl_renderer);
+    winDebug("GL_RENDERER:    %s\n", gl_renderer);
     gl_extensions = (const char *) glGetStringWrapperNonstatic(GL_EXTENSIONS);
     wgl_extensions = wglGetExtensionsStringARBWrapper(hdc);
     if (!wgl_extensions)
@@ -775,8 +827,10 @@ glxWinScreenProbe(ScreenPtr pScreen)
     ReleaseDC(hwnd, hdc);
     DestroyWindow(hwnd);
 
+#ifdef _DEBUG
     // dump out fbConfigs now fbConfigIds and visualIDs have been assigned
     fbConfigsDump(screen->base.numFBConfigs, screen->base.fbconfigs);
+#endif
 
     /* Wrap RealizeWindow, UnrealizeWindow and CopyWindow on this screen */
     screen->RealizeWindow = pScreen->RealizeWindow;
@@ -785,6 +839,10 @@ glxWinScreenProbe(ScreenPtr pScreen)
     pScreen->UnrealizeWindow = glxWinUnrealizeWindow;
     screen->CopyWindow = pScreen->CopyWindow;
     pScreen->CopyWindow = glxWinCopyWindow;
+    screen->PositionWindow = pScreen->PositionWindow;
+    pScreen->PositionWindow = glxWinPositionWindow;
+    screen->DestroyWindow = pScreen->DestroyWindow;
+    pScreen->DestroyWindow = glxWinDestroyWindow;
 
     return &screen->base;
 }
@@ -800,6 +858,7 @@ glxWinRealizeWindow(WindowPtr pWin)
     Bool result;
     ScreenPtr pScreen = pWin->drawable.pScreen;
     glxWinScreen *screenPriv = (glxWinScreen *) glxGetScreen(pScreen);
+    winWindowPriv(pWin);
 
     GLWIN_DEBUG_MSG("glxWinRealizeWindow");
 
@@ -807,7 +866,11 @@ glxWinRealizeWindow(WindowPtr pWin)
     pScreen->RealizeWindow = screenPriv->RealizeWindow;
     result = pScreen->RealizeWindow(pWin);
     pScreen->RealizeWindow = glxWinRealizeWindow;
-
+    
+    // Check if ze need to move the window\n
+    if (pWinPriv->fWglUsed && pWinPriv->hWnd) {
+        ShowWindow(pWinPriv->hWnd,SW_SHOWNOACTIVATE);
+    }
     return result;
 }
 
@@ -843,17 +906,88 @@ glxWinCopyWindow(WindowPtr pWindow, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
 }
 
 static Bool
+glxWinPositionWindow(WindowPtr pWin, int x, int y)
+{
+    Bool result;
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+    glxWinScreen *screenPriv = (glxWinScreen *) glxGetScreen(pScreen);
+    winWindowPriv(pWin);
+
+    pScreen->PositionWindow = screenPriv->PositionWindow;
+    result = pScreen->PositionWindow(pWin, x, y);
+    pScreen->PositionWindow = glxWinPositionWindow;
+
+    if (pWinPriv->fWglUsed && pWinPriv->hWnd)
+    {
+        MoveWindow(pWinPriv->hWnd,
+                   pWin->drawable.x,
+                   pWin->drawable.y,
+                   pWin->drawable.width,
+                   pWin->drawable.height,
+                   FALSE);
+        winDebug("Move window %x,  %x, %d, %d, %d, %d\n",pWinPriv->hWnd,GetParent(pWinPriv->hWnd), pWin->drawable.x, pWin->drawable.y, pWin->drawable.width, pWin->drawable.height);
+    }
+    return result;
+}
+
+
+static Bool
 glxWinUnrealizeWindow(WindowPtr pWin)
 {
     Bool result;
     ScreenPtr pScreen = pWin->drawable.pScreen;
     glxWinScreen *screenPriv = (glxWinScreen *) glxGetScreen(pScreen);
+    winWindowPriv(pWin);
 
     GLWIN_DEBUG_MSG("glxWinUnrealizeWindow");
 
-    pScreen->UnrealizeWindow = screenPriv->UnrealizeWindow;
-    result = pScreen->UnrealizeWindow(pWin);
-    pScreen->UnrealizeWindow = glxWinUnrealizeWindow;
+    if (pWinPriv->fWglUsed && pWinPriv->hWnd)
+    {
+      ShowWindow(pWinPriv->hWnd,SW_HIDE);
+      result = TRUE;
+    }
+    else
+    {
+      pScreen->UnrealizeWindow = screenPriv->UnrealizeWindow;
+      result = pScreen->UnrealizeWindow(pWin);
+      pScreen->UnrealizeWindow = glxWinUnrealizeWindow;
+    }
+
+
+    return result;
+}
+
+static Bool
+glxWinDestroyWindow(WindowPtr pWin)
+{
+    Bool result;
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+    glxWinScreen *screenPriv = (glxWinScreen *)glxGetScreen(pScreen);
+    __GLXWinDrawable *pGlxDraw;
+    winWindowPriv(pWin);
+
+    GLWIN_DEBUG_MSG("glxWinDestroyWindow");
+
+    dixLookupResourceByType((pointer) &pGlxDraw, pWin->drawable.id, __glXDrawableRes, NullClient, DixUnknownAccess);
+
+    if (pGlxDraw && pGlxDraw->drawContext)
+    {
+      if (pGlxDraw->drawContext->hwnd!=pWinPriv->hWnd)
+        ErrorF("Wrong assumption\n");
+      glxWinReleaseDC(pGlxDraw->drawContext->hwnd, pGlxDraw->drawContext->hDC, pGlxDraw);
+      pGlxDraw->drawContext->hDC=NULL;
+      pGlxDraw->drawContext->hwnd=NULL;
+    }
+    if (pWinPriv->fWglUsed && pWinPriv->hWnd)
+    {
+      DestroyWindow(pWinPriv->hWnd);
+      pWinPriv->hWnd=NULL;
+      pWinPriv->fWglUsed=0;
+    }
+
+    pScreen->DestroyWindow = screenPriv->DestroyWindow;
+    result = pScreen->DestroyWindow(pWin);
+    pScreen->DestroyWindow = glxWinDestroyWindow;
 
     return result;
 }
@@ -866,8 +1000,6 @@ glxWinUnrealizeWindow(WindowPtr pWin)
 static GLboolean
 glxWinDrawableSwapBuffers(ClientPtr client, __GLXdrawable * base)
 {
-    HDC dc;
-    HWND hwnd;
     BOOL ret;
     __GLXWinDrawable *draw = (__GLXWinDrawable *) base;
 
@@ -888,13 +1020,7 @@ glxWinDrawableSwapBuffers(ClientPtr client, __GLXdrawable * base)
     assert((draw->drawContext->base.drawPriv == NULL) ||
            (draw->drawContext->base.drawPriv == base));
 
-    dc = glxWinMakeDC(draw->drawContext, draw, &dc, &hwnd);
-    if (dc == NULL)
-        return GL_FALSE;
-
-    ret = wglSwapLayerBuffers(dc, WGL_SWAP_MAIN_PLANE);
-
-    glxWinReleaseDC(hwnd, dc, draw);
+    ret = SwapBuffers(draw->drawContext->hDC);
 
     if (!ret) {
         ErrorF("wglSwapBuffers failed: %s\n", glxWinErrorMessage());
@@ -948,6 +1074,7 @@ glxWinDrawableDestroy(__GLXdrawable * base)
         }
 
         ((PixmapPtr) glxPriv->base.pDraw)->devPrivate.ptr = glxPriv->pOldBits;
+        glxPriv->base.pDraw->pScreen->DestroyPixmap((PixmapPtr)glxPriv->base.pDraw); /* Decrement reference count since we do not use it any more */
     }
 
     GLWIN_DEBUG_MSG("glxWinDestroyDrawable");
@@ -962,13 +1089,11 @@ glxWinCreateDrawable(ClientPtr client,
 {
     __GLXWinDrawable *glxPriv;
 
-    glxPriv = malloc(sizeof *glxPriv);
+    glxPriv = calloc(1, sizeof *glxPriv);
 
     if (glxPriv == NULL)
         return NULL;
 
-    memset(glxPriv, 0, sizeof *glxPriv);
-
     if (!__glXDrawableInit
         (&glxPriv->base, screen, pDraw, type, glxDrawId, conf)) {
         free(glxPriv);
@@ -1038,28 +1163,25 @@ glxWinSetPixelFormat(__GLXWinContext * gc, HDC hdc, int bppOverride,
     __GLXconfig *config = gc->base.config;
     GLXWinConfig *winConfig = (GLXWinConfig *) config;
 
-    GLWIN_DEBUG_MSG("glxWinSetPixelFormat: pixelFormatIndex %d",
-                    winConfig->pixelFormatIndex);
 
-    /*
-       Normally, we can just use the the pixelFormatIndex corresponding
-       to the fbconfig which has been specified by the client
-     */
-
-    if (!
-        ((bppOverride &&
-          (bppOverride !=
-           (config->redBits + config->greenBits + config->blueBits)))
-         || ((config->drawableType & drawableTypeOverride) == 0))) {
-        if (!SetPixelFormat(hdc, winConfig->pixelFormatIndex, NULL)) {
-            ErrorF("SetPixelFormat error: %s\n", glxWinErrorMessage());
-            return FALSE;
+    WindowPtr pWin;
+    __GLXWinDrawable *drawPriv = (__GLXWinDrawable *)gc->base.drawPriv;
+    pWin = (WindowPtr) drawPriv->base.pDraw;
+    {
+        winWindowPriv(pWin);
+        if (pWinPriv->OpenGlWindow)
+        {
+            ErrorF("Not Setting pixel format to  %d on hdc %x for window %x (not allowed on windows)\n",winConfig->pixelFormatIndex,hdc,pWinPriv->hWnd);
+            return TRUE; /* Pixel format is already set on this window so it cannot be changed anymore */
         }
-
-        return TRUE;
     }
+    GLWIN_DEBUG_MSG("glxWinSetPixelFormat: pixelFormatIndex %d", winConfig->pixelFormatIndex);
 
     /*
+    Normally, we can just use the the pixelFormatIndex corresponding
+    to the fbconfig which has been specified by the client
+    */
+    /*
        However, in certain special cases this pixel format will be incompatible with the
        use we are going to put it to, so we need to re-evaluate the pixel format to use:
 
@@ -1091,8 +1213,10 @@ glxWinSetPixelFormat(__GLXWinContext * gc, HDC hdc, int bppOverride,
             return FALSE;
         }
 
+#ifdef _DEBUG
         if (glxWinDebugSettings.dumpPFD)
             pfdOut(&pfd);
+#endif
 
         if (bppOverride) {
             GLWIN_DEBUG_MSG("glxWinSetPixelFormat: Forcing bpp from %d to %d\n",
@@ -1112,6 +1236,7 @@ glxWinSetPixelFormat(__GLXWinContext * gc, HDC hdc, int bppOverride,
             ("ChoosePixelFormat: chose pixelFormatIndex %d (rather than %d as originally planned)\n",
              pixelFormat, winConfig->pixelFormatIndex);
 
+        ErrorF("Setting pixel format 2 to  %d on hdc %x\n",pixelFormat,hdc);
         if (!SetPixelFormat(hdc, pixelFormat, &pfd)) {
             ErrorF("SetPixelFormat error: %s\n", glxWinErrorMessage());
             return FALSE;
@@ -1121,31 +1246,58 @@ glxWinSetPixelFormat(__GLXWinContext * gc, HDC hdc, int bppOverride,
         int pixelFormat =
             fbConfigToPixelFormatIndex(hdc, gc->base.config,
                                        drawableTypeOverride, winScreen);
-        if (pixelFormat == 0) {
-            ErrorF("wglChoosePixelFormat error: %s\n", glxWinErrorMessage());
-            return FALSE;
-        }
+        if (pixelFormat != 0) {
+            GLWIN_DEBUG_MSG("wglChoosePixelFormat: chose pixelFormatIndex %d", pixelFormat);
 
-        GLWIN_DEBUG_MSG("wglChoosePixelFormat: chose pixelFormatIndex %d",
-                        pixelFormat);
-        ErrorF
-            ("wglChoosePixelFormat: chose pixelFormatIndex %d (rather than %d as originally planned)\n",
-             pixelFormat, winConfig->pixelFormatIndex);
-
-        if (!SetPixelFormat(hdc, pixelFormat, NULL)) {
-            ErrorF("SetPixelFormat error: %s\n", glxWinErrorMessage());
-            return FALSE;
+            ErrorF("Setting pixel format 3 to  %d on hdc %x\n",pixelFormat,hdc);
+            if (!SetPixelFormat(hdc, pixelFormat, NULL)) {
+                ErrorF("SetPixelFormat error: %s\n", glxWinErrorMessage());
+                return FALSE;
+            }
+            return TRUE;
+        }
+        else {
+            /* There was an error choose some default for the moment */
+            PIXELFORMATDESCRIPTOR pfd = { 
+                sizeof(PIXELFORMATDESCRIPTOR),   // size of this pfd  
+                1,                     // version number  
+                PFD_DRAW_TO_WINDOW |   // support window  
+                PFD_SUPPORT_OPENGL |   // support OpenGL  
+                PFD_DOUBLEBUFFER,      // double buffered  
+                PFD_TYPE_RGBA,         // RGBA type  
+                24,                    // 24-bit color depth  
+                0, 0, 0, 0, 0, 0,      // color bits ignored  
+                0,                     // no alpha buffer  
+                0,                     // shift bit ignored  
+                0,                     // no accumulation buffer  
+                0, 0, 0, 0,            // accum bits ignored  
+                32,                    // 32-bit z-buffer  
+                0,                     // no stencil buffer  
+                0,                     // no auxiliary buffer  
+                PFD_MAIN_PLANE,        // main layer  
+                0,                     // reserved  
+                0, 0, 0                // layer masks ignored  
+            }; 
+            int  iPixelFormat; 
+         
+            // get the best available match of pixel format for the device context   
+            iPixelFormat = ChoosePixelFormat(hdc, &pfd); 
+         
+            ErrorF("Setting pixel format 4 to  %d on hdc %x\n",iPixelFormat,hdc);
+            // make that the pixel format of the device context  
+            if (!SetPixelFormat(hdc, iPixelFormat, &pfd)) {
+                ErrorF("SetPixelFormat error: %s\n", glxWinErrorMessage());
+                return FALSE;
+            }
         }
     }
-
     return TRUE;
 }
 
 static HDC
-glxWinMakeDC(__GLXWinContext * gc, __GLXWinDrawable * draw, HDC * hdc,
-             HWND * hwnd)
+glxWinMakeDC(__GLXWinContext *gc, __GLXWinDrawable *draw, HWND *hwnd)
 {
-    *hdc = NULL;
+    HDC hdc = NULL;
     *hwnd = NULL;
 
     if (draw == NULL) {
@@ -1172,45 +1324,52 @@ glxWinMakeDC(__GLXWinContext * gc, __GLXWinDrawable * draw, HDC * hdc,
             return NULL;
         }
 
-        *hdc = GetDC(*hwnd);
-
-        if (*hdc == NULL)
-            ErrorF("GetDC error: %s\n", glxWinErrorMessage());
+        if (!gc->hDC) {
+            winWindowPriv(pWin);
 
-        /* Check if the hwnd has changed... */
-        if (*hwnd != gc->hwnd) {
-            if (glxWinDebugSettings.enableTrace)
-                GLWIN_DEBUG_HWND(*hwnd);
+            hdc = GetDC(*hwnd);
 
-            GLWIN_TRACE_MSG
-                ("for context %p (native ctx %p), hWnd changed from %p to %p",
-                 gc, gc->ctx, gc->hwnd, *hwnd);
-            gc->hwnd = *hwnd;
+            if (hdc == NULL)
+                ErrorF("GetDC error: %s: hwnd %x, gc %p, gc->ctx %p ,gc->hwnd %p\n", glxWinErrorMessage(), *hwnd, gc, gc->ctx, gc->hwnd);
 
-            /* We must select a pixelformat, but SetPixelFormat can only be called once for a window... */
-            if (!glxWinSetPixelFormat(gc, *hdc, 0, GLX_WINDOW_BIT)) {
-                ErrorF("glxWinSetPixelFormat error: %s\n",
-                       glxWinErrorMessage());
-                ReleaseDC(*hwnd, *hdc);
-                *hdc = NULL;
-                return NULL;
-            }
+            glxWinSetPixelFormat(gc, hdc, 0, GLX_WINDOW_BIT);
+            pWinPriv->OpenGlWindow=TRUE; /* Identify it as an opengl window, also used to check if the pixel format is already set */
+            gc->ctx = wglCreateContext(hdc);
         }
+
+#ifdef _DEBUG
+        if (glxWinDebugSettings.enableTrace)
+            GLWIN_DEBUG_HWND(*hwnd);
+
+        GLWIN_TRACE_MSG
+            ("for context %p (native ctx %p), hWnd changed from %p to %p",
+             gc, gc->ctx, gc->hwnd, *hwnd);
+#endif
+        if (gc->hwnd!=*hwnd)
+            ErrorF("Window changed handle from %x to %x\n", gc->hwnd, *hwnd);
+
+        gc->hwnd = *hwnd;
     }
         break;
 
     case GLX_DRAWABLE_PBUFFER:
     {
-        *hdc = wglGetPbufferDCARBWrapper(draw->hPbuffer);
+        hdc = wglGetPbufferDCARBWrapper(draw->hPbuffer);
 
-        if (*hdc == NULL)
+        if (hdc == NULL)
             ErrorF("GetDC (pbuffer) error: %s\n", glxWinErrorMessage());
+
+        gc->ctx = wglCreateContext(hdc);
     }
         break;
 
     case GLX_DRAWABLE_PIXMAP:
     {
-        *hdc = draw->dibDC;
+        hdc = draw->dibDC;
+#ifdef _DEBUG
+        if (glxWinDebugSettings.dumpDC)
+            GLWIN_DEBUG_MSG("Got PIXMAP HDC %p for window %p", hdc, *hwnd);
+#endif
     }
         break;
 
@@ -1221,10 +1380,12 @@ glxWinMakeDC(__GLXWinContext * gc, __GLXWinDrawable * draw, HDC * hdc,
     }
     }
 
+#ifdef _DEBUG
     if (glxWinDebugSettings.dumpDC)
-        GLWIN_DEBUG_MSG("Got HDC %p", *hdc);
+        GLWIN_HDC_DEBUG_MSG("Got HDC %p for window %p", hdc, *hwnd);
+#endif
 
-    return *hdc;
+    return hdc;
 }
 
 static void
@@ -1267,7 +1428,6 @@ glxWinReleaseDC(HWND hwnd, HDC hdc, __GLXWinDrawable * draw)
 static void
 glxWinDeferredCreateContext(__GLXWinContext * gc, __GLXWinDrawable * draw)
 {
-    HDC dc;
     HWND hwnd;
 
     GLWIN_DEBUG_MSG
@@ -1300,13 +1460,16 @@ glxWinDeferredCreateContext(__GLXWinContext * gc, __GLXWinDrawable * draw)
 
     case GLX_DRAWABLE_PBUFFER:
     {
+        WindowPtr pWin = (WindowPtr) draw->base.pDraw;
         if (draw->hPbuffer == NULL) {
             __GLXscreen *screen;
             glxWinScreen *winScreen;
             int pixelFormat;
 
             // XXX: which DC are supposed to use???
-            HDC screenDC = GetDC(NULL);
+            ScreenPtr pScreen = pWin->drawable.pScreen;
+            winPrivScreenPtr pWinScreen = winGetScreenPriv(pScreen);
+            HDC screenDC=pWinScreen->hdcScreen;
 
             if (!(gc->base.config->drawableType & GLX_PBUFFER_BIT)) {
                 ErrorF
@@ -1318,7 +1481,7 @@ glxWinDeferredCreateContext(__GLXWinContext * gc, __GLXWinDrawable * draw)
 
             pixelFormat =
                 fbConfigToPixelFormatIndex(screenDC, gc->base.config,
-                                           GLX_DRAWABLE_PBUFFER, winScreen);
+                                           GLX_PBUFFER_BIT, winScreen);
             if (pixelFormat == 0) {
                 ErrorF("wglChoosePixelFormat error: %s\n",
                        glxWinErrorMessage());
@@ -1329,7 +1492,6 @@ glxWinDeferredCreateContext(__GLXWinContext * gc, __GLXWinDrawable * draw)
                 wglCreatePbufferARBWrapper(screenDC, pixelFormat,
                                            draw->base.pDraw->width,
                                            draw->base.pDraw->height, NULL);
-            ReleaseDC(NULL, screenDC);
 
             if (draw->hPbuffer == NULL) {
                 ErrorF("wglCreatePbufferARBWrapper error: %s\n",
@@ -1384,6 +1546,8 @@ glxWinDeferredCreateContext(__GLXWinContext * gc, __GLXWinDrawable * draw)
             draw->pOldBits = ((PixmapPtr) draw->base.pDraw)->devPrivate.ptr;
             ((PixmapPtr) draw->base.pDraw)->devPrivate.ptr = pBits;
 
+            ((PixmapPtr)draw->base.pDraw)->refcnt++;  /* Increment reference count to be sure it is not freed before the glxdrawable is destroyed */
+
             // Select the DIB into the DC
             draw->hOldDIB = SelectObject(draw->dibDC, draw->hDIB);
             if (!draw->hOldDIB) {
@@ -1411,11 +1575,12 @@ glxWinDeferredCreateContext(__GLXWinContext * gc, __GLXWinDrawable * draw)
     }
     }
 
-    dc = glxWinMakeDC(gc, draw, &dc, &hwnd);
-    gc->ctx = wglCreateContext(dc);
-    glxWinReleaseDC(hwnd, dc, draw);
+    gc->hDC = glxWinMakeDC(gc, draw, &hwnd);
 
     if (gc->ctx == NULL) {
+        glxWinReleaseDC(hwnd, gc->hDC, draw);
+        gc->hDC=0;
+      
         ErrorF("wglCreateContext error: %s\n", glxWinErrorMessage());
         return;
     }
@@ -1425,7 +1590,7 @@ glxWinDeferredCreateContext(__GLXWinContext * gc, __GLXWinDrawable * draw)
          gc, gc->ctx, draw);
 
     // if the native context was created successfully, shareLists if needed
-    if (gc->ctx && gc->shareContext) {
+    if (gc->ctx && gc->shareContext && gc->shareContext->ctx) {
         GLWIN_DEBUG_MSG
             ("glxWinCreateContextReal shareLists with context %p (native ctx %p)",
              gc->shareContext, gc->shareContext->ctx);
@@ -1447,34 +1612,25 @@ glxWinContextMakeCurrent(__GLXcontext * base)
 {
     __GLXWinContext *gc = (__GLXWinContext *) base;
     BOOL ret;
-    HDC drawDC;
-    HDC readDC = NULL;
-    __GLXdrawable *drawPriv;
-    __GLXdrawable *readPriv = NULL;
-    HWND hDrawWnd;
-    HWND hReadWnd;
-
-    GLWIN_TRACE_MSG("glxWinContextMakeCurrent context %p (native ctx %p)", gc,
-                    gc->ctx);
+    __GLXWinDrawable *drawPriv;
+
+#ifdef _DEBUG
+    GLWIN_TRACE_MSG("glxWinContextMakeCurrent context %p (native ctx %p)", gc, gc->ctx);
     glWinCallDelta();
+#endif
 
     /* Keep a note of the last active context in the drawable */
-    drawPriv = gc->base.drawPriv;
-    ((__GLXWinDrawable *) drawPriv)->drawContext = gc;
+    drawPriv = (__GLXWinDrawable *)gc->base.drawPriv;
+    drawPriv->drawContext = gc;
 
     if (gc->ctx == NULL) {
-        glxWinDeferredCreateContext(gc, (__GLXWinDrawable *) drawPriv);
+        glxWinDeferredCreateContext(gc, drawPriv);
     }
+    _glapi_set_dispatch(gc->Dispatch);
 
     if (gc->ctx == NULL) {
         ErrorF("glxWinContextMakeCurrent: Native context is NULL\n");
-        return FALSE;
-    }
-
-    drawDC =
-        glxWinMakeDC(gc, (__GLXWinDrawable *) drawPriv, &drawDC, &hDrawWnd);
-    if (drawDC == NULL) {
-        ErrorF("glxWinMakeDC failed for drawDC\n");
+        drawPriv->drawContext = NULL; /* clear last active context because we return error */
         return FALSE;
     }
 
@@ -1485,16 +1641,14 @@ glxWinContextMakeCurrent(__GLXcontext * base)
            use the wglMakeContextCurrent extension to make the context current drawing
            to one DC and reading from the other
          */
-        readPriv = gc->base.readPriv;
-        readDC =
-            glxWinMakeDC(gc, (__GLXWinDrawable *) readPriv, &readDC, &hReadWnd);
-        if (readDC == NULL) {
+        gc->hreadDC = glxWinMakeDC(gc, (__GLXWinDrawable *)gc->base.readPriv, &gc->hreadwnd);
+        if (gc->hreadDC == NULL) {
             ErrorF("glxWinMakeDC failed for readDC\n");
-            glxWinReleaseDC(hDrawWnd, drawDC, (__GLXWinDrawable *) drawPriv);
+            drawPriv->drawContext = NULL; /* clear last active context because we return error */
             return FALSE;
         }
 
-        ret = wglMakeContextCurrentARBWrapper(drawDC, readDC, gc->ctx);
+        ret = wglMakeContextCurrentARBWrapper(gc->hDC, gc->hreadDC, gc->ctx);
         if (!ret) {
             ErrorF("wglMakeContextCurrentARBWrapper error: %s\n",
                    glxWinErrorMessage());
@@ -1502,18 +1656,25 @@ glxWinContextMakeCurrent(__GLXcontext * base)
     }
     else {
         /* Otherwise, just use wglMakeCurrent */
-        ret = wglMakeCurrent(drawDC, gc->ctx);
+        if (!gc->hDC) {
+            /* It probably has been release by loseCurrent, so create it again */
+            gc->hDC = glxWinMakeDC(gc, drawPriv, &gc->hwnd);
+        }
+        ret = wglMakeCurrent(gc->hDC, gc->ctx);
         if (!ret) {
-            ErrorF("wglMakeCurrent error: %s\n", glxWinErrorMessage());
+            DWORD ErrorCode=GetLastError();
+            ErrorF("wglMakeCurrent error: %x dc %p ctx %p\n", ErrorCode,gc->hDC,gc->ctx);
+            if (!ErrorCode) {
+                ErrorF("Error code was 0, assuming no error.\n");
+                ret=TRUE;
+            }
         }
     }
 
     // apparently make current could fail if the context is current in a different thread,
     // but that shouldn't be able to happen in the current server...
-
-    glxWinReleaseDC(hDrawWnd, drawDC, (__GLXWinDrawable *) drawPriv);
-    if (readDC)
-        glxWinReleaseDC(hReadWnd, readDC, (__GLXWinDrawable *) readPriv);
+    if (!ret)
+      drawPriv->drawContext = NULL; /* clear last active context because we return error */
 
     return ret;
 }
@@ -1521,25 +1682,34 @@ glxWinContextMakeCurrent(__GLXcontext * base)
 static int
 glxWinContextLoseCurrent(__GLXcontext * base)
 {
-    BOOL ret;
+    BOOL ret=TRUE;
     __GLXWinContext *gc = (__GLXWinContext *) base;
+    __GLXWinDrawable *drawPriv = (__GLXWinDrawable *)gc->base.drawPriv;
 
-    GLWIN_TRACE_MSG("glxWinContextLoseCurrent context %p (native ctx %p)", gc,
-                    gc->ctx);
+#ifdef _DEBUG
+    GLWIN_TRACE_MSG("glxWinContextLoseCurrent context %p (native ctx %p)", gc, gc->ctx);
     glWinCallDelta();
+#endif
 
-    /*
-       An error seems to be reported if we try to make no context current
-       if there is already no current context, so avoid doing that...
-     */
-    if (__glXLastContext != NULL) {
-        ret = wglMakeCurrent(NULL, NULL);       /* We don't need a DC when setting no current context */
-        if (!ret)
-            ErrorF("glxWinContextLoseCurrent error: %s\n",
-                   glxWinErrorMessage());
+     /* Clear the last active context in the drawable */
+    if (drawPriv) drawPriv->drawContext = NULL;
+
+    if (wglGetCurrentContext()==gc->ctx)
+    {
+      /* Only do this when we are sure we are currently the active, otherwise we are deactivating the wrong one (this is happening!!!) */
+      ret = wglMakeCurrent(NULL, NULL);
+      if (!ret)
+        ErrorF("glxWinContextLoseCurrent error: %s\n", glxWinErrorMessage());
+    }
+    else
+    {
+      return FALSE;
     }
 
-    return TRUE;
+    base->isCurrent=FALSE;  /* It looks like glx is not doing this */
+    _glapi_set_dispatch(NULL);
+
+    return ret;
 }
 
 static int
@@ -1566,27 +1736,35 @@ glxWinContextDestroy(__GLXcontext * base)
     __GLXWinContext *gc = (__GLXWinContext *) base;
 
     if (gc != NULL) {
+        __GLXWinDrawable *drawPriv = (__GLXWinDrawable *)gc->base.drawPriv;
+
         GLWIN_DEBUG_MSG("GLXcontext %p destroyed (native ctx %p)", base,
                         gc->ctx);
 
         if (gc->ctx) {
+            BOOL ret;
             /* It's bad style to delete the context while it's still current */
             if (wglGetCurrentContext() == gc->ctx) {
                 wglMakeCurrent(NULL, NULL);
             }
 
-            {
-                BOOL ret = wglDeleteContext(gc->ctx);
-
-                if (!ret)
-                    ErrorF("wglDeleteContext error: %s\n",
-                           glxWinErrorMessage());
-            }
+            ret = wglDeleteContext(gc->ctx);
 
+            if (!ret)
+                ErrorF("wglDeleteContext error: %s\n", glxWinErrorMessage());
+            if (drawPriv && gc->hDC) glxWinReleaseDC(gc->hwnd, gc->hDC, drawPriv);
+            if (gc->base.readPriv && gc->hreadDC) glxWinReleaseDC(gc->hreadwnd, gc->hreadDC, (__GLXWinDrawable *)gc->base.readPriv);
+            gc->hDC=NULL;
+            gc->hreadDC=NULL;
             gc->ctx = NULL;
         }
 
+        /* Clear the last active context in the drawable */
+        if (drawPriv) drawPriv->drawContext = NULL;
+
+        free(gc->Dispatch);
         free(gc);
+        _glapi_set_dispatch(NULL);
     }
 }
 
@@ -1618,9 +1796,12 @@ glxWinCreateContext(__GLXscreen * screen,
     context->base.pGlxScreen = screen;
 
     // actual native GL context creation is deferred until attach()
-    context->ctx = NULL;
+    //context->ctx = NULL; already done with memset
     context->shareContext = shareContext;
 
+    context->Dispatch=calloc(sizeof(void*), (sizeof(struct _glapi_table) / sizeof(void *) + MAX_EXTENSION_FUNCS));
+    _glapi_set_dispatch(context->Dispatch);
+
     glWinSetupDispatchTable();
 
     GLWIN_DEBUG_MSG("GLXcontext %p created", context);
@@ -1873,8 +2054,10 @@ glxWinCreateConfigs(HDC hdc, glxWinScreen * screen)
             break;
         }
 
+#ifdef _DEBUG
         if (glxWinDebugSettings.dumpPFD)
             pfdOut(&pfd);
+#endif
 
         if (!(pfd.dwFlags & (PFD_DRAW_TO_WINDOW | PFD_DRAW_TO_BITMAP)) ||
             !(pfd.dwFlags & PFD_SUPPORT_OPENGL)) {
@@ -2162,7 +2345,10 @@ glxWinCreateConfigsExt(HDC hdc, glxWinScreen * screen)
 
     /* fill in configs */
     for (i = 0; i < numConfigs; i++) {
-        int values[num_attrs];
+        int sizevalues=num_attrs*sizeof(int);
+        int *values=(int*)_alloca(sizevalues);
+
+        memset(values,0,sizevalues);
 
         c = &(result[i]);
         c->base.next = NULL;
diff --git a/xorg-server/hw/xwin/glx/makefile b/xorg-server/hw/xwin/glx/makefile
new file mode 100644
index 000000000..e9f2da506
--- /dev/null
+++ b/xorg-server/hw/xwin/glx/makefile
@@ -0,0 +1,46 @@
+LIBRARY=libwinglx
+
+INCLUDES += $(OBJDIR) ..\..\..\glx .. ..\..\..
+DEFINES += GLAPIENTRY=__stdcall _GLAPI_NO_EXPORTS
+
+DEFINES += XWIN_CLIPBOARD
+DEFINES += XWIN_MULTIWINDOW
+DEFINES += XWIN_GLX_WINDOWS
+DEFINES += XWIN_RANDR
+DEFINES += RELOCATE_PROJECTROOT
+INCLUDES += ..\..\..\miext\rootless
+DEFINES += HAVE_XWIN_CONFIG_H PTW32_STATIC_LIB
+
+CSRCS = \
+	winpriv.c \
+	glwrap.c \
+	indirect.c \
+	wgl_ext_api.c
+
+.PHONY: getspecfiles
+
+getspecfiles:
+	wget http://www.opengl.org/registry/api/gl.spec
+	wget http://www.opengl.org/registry/api/gl.tm
+
+	wget http://www.opengl.org/registry/api/glxenum.spec
+	wget http://www.opengl.org/registry/api/glxenumext.spec
+	wget http://www.opengl.org/registry/api/glx.spec
+	wget http://www.opengl.org/registry/api/glxext.spec
+	wget http://www.opengl.org/registry/api/glx.tm
+
+	wget http://www.opengl.org/registry/api/wglenum.spec
+	wget http://www.opengl.org/registry/api/wglenumext.spec
+	wget http://www.opengl.org/registry/api/wgl.spec
+	wget http://www.opengl.org/registry/api/wglext.spec
+	wget http://www.opengl.org/registry/api/wgl.tm
+	wget http://www.opengl.org/registry/api/wglext.h
+	wget http://www.opengl.org/registry/api/glext.h
+	wget http://www.opengl.org/registry/api/glxext.h
+
+$(OBJDIR)\generated_gl_wrappers.c: gen_gl_wrappers.py gl.spec gl.tm
+	gen_gl_wrappers --spec=gl.spec --typemap=gl.tm --dispatch-header=../../../glx/dispatch.h --staticwrappers > $@
+
+$(OBJDIR)\generated_wgl_wrappers.c: gen_gl_wrappers.py wglext.spec wgl.tm
+	gen_gl_wrappers --spec=wglext.spec --typemap=wgl.tm --prefix=wgl --preresolve > $@
+
diff --git a/xorg-server/hw/xwin/glx/simpledib.c b/xorg-server/hw/xwin/glx/simpledib.c
new file mode 100644
index 000000000..f491e2857
--- /dev/null
+++ b/xorg-server/hw/xwin/glx/simpledib.c
@@ -0,0 +1,675 @@
+/*
+** Simple example of rendering to a Windows DIB (Device Independent Bitmap)
+*/
+#include <windows.h>
+#include <math.h>
+#include <GL/gl.h>
+
+#if !defined(M_PI)
+#define M_PI 3.14159265F
+#endif
+
+char *className = "OpenGL";
+char *windowName = "Simple DIB Example";
+int winX = 0, winY = 0;
+int winWidth = 1024, winHeight = 1024;
+
+HDC hDC;
+HDC hDCFrontBuffer;
+HGLRC hGLRC;
+HPALETTE hPalette;
+HBITMAP hBitmap, hOldBitmap;
+
+void (*idleFunc)(void);
+
+BOOL colorIndexMode = FALSE;
+BOOL doubleBuffered = FALSE;
+BOOL renderToDIB = TRUE;
+
+/* Struct used to manage color ramps */
+struct colorIndexState {
+    GLfloat amb[3];	/* ambient color / bottom of ramp */
+    GLfloat diff[3];	/* diffuse color / middle of ramp */
+    GLfloat spec[3];	/* specular color / top of ramp */
+    GLfloat ratio;	/* ratio of diffuse to specular in ramp */
+    GLint indexes[3];	/* where ramp was placed in palette */
+};
+
+/*
+** Each entry in this array corresponds to a color ramp in the
+** palette.  The indexes member of each struct is updated to
+** reflect the placement of the color ramp in the palette.
+*/
+#define NUM_COLORS (sizeof(colors) / sizeof(colors[0]))
+struct colorIndexState colors[] = {
+    {
+        { 0.0F, 0.0F, 0.0F },
+        { 0.1F, 0.6F, 0.3F },
+        { 1.0F, 1.0F, 1.0F },
+        0.75F, { 0, 0, 0 },
+    },
+    {
+        { 0.0F, 0.0F, 0.0F },
+        { 0.0F, 0.2F, 0.5F },
+        { 1.0F, 1.0F, 1.0F },
+
+        0.75F, { 0, 0, 0 },
+    },
+    {
+        { 0.0F, 0.05F, 0.05F },
+        { 0.6F, 0.0F, 0.8F },
+        { 1.0F, 1.0F, 1.0F },
+        0.75F, { 0, 0, 0 },
+    },
+};
+
+void
+drawTorus(void)
+{
+    int numMajor = 32;
+    int numMinor = 24;
+    float majorRadius = 0.6F;
+    float minorRadius = 0.2F;
+    double majorStep = 2.0F*M_PI / numMajor;
+    double minorStep = 2.0F*M_PI / numMinor;
+    int i, j;
+
+    for (i=0; i<numMajor; ++i) {
+	double a0 = i * majorStep;
+	double a1 = a0 + majorStep;
+	GLfloat x0 = (GLfloat) cos(a0);
+	GLfloat y0 = (GLfloat) sin(a0);
+	GLfloat x1 = (GLfloat) cos(a1);
+	GLfloat y1 = (GLfloat) sin(a1);
+
+	if (i & 1) {
+	    glColor3fv(colors[0].diff);
+	    glMaterialiv(GL_FRONT, GL_COLOR_INDEXES, colors[0].indexes);
+	} else {
+	    glColor3fv(colors[1].diff);
+	    glMaterialiv(GL_FRONT, GL_COLOR_INDEXES, colors[1].indexes);
+	}
+
+	glBegin(GL_TRIANGLE_STRIP);
+	for (j=0; j<=numMinor; ++j) {
+	    double b = j * minorStep;
+	    GLfloat c = (GLfloat) cos(b);
+	    GLfloat r = minorRadius * c + majorRadius;
+	    GLfloat z = minorRadius * (GLfloat) sin(b);
+
+	    glNormal3f(x0*c, y0*c, z/minorRadius);
+	    glVertex3f(x0*r, y0*r, z);
+
+	    glNormal3f(x1*c, y1*c, z/minorRadius);
+	    glVertex3f(x1*r, y1*r, z);
+	}
+	glEnd();
+    }
+}
+
+/*****************************************************************/
+
+void
+setProjection(void)
+{
+    glMatrixMode(GL_PROJECTION);
+    glLoadIdentity();
+    /*
+    ** Preserve the aspect ratio of objects in the scene.
+    */
+    if (winWidth > winHeight) {
+	GLfloat aspect = (GLfloat) winWidth / (GLfloat) winHeight;
+	glFrustum(-0.5F*aspect, 0.5F*aspect, -0.5F, 0.5F, 1.0F, 3.0F);
+    } else {
+	GLfloat aspect = (GLfloat) winHeight / (GLfloat) winWidth;
+	glFrustum(-0.5F, 0.5F, -0.5F*aspect, 0.5F*aspect, 1.0F, 3.0F);
+    }
+    glMatrixMode(GL_MODELVIEW);
+}
+
+void
+init(void)
+{
+    GLfloat matShine = 20.00F;
+    GLfloat light0Pos[4] = { 0.70F, 0.70F, 1.25F, 0.00F };
+
+    glClearColor(colors[2].diff[0], colors[2].diff[1], colors[2].diff[2], 1.0F);
+    glClearIndex((GLfloat) colors[2].indexes[1]);
+
+    setProjection();
+    glTranslatef(0.0F, 0.0F, -2.0F);
+
+    glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, matShine);
+    glLightfv(GL_LIGHT0, GL_POSITION, light0Pos);
+    glEnable(GL_LIGHT0);
+
+    glEnable(GL_LIGHTING);
+    glEnable(GL_DEPTH_TEST);
+
+    if (!colorIndexMode) {
+	glEnable(GL_COLOR_MATERIAL);
+    }
+}
+
+void
+doRedraw(void)
+{
+    static GLfloat x, y, z;
+
+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+    glPushMatrix();
+    glRotatef(x, 1.0F, 0.0F, 0.0F);
+    glRotatef(y, 0.0F, 1.0F, 0.0F);
+    glRotatef(z, 0.0F, 0.0F, 1.0F);
+
+    drawTorus();
+
+    glPopMatrix();
+
+    if (renderToDIB) {
+	glFinish();
+	BitBlt(hDCFrontBuffer, /*winWidth/4, winHeight/4, winWidth/2, winHeight/2,*/0,0,winWidth, winHeight, hDC, 0, 0, SRCCOPY);
+	GdiFlush();
+    } else {
+	SwapBuffers(hDC);
+    }
+
+    x += 5.0F;
+    if (x > 360.0F) x -= 360.0F;
+    y += 7.0F;
+    if (y > 360.0F) y -= 360.0F;
+    z += 9.0F;
+    if (z > 360.0F) z -= 360.0F;
+}
+
+void
+redraw(void)
+{
+    idleFunc = doRedraw;
+}
+
+void
+resize(void)
+{
+    setProjection();
+    glViewport(0, 0, winWidth, winHeight /*winWidth/2, winHeight/2*/);
+}
+
+/*****************************************************************/
+
+void
+setupDIB(HDC hDC)
+{
+    BITMAPINFO *bmInfo;
+    BITMAPINFOHEADER *bmHeader;
+    UINT usage;
+    VOID *base;
+    int bmiSize;
+    int bitsPerPixel;
+
+    bmiSize = sizeof(*bmInfo);
+    bitsPerPixel = GetDeviceCaps(hDC, BITSPIXEL);
+
+    switch (bitsPerPixel) {
+    case 8:
+	/* bmiColors is 256 WORD palette indices */
+	bmiSize += (256 * sizeof(WORD)) - sizeof(RGBQUAD);
+	break;
+    case 16:
+	/* bmiColors is 3 WORD component masks */
+	bmiSize += (3 * sizeof(DWORD)) - sizeof(RGBQUAD);
+	break;
+    case 24:
+    case 32:
+    default:
+	/* bmiColors not used */
+	break;
+    }
+
+    bmInfo = (BITMAPINFO *) calloc(1, bmiSize);
+    bmHeader = &bmInfo->bmiHeader;
+
+    bmHeader->biSize = sizeof(*bmHeader);
+    bmHeader->biWidth = winWidth /* /2 */;
+    bmHeader->biHeight = winHeight /* /2 */;
+    bmHeader->biPlanes = 1;			/* must be 1 */
+    bmHeader->biBitCount = bitsPerPixel;
+    bmHeader->biXPelsPerMeter = 0;
+    bmHeader->biYPelsPerMeter = 0;
+    bmHeader->biClrUsed = 0;			/* all are used */
+    bmHeader->biClrImportant = 0;		/* all are important */
+
+    switch (bitsPerPixel) {
+    case 8:
+	bmHeader->biCompression = BI_RGB;
+	bmHeader->biSizeImage = 0;
+	usage = DIB_PAL_COLORS;
+	/* bmiColors is 256 WORD palette indices */
+	{
+	    WORD *palIndex = (WORD *) &bmInfo->bmiColors[0];
+	    int i;
+
+	    for (i=0; i<256; i++) {
+		palIndex[i] = i;
+	    }
+	}
+	break;
+    case 16:
+	bmHeader->biCompression = BI_RGB;
+	bmHeader->biSizeImage = 0;
+	usage = DIB_RGB_COLORS;
+	/* bmiColors is 3 WORD component masks */
+	{
+	    DWORD *compMask = (DWORD *) &bmInfo->bmiColors[0];
+
+	    compMask[0] = 0xF800;
+	    compMask[1] = 0x07E0;
+	    compMask[2] = 0x001F;
+	}
+	break;
+    case 24:
+    case 32:
+    default:
+	bmHeader->biCompression = BI_RGB;
+	bmHeader->biSizeImage = 0;
+	usage = DIB_RGB_COLORS;
+	/* bmiColors not used */
+	break;
+    }
+
+    hBitmap = CreateDIBSection(hDC, bmInfo, usage, &base, NULL, 0);
+    if (hBitmap == NULL) {
+	(void) MessageBox(WindowFromDC(hDC),
+		"Failed to create DIBSection.",
+		"OpenGL application error",
+		MB_ICONERROR | MB_OK);
+	exit(1);
+    }
+
+    hOldBitmap = SelectObject(hDC, hBitmap);
+
+    free(bmInfo);
+}
+
+void
+resizeDIB(HDC hDC)
+{
+    SelectObject(hDC, hOldBitmap);
+    DeleteObject(hBitmap);
+    setupDIB(hDC);
+}
+
+void
+setupPalette(HDC hDC)
+{
+    PIXELFORMATDESCRIPTOR pfd;
+    LOGPALETTE* pPal;
+    int pixelFormat = GetPixelFormat(hDC);
+    int paletteSize;
+
+    DescribePixelFormat(hDC, pixelFormat, sizeof(PIXELFORMATDESCRIPTOR), &pfd);
+
+    /*
+    ** Determine if a palette is needed and if so what size.
+    */
+    if (pfd.dwFlags & PFD_NEED_PALETTE) {
+	paletteSize = 1 << pfd.cColorBits;
+    } else if (pfd.iPixelType == PFD_TYPE_COLORINDEX) {
+	paletteSize = 4096;
+    } else {
+	return;
+    }
+
+    pPal = (LOGPALETTE*)
+	malloc(sizeof(LOGPALETTE) + paletteSize * sizeof(PALETTEENTRY));
+    pPal->palVersion = 0x300;
+    pPal->palNumEntries = paletteSize;
+
+    if (pfd.iPixelType == PFD_TYPE_RGBA) {
+	/*
+	** Fill the logical paletee with RGB color ramps
+	*/
+	int redMask = (1 << pfd.cRedBits) - 1;
+	int greenMask = (1 << pfd.cGreenBits) - 1;
+	int blueMask = (1 << pfd.cBlueBits) - 1;
+	int i;
+
+	for (i=0; i<paletteSize; ++i) {
+	    pPal->palPalEntry[i].peRed =
+		    (((i >> pfd.cRedShift) & redMask) * 255) / redMask;
+	    pPal->palPalEntry[i].peGreen =
+		    (((i >> pfd.cGreenShift) & greenMask) * 255) / greenMask;
+	    pPal->palPalEntry[i].peBlue =
+		    (((i >> pfd.cBlueShift) & blueMask) * 255) / blueMask;
+	    pPal->palPalEntry[i].peFlags = 0;
+	}
+    } else {
+	/*
+	** Fill the logical palette with color ramps.
+	**
+	** Set up the logical palette so that it can be realized
+	** into the system palette as an identity palette.
+	**
+	** 1) The default static entries should be present and at the right
+	**    location.  The easiest way to do this is to grab them from
+	**    the current system palette.
+	**
+	** 2) All non-static entries should be initialized to unique values.
+	**    The easiest way to do this is to ensure that all of the non-static
+	**    entries have the PC_NOCOLLAPSE flag bit set.
+	*/
+	int numRamps = NUM_COLORS;
+	int rampSize = (paletteSize - 20) / numRamps;
+	int extra = (paletteSize - 20) - (numRamps * rampSize);
+	int i, r;
+
+	/*
+	** Initialize static entries by copying them from the
+	** current system palette.
+	*/
+	GetSystemPaletteEntries(hDC, 0, paletteSize, &pPal->palPalEntry[0]);
+
+	/*
+	** Fill in non-static entries with desired colors.
+	*/
+	for (r=0; r<numRamps; ++r) {
+	    int rampBase = r * rampSize + 10;
+	    PALETTEENTRY *pe = &pPal->palPalEntry[rampBase];
+	    int diffSize = (int) (rampSize * colors[r].ratio);
+	    int specSize = rampSize - diffSize;
+
+	    for (i=0; i<rampSize; ++i) {
+		GLfloat *c0, *c1;
+		GLint a;
+
+		if (i < diffSize) {
+		    c0 = colors[r].amb;
+		    c1 = colors[r].diff;
+		    a = (i * 255) / (diffSize - 1);
+		} else {
+		    c0 = colors[r].diff;
+		    c1 = colors[r].spec;
+		    a = ((i - diffSize) * 255) / (specSize - 1);
+		}
+
+		pe[i].peRed = (BYTE) (a * (c1[0] - c0[0]) + 255 * c0[0]);
+		pe[i].peGreen = (BYTE) (a * (c1[1] - c0[1]) + 255 * c0[1]);
+		pe[i].peBlue = (BYTE) (a * (c1[2] - c0[2]) + 255 * c0[2]);
+		pe[i].peFlags = PC_NOCOLLAPSE;
+	    }
+
+	    colors[r].indexes[0] = rampBase;
+	    colors[r].indexes[1] = rampBase + (diffSize-1);
+	    colors[r].indexes[2] = rampBase + (rampSize-1);
+	}
+
+	/*
+	** Initialize any remaining non-static entries.
+	*/
+	for (i=0; i<extra; ++i) {
+	    int index = numRamps*rampSize+10+i;
+	    PALETTEENTRY *pe = &pPal->palPalEntry[index];
+
+	    pe->peRed = (BYTE) 0;
+	    pe->peGreen = (BYTE) 0;
+	    pe->peBlue = (BYTE) 0;
+	    pe->peFlags = PC_NOCOLLAPSE;
+	}
+    }
+
+    hPalette = CreatePalette(pPal);
+    free(pPal);
+
+    if (hPalette) {
+	SelectPalette(hDC, hPalette, FALSE);
+	RealizePalette(hDC);
+    }
+}
+
+void
+setupPixelFormat(HDC hDC)
+{
+    PIXELFORMATDESCRIPTOR pfd = {
+	sizeof(PIXELFORMATDESCRIPTOR),	/* size of this pfd */
+	1,				/* version num */
+	PFD_SUPPORT_OPENGL,		/* support OpenGL */
+	0,				/* pixel type */
+	0,				/* 8-bit color depth */
+	0, 0, 0, 0, 0, 0,		/* color bits (ignored) */
+	0,				/* no alpha buffer */
+	0,				/* alpha bits (ignored) */
+	0,				/* no accumulation buffer */
+	0, 0, 0, 0,			/* accum bits (ignored) */
+	16,				/* depth buffer */
+	0,				/* no stencil buffer */
+	0,				/* no auxiliary buffers */
+	PFD_MAIN_PLANE,			/* main layer */
+	0,				/* reserved */
+	0, 0, 0,			/* no layer, visible, damage masks */
+    };
+    int SelectedPixelFormat;
+    BOOL retVal;
+
+    pfd.cColorBits = GetDeviceCaps(hDC, BITSPIXEL);
+
+    if (colorIndexMode) {
+	pfd.iPixelType = PFD_TYPE_COLORINDEX;
+    } else {
+	pfd.iPixelType = PFD_TYPE_RGBA;
+    }
+
+    if (doubleBuffered) {
+        pfd.dwFlags |= PFD_DOUBLEBUFFER;
+    }
+
+    if (renderToDIB) {
+	pfd.dwFlags |= PFD_DRAW_TO_BITMAP;
+    } else {
+	pfd.dwFlags |= PFD_DRAW_TO_WINDOW;
+    }
+
+    SelectedPixelFormat = ChoosePixelFormat(hDC, &pfd);
+    if (SelectedPixelFormat == 0) {
+	(void) MessageBox(WindowFromDC(hDC),
+		"Failed to find acceptable pixel format.",
+		"OpenGL application error",
+		MB_ICONERROR | MB_OK);
+	exit(1);
+    }
+
+    retVal = SetPixelFormat(hDC, SelectedPixelFormat, &pfd);
+    if (retVal != TRUE) {
+	(void) MessageBox(WindowFromDC(hDC),
+		"Failed to set pixel format.",
+		"OpenGL application error",
+		MB_ICONERROR | MB_OK);
+	exit(1);
+    }
+}
+
+LRESULT APIENTRY
+WndProc(
+    HWND hWnd,
+    UINT message,
+    WPARAM wParam,
+    LPARAM lParam)
+{
+    switch (message) {
+    case WM_CREATE:
+	return 0;
+    case WM_DESTROY:
+	PostQuitMessage(0);
+	return 0;
+    case WM_SIZE:
+	if (hGLRC) {
+	    winWidth = (int) LOWORD(lParam);
+	    winHeight = (int) HIWORD(lParam);
+	    /**/
+	    if (renderToDIB) {
+		resizeDIB(hDC);
+	    }
+	    /**/
+	    resize();
+	    return 0;
+	}
+    case WM_PALETTECHANGED:
+	/*
+	** Update palette mapping if this *is not* the active window.
+	*/
+	if (hGLRC && hPalette && (HWND) wParam != hWnd) {
+	    UnrealizeObject(hPalette);
+	    SelectPalette(hDC, hPalette, FALSE);
+	    RealizePalette(hDC);
+	    redraw();
+	    return 0;
+	}
+	break;
+    case WM_QUERYNEWPALETTE:
+	/*
+	** Update palette mapping if this *is* the active window.
+	*/
+	if (hGLRC && hPalette) {
+	    UnrealizeObject(hPalette);
+	    SelectPalette(hDC, hPalette, FALSE);
+	    RealizePalette(hDC);
+	    redraw();
+	    return TRUE;
+	}
+	break;
+    case WM_PAINT:
+	/*
+	** Update the window.  Don't use the device context returned by
+	** BeginPaint as it won't have the right palette selected into it.
+	*/
+	if (hGLRC) {
+	    PAINTSTRUCT ps;
+
+	    BeginPaint(hWnd, &ps);
+	    redraw();
+	    EndPaint(hWnd, &ps);
+	    return 0;
+	}
+	break;
+    case WM_CHAR:
+	switch ((int)wParam) {
+	case VK_ESCAPE:
+	    DestroyWindow(hWnd);
+	    return 0;
+	case VK_SPACE:
+	    if (idleFunc) {
+		idleFunc = NULL;
+	    } else {
+		idleFunc = doRedraw;
+	    }
+	default:
+	    break;
+	}
+	break;
+    default:
+	break;
+    }
+
+    /* Deal with any unprocessed messages */
+    return DefWindowProc(hWnd, message, wParam, lParam);
+}
+
+int APIENTRY
+WinMain(
+    HINSTANCE hCurrentInst,
+    HINSTANCE hPreviousInst,
+    LPSTR lpszCmdLine,
+    int nCmdShow)
+{
+    const GLubyte * Ret;
+    WNDCLASS wndClass;
+    HWND hWnd;
+    MSG msg;
+
+    __asm int 3;
+    Ret = glGetString( GL_EXTENSIONS );
+
+    /* Define and register a window class */
+    wndClass.style = CS_HREDRAW | CS_VREDRAW;
+    wndClass.lpfnWndProc = WndProc;
+    wndClass.cbClsExtra = 0;
+    wndClass.cbWndExtra = 0;
+    wndClass.hInstance = hCurrentInst;
+    wndClass.hIcon = LoadIcon(NULL, IDI_APPLICATION);
+    wndClass.hCursor = LoadCursor(NULL, IDC_ARROW);
+    wndClass.hbrBackground = GetStockObject(WHITE_BRUSH);
+    wndClass.lpszMenuName = NULL;
+    wndClass.lpszClassName = className;
+    RegisterClass(&wndClass);
+
+    /* Create a window of the previously defined class */
+    hWnd = CreateWindow(
+	className,		/* Window class's name */
+	windowName,		/* Title bar text */
+	WS_OVERLAPPEDWINDOW |	/* The window's style */
+	WS_CLIPCHILDREN |
+	WS_CLIPSIBLINGS,
+	winX, winY,		/* Position */
+	winWidth, winHeight,	/* Size */
+	NULL,			/* Parent window's handle */
+	NULL,			/* Menu handle */
+	hCurrentInst,		/* Instance handle */
+	NULL);			/* No additional data */
+
+    /* Map the window to the screen */
+    ShowWindow(hWnd, nCmdShow);
+
+    /* Force the window to repaint itself */
+    UpdateWindow(hWnd);
+
+    /*
+    ** Set up for OpenGL rendering.  Bind the rendering context to
+    ** the same device context that the palette will be selected into.
+    */
+    hDC = GetDC(hWnd);
+    hDCFrontBuffer = hDC;
+    if (renderToDIB) {
+	hDC = CreateCompatibleDC(hDCFrontBuffer);
+	setupDIB(hDC);
+    }
+    Ret = glGetString( GL_EXTENSIONS );
+    setupPixelFormat(hDC);
+    Ret = glGetString( GL_EXTENSIONS );
+    setupPalette(hDC);
+    Ret = glGetString( GL_EXTENSIONS );
+    hGLRC = wglCreateContext(hDC);
+    Ret = glGetString( GL_EXTENSIONS );
+    wglMakeCurrent(hDC, hGLRC);
+    Ret = glGetString( GL_EXTENSIONS );
+    init();
+    idleFunc = doRedraw;
+    
+
+
+    /* Process Messages */
+    while (1) {
+	/* execute the idle function while there are no messages to process */
+	while (idleFunc &&
+	       PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE) == FALSE)
+	{
+	    (*idleFunc)();
+	}
+	if (GetMessage(&msg, NULL, 0, 0) != TRUE) {
+	    break;
+	}
+	TranslateMessage(&msg);
+	DispatchMessage(&msg);
+    }
+
+    /*
+    ** Finish OpenGL rendering.
+    */
+    idleFunc = NULL;
+    if (hGLRC) {
+	wglMakeCurrent(NULL, NULL);
+	wglDeleteContext(hGLRC);
+    }
+    ReleaseDC(hWnd, hDC);
+
+    return msg.wParam;
+}
diff --git a/xorg-server/hw/xwin/glx/wgl.tm b/xorg-server/hw/xwin/glx/wgl.tm
new file mode 100644
index 000000000..f7ae79ec8
--- /dev/null
+++ b/xorg-server/hw/xwin/glx/wgl.tm
@@ -0,0 +1,37 @@
+BOOL,*,*,	    BOOL,*,*
+DWORD,*,*,	    DWORD,*,*
+FLOAT,*,*,	    FLOAT,*,*
+GLbitfield,*,*,     GLbitfield,*,*
+GLboolean,*,*,	    GLboolean,*,*
+GLenum,*,*,	    GLenum,*,*
+GLfloat,*,*,	    GLfloat,*,*
+GLint,*,*,	    GLint,*,*
+GLsizei,*,*,	    GLsizei,*,*
+GLuint,*,*,	    GLuint,*,*
+GLushort,*,*,	    GLushort,*,*
+HANDLE,*,*,	    HANDLE,*,*
+HDC,*,*,	    HDC,*,*
+HGLRC,*,*,	    HGLRC,*,*
+HGPUNV,*,*,	    HGPUNV,*,*
+HPBUFFERARB,*,*,    HPBUFFERARB,*,*
+HPBUFFEREXT,*,*,    HPBUFFEREXT,*,*
+HPVIDEODEV,*,*,     HPVIDEODEV,*,*
+HPGPUNV,*,*,	    HPGPUNV,*,*
+HVIDEOINPUTDEVICENV,*,*,    HVIDEOINPUTDEVICENV,*,*
+HVIDEOOUTPUTDEVICENV,*,*,   HVIDEOOUTPUTDEVICENV,*,*
+INT,*,*,	    INT,*,*
+INT32,*,*,	    INT32,*,*
+INT64,*,*,	    INT64,*,*
+LPVOID,*,*,	    LPVOID,*,*
+PGPU_DEVICE,*,*,    PGPU_DEVICE,*,*
+PROC,*,*,	    PROC,*,*
+String,*,*,	    const char *,*,*
+UINT,*,*,	    UINT,*,*
+USHORT,*,*,	    USHORT,*,*
+VOID,*,*,	    VOID,*,*
+VoidPointer,*,*,    void*,*,*
+float,*,*,	    float,*,*
+int,*,*,	    int,*,*
+uint,*,*,	    unsigned int,*,*
+ulong,*,*,	    unsigned long,*,*
+void,*,*,	    *,*,*
diff --git a/xorg-server/hw/xwin/glx/wgl_ext_api.c b/xorg-server/hw/xwin/glx/wgl_ext_api.c
index 78b6e2a02..c11eb4f14 100644
--- a/xorg-server/hw/xwin/glx/wgl_ext_api.c
+++ b/xorg-server/hw/xwin/glx/wgl_ext_api.c
@@ -35,15 +35,20 @@
 #include <GL/glext.h>
 #include <glx/glxserver.h>
 #include <glx/glxext.h>
-#include <GL/wglext.h>
+#include "wglext.h"
 #include <wgl_ext_api.h>
 #include "glwindows.h"
 
 #define RESOLVE_DECL(type) \
     static type type##proc = NULL;
 
+#ifdef _DEBUG
 #define PRERESOLVE(type, symbol) \
     type##proc = (type)wglGetProcAddress(symbol);
+#else
+#define PRERESOLVE(type, symbol) \
+    type##proc = (type)wglGetProcAddress(symbol);
+#endif
 
 #define RESOLVE_RET(type, symbol, retval) \
   if (type##proc == NULL) { \
diff --git a/xorg-server/hw/xwin/glx/wgl_ext_api.h b/xorg-server/hw/xwin/glx/wgl_ext_api.h
index b7231eb13..63b1d7ef1 100644
--- a/xorg-server/hw/xwin/glx/wgl_ext_api.h
+++ b/xorg-server/hw/xwin/glx/wgl_ext_api.h
@@ -29,7 +29,7 @@
 #ifndef wgl_ext_api_h
 #define wgl_ext_api_h
 
-#include <GL/wglext.h>
+#include "wglext.h"
 
 void wglResolveExtensionProcs(void);
 
@@ -38,46 +38,46 @@ void wglResolveExtensionProcs(void);
   XXX: should be automatically generated as well
 */
 
-const char *wglGetExtensionsStringARBWrapper(HDC hdc);
-BOOL wglMakeContextCurrentARBWrapper(HDC hDrawDC, HDC hReadDC, HGLRC hglrc);
-HDC wglGetCurrentReadDCARBWrapper(VOID);
+const char * __stdcall wglGetExtensionsStringARBWrapper(HDC hdc);
+BOOL __stdcall wglMakeContextCurrentARBWrapper(HDC hDrawDC, HDC hReadDC, HGLRC hglrc);
+HDC __stdcall wglGetCurrentReadDCARBWrapper(VOID);
 
-BOOL wglGetPixelFormatAttribivARBWrapper(HDC hdc,
+BOOL __stdcall wglGetPixelFormatAttribivARBWrapper(HDC hdc,
                                          int iPixelFormat,
                                          int iLayerPlane,
                                          UINT nAttributes,
                                          const int *piAttributes,
                                          int *piValues);
 
-BOOL wglGetPixelFormatAttribfvARBWrapper(HDC hdc,
+BOOL __stdcall wglGetPixelFormatAttribfvARBWrapper(HDC hdc,
                                          int iPixelFormat,
                                          int iLayerPlane,
                                          UINT nAttributes,
                                          const int *piAttributes,
                                          FLOAT * pfValues);
 
-BOOL wglChoosePixelFormatARBWrapper(HDC hdc,
+BOOL __stdcall wglChoosePixelFormatARBWrapper(HDC hdc,
                                     const int *piAttribIList,
                                     const FLOAT * pfAttribFList,
                                     UINT nMaxFormats,
                                     int *piFormats, UINT * nNumFormats);
 
-HPBUFFERARB wglCreatePbufferARBWrapper(HDC hDC,
+HPBUFFERARB __stdcall wglCreatePbufferARBWrapper(HDC hDC,
                                        int iPixelFormat,
                                        int iWidth,
                                        int iHeight, const int *piAttribList);
 
-HDC wglGetPbufferDCARBWrapper(HPBUFFERARB hPbuffer);
+HDC __stdcall wglGetPbufferDCARBWrapper(HPBUFFERARB hPbuffer);
 
-int wglReleasePbufferDCARBWrapper(HPBUFFERARB hPbuffer, HDC hDC);
+int __stdcall wglReleasePbufferDCARBWrapper(HPBUFFERARB hPbuffer, HDC hDC);
 
-BOOL wglDestroyPbufferARBWrapper(HPBUFFERARB hPbuffer);
+BOOL __stdcall wglDestroyPbufferARBWrapper(HPBUFFERARB hPbuffer);
 
-BOOL wglQueryPbufferARBWrapper(HPBUFFERARB hPbuffer,
+BOOL __stdcall wglQueryPbufferARBWrapper(HPBUFFERARB hPbuffer,
                                int iAttribute, int *piValue);
 
-BOOL wglSwapIntervalEXTWrapper(int interval);
+BOOL __stdcall wglSwapIntervalEXTWrapper(int interval);
 
-int wglGetSwapIntervalEXTWrapper(void);
+int __stdcall wglGetSwapIntervalEXTWrapper(void);
 
 #endif                          /* wgl_ext_api_h */
diff --git a/xorg-server/hw/xwin/glx/wglext.h b/xorg-server/hw/xwin/glx/wglext.h
new file mode 100644
index 000000000..b5dc7bf7f
--- /dev/null
+++ b/xorg-server/hw/xwin/glx/wglext.h
@@ -0,0 +1,943 @@
+#ifndef __wglext_h_
+#define __wglext_h_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+** Copyright (c) 2007-2012 The Khronos Group Inc.
+** 
+** Permission is hereby granted, free of charge, to any person obtaining a
+** copy of this software and/or associated documentation files (the
+** "Materials"), to deal in the Materials without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Materials, and to
+** permit persons to whom the Materials are 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 Materials.
+** 
+** THE MATERIALS ARE 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
+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+*/
+
+/* Function declaration macros - to move into glplatform.h */
+
+#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
+#define WIN32_LEAN_AND_MEAN 1
+#include <windows.h>
+#endif
+
+#ifndef APIENTRY
+#define APIENTRY
+#endif
+#ifndef APIENTRYP
+#define APIENTRYP APIENTRY *
+#endif
+#ifndef GLAPI
+#define GLAPI extern
+#endif
+
+/*************************************************************/
+
+/* Header file version number */
+/* wglext.h last updated 2012/01/04 */
+/* Current version at http://www.opengl.org/registry/ */
+#define WGL_WGLEXT_VERSION 24
+
+#ifndef WGL_ARB_buffer_region
+#define WGL_FRONT_COLOR_BUFFER_BIT_ARB 0x00000001
+#define WGL_BACK_COLOR_BUFFER_BIT_ARB  0x00000002
+#define WGL_DEPTH_BUFFER_BIT_ARB       0x00000004
+#define WGL_STENCIL_BUFFER_BIT_ARB     0x00000008
+#endif
+
+#ifndef WGL_ARB_multisample
+#define WGL_SAMPLE_BUFFERS_ARB         0x2041
+#define WGL_SAMPLES_ARB                0x2042
+#endif
+
+#ifndef WGL_ARB_extensions_string
+#endif
+
+#ifndef WGL_ARB_pixel_format
+#define WGL_NUMBER_PIXEL_FORMATS_ARB   0x2000
+#define WGL_DRAW_TO_WINDOW_ARB         0x2001
+#define WGL_DRAW_TO_BITMAP_ARB         0x2002
+#define WGL_ACCELERATION_ARB           0x2003
+#define WGL_NEED_PALETTE_ARB           0x2004
+#define WGL_NEED_SYSTEM_PALETTE_ARB    0x2005
+#define WGL_SWAP_LAYER_BUFFERS_ARB     0x2006
+#define WGL_SWAP_METHOD_ARB            0x2007
+#define WGL_NUMBER_OVERLAYS_ARB        0x2008
+#define WGL_NUMBER_UNDERLAYS_ARB       0x2009
+#define WGL_TRANSPARENT_ARB            0x200A
+#define WGL_TRANSPARENT_RED_VALUE_ARB  0x2037
+#define WGL_TRANSPARENT_GREEN_VALUE_ARB 0x2038
+#define WGL_TRANSPARENT_BLUE_VALUE_ARB 0x2039
+#define WGL_TRANSPARENT_ALPHA_VALUE_ARB 0x203A
+#define WGL_TRANSPARENT_INDEX_VALUE_ARB 0x203B
+#define WGL_SHARE_DEPTH_ARB            0x200C
+#define WGL_SHARE_STENCIL_ARB          0x200D
+#define WGL_SHARE_ACCUM_ARB            0x200E
+#define WGL_SUPPORT_GDI_ARB            0x200F
+#define WGL_SUPPORT_OPENGL_ARB         0x2010
+#define WGL_DOUBLE_BUFFER_ARB          0x2011
+#define WGL_STEREO_ARB                 0x2012
+#define WGL_PIXEL_TYPE_ARB             0x2013
+#define WGL_COLOR_BITS_ARB             0x2014
+#define WGL_RED_BITS_ARB               0x2015
+#define WGL_RED_SHIFT_ARB              0x2016
+#define WGL_GREEN_BITS_ARB             0x2017
+#define WGL_GREEN_SHIFT_ARB            0x2018
+#define WGL_BLUE_BITS_ARB              0x2019
+#define WGL_BLUE_SHIFT_ARB             0x201A
+#define WGL_ALPHA_BITS_ARB             0x201B
+#define WGL_ALPHA_SHIFT_ARB            0x201C
+#define WGL_ACCUM_BITS_ARB             0x201D
+#define WGL_ACCUM_RED_BITS_ARB         0x201E
+#define WGL_ACCUM_GREEN_BITS_ARB       0x201F
+#define WGL_ACCUM_BLUE_BITS_ARB        0x2020
+#define WGL_ACCUM_ALPHA_BITS_ARB       0x2021
+#define WGL_DEPTH_BITS_ARB             0x2022
+#define WGL_STENCIL_BITS_ARB           0x2023
+#define WGL_AUX_BUFFERS_ARB            0x2024
+#define WGL_NO_ACCELERATION_ARB        0x2025
+#define WGL_GENERIC_ACCELERATION_ARB   0x2026
+#define WGL_FULL_ACCELERATION_ARB      0x2027
+#define WGL_SWAP_EXCHANGE_ARB          0x2028
+#define WGL_SWAP_COPY_ARB              0x2029
+#define WGL_SWAP_UNDEFINED_ARB         0x202A
+#define WGL_TYPE_RGBA_ARB              0x202B
+#define WGL_TYPE_COLORINDEX_ARB        0x202C
+#endif
+
+#ifndef WGL_ARB_make_current_read
+#define ERROR_INVALID_PIXEL_TYPE_ARB   0x2043
+#define ERROR_INCOMPATIBLE_DEVICE_CONTEXTS_ARB 0x2054
+#endif
+
+#ifndef WGL_ARB_pbuffer
+#define WGL_DRAW_TO_PBUFFER_ARB        0x202D
+#define WGL_MAX_PBUFFER_PIXELS_ARB     0x202E
+#define WGL_MAX_PBUFFER_WIDTH_ARB      0x202F
+#define WGL_MAX_PBUFFER_HEIGHT_ARB     0x2030
+#define WGL_PBUFFER_LARGEST_ARB        0x2033
+#define WGL_PBUFFER_WIDTH_ARB          0x2034
+#define WGL_PBUFFER_HEIGHT_ARB         0x2035
+#define WGL_PBUFFER_LOST_ARB           0x2036
+#endif
+
+#ifndef WGL_ARB_render_texture
+#define WGL_BIND_TO_TEXTURE_RGB_ARB    0x2070
+#define WGL_BIND_TO_TEXTURE_RGBA_ARB   0x2071
+#define WGL_TEXTURE_FORMAT_ARB         0x2072
+#define WGL_TEXTURE_TARGET_ARB         0x2073
+#define WGL_MIPMAP_TEXTURE_ARB         0x2074
+#define WGL_TEXTURE_RGB_ARB            0x2075
+#define WGL_TEXTURE_RGBA_ARB           0x2076
+#define WGL_NO_TEXTURE_ARB             0x2077
+#define WGL_TEXTURE_CUBE_MAP_ARB       0x2078
+#define WGL_TEXTURE_1D_ARB             0x2079
+#define WGL_TEXTURE_2D_ARB             0x207A
+#define WGL_MIPMAP_LEVEL_ARB           0x207B
+#define WGL_CUBE_MAP_FACE_ARB          0x207C
+#define WGL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x207D
+#define WGL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x207E
+#define WGL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x207F
+#define WGL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x2080
+#define WGL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x2081
+#define WGL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x2082
+#define WGL_FRONT_LEFT_ARB             0x2083
+#define WGL_FRONT_RIGHT_ARB            0x2084
+#define WGL_BACK_LEFT_ARB              0x2085
+#define WGL_BACK_RIGHT_ARB             0x2086
+#define WGL_AUX0_ARB                   0x2087
+#define WGL_AUX1_ARB                   0x2088
+#define WGL_AUX2_ARB                   0x2089
+#define WGL_AUX3_ARB                   0x208A
+#define WGL_AUX4_ARB                   0x208B
+#define WGL_AUX5_ARB                   0x208C
+#define WGL_AUX6_ARB                   0x208D
+#define WGL_AUX7_ARB                   0x208E
+#define WGL_AUX8_ARB                   0x208F
+#define WGL_AUX9_ARB                   0x2090
+#endif
+
+#ifndef WGL_ARB_pixel_format_float
+#define WGL_TYPE_RGBA_FLOAT_ARB        0x21A0
+#endif
+
+#ifndef WGL_ARB_framebuffer_sRGB
+#define WGL_FRAMEBUFFER_SRGB_CAPABLE_ARB 0x20A9
+#endif
+
+#ifndef WGL_ARB_create_context
+#define WGL_CONTEXT_DEBUG_BIT_ARB      0x00000001
+#define WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x00000002
+#define WGL_CONTEXT_MAJOR_VERSION_ARB  0x2091
+#define WGL_CONTEXT_MINOR_VERSION_ARB  0x2092
+#define WGL_CONTEXT_LAYER_PLANE_ARB    0x2093
+#define WGL_CONTEXT_FLAGS_ARB          0x2094
+#define ERROR_INVALID_VERSION_ARB      0x2095
+#endif
+
+#ifndef WGL_ARB_create_context_profile
+#define WGL_CONTEXT_PROFILE_MASK_ARB   0x9126
+#define WGL_CONTEXT_CORE_PROFILE_BIT_ARB 0x00000001
+#define WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB 0x00000002
+#define ERROR_INVALID_PROFILE_ARB      0x2096
+#endif
+
+#ifndef WGL_ARB_create_context_robustness
+#define WGL_CONTEXT_ROBUST_ACCESS_BIT_ARB 0x00000004
+#define WGL_LOSE_CONTEXT_ON_RESET_ARB  0x8252
+#define WGL_CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB 0x8256
+#define WGL_NO_RESET_NOTIFICATION_ARB  0x8261
+#endif
+
+#ifndef WGL_EXT_make_current_read
+#define ERROR_INVALID_PIXEL_TYPE_EXT   0x2043
+#endif
+
+#ifndef WGL_EXT_pixel_format
+#define WGL_NUMBER_PIXEL_FORMATS_EXT   0x2000
+#define WGL_DRAW_TO_WINDOW_EXT         0x2001
+#define WGL_DRAW_TO_BITMAP_EXT         0x2002
+#define WGL_ACCELERATION_EXT           0x2003
+#define WGL_NEED_PALETTE_EXT           0x2004
+#define WGL_NEED_SYSTEM_PALETTE_EXT    0x2005
+#define WGL_SWAP_LAYER_BUFFERS_EXT     0x2006
+#define WGL_SWAP_METHOD_EXT            0x2007
+#define WGL_NUMBER_OVERLAYS_EXT        0x2008
+#define WGL_NUMBER_UNDERLAYS_EXT       0x2009
+#define WGL_TRANSPARENT_EXT            0x200A
+#define WGL_TRANSPARENT_VALUE_EXT      0x200B
+#define WGL_SHARE_DEPTH_EXT            0x200C
+#define WGL_SHARE_STENCIL_EXT          0x200D
+#define WGL_SHARE_ACCUM_EXT            0x200E
+#define WGL_SUPPORT_GDI_EXT            0x200F
+#define WGL_SUPPORT_OPENGL_EXT         0x2010
+#define WGL_DOUBLE_BUFFER_EXT          0x2011
+#define WGL_STEREO_EXT                 0x2012
+#define WGL_PIXEL_TYPE_EXT             0x2013
+#define WGL_COLOR_BITS_EXT             0x2014
+#define WGL_RED_BITS_EXT               0x2015
+#define WGL_RED_SHIFT_EXT              0x2016
+#define WGL_GREEN_BITS_EXT             0x2017
+#define WGL_GREEN_SHIFT_EXT            0x2018
+#define WGL_BLUE_BITS_EXT              0x2019
+#define WGL_BLUE_SHIFT_EXT             0x201A
+#define WGL_ALPHA_BITS_EXT             0x201B
+#define WGL_ALPHA_SHIFT_EXT            0x201C
+#define WGL_ACCUM_BITS_EXT             0x201D
+#define WGL_ACCUM_RED_BITS_EXT         0x201E
+#define WGL_ACCUM_GREEN_BITS_EXT       0x201F
+#define WGL_ACCUM_BLUE_BITS_EXT        0x2020
+#define WGL_ACCUM_ALPHA_BITS_EXT       0x2021
+#define WGL_DEPTH_BITS_EXT             0x2022
+#define WGL_STENCIL_BITS_EXT           0x2023
+#define WGL_AUX_BUFFERS_EXT            0x2024
+#define WGL_NO_ACCELERATION_EXT        0x2025
+#define WGL_GENERIC_ACCELERATION_EXT   0x2026
+#define WGL_FULL_ACCELERATION_EXT      0x2027
+#define WGL_SWAP_EXCHANGE_EXT          0x2028
+#define WGL_SWAP_COPY_EXT              0x2029
+#define WGL_SWAP_UNDEFINED_EXT         0x202A
+#define WGL_TYPE_RGBA_EXT              0x202B
+#define WGL_TYPE_COLORINDEX_EXT        0x202C
+#endif
+
+#ifndef WGL_EXT_pbuffer
+#define WGL_DRAW_TO_PBUFFER_EXT        0x202D
+#define WGL_MAX_PBUFFER_PIXELS_EXT     0x202E
+#define WGL_MAX_PBUFFER_WIDTH_EXT      0x202F
+#define WGL_MAX_PBUFFER_HEIGHT_EXT     0x2030
+#define WGL_OPTIMAL_PBUFFER_WIDTH_EXT  0x2031
+#define WGL_OPTIMAL_PBUFFER_HEIGHT_EXT 0x2032
+#define WGL_PBUFFER_LARGEST_EXT        0x2033
+#define WGL_PBUFFER_WIDTH_EXT          0x2034
+#define WGL_PBUFFER_HEIGHT_EXT         0x2035
+#endif
+
+#ifndef WGL_EXT_depth_float
+#define WGL_DEPTH_FLOAT_EXT            0x2040
+#endif
+
+#ifndef WGL_3DFX_multisample
+#define WGL_SAMPLE_BUFFERS_3DFX        0x2060
+#define WGL_SAMPLES_3DFX               0x2061
+#endif
+
+#ifndef WGL_EXT_multisample
+#define WGL_SAMPLE_BUFFERS_EXT         0x2041
+#define WGL_SAMPLES_EXT                0x2042
+#endif
+
+#ifndef WGL_I3D_digital_video_control
+#define WGL_DIGITAL_VIDEO_CURSOR_ALPHA_FRAMEBUFFER_I3D 0x2050
+#define WGL_DIGITAL_VIDEO_CURSOR_ALPHA_VALUE_I3D 0x2051
+#define WGL_DIGITAL_VIDEO_CURSOR_INCLUDED_I3D 0x2052
+#define WGL_DIGITAL_VIDEO_GAMMA_CORRECTED_I3D 0x2053
+#endif
+
+#ifndef WGL_I3D_gamma
+#define WGL_GAMMA_TABLE_SIZE_I3D       0x204E
+#define WGL_GAMMA_EXCLUDE_DESKTOP_I3D  0x204F
+#endif
+
+#ifndef WGL_I3D_genlock
+#define WGL_GENLOCK_SOURCE_MULTIVIEW_I3D 0x2044
+#define WGL_GENLOCK_SOURCE_EXTENAL_SYNC_I3D 0x2045
+#define WGL_GENLOCK_SOURCE_EXTENAL_FIELD_I3D 0x2046
+#define WGL_GENLOCK_SOURCE_EXTENAL_TTL_I3D 0x2047
+#define WGL_GENLOCK_SOURCE_DIGITAL_SYNC_I3D 0x2048
+#define WGL_GENLOCK_SOURCE_DIGITAL_FIELD_I3D 0x2049
+#define WGL_GENLOCK_SOURCE_EDGE_FALLING_I3D 0x204A
+#define WGL_GENLOCK_SOURCE_EDGE_RISING_I3D 0x204B
+#define WGL_GENLOCK_SOURCE_EDGE_BOTH_I3D 0x204C
+#endif
+
+#ifndef WGL_I3D_image_buffer
+#define WGL_IMAGE_BUFFER_MIN_ACCESS_I3D 0x00000001
+#define WGL_IMAGE_BUFFER_LOCK_I3D      0x00000002
+#endif
+
+#ifndef WGL_I3D_swap_frame_lock
+#endif
+
+#ifndef WGL_NV_render_depth_texture
+#define WGL_BIND_TO_TEXTURE_DEPTH_NV   0x20A3
+#define WGL_BIND_TO_TEXTURE_RECTANGLE_DEPTH_NV 0x20A4
+#define WGL_DEPTH_TEXTURE_FORMAT_NV    0x20A5
+#define WGL_TEXTURE_DEPTH_COMPONENT_NV 0x20A6
+#define WGL_DEPTH_COMPONENT_NV         0x20A7
+#endif
+
+#ifndef WGL_NV_render_texture_rectangle
+#define WGL_BIND_TO_TEXTURE_RECTANGLE_RGB_NV 0x20A0
+#define WGL_BIND_TO_TEXTURE_RECTANGLE_RGBA_NV 0x20A1
+#define WGL_TEXTURE_RECTANGLE_NV       0x20A2
+#endif
+
+#ifndef WGL_ATI_pixel_format_float
+#define WGL_TYPE_RGBA_FLOAT_ATI        0x21A0
+#endif
+
+#ifndef WGL_NV_float_buffer
+#define WGL_FLOAT_COMPONENTS_NV        0x20B0
+#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_R_NV 0x20B1
+#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RG_NV 0x20B2
+#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGB_NV 0x20B3
+#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGBA_NV 0x20B4
+#define WGL_TEXTURE_FLOAT_R_NV         0x20B5
+#define WGL_TEXTURE_FLOAT_RG_NV        0x20B6
+#define WGL_TEXTURE_FLOAT_RGB_NV       0x20B7
+#define WGL_TEXTURE_FLOAT_RGBA_NV      0x20B8
+#endif
+
+#ifndef WGL_3DL_stereo_control
+#define WGL_STEREO_EMITTER_ENABLE_3DL  0x2055
+#define WGL_STEREO_EMITTER_DISABLE_3DL 0x2056
+#define WGL_STEREO_POLARITY_NORMAL_3DL 0x2057
+#define WGL_STEREO_POLARITY_INVERT_3DL 0x2058
+#endif
+
+#ifndef WGL_EXT_pixel_format_packed_float
+#define WGL_TYPE_RGBA_UNSIGNED_FLOAT_EXT 0x20A8
+#endif
+
+#ifndef WGL_EXT_framebuffer_sRGB
+#define WGL_FRAMEBUFFER_SRGB_CAPABLE_EXT 0x20A9
+#endif
+
+#ifndef WGL_NV_present_video
+#define WGL_NUM_VIDEO_SLOTS_NV         0x20F0
+#endif
+
+#ifndef WGL_NV_video_out
+#define WGL_BIND_TO_VIDEO_RGB_NV       0x20C0
+#define WGL_BIND_TO_VIDEO_RGBA_NV      0x20C1
+#define WGL_BIND_TO_VIDEO_RGB_AND_DEPTH_NV 0x20C2
+#define WGL_VIDEO_OUT_COLOR_NV         0x20C3
+#define WGL_VIDEO_OUT_ALPHA_NV         0x20C4
+#define WGL_VIDEO_OUT_DEPTH_NV         0x20C5
+#define WGL_VIDEO_OUT_COLOR_AND_ALPHA_NV 0x20C6
+#define WGL_VIDEO_OUT_COLOR_AND_DEPTH_NV 0x20C7
+#define WGL_VIDEO_OUT_FRAME            0x20C8
+#define WGL_VIDEO_OUT_FIELD_1          0x20C9
+#define WGL_VIDEO_OUT_FIELD_2          0x20CA
+#define WGL_VIDEO_OUT_STACKED_FIELDS_1_2 0x20CB
+#define WGL_VIDEO_OUT_STACKED_FIELDS_2_1 0x20CC
+#endif
+
+#ifndef WGL_NV_swap_group
+#endif
+
+#ifndef WGL_NV_gpu_affinity
+#define WGL_ERROR_INCOMPATIBLE_AFFINITY_MASKS_NV 0x20D0
+#define WGL_ERROR_MISSING_AFFINITY_MASK_NV 0x20D1
+#endif
+
+#ifndef WGL_AMD_gpu_association
+#define WGL_GPU_VENDOR_AMD             0x1F00
+#define WGL_GPU_RENDERER_STRING_AMD    0x1F01
+#define WGL_GPU_OPENGL_VERSION_STRING_AMD 0x1F02
+#define WGL_GPU_FASTEST_TARGET_GPUS_AMD 0x21A2
+#define WGL_GPU_RAM_AMD                0x21A3
+#define WGL_GPU_CLOCK_AMD              0x21A4
+#define WGL_GPU_NUM_PIPES_AMD          0x21A5
+#define WGL_GPU_NUM_SIMD_AMD           0x21A6
+#define WGL_GPU_NUM_RB_AMD             0x21A7
+#define WGL_GPU_NUM_SPI_AMD            0x21A8
+#endif
+
+#ifndef WGL_NV_video_capture
+#define WGL_UNIQUE_ID_NV               0x20CE
+#define WGL_NUM_VIDEO_CAPTURE_SLOTS_NV 0x20CF
+#endif
+
+#ifndef WGL_NV_copy_image
+#endif
+
+#ifndef WGL_NV_multisample_coverage
+#define WGL_COVERAGE_SAMPLES_NV        0x2042
+#define WGL_COLOR_SAMPLES_NV           0x20B9
+#endif
+
+#ifndef WGL_EXT_create_context_es2_profile
+#define WGL_CONTEXT_ES2_PROFILE_BIT_EXT 0x00000004
+#endif
+
+#ifndef WGL_NV_DX_interop
+#define WGL_ACCESS_READ_ONLY_NV        0x00000000
+#define WGL_ACCESS_READ_WRITE_NV       0x00000001
+#define WGL_ACCESS_WRITE_DISCARD_NV    0x00000002
+#endif
+
+#ifndef WGL_NV_DX_interop2
+#endif
+
+#ifndef WGL_EXT_swap_control_tear
+#endif
+
+
+/*************************************************************/
+
+#ifndef WGL_ARB_pbuffer
+DECLARE_HANDLE(HPBUFFERARB);
+#endif
+#ifndef WGL_EXT_pbuffer
+DECLARE_HANDLE(HPBUFFEREXT);
+#endif
+#ifndef WGL_NV_present_video
+DECLARE_HANDLE(HVIDEOOUTPUTDEVICENV);
+#endif
+#ifndef WGL_NV_video_output
+DECLARE_HANDLE(HPVIDEODEV);
+#endif
+#ifndef WGL_NV_gpu_affinity
+DECLARE_HANDLE(HPGPUNV);
+DECLARE_HANDLE(HGPUNV);
+
+typedef struct _GPU_DEVICE {
+    DWORD  cb;
+    CHAR   DeviceName[32];
+    CHAR   DeviceString[128];
+    DWORD  Flags;
+    RECT   rcVirtualScreen;
+} GPU_DEVICE, *PGPU_DEVICE;
+#endif
+#ifndef WGL_NV_video_capture
+DECLARE_HANDLE(HVIDEOINPUTDEVICENV);
+#endif
+
+#ifndef WGL_ARB_buffer_region
+#define WGL_ARB_buffer_region 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern HANDLE WINAPI wglCreateBufferRegionARB (HDC hDC, int iLayerPlane, UINT uType);
+extern VOID WINAPI wglDeleteBufferRegionARB (HANDLE hRegion);
+extern BOOL WINAPI wglSaveBufferRegionARB (HANDLE hRegion, int x, int y, int width, int height);
+extern BOOL WINAPI wglRestoreBufferRegionARB (HANDLE hRegion, int x, int y, int width, int height, int xSrc, int ySrc);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef HANDLE (WINAPI * PFNWGLCREATEBUFFERREGIONARBPROC) (HDC hDC, int iLayerPlane, UINT uType);
+typedef VOID (WINAPI * PFNWGLDELETEBUFFERREGIONARBPROC) (HANDLE hRegion);
+typedef BOOL (WINAPI * PFNWGLSAVEBUFFERREGIONARBPROC) (HANDLE hRegion, int x, int y, int width, int height);
+typedef BOOL (WINAPI * PFNWGLRESTOREBUFFERREGIONARBPROC) (HANDLE hRegion, int x, int y, int width, int height, int xSrc, int ySrc);
+#endif
+
+#ifndef WGL_ARB_multisample
+#define WGL_ARB_multisample 1
+#endif
+
+#ifndef WGL_ARB_extensions_string
+#define WGL_ARB_extensions_string 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern const char * WINAPI wglGetExtensionsStringARB (HDC hdc);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef const char * (WINAPI * PFNWGLGETEXTENSIONSSTRINGARBPROC) (HDC hdc);
+#endif
+
+#ifndef WGL_ARB_pixel_format
+#define WGL_ARB_pixel_format 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern BOOL WINAPI wglGetPixelFormatAttribivARB (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, int *piValues);
+extern BOOL WINAPI wglGetPixelFormatAttribfvARB (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, FLOAT *pfValues);
+extern BOOL WINAPI wglChoosePixelFormatARB (HDC hdc, const int *piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBIVARBPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, int *piValues);
+typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBFVARBPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, FLOAT *pfValues);
+typedef BOOL (WINAPI * PFNWGLCHOOSEPIXELFORMATARBPROC) (HDC hdc, const int *piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats);
+#endif
+
+#ifndef WGL_ARB_make_current_read
+#define WGL_ARB_make_current_read 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern BOOL WINAPI wglMakeContextCurrentARB (HDC hDrawDC, HDC hReadDC, HGLRC hglrc);
+extern HDC WINAPI wglGetCurrentReadDCARB (void);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef BOOL (WINAPI * PFNWGLMAKECONTEXTCURRENTARBPROC) (HDC hDrawDC, HDC hReadDC, HGLRC hglrc);
+typedef HDC (WINAPI * PFNWGLGETCURRENTREADDCARBPROC) (void);
+#endif
+
+#ifndef WGL_ARB_pbuffer
+#define WGL_ARB_pbuffer 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern HPBUFFERARB WINAPI wglCreatePbufferARB (HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int *piAttribList);
+extern HDC WINAPI wglGetPbufferDCARB (HPBUFFERARB hPbuffer);
+extern int WINAPI wglReleasePbufferDCARB (HPBUFFERARB hPbuffer, HDC hDC);
+extern BOOL WINAPI wglDestroyPbufferARB (HPBUFFERARB hPbuffer);
+extern BOOL WINAPI wglQueryPbufferARB (HPBUFFERARB hPbuffer, int iAttribute, int *piValue);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef HPBUFFERARB (WINAPI * PFNWGLCREATEPBUFFERARBPROC) (HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int *piAttribList);
+typedef HDC (WINAPI * PFNWGLGETPBUFFERDCARBPROC) (HPBUFFERARB hPbuffer);
+typedef int (WINAPI * PFNWGLRELEASEPBUFFERDCARBPROC) (HPBUFFERARB hPbuffer, HDC hDC);
+typedef BOOL (WINAPI * PFNWGLDESTROYPBUFFERARBPROC) (HPBUFFERARB hPbuffer);
+typedef BOOL (WINAPI * PFNWGLQUERYPBUFFERARBPROC) (HPBUFFERARB hPbuffer, int iAttribute, int *piValue);
+#endif
+
+#ifndef WGL_ARB_render_texture
+#define WGL_ARB_render_texture 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern BOOL WINAPI wglBindTexImageARB (HPBUFFERARB hPbuffer, int iBuffer);
+extern BOOL WINAPI wglReleaseTexImageARB (HPBUFFERARB hPbuffer, int iBuffer);
+extern BOOL WINAPI wglSetPbufferAttribARB (HPBUFFERARB hPbuffer, const int *piAttribList);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef BOOL (WINAPI * PFNWGLBINDTEXIMAGEARBPROC) (HPBUFFERARB hPbuffer, int iBuffer);
+typedef BOOL (WINAPI * PFNWGLRELEASETEXIMAGEARBPROC) (HPBUFFERARB hPbuffer, int iBuffer);
+typedef BOOL (WINAPI * PFNWGLSETPBUFFERATTRIBARBPROC) (HPBUFFERARB hPbuffer, const int *piAttribList);
+#endif
+
+#ifndef WGL_ARB_pixel_format_float
+#define WGL_ARB_pixel_format_float 1
+#endif
+
+#ifndef WGL_ARB_framebuffer_sRGB
+#define WGL_ARB_framebuffer_sRGB 1
+#endif
+
+#ifndef WGL_ARB_create_context
+#define WGL_ARB_create_context 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern HGLRC WINAPI wglCreateContextAttribsARB (HDC hDC, HGLRC hShareContext, const int *attribList);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef HGLRC (WINAPI * PFNWGLCREATECONTEXTATTRIBSARBPROC) (HDC hDC, HGLRC hShareContext, const int *attribList);
+#endif
+
+#ifndef WGL_ARB_create_context_profile
+#define WGL_ARB_create_context_profile 1
+#endif
+
+#ifndef WGL_ARB_create_context_robustness
+#define WGL_ARB_create_context_robustness 1
+#endif
+
+#ifndef WGL_EXT_display_color_table
+#define WGL_EXT_display_color_table 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern GLboolean WINAPI wglCreateDisplayColorTableEXT (GLushort id);
+extern GLboolean WINAPI wglLoadDisplayColorTableEXT (const GLushort *table, GLuint length);
+extern GLboolean WINAPI wglBindDisplayColorTableEXT (GLushort id);
+extern VOID WINAPI wglDestroyDisplayColorTableEXT (GLushort id);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef GLboolean (WINAPI * PFNWGLCREATEDISPLAYCOLORTABLEEXTPROC) (GLushort id);
+typedef GLboolean (WINAPI * PFNWGLLOADDISPLAYCOLORTABLEEXTPROC) (const GLushort *table, GLuint length);
+typedef GLboolean (WINAPI * PFNWGLBINDDISPLAYCOLORTABLEEXTPROC) (GLushort id);
+typedef VOID (WINAPI * PFNWGLDESTROYDISPLAYCOLORTABLEEXTPROC) (GLushort id);
+#endif
+
+#ifndef WGL_EXT_extensions_string
+#define WGL_EXT_extensions_string 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern const char * WINAPI wglGetExtensionsStringEXT (void);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef const char * (WINAPI * PFNWGLGETEXTENSIONSSTRINGEXTPROC) (void);
+#endif
+
+#ifndef WGL_EXT_make_current_read
+#define WGL_EXT_make_current_read 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern BOOL WINAPI wglMakeContextCurrentEXT (HDC hDrawDC, HDC hReadDC, HGLRC hglrc);
+extern HDC WINAPI wglGetCurrentReadDCEXT (void);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef BOOL (WINAPI * PFNWGLMAKECONTEXTCURRENTEXTPROC) (HDC hDrawDC, HDC hReadDC, HGLRC hglrc);
+typedef HDC (WINAPI * PFNWGLGETCURRENTREADDCEXTPROC) (void);
+#endif
+
+#ifndef WGL_EXT_pbuffer
+#define WGL_EXT_pbuffer 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern HPBUFFEREXT WINAPI wglCreatePbufferEXT (HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int *piAttribList);
+extern HDC WINAPI wglGetPbufferDCEXT (HPBUFFEREXT hPbuffer);
+extern int WINAPI wglReleasePbufferDCEXT (HPBUFFEREXT hPbuffer, HDC hDC);
+extern BOOL WINAPI wglDestroyPbufferEXT (HPBUFFEREXT hPbuffer);
+extern BOOL WINAPI wglQueryPbufferEXT (HPBUFFEREXT hPbuffer, int iAttribute, int *piValue);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef HPBUFFEREXT (WINAPI * PFNWGLCREATEPBUFFEREXTPROC) (HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int *piAttribList);
+typedef HDC (WINAPI * PFNWGLGETPBUFFERDCEXTPROC) (HPBUFFEREXT hPbuffer);
+typedef int (WINAPI * PFNWGLRELEASEPBUFFERDCEXTPROC) (HPBUFFEREXT hPbuffer, HDC hDC);
+typedef BOOL (WINAPI * PFNWGLDESTROYPBUFFEREXTPROC) (HPBUFFEREXT hPbuffer);
+typedef BOOL (WINAPI * PFNWGLQUERYPBUFFEREXTPROC) (HPBUFFEREXT hPbuffer, int iAttribute, int *piValue);
+#endif
+
+#ifndef WGL_EXT_pixel_format
+#define WGL_EXT_pixel_format 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern BOOL WINAPI wglGetPixelFormatAttribivEXT (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int *piAttributes, int *piValues);
+extern BOOL WINAPI wglGetPixelFormatAttribfvEXT (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int *piAttributes, FLOAT *pfValues);
+extern BOOL WINAPI wglChoosePixelFormatEXT (HDC hdc, const int *piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBIVEXTPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int *piAttributes, int *piValues);
+typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBFVEXTPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int *piAttributes, FLOAT *pfValues);
+typedef BOOL (WINAPI * PFNWGLCHOOSEPIXELFORMATEXTPROC) (HDC hdc, const int *piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats);
+#endif
+
+#ifndef WGL_EXT_swap_control
+#define WGL_EXT_swap_control 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern BOOL WINAPI wglSwapIntervalEXT (int interval);
+extern int WINAPI wglGetSwapIntervalEXT (void);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef BOOL (WINAPI * PFNWGLSWAPINTERVALEXTPROC) (int interval);
+typedef int (WINAPI * PFNWGLGETSWAPINTERVALEXTPROC) (void);
+#endif
+
+#ifndef WGL_EXT_depth_float
+#define WGL_EXT_depth_float 1
+#endif
+
+#ifndef WGL_NV_vertex_array_range
+#define WGL_NV_vertex_array_range 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern void* WINAPI wglAllocateMemoryNV (GLsizei size, GLfloat readfreq, GLfloat writefreq, GLfloat priority);
+extern void WINAPI wglFreeMemoryNV (void *pointer);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef void* (WINAPI * PFNWGLALLOCATEMEMORYNVPROC) (GLsizei size, GLfloat readfreq, GLfloat writefreq, GLfloat priority);
+typedef void (WINAPI * PFNWGLFREEMEMORYNVPROC) (void *pointer);
+#endif
+
+#ifndef WGL_3DFX_multisample
+#define WGL_3DFX_multisample 1
+#endif
+
+#ifndef WGL_EXT_multisample
+#define WGL_EXT_multisample 1
+#endif
+
+#ifndef WGL_OML_sync_control
+#define WGL_OML_sync_control 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern BOOL WINAPI wglGetSyncValuesOML (HDC hdc, INT64 *ust, INT64 *msc, INT64 *sbc);
+extern BOOL WINAPI wglGetMscRateOML (HDC hdc, INT32 *numerator, INT32 *denominator);
+extern INT64 WINAPI wglSwapBuffersMscOML (HDC hdc, INT64 target_msc, INT64 divisor, INT64 remainder);
+extern INT64 WINAPI wglSwapLayerBuffersMscOML (HDC hdc, int fuPlanes, INT64 target_msc, INT64 divisor, INT64 remainder);
+extern BOOL WINAPI wglWaitForMscOML (HDC hdc, INT64 target_msc, INT64 divisor, INT64 remainder, INT64 *ust, INT64 *msc, INT64 *sbc);
+extern BOOL WINAPI wglWaitForSbcOML (HDC hdc, INT64 target_sbc, INT64 *ust, INT64 *msc, INT64 *sbc);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef BOOL (WINAPI * PFNWGLGETSYNCVALUESOMLPROC) (HDC hdc, INT64 *ust, INT64 *msc, INT64 *sbc);
+typedef BOOL (WINAPI * PFNWGLGETMSCRATEOMLPROC) (HDC hdc, INT32 *numerator, INT32 *denominator);
+typedef INT64 (WINAPI * PFNWGLSWAPBUFFERSMSCOMLPROC) (HDC hdc, INT64 target_msc, INT64 divisor, INT64 remainder);
+typedef INT64 (WINAPI * PFNWGLSWAPLAYERBUFFERSMSCOMLPROC) (HDC hdc, int fuPlanes, INT64 target_msc, INT64 divisor, INT64 remainder);
+typedef BOOL (WINAPI * PFNWGLWAITFORMSCOMLPROC) (HDC hdc, INT64 target_msc, INT64 divisor, INT64 remainder, INT64 *ust, INT64 *msc, INT64 *sbc);
+typedef BOOL (WINAPI * PFNWGLWAITFORSBCOMLPROC) (HDC hdc, INT64 target_sbc, INT64 *ust, INT64 *msc, INT64 *sbc);
+#endif
+
+#ifndef WGL_I3D_digital_video_control
+#define WGL_I3D_digital_video_control 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern BOOL WINAPI wglGetDigitalVideoParametersI3D (HDC hDC, int iAttribute, int *piValue);
+extern BOOL WINAPI wglSetDigitalVideoParametersI3D (HDC hDC, int iAttribute, const int *piValue);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef BOOL (WINAPI * PFNWGLGETDIGITALVIDEOPARAMETERSI3DPROC) (HDC hDC, int iAttribute, int *piValue);
+typedef BOOL (WINAPI * PFNWGLSETDIGITALVIDEOPARAMETERSI3DPROC) (HDC hDC, int iAttribute, const int *piValue);
+#endif
+
+#ifndef WGL_I3D_gamma
+#define WGL_I3D_gamma 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern BOOL WINAPI wglGetGammaTableParametersI3D (HDC hDC, int iAttribute, int *piValue);
+extern BOOL WINAPI wglSetGammaTableParametersI3D (HDC hDC, int iAttribute, const int *piValue);
+extern BOOL WINAPI wglGetGammaTableI3D (HDC hDC, int iEntries, USHORT *puRed, USHORT *puGreen, USHORT *puBlue);
+extern BOOL WINAPI wglSetGammaTableI3D (HDC hDC, int iEntries, const USHORT *puRed, const USHORT *puGreen, const USHORT *puBlue);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef BOOL (WINAPI * PFNWGLGETGAMMATABLEPARAMETERSI3DPROC) (HDC hDC, int iAttribute, int *piValue);
+typedef BOOL (WINAPI * PFNWGLSETGAMMATABLEPARAMETERSI3DPROC) (HDC hDC, int iAttribute, const int *piValue);
+typedef BOOL (WINAPI * PFNWGLGETGAMMATABLEI3DPROC) (HDC hDC, int iEntries, USHORT *puRed, USHORT *puGreen, USHORT *puBlue);
+typedef BOOL (WINAPI * PFNWGLSETGAMMATABLEI3DPROC) (HDC hDC, int iEntries, const USHORT *puRed, const USHORT *puGreen, const USHORT *puBlue);
+#endif
+
+#ifndef WGL_I3D_genlock
+#define WGL_I3D_genlock 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern BOOL WINAPI wglEnableGenlockI3D (HDC hDC);
+extern BOOL WINAPI wglDisableGenlockI3D (HDC hDC);
+extern BOOL WINAPI wglIsEnabledGenlockI3D (HDC hDC, BOOL *pFlag);
+extern BOOL WINAPI wglGenlockSourceI3D (HDC hDC, UINT uSource);
+extern BOOL WINAPI wglGetGenlockSourceI3D (HDC hDC, UINT *uSource);
+extern BOOL WINAPI wglGenlockSourceEdgeI3D (HDC hDC, UINT uEdge);
+extern BOOL WINAPI wglGetGenlockSourceEdgeI3D (HDC hDC, UINT *uEdge);
+extern BOOL WINAPI wglGenlockSampleRateI3D (HDC hDC, UINT uRate);
+extern BOOL WINAPI wglGetGenlockSampleRateI3D (HDC hDC, UINT *uRate);
+extern BOOL WINAPI wglGenlockSourceDelayI3D (HDC hDC, UINT uDelay);
+extern BOOL WINAPI wglGetGenlockSourceDelayI3D (HDC hDC, UINT *uDelay);
+extern BOOL WINAPI wglQueryGenlockMaxSourceDelayI3D (HDC hDC, UINT *uMaxLineDelay, UINT *uMaxPixelDelay);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef BOOL (WINAPI * PFNWGLENABLEGENLOCKI3DPROC) (HDC hDC);
+typedef BOOL (WINAPI * PFNWGLDISABLEGENLOCKI3DPROC) (HDC hDC);
+typedef BOOL (WINAPI * PFNWGLISENABLEDGENLOCKI3DPROC) (HDC hDC, BOOL *pFlag);
+typedef BOOL (WINAPI * PFNWGLGENLOCKSOURCEI3DPROC) (HDC hDC, UINT uSource);
+typedef BOOL (WINAPI * PFNWGLGETGENLOCKSOURCEI3DPROC) (HDC hDC, UINT *uSource);
+typedef BOOL (WINAPI * PFNWGLGENLOCKSOURCEEDGEI3DPROC) (HDC hDC, UINT uEdge);
+typedef BOOL (WINAPI * PFNWGLGETGENLOCKSOURCEEDGEI3DPROC) (HDC hDC, UINT *uEdge);
+typedef BOOL (WINAPI * PFNWGLGENLOCKSAMPLERATEI3DPROC) (HDC hDC, UINT uRate);
+typedef BOOL (WINAPI * PFNWGLGETGENLOCKSAMPLERATEI3DPROC) (HDC hDC, UINT *uRate);
+typedef BOOL (WINAPI * PFNWGLGENLOCKSOURCEDELAYI3DPROC) (HDC hDC, UINT uDelay);
+typedef BOOL (WINAPI * PFNWGLGETGENLOCKSOURCEDELAYI3DPROC) (HDC hDC, UINT *uDelay);
+typedef BOOL (WINAPI * PFNWGLQUERYGENLOCKMAXSOURCEDELAYI3DPROC) (HDC hDC, UINT *uMaxLineDelay, UINT *uMaxPixelDelay);
+#endif
+
+#ifndef WGL_I3D_image_buffer
+#define WGL_I3D_image_buffer 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern LPVOID WINAPI wglCreateImageBufferI3D (HDC hDC, DWORD dwSize, UINT uFlags);
+extern BOOL WINAPI wglDestroyImageBufferI3D (HDC hDC, LPVOID pAddress);
+extern BOOL WINAPI wglAssociateImageBufferEventsI3D (HDC hDC, const HANDLE *pEvent, const LPVOID *pAddress, const DWORD *pSize, UINT count);
+extern BOOL WINAPI wglReleaseImageBufferEventsI3D (HDC hDC, const LPVOID *pAddress, UINT count);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef LPVOID (WINAPI * PFNWGLCREATEIMAGEBUFFERI3DPROC) (HDC hDC, DWORD dwSize, UINT uFlags);
+typedef BOOL (WINAPI * PFNWGLDESTROYIMAGEBUFFERI3DPROC) (HDC hDC, LPVOID pAddress);
+typedef BOOL (WINAPI * PFNWGLASSOCIATEIMAGEBUFFEREVENTSI3DPROC) (HDC hDC, const HANDLE *pEvent, const LPVOID *pAddress, const DWORD *pSize, UINT count);
+typedef BOOL (WINAPI * PFNWGLRELEASEIMAGEBUFFEREVENTSI3DPROC) (HDC hDC, const LPVOID *pAddress, UINT count);
+#endif
+
+#ifndef WGL_I3D_swap_frame_lock
+#define WGL_I3D_swap_frame_lock 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern BOOL WINAPI wglEnableFrameLockI3D (void);
+extern BOOL WINAPI wglDisableFrameLockI3D (void);
+extern BOOL WINAPI wglIsEnabledFrameLockI3D (BOOL *pFlag);
+extern BOOL WINAPI wglQueryFrameLockMasterI3D (BOOL *pFlag);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef BOOL (WINAPI * PFNWGLENABLEFRAMELOCKI3DPROC) (void);
+typedef BOOL (WINAPI * PFNWGLDISABLEFRAMELOCKI3DPROC) (void);
+typedef BOOL (WINAPI * PFNWGLISENABLEDFRAMELOCKI3DPROC) (BOOL *pFlag);
+typedef BOOL (WINAPI * PFNWGLQUERYFRAMELOCKMASTERI3DPROC) (BOOL *pFlag);
+#endif
+
+#ifndef WGL_I3D_swap_frame_usage
+#define WGL_I3D_swap_frame_usage 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern BOOL WINAPI wglGetFrameUsageI3D (float *pUsage);
+extern BOOL WINAPI wglBeginFrameTrackingI3D (void);
+extern BOOL WINAPI wglEndFrameTrackingI3D (void);
+extern BOOL WINAPI wglQueryFrameTrackingI3D (DWORD *pFrameCount, DWORD *pMissedFrames, float *pLastMissedUsage);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef BOOL (WINAPI * PFNWGLGETFRAMEUSAGEI3DPROC) (float *pUsage);
+typedef BOOL (WINAPI * PFNWGLBEGINFRAMETRACKINGI3DPROC) (void);
+typedef BOOL (WINAPI * PFNWGLENDFRAMETRACKINGI3DPROC) (void);
+typedef BOOL (WINAPI * PFNWGLQUERYFRAMETRACKINGI3DPROC) (DWORD *pFrameCount, DWORD *pMissedFrames, float *pLastMissedUsage);
+#endif
+
+#ifndef WGL_ATI_pixel_format_float
+#define WGL_ATI_pixel_format_float 1
+#endif
+
+#ifndef WGL_NV_float_buffer
+#define WGL_NV_float_buffer 1
+#endif
+
+#ifndef WGL_3DL_stereo_control
+#define WGL_3DL_stereo_control 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern BOOL WINAPI wglSetStereoEmitterState3DL (HDC hDC, UINT uState);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef BOOL (WINAPI * PFNWGLSETSTEREOEMITTERSTATE3DLPROC) (HDC hDC, UINT uState);
+#endif
+
+#ifndef WGL_EXT_pixel_format_packed_float
+#define WGL_EXT_pixel_format_packed_float 1
+#endif
+
+#ifndef WGL_EXT_framebuffer_sRGB
+#define WGL_EXT_framebuffer_sRGB 1
+#endif
+
+#ifndef WGL_NV_present_video
+#define WGL_NV_present_video 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern int WINAPI wglEnumerateVideoDevicesNV (HDC hDC, HVIDEOOUTPUTDEVICENV *phDeviceList);
+extern BOOL WINAPI wglBindVideoDeviceNV (HDC hDC, unsigned int uVideoSlot, HVIDEOOUTPUTDEVICENV hVideoDevice, const int *piAttribList);
+extern BOOL WINAPI wglQueryCurrentContextNV (int iAttribute, int *piValue);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef int (WINAPI * PFNWGLENUMERATEVIDEODEVICESNVPROC) (HDC hDC, HVIDEOOUTPUTDEVICENV *phDeviceList);
+typedef BOOL (WINAPI * PFNWGLBINDVIDEODEVICENVPROC) (HDC hDC, unsigned int uVideoSlot, HVIDEOOUTPUTDEVICENV hVideoDevice, const int *piAttribList);
+typedef BOOL (WINAPI * PFNWGLQUERYCURRENTCONTEXTNVPROC) (int iAttribute, int *piValue);
+#endif
+
+#ifndef WGL_NV_video_output
+#define WGL_NV_video_output 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern BOOL WINAPI wglGetVideoDeviceNV (HDC hDC, int numDevices, HPVIDEODEV *hVideoDevice);
+extern BOOL WINAPI wglReleaseVideoDeviceNV (HPVIDEODEV hVideoDevice);
+extern BOOL WINAPI wglBindVideoImageNV (HPVIDEODEV hVideoDevice, HPBUFFERARB hPbuffer, int iVideoBuffer);
+extern BOOL WINAPI wglReleaseVideoImageNV (HPBUFFERARB hPbuffer, int iVideoBuffer);
+extern BOOL WINAPI wglSendPbufferToVideoNV (HPBUFFERARB hPbuffer, int iBufferType, unsigned long *pulCounterPbuffer, BOOL bBlock);
+extern BOOL WINAPI wglGetVideoInfoNV (HPVIDEODEV hpVideoDevice, unsigned long *pulCounterOutputPbuffer, unsigned long *pulCounterOutputVideo);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef BOOL (WINAPI * PFNWGLGETVIDEODEVICENVPROC) (HDC hDC, int numDevices, HPVIDEODEV *hVideoDevice);
+typedef BOOL (WINAPI * PFNWGLRELEASEVIDEODEVICENVPROC) (HPVIDEODEV hVideoDevice);
+typedef BOOL (WINAPI * PFNWGLBINDVIDEOIMAGENVPROC) (HPVIDEODEV hVideoDevice, HPBUFFERARB hPbuffer, int iVideoBuffer);
+typedef BOOL (WINAPI * PFNWGLRELEASEVIDEOIMAGENVPROC) (HPBUFFERARB hPbuffer, int iVideoBuffer);
+typedef BOOL (WINAPI * PFNWGLSENDPBUFFERTOVIDEONVPROC) (HPBUFFERARB hPbuffer, int iBufferType, unsigned long *pulCounterPbuffer, BOOL bBlock);
+typedef BOOL (WINAPI * PFNWGLGETVIDEOINFONVPROC) (HPVIDEODEV hpVideoDevice, unsigned long *pulCounterOutputPbuffer, unsigned long *pulCounterOutputVideo);
+#endif
+
+#ifndef WGL_NV_swap_group
+#define WGL_NV_swap_group 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern BOOL WINAPI wglJoinSwapGroupNV (HDC hDC, GLuint group);
+extern BOOL WINAPI wglBindSwapBarrierNV (GLuint group, GLuint barrier);
+extern BOOL WINAPI wglQuerySwapGroupNV (HDC hDC, GLuint *group, GLuint *barrier);
+extern BOOL WINAPI wglQueryMaxSwapGroupsNV (HDC hDC, GLuint *maxGroups, GLuint *maxBarriers);
+extern BOOL WINAPI wglQueryFrameCountNV (HDC hDC, GLuint *count);
+extern BOOL WINAPI wglResetFrameCountNV (HDC hDC);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef BOOL (WINAPI * PFNWGLJOINSWAPGROUPNVPROC) (HDC hDC, GLuint group);
+typedef BOOL (WINAPI * PFNWGLBINDSWAPBARRIERNVPROC) (GLuint group, GLuint barrier);
+typedef BOOL (WINAPI * PFNWGLQUERYSWAPGROUPNVPROC) (HDC hDC, GLuint *group, GLuint *barrier);
+typedef BOOL (WINAPI * PFNWGLQUERYMAXSWAPGROUPSNVPROC) (HDC hDC, GLuint *maxGroups, GLuint *maxBarriers);
+typedef BOOL (WINAPI * PFNWGLQUERYFRAMECOUNTNVPROC) (HDC hDC, GLuint *count);
+typedef BOOL (WINAPI * PFNWGLRESETFRAMECOUNTNVPROC) (HDC hDC);
+#endif
+
+#ifndef WGL_NV_gpu_affinity
+#define WGL_NV_gpu_affinity 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern BOOL WINAPI wglEnumGpusNV (UINT iGpuIndex, HGPUNV *phGpu);
+extern BOOL WINAPI wglEnumGpuDevicesNV (HGPUNV hGpu, UINT iDeviceIndex, PGPU_DEVICE lpGpuDevice);
+extern HDC WINAPI wglCreateAffinityDCNV (const HGPUNV *phGpuList);
+extern BOOL WINAPI wglEnumGpusFromAffinityDCNV (HDC hAffinityDC, UINT iGpuIndex, HGPUNV *hGpu);
+extern BOOL WINAPI wglDeleteDCNV (HDC hdc);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef BOOL (WINAPI * PFNWGLENUMGPUSNVPROC) (UINT iGpuIndex, HGPUNV *phGpu);
+typedef BOOL (WINAPI * PFNWGLENUMGPUDEVICESNVPROC) (HGPUNV hGpu, UINT iDeviceIndex, PGPU_DEVICE lpGpuDevice);
+typedef HDC (WINAPI * PFNWGLCREATEAFFINITYDCNVPROC) (const HGPUNV *phGpuList);
+typedef BOOL (WINAPI * PFNWGLENUMGPUSFROMAFFINITYDCNVPROC) (HDC hAffinityDC, UINT iGpuIndex, HGPUNV *hGpu);
+typedef BOOL (WINAPI * PFNWGLDELETEDCNVPROC) (HDC hdc);
+#endif
+
+#ifndef WGL_AMD_gpu_association
+#define WGL_AMD_gpu_association 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern UINT WINAPI wglGetGPUIDsAMD (UINT maxCount, UINT *ids);
+extern INT WINAPI wglGetGPUInfoAMD (UINT id, int property, GLenum dataType, UINT size, void *data);
+extern UINT WINAPI wglGetContextGPUIDAMD (HGLRC hglrc);
+extern HGLRC WINAPI wglCreateAssociatedContextAMD (UINT id);
+extern HGLRC WINAPI wglCreateAssociatedContextAttribsAMD (UINT id, HGLRC hShareContext, const int *attribList);
+extern BOOL WINAPI wglDeleteAssociatedContextAMD (HGLRC hglrc);
+extern BOOL WINAPI wglMakeAssociatedContextCurrentAMD (HGLRC hglrc);
+extern HGLRC WINAPI wglGetCurrentAssociatedContextAMD (void);
+extern VOID WINAPI wglBlitContextFramebufferAMD (HGLRC dstCtx, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef UINT (WINAPI * PFNWGLGETGPUIDSAMDPROC) (UINT maxCount, UINT *ids);
+typedef INT (WINAPI * PFNWGLGETGPUINFOAMDPROC) (UINT id, int property, GLenum dataType, UINT size, void *data);
+typedef UINT (WINAPI * PFNWGLGETCONTEXTGPUIDAMDPROC) (HGLRC hglrc);
+typedef HGLRC (WINAPI * PFNWGLCREATEASSOCIATEDCONTEXTAMDPROC) (UINT id);
+typedef HGLRC (WINAPI * PFNWGLCREATEASSOCIATEDCONTEXTATTRIBSAMDPROC) (UINT id, HGLRC hShareContext, const int *attribList);
+typedef BOOL (WINAPI * PFNWGLDELETEASSOCIATEDCONTEXTAMDPROC) (HGLRC hglrc);
+typedef BOOL (WINAPI * PFNWGLMAKEASSOCIATEDCONTEXTCURRENTAMDPROC) (HGLRC hglrc);
+typedef HGLRC (WINAPI * PFNWGLGETCURRENTASSOCIATEDCONTEXTAMDPROC) (void);
+typedef VOID (WINAPI * PFNWGLBLITCONTEXTFRAMEBUFFERAMDPROC) (HGLRC dstCtx, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+#endif
+
+#ifndef WGL_NV_video_capture
+#define WGL_NV_video_capture 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern BOOL WINAPI wglBindVideoCaptureDeviceNV (UINT uVideoSlot, HVIDEOINPUTDEVICENV hDevice);
+extern UINT WINAPI wglEnumerateVideoCaptureDevicesNV (HDC hDc, HVIDEOINPUTDEVICENV *phDeviceList);
+extern BOOL WINAPI wglLockVideoCaptureDeviceNV (HDC hDc, HVIDEOINPUTDEVICENV hDevice);
+extern BOOL WINAPI wglQueryVideoCaptureDeviceNV (HDC hDc, HVIDEOINPUTDEVICENV hDevice, int iAttribute, int *piValue);
+extern BOOL WINAPI wglReleaseVideoCaptureDeviceNV (HDC hDc, HVIDEOINPUTDEVICENV hDevice);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef BOOL (WINAPI * PFNWGLBINDVIDEOCAPTUREDEVICENVPROC) (UINT uVideoSlot, HVIDEOINPUTDEVICENV hDevice);
+typedef UINT (WINAPI * PFNWGLENUMERATEVIDEOCAPTUREDEVICESNVPROC) (HDC hDc, HVIDEOINPUTDEVICENV *phDeviceList);
+typedef BOOL (WINAPI * PFNWGLLOCKVIDEOCAPTUREDEVICENVPROC) (HDC hDc, HVIDEOINPUTDEVICENV hDevice);
+typedef BOOL (WINAPI * PFNWGLQUERYVIDEOCAPTUREDEVICENVPROC) (HDC hDc, HVIDEOINPUTDEVICENV hDevice, int iAttribute, int *piValue);
+typedef BOOL (WINAPI * PFNWGLRELEASEVIDEOCAPTUREDEVICENVPROC) (HDC hDc, HVIDEOINPUTDEVICENV hDevice);
+#endif
+
+#ifndef WGL_NV_copy_image
+#define WGL_NV_copy_image 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern BOOL WINAPI wglCopyImageSubDataNV (HGLRC hSrcRC, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, HGLRC hDstRC, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef BOOL (WINAPI * PFNWGLCOPYIMAGESUBDATANVPROC) (HGLRC hSrcRC, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, HGLRC hDstRC, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth);
+#endif
+
+#ifndef WGL_NV_multisample_coverage
+#define WGL_NV_multisample_coverage 1
+#endif
+
+#ifndef WGL_NV_DX_interop
+#define WGL_NV_DX_interop 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern BOOL WINAPI wglDXSetResourceShareHandleNV (void *dxObject, HANDLE shareHandle);
+extern HANDLE WINAPI wglDXOpenDeviceNV (void *dxDevice);
+extern BOOL WINAPI wglDXCloseDeviceNV (HANDLE hDevice);
+extern HANDLE WINAPI wglDXRegisterObjectNV (HANDLE hDevice, void *dxObject, GLuint name, GLenum type, GLenum access);
+extern BOOL WINAPI wglDXUnregisterObjectNV (HANDLE hDevice, HANDLE hObject);
+extern BOOL WINAPI wglDXObjectAccessNV (HANDLE hObject, GLenum access);
+extern BOOL WINAPI wglDXLockObjectsNV (HANDLE hDevice, GLint count, HANDLE *hObjects);
+extern BOOL WINAPI wglDXUnlockObjectsNV (HANDLE hDevice, GLint count, HANDLE *hObjects);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef BOOL (WINAPI * PFNWGLDXSETRESOURCESHAREHANDLENVPROC) (void *dxObject, HANDLE shareHandle);
+typedef HANDLE (WINAPI * PFNWGLDXOPENDEVICENVPROC) (void *dxDevice);
+typedef BOOL (WINAPI * PFNWGLDXCLOSEDEVICENVPROC) (HANDLE hDevice);
+typedef HANDLE (WINAPI * PFNWGLDXREGISTEROBJECTNVPROC) (HANDLE hDevice, void *dxObject, GLuint name, GLenum type, GLenum access);
+typedef BOOL (WINAPI * PFNWGLDXUNREGISTEROBJECTNVPROC) (HANDLE hDevice, HANDLE hObject);
+typedef BOOL (WINAPI * PFNWGLDXOBJECTACCESSNVPROC) (HANDLE hObject, GLenum access);
+typedef BOOL (WINAPI * PFNWGLDXLOCKOBJECTSNVPROC) (HANDLE hDevice, GLint count, HANDLE *hObjects);
+typedef BOOL (WINAPI * PFNWGLDXUNLOCKOBJECTSNVPROC) (HANDLE hDevice, GLint count, HANDLE *hObjects);
+#endif
+
+#ifndef WGL_NV_DX_interop2
+#define WGL_NV_DX_interop2 1
+#endif
+
+#ifndef WGL_EXT_swap_control_tear
+#define WGL_EXT_swap_control_tear 1
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/xorg-server/hw/xwin/glx/wglext.spec b/xorg-server/hw/xwin/glx/wglext.spec
new file mode 100644
index 000000000..265bb0d06
--- /dev/null
+++ b/xorg-server/hw/xwin/glx/wglext.spec
@@ -0,0 +1,1205 @@
+# wglext.spec file
+# DON'T REMOVE PREVIOUS LINE!!! libspec depends on it!
+#
+# Copyright (c) 1991-2002 Silicon Graphics, Inc. All Rights Reserved.
+# Copyright (c) 2006-2010 The Khronos Group, Inc.
+#
+# This document is licensed under the SGI Free Software B License Version
+# 2.0. For details, see http://oss.sgi.com/projects/FreeB/ .
+#
+# $Revision: 17027 $ on $Date: 2012-03-05 11:19:50 -0800 (Mon, 05 Mar 2012) $
+
+required-props:
+param:		retval retained
+category:	wgl ARB_buffer_region ARB_extensions_string ARB_pixel_format ARB_make_current_read ARB_pbuffer ARB_render_texture ARB_pixel_format_float EXT_display_color_table EXT_extensions_string EXT_make_current_read EXT_pbuffer EXT_pixel_format EXT_swap_control OML_sync_control I3D_digital_video_control I3D_gamma I3D_genlock I3D_image_buffer I3D_swap_frame_lock I3D_swap_frame_usage NV_vertex_array_range 3DL_stereo_control NV_swap_group NV_video_output NV_present_video ARB_create_context NV_gpu_affinity AMD_gpu_association NV_video_capture NV_copy_image ARB_framebuffer_sRGB NV_DX_interop
+# required-props in wgl.spec (which is not used for anything):
+# dlflags:	  notlistable handcode
+# wglflags:	  client-handcode server-handcode non-dispatch
+
+#
+# Boilerplate to define types used by some extensions. This is done
+#   up front, since it involves some complexities in protecting
+#   the declarations whether or not the -protect flag is given to
+#   the generator scripts.
+#
+
+passthru: #ifndef WGL_ARB_pbuffer
+passthru: DECLARE_HANDLE(HPBUFFERARB);
+passthru: #endif
+passthru: #ifndef WGL_EXT_pbuffer
+passthru: DECLARE_HANDLE(HPBUFFEREXT);
+passthru: #endif
+passthru: #ifndef WGL_NV_present_video
+passthru: DECLARE_HANDLE(HVIDEOOUTPUTDEVICENV);
+passthru: #endif
+passthru: #ifndef WGL_NV_video_output
+passthru: DECLARE_HANDLE(HPVIDEODEV);
+passthru: #endif
+passthru: #ifndef WGL_NV_gpu_affinity
+passthru: DECLARE_HANDLE(HPGPUNV);
+passthru: DECLARE_HANDLE(HGPUNV);
+passthru:
+passthru: typedef struct _GPU_DEVICE {
+passthru:     DWORD  cb;
+passthru:     CHAR   DeviceName[32];
+passthru:     CHAR   DeviceString[128];
+passthru:     DWORD  Flags;
+passthru:     RECT   rcVirtualScreen;
+passthru: } GPU_DEVICE, *PGPU_DEVICE;
+passthru: #endif
+passthru: #ifndef WGL_NV_video_capture
+passthru: DECLARE_HANDLE(HVIDEOINPUTDEVICENV);
+passthru: #endif
+passthru:
+
+
+###############################################################################
+#
+# ARB Extension #4
+# ARB_buffer_region commands
+#
+###############################################################################
+
+CreateBufferRegionARB(hDC, iLayerPlane, uType)
+	return		HANDLE
+	param		hDC		HDC in value
+	param		iLayerPlane	int in value
+	param		uType		UINT in value
+	category	ARB_buffer_region
+
+DeleteBufferRegionARB(hRegion)
+	return		VOID
+	param		hRegion		HANDLE in value
+	category	ARB_buffer_region
+
+SaveBufferRegionARB(hRegion, x, y, width, height)
+	return		BOOL
+	param		hRegion		HANDLE in value
+	param		x		int in value
+	param		y		int in value
+	param		width		int in value
+	param		height		int in value
+	category	ARB_buffer_region
+
+RestoreBufferRegionARB(hRegion, x, y, width, height, xSrc, ySrc)
+	return		BOOL
+	param		hRegion		HANDLE in value
+	param		x		int in value
+	param		y		int in value
+	param		width		int in value
+	param		height		int in value
+	param		xSrc		int in value
+	param		ySrc		int in value
+	category	ARB_buffer_region
+
+###############################################################################
+#
+# ARB Extension #5
+# ARB_multisample commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_multisample
+
+###############################################################################
+#
+# ARB Extension #8
+# ARB_extensions_string commands
+#
+###############################################################################
+
+GetExtensionsStringARB(hdc)
+	return		String
+	param		hdc		HDC in value
+	category	ARB_extensions_string
+
+###############################################################################
+#
+# ARB Extension #9
+# ARB_pixel_format commands
+#
+###############################################################################
+
+GetPixelFormatAttribivARB(hdc, iPixelFormat, iLayerPlane, nAttributes, piAttributes, piValues)
+	return		BOOL
+	param		hdc		HDC in value
+	param		iPixelFormat	int in value
+	param		iLayerPlane	int in value
+	param		nAttributes	UINT in value
+	param		piAttributes	int in array [nAttributes]
+	param		piValues	int out array [nAttributes]
+	category	ARB_pixel_format
+
+GetPixelFormatAttribfvARB(hdc, iPixelFormat, iLayerPlane, nAttributes, piAttributes, pfValues)
+	return		BOOL
+	param		hdc		HDC in value
+	param		iPixelFormat	int in value
+	param		iLayerPlane	int in value
+	param		nAttributes	UINT in value
+	param		piAttributes	int in array [nAttributes]
+	param		pfValues	FLOAT out array [nAttributes]
+	category	ARB_pixel_format
+
+ChoosePixelFormatARB(hdc, piAttribIList, pfAttribFList, nMaxFormats, piFormats, nNumFormats)
+	return		BOOL
+	param		hdc		HDC in value
+	param		piAttribIList	int in array [COMPSIZE()]
+	param		pfAttribFList	FLOAT in array [COMPSIZE()]
+	param		nMaxFormats	UINT in value
+	param		piFormats	int out array [COMPSIZE(nNumFormats)]
+	param		nNumFormats	UINT out reference
+	category	ARB_pixel_format
+
+###############################################################################
+#
+# ARB Extension #10
+# ARB_make_current_read commands
+#
+###############################################################################
+
+MakeContextCurrentARB(hDrawDC, hReadDC, hglrc)
+	return		BOOL
+	param		hDrawDC		HDC in value
+	param		hReadDC		HDC in value
+	param		hglrc		HGLRC in value
+	category	ARB_make_current_read
+
+GetCurrentReadDCARB()
+	return		HDC
+	category	ARB_make_current_read
+
+###############################################################################
+#
+# ARB Extension #11
+# ARB_pbuffer commands
+#
+###############################################################################
+
+CreatePbufferARB(hDC, iPixelFormat, iWidth, iHeight, piAttribList)
+	return		HPBUFFERARB
+	param		hDC		HDC in value
+	param		iPixelFormat	int in value
+	param		iWidth		int in value
+	param		iHeight		int in value
+	param		piAttribList	int in array [COMPSIZE()]
+	category	ARB_pbuffer
+
+GetPbufferDCARB(hPbuffer)
+	return		HDC
+	param		hPbuffer	HPBUFFERARB in value
+	category	ARB_pbuffer
+
+ReleasePbufferDCARB(hPbuffer, hDC)
+	return		int
+	param		hPbuffer	HPBUFFERARB in value
+	param		hDC		HDC in value
+	category	ARB_pbuffer
+
+DestroyPbufferARB(hPbuffer)
+	return		BOOL
+	param		hPbuffer	HPBUFFERARB in value
+	category	ARB_pbuffer
+
+QueryPbufferARB(hPbuffer, iAttribute, piValue)
+	return		BOOL
+	param		hPbuffer	HPBUFFERARB in value
+	param		iAttribute	int in value
+	param		piValue		int out reference
+	category	ARB_pbuffer
+
+###############################################################################
+#
+# ARB Extension #20
+# ARB_render_texture commands
+#
+###############################################################################
+
+BindTexImageARB(hPbuffer, iBuffer)
+	return		BOOL
+	param		hPbuffer	HPBUFFERARB in value
+	param		iBuffer		int in value
+	category	ARB_render_texture
+
+ReleaseTexImageARB(hPbuffer, iBuffer)
+	return		BOOL
+	param		hPbuffer	HPBUFFERARB in value
+	param		iBuffer		int in value
+	category	ARB_render_texture
+
+SetPbufferAttribARB(hPbuffer, piAttribList)
+	return		BOOL
+	param		hPbuffer	HPBUFFERARB in value
+	param		piAttribList	int in array [COMPSIZE()]
+	category	ARB_render_texture
+
+###############################################################################
+#
+# ARB Extension #39
+# ARB_pixel_format_float commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_pixel_format_float
+
+###############################################################################
+#
+# ARB Extension #46
+# ARB_framebuffer_sRGB commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_framebuffer_sRGB
+
+###############################################################################
+#
+# ARB Extension #55
+# ARB_create_context commands
+#
+###############################################################################
+
+CreateContextAttribsARB(hDC, hShareContext, attribList)
+	return		HGLRC
+	param		hDC		HDC in value
+	param		hShareContext	HGLRC in value
+	param		attribList	int in array [COMPSIZE()]
+	category	ARB_create_context
+
+###############################################################################
+#
+# ARB Extension #74
+# ARB_create_context_profile commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_create_context_profile
+
+###############################################################################
+#
+# ARB Extension #102
+# ARB_create_context_robustness commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_create_context_robustness
+
+
+###############################################################################
+#
+# Extension #167
+# EXT_display_color_table commands
+#
+###############################################################################
+
+CreateDisplayColorTableEXT(id)
+	return		GLboolean
+	param		id		GLushort in value
+	category	EXT_display_color_table
+
+LoadDisplayColorTableEXT(table, length)
+	return		GLboolean
+	param		table		GLushort in array [length]
+	param		length		GLuint in value
+	category	EXT_display_color_table
+
+BindDisplayColorTableEXT(id)
+	return		GLboolean
+	param		id		GLushort in value
+	category	EXT_display_color_table
+
+DestroyDisplayColorTableEXT(id)
+	return		VOID
+	param		id		GLushort in value
+	category	EXT_display_color_table
+
+###############################################################################
+#
+# Extension #168
+# EXT_extensions_string commands
+#
+###############################################################################
+
+GetExtensionsStringEXT()
+	return		String
+	category	EXT_extensions_string
+
+###############################################################################
+#
+# Extension #169
+# EXT_make_current_read commands
+#
+###############################################################################
+
+MakeContextCurrentEXT(hDrawDC, hReadDC, hglrc)
+	return		BOOL
+	param		hDrawDC		HDC in value
+	param		hReadDC		HDC in value
+	param		hglrc		HGLRC in value
+	category	EXT_make_current_read
+
+GetCurrentReadDCEXT()
+	return		HDC
+	category	EXT_make_current_read
+
+###############################################################################
+#
+# Extension #171
+# EXT_pbuffer commands
+#
+###############################################################################
+
+CreatePbufferEXT(hDC, iPixelFormat, iWidth, iHeight, piAttribList)
+	return		HPBUFFEREXT
+	param		hDC		HDC in value
+	param		iPixelFormat	int in value
+	param		iWidth		int in value
+	param		iHeight		int in value
+	param		piAttribList	int in array [COMPSIZE()]
+	category	EXT_pbuffer
+
+GetPbufferDCEXT(hPbuffer)
+	return		HDC
+	param		hPbuffer	HPBUFFEREXT in value
+	category	EXT_pbuffer
+
+ReleasePbufferDCEXT(hPbuffer, hDC)
+	return		int
+	param		hPbuffer	HPBUFFEREXT in value
+	param		hDC		HDC in value
+	category	EXT_pbuffer
+
+DestroyPbufferEXT(hPbuffer)
+	return		BOOL
+	param		hPbuffer	HPBUFFEREXT in value
+	category	EXT_pbuffer
+
+QueryPbufferEXT(hPbuffer, iAttribute, piValue)
+	return		BOOL
+	param		hPbuffer	HPBUFFEREXT in value
+	param		iAttribute	int in value
+	param		piValue		int out reference
+	category	EXT_pbuffer
+
+###############################################################################
+#
+# Extension #170
+# EXT_pixel_format commands
+#
+###############################################################################
+
+GetPixelFormatAttribivEXT(hdc, iPixelFormat, iLayerPlane, nAttributes, piAttributes, piValues)
+	return		BOOL
+	param		hdc		HDC in value
+	param		iPixelFormat	int in value
+	param		iLayerPlane	int in value
+	param		nAttributes	UINT in value
+	param		piAttributes	int out array [nAttributes]
+	param		piValues	int out array [nAttributes]
+	category	EXT_pixel_format
+
+GetPixelFormatAttribfvEXT(hdc, iPixelFormat, iLayerPlane, nAttributes, piAttributes, pfValues)
+	return		BOOL
+	param		hdc		HDC in value
+	param		iPixelFormat	int in value
+	param		iLayerPlane	int in value
+	param		nAttributes	UINT in value
+	param		piAttributes	int out array [nAttributes]
+	param		pfValues	FLOAT out array [nAttributes]
+	category	EXT_pixel_format
+
+ChoosePixelFormatEXT(hdc, piAttribIList, pfAttribFList, nMaxFormats, piFormats, nNumFormats)
+	return		BOOL
+	param		hdc		HDC in value
+	param		piAttribIList	int in array [COMPSIZE()]
+	param		pfAttribFList	FLOAT in array [COMPSIZE()]
+	param		nMaxFormats	UINT in value
+	param		piFormats	int out array [COMPSIZE(nNumFormats)]
+	param		nNumFormats	UINT out reference
+	category	EXT_pixel_format
+
+###############################################################################
+#
+# Extension #172
+# EXT_swap_control commands
+#
+###############################################################################
+
+SwapIntervalEXT(interval)
+	return		BOOL
+	param		interval	int in value
+	category	EXT_swap_control
+
+GetSwapIntervalEXT()
+	return		int
+	category	EXT_swap_control
+
+###############################################################################
+#
+# Extension #177
+# EXT_depth_float commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_depth_float
+
+###############################################################################
+#
+# Extension #190
+# NV_vertex_array_range commands
+#
+###############################################################################
+
+AllocateMemoryNV(size, readfreq, writefreq, priority)
+	return		VoidPointer
+	param		size		    GLsizei in value
+	param		readfreq	    GLfloat in value
+	param		writefreq	    GLfloat in value
+	param		priority	    GLfloat in value
+	category	NV_vertex_array_range
+
+FreeMemoryNV(pointer)
+	return		void
+	param		pointer		    void out array [1]
+	category	NV_vertex_array_range
+
+###############################################################################
+#
+# Extension #207
+# 3DFX_multisample commands
+#
+###############################################################################
+
+# (none)
+newcategory: 3DFX_multisample
+
+###############################################################################
+#
+# Extension #209
+# EXT_multisample commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_multisample
+
+###############################################################################
+#
+# Extension #242
+# OML_sync_control commands
+#
+###############################################################################
+
+GetSyncValuesOML(hdc, ust, msc, sbc)
+	return		BOOL
+	param		hdc		HDC in value
+	param		ust		INT64 out array [1]
+	param		msc		INT64 out array [1]
+	param		sbc		INT64 out array [1]
+	category	OML_sync_control
+
+GetMscRateOML(hdc, numerator, denominator)
+	return		BOOL
+	param		hdc		HDC in value
+	param		numerator	INT32 out array [1]
+	param		denominator	INT32 out array [1]
+	category	OML_sync_control
+
+SwapBuffersMscOML(hdc, target_msc, divisor, remainder)
+	return		INT64
+	param		hdc		HDC in value
+	param		target_msc	INT64 in value
+	param		divisor		INT64 in value
+	param		remainder	INT64 in value
+	category	OML_sync_control
+
+SwapLayerBuffersMscOML(hdc, fuPlanes, target_msc, divisor, remainder)
+	return		INT64
+	param		hdc		HDC in value
+	param		fuPlanes	int in value
+	param		target_msc	INT64 in value
+	param		divisor		INT64 in value
+	param		remainder	INT64 in value
+	category	OML_sync_control
+
+WaitForMscOML(hdc, target_msc, divisor, remainder , ust, msc, sbc)
+	return		BOOL
+	param		hdc		HDC in value
+	param		target_msc	INT64 in value
+	param		divisor		INT64 in value
+	param		remainder	INT64 in value
+	param		ust		INT64 out array [1]
+	param		msc		INT64 out array [1]
+	param		sbc		INT64 out array [1]
+	category	OML_sync_control
+
+WaitForSbcOML(hdc, target_sbc, ust, msc, sbc)
+	return		BOOL
+	param		hdc		HDC in value
+	param		target_sbc	INT64 in value
+	param		ust		INT64 out array [1]
+	param		msc		INT64 out array [1]
+	param		sbc		INT64 out array [1]
+	category	OML_sync_control
+
+###############################################################################
+#
+# Extension #250
+# I3D_digital_video_control commands
+#
+###############################################################################
+
+GetDigitalVideoParametersI3D(hDC, iAttribute, piValue)
+	return		BOOL
+	param		hDC		HDC in value
+	param		iAttribute	int in value
+	param		piValue		int out array [COMPSIZE(iAttribute)]
+	category	I3D_digital_video_control
+
+SetDigitalVideoParametersI3D(hDC, iAttribute, piValue)
+	return		BOOL
+	param		hDC		HDC in value
+	param		iAttribute	int in value
+	param		piValue		int in array [COMPSIZE(iAttribute)]
+	category	I3D_digital_video_control
+
+###############################################################################
+#
+# Extension #251
+# I3D_gamma commands
+#
+###############################################################################
+
+GetGammaTableParametersI3D(hDC, iAttribute, piValue)
+	return		BOOL
+	param		hDC		HDC in value
+	param		iAttribute	int in value
+	param		piValue		int out array [COMPSIZE(iAttribute)]
+	category	I3D_gamma
+
+SetGammaTableParametersI3D(hDC, iAttribute, piValue)
+	return		BOOL
+	param		hDC		HDC in value
+	param		iAttribute	int in value
+	param		piValue		int in array [COMPSIZE(iAttribute)]
+	category	I3D_gamma
+
+GetGammaTableI3D(hDC, iEntries, puRed, puGreen, puBlue)
+	return		BOOL
+	param		hDC		HDC in value
+	param		iEntries	int in value
+	param		puRed		USHORT out array [iEntries]
+	param		puGreen		USHORT out array [iEntries]
+	param		puBlue		USHORT out array [iEntries]
+	category	I3D_gamma
+
+SetGammaTableI3D(hDC, iEntries, puRed, puGreen, puBlue)
+	return		BOOL
+	param		hDC		HDC in value
+	param		iEntries	int in value
+	param		puRed		USHORT in array [iEntries]
+	param		puGreen		USHORT in array [iEntries]
+	param		puBlue		USHORT in array [iEntries]
+	category	I3D_gamma
+
+###############################################################################
+#
+# Extension #252
+# I3D_genlock commands
+#
+###############################################################################
+
+EnableGenlockI3D(hDC)
+	return		BOOL
+	param		hDC		HDC in value
+	category	I3D_genlock
+
+DisableGenlockI3D(hDC)
+	return		BOOL
+	param		hDC		HDC in value
+	category	I3D_genlock
+
+IsEnabledGenlockI3D(hDC, pFlag)
+	return		BOOL
+	param		hDC		HDC in value
+	param		pFlag		BOOL out reference
+	category	I3D_genlock
+
+GenlockSourceI3D(hDC,  uSource)
+	return		BOOL
+	param		hDC		HDC in value
+	param		uSource		UINT in value
+	category	I3D_genlock
+
+GetGenlockSourceI3D(hDC, uSource)
+	return		BOOL
+	param		hDC		HDC in value
+	param		uSource		UINT out reference
+	category	I3D_genlock
+
+GenlockSourceEdgeI3D(hDC,  uEdge)
+	return		BOOL
+	param		hDC		HDC in value
+	param		uEdge		UINT in value
+	category	I3D_genlock
+
+GetGenlockSourceEdgeI3D(hDC, uEdge)
+	return		BOOL
+	param		hDC		HDC in value
+	param		uEdge		UINT out reference
+	category	I3D_genlock
+
+GenlockSampleRateI3D(hDC,  uRate)
+	return		BOOL
+	param		hDC		HDC in value
+	param		uRate		UINT in value
+	category	I3D_genlock
+
+GetGenlockSampleRateI3D(hDC, uRate)
+	return		BOOL
+	param		hDC		HDC in value
+	param		uRate		UINT out reference
+	category	I3D_genlock
+
+GenlockSourceDelayI3D(hDC,  uDelay)
+	return		BOOL
+	param		hDC		HDC in value
+	param		uDelay		UINT in value
+	category	I3D_genlock
+
+GetGenlockSourceDelayI3D(hDC, uDelay)
+	return		BOOL
+	param		hDC		HDC in value
+	param		uDelay		UINT out reference
+	category	I3D_genlock
+
+QueryGenlockMaxSourceDelayI3D(hDC, uMaxLineDelay, uMaxPixelDelay)
+	return		BOOL
+	param		hDC		HDC in value
+	param		uMaxLineDelay	UINT out reference
+	param		uMaxPixelDelay	UINT out reference
+	category	I3D_genlock
+
+###############################################################################
+#
+# Extension #253
+# I3D_image_buffer commands
+#
+###############################################################################
+
+CreateImageBufferI3D(hDC, dwSize,  uFlags)
+	return		LPVOID
+	param		hDC		HDC in value
+	param		dwSize		DWORD in value
+	param		uFlags		UINT in value
+	category	I3D_image_buffer
+
+DestroyImageBufferI3D(hDC, pAddress)
+	return		BOOL
+	param		hDC		HDC in value
+	param		pAddress	LPVOID in value
+	category	I3D_image_buffer
+
+AssociateImageBufferEventsI3D(hDC,  pEvent, pAddress, pSize,  count)
+	return		BOOL
+	param		hDC		HDC in value
+	param		pEvent		HANDLE in array [count]
+	param		pAddress	LPVOID in array [count]
+	param		pSize		DWORD in array [count]
+	param		count		UINT in value
+	category	I3D_image_buffer
+
+ReleaseImageBufferEventsI3D(hDC, pAddress,  count)
+	return		BOOL
+	param		hDC		HDC in value
+	param		pAddress	LPVOID in array [count]
+	param		count		UINT in value
+	category	I3D_image_buffer
+
+###############################################################################
+#
+# Extension #254
+# I3D_swap_frame_lock commands
+#
+###############################################################################
+
+EnableFrameLockI3D()
+	return		BOOL
+	category	I3D_swap_frame_lock
+
+DisableFrameLockI3D()
+	return		BOOL
+	category	I3D_swap_frame_lock
+
+IsEnabledFrameLockI3D(pFlag)
+	return		BOOL
+	param		pFlag		BOOL out reference
+	category	I3D_swap_frame_lock
+
+QueryFrameLockMasterI3D(pFlag)
+	return		BOOL
+	param		pFlag		BOOL out reference
+	category	I3D_swap_frame_lock
+
+###############################################################################
+#
+# Extension #255
+# I3D_swap_frame_usage commands
+#
+###############################################################################
+
+GetFrameUsageI3D(pUsage)
+	return		BOOL
+	param		pUsage		float out reference
+	category	I3D_swap_frame_usage
+
+BeginFrameTrackingI3D()
+	return		BOOL
+	category	I3D_swap_frame_usage
+
+EndFrameTrackingI3D()
+	return		BOOL
+	category	I3D_swap_frame_usage
+
+QueryFrameTrackingI3D(pFrameCount, pMissedFrames, pLastMissedUsage)
+	return		BOOL
+	param		pFrameCount	DWORD out reference
+	param		pMissedFrames	DWORD out reference
+	param		pLastMissedUsage    float out reference
+	category	I3D_swap_frame_usage
+
+###############################################################################
+#
+# Extension #278
+# ATI_pixel_format_float commands
+#
+###############################################################################
+
+# (none)
+newcategory: ATI_pixel_format_float
+
+###############################################################################
+#
+# Extension #281
+# NV_float_buffer commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_float_buffer
+
+###############################################################################
+#
+# Extension #313
+# 3DL_stereo_control commands
+#
+###############################################################################
+
+SetStereoEmitterState3DL(hDC, uState)
+	return		BOOL
+	param		hDC		HDC in value
+	param		uState		UINT in value
+	category	3DL_stereo_control
+
+###############################################################################
+#
+# Extension #328
+# EXT_pixel_format_packed_float commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_pixel_format_packed_float
+
+###############################################################################
+#
+# Extension #337
+# EXT_framebuffer_sRGB commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_framebuffer_sRGB
+
+###############################################################################
+#
+# Extension #347
+# NV_present_video commands
+#
+###############################################################################
+
+EnumerateVideoDevicesNV(hDC, phDeviceList)
+	return		int
+	param		hDC		HDC in value
+	param		phDeviceList	HVIDEOOUTPUTDEVICENV out array
+	category	NV_present_video
+
+BindVideoDeviceNV(hDC, uVideoSlot, hVideoDevice, piAttribList)
+	return		BOOL
+	param		hDC		HDC in value
+	param		uVideoSlot	uint in value
+	param		hVideoDevice	HVIDEOOUTPUTDEVICENV in value
+	param		piAttribList	int in array [COMPSIZE()]
+	category	NV_present_video
+
+QueryCurrentContextNV(iAttribute, piValue)
+	return		BOOL
+	param		iAttribute	int in value
+	param		piValue		int out array [COMPSIZE()]
+	category	NV_present_video
+
+###############################################################################
+#
+# Extension #349
+# NV_video_output commands
+#
+###############################################################################
+
+GetVideoDeviceNV(hDC, numDevices, hVideoDevice)
+	return		BOOL
+	param		hDC		HDC in value
+	param		numDevices	int in value
+	param		hVideoDevice	HPVIDEODEV out reference
+	category	NV_video_output
+
+ReleaseVideoDeviceNV(hVideoDevice)
+	return		BOOL
+	param		hVideoDevice	HPVIDEODEV in value
+	category	NV_video_output
+
+BindVideoImageNV(hVideoDevice, hPbuffer, iVideoBuffer)
+	return		BOOL
+	param		hVideoDevice	HPVIDEODEV in value
+	param		hPbuffer	HPBUFFERARB in value
+	param		iVideoBuffer	int in value
+	category	NV_video_output
+
+ReleaseVideoImageNV(hPbuffer, iVideoBuffer)
+	return		BOOL
+	param		hPbuffer	HPBUFFERARB in value
+	param		iVideoBuffer	int in value
+	category	NV_video_output
+
+SendPbufferToVideoNV(hPbuffer, iBufferType, pulCounterPbuffer, bBlock)
+	return		BOOL
+	param		hPbuffer	HPBUFFERARB in value
+	param		iBufferType	int in value
+	param		pulCounterPbuffer   ulong out reference
+	param		bBlock		BOOL in value
+	category	NV_video_output
+
+GetVideoInfoNV(hpVideoDevice, pulCounterOutputPbuffer, pulCounterOutputVideo)
+	return		BOOL
+	param		hpVideoDevice	HPVIDEODEV in value
+	param		pulCounterOutputPbuffer ulong out reference
+	param		pulCounterOutputVideo	ulong out reference
+	category	NV_video_output
+
+###############################################################################
+#
+# Extension #351
+# NV_swap_group commands
+#
+###############################################################################
+
+JoinSwapGroupNV(hDC, group)
+	return		BOOL
+	param		hDC		HDC in value
+	param		group		GLuint in value
+	category	NV_swap_group
+
+BindSwapBarrierNV(group, barrier)
+	return		BOOL
+	param		group		GLuint in value
+	param		barrier		GLuint in value
+	category	NV_swap_group
+
+QuerySwapGroupNV(hDC, group, barrier)
+	return		BOOL
+	param		hDC		HDC in value
+	param		group		GLuint out reference
+	param		barrier		GLuint out reference
+	category	NV_swap_group
+
+QueryMaxSwapGroupsNV(hDC, maxGroups, maxBarriers)
+	return		BOOL
+	param		hDC		HDC in value
+	param		maxGroups	GLuint out reference
+	param		maxBarriers	GLuint out reference
+	category	NV_swap_group
+
+QueryFrameCountNV(hDC, count)
+	return		BOOL
+	param		hDC		HDC in value
+	param		count		GLuint out reference
+	category	NV_swap_group
+
+ResetFrameCountNV(hDC)
+	return		BOOL
+	param		hDC		HDC in value
+	category	NV_swap_group
+
+###############################################################################
+#
+# Extension #355
+# NV_gpu_affinity commands
+#
+###############################################################################
+
+EnumGpusNV(iGpuIndex, phGpu)
+	return		BOOL
+	param		iGpuIndex	UINT in value
+	param		phGpu		HGPUNV out reference
+	category	NV_gpu_affinity
+
+EnumGpuDevicesNV(hGpu, iDeviceIndex, lpGpuDevice)
+	return		BOOL
+	param		hGpu		HGPUNV in value
+	param		iDeviceIndex	UINT in value
+	param		lpGpuDevice	PGPU_DEVICE in value
+	category	NV_gpu_affinity
+
+CreateAffinityDCNV(phGpuList)
+	return		HDC
+	param		phGpuList	HGPUNV in array [COMPSIZE()]
+	category	NV_gpu_affinity
+
+EnumGpusFromAffinityDCNV(hAffinityDC, iGpuIndex, hGpu)
+	return		BOOL
+	param		hAffinityDC	HDC in value
+	param		iGpuIndex	UINT in value
+	param		hGpu		HGPUNV out reference
+	category	NV_gpu_affinity
+
+DeleteDCNV(hdc)
+	return		BOOL
+	param		hdc		HDC in value
+	category	NV_gpu_affinity
+
+###############################################################################
+#
+# Extension #361
+# AMD_gpu_association commands
+#
+###############################################################################
+
+GetGPUIDsAMD(maxCount, ids)
+	return		UINT
+	param		maxCount	UINT in value
+	param		ids		UINT out array [maxCount]
+	category	AMD_gpu_association
+
+GetGPUInfoAMD(id, property, dataType, size, data)
+	return		INT
+	param		id		UINT in value
+	param		property	int in value
+	param		dataType	GLenum in value
+	param		size		UINT in value
+	param		data		void out array [COMPSIZE(dataType,size)]
+	category	AMD_gpu_association
+
+GetContextGPUIDAMD(hglrc)
+	return		UINT
+	param		hglrc		HGLRC in value
+	category	AMD_gpu_association
+
+CreateAssociatedContextAMD(id)
+	return		HGLRC
+	param		id		UINT in value
+	category	AMD_gpu_association
+
+CreateAssociatedContextAttribsAMD(id, hShareContext, attribList)
+	return		HGLRC
+	param		id		UINT in value
+	param		hShareContext	HGLRC in value
+	param		attribList	int in array [COMPSIZE()]
+	category	AMD_gpu_association
+
+DeleteAssociatedContextAMD(hglrc)
+	return		BOOL
+	param		hglrc		HGLRC in value
+	category	AMD_gpu_association
+
+MakeAssociatedContextCurrentAMD(hglrc)
+	return		BOOL
+	param		hglrc		HGLRC in value
+	category	AMD_gpu_association
+
+GetCurrentAssociatedContextAMD()
+	return		HGLRC
+	category	AMD_gpu_association
+
+BlitContextFramebufferAMD(dstCtx, srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter)
+	return		VOID
+	param		dstCtx		HGLRC in value
+	param		srcX0		GLint in value
+	param		srcY0		GLint in value
+	param		srcX1		GLint in value
+	param		srcY1		GLint in value
+	param		dstX0		GLint in value
+	param		dstY0		GLint in value
+	param		dstX1		GLint in value
+	param		dstY1		GLint in value
+	param		mask		GLbitfield in value
+	param		filter		GLenum in value
+	category	AMD_gpu_association
+
+###############################################################################
+#
+# Extension #374
+# NV_video_capture commands
+#
+###############################################################################
+
+BindVideoCaptureDeviceNV(uVideoSlot, hDevice)
+	return		BOOL
+	param		uVideoSlot	UINT in value
+	param		hDevice		HVIDEOINPUTDEVICENV in value
+	category	NV_video_capture
+
+EnumerateVideoCaptureDevicesNV(hDc, phDeviceList)
+	return		UINT
+	param		hDc		HDC in value
+	param		phDeviceList	HVIDEOINPUTDEVICENV out reference
+	category	NV_video_capture
+
+LockVideoCaptureDeviceNV(hDc, hDevice)
+	return		BOOL
+	param		hDc		HDC in value
+	param		hDevice		HVIDEOINPUTDEVICENV in value
+	category	NV_video_capture
+
+QueryVideoCaptureDeviceNV(hDc, hDevice, iAttribute, piValue)
+	return		BOOL
+	param		hDc		HDC in value
+	param		hDevice		HVIDEOINPUTDEVICENV in value
+	param		iAttribute	int in value
+	param		piValue		int out reference
+	category	NV_video_capture
+
+ReleaseVideoCaptureDeviceNV(hDc, hDevice)
+	return		BOOL
+	param		hDc		HDC in value
+	param		hDevice		HVIDEOINPUTDEVICENV in value
+	category	NV_video_capture
+
+###############################################################################
+#
+# Extension #376
+# NV_copy_image commands
+#
+###############################################################################
+
+CopyImageSubDataNV(hSrcRC, srcName, srcTarget, srcLevel, srcX, srcY, srcZ, hDstRC, dstName, dstTarget, dstLevel, dstX, dstY, dstZ, width, height, depth)
+	return		BOOL
+	param		hSrcRC		HGLRC in value
+	param		srcName		GLuint in value
+	param		srcTarget	GLenum in value
+	param		srcLevel	GLint in value
+	param		srcX		GLint in value
+	param		srcY		GLint in value
+	param		srcZ		GLint in value
+	param		hDstRC		HGLRC in value
+	param		dstName		GLuint in value
+	param		dstTarget	GLenum in value
+	param		dstLevel	GLint in value
+	param		dstX		GLint in value
+	param		dstY		GLint in value
+	param		dstZ		GLint in value
+	param		width		GLsizei in value
+	param		height		GLsizei in value
+	param		depth		GLsizei in value
+	category	NV_copy_image
+
+###############################################################################
+#
+# Extension #393
+# NV_multisample_coverage commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_multisample_coverage
+
+###############################################################################
+#
+# Extension #407
+# NV_DX_interop commands
+#
+###############################################################################
+
+DXSetResourceShareHandleNV(dxObject, shareHandle)
+	return		BOOL
+	param		dxObject	void out array [1]
+	param		shareHandle	HANDLE in value
+	category	NV_DX_interop
+
+DXOpenDeviceNV(dxDevice)
+	return		HANDLE
+	param		dxDevice	void out array [1]
+	category	NV_DX_interop
+
+DXCloseDeviceNV(hDevice)
+	return		BOOL
+	param		hDevice		HANDLE in value
+	category	NV_DX_interop
+
+DXRegisterObjectNV(hDevice, dxObject, name, type, access)
+	return		HANDLE
+	param		hDevice		HANDLE in value
+	param		dxObject	void out array [1]
+	param		name		GLuint in value
+	param		type		GLenum in value
+	param		access		GLenum in value
+	category	NV_DX_interop
+
+DXUnregisterObjectNV(hDevice, hObject)
+	return		BOOL
+	param		hDevice		HANDLE in value
+	param		hObject		HANDLE in value
+	category	NV_DX_interop
+
+DXObjectAccessNV(hObject, access)
+	return		BOOL
+	param		hObject		HANDLE in value
+	param		access		GLenum in value
+	category	NV_DX_interop
+
+DXLockObjectsNV(hDevice, count, hObjects)
+	return		BOOL
+	param		hDevice		HANDLE in value
+	param		count		GLint in value
+	param		hObjects	HANDLE out array [count]
+	category	NV_DX_interop
+
+DXUnlockObjectsNV(hDevice, count, hObjects)
+	return		BOOL
+	param		hDevice		HANDLE in value
+	param		count		GLint in value
+	param		hObjects	HANDLE out array [count]
+	category	NV_DX_interop
+
+###############################################################################
+#
+# Extension #412
+# NV_DX_interop2 commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_DX_interop2
+
+###############################################################################
+#
+# Extension #415
+# EXT_swap_control_tear commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_swap_control_tear
+
diff --git a/xorg-server/hw/xwin/glx/winpriv.c b/xorg-server/hw/xwin/glx/winpriv.c
index 4f6e4ffd5..4f2bc21a8 100644
--- a/xorg-server/hw/xwin/glx/winpriv.c
+++ b/xorg-server/hw/xwin/glx/winpriv.c
@@ -11,6 +11,8 @@
 #include "winpriv.h"
 #include "winwindow.h"
 
+extern Bool			g_fXdmcpEnabled;
+
 void
  winCreateWindowsWindow(WindowPtr pWin);
 
@@ -21,7 +23,8 @@ void
 HWND
 winGetWindowInfo(WindowPtr pWin)
 {
-    winTrace("%s: pWin %p XID 0x%x\n", __FUNCTION__, pWin, pWin->drawable.id);
+    HWND hwnd = NULL;
+    winDebug("%s:%d pWin %p XID 0x%x\n", __FUNCTION__, __LINE__, pWin, pWin->drawable.id);
 
     /* a real window was requested */
     if (pWin != NULL) {
@@ -29,11 +32,10 @@ winGetWindowInfo(WindowPtr pWin)
         ScreenPtr pScreen = pWin->drawable.pScreen;
         winPrivScreenPtr pWinScreen = winGetScreenPriv(pScreen);
         winScreenInfoPtr pScreenInfo = NULL;
-        HWND hwnd = NULL;
 
         if (pWinScreen == NULL) {
             ErrorF("winGetWindowInfo: screen has no privates\n");
-            return NULL;
+            return hwnd;
         }
 
         hwnd = pWinScreen->hwndScreen;
@@ -50,19 +52,103 @@ winGetWindowInfo(WindowPtr pWin)
             }
 
             if (pWinPriv->hWnd == NULL) {
+              if (pWin->parent && pWin->parent->parent)
+              {
+                int offsetx;
+                int offsety;
+                int ExtraClass=(pWin->realized)?WS_VISIBLE:0;
+                HWND hWndParent;
+                WindowPtr pParent=pWin->parent;
+                while (pParent)
+                {
+                  winWindowPriv(pParent);
+                  hWndParent=pWinPriv->hWnd;
+                  if (hWndParent)
+                    break;
+                  pParent=pParent->parent;
+                }
+                if (!hWndParent)
+                  hWndParent=hwnd;
+                if (pParent)
+                {
+                  offsetx=pParent->drawable.x;
+                  offsety=pParent->drawable.y;
+                }
+                else
+                {
+                  offsetx=0;
+                  offsety=0;
+                }
+                pWinPriv->hWnd=CreateWindowExA(WS_EX_TRANSPARENT,
+                             WIN_GL_WINDOW_CLASS,
+                             "",
+                             WS_CHILD |WS_CLIPSIBLINGS | WS_CLIPCHILDREN  | ExtraClass,
+                             pWin->drawable.x-offsetx,
+                             pWin->drawable.y-offsety,
+                             pWin->drawable.width,
+                             pWin->drawable.height,
+                             hWndParent,
+                             NULL,
+                             GetModuleHandle(NULL),
+                             NULL);
+                winDebug("Window created %x %x %d %d %d %d\n",pWinPriv->hWnd,hWndParent,pWin->drawable.x-offsetx,pWin->drawable.y-offsety,pWin->drawable.width, pWin->drawable.height);
+                pWinPriv->fWglUsed=TRUE;
+              }
+              else
+              {
                 winCreateWindowsWindow(pWin);
-                ErrorF("winGetWindowInfo: forcing window to exist...\n");
+                winDebug("winGetWindowInfo: forcing window to exist...\n");
+              }
             }
-
             if (pWinPriv->hWnd != NULL) {
                 /* copy window handle */
                 hwnd = pWinPriv->hWnd;
-
-                /* mark GLX active on that hwnd */
-                pWinPriv->fWglUsed = TRUE;
             }
+        }
+        else if (g_fXdmcpEnabled)
+        {
+            winWindowPriv(pWin);
 
-            return hwnd;
+            if (pWinPriv == NULL)
+            {
+                ErrorF("winGetWindowInfo: window has no privates\n");
+                return hwnd;
+            }
+            if (pWinPriv->hWnd == NULL)
+            {
+              if (!((pWin->drawable.x==0) &&
+                     (pWin->drawable.y==0) &&
+                     (pWin->drawable.width==pScreen->width) &&
+                     (pWin->drawable.height==pScreen->height)
+                    )
+                  )
+              {
+                int ExtraClass=(pWin->realized)?WS_VISIBLE:0;
+                pWinPriv->hWnd=CreateWindowExA(WS_EX_TRANSPARENT,
+                             WIN_GL_WINDOW_CLASS,
+                             "",
+                             WS_CHILD |WS_CLIPSIBLINGS | WS_CLIPCHILDREN  | ExtraClass,
+                             pWin->drawable.x,
+                             pWin->drawable.y,
+                             pWin->drawable.width,
+                             pWin->drawable.height,
+                             pWinScreen->hwndScreen,
+                             NULL,
+                             GetModuleHandle(NULL),
+                             NULL);
+                pWinPriv->fWglUsed=TRUE;
+                /* copy size and window handle */
+                hwnd = pWinPriv->hWnd;
+              }
+              else
+              {
+                hwnd = pWinScreen->hwndScreen;
+              }
+            }
+            else
+            {
+              hwnd = pWinPriv->hWnd;
+            }
         }
 #endif
 #ifdef XWIN_MULTIWINDOWEXTWM
@@ -73,14 +159,12 @@ winGetWindowInfo(WindowPtr pWin)
 
             if (pRLWinPriv == NULL) {
                 ErrorF("winGetWindowInfo: window has no privates\n");
-                return hwnd;
             }
 
             if (pRLWinPriv->hWnd != NULL) {
                 /* copy window handle */
                 hwnd = pRLWinPriv->hWnd;
             }
-            return hwnd;
         }
 #endif
     }
@@ -90,15 +174,16 @@ winGetWindowInfo(WindowPtr pWin)
 
         if (pWinScreen == NULL) {
             ErrorF("winGetWindowInfo: screen has no privates\n");
-            return NULL;
         }
+        else
+        {
+            winDebug("winGetWindowInfo: returning root window\n");
 
-        ErrorF("winGetWindowInfo: returning root window\n");
-
-        return pWinScreen->hwndScreen;
+            hwnd=pWinScreen->hwndScreen;
+        }
     }
 
-    return NULL;
+    return hwnd;
 }
 
 Bool
@@ -117,5 +202,8 @@ winCheckScreenAiglxIsSupported(ScreenPtr pScreen)
         return TRUE;
 #endif
 
+  if (g_fXdmcpEnabled)
+    return TRUE;
+
     return FALSE;
 }
diff --git a/xorg-server/hw/xwin/glx/winpriv.h b/xorg-server/hw/xwin/glx/winpriv.h
index dce1edf48..710525ccc 100644
--- a/xorg-server/hw/xwin/glx/winpriv.h
+++ b/xorg-server/hw/xwin/glx/winpriv.h
@@ -7,5 +7,7 @@
 #include <X11/Xwindows.h>
 #include <windowstr.h>
 
+#define WIN_GL_WINDOW_CLASS "XWinGLTest"
+
 HWND winGetWindowInfo(WindowPtr pWin);
 Bool winCheckScreenAiglxIsSupported(ScreenPtr pScreen);
diff --git a/xorg-server/hw/xwin/makefile b/xorg-server/hw/xwin/makefile
new file mode 100644
index 000000000..6ed7d7f54
--- /dev/null
+++ b/xorg-server/hw/xwin/makefile
@@ -0,0 +1,164 @@
+LIBRARY = libXWin
+
+XWIN_MULTIWINDOW=1
+XWIN_CLIPBOARD=1
+XWIN_MULTIWINDOWEXTWM=0  # currently not working correctly
+XWIN_MULTIWINDOWINTWM=0  # currently not working correctly
+XWIN_RANDR=1
+XWIN_NATIVEGDI=0         # currently not working correctly
+XWIN_PRIMARYFB=0         # currently not working correctly
+XWIN_GLX_WINDOWS=1       # everything is in the glx makefile
+
+if XWIN_CLIPBOARD
+SRCS_CLIPBOARD = \
+	winclipboardinit.c \
+	winclipboardtextconv.c \
+	winclipboardthread.c \
+	winclipboardwndproc.c \
+	winclipboardwrappers.c \
+	winclipboardxevents.c
+DEFS_CLIPBOARD = -DXWIN_CLIPBOARD
+endif
+
+if XWIN_GLX_WINDOWS
+GLX_DIR = glx
+DEFS_GLX_WINDOWS = -DXWIN_GLX_WINDOWS
+XWIN_GLX_LIBS = $(top_builddir)/hw/xwin/glx/libXwinGLX.la
+XWIN_GLX_LINK_FLAGS = -lopengl32
+endif
+
+if XWIN_MULTIWINDOW
+SRCS_MULTIWINDOW = \
+	winmultiwindowshape.c \
+	winmultiwindowwindow.c \
+	winmultiwindowwm.c \
+	winmultiwindowwndproc.c \
+	winSetAppUserModelID.c
+DEFS_MULTIWINDOW = -DXWIN_MULTIWINDOW
+endif
+
+if XWIN_MULTIWINDOWEXTWM
+SRCS_MULTIWINDOWEXTWM = \
+	winwin32rootless.c \
+	winwin32rootlesswindow.c \
+	winwin32rootlesswndproc.c \
+	winwindowswm.c
+DEFS_MULTIWINDOWEXTWM = -DXWIN_MULTIWINDOWEXTWM
+MULTIWINDOWEXTWM_LIBS = $(top_builddir)/miext/rootless/librootless.la
+endif
+
+if XWIN_NATIVEGDI
+SRCS_NATIVEGDI = \
+	winclip.c \
+	winfillsp.c \
+	winfont.c \
+	wingc.c \
+	wingetsp.c \
+	winnativegdi.c \
+	winpixmap.c \
+	winpolyline.c \
+	winrop.c \
+	winsetsp.c
+DEFS_NATIVEGDI = -DXWIN_NATIVEGDI
+endif
+
+if XWIN_PRIMARYFB
+SRCS_PRIMARYFB = \
+	winpfbdd.c
+DEFS_PRIMARYFB = -DXWIN_PRIMARYFB
+endif
+
+if XWIN_RANDR
+SRCS_RANDR = \
+	winrandr.c
+DEFS_RANDR = -DXWIN_RANDR
+endif
+
+if XWIN_XV
+SRCS_XV = \
+	winvideo.c
+DEFS_XV = -DXWIN_XV
+endif
+
+SRCS =	InitInput.c \
+	InitOutput.c \
+	winallpriv.c \
+	winauth.c \
+	winblock.c \
+	wincmap.c \
+	winconfig.c \
+	wincreatewnd.c \
+	wincursor.c \
+	windialogs.c \
+	winengine.c \
+	winerror.c \
+	winglobals.c \
+	winkeybd.c \
+	winkeyhook.c \
+	winmisc.c \
+	winmonitors.c \
+	winmouse.c \
+	winmsg.c \
+	winmultiwindowclass.c \
+	winmultiwindowicons.c \
+	winprefs.c \
+	winprefsyacc.y \
+	winprefslex.l \
+	winprocarg.c \
+	winscrinit.c \
+	winshaddd.c \
+	winshadddnl.c \
+	winshadgdi.c \
+	wintaskbar.c \
+	wintrayicon.c \
+	winvalargs.c \
+	winwakeup.c \
+	winwindow.c \
+	winwndproc.c \
+	ddraw.h \
+	winclipboard.h \
+	winconfig.h \
+	win.h \
+	winkeybd.h \
+	winkeynames.h \
+	winlayouts.h \
+	winmessages.h \
+	winmsg.h \
+	winms.h \
+	winmultiwindowclass.h \
+	winprefs.h \
+	winresource.h \
+	winwindow.h \
+	windisplay.c \
+	XWin.rc \
+	$(SRCS_CLIPBOARD) \
+	$(SRCS_MULTIWINDOW) \
+	$(SRCS_MULTIWINDOWEXTWM) \
+	$(SRCS_NATIVEGDI) \
+	$(SRCS_PRIMARYFB) \
+	$(SRCS_RANDR) \
+	$(SRCS_XV) \
+	xdmcphostselect.c
+
+CSRCS=$(filter %.c,$(SRCS)) $(filter %.y,$(SRCS)) $(filter %.l,$(SRCS))
+CSRCS := $(CSRCS:%.y=%.c)
+CSRCS := $(CSRCS:%.l=%.c)
+
+ DEFS = $(DEFS_CLIPBOARD) \
+	$(DEFS_GLX_WINDOWS) \
+	$(DEFS_MULTIWINDOW) \
+	$(DEFS_MULTIWINDOWEXTWM) \
+	$(DEFS_NATIVEGDI) \
+	$(DEFS_PRIMARYFB) \
+	$(DEFS_RANDR) \
+	$(DEFS_XV)
+
+DEFINES += $(DEFS:-D%=%) HAVE_XWIN_CONFIG_H PTW32_STATIC_LIB RELOCATE_PROJECTROOT
+
+INCLUDES += ..\..\miext\rootless
+
+INCLUDES += $(OBJDIR)
+
+$(OBJDIR)\winprefslex.c $(OBJDIR)\winprefsyacc.c $(OBJDIR)\winprefsyacc.h: winprefslex.l winprefsyacc.y
+	doflexbison.bat $(subst \,/,$(OBJDIR))
+
diff --git a/xorg-server/hw/xwin/propertystore.h b/xorg-server/hw/xwin/propertystore.h
index 6afc6c954..b4a761f51 100644
--- a/xorg-server/hw/xwin/propertystore.h
+++ b/xorg-server/hw/xwin/propertystore.h
@@ -26,7 +26,7 @@
 
 #include <windows.h>
 
-#ifdef __MINGW64_VERSION_MAJOR
+#if defined(__MINGW64_VERSION_MAJOR) || defined(_MSC_VER)
 /* If we are using headers from mingw-w64 project, it provides the PSDK headers this needs ... */
 #include <propkey.h>
 #include <propsys.h>
diff --git a/xorg-server/hw/xwin/swrastwgl_dri/gen_gl_wrappers.py b/xorg-server/hw/xwin/swrastwgl_dri/gen_gl_wrappers.py
new file mode 100644
index 000000000..cc66eb096
--- /dev/null
+++ b/xorg-server/hw/xwin/swrastwgl_dri/gen_gl_wrappers.py
@@ -0,0 +1,327 @@
+#!/usr/bin/python
+#
+# Comedy python script to generate cdecl to stdcall wrappers for GL functions
+#
+# This is designed to operate on OpenGL spec files from
+# http://www.opengl.org/registry/api/
+#
+#
+# Copyright (c) Jon TURNEY 2009
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name(s) of the above copyright
+# holders shall not be used in advertising or otherwise to promote the sale,
+# use or other dealings in this Software without prior written authorization.
+#
+
+import sys
+import re
+import getopt
+
+dispatchheader = ''
+prefix = 'gl'
+preresolve = False
+staticwrappers = False
+
+opts, args = getopt.getopt(sys.argv[1:], "", ['spec=', 'typemap=', 'dispatch-header=', 'prefix=', 'preresolve', 'staticwrappers' ])
+
+for o,a in opts:
+        if o == '--typemap' :
+                typemapfile = a
+        elif o == '--dispatch-header' :
+                dispatchheader = a
+        elif o == '--spec' :
+                specfile = a
+        elif o == '--prefix' :
+                prefix = a
+        elif o == '--preresolve' :
+                preresolve = True
+        elif o == '--staticwrappers' :
+                staticwrappers = True
+
+#
+# look for all the SET_ macros in dispatch.h, this is the set of functions
+# we need to generate
+#
+
+dispatch = {}
+
+if dispatchheader :
+        fh = open(dispatchheader)
+        dispatchh = fh.readlines()
+
+        dispatch_regex = re.compile(r'(?:#define|static\s+INLINE\s+void)\s+SET_([^\()]+)\(')
+
+        for line in dispatchh :
+                line = line.strip()
+                m1 = dispatch_regex.search(line)
+
+                if m1 :
+                        dispatch[m1.group(1)] = 1
+
+        del dispatch['by_offset']
+
+#
+# read the typemap .tm file
+#
+
+typemap = {}
+
+fh = open(typemapfile)
+tm = fh.readlines()
+
+typemap_regex = re.compile(r'#define\sSET_(\S*)\(')
+
+for line in tm :
+        # ignore everything after a '#' as a comment
+        hash = line.find('#')
+        if hash != -1 :
+                line = line[:hash-1]
+
+        # ignore blank lines
+        if line.startswith('#') or len(line) == 0 :
+                continue
+
+        l = line.split(',')
+        typemap[l[0]] = l[3].strip()
+
+# interestingly, * is not a C type
+if typemap['void'] == '*' :
+        typemap['void'] = 'void'
+
+#
+# crudely parse the .spec file
+#
+
+r1 = re.compile(r'\t(\S*)\s+(\S*.*)')
+r2 = re.compile(r'(.*)\((.*)\)')
+r3 = re.compile(r'glWindowPos.*MESA')
+r4 = re.compile(r'gl.*Program(s|)NV')
+r5 = re.compile(r'glGetVertexAttribfvNV')
+
+wrappers = {}
+
+fh = open(specfile)
+glspec = fh.readlines()
+param_count = 0
+
+for line in glspec :
+        line = line.rstrip()
+
+        # ignore everything after a '#' as a comment
+        hash = line.find('#')
+        if hash != -1 :
+                line = line[:hash-1]
+
+        # ignore blank lines
+        if line.startswith('#') or len(line) == 0 :
+                continue
+
+        # lines containing ':' aren't intersting to us
+        if line.count(':') != 0 :
+                continue
+
+        # attributes of each function follow the name, indented by a tab
+        if not line.startswith('\t') :
+                m1 = r2.search(line)
+                if m1 :
+                        function = m1.group(1)
+                        arglist_use = m1.group(2)
+                        wrappers[function] = {}
+
+                        # near and far might be reserved words or macros so can't be used as formal parameter names
+                        arglist_use = arglist_use.replace('near','zNear')
+                        arglist_use = arglist_use.replace('far','zFar')
+
+                        wrappers[function]['arglist_use'] = arglist_use
+                        param_count = 0
+        else :
+                m1 = r1.search(line)
+                if m1 :
+                        attribute = m1.group(1)
+                        value = m1.group(2)
+
+                        # make param attributes unique and ordered
+                        if attribute == 'param' :
+                                attribute = 'param' + '%02d' % param_count
+                                param_count += 1
+
+                        wrappers[function][attribute] = value
+
+#
+# now emit code
+#
+
+print '/* Automatically generated by ' + sys.argv[0] + ' DO NOT EDIT */'
+print '/* from ' + specfile + ' and typemap ' + typemapfile + ' */'
+print ''
+
+#
+# if required, emit code for non-lazy function resolving
+#
+
+if preresolve :
+        for w in sorted(wrappers.keys()) :
+                funcname = prefix + w
+                print 'RESOLVE_DECL(PFN' + funcname.upper() + 'PROC);'
+
+        print ''
+        print 'void ' + prefix + 'ResolveExtensionProcs(void)'
+        print '{'
+
+        for w in sorted(wrappers.keys()) :
+                funcname = prefix + w
+                print '  PRERESOLVE(PFN' + funcname.upper() + 'PROC, "' + funcname + '");'
+
+        print '}\n'
+
+#
+# now emit the wrappers
+# for GL 1.0 and 1.1 functions, generate stdcall wrappers which call the function directly
+# for GL 1.2+ functions, generate wrappers which use wglGetProcAddress()
+#
+
+for w in sorted(wrappers.keys()) :
+
+        funcname = prefix + w
+        returntype = wrappers[w]['return']
+        if returntype != 'void' :
+                returntype = typemap[returntype]
+
+        # Avoid generating wrappers which aren't referenced by the dispatch table
+        if dispatchheader and not dispatch.has_key(w) :
+                print '/* No wrapper for ' + funcname + ', not in dispatch table */'
+                continue
+
+        # manufacture arglist
+        # if no param attributes were found, it should be 'void'
+        al = []
+        for k in sorted(wrappers[w].keys()) :
+                if k.startswith('param') :
+                        l = wrappers[w][k].split()
+
+                        # near and far might be reserved words or macros so can't be used as formal parameter names
+                        l[0] = l[0].replace('near','zNear')
+                        l[0] = l[0].replace('far','zFar')
+
+                        if l[2] == 'in' :
+                                if l[3] == 'array' :
+                                        arg = 'const ' + typemap[l[1]] + ' *' + l[0]
+                                elif l[3] == 'reference' :
+                                        arg = 'const ' + typemap[l[1]] + ' *' + l[0]
+                                else :
+                                        arg = typemap[l[1]] + ' ' + l[0]
+                        elif l[2] == 'out' :
+                                arg = typemap[l[1]] + ' *' + l[0]
+
+                        al.append(arg)
+
+        if len(al) == 0 :
+                arglist = 'void'
+        else:
+                arglist  = ', '.join(al)
+
+        if wrappers[w]['category'].startswith('VERSION_1_0') or wrappers[w]['category'].startswith('VERSION_1_1') :
+                if staticwrappers :
+                        print 'static',
+                print returntype + ' __stdcall ' + funcname + 'Wrapper(' + arglist + ')'
+                print '{'
+                print '#ifdef _DEBUG'
+                print '  //if (glxWinDebugSettings.enable' + prefix.upper() + 'callTrace) ErrorF("'+ funcname + '\\n");'
+                print '  glWinDirectProcCalls++;'
+                print '#endif'
+                if returntype.lower() == 'void' :
+                        print '  ' +  funcname + '(',
+                else :
+                        print ' /* returntype was ' + returntype.lower() + '*/'
+                        print '  return ' +  funcname + '(',
+
+                if arglist != 'void' :
+                        print wrappers[w]['arglist_use'],
+
+                print ');'
+                print "}\n"
+        else:
+                if staticwrappers :
+                        print 'static',
+                print returntype + ' __stdcall ' + funcname + 'Wrapper(' + arglist + ')'
+                print '{'
+
+                stringname = funcname
+
+#
+# special case: Windows OpenGL implementations are far more likely to have GL_ARB_window_pos than GL_MESA_window_pos,
+# so arrange for the wrapper to use the ARB strings to find functions...
+#
+
+                m2 = r3.search(funcname)
+                if m2 :
+                        stringname = stringname.replace('MESA','ARB')
+
+#
+# special case: likewise, implementations are more likely to have GL_ARB_vertex_program than GL_NV_vertex_program,
+# especially if they are not NV implementations, so arrange for the wrapper to use ARB strings to find functions
+#
+
+                m3 = r4.search(funcname)
+                if m3 :
+                        stringname = stringname.replace('NV','ARB')
+                m4 = r5.search(funcname)
+                if m4 :
+                        stringname = stringname.replace('NV','ARB')
+
+                pfntypename = 'PFN' + funcname.upper() + 'PROC'
+
+                if returntype.lower() == 'void' :
+                        print '  RESOLVE(' + pfntypename + ', "' + stringname + '");'
+                        print '#ifdef _DEBUG'
+                        print '  //if (glxWinDebugSettings.enable' + prefix.upper() + 'callTrace) ErrorF("'+ funcname + '\\n");'
+                        print '#endif'
+                        print '  RESOLVED_PROC(' + pfntypename + ')(',
+                else :
+                        print '  RESOLVE_RET(' + pfntypename + ', "' + stringname + '", FALSE);'
+                        print '#ifdef _DEBUG'
+                        print '  //if (glxWinDebugSettings.enable' + prefix.upper() + 'callTrace) ErrorF("'+ funcname + '\\n");'
+                        print '#endif'
+                        print '  return RESOLVED_PROC(' + pfntypename + ')(',
+
+                if arglist != 'void' :
+                        print wrappers[w]['arglist_use'],
+
+                print ');'
+                print "}\n"
+
+
+# generate function to setup the dispatch table, which sets each
+# dispatch table entry to point to it's wrapper function
+# (assuming we were able to make one)
+
+if dispatchheader :
+        print 'void glWinSetupDispatchTable(void)'
+        print '{'
+        print '  struct _glapi_table *disp = _glapi_get_dispatch();'
+
+        for d in sorted(dispatch.keys()) :
+                if wrappers.has_key(d) :
+                        print '  SET_'+ d + '(disp, (void *)' + prefix + d + 'Wrapper);'
+                else :
+                        print '#pragma message("No wrapper for ' + prefix + d + ' !")'
+
+        print '}'
diff --git a/xorg-server/hw/xwin/swrastwgl_dri/gl.spec b/xorg-server/hw/xwin/swrastwgl_dri/gl.spec
new file mode 100644
index 000000000..55e2d3b4c
--- /dev/null
+++ b/xorg-server/hw/xwin/swrastwgl_dri/gl.spec
@@ -0,0 +1,34247 @@
+# gl.spec file
+# DON'T REMOVE PREVIOUS LINE!!! libspec depends on it!
+#
+# Copyright (c) 1991-2005 Silicon Graphics, Inc. All Rights Reserved.
+# Copyright (c) 2006-2012 The Khronos Group Inc.
+#
+# This document is licensed under the SGI Free Software B License Version
+# 2.0. For details, see http://oss.sgi.com/projects/FreeB/ .
+#
+# $Revision: 19329 $ on $Date: 2012-09-28 12:26:05 -0700 (Fri, 28 Sep 2012) $
+
+required-props:
+# Description of a parameter
+param:		retval retained
+# Display list flags
+dlflags:	notlistable handcode prepad
+# GLX implementation flags
+glxflags:	client-intercept client-handcode server-handcode EXT SGI ignore ARB
+# Vector ('v') equivalent form of a command taking 1-4 explicit xyzw/rgba arguments
+vectorequiv:	*
+# Category a function falls in. While there are many categories for
+# early GL 1.0 functions, later functions just have a core version
+# (e.g. VERSION_major_minor) or extension name for the category.
+category: display-list drawing drawing-control feedback framebuf misc modeling pixel-op pixel-rw state-req xform
+category: VERSION_1_0 VERSION_1_1 VERSION_1_2 VERSION_1_3 VERSION_1_4 VERSION_1_5 VERSION_2_0 VERSION_2_1 VERSION_3_0 VERSION_3_1 VERSION_3_2 VERSION_3_3 VERSION_4_0 VERSION_4_1 VERSION_4_2 VERSION_4_3
+category: 3DFX_tbuffer
+category: AMD_conservative_depth AMD_debug_output AMD_draw_buffers_blend AMD_multi_draw_indirect AMD_name_gen_delete AMD_performance_monitor AMD_sample_positions AMD_sparse_texture AMD_stencil_operation_extended AMD_vertex_shader_tesselator
+category: APPLE_aux_depth_stencil APPLE_element_array APPLE_fence APPLE_float_pixels APPLE_flush_buffer_range APPLE_object_purgeable APPLE_row_bytes APPLE_texture_range APPLE_vertex_array_object APPLE_vertex_array_range APPLE_vertex_program_evaluators
+category: ARB_ES2_compatibility ARB_base_instance ARB_blend_func_extended ARB_cl_event ARB_color_buffer_float ARB_copy_buffer ARB_debug_output ARB_depth_buffer_float ARB_draw_buffers ARB_draw_buffers_blend ARB_draw_elements_base_vertex ARB_draw_indirect ARB_draw_instanced ARB_fragment_program ARB_fragment_shader ARB_framebuffer_object ARB_framebuffer_sRGB ARB_geometry_shader4 ARB_get_program_binary ARB_gpu_shader_fp64 ARB_half_float_vertex ARB_instanced_arrays ARB_internalformat_query ARB_map_buffer_range ARB_matrix_palette ARB_multisample ARB_multitexture ARB_occlusion_query ARB_point_parameters ARB_provoking_vertex ARB_robustness ARB_sample_shading ARB_sampler_objects ARB_separate_shader_objects ARB_shader_atomic_counters ARB_shader_image_load_store ARB_shader_objects ARB_shader_subroutine ARB_shading_language_include ARB_sync ARB_tessellation_shader ARB_texture_buffer_object ARB_texture_compression ARB_texture_compression_rgtc ARB_texture_multisample ARB_texture_rectangle ARB_texture_rg ARB_texture_storage ARB_timer_query ARB_transform_feedback2 ARB_transform_feedback3 ARB_transform_feedback_instanced ARB_transpose_matrix ARB_uniform_buffer_object ARB_vertex_array_object ARB_vertex_attrib_64bit ARB_vertex_blend ARB_vertex_buffer_object ARB_vertex_program ARB_vertex_shader ARB_vertex_type_2_10_10_10_rev ARB_viewport_array ARB_window_pos
+category: ARB_clear_buffer_object ARB_compute_shader ARB_copy_image ARB_framebuffer_no_attachments ARB_internalformat_query2 ARB_invalidate_subdata ARB_multi_draw_indirect ARB_program_interface_query ARB_shader_storage_buffer_object ARB_texture_buffer_range ARB_texture_storage_multisample ARB_texture_view ARB_vertex_attrib_binding
+category: ATI_draw_buffers ATI_draw_buffers ATI_element_array ATI_envmap_bumpmap ATI_fragment_shader ATI_map_object_buffer ATI_meminfo ATI_pn_triangles ATI_separate_stencil ATI_texture_env_combine3 ATI_texture_float ATI_vertex_array_object ATI_vertex_attrib_array_object ATI_vertex_streams
+category: EXT_bindable_uniform EXT_blend_color EXT_blend_equation_separate EXT_blend_func_separate EXT_blend_minmax EXT_color_subtable EXT_compiled_vertex_array EXT_convolution EXT_coordinate_frame EXT_copy_texture EXT_cull_vertex EXT_depth_bounds_test EXT_direct_state_access EXT_draw_buffers2 EXT_draw_instanced EXT_draw_range_elements EXT_fog_coord EXT_framebuffer_blit EXT_framebuffer_multisample EXT_framebuffer_object EXT_geometry_shader4 EXT_gpu_program_parameters EXT_gpu_shader4 EXT_histogram EXT_index_func EXT_index_material EXT_light_texture EXT_multi_draw_arrays EXT_multisample EXT_paletted_texture EXT_pixel_transform EXT_point_parameters EXT_polygon_offset EXT_provoking_vertex EXT_secondary_color EXT_separate_shader_objects EXT_shader_image_load_store EXT_stencil_clear_tag EXT_stencil_two_side EXT_subtexture EXT_texture3D EXT_texture_buffer_object EXT_texture_integer EXT_texture_object EXT_texture_perturb_normal EXT_texture_snorm EXT_texture_swizzle EXT_timer_query EXT_transform_feedback EXT_vertex_array EXT_vertex_array_bgra EXT_vertex_attrib_64bit EXT_vertex_shader EXT_vertex_weighting EXT_x11_sync_object
+category: GREMEDY_frame_terminator GREMEDY_string_marker
+category: HP_image_transform
+category: IBM_multimode_draw_arrays IBM_vertex_array_lists
+category: INGR_blend_func_separate
+category: INTEL_parallel_arrays
+category: KHR_debug
+category: MESAX_texture_stack MESA_resize_buffers MESA_window_pos
+category: NV_bindless_texture NV_conditional_render NV_copy_image NV_depth_buffer_float NV_evaluators NV_explicit_multisample NV_fence NV_float_buffer NV_fragment_program NV_fragment_program NV_framebuffer_multisample_coverage NV_geometry_program4 NV_gpu_program4 NV_gpu_program5 NV_gpu_shader5 NV_half_float NV_half_float NV_occlusion_query NV_parameter_buffer_object NV_parameter_buffer_object2 NV_path_rendering NV_pixel_data_range NV_pixel_data_range NV_point_sprite NV_present_video NV_primitive_restart NV_primitive_restart NV_register_combiners NV_register_combiners2 NV_shader_buffer_load NV_texture_barrier NV_texture_expand_normal NV_texture_expand_normal NV_texture_multisample NV_transform_feedback NV_transform_feedback2 NV_vdpau_interop NV_vdpau_interop NV_vertex_array_range NV_vertex_attrib_integer_64bit NV_vertex_buffer_unified_memory NV_vertex_program NV_vertex_program1_1_dcc NV_vertex_program2 NV_vertex_program4 NV_video_capture
+category: PGI_misc_hints
+category: S3_s3tc
+category: SGIS_detail_texture SGIS_fog_function SGIS_multisample SGIS_pixel_texture SGIS_point_parameters SGIS_sharpen_texture SGIS_texture4D SGIS_texture_color_mask SGIS_texture_filter4 SGIX_async SGIX_flush_raster SGIX_fragment_lighting SGIX_framezoom SGIX_igloo_interface SGIX_instruments SGIX_list_priority SGIX_pixel_texture SGIX_polynomial_ffd SGIX_reference_plane SGIX_sprite SGIX_tag_sample_buffer SGI_color_table
+category: SUNX_constant_data SUN_global_alpha SUN_mesh_array SUN_triangle_list SUN_vertex
+
+# Categories for extensions with no functions - need not be included now
+#
+# 3DFX_multisample 3DFX_texture_compression_FXT1
+# AMD_blend_minmax_factor AMD_pinned_memory AMD_seamless_cubemap_per_texture AMD_shader_stencil_export AMD_vertex_shader_layer AMD_vertex_shader_viewport_index
+# APPLE_specular_vector APPLE_transform_hint
+# ARB_ES3_compatibility ARB_arrays_of_arrays ARB_compressed_texture_pixel_storage ARB_conservative_depth ARB_debug_output2 ARB_depth_clamp ARB_explicit_uniform_location ARB_fragment_coord_conventions ARB_fragment_layer_viewport ARB_half_float_pixel ARB_map_buffer_alignment ARB_pixel_buffer_object ARB_point_sprite ARB_robust_buffer_access_behavior ARB_robustness_isolation ARB_seamless_cube_map ARB_shader_image_size ARB_shading_language_100 ARB_shading_language_420pack ARB_shading_language_packing ARB_stencil_texturing ARB_texture_border_clamp ARB_texture_cube_map ARB_texture_cube_map_array ARB_texture_env_add ARB_texture_float ARB_texture_gather ARB_texture_non_power_of_two ARB_texture_query_levels ARB_texture_query_lod ARB_vertex_array_bgra
+# EXT_422_pixels EXT_abgr EXT_bgra EXT_blend_logic_op EXT_blend_subtract EXT_clip_volume_hint EXT_cmyka EXT_framebuffer_sRGB EXT_index_array_formats EXT_index_texture EXT_misc_attribute EXT_packed_float EXT_packed_pixels EXT_pixel_transform_color_table EXT_rescale_normal EXT_separate_specular_color EXT_shadow_funcs EXT_shared_texture_palette EXT_stencil_wrap EXT_texture EXT_texture_array EXT_texture_compression_latc EXT_texture_compression_rgtc EXT_texture_env EXT_texture_env_add EXT_texture_env_combine EXT_texture_filter_anisotropic EXT_texture_lod_bias EXT_texture_shared_exponent EXT_vertex_array_bgra
+# HP_convolution_border_modes HP_occlusion_test HP_texture_lighting
+# IBM_cull_vertex IBM_rasterpos_clip
+# INGR_color_clamp INGR_interlace_read
+# KHR_texture_compression_astc_ldr
+# MESA_pack_invert MESA_ycbcr_texture
+# NV_blend_square NV_fog_distance NV_fragment_program4 NV_geometry_shader4 NV_light_max_exponent NV_packed_depth_stencil NV_shader_atomic_float NV_texgen_emboss NV_texgen_reflection NV_texture_compression_vtc NV_texture_env_combine4 NV_texture_rectangle NV_texture_shader NV_texture_shader2 NV_vertex_array_range2
+# PGI_vertex_hints
+# REND_screen_coordinates
+# SGIS_generate_mipmap SGIS_texture_border_clamp SGIS_texture_edge_clamp SGIS_texture_lod SGIX_async_histogram SGIX_async_pixel SGIX_blend_alpha_minmax SGIX_calligraphic_fragment SGIX_clipmap SGIX_convolution_accuracy SGIX_depth_pass_instrument SGIX_depth_texture SGIX_fog_offset SGIX_fog_scale SGIX_interlace SGIX_ir_instrument1 SGIX_pixel_tiles SGIX_resample SGIX_scalebias_hint SGIX_shadow SGIX_shadow_ambient SGIX_subsample SGIX_texture_add_env SGIX_texture_coordinate_clamp SGIX_texture_lod_bias SGIX_texture_multi_buffer SGIX_texture_scale_bias SGIX_texture_select SGIX_vertex_preclip SGIX_ycrcb SGIX_ycrcb_subsample SGIX_ycrcba SGI_color_matrix SGI_texture_color_table
+# SUN_convolution_border_modes SUN_slice_accum
+# WIN_phong_shading WIN_specular_fog
+
+# Core version in which a function was introduced, or against
+# which an extension can be implemented
+version:	1.0 1.1 1.2 1.3 1.4 1.5 2.0 2.1 3.0 3.1 3.2 3.3 4.0 4.1 4.2 4.3
+# Core version in which a function was removed
+deprecated:	3.1
+# API profile - should only be compatibility since there are no core-only
+# functions for now.
+profile:	compatibility
+# GLX Single, Rendering, or Vendor Private opcode
+glxsingle:	*
+glxropcode:	*
+glxvendorpriv:	*
+# WGL implementation flags (incomplete)
+wglflags:	client-handcode server-handcode small-data batchable
+# Drivers in which this is implemented (very incomplete)
+extension:	future not_implemented soft WINSOFT NV10 NV20 NV50
+# Function this aliases (indistinguishable to the GL)
+alias:		*
+# Mesa dispatch table offset (incomplete)
+offset:		*
+# These properties are picked up from NVIDIA .spec files, we don't use them
+glfflags:	*
+beginend:	*
+glxvectorequiv: *
+subcategory:	*
+glextmask:	*
+
+###############################################################################
+#
+# glxsingle, glxropcode, and other GLX allocations to vendors
+# are used here, but the master registry for GLX is in
+# /repos/ogl/trunk/doc/registry/extensions.reserved
+#
+# XFree86 dispatch offsets:	0-645
+#				578-641     NV_vertex_program
+# GLS opcodes:			0x0030-0x0269
+#
+###############################################################################
+
+###############################################################################
+#
+# things to remember when adding an extension command
+#
+# - append new ARB and non-ARB extensions to the appropriate portion of
+#   the spec file, in extension number order.
+# - leading tabs are suggested. Whitespace of any sort may be used elsewhere.
+# - set glxflags to "ignore" until GLX is updated to support the new command
+# - add new data types to typemaps/spec2wire.map
+# - add extension name in alphabetical order to category list
+# - add commands within an extension in spec order
+# - use existing command entries as a model (where possible)
+# - when reserving new glxropcodes, update extensions.reserved (per above)
+#
+###############################################################################
+
+# New type declarations
+
+passthru: #include <stddef.h>
+
+passthru: #ifndef GL_VERSION_2_0
+passthru: /* GL type for program/shader text */
+passthru: typedef char GLchar;
+passthru: #endif
+passthru:
+passthru: #ifndef GL_VERSION_1_5
+passthru: /* GL types for handling large vertex buffer objects */
+passthru: typedef ptrdiff_t GLintptr;
+passthru: typedef ptrdiff_t GLsizeiptr;
+passthru: #endif
+passthru:
+passthru: #ifndef GL_ARB_vertex_buffer_object
+passthru: /* GL types for handling large vertex buffer objects */
+passthru: typedef ptrdiff_t GLintptrARB;
+passthru: typedef ptrdiff_t GLsizeiptrARB;
+passthru: #endif
+passthru:
+passthru: #ifndef GL_ARB_shader_objects
+passthru: /* GL types for program/shader text and shader object handles */
+passthru: typedef char GLcharARB;
+passthru: typedef unsigned int GLhandleARB;
+passthru: #endif
+passthru:
+passthru: /* GL type for "half" precision (s10e5) float data in host memory */
+passthru: #ifndef GL_ARB_half_float_pixel
+passthru: typedef unsigned short GLhalfARB;
+passthru: #endif
+passthru:
+passthru: #ifndef GL_NV_half_float
+passthru: typedef unsigned short GLhalfNV;
+passthru: #endif
+passthru:
+passthru: #ifndef GLEXT_64_TYPES_DEFINED
+passthru: /* This code block is duplicated in glxext.h, so must be protected */
+passthru: #define GLEXT_64_TYPES_DEFINED
+passthru: /* Define int32_t, int64_t, and uint64_t types for UST/MSC */
+passthru: /* (as used in the GL_EXT_timer_query extension). */
+passthru: #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+passthru: #include <inttypes.h>
+passthru: #elif defined(__sun__) || defined(__digital__)
+passthru: #include <inttypes.h>
+passthru: #if defined(__STDC__)
+passthru: #if defined(__arch64__) || defined(_LP64)
+passthru: typedef long int int64_t;
+passthru: typedef unsigned long int uint64_t;
+passthru: #else
+passthru: typedef long long int int64_t;
+passthru: typedef unsigned long long int uint64_t;
+passthru: #endif /* __arch64__ */
+passthru: #endif /* __STDC__ */
+passthru: #elif defined( __VMS ) || defined(__sgi)
+passthru: #include <inttypes.h>
+passthru: #elif defined(__SCO__) || defined(__USLC__)
+passthru: #include <stdint.h>
+passthru: #elif defined(__UNIXOS2__) || defined(__SOL64__)
+passthru: typedef long int int32_t;
+passthru: typedef long long int int64_t;
+passthru: typedef unsigned long long int uint64_t;
+passthru: #elif defined(_WIN32) && defined(__GNUC__)
+passthru: #include <stdint.h>
+passthru: #elif defined(_WIN32)
+passthru: typedef __int32 int32_t;
+passthru: typedef __int64 int64_t;
+passthru: typedef unsigned __int64 uint64_t;
+passthru: #else
+passthru: /* Fallback if nothing above works */
+passthru: #include <inttypes.h>
+passthru: #endif
+passthru: #endif
+passthru:
+passthru: #ifndef GL_EXT_timer_query
+passthru: typedef int64_t GLint64EXT;
+passthru: typedef uint64_t GLuint64EXT;
+passthru: #endif
+passthru:
+passthru: #ifndef GL_ARB_sync
+passthru: typedef int64_t GLint64;
+passthru: typedef uint64_t GLuint64;
+passthru: typedef struct __GLsync *GLsync;
+passthru: #endif
+passthru:
+passthru: #ifndef GL_ARB_cl_event
+passthru: /* These incomplete types let us declare types compatible with OpenCL's cl_context and cl_event */
+passthru: struct _cl_context;
+passthru: struct _cl_event;
+passthru: #endif
+passthru:
+passthru: #ifndef GL_ARB_debug_output
+passthru: typedef void (APIENTRY *GLDEBUGPROCARB)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,GLvoid *userParam);
+passthru: #endif
+passthru:
+passthru: #ifndef GL_AMD_debug_output
+passthru: typedef void (APIENTRY *GLDEBUGPROCAMD)(GLuint id,GLenum category,GLenum severity,GLsizei length,const GLchar *message,GLvoid *userParam);
+passthru: #endif
+passthru:
+passthru: #ifndef GL_KHR_debug
+passthru: typedef void (APIENTRY *GLDEBUGPROC)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,GLvoid *userParam);
+passthru: #endif
+passthru:
+passthru: #ifndef GL_NV_vdpau_interop
+passthru: typedef GLintptr GLvdpauSurfaceNV;
+passthru: #endif
+passthru:
+
+###############################################################################
+###############################################################################
+#
+# OpenGL 1.0 commands
+#
+###############################################################################
+###############################################################################
+
+###############################################################################
+#
+# drawing-control commands
+#
+###############################################################################
+
+CullFace(mode)
+	return		void
+	param		mode		CullFaceMode in value
+	category	VERSION_1_0		   # old: drawing-control
+	version		1.0
+	glxropcode	79
+	offset		152
+
+FrontFace(mode)
+	return		void
+	param		mode		FrontFaceDirection in value
+	category	VERSION_1_0		   # old: drawing-control
+	version		1.0
+	glxropcode	84
+	offset		157
+
+Hint(target, mode)
+	return		void
+	param		target		HintTarget in value
+	param		mode		HintMode in value
+	category	VERSION_1_0		   # old: drawing-control
+	version		1.0
+	glxropcode	85
+	offset		158
+
+LineWidth(width)
+	return		void
+	param		width		CheckedFloat32 in value
+	category	VERSION_1_0		   # old: drawing-control
+	version		1.0
+	glxropcode	95
+	offset		168
+
+PointSize(size)
+	return		void
+	param		size		CheckedFloat32 in value
+	category	VERSION_1_0		   # old: drawing-control
+	version		1.0
+	glxropcode	100
+	offset		173
+
+PolygonMode(face, mode)
+	return		void
+	param		face		MaterialFace in value
+	param		mode		PolygonMode in value
+	category	VERSION_1_0		   # old: drawing-control
+	version		1.0
+	glxropcode	101
+	offset		174
+
+Scissor(x, y, width, height)
+	return		void
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	category	VERSION_1_0		   # old: drawing-control
+	version		1.0
+	glxropcode	103
+	offset		176
+
+TexParameterf(target, pname, param)
+	return		void
+	param		target		TextureTarget in value
+	param		pname		TextureParameterName in value
+	param		param		CheckedFloat32 in value
+	category	VERSION_1_0		   # old: drawing-control
+	version		1.0
+	glxropcode	105
+	wglflags	small-data
+	offset		178
+
+TexParameterfv(target, pname, params)
+	return		void
+	param		target		TextureTarget in value
+	param		pname		TextureParameterName in value
+	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: drawing-control
+	version		1.0
+	glxropcode	106
+	wglflags	small-data
+	offset		179
+
+TexParameteri(target, pname, param)
+	return		void
+	param		target		TextureTarget in value
+	param		pname		TextureParameterName in value
+	param		param		CheckedInt32 in value
+	category	VERSION_1_0		   # old: drawing-control
+	version		1.0
+	glxropcode	107
+	wglflags	small-data
+	offset		180
+
+TexParameteriv(target, pname, params)
+	return		void
+	param		target		TextureTarget in value
+	param		pname		TextureParameterName in value
+	param		params		CheckedInt32 in array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: drawing-control
+	version		1.0
+	glxropcode	108
+	wglflags	small-data
+	offset		181
+
+TexImage1D(target, level, internalformat, width, border, format, type, pixels)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	TextureComponentCount in value
+	param		width		SizeI in value
+	param		border		CheckedInt32 in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void in array [COMPSIZE(format/type/width)]
+	category	VERSION_1_0		   # old: drawing-control
+	dlflags		handcode
+	glxflags	client-handcode server-handcode
+	version		1.0
+	glxropcode	109
+	wglflags	client-handcode server-handcode
+	offset		182
+
+TexImage2D(target, level, internalformat, width, height, border, format, type, pixels)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	TextureComponentCount in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		border		CheckedInt32 in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void in array [COMPSIZE(format/type/width/height)]
+	category	VERSION_1_0		   # old: drawing-control
+	dlflags		handcode
+	glxflags	client-handcode server-handcode
+	version		1.0
+	glxropcode	110
+	wglflags	client-handcode server-handcode
+	offset		183
+
+###############################################################################
+#
+# framebuf commands
+#
+###############################################################################
+
+DrawBuffer(mode)
+	return		void
+	param		mode		DrawBufferMode in value
+	category	VERSION_1_0		   # old: framebuf
+	version		1.0
+	glxropcode	126
+	offset		202
+
+Clear(mask)
+	return		void
+	param		mask		ClearBufferMask in value
+	category	VERSION_1_0		   # old: framebuf
+	version		1.0
+	glxropcode	127
+	offset		203
+
+ClearColor(red, green, blue, alpha)
+	return		void
+	param		red		ColorF in value
+	param		green		ColorF in value
+	param		blue		ColorF in value
+	param		alpha		ColorF in value
+	category	VERSION_1_0		   # old: framebuf
+	version		1.0
+	glxropcode	130
+	offset		206
+
+ClearStencil(s)
+	return		void
+	param		s		StencilValue in value
+	category	VERSION_1_0		   # old: framebuf
+	version		1.0
+	glxropcode	131
+	offset		207
+
+ClearDepth(depth)
+	return		void
+	param		depth		Float64 in value
+	category	VERSION_1_0		   # old: framebuf
+	version		1.0
+	glxropcode	132
+	offset		208
+
+StencilMask(mask)
+	return		void
+	param		mask		MaskedStencilValue in value
+	category	VERSION_1_0		   # old: framebuf
+	version		1.0
+	glxropcode	133
+	offset		209
+
+ColorMask(red, green, blue, alpha)
+	return		void
+	param		red		Boolean in value
+	param		green		Boolean in value
+	param		blue		Boolean in value
+	param		alpha		Boolean in value
+	category	VERSION_1_0		   # old: framebuf
+	version		1.0
+	glxropcode	134
+	offset		210
+
+DepthMask(flag)
+	return		void
+	param		flag		Boolean in value
+	category	VERSION_1_0		   # old: framebuf
+	version		1.0
+	glxropcode	135
+	offset		211
+
+###############################################################################
+#
+# misc commands
+#
+###############################################################################
+
+Disable(cap)
+	return		void
+	param		cap		EnableCap in value
+	category	VERSION_1_0		   # old: misc
+	version		1.0
+	dlflags		handcode
+	glxflags	client-handcode client-intercept
+	glxropcode	138
+	offset		214
+
+Enable(cap)
+	return		void
+	param		cap		EnableCap in value
+	category	VERSION_1_0		   # old: misc
+	version		1.0
+	dlflags		handcode
+	glxflags	client-handcode client-intercept
+	glxropcode	139
+	offset		215
+
+Finish()
+	return		void
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode
+	category	VERSION_1_0		   # old: misc
+	version		1.0
+	glxsingle	108
+	offset		216
+
+Flush()
+	return		void
+	dlflags		notlistable
+	glxflags	client-handcode client-intercept server-handcode
+	category	VERSION_1_0		   # old: misc
+	version		1.0
+	glxsingle	142
+	offset		217
+
+###############################################################################
+#
+# pixel-op commands
+#
+###############################################################################
+
+BlendFunc(sfactor, dfactor)
+	return		void
+	param		sfactor		BlendingFactorSrc in value
+	param		dfactor		BlendingFactorDest in value
+	category	VERSION_1_0		   # old: pixel-op
+	version		1.0
+	glxropcode	160
+	offset		241
+
+LogicOp(opcode)
+	return		void
+	param		opcode		LogicOp in value
+	category	VERSION_1_0		   # old: pixel-op
+	version		1.0
+	glxropcode	161
+	offset		242
+
+StencilFunc(func, ref, mask)
+	return		void
+	param		func		StencilFunction in value
+	param		ref		StencilValue in value
+	param		mask		MaskedStencilValue in value
+	category	VERSION_1_0		   # old: pixel-op
+	version		1.0
+	glxropcode	162
+	offset		243
+
+StencilOp(fail, zfail, zpass)
+	return		void
+	param		fail		StencilOp in value
+	param		zfail		StencilOp in value
+	param		zpass		StencilOp in value
+	category	VERSION_1_0		   # old: pixel-op
+	version		1.0
+	glxropcode	163
+	offset		244
+
+DepthFunc(func)
+	return		void
+	param		func		DepthFunction in value
+	category	VERSION_1_0		   # old: pixel-op
+	version		1.0
+	glxropcode	164
+	offset		245
+
+###############################################################################
+#
+# pixel-rw commands
+#
+###############################################################################
+
+PixelStoref(pname, param)
+	return		void
+	param		pname		PixelStoreParameter in value
+	param		param		CheckedFloat32 in value
+	dlflags		notlistable
+	glxflags	client-handcode
+	category	VERSION_1_0		   # old: pixel-rw
+	version		1.0
+	glxsingle	109
+	wglflags	batchable
+	offset		249
+
+PixelStorei(pname, param)
+	return		void
+	param		pname		PixelStoreParameter in value
+	param		param		CheckedInt32 in value
+	dlflags		notlistable
+	glxflags	client-handcode
+	category	VERSION_1_0		   # old: pixel-rw
+	version		1.0
+	glxsingle	110
+	wglflags	batchable
+	offset		250
+
+ReadBuffer(mode)
+	return		void
+	param		mode		ReadBufferMode in value
+	category	VERSION_1_0		   # old: pixel-rw
+	version		1.0
+	glxropcode	171
+	offset		254
+
+ReadPixels(x, y, width, height, format, type, pixels)
+	return		void
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void out array [COMPSIZE(format/type/width/height)]
+	category	VERSION_1_0		   # old: pixel-rw
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode
+	version		1.0
+	glxsingle	111
+	wglflags	client-handcode server-handcode
+	offset		256
+
+###############################################################################
+#
+# state-req commands
+#
+###############################################################################
+
+GetBooleanv(pname, params)
+	return		void
+	param		pname		GetPName in value
+	param		params		Boolean out array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	glxflags	client-handcode
+	version		1.0
+	glxsingle	112
+	wglflags	small-data
+	offset		258
+
+GetDoublev(pname, params)
+	return		void
+	param		pname		GetPName in value
+	param		params		Float64 out array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	glxflags	client-handcode
+	version		1.0
+	glxsingle	114
+	wglflags	small-data
+	offset		260
+
+GetError()
+	return		ErrorCode
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	glxflags	client-handcode
+	version		1.0
+	glxsingle	115
+	offset		261
+
+GetFloatv(pname, params)
+	return		void
+	param		pname		GetPName in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	glxflags	client-handcode
+	version		1.0
+	glxsingle	116
+	wglflags	small-data
+	offset		262
+
+GetIntegerv(pname, params)
+	return		void
+	param		pname		GetPName in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	glxflags	client-handcode
+	version		1.0
+	glxsingle	117
+	wglflags	small-data
+	offset		263
+
+GetString(name)
+	return		String
+	param		name		StringName in value
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode
+	version		1.0
+	glxsingle	129
+	wglflags	client-handcode server-handcode
+	offset		275
+
+GetTexImage(target, level, format, type, pixels)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void out array [COMPSIZE(target/level/format/type)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode
+	version		1.0
+	glxsingle	135
+	wglflags	client-handcode server-handcode
+	offset		281
+
+GetTexParameterfv(target, pname, params)
+	return		void
+	param		target		TextureTarget in value
+	param		pname		GetTextureParameter in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	version		1.0
+	glxsingle	136
+	wglflags	small-data
+	offset		282
+
+GetTexParameteriv(target, pname, params)
+	return		void
+	param		target		TextureTarget in value
+	param		pname		GetTextureParameter in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	version		1.0
+	glxsingle	137
+	wglflags	small-data
+	offset		283
+
+GetTexLevelParameterfv(target, level, pname, params)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		pname		GetTextureParameter in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	version		1.0
+	glxsingle	138
+	wglflags	small-data
+	offset		284
+
+GetTexLevelParameteriv(target, level, pname, params)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		pname		GetTextureParameter in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	version		1.0
+	glxsingle	139
+	wglflags	small-data
+	offset		285
+
+IsEnabled(cap)
+	return		Boolean
+	param		cap		EnableCap in value
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	version		1.0
+	glxflags	client-handcode client-intercept
+	glxsingle	140
+	offset		286
+
+###############################################################################
+#
+# xform commands
+#
+###############################################################################
+
+DepthRange(near, far)
+	return		void
+	param		near		Float64 in value
+	param		far		Float64 in value
+	category	VERSION_1_0		   # old: xform
+	version		1.0
+	glxropcode	174
+	offset		288
+
+Viewport(x, y, width, height)
+	return		void
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	category	VERSION_1_0		   # old: xform
+	version		1.0
+	glxropcode	191
+	offset		305
+
+###############################################################################
+###############################################################################
+#
+# OpenGL 1.0 deprecated commands
+#
+###############################################################################
+###############################################################################
+
+# display-list commands
+
+NewList(list, mode)
+	return		void
+	param		list		List in value
+	param		mode		ListMode in value
+	dlflags		notlistable
+	category	VERSION_1_0		   # old: display-list
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxsingle	101
+	wglflags	batchable
+	offset		0
+
+EndList()
+	return		void
+	dlflags		notlistable
+	category	VERSION_1_0		   # old: display-list
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxsingle	102
+	wglflags	batchable
+	offset		1
+
+CallList(list)
+	return		void
+	param		list		List in value
+	category	VERSION_1_0		   # old: display-list
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	1
+	offset		2
+
+CallLists(n, type, lists)
+	return		void
+	param		n		SizeI in value
+	param		type		ListNameType in value
+	param		lists		Void in array [COMPSIZE(n/type)]
+	category	VERSION_1_0		   # old: display-list
+	glxflags	client-handcode server-handcode
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	2
+	offset		3
+
+DeleteLists(list, range)
+	return		void
+	param		list		List in value
+	param		range		SizeI in value
+	dlflags		notlistable
+	category	VERSION_1_0		   # old: display-list
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxsingle	103
+	wglflags	batchable
+	offset		4
+
+GenLists(range)
+	return		List
+	param		range		SizeI in value
+	dlflags		notlistable
+	category	VERSION_1_0		   # old: display-list
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxsingle	104
+	offset		5
+
+ListBase(base)
+	return		void
+	param		base		List in value
+	category	VERSION_1_0		   # old: display-list
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	3
+	offset		6
+
+# drawing commands
+
+Begin(mode)
+	return		void
+	param		mode		BeginMode in value
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	4
+	offset		7
+
+Bitmap(width, height, xorig, yorig, xmove, ymove, bitmap)
+	return		void
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		xorig		CoordF in value
+	param		yorig		CoordF in value
+	param		xmove		CoordF in value
+	param		ymove		CoordF in value
+	param		bitmap		UInt8 in array [COMPSIZE(width/height)]
+	category	VERSION_1_0		   # old: drawing
+	dlflags		handcode
+	glxflags	client-handcode server-handcode
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	5
+	wglflags	client-handcode server-handcode
+	offset		8
+
+Color3b(red, green, blue)
+	return		void
+	param		red		ColorB in value
+	param		green		ColorB in value
+	param		blue		ColorB in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Color3bv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		9
+
+Color3bv(v)
+	return		void
+	param		v		ColorB in array [3]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	6
+	offset		10
+
+Color3d(red, green, blue)
+	return		void
+	param		red		ColorD in value
+	param		green		ColorD in value
+	param		blue		ColorD in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Color3dv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		11
+
+Color3dv(v)
+	return		void
+	param		v		ColorD in array [3]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	7
+	offset		12
+
+Color3f(red, green, blue)
+	return		void
+	param		red		ColorF in value
+	param		green		ColorF in value
+	param		blue		ColorF in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Color3fv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		13
+
+Color3fv(v)
+	return		void
+	param		v		ColorF in array [3]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	8
+	offset		14
+
+Color3i(red, green, blue)
+	return		void
+	param		red		ColorI in value
+	param		green		ColorI in value
+	param		blue		ColorI in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Color3iv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		15
+
+Color3iv(v)
+	return		void
+	param		v		ColorI in array [3]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	9
+	offset		16
+
+Color3s(red, green, blue)
+	return		void
+	param		red		ColorS in value
+	param		green		ColorS in value
+	param		blue		ColorS in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Color3sv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		17
+
+Color3sv(v)
+	return		void
+	param		v		ColorS in array [3]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	10
+	offset		18
+
+Color3ub(red, green, blue)
+	return		void
+	param		red		ColorUB in value
+	param		green		ColorUB in value
+	param		blue		ColorUB in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Color3ubv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		19
+
+Color3ubv(v)
+	return		void
+	param		v		ColorUB in array [3]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	11
+	offset		20
+
+Color3ui(red, green, blue)
+	return		void
+	param		red		ColorUI in value
+	param		green		ColorUI in value
+	param		blue		ColorUI in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Color3uiv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		21
+
+Color3uiv(v)
+	return		void
+	param		v		ColorUI in array [3]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	12
+	offset		22
+
+Color3us(red, green, blue)
+	return		void
+	param		red		ColorUS in value
+	param		green		ColorUS in value
+	param		blue		ColorUS in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Color3usv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		23
+
+Color3usv(v)
+	return		void
+	param		v		ColorUS in array [3]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	13
+	offset		24
+
+Color4b(red, green, blue, alpha)
+	return		void
+	param		red		ColorB in value
+	param		green		ColorB in value
+	param		blue		ColorB in value
+	param		alpha		ColorB in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Color4bv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		25
+
+Color4bv(v)
+	return		void
+	param		v		ColorB in array [4]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	14
+	offset		26
+
+Color4d(red, green, blue, alpha)
+	return		void
+	param		red		ColorD in value
+	param		green		ColorD in value
+	param		blue		ColorD in value
+	param		alpha		ColorD in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Color4dv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		27
+
+Color4dv(v)
+	return		void
+	param		v		ColorD in array [4]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	15
+	offset		28
+
+Color4f(red, green, blue, alpha)
+	return		void
+	param		red		ColorF in value
+	param		green		ColorF in value
+	param		blue		ColorF in value
+	param		alpha		ColorF in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Color4fv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		29
+
+Color4fv(v)
+	return		void
+	param		v		ColorF in array [4]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	16
+	offset		30
+
+Color4i(red, green, blue, alpha)
+	return		void
+	param		red		ColorI in value
+	param		green		ColorI in value
+	param		blue		ColorI in value
+	param		alpha		ColorI in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Color4iv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		31
+
+Color4iv(v)
+	return		void
+	param		v		ColorI in array [4]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	17
+	offset		32
+
+Color4s(red, green, blue, alpha)
+	return		void
+	param		red		ColorS in value
+	param		green		ColorS in value
+	param		blue		ColorS in value
+	param		alpha		ColorS in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Color4sv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		33
+
+Color4sv(v)
+	return		void
+	param		v		ColorS in array [4]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	18
+	offset		34
+
+Color4ub(red, green, blue, alpha)
+	return		void
+	param		red		ColorUB in value
+	param		green		ColorUB in value
+	param		blue		ColorUB in value
+	param		alpha		ColorUB in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Color4ubv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		35
+
+Color4ubv(v)
+	return		void
+	param		v		ColorUB in array [4]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	19
+	offset		36
+
+Color4ui(red, green, blue, alpha)
+	return		void
+	param		red		ColorUI in value
+	param		green		ColorUI in value
+	param		blue		ColorUI in value
+	param		alpha		ColorUI in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Color4uiv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		37
+
+Color4uiv(v)
+	return		void
+	param		v		ColorUI in array [4]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	20
+	offset		38
+
+Color4us(red, green, blue, alpha)
+	return		void
+	param		red		ColorUS in value
+	param		green		ColorUS in value
+	param		blue		ColorUS in value
+	param		alpha		ColorUS in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Color4usv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		39
+
+Color4usv(v)
+	return		void
+	param		v		ColorUS in array [4]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	21
+	offset		40
+
+EdgeFlag(flag)
+	return		void
+	param		flag		Boolean in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	EdgeFlagv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		41
+
+EdgeFlagv(flag)
+	return		void
+	param		flag		Boolean in reference
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	22
+	offset		42
+
+End()
+	return		void
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	23
+	offset		43
+
+Indexd(c)
+	return		void
+	param		c		ColorIndexValueD in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Indexdv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		44
+
+Indexdv(c)
+	return		void
+	param		c		ColorIndexValueD in array [1]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	24
+	offset		45
+
+Indexf(c)
+	return		void
+	param		c		ColorIndexValueF in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Indexfv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		46
+
+Indexfv(c)
+	return		void
+	param		c		ColorIndexValueF in array [1]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	25
+	offset		47
+
+Indexi(c)
+	return		void
+	param		c		ColorIndexValueI in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Indexiv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		48
+
+Indexiv(c)
+	return		void
+	param		c		ColorIndexValueI in array [1]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	26
+	offset		49
+
+Indexs(c)
+	return		void
+	param		c		ColorIndexValueS in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Indexsv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		50
+
+Indexsv(c)
+	return		void
+	param		c		ColorIndexValueS in array [1]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	27
+	offset		51
+
+Normal3b(nx, ny, nz)
+	return		void
+	param		nx		Int8 in value
+	param		ny		Int8 in value
+	param		nz		Int8 in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Normal3bv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		52
+
+Normal3bv(v)
+	return		void
+	param		v		Int8 in array [3]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	28
+	offset		53
+
+Normal3d(nx, ny, nz)
+	return		void
+	param		nx		CoordD in value
+	param		ny		CoordD in value
+	param		nz		CoordD in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Normal3dv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		54
+
+Normal3dv(v)
+	return		void
+	param		v		CoordD in array [3]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	29
+	offset		55
+
+Normal3f(nx, ny, nz)
+	return		void
+	param		nx		CoordF in value
+	param		ny		CoordF in value
+	param		nz		CoordF in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Normal3fv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		56
+
+Normal3fv(v)
+	return		void
+	param		v		CoordF in array [3]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	30
+	offset		57
+
+Normal3i(nx, ny, nz)
+	return		void
+	param		nx		Int32 in value
+	param		ny		Int32 in value
+	param		nz		Int32 in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Normal3iv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		58
+
+Normal3iv(v)
+	return		void
+	param		v		Int32 in array [3]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	31
+	offset		59
+
+Normal3s(nx, ny, nz)
+	return		void
+	param		nx		Int16 in value
+	param		ny		Int16 in value
+	param		nz		Int16 in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Normal3sv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		60
+
+Normal3sv(v)
+	return		void
+	param		v		Int16 in array [3]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	32
+	offset		61
+
+RasterPos2d(x, y)
+	return		void
+	param		x		CoordD in value
+	param		y		CoordD in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	RasterPos2dv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		62
+
+RasterPos2dv(v)
+	return		void
+	param		v		CoordD in array [2]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	33
+	offset		63
+
+RasterPos2f(x, y)
+	return		void
+	param		x		CoordF in value
+	param		y		CoordF in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	RasterPos2fv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		64
+
+RasterPos2fv(v)
+	return		void
+	param		v		CoordF in array [2]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	34
+	offset		65
+
+RasterPos2i(x, y)
+	return		void
+	param		x		CoordI in value
+	param		y		CoordI in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	RasterPos2iv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		66
+
+RasterPos2iv(v)
+	return		void
+	param		v		CoordI in array [2]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	35
+	offset		67
+
+RasterPos2s(x, y)
+	return		void
+	param		x		CoordS in value
+	param		y		CoordS in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	RasterPos2sv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		68
+
+RasterPos2sv(v)
+	return		void
+	param		v		CoordS in array [2]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	36
+	offset		69
+
+RasterPos3d(x, y, z)
+	return		void
+	param		x		CoordD in value
+	param		y		CoordD in value
+	param		z		CoordD in value
+	vectorequiv	RasterPos3dv
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		70
+
+RasterPos3dv(v)
+	return		void
+	param		v		CoordD in array [3]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	37
+	offset		71
+
+RasterPos3f(x, y, z)
+	return		void
+	param		x		CoordF in value
+	param		y		CoordF in value
+	param		z		CoordF in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	RasterPos3fv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		72
+
+RasterPos3fv(v)
+	return		void
+	param		v		CoordF in array [3]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	38
+	offset		73
+
+RasterPos3i(x, y, z)
+	return		void
+	param		x		CoordI in value
+	param		y		CoordI in value
+	param		z		CoordI in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	RasterPos3iv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		74
+
+RasterPos3iv(v)
+	return		void
+	param		v		CoordI in array [3]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	39
+	offset		75
+
+RasterPos3s(x, y, z)
+	return		void
+	param		x		CoordS in value
+	param		y		CoordS in value
+	param		z		CoordS in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	RasterPos3sv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		76
+
+RasterPos3sv(v)
+	return		void
+	param		v		CoordS in array [3]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	40
+	offset		77
+
+RasterPos4d(x, y, z, w)
+	return		void
+	param		x		CoordD in value
+	param		y		CoordD in value
+	param		z		CoordD in value
+	param		w		CoordD in value
+	vectorequiv	RasterPos4dv
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		78
+
+RasterPos4dv(v)
+	return		void
+	param		v		CoordD in array [4]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	41
+	offset		79
+
+RasterPos4f(x, y, z, w)
+	return		void
+	param		x		CoordF in value
+	param		y		CoordF in value
+	param		z		CoordF in value
+	param		w		CoordF in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	RasterPos4fv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		80
+
+RasterPos4fv(v)
+	return		void
+	param		v		CoordF in array [4]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	42
+	offset		81
+
+RasterPos4i(x, y, z, w)
+	return		void
+	param		x		CoordI in value
+	param		y		CoordI in value
+	param		z		CoordI in value
+	param		w		CoordI in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	RasterPos4iv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		82
+
+RasterPos4iv(v)
+	return		void
+	param		v		CoordI in array [4]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	43
+	offset		83
+
+RasterPos4s(x, y, z, w)
+	return		void
+	param		x		CoordS in value
+	param		y		CoordS in value
+	param		z		CoordS in value
+	param		w		CoordS in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	RasterPos4sv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		84
+
+RasterPos4sv(v)
+	return		void
+	param		v		CoordS in array [4]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	44
+	offset		85
+
+Rectd(x1, y1, x2, y2)
+	return		void
+	param		x1		CoordD in value
+	param		y1		CoordD in value
+	param		x2		CoordD in value
+	param		y2		CoordD in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Rectdv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		86
+
+Rectdv(v1, v2)
+	return		void
+	param		v1		CoordD in array [2]
+	param		v2		CoordD in array [2]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	45
+	offset		87
+
+Rectf(x1, y1, x2, y2)
+	return		void
+	param		x1		CoordF in value
+	param		y1		CoordF in value
+	param		x2		CoordF in value
+	param		y2		CoordF in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Rectfv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		88
+
+Rectfv(v1, v2)
+	return		void
+	param		v1		CoordF in array [2]
+	param		v2		CoordF in array [2]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	46
+	offset		89
+
+Recti(x1, y1, x2, y2)
+	return		void
+	param		x1		CoordI in value
+	param		y1		CoordI in value
+	param		x2		CoordI in value
+	param		y2		CoordI in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Rectiv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		90
+
+Rectiv(v1, v2)
+	return		void
+	param		v1		CoordI in array [2]
+	param		v2		CoordI in array [2]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	47
+	offset		91
+
+Rects(x1, y1, x2, y2)
+	return		void
+	param		x1		CoordS in value
+	param		y1		CoordS in value
+	param		x2		CoordS in value
+	param		y2		CoordS in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Rectsv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		92
+
+Rectsv(v1, v2)
+	return		void
+	param		v1		CoordS in array [2]
+	param		v2		CoordS in array [2]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	48
+	offset		93
+
+TexCoord1d(s)
+	return		void
+	param		s		CoordD in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	TexCoord1dv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		94
+
+TexCoord1dv(v)
+	return		void
+	param		v		CoordD in array [1]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	49
+	offset		95
+
+TexCoord1f(s)
+	return		void
+	param		s		CoordF in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	TexCoord1fv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		96
+
+TexCoord1fv(v)
+	return		void
+	param		v		CoordF in array [1]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	50
+	offset		97
+
+TexCoord1i(s)
+	return		void
+	param		s		CoordI in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	TexCoord1iv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		98
+
+TexCoord1iv(v)
+	return		void
+	param		v		CoordI in array [1]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	51
+	offset		99
+
+TexCoord1s(s)
+	return		void
+	param		s		CoordS in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	TexCoord1sv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		100
+
+TexCoord1sv(v)
+	return		void
+	param		v		CoordS in array [1]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	52
+	offset		101
+
+TexCoord2d(s, t)
+	return		void
+	param		s		CoordD in value
+	param		t		CoordD in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	TexCoord2dv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		102
+
+TexCoord2dv(v)
+	return		void
+	param		v		CoordD in array [2]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	53
+	offset		103
+
+TexCoord2f(s, t)
+	return		void
+	param		s		CoordF in value
+	param		t		CoordF in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	TexCoord2fv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		104
+
+TexCoord2fv(v)
+	return		void
+	param		v		CoordF in array [2]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	54
+	offset		105
+
+TexCoord2i(s, t)
+	return		void
+	param		s		CoordI in value
+	param		t		CoordI in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	TexCoord2iv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		106
+
+TexCoord2iv(v)
+	return		void
+	param		v		CoordI in array [2]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	55
+	offset		107
+
+TexCoord2s(s, t)
+	return		void
+	param		s		CoordS in value
+	param		t		CoordS in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	TexCoord2sv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		108
+
+TexCoord2sv(v)
+	return		void
+	param		v		CoordS in array [2]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	56
+	offset		109
+
+TexCoord3d(s, t, r)
+	return		void
+	param		s		CoordD in value
+	param		t		CoordD in value
+	param		r		CoordD in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	TexCoord3dv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		110
+
+TexCoord3dv(v)
+	return		void
+	param		v		CoordD in array [3]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	57
+	offset		111
+
+TexCoord3f(s, t, r)
+	return		void
+	param		s		CoordF in value
+	param		t		CoordF in value
+	param		r		CoordF in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	TexCoord3fv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		112
+
+TexCoord3fv(v)
+	return		void
+	param		v		CoordF in array [3]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	58
+	offset		113
+
+TexCoord3i(s, t, r)
+	return		void
+	param		s		CoordI in value
+	param		t		CoordI in value
+	param		r		CoordI in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	TexCoord3iv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		114
+
+TexCoord3iv(v)
+	return		void
+	param		v		CoordI in array [3]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	59
+	offset		115
+
+TexCoord3s(s, t, r)
+	return		void
+	param		s		CoordS in value
+	param		t		CoordS in value
+	param		r		CoordS in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	TexCoord3sv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		116
+
+TexCoord3sv(v)
+	return		void
+	param		v		CoordS in array [3]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	60
+	offset		117
+
+TexCoord4d(s, t, r, q)
+	return		void
+	param		s		CoordD in value
+	param		t		CoordD in value
+	param		r		CoordD in value
+	param		q		CoordD in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	TexCoord4dv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		118
+
+TexCoord4dv(v)
+	return		void
+	param		v		CoordD in array [4]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	61
+	offset		119
+
+TexCoord4f(s, t, r, q)
+	return		void
+	param		s		CoordF in value
+	param		t		CoordF in value
+	param		r		CoordF in value
+	param		q		CoordF in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	TexCoord4fv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		120
+
+TexCoord4fv(v)
+	return		void
+	param		v		CoordF in array [4]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	62
+	offset		121
+
+TexCoord4i(s, t, r, q)
+	return		void
+	param		s		CoordI in value
+	param		t		CoordI in value
+	param		r		CoordI in value
+	param		q		CoordI in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	TexCoord4iv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		122
+
+TexCoord4iv(v)
+	return		void
+	param		v		CoordI in array [4]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	63
+	offset		123
+
+TexCoord4s(s, t, r, q)
+	return		void
+	param		s		CoordS in value
+	param		t		CoordS in value
+	param		r		CoordS in value
+	param		q		CoordS in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	TexCoord4sv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		124
+
+TexCoord4sv(v)
+	return		void
+	param		v		CoordS in array [4]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	64
+	offset		125
+
+Vertex2d(x, y)
+	return		void
+	param		x		CoordD in value
+	param		y		CoordD in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Vertex2dv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		126
+
+Vertex2dv(v)
+	return		void
+	param		v		CoordD in array [2]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	65
+	offset		127
+
+Vertex2f(x, y)
+	return		void
+	param		x		CoordF in value
+	param		y		CoordF in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Vertex2fv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		128
+
+Vertex2fv(v)
+	return		void
+	param		v		CoordF in array [2]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	66
+	offset		129
+
+Vertex2i(x, y)
+	return		void
+	param		x		CoordI in value
+	param		y		CoordI in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Vertex2iv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		130
+
+Vertex2iv(v)
+	return		void
+	param		v		CoordI in array [2]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	67
+	offset		131
+
+Vertex2s(x, y)
+	return		void
+	param		x		CoordS in value
+	param		y		CoordS in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Vertex2sv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		132
+
+Vertex2sv(v)
+	return		void
+	param		v		CoordS in array [2]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	68
+	offset		133
+
+Vertex3d(x, y, z)
+	return		void
+	param		x		CoordD in value
+	param		y		CoordD in value
+	param		z		CoordD in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Vertex3dv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		134
+
+Vertex3dv(v)
+	return		void
+	param		v		CoordD in array [3]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	69
+	offset		135
+
+Vertex3f(x, y, z)
+	return		void
+	param		x		CoordF in value
+	param		y		CoordF in value
+	param		z		CoordF in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Vertex3fv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		136
+
+Vertex3fv(v)
+	return		void
+	param		v		CoordF in array [3]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	70
+	offset		137
+
+Vertex3i(x, y, z)
+	return		void
+	param		x		CoordI in value
+	param		y		CoordI in value
+	param		z		CoordI in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Vertex3iv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		138
+
+Vertex3iv(v)
+	return		void
+	param		v		CoordI in array [3]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	71
+	offset		139
+
+Vertex3s(x, y, z)
+	return		void
+	param		x		CoordS in value
+	param		y		CoordS in value
+	param		z		CoordS in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Vertex3sv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		140
+
+Vertex3sv(v)
+	return		void
+	param		v		CoordS in array [3]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	72
+	offset		141
+
+Vertex4d(x, y, z, w)
+	return		void
+	param		x		CoordD in value
+	param		y		CoordD in value
+	param		z		CoordD in value
+	param		w		CoordD in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Vertex4dv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		142
+
+Vertex4dv(v)
+	return		void
+	param		v		CoordD in array [4]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	73
+	offset		143
+
+Vertex4f(x, y, z, w)
+	return		void
+	param		x		CoordF in value
+	param		y		CoordF in value
+	param		z		CoordF in value
+	param		w		CoordF in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Vertex4fv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		144
+
+Vertex4fv(v)
+	return		void
+	param		v		CoordF in array [4]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	74
+	offset		145
+
+Vertex4i(x, y, z, w)
+	return		void
+	param		x		CoordI in value
+	param		y		CoordI in value
+	param		z		CoordI in value
+	param		w		CoordI in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Vertex4iv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		146
+
+Vertex4iv(v)
+	return		void
+	param		v		CoordI in array [4]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	75
+	offset		147
+
+Vertex4s(x, y, z, w)
+	return		void
+	param		x		CoordS in value
+	param		y		CoordS in value
+	param		z		CoordS in value
+	param		w		CoordS in value
+	category	VERSION_1_0		   # old: drawing
+	vectorequiv	Vertex4sv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		148
+
+Vertex4sv(v)
+	return		void
+	param		v		CoordS in array [4]
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	76
+	offset		149
+
+ClipPlane(plane, equation)
+	return		void
+	param		plane		ClipPlaneName in value
+	param		equation	Float64 in array [4]
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	77
+	offset		150
+
+ColorMaterial(face, mode)
+	return		void
+	param		face		MaterialFace in value
+	param		mode		ColorMaterialParameter in value
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	78
+	offset		151
+
+Fogf(pname, param)
+	return		void
+	param		pname		FogParameter in value
+	param		param		CheckedFloat32 in value
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	80
+	wglflags	small-data
+	offset		153
+
+Fogfv(pname, params)
+	return		void
+	param		pname		FogParameter in value
+	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	81
+	wglflags	small-data
+	offset		154
+
+Fogi(pname, param)
+	return		void
+	param		pname		FogParameter in value
+	param		param		CheckedInt32 in value
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	82
+	wglflags	small-data
+	offset		155
+
+Fogiv(pname, params)
+	return		void
+	param		pname		FogParameter in value
+	param		params		CheckedInt32 in array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	83
+	wglflags	small-data
+	offset		156
+
+Lightf(light, pname, param)
+	return		void
+	param		light		LightName in value
+	param		pname		LightParameter in value
+	param		param		CheckedFloat32 in value
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	86
+	wglflags	small-data
+	offset		159
+
+Lightfv(light, pname, params)
+	return		void
+	param		light		LightName in value
+	param		pname		LightParameter in value
+	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	87
+	wglflags	small-data
+	offset		160
+
+Lighti(light, pname, param)
+	return		void
+	param		light		LightName in value
+	param		pname		LightParameter in value
+	param		param		CheckedInt32 in value
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	88
+	wglflags	small-data
+	offset		161
+
+Lightiv(light, pname, params)
+	return		void
+	param		light		LightName in value
+	param		pname		LightParameter in value
+	param		params		CheckedInt32 in array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	89
+	wglflags	small-data
+	offset		162
+
+LightModelf(pname, param)
+	return		void
+	param		pname		LightModelParameter in value
+	param		param		Float32 in value
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	90
+	wglflags	small-data
+	offset		163
+
+LightModelfv(pname, params)
+	return		void
+	param		pname		LightModelParameter in value
+	param		params		Float32 in array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	91
+	wglflags	small-data
+	offset		164
+
+LightModeli(pname, param)
+	return		void
+	param		pname		LightModelParameter in value
+	param		param		Int32 in value
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	92
+	wglflags	small-data
+	offset		165
+
+LightModeliv(pname, params)
+	return		void
+	param		pname		LightModelParameter in value
+	param		params		Int32 in array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	93
+	wglflags	small-data
+	offset		166
+
+LineStipple(factor, pattern)
+	return		void
+	param		factor		CheckedInt32 in value
+	param		pattern		LineStipple in value
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	94
+	offset		167
+
+Materialf(face, pname, param)
+	return		void
+	param		face		MaterialFace in value
+	param		pname		MaterialParameter in value
+	param		param		CheckedFloat32 in value
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	96
+	wglflags	small-data
+	offset		169
+
+Materialfv(face, pname, params)
+	return		void
+	param		face		MaterialFace in value
+	param		pname		MaterialParameter in value
+	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	97
+	wglflags	small-data
+	offset		170
+
+Materiali(face, pname, param)
+	return		void
+	param		face		MaterialFace in value
+	param		pname		MaterialParameter in value
+	param		param		CheckedInt32 in value
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	98
+	wglflags	small-data
+	offset		171
+
+Materialiv(face, pname, params)
+	return		void
+	param		face		MaterialFace in value
+	param		pname		MaterialParameter in value
+	param		params		CheckedInt32 in array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	99
+	wglflags	small-data
+	offset		172
+
+PolygonStipple(mask)
+	return		void
+	param		mask		UInt8 in array [COMPSIZE()]
+	category	VERSION_1_0		   # old: drawing-control
+	dlflags		handcode
+	glxflags	client-handcode server-handcode
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	102
+	wglflags	client-handcode server-handcode
+	offset		175
+
+ShadeModel(mode)
+	return		void
+	param		mode		ShadingModel in value
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	104
+	offset		177
+
+TexEnvf(target, pname, param)
+	return		void
+	param		target		TextureEnvTarget in value
+	param		pname		TextureEnvParameter in value
+	param		param		CheckedFloat32 in value
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	111
+	wglflags	small-data
+	offset		184
+
+TexEnvfv(target, pname, params)
+	return		void
+	param		target		TextureEnvTarget in value
+	param		pname		TextureEnvParameter in value
+	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	112
+	wglflags	small-data
+	offset		185
+
+TexEnvi(target, pname, param)
+	return		void
+	param		target		TextureEnvTarget in value
+	param		pname		TextureEnvParameter in value
+	param		param		CheckedInt32 in value
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	113
+	wglflags	small-data
+	offset		186
+
+TexEnviv(target, pname, params)
+	return		void
+	param		target		TextureEnvTarget in value
+	param		pname		TextureEnvParameter in value
+	param		params		CheckedInt32 in array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	114
+	wglflags	small-data
+	offset		187
+
+TexGend(coord, pname, param)
+	return		void
+	param		coord		TextureCoordName in value
+	param		pname		TextureGenParameter in value
+	param		param		Float64 in value
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	115
+	wglflags	small-data
+	offset		188
+
+TexGendv(coord, pname, params)
+	return		void
+	param		coord		TextureCoordName in value
+	param		pname		TextureGenParameter in value
+	param		params		Float64 in array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	116
+	wglflags	small-data
+	offset		189
+
+TexGenf(coord, pname, param)
+	return		void
+	param		coord		TextureCoordName in value
+	param		pname		TextureGenParameter in value
+	param		param		CheckedFloat32 in value
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	117
+	wglflags	small-data
+	offset		190
+
+TexGenfv(coord, pname, params)
+	return		void
+	param		coord		TextureCoordName in value
+	param		pname		TextureGenParameter in value
+	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	118
+	wglflags	small-data
+	offset		191
+
+TexGeni(coord, pname, param)
+	return		void
+	param		coord		TextureCoordName in value
+	param		pname		TextureGenParameter in value
+	param		param		CheckedInt32 in value
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	119
+	wglflags	small-data
+	offset		192
+
+TexGeniv(coord, pname, params)
+	return		void
+	param		coord		TextureCoordName in value
+	param		pname		TextureGenParameter in value
+	param		params		CheckedInt32 in array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	120
+	wglflags	small-data
+	offset		193
+
+# feedback commands
+
+FeedbackBuffer(size, type, buffer)
+	return		void
+	param		size		SizeI in value
+	param		type		FeedbackType in value
+	param		buffer		FeedbackElement out array [size] retained
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode
+	category	VERSION_1_0		   # old: feedback
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxsingle	105
+	wglflags	client-handcode server-handcode batchable
+	offset		194
+
+SelectBuffer(size, buffer)
+	return		void
+	param		size		SizeI in value
+	param		buffer		SelectName out array [size] retained
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode
+	category	VERSION_1_0		   # old: feedback
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxsingle	106
+	wglflags	client-handcode server-handcode batchable
+	offset		195
+
+RenderMode(mode)
+	return		Int32
+	param		mode		RenderingMode in value
+	category	VERSION_1_0		   # old: feedback
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxsingle	107
+	wglflags	client-handcode server-handcode
+	offset		196
+
+InitNames()
+	return		void
+	category	VERSION_1_0		   # old: feedback
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	121
+	offset		197
+
+LoadName(name)
+	return		void
+	param		name		SelectName in value
+	category	VERSION_1_0		   # old: feedback
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	122
+	offset		198
+
+PassThrough(token)
+	return		void
+	param		token		FeedbackElement in value
+	category	VERSION_1_0		   # old: feedback
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	123
+	offset		199
+
+PopName()
+	return		void
+	category	VERSION_1_0		   # old: feedback
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	124
+	offset		200
+
+PushName(name)
+	return		void
+	param		name		SelectName in value
+	category	VERSION_1_0		   # old: feedback
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	125
+	offset		201
+
+ClearAccum(red, green, blue, alpha)
+	return		void
+	param		red		Float32 in value
+	param		green		Float32 in value
+	param		blue		Float32 in value
+	param		alpha		Float32 in value
+	category	VERSION_1_0		   # old: framebuf
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	128
+	offset		204
+
+ClearIndex(c)
+	return		void
+	param		c		MaskedColorIndexValueF in value
+	category	VERSION_1_0		   # old: framebuf
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	129
+	offset		205
+
+IndexMask(mask)
+	return		void
+	param		mask		MaskedColorIndexValueI in value
+	category	VERSION_1_0		   # old: framebuf
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	136
+	offset		212
+
+Accum(op, value)
+	return		void
+	param		op		AccumOp in value
+	param		value		CoordF in value
+	category	VERSION_1_0		   # old: misc
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	137
+	offset		213
+
+PopAttrib()
+	return		void
+	category	VERSION_1_0		   # old: misc
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	141
+	offset		218
+
+PushAttrib(mask)
+	return		void
+	param		mask		AttribMask in value
+	category	VERSION_1_0		   # old: misc
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	142
+	offset		219
+
+# modeling commands
+
+Map1d(target, u1, u2, stride, order, points)
+	return		void
+	param		target		MapTarget in value
+	param		u1		CoordD in value
+	param		u2		CoordD in value
+	param		stride		Int32 in value
+	param		order		CheckedInt32 in value
+	param		points		CoordD in array [COMPSIZE(target/stride/order)]
+	category	VERSION_1_0		   # old: modeling
+	dlflags		handcode
+	glxflags	client-handcode server-handcode
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	143
+	wglflags	client-handcode server-handcode
+	offset		220
+
+Map1f(target, u1, u2, stride, order, points)
+	return		void
+	param		target		MapTarget in value
+	param		u1		CoordF in value
+	param		u2		CoordF in value
+	param		stride		Int32 in value
+	param		order		CheckedInt32 in value
+	param		points		CoordF in array [COMPSIZE(target/stride/order)]
+	category	VERSION_1_0		   # old: modeling
+	dlflags		handcode
+	glxflags	client-handcode server-handcode
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	144
+	wglflags	client-handcode server-handcode
+	offset		221
+
+Map2d(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points)
+	return		void
+	param		target		MapTarget in value
+	param		u1		CoordD in value
+	param		u2		CoordD in value
+	param		ustride		Int32 in value
+	param		uorder		CheckedInt32 in value
+	param		v1		CoordD in value
+	param		v2		CoordD in value
+	param		vstride		Int32 in value
+	param		vorder		CheckedInt32 in value
+	param		points		CoordD in array [COMPSIZE(target/ustride/uorder/vstride/vorder)]
+	category	VERSION_1_0		   # old: modeling
+	dlflags		handcode
+	glxflags	client-handcode server-handcode
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	145
+	wglflags	client-handcode server-handcode
+	offset		222
+
+Map2f(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points)
+	return		void
+	param		target		MapTarget in value
+	param		u1		CoordF in value
+	param		u2		CoordF in value
+	param		ustride		Int32 in value
+	param		uorder		CheckedInt32 in value
+	param		v1		CoordF in value
+	param		v2		CoordF in value
+	param		vstride		Int32 in value
+	param		vorder		CheckedInt32 in value
+	param		points		CoordF in array [COMPSIZE(target/ustride/uorder/vstride/vorder)]
+	category	VERSION_1_0		   # old: modeling
+	dlflags		handcode
+	glxflags	client-handcode server-handcode
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	146
+	wglflags	client-handcode server-handcode
+	offset		223
+
+MapGrid1d(un, u1, u2)
+	return		void
+	param		un		Int32 in value
+	param		u1		CoordD in value
+	param		u2		CoordD in value
+	category	VERSION_1_0		   # old: modeling
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	147
+	offset		224
+
+MapGrid1f(un, u1, u2)
+	return		void
+	param		un		Int32 in value
+	param		u1		CoordF in value
+	param		u2		CoordF in value
+	category	VERSION_1_0		   # old: modeling
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	148
+	offset		225
+
+MapGrid2d(un, u1, u2, vn, v1, v2)
+	return		void
+	param		un		Int32 in value
+	param		u1		CoordD in value
+	param		u2		CoordD in value
+	param		vn		Int32 in value
+	param		v1		CoordD in value
+	param		v2		CoordD in value
+	category	VERSION_1_0		   # old: modeling
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	149
+	offset		226
+
+MapGrid2f(un, u1, u2, vn, v1, v2)
+	return		void
+	param		un		Int32 in value
+	param		u1		CoordF in value
+	param		u2		CoordF in value
+	param		vn		Int32 in value
+	param		v1		CoordF in value
+	param		v2		CoordF in value
+	category	VERSION_1_0		   # old: modeling
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	150
+	offset		227
+
+EvalCoord1d(u)
+	return		void
+	param		u		CoordD in value
+	category	VERSION_1_0		   # old: modeling
+	vectorequiv	EvalCoord1dv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		228
+
+EvalCoord1dv(u)
+	return		void
+	param		u		CoordD in array [1]
+	category	VERSION_1_0		   # old: modeling
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	151
+	offset		229
+
+EvalCoord1f(u)
+	return		void
+	param		u		CoordF in value
+	category	VERSION_1_0		   # old: modeling
+	vectorequiv	EvalCoord1fv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		230
+
+EvalCoord1fv(u)
+	return		void
+	param		u		CoordF in array [1]
+	category	VERSION_1_0		   # old: modeling
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	152
+	offset		231
+
+EvalCoord2d(u, v)
+	return		void
+	param		u		CoordD in value
+	param		v		CoordD in value
+	category	VERSION_1_0		   # old: modeling
+	vectorequiv	EvalCoord2dv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		232
+
+EvalCoord2dv(u)
+	return		void
+	param		u		CoordD in array [2]
+	category	VERSION_1_0		   # old: modeling
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	153
+	offset		233
+
+EvalCoord2f(u, v)
+	return		void
+	param		u		CoordF in value
+	param		v		CoordF in value
+	category	VERSION_1_0		   # old: modeling
+	vectorequiv	EvalCoord2fv
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	offset		234
+
+EvalCoord2fv(u)
+	return		void
+	param		u		CoordF in array [2]
+	category	VERSION_1_0		   # old: modeling
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	154
+	offset		235
+
+EvalMesh1(mode, i1, i2)
+	return		void
+	param		mode		MeshMode1 in value
+	param		i1		CheckedInt32 in value
+	param		i2		CheckedInt32 in value
+	category	VERSION_1_0		   # old: modeling
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	155
+	offset		236
+
+EvalPoint1(i)
+	return		void
+	param		i		Int32 in value
+	category	VERSION_1_0		   # old: modeling
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	156
+	offset		237
+
+EvalMesh2(mode, i1, i2, j1, j2)
+	return		void
+	param		mode		MeshMode2 in value
+	param		i1		CheckedInt32 in value
+	param		i2		CheckedInt32 in value
+	param		j1		CheckedInt32 in value
+	param		j2		CheckedInt32 in value
+	category	VERSION_1_0		   # old: modeling
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	157
+	offset		238
+
+EvalPoint2(i, j)
+	return		void
+	param		i		CheckedInt32 in value
+	param		j		CheckedInt32 in value
+	category	VERSION_1_0		   # old: modeling
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	158
+	offset		239
+
+AlphaFunc(func, ref)
+	return		void
+	param		func		AlphaFunction in value
+	param		ref		Float32 in value
+	category	VERSION_1_0		   # old: pixel-op
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	159
+	offset		240
+
+PixelZoom(xfactor, yfactor)
+	return		void
+	param		xfactor		Float32 in value
+	param		yfactor		Float32 in value
+	category	VERSION_1_0		   # old: pixel-rw
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	165
+	offset		246
+
+PixelTransferf(pname, param)
+	return		void
+	param		pname		PixelTransferParameter in value
+	param		param		CheckedFloat32 in value
+	category	VERSION_1_0		   # old: pixel-rw
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	166
+	offset		247
+
+PixelTransferi(pname, param)
+	return		void
+	param		pname		PixelTransferParameter in value
+	param		param		CheckedInt32 in value
+	category	VERSION_1_0		   # old: pixel-rw
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	167
+	offset		248
+
+PixelMapfv(map, mapsize, values)
+	return		void
+	param		map		PixelMap in value
+	param		mapsize		CheckedInt32 in value
+	param		values		Float32 in array [mapsize]
+	category	VERSION_1_0		   # old: pixel-rw
+	glxflags	client-handcode
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	168
+	offset		251
+
+PixelMapuiv(map, mapsize, values)
+	return		void
+	param		map		PixelMap in value
+	param		mapsize		CheckedInt32 in value
+	param		values		UInt32 in array [mapsize]
+	category	VERSION_1_0		   # old: pixel-rw
+	glxflags	client-handcode
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	169
+	offset		252
+
+PixelMapusv(map, mapsize, values)
+	return		void
+	param		map		PixelMap in value
+	param		mapsize		CheckedInt32 in value
+	param		values		UInt16 in array [mapsize]
+	category	VERSION_1_0		   # old: pixel-rw
+	glxflags	client-handcode
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	170
+	offset		253
+
+CopyPixels(x, y, width, height, type)
+	return		void
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		type		PixelCopyType in value
+	category	VERSION_1_0		   # old: pixel-rw
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	172
+	offset		255
+
+DrawPixels(width, height, format, type, pixels)
+	return		void
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void in array [COMPSIZE(format/type/width/height)]
+	category	VERSION_1_0		   # old: pixel-rw
+	dlflags		handcode
+	glxflags	client-handcode server-handcode
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	173
+	wglflags	client-handcode server-handcode
+	offset		257
+
+GetClipPlane(plane, equation)
+	return		void
+	param		plane		ClipPlaneName in value
+	param		equation	Float64 out array [4]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxsingle	113
+	glxflags	client-handcode server-handcode
+	offset		259
+
+GetLightfv(light, pname, params)
+	return		void
+	param		light		LightName in value
+	param		pname		LightParameter in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxsingle	118
+	wglflags	small-data
+	offset		264
+
+GetLightiv(light, pname, params)
+	return		void
+	param		light		LightName in value
+	param		pname		LightParameter in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxsingle	119
+	wglflags	small-data
+	offset		265
+
+GetMapdv(target, query, v)
+	return		void
+	param		target		MapTarget in value
+	param		query		GetMapQuery in value
+	param		v		Float64 out array [COMPSIZE(target/query)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxsingle	120
+	offset		266
+
+GetMapfv(target, query, v)
+	return		void
+	param		target		MapTarget in value
+	param		query		GetMapQuery in value
+	param		v		Float32 out array [COMPSIZE(target/query)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxsingle	121
+	offset		267
+
+GetMapiv(target, query, v)
+	return		void
+	param		target		MapTarget in value
+	param		query		GetMapQuery in value
+	param		v		Int32 out array [COMPSIZE(target/query)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxsingle	122
+	offset		268
+
+GetMaterialfv(face, pname, params)
+	return		void
+	param		face		MaterialFace in value
+	param		pname		MaterialParameter in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxsingle	123
+	wglflags	small-data
+	offset		269
+
+GetMaterialiv(face, pname, params)
+	return		void
+	param		face		MaterialFace in value
+	param		pname		MaterialParameter in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxsingle	124
+	wglflags	small-data
+	offset		270
+
+GetPixelMapfv(map, values)
+	return		void
+	param		map		PixelMap in value
+	param		values		Float32 out array [COMPSIZE(map)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxsingle	125
+	offset		271
+
+GetPixelMapuiv(map, values)
+	return		void
+	param		map		PixelMap in value
+	param		values		UInt32 out array [COMPSIZE(map)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxsingle	126
+	offset		272
+
+GetPixelMapusv(map, values)
+	return		void
+	param		map		PixelMap in value
+	param		values		UInt16 out array [COMPSIZE(map)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxsingle	127
+	offset		273
+
+GetPolygonStipple(mask)
+	return		void
+	param		mask		UInt8 out array [COMPSIZE()]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxsingle	128
+	wglflags	client-handcode server-handcode
+	offset		274
+
+GetTexEnvfv(target, pname, params)
+	return		void
+	param		target		TextureEnvTarget in value
+	param		pname		TextureEnvParameter in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxsingle	130
+	wglflags	small-data
+	offset		276
+
+GetTexEnviv(target, pname, params)
+	return		void
+	param		target		TextureEnvTarget in value
+	param		pname		TextureEnvParameter in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxsingle	131
+	wglflags	small-data
+	offset		277
+
+GetTexGendv(coord, pname, params)
+	return		void
+	param		coord		TextureCoordName in value
+	param		pname		TextureGenParameter in value
+	param		params		Float64 out array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxsingle	132
+	wglflags	small-data
+	offset		278
+
+GetTexGenfv(coord, pname, params)
+	return		void
+	param		coord		TextureCoordName in value
+	param		pname		TextureGenParameter in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxsingle	133
+	wglflags	small-data
+	offset		279
+
+GetTexGeniv(coord, pname, params)
+	return		void
+	param		coord		TextureCoordName in value
+	param		pname		TextureGenParameter in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxsingle	134
+	wglflags	small-data
+	offset		280
+
+IsList(list)
+	return		Boolean
+	param		list		List in value
+	category	VERSION_1_0		   # old: state-req
+	dlflags		notlistable
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxsingle	141
+	offset		287
+
+Frustum(left, right, bottom, top, zNear, zFar)
+	return		void
+	param		left		Float64 in value
+	param		right		Float64 in value
+	param		bottom		Float64 in value
+	param		top		Float64 in value
+	param		zNear		Float64 in value
+	param		zFar		Float64 in value
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	175
+	offset		289
+
+LoadIdentity()
+	return		void
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	176
+	offset		290
+
+LoadMatrixf(m)
+	return		void
+	param		m		Float32 in array [16]
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	177
+	offset		291
+
+LoadMatrixd(m)
+	return		void
+	param		m		Float64 in array [16]
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	178
+	offset		292
+
+MatrixMode(mode)
+	return		void
+	param		mode		MatrixMode in value
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	179
+	offset		293
+
+MultMatrixf(m)
+	return		void
+	param		m		Float32 in array [16]
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	180
+	offset		294
+
+MultMatrixd(m)
+	return		void
+	param		m		Float64 in array [16]
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	181
+	offset		295
+
+Ortho(left, right, bottom, top, zNear, zFar)
+	return		void
+	param		left		Float64 in value
+	param		right		Float64 in value
+	param		bottom		Float64 in value
+	param		top		Float64 in value
+	param		zNear		Float64 in value
+	param		zFar		Float64 in value
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	182
+	offset		296
+
+PopMatrix()
+	return		void
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	183
+	offset		297
+
+PushMatrix()
+	return		void
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	184
+	offset		298
+
+Rotated(angle, x, y, z)
+	return		void
+	param		angle		Float64 in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	param		z		Float64 in value
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	185
+	offset		299
+
+Rotatef(angle, x, y, z)
+	return		void
+	param		angle		Float32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	186
+	offset		300
+
+Scaled(x, y, z)
+	return		void
+	param		x		Float64 in value
+	param		y		Float64 in value
+	param		z		Float64 in value
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	187
+	offset		301
+
+Scalef(x, y, z)
+	return		void
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	188
+	offset		302
+
+Translated(x, y, z)
+	return		void
+	param		x		Float64 in value
+	param		y		Float64 in value
+	param		z		Float64 in value
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	189
+	offset		303
+
+Translatef(x, y, z)
+	return		void
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
+	version		1.0
+	deprecated	3.1
+	glxropcode	190
+	offset		304
+
+###############################################################################
+###############################################################################
+#
+# OpenGL 1.1 commands
+#
+###############################################################################
+###############################################################################
+
+DrawArrays(mode, first, count)
+	return		void
+	param		mode		BeginMode in value
+	param		first		Int32 in value
+	param		count		SizeI in value
+	category	VERSION_1_1
+	dlflags		handcode
+	glxflags	client-handcode client-intercept server-handcode
+	version		1.1
+	glxropcode	193
+	offset		310
+
+DrawElements(mode, count, type, indices)
+	return		void
+	param		mode		BeginMode in value
+	param		count		SizeI in value
+	param		type		DrawElementsType in value
+	param		indices		Void in array [COMPSIZE(count/type)]
+	category	VERSION_1_1
+	dlflags		handcode
+	glxflags	client-handcode client-intercept server-handcode
+	version		1.1
+	offset		311
+
+GetPointerv(pname, params)
+	return		void
+	param		pname		GetPointervPName in value
+	param		params		VoidPointer out reference
+	category	VERSION_1_1
+	dlflags		notlistable
+	glxflags	client-handcode client-intercept server-handcode
+	version		1.1
+	offset		329
+
+PolygonOffset(factor, units)
+	return		void
+	param		factor		Float32 in value
+	param		units		Float32 in value
+	category	VERSION_1_1
+	version		1.1
+	glxropcode	192
+	offset		319
+
+# Arguably TexelInternalFormat, not PixelInternalFormat
+CopyTexImage1D(target, level, internalformat, x, y, width, border)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	PixelInternalFormat in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	param		border		CheckedInt32 in value
+	category	VERSION_1_1
+	version		1.1
+	glxropcode	4119
+	glxflags	EXT
+	offset		323
+
+# Arguably TexelInternalFormat, not PixelInternalFormat
+CopyTexImage2D(target, level, internalformat, x, y, width, height, border)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	PixelInternalFormat in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		border		CheckedInt32 in value
+	category	VERSION_1_1
+	version		1.1
+	glxropcode	4120
+	glxflags	EXT
+	offset		324
+
+CopyTexSubImage1D(target, level, xoffset, x, y, width)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	category	VERSION_1_1
+	version		1.1
+	glxropcode	4121
+	glxflags	EXT
+	offset		325
+
+CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		yoffset		CheckedInt32 in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	category	VERSION_1_1
+	version		1.1
+	glxropcode	4122
+	glxflags	EXT
+	offset		326
+
+TexSubImage1D(target, level, xoffset, width, format, type, pixels)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		width		SizeI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void in array [COMPSIZE(format/type/width)]
+	category	VERSION_1_1
+	dlflags		handcode
+	glxflags	EXT client-handcode server-handcode
+	version		1.1
+	glxropcode	4099
+	offset		332
+
+TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		yoffset		CheckedInt32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void in array [COMPSIZE(format/type/width/height)]
+	category	VERSION_1_1
+	dlflags		handcode
+	glxflags	EXT client-handcode server-handcode
+	version		1.1
+	glxropcode	4100
+	offset		333
+
+BindTexture(target, texture)
+	return		void
+	param		target		TextureTarget in value
+	param		texture		Texture in value
+	category	VERSION_1_1
+	version		1.1
+	glxropcode	4117
+	glxflags	EXT
+	offset		307
+
+DeleteTextures(n, textures)
+	return		void
+	param		n		SizeI in value
+	param		textures	Texture in array [n]
+	category	VERSION_1_1
+	dlflags		notlistable
+	version		1.1
+	glxsingle	144
+	offset		327
+
+GenTextures(n, textures)
+	return		void
+	param		n		SizeI in value
+	param		textures	Texture out array [n]
+	category	VERSION_1_1
+	dlflags		notlistable
+	version		1.1
+	glxsingle	145
+	offset		328
+
+IsTexture(texture)
+	return		Boolean
+	param		texture		Texture in value
+	category	VERSION_1_1
+	dlflags		notlistable
+	version		1.1
+	glxsingle	146
+	offset		330
+
+###############################################################################
+###############################################################################
+#
+# OpenGL 1.1 deprecated commands
+#
+###############################################################################
+###############################################################################
+
+ArrayElement(i)
+	return		void
+	param		i		Int32 in value
+	category	VERSION_1_1
+	profile		compatibility
+	dlflags		handcode
+	glxflags	client-handcode client-intercept server-handcode
+	version		1.1
+	deprecated	3.1
+	offset		306
+
+ColorPointer(size, type, stride, pointer)
+	return		void
+	param		size		Int32 in value
+	param		type		ColorPointerType in value
+	param		stride		SizeI in value
+	param		pointer		Void in array [COMPSIZE(size/type/stride)] retained
+	category	VERSION_1_1
+	profile		compatibility
+	dlflags		notlistable
+	glxflags	client-handcode client-intercept server-handcode
+	version		1.1
+	deprecated	3.1
+	offset		308
+
+DisableClientState(array)
+	return		void
+	param		array		EnableCap in value
+	category	VERSION_1_1
+	profile		compatibility
+	version		1.1
+	deprecated	3.1
+	dlflags		notlistable
+	glxflags	client-handcode client-intercept server-handcode
+	offset		309
+
+EdgeFlagPointer(stride, pointer)
+	return		void
+	param		stride		SizeI in value
+	param		pointer		Void in array [COMPSIZE(stride)] retained
+	category	VERSION_1_1
+	profile		compatibility
+	dlflags		notlistable
+	glxflags	client-handcode client-intercept server-handcode
+	version		1.1
+	deprecated	3.1
+	offset		312
+
+EnableClientState(array)
+	return		void
+	param		array		EnableCap in value
+	category	VERSION_1_1
+	profile		compatibility
+	dlflags		notlistable
+	glxflags	client-handcode client-intercept server-handcode
+	version		1.1
+	deprecated	3.1
+	offset		313
+
+IndexPointer(type, stride, pointer)
+	return		void
+	param		type		IndexPointerType in value
+	param		stride		SizeI in value
+	param		pointer		Void in array [COMPSIZE(type/stride)] retained
+	category	VERSION_1_1
+	profile		compatibility
+	dlflags		notlistable
+	glxflags	client-handcode client-intercept server-handcode
+	version		1.1
+	deprecated	3.1
+	offset		314
+
+InterleavedArrays(format, stride, pointer)
+	return		void
+	param		format		InterleavedArrayFormat in value
+	param		stride		SizeI in value
+	param		pointer		Void in array [COMPSIZE(format/stride)] retained
+	category	VERSION_1_1
+	profile		compatibility
+	dlflags		notlistable
+	glxflags	client-handcode client-intercept server-handcode
+	version		1.1
+	deprecated	3.1
+	offset		317
+
+NormalPointer(type, stride, pointer)
+	return		void
+	param		type		NormalPointerType in value
+	param		stride		SizeI in value
+	param		pointer		Void in array [COMPSIZE(type/stride)] retained
+	category	VERSION_1_1
+	profile		compatibility
+	dlflags		notlistable
+	glxflags	client-handcode client-intercept server-handcode
+	version		1.1
+	deprecated	3.1
+	offset		318
+
+TexCoordPointer(size, type, stride, pointer)
+	return		void
+	param		size		Int32 in value
+	param		type		TexCoordPointerType in value
+	param		stride		SizeI in value
+	param		pointer		Void in array [COMPSIZE(size/type/stride)] retained
+	category	VERSION_1_1
+	profile		compatibility
+	dlflags		notlistable
+	glxflags	client-handcode client-intercept server-handcode
+	version		1.1
+	deprecated	3.1
+	offset		320
+
+VertexPointer(size, type, stride, pointer)
+	return		void
+	param		size		Int32 in value
+	param		type		VertexPointerType in value
+	param		stride		SizeI in value
+	param		pointer		Void in array [COMPSIZE(size/type/stride)] retained
+	category	VERSION_1_1
+	profile		compatibility
+	dlflags		notlistable
+	glxflags	client-handcode client-intercept server-handcode
+	version		1.1
+	deprecated	3.1
+	offset		321
+
+AreTexturesResident(n, textures, residences)
+	return		Boolean
+	param		n		SizeI in value
+	param		textures	Texture in array [n]
+	param		residences	Boolean out array [n]
+	category	VERSION_1_1
+	profile		compatibility
+	glxsingle	143
+	dlflags		notlistable
+	version		1.1
+	deprecated	3.1
+	offset		322
+
+PrioritizeTextures(n, textures, priorities)
+	return		void
+	param		n		SizeI in value
+	param		textures	Texture in array [n]
+	param		priorities	Float32 in array [n]
+	category	VERSION_1_1
+	profile		compatibility
+	version		1.1
+	deprecated	3.1
+	glxropcode	4118
+	glxflags	EXT
+	offset		331
+
+Indexub(c)
+	return		void
+	param		c		ColorIndexValueUB in value
+	category	VERSION_1_1
+	profile		compatibility
+	vectorequiv	Indexubv
+	version		1.1
+	offset		315
+
+Indexubv(c)
+	return		void
+	param		c		ColorIndexValueUB in array [1]
+	category	VERSION_1_1
+	profile		compatibility
+	version		1.1
+	glxropcode	194
+	offset		316
+
+PopClientAttrib()
+	return		void
+	category	VERSION_1_1
+	profile		compatibility
+	version		1.1
+	deprecated	3.1
+	dlflags		notlistable
+	glxflags	client-handcode client-intercept server-handcode
+	offset		334
+
+PushClientAttrib(mask)
+	return		void
+	param		mask		ClientAttribMask in value
+	category	VERSION_1_1
+	profile		compatibility
+	version		1.1
+	deprecated	3.1
+	dlflags		notlistable
+	glxflags	client-handcode client-intercept server-handcode
+	offset		335
+
+###############################################################################
+###############################################################################
+#
+# OpenGL 1.2 commands
+#
+###############################################################################
+###############################################################################
+
+BlendColor(red, green, blue, alpha)
+	return		void
+	param		red		ColorF in value
+	param		green		ColorF in value
+	param		blue		ColorF in value
+	param		alpha		ColorF in value
+	category	VERSION_1_2
+	glxflags	EXT
+	version		1.2
+	glxropcode	4096
+	offset		336
+
+BlendEquation(mode)
+	return		void
+	param		mode		BlendEquationMode in value
+	category	VERSION_1_2
+	glxflags	EXT
+	version		1.2
+	glxropcode	4097
+	offset		337
+
+DrawRangeElements(mode, start, end, count, type, indices)
+	return		void
+	param		mode		BeginMode in value
+	param		start		UInt32 in value
+	param		end		UInt32 in value
+	param		count		SizeI in value
+	param		type		DrawElementsType in value
+	param		indices		Void in array [COMPSIZE(count/type)]
+	category	VERSION_1_2
+	dlflags		handcode
+	glxflags	client-handcode client-intercept server-handcode
+	version		1.2
+	offset		338
+
+# OpenGL 1.2 (EXT_texture3D) commands
+
+# Arguably TexelInternalFormat, not PixelInternalFormat
+TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	TextureComponentCount in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		border		CheckedInt32 in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void in array [COMPSIZE(format/type/width/height/depth)]
+	category	VERSION_1_2
+	dlflags		handcode
+	glxflags	client-handcode server-handcode EXT
+	version		1.2
+	deprecated	3.1
+	glxropcode	4114
+	offset		371
+
+TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		yoffset		CheckedInt32 in value
+	param		zoffset		CheckedInt32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void in array [COMPSIZE(format/type/width/height/depth)]
+	category	VERSION_1_2
+	dlflags		handcode
+	glxflags	client-handcode server-handcode EXT
+	version		1.2
+	glxropcode	4115
+	offset		372
+
+# OpenGL 1.2 (EXT_copy_texture) commands (specific to texture3D)
+
+CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		yoffset		CheckedInt32 in value
+	param		zoffset		CheckedInt32 in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	category	VERSION_1_2
+	glxflags	EXT
+	version		1.2
+	glxropcode	4123
+	offset		373
+
+###############################################################################
+###############################################################################
+#
+# OpenGL 1.2 deprecated commands
+#
+###############################################################################
+###############################################################################
+
+# OpenGL 1.2 (SGI_color_table) commands
+
+ColorTable(target, internalformat, width, format, type, table)
+	return		void
+	param		target		ColorTableTarget in value
+	param		internalformat	PixelInternalFormat in value
+	param		width		SizeI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		table		Void in array [COMPSIZE(format/type/width)]
+	category	VERSION_1_2
+	profile		compatibility
+	dlflags		handcode
+	glxflags	client-handcode server-handcode EXT
+	version		1.2
+	deprecated	3.1
+	glxropcode	2053
+	offset		339
+
+ColorTableParameterfv(target, pname, params)
+	return		void
+	param		target		ColorTableTarget in value
+	param		pname		ColorTableParameterPName in value
+	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
+	category	VERSION_1_2
+	profile		compatibility
+	glxflags	EXT
+	version		1.2
+	deprecated	3.1
+	glxropcode	2054
+	offset		340
+
+ColorTableParameteriv(target, pname, params)
+	return		void
+	param		target		ColorTableTarget in value
+	param		pname		ColorTableParameterPName in value
+	param		params		CheckedInt32 in array [COMPSIZE(pname)]
+	category	VERSION_1_2
+	profile		compatibility
+	glxflags	EXT
+	version		1.2
+	deprecated	3.1
+	glxropcode	2055
+	offset		341
+
+CopyColorTable(target, internalformat, x, y, width)
+	return		void
+	param		target		ColorTableTarget in value
+	param		internalformat	PixelInternalFormat in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	category	VERSION_1_2
+	profile		compatibility
+	glxflags	EXT
+	version		1.2
+	deprecated	3.1
+	glxropcode	2056
+	offset		342
+
+GetColorTable(target, format, type, table)
+	return		void
+	param		target		ColorTableTarget in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		table		Void out array [COMPSIZE(target/format/type)]
+	category	VERSION_1_2
+	profile		compatibility
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode
+	version		1.2
+	deprecated	3.1
+	glxsingle	147
+	offset		343
+
+GetColorTableParameterfv(target, pname, params)
+	return		void
+	param		target		ColorTableTarget in value
+	param		pname		GetColorTableParameterPName in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	VERSION_1_2
+	profile		compatibility
+	dlflags		notlistable
+	version		1.2
+	deprecated	3.1
+	glxsingle	148
+	offset		344
+
+GetColorTableParameteriv(target, pname, params)
+	return		void
+	param		target		ColorTableTarget in value
+	param		pname		GetColorTableParameterPName in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	VERSION_1_2
+	profile		compatibility
+	dlflags		notlistable
+	version		1.2
+	deprecated	3.1
+	glxsingle	149
+	offset		345
+
+# OpenGL 1.2 (EXT_color_subtable) commands
+
+ColorSubTable(target, start, count, format, type, data)
+	return		void
+	param		target		ColorTableTarget in value
+	param		start		SizeI in value
+	param		count		SizeI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		data		Void in array [COMPSIZE(format/type/count)]
+	category	VERSION_1_2
+	profile		compatibility
+	dlflags		handcode
+	glxflags	client-handcode server-handcode
+	version		1.2
+	deprecated	3.1
+	glxropcode	195
+	offset		346
+
+CopyColorSubTable(target, start, x, y, width)
+	return		void
+	param		target		ColorTableTarget in value
+	param		start		SizeI in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	category	VERSION_1_2
+	profile		compatibility
+	version		1.2
+	deprecated	3.1
+	glxropcode	196
+	offset		347
+
+# OpenGL 1.2 (EXT_convolution) commands
+
+ConvolutionFilter1D(target, internalformat, width, format, type, image)
+	return		void
+	param		target		ConvolutionTarget in value
+	param		internalformat	PixelInternalFormat in value
+	param		width		SizeI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		image		Void in array [COMPSIZE(format/type/width)]
+	category	VERSION_1_2
+	profile		compatibility
+	dlflags		handcode
+	glxflags	client-handcode server-handcode EXT
+	version		1.2
+	deprecated	3.1
+	glxropcode	4101
+	offset		348
+
+ConvolutionFilter2D(target, internalformat, width, height, format, type, image)
+	return		void
+	param		target		ConvolutionTarget in value
+	param		internalformat	PixelInternalFormat in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		image		Void in array [COMPSIZE(format/type/width/height)]
+	category	VERSION_1_2
+	profile		compatibility
+	dlflags		handcode
+	glxflags	client-handcode server-handcode EXT
+	version		1.2
+	deprecated	3.1
+	glxropcode	4102
+	offset		349
+
+ConvolutionParameterf(target, pname, params)
+	return		void
+	param		target		ConvolutionTarget in value
+	param		pname		ConvolutionParameter in value
+	param		params		CheckedFloat32 in value
+	category	VERSION_1_2
+	profile		compatibility
+	glxflags	EXT
+	version		1.2
+	deprecated	3.1
+	glxropcode	4103
+	offset		350
+
+ConvolutionParameterfv(target, pname, params)
+	return		void
+	param		target		ConvolutionTarget in value
+	param		pname		ConvolutionParameter in value
+	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
+	category	VERSION_1_2
+	profile		compatibility
+	glxflags	EXT
+	version		1.2
+	deprecated	3.1
+	glxropcode	4104
+	offset		351
+
+ConvolutionParameteri(target, pname, params)
+	return		void
+	param		target		ConvolutionTarget in value
+	param		pname		ConvolutionParameter in value
+	param		params		CheckedInt32 in value
+	category	VERSION_1_2
+	profile		compatibility
+	glxflags	EXT
+	version		1.2
+	deprecated	3.1
+	glxropcode	4105
+	offset		352
+
+ConvolutionParameteriv(target, pname, params)
+	return		void
+	param		target		ConvolutionTarget in value
+	param		pname		ConvolutionParameter in value
+	param		params		CheckedInt32 in array [COMPSIZE(pname)]
+	category	VERSION_1_2
+	profile		compatibility
+	glxflags	EXT
+	version		1.2
+	deprecated	3.1
+	glxropcode	4106
+	offset		353
+
+CopyConvolutionFilter1D(target, internalformat, x, y, width)
+	return		void
+	param		target		ConvolutionTarget in value
+	param		internalformat	PixelInternalFormat in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	category	VERSION_1_2
+	profile		compatibility
+	glxflags	EXT
+	version		1.2
+	deprecated	3.1
+	glxropcode	4107
+	offset		354
+
+CopyConvolutionFilter2D(target, internalformat, x, y, width, height)
+	return		void
+	param		target		ConvolutionTarget in value
+	param		internalformat	PixelInternalFormat in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	category	VERSION_1_2
+	profile		compatibility
+	glxflags	EXT
+	version		1.2
+	deprecated	3.1
+	glxropcode	4108
+	offset		355
+
+GetConvolutionFilter(target, format, type, image)
+	return		void
+	param		target		ConvolutionTarget in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		image		Void out array [COMPSIZE(target/format/type)]
+	category	VERSION_1_2
+	profile		compatibility
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode
+	version		1.2
+	deprecated	3.1
+	glxsingle	150
+	offset		356
+
+GetConvolutionParameterfv(target, pname, params)
+	return		void
+	param		target		ConvolutionTarget in value
+	param		pname		GetConvolutionParameterPName in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	VERSION_1_2
+	profile		compatibility
+	dlflags		notlistable
+	version		1.2
+	deprecated	3.1
+	glxsingle	151
+	offset		357
+
+GetConvolutionParameteriv(target, pname, params)
+	return		void
+	param		target		ConvolutionTarget in value
+	param		pname		GetConvolutionParameterPName in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	VERSION_1_2
+	profile		compatibility
+	dlflags		notlistable
+	version		1.2
+	deprecated	3.1
+	glxsingle	152
+	offset		358
+
+GetSeparableFilter(target, format, type, row, column, span)
+	return		void
+	param		target		SeparableTarget in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		row		Void out array [COMPSIZE(target/format/type)]
+	param		column		Void out array [COMPSIZE(target/format/type)]
+	param		span		Void out array [COMPSIZE(target/format/type)]
+	category	VERSION_1_2
+	profile		compatibility
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode
+	version		1.2
+	deprecated	3.1
+	glxsingle	153
+	offset		359
+
+SeparableFilter2D(target, internalformat, width, height, format, type, row, column)
+	return		void
+	param		target		SeparableTarget in value
+	param		internalformat	PixelInternalFormat in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		row		Void in array [COMPSIZE(target/format/type/width)]
+	param		column		Void in array [COMPSIZE(target/format/type/height)]
+	category	VERSION_1_2
+	profile		compatibility
+	dlflags		handcode
+	glxflags	client-handcode server-handcode EXT
+	version		1.2
+	deprecated	3.1
+	glxropcode	4109
+	offset		360
+
+# OpenGL 1.2 (EXT_histogram) commands
+
+GetHistogram(target, reset, format, type, values)
+	return		void
+	param		target		HistogramTarget in value
+	param		reset		Boolean in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		values		Void out array [COMPSIZE(target/format/type)]
+	category	VERSION_1_2
+	profile		compatibility
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode
+	version		1.2
+	deprecated	3.1
+	glxsingle	154
+	offset		361
+
+GetHistogramParameterfv(target, pname, params)
+	return		void
+	param		target		HistogramTarget in value
+	param		pname		GetHistogramParameterPName in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	VERSION_1_2
+	profile		compatibility
+	dlflags		notlistable
+	version		1.2
+	deprecated	3.1
+	glxsingle	155
+	offset		362
+
+GetHistogramParameteriv(target, pname, params)
+	return		void
+	param		target		HistogramTarget in value
+	param		pname		GetHistogramParameterPName in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	VERSION_1_2
+	profile		compatibility
+	dlflags		notlistable
+	version		1.2
+	deprecated	3.1
+	glxsingle	156
+	offset		363
+
+GetMinmax(target, reset, format, type, values)
+	return		void
+	param		target		MinmaxTarget in value
+	param		reset		Boolean in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		values		Void out array [COMPSIZE(target/format/type)]
+	category	VERSION_1_2
+	profile		compatibility
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode
+	version		1.2
+	deprecated	3.1
+	glxsingle	157
+	offset		364
+
+GetMinmaxParameterfv(target, pname, params)
+	return		void
+	param		target		MinmaxTarget in value
+	param		pname		GetMinmaxParameterPName in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	VERSION_1_2
+	profile		compatibility
+	dlflags		notlistable
+	version		1.2
+	deprecated	3.1
+	glxsingle	158
+	offset		365
+
+GetMinmaxParameteriv(target, pname, params)
+	return		void
+	param		target		MinmaxTarget in value
+	param		pname		GetMinmaxParameterPName in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	VERSION_1_2
+	profile		compatibility
+	dlflags		notlistable
+	version		1.2
+	deprecated	3.1
+	glxsingle	159
+	offset		366
+
+Histogram(target, width, internalformat, sink)
+	return		void
+	param		target		HistogramTarget in value
+	param		width		SizeI in value
+	param		internalformat	PixelInternalFormat in value
+	param		sink		Boolean in value
+	category	VERSION_1_2
+	profile		compatibility
+	dlflags		handcode
+	glxflags	EXT
+	version		1.2
+	deprecated	3.1
+	glxropcode	4110
+	offset		367
+
+Minmax(target, internalformat, sink)
+	return		void
+	param		target		MinmaxTarget in value
+	param		internalformat	PixelInternalFormat in value
+	param		sink		Boolean in value
+	category	VERSION_1_2
+	profile		compatibility
+	glxflags	EXT
+	version		1.2
+	deprecated	3.1
+	glxropcode	4111
+	offset		368
+
+ResetHistogram(target)
+	return		void
+	param		target		HistogramTarget in value
+	category	VERSION_1_2
+	profile		compatibility
+	glxflags	EXT
+	version		1.2
+	deprecated	3.1
+	glxropcode	4112
+	offset		369
+
+ResetMinmax(target)
+	return		void
+	param		target		MinmaxTarget in value
+	category	VERSION_1_2
+	profile		compatibility
+	glxflags	EXT
+	version		1.2
+	deprecated	3.1
+	glxropcode	4113
+	offset		370
+
+###############################################################################
+###############################################################################
+#
+# OpenGL 1.3 commands
+#
+###############################################################################
+###############################################################################
+
+# OpenGL 1.3 (ARB_multitexture) commands
+
+ActiveTexture(texture)
+	return		void
+	param		texture		TextureUnit in value
+	category	VERSION_1_3
+	glxflags	ARB
+	version		1.3
+	glxropcode	197
+	offset		374
+
+# OpenGL 1.3 (ARB_multisample) commands
+
+SampleCoverage(value, invert)
+	return		void
+	param		value		Float32 in value
+	param		invert		Boolean in value
+	category	VERSION_1_3
+	glxflags	ARB
+	version		1.3
+	glxropcode	229
+	offset		412
+
+# OpenGL 1.3 (ARB_texture_compression) commands
+
+# Arguably TexelInternalFormat, not PixelInternalFormat
+CompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	PixelInternalFormat in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		border		CheckedInt32 in value
+	param		imageSize	SizeI in value
+	param		data		CompressedTextureARB in array [imageSize]
+	category	VERSION_1_3
+	dlflags		handcode
+	glxflags	ARB client-handcode server-handcode
+	version		1.3
+	glxropcode	216
+	wglflags	client-handcode server-handcode
+	offset		554
+
+# Arguably TexelInternalFormat, not PixelInternalFormat
+CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	PixelInternalFormat in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		border		CheckedInt32 in value
+	param		imageSize	SizeI in value
+	param		data		CompressedTextureARB in array [imageSize]
+	category	VERSION_1_3
+	dlflags		handcode
+	glxflags	ARB client-handcode server-handcode
+	version		1.3
+	glxropcode	215
+	wglflags	client-handcode server-handcode
+	offset		555
+
+# Arguably TexelInternalFormat, not PixelInternalFormat
+CompressedTexImage1D(target, level, internalformat, width, border, imageSize, data)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	PixelInternalFormat in value
+	param		width		SizeI in value
+	param		border		CheckedInt32 in value
+	param		imageSize	SizeI in value
+	param		data		CompressedTextureARB in array [imageSize]
+	category	VERSION_1_3
+	dlflags		handcode
+	glxflags	ARB client-handcode server-handcode
+	version		1.3
+	glxropcode	214
+	wglflags	client-handcode server-handcode
+	offset		556
+
+CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		yoffset		CheckedInt32 in value
+	param		zoffset		CheckedInt32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		format		PixelFormat in value
+	param		imageSize	SizeI in value
+	param		data		CompressedTextureARB in array [imageSize]
+	category	VERSION_1_3
+	dlflags		handcode
+	glxflags	ARB client-handcode server-handcode
+	version		1.3
+	glxropcode	219
+	wglflags	client-handcode server-handcode
+	offset		557
+
+CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		yoffset		CheckedInt32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		format		PixelFormat in value
+	param		imageSize	SizeI in value
+	param		data		CompressedTextureARB in array [imageSize]
+	category	VERSION_1_3
+	dlflags		handcode
+	glxflags	ARB client-handcode server-handcode
+	version		1.3
+	glxropcode	218
+	wglflags	client-handcode server-handcode
+	offset		558
+
+CompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		width		SizeI in value
+	param		format		PixelFormat in value
+	param		imageSize	SizeI in value
+	param		data		CompressedTextureARB in array [imageSize]
+	category	VERSION_1_3
+	dlflags		handcode
+	glxflags	ARB client-handcode server-handcode
+	version		1.3
+	glxropcode	217
+	wglflags	client-handcode server-handcode
+	offset		559
+
+GetCompressedTexImage(target, level, img)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		img		CompressedTextureARB out array [COMPSIZE(target/level)]
+	category	VERSION_1_3
+	dlflags		notlistable
+	glxflags	ARB client-handcode server-handcode
+	version		1.3
+	glxsingle	160
+	wglflags	client-handcode server-handcode
+	offset		560
+
+###############################################################################
+###############################################################################
+#
+# OpenGL 1.3 deprecated commands
+#
+###############################################################################
+###############################################################################
+
+ClientActiveTexture(texture)
+	return		void
+	param		texture		TextureUnit in value
+	category	VERSION_1_3
+	profile		compatibility
+	dlflags		notlistable
+	glxflags	ARB client-handcode client-intercept server-handcode
+	version		1.3
+	deprecated	3.1
+	offset		375
+
+MultiTexCoord1d(target, s)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordD in value
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	vectorequiv	MultiTexCoord1dv
+	offset		376
+
+MultiTexCoord1dv(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordD in array [1]
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	glxropcode	198
+	offset		377
+
+MultiTexCoord1f(target, s)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordF in value
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	vectorequiv	MultiTexCoord1fv
+	offset		378
+
+MultiTexCoord1fv(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordF in array [1]
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	glxropcode	199
+	offset		379
+
+MultiTexCoord1i(target, s)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordI in value
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	vectorequiv	MultiTexCoord1iv
+	offset		380
+
+MultiTexCoord1iv(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordI in array [1]
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	glxropcode	200
+	offset		381
+
+MultiTexCoord1s(target, s)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordS in value
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	vectorequiv	MultiTexCoord1sv
+	offset		382
+
+MultiTexCoord1sv(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordS in array [1]
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	glxropcode	201
+	offset		383
+
+MultiTexCoord2d(target, s, t)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordD in value
+	param		t		CoordD in value
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	vectorequiv	MultiTexCoord2dv
+	offset		384
+
+MultiTexCoord2dv(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordD in array [2]
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	glxropcode	202
+	offset		385
+
+MultiTexCoord2f(target, s, t)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordF in value
+	param		t		CoordF in value
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	vectorequiv	MultiTexCoord2fv
+	offset		386
+
+MultiTexCoord2fv(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordF in array [2]
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	glxropcode	203
+	offset		387
+
+MultiTexCoord2i(target, s, t)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordI in value
+	param		t		CoordI in value
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	vectorequiv	MultiTexCoord2iv
+	offset		388
+
+MultiTexCoord2iv(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordI in array [2]
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	glxropcode	204
+	offset		389
+
+MultiTexCoord2s(target, s, t)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordS in value
+	param		t		CoordS in value
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	vectorequiv	MultiTexCoord2sv
+	offset		390
+
+MultiTexCoord2sv(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordS in array [2]
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	glxropcode	205
+	offset		391
+
+MultiTexCoord3d(target, s, t, r)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordD in value
+	param		t		CoordD in value
+	param		r		CoordD in value
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	vectorequiv	MultiTexCoord3dv
+	offset		392
+
+MultiTexCoord3dv(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordD in array [3]
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	glxropcode	206
+	offset		393
+
+MultiTexCoord3f(target, s, t, r)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordF in value
+	param		t		CoordF in value
+	param		r		CoordF in value
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	vectorequiv	MultiTexCoord3fv
+	offset		394
+
+MultiTexCoord3fv(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordF in array [3]
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	glxropcode	207
+	offset		395
+
+MultiTexCoord3i(target, s, t, r)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordI in value
+	param		t		CoordI in value
+	param		r		CoordI in value
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	vectorequiv	MultiTexCoord3iv
+	offset		396
+
+MultiTexCoord3iv(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordI in array [3]
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	glxropcode	208
+	offset		397
+
+MultiTexCoord3s(target, s, t, r)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordS in value
+	param		t		CoordS in value
+	param		r		CoordS in value
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	vectorequiv	MultiTexCoord3sv
+	offset		398
+
+MultiTexCoord3sv(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordS in array [3]
+	category	VERSION_1_3
+	profile		compatibility
+	version		1.3
+	deprecated	3.1
+	glxflags	ARB
+	glxropcode	209
+	offset		399
+
+MultiTexCoord4d(target, s, t, r, q)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordD in value
+	param		t		CoordD in value
+	param		r		CoordD in value
+	param		q		CoordD in value
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	vectorequiv	MultiTexCoord4dv
+	offset		400
+
+MultiTexCoord4dv(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordD in array [4]
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	glxropcode	210
+	offset		401
+
+MultiTexCoord4f(target, s, t, r, q)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordF in value
+	param		t		CoordF in value
+	param		r		CoordF in value
+	param		q		CoordF in value
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	vectorequiv	MultiTexCoord4fv
+	offset		402
+
+MultiTexCoord4fv(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordF in array [4]
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	glxropcode	211
+	offset		403
+
+MultiTexCoord4i(target, s, t, r, q)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordI in value
+	param		t		CoordI in value
+	param		r		CoordI in value
+	param		q		CoordI in value
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	vectorequiv	MultiTexCoord4iv
+	offset		404
+
+MultiTexCoord4iv(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordI in array [4]
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	glxropcode	212
+	offset		405
+
+MultiTexCoord4s(target, s, t, r, q)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordS in value
+	param		t		CoordS in value
+	param		r		CoordS in value
+	param		q		CoordS in value
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	vectorequiv	MultiTexCoord4sv
+	offset		406
+
+MultiTexCoord4sv(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordS in array [4]
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB
+	version		1.3
+	deprecated	3.1
+	glxropcode	213
+	offset		407
+
+# OpenGL 1.3 (ARB_transpose_matrix) commands
+
+LoadTransposeMatrixf(m)
+	return		void
+	param		m		Float32 in array [16]
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB client-handcode client-intercept server-handcode
+	version		1.3
+	deprecated	3.1
+	offset		408
+
+LoadTransposeMatrixd(m)
+	return		void
+	param		m		Float64 in array [16]
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB client-handcode client-intercept server-handcode
+	version		1.3
+	deprecated	3.1
+	offset		409
+
+MultTransposeMatrixf(m)
+	return		void
+	param		m		Float32 in array [16]
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB client-handcode client-intercept server-handcode
+	version		1.3
+	deprecated	3.1
+	offset		410
+
+MultTransposeMatrixd(m)
+	return		void
+	param		m		Float64 in array [16]
+	category	VERSION_1_3
+	profile		compatibility
+	glxflags	ARB client-handcode client-intercept server-handcode
+	version		1.3
+	deprecated	3.1
+	offset		411
+
+###############################################################################
+###############################################################################
+#
+# OpenGL 1.4 commands
+#
+###############################################################################
+###############################################################################
+
+# OpenGL 1.4 (EXT_blend_func_separate) commands
+
+BlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha)
+	return		void
+	param		sfactorRGB	BlendFuncSeparateParameterEXT in value
+	param		dfactorRGB	BlendFuncSeparateParameterEXT in value
+	param		sfactorAlpha	BlendFuncSeparateParameterEXT in value
+	param		dfactorAlpha	BlendFuncSeparateParameterEXT in value
+	category	VERSION_1_4
+	glxropcode	4134
+	version		1.4
+	extension
+	offset		537
+
+# OpenGL 1.4 (EXT_multi_draw_arrays) commands
+
+# first and count are really 'in'
+MultiDrawArrays(mode, first, count, drawcount)
+	return		void
+	param		mode		BeginMode in value
+	param		first		Int32 in array [COMPSIZE(count)]
+	param		count		SizeI in array [COMPSIZE(drawcount)]
+	param		drawcount	SizeI in value
+	category	VERSION_1_4
+	version		1.4
+	glxropcode	?
+	offset		644
+
+MultiDrawElements(mode, count, type, indices, drawcount)
+	return		void
+	param		mode		BeginMode in value
+	param		count		SizeI in array [COMPSIZE(drawcount)]
+	param		type		DrawElementsType in value
+	param		indices		ConstVoidPointer in array [COMPSIZE(drawcount)]
+	param		drawcount	SizeI in value
+	category	VERSION_1_4
+	version		1.4
+	glxropcode	?
+	offset		645
+
+# OpenGL 1.4 (ARB_point_parameters, NV_point_sprite) commands
+
+PointParameterf(pname, param)
+	return		void
+	param		pname		PointParameterNameARB in value
+	param		param		CheckedFloat32 in value
+	category	VERSION_1_4
+	version		1.4
+	glxropcode	2065
+	extension
+	offset		458
+
+PointParameterfv(pname, params)
+	return		void
+	param		pname		PointParameterNameARB in value
+	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
+	category	VERSION_1_4
+	version		1.4
+	glxropcode	2066
+	extension
+	offset		459
+
+PointParameteri(pname, param)
+	return		void
+	param		pname		PointParameterNameARB in value
+	param		param		Int32 in value
+	category	VERSION_1_4
+	version		1.4
+	extension	soft WINSOFT NV20
+	glxropcode	4221
+	offset		642
+
+PointParameteriv(pname, params)
+	return		void
+	param		pname		PointParameterNameARB in value
+	param		params		Int32 in array [COMPSIZE(pname)]
+	category	VERSION_1_4
+	version		1.4
+	extension	soft WINSOFT NV20
+	glxropcode	4222re
+	offset		643
+
+###############################################################################
+###############################################################################
+#
+# OpenGL 1.4 deprecated commands
+#
+###############################################################################
+###############################################################################
+
+# OpenGL 1.4 (EXT_fog_coord) commands
+
+FogCoordf(coord)
+	return		void
+	param		coord		CoordF in value
+	category	VERSION_1_4
+	profile		compatibility
+	vectorequiv	FogCoordfv
+	version		1.4
+	deprecated	3.1
+	offset		545
+
+FogCoordfv(coord)
+	return		void
+	param		coord		CoordF in array [1]
+	category	VERSION_1_4
+	profile		compatibility
+	version		1.4
+	deprecated	3.1
+	glxropcode	4124
+	offset		546
+
+FogCoordd(coord)
+	return		void
+	param		coord		CoordD in value
+	category	VERSION_1_4
+	profile		compatibility
+	vectorequiv	FogCoorddv
+	version		1.4
+	deprecated	3.1
+	offset		547
+
+FogCoorddv(coord)
+	return		void
+	param		coord		CoordD in array [1]
+	category	VERSION_1_4
+	profile		compatibility
+	version		1.4
+	deprecated	3.1
+	glxropcode	4125
+	offset		548
+
+FogCoordPointer(type, stride, pointer)
+	return		void
+	param		type		FogPointerTypeEXT in value
+	param		stride		SizeI in value
+	param		pointer		Void in array [COMPSIZE(type/stride)] retained
+	category	VERSION_1_4
+	profile		compatibility
+	dlflags		notlistable
+	version		1.4
+	deprecated	3.1
+	glxflags	client-handcode server-handcode
+	offset		549
+
+# OpenGL 1.4 (EXT_secondary_color) commands
+
+SecondaryColor3b(red, green, blue)
+	return		void
+	param		red		ColorB in value
+	param		green		ColorB in value
+	param		blue		ColorB in value
+	category	VERSION_1_4
+	profile		compatibility
+	vectorequiv	SecondaryColor3bv
+	version		1.4
+	deprecated	3.1
+	offset		561
+
+SecondaryColor3bv(v)
+	return		void
+	param		v		ColorB in array [3]
+	category	VERSION_1_4
+	profile		compatibility
+	version		1.4
+	deprecated	3.1
+	glxropcode	4126
+	offset		562
+
+SecondaryColor3d(red, green, blue)
+	return		void
+	param		red		ColorD in value
+	param		green		ColorD in value
+	param		blue		ColorD in value
+	category	VERSION_1_4
+	profile		compatibility
+	vectorequiv	SecondaryColor3dv
+	version		1.4
+	deprecated	3.1
+	offset		563
+
+SecondaryColor3dv(v)
+	return		void
+	param		v		ColorD in array [3]
+	category	VERSION_1_4
+	profile		compatibility
+	version		1.4
+	deprecated	3.1
+	glxropcode	4130
+	offset		564
+
+SecondaryColor3f(red, green, blue)
+	return		void
+	param		red		ColorF in value
+	param		green		ColorF in value
+	param		blue		ColorF in value
+	category	VERSION_1_4
+	profile		compatibility
+	vectorequiv	SecondaryColor3fv
+	version		1.4
+	deprecated	3.1
+	offset		565
+
+SecondaryColor3fv(v)
+	return		void
+	param		v		ColorF in array [3]
+	category	VERSION_1_4
+	profile		compatibility
+	version		1.4
+	deprecated	3.1
+	glxropcode	4129
+	offset		566
+
+SecondaryColor3i(red, green, blue)
+	return		void
+	param		red		ColorI in value
+	param		green		ColorI in value
+	param		blue		ColorI in value
+	category	VERSION_1_4
+	profile		compatibility
+	vectorequiv	SecondaryColor3iv
+	version		1.4
+	deprecated	3.1
+	offset		567
+
+SecondaryColor3iv(v)
+	return		void
+	param		v		ColorI in array [3]
+	category	VERSION_1_4
+	profile		compatibility
+	version		1.4
+	deprecated	3.1
+	glxropcode	4128
+	offset		568
+
+SecondaryColor3s(red, green, blue)
+	return		void
+	param		red		ColorS in value
+	param		green		ColorS in value
+	param		blue		ColorS in value
+	category	VERSION_1_4
+	profile		compatibility
+	vectorequiv	SecondaryColor3sv
+	version		1.4
+	deprecated	3.1
+	offset		569
+
+SecondaryColor3sv(v)
+	return		void
+	param		v		ColorS in array [3]
+	category	VERSION_1_4
+	profile		compatibility
+	version		1.4
+	deprecated	3.1
+	glxropcode	4127
+	offset		570
+
+SecondaryColor3ub(red, green, blue)
+	return		void
+	param		red		ColorUB in value
+	param		green		ColorUB in value
+	param		blue		ColorUB in value
+	category	VERSION_1_4
+	profile		compatibility
+	vectorequiv	SecondaryColor3ubv
+	version		1.4
+	deprecated	3.1
+	offset		571
+
+SecondaryColor3ubv(v)
+	return		void
+	param		v		ColorUB in array [3]
+	category	VERSION_1_4
+	profile		compatibility
+	version		1.4
+	deprecated	3.1
+	glxropcode	4131
+	offset		572
+
+SecondaryColor3ui(red, green, blue)
+	return		void
+	param		red		ColorUI in value
+	param		green		ColorUI in value
+	param		blue		ColorUI in value
+	category	VERSION_1_4
+	profile		compatibility
+	vectorequiv	SecondaryColor3uiv
+	version		1.4
+	deprecated	3.1
+	offset		573
+
+SecondaryColor3uiv(v)
+	return		void
+	param		v		ColorUI in array [3]
+	category	VERSION_1_4
+	profile		compatibility
+	version		1.4
+	deprecated	3.1
+	glxropcode	4133
+	offset		574
+
+SecondaryColor3us(red, green, blue)
+	return		void
+	param		red		ColorUS in value
+	param		green		ColorUS in value
+	param		blue		ColorUS in value
+	category	VERSION_1_4
+	profile		compatibility
+	vectorequiv	SecondaryColor3usv
+	version		1.4
+	deprecated	3.1
+	offset		575
+
+SecondaryColor3usv(v)
+	return		void
+	param		v		ColorUS in array [3]
+	category	VERSION_1_4
+	profile		compatibility
+	version		1.4
+	deprecated	3.1
+	glxropcode	4132
+	offset		576
+
+SecondaryColorPointer(size, type, stride, pointer)
+	return		void
+	param		size		Int32 in value
+	param		type		ColorPointerType in value
+	param		stride		SizeI in value
+	param		pointer		Void in array [COMPSIZE(size/type/stride)] retained
+	category	VERSION_1_4
+	profile		compatibility
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode
+	version		1.4
+	deprecated	3.1
+	extension
+	offset		577
+
+# OpenGL 1.4 (ARB_window_pos) commands
+# Note: all WindowPos* entry points use glxropcode ropcode 230, with 3 float parameters
+
+WindowPos2d(x, y)
+	return		void
+	param		x		CoordD in value
+	param		y		CoordD in value
+	category	VERSION_1_4
+	profile		compatibility
+	vectorequiv	WindowPos2dv
+	version		1.4
+	deprecated	3.1
+	offset		513
+
+WindowPos2dv(v)
+	return		void
+	param		v		CoordD in array [2]
+	category	VERSION_1_4
+	profile		compatibility
+	version		1.4
+	deprecated	3.1
+	glxropcode	230
+	glxflags	client-handcode server-handcode
+	offset		514
+
+WindowPos2f(x, y)
+	return		void
+	param		x		CoordF in value
+	param		y		CoordF in value
+	category	VERSION_1_4
+	profile		compatibility
+	vectorequiv	WindowPos2fv
+	version		1.4
+	deprecated	3.1
+	offset		515
+
+WindowPos2fv(v)
+	return		void
+	param		v		CoordF in array [2]
+	category	VERSION_1_4
+	profile		compatibility
+	version		1.4
+	deprecated	3.1
+	glxropcode	230
+	glxflags	client-handcode server-handcode
+	offset		516
+
+WindowPos2i(x, y)
+	return		void
+	param		x		CoordI in value
+	param		y		CoordI in value
+	category	VERSION_1_4
+	profile		compatibility
+	vectorequiv	WindowPos2iv
+	version		1.4
+	deprecated	3.1
+	offset		517
+
+WindowPos2iv(v)
+	return		void
+	param		v		CoordI in array [2]
+	category	VERSION_1_4
+	profile		compatibility
+	version		1.4
+	deprecated	3.1
+	glxropcode	230
+	glxflags	client-handcode server-handcode
+	offset		518
+
+WindowPos2s(x, y)
+	return		void
+	param		x		CoordS in value
+	param		y		CoordS in value
+	category	VERSION_1_4
+	profile		compatibility
+	vectorequiv	WindowPos2sv
+	version		1.4
+	deprecated	3.1
+	offset		519
+
+WindowPos2sv(v)
+	return		void
+	param		v		CoordS in array [2]
+	category	VERSION_1_4
+	profile		compatibility
+	version		1.4
+	deprecated	3.1
+	glxropcode	230
+	glxflags	client-handcode server-handcode
+	offset		520
+
+WindowPos3d(x, y, z)
+	return		void
+	param		x		CoordD in value
+	param		y		CoordD in value
+	param		z		CoordD in value
+	vectorequiv	WindowPos3dv
+	category	VERSION_1_4
+	profile		compatibility
+	version		1.4
+	deprecated	3.1
+	offset		521
+
+WindowPos3dv(v)
+	return		void
+	param		v		CoordD in array [3]
+	category	VERSION_1_4
+	profile		compatibility
+	version		1.4
+	deprecated	3.1
+	glxropcode	230
+	glxflags	client-handcode server-handcode
+	offset		522
+
+WindowPos3f(x, y, z)
+	return		void
+	param		x		CoordF in value
+	param		y		CoordF in value
+	param		z		CoordF in value
+	category	VERSION_1_4
+	profile		compatibility
+	vectorequiv	WindowPos3fv
+	version		1.4
+	deprecated	3.1
+	offset		523
+
+WindowPos3fv(v)
+	return		void
+	param		v		CoordF in array [3]
+	category	VERSION_1_4
+	profile		compatibility
+	version		1.4
+	deprecated	3.1
+	glxropcode	230
+	glxflags	client-handcode server-handcode
+	offset		524
+
+WindowPos3i(x, y, z)
+	return		void
+	param		x		CoordI in value
+	param		y		CoordI in value
+	param		z		CoordI in value
+	category	VERSION_1_4
+	profile		compatibility
+	vectorequiv	WindowPos3iv
+	version		1.4
+	deprecated	3.1
+	offset		525
+
+WindowPos3iv(v)
+	return		void
+	param		v		CoordI in array [3]
+	category	VERSION_1_4
+	profile		compatibility
+	version		1.4
+	deprecated	3.1
+	glxropcode	230
+	glxflags	client-handcode server-handcode
+	offset		526
+
+WindowPos3s(x, y, z)
+	return		void
+	param		x		CoordS in value
+	param		y		CoordS in value
+	param		z		CoordS in value
+	category	VERSION_1_4
+	profile		compatibility
+	vectorequiv	WindowPos3sv
+	version		1.4
+	deprecated	3.1
+	offset		527
+
+WindowPos3sv(v)
+	return		void
+	param		v		CoordS in array [3]
+	category	VERSION_1_4
+	profile		compatibility
+	version		1.4
+	deprecated	3.1
+	glxropcode	230
+	glxflags	client-handcode server-handcode
+	offset		528
+
+###############################################################################
+###############################################################################
+#
+# OpenGL 1.5 commands
+#
+###############################################################################
+###############################################################################
+
+# OpenGL 1.5 (ARB_occlusion_query) commands
+
+GenQueries(n, ids)
+	return		void
+	param		n		SizeI in value
+	param		ids		UInt32 out array [n]
+	category	VERSION_1_5
+	version		1.5
+	extension
+	glxsingle	162
+	glxflags	ignore
+	offset		700
+
+DeleteQueries(n, ids)
+	return		void
+	param		n		SizeI in value
+	param		ids		UInt32 in array [n]
+	category	VERSION_1_5
+	version		1.5
+	extension
+	glxsingle	161
+	glxflags	ignore
+	offset		701
+
+IsQuery(id)
+	return		Boolean
+	param		id		UInt32 in value
+	category	VERSION_1_5
+	version		1.5
+	extension
+	glxsingle	163
+	glxflags	ignore
+	offset		702
+
+BeginQuery(target, id)
+	return		void
+	param		target		GLenum in value
+	param		id		UInt32 in value
+	category	VERSION_1_5
+	version		1.5
+	extension
+	glxropcode	231
+	glxflags	ignore
+	offset		703
+
+EndQuery(target)
+	return		void
+	param		target		GLenum in value
+	category	VERSION_1_5
+	version		1.5
+	extension
+	glxropcode	232
+	glxflags	ignore
+	offset		704
+
+GetQueryiv(target, pname, params)
+	return		void
+	param		target		GLenum in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [pname]
+	category	VERSION_1_5
+	dlflags		notlistable
+	version		1.5
+	extension
+	glxsingle	164
+	glxflags	ignore
+	offset		705
+
+GetQueryObjectiv(id, pname, params)
+	return		void
+	param		id		UInt32 in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [pname]
+	category	VERSION_1_5
+	dlflags		notlistable
+	version		1.5
+	extension
+	glxsingle	165
+	glxflags	ignore
+	offset		706
+
+GetQueryObjectuiv(id, pname, params)
+	return		void
+	param		id		UInt32 in value
+	param		pname		GLenum in value
+	param		params		UInt32 out array [pname]
+	category	VERSION_1_5
+	dlflags		notlistable
+	version		1.5
+	extension
+	glxsingle	166
+	glxflags	ignore
+	offset		707
+
+# OpenGL 1.5 (ARB_vertex_buffer_object) commands
+
+BindBuffer(target, buffer)
+	return		void
+	param		target		BufferTargetARB in value
+	param		buffer		UInt32 in value
+	category	VERSION_1_5
+	version		1.5
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		688
+
+DeleteBuffers(n, buffers)
+	return		void
+	param		n		SizeI in value
+	param		buffers		ConstUInt32 in array [n]
+	category	VERSION_1_5
+	version		1.5
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		691
+
+GenBuffers(n, buffers)
+	return		void
+	param		n		SizeI in value
+	param		buffers		UInt32 out array [n]
+	category	VERSION_1_5
+	version		1.5
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		692
+
+IsBuffer(buffer)
+	return		Boolean
+	param		buffer		UInt32 in value
+	category	VERSION_1_5
+	version		1.5
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		696
+
+BufferData(target, size, data, usage)
+	return		void
+	param		target		BufferTargetARB in value
+	param		size		BufferSize in value
+	param		data		ConstVoid in array [size]
+	param		usage		BufferUsageARB in value
+	category	VERSION_1_5
+	version		1.5
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		689
+
+BufferSubData(target, offset, size, data)
+	return		void
+	param		target		BufferTargetARB in value
+	param		offset		BufferOffset in value
+	param		size		BufferSize in value
+	param		data		ConstVoid in array [size]
+	category	VERSION_1_5
+	version		1.5
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		690
+
+GetBufferSubData(target, offset, size, data)
+	return		void
+	param		target		BufferTargetARB in value
+	param		offset		BufferOffset in value
+	param		size		BufferSize in value
+	param		data		Void out array [size]
+	category	VERSION_1_5
+	dlflags		notlistable
+	version		1.5
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		695
+
+MapBuffer(target, access)
+	return		VoidPointer
+	param		target		BufferTargetARB in value
+	param		access		BufferAccessARB in value
+	category	VERSION_1_5
+	version		1.5
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		697
+
+UnmapBuffer(target)
+	return		Boolean
+	param		target		BufferTargetARB in value
+	category	VERSION_1_5
+	version		1.5
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		698
+
+GetBufferParameteriv(target, pname, params)
+	return		void
+	param		target		BufferTargetARB in value
+	param		pname		BufferPNameARB in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	VERSION_1_5
+	dlflags		notlistable
+	version		1.5
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		693
+
+GetBufferPointerv(target, pname, params)
+	return		void
+	param		target		BufferTargetARB in value
+	param		pname		BufferPointerNameARB in value
+	param		params		VoidPointer out array [1]
+	category	VERSION_1_5
+	dlflags		notlistable
+	version		1.5
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		694
+
+# OpenGL 1.5 (EXT_shadow_funcs) commands - none
+
+
+###############################################################################
+###############################################################################
+#
+# OpenGL 2.0 commands
+#
+###############################################################################
+###############################################################################
+
+# OpenGL 2.0 (EXT_blend_equation_separate) commands
+
+BlendEquationSeparate(modeRGB, modeAlpha)
+	return		void
+	param		modeRGB		BlendEquationModeEXT in value
+	param		modeAlpha	BlendEquationModeEXT in value
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	4228
+
+# OpenGL 2.0 (ARB_draw_buffers) commands
+
+DrawBuffers(n, bufs)
+	return		void
+	param		n		SizeI in value
+	param		bufs		DrawBufferModeATI in array [n]
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	233
+	glxflags	ignore
+	offset		?
+
+# OpenGL 2.0 (ARB_stencil_two_side) commands
+
+StencilOpSeparate(face, sfail, dpfail, dppass)
+	return		void
+	param		face		StencilFaceDirection in value
+	param		sfail		StencilOp in value
+	param		dpfail		StencilOp in value
+	param		dppass		StencilOp in value
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+StencilFuncSeparate(face, func, ref, mask)
+	return		void
+	param		face		StencilFaceDirection in value
+	param		func		StencilFunction in value
+	param		ref		StencilValue in value
+	param		mask		MaskedStencilValue in value
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+StencilMaskSeparate(face, mask)
+	return		void
+	param		face		StencilFaceDirection in value
+	param		mask		MaskedStencilValue in value
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+# OpenGL 2.0 (ARB_shader_objects / ARB_vertex_shader / ARB_fragment_shader) commands
+
+AttachShader(program, shader)
+	return		void
+	param		program		UInt32 in value
+	param		shader		UInt32 in value
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+BindAttribLocation(program, index, name)
+	return		void
+	param		program		UInt32 in value
+	param		index		UInt32 in value
+	param		name		Char in array []
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+CompileShader(shader)
+	return		void
+	param		shader		UInt32 in value
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+CreateProgram()
+	return		UInt32
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+CreateShader(type)
+	return		UInt32
+	param		type		GLenum in value
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DeleteProgram(program)
+	return		void
+	param		program		UInt32 in value
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxsingle	202
+	offset		?
+
+DeleteShader(shader)
+	return		void
+	param		shader		UInt32 in value
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxsingle	195
+	offset		?
+
+DetachShader(program, shader)
+	return		void
+	param		program		UInt32 in value
+	param		shader		UInt32 in value
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DisableVertexAttribArray(index)
+	return		void
+	param		index		UInt32 in value
+	dlflags		notlistable
+	category	VERSION_2_0
+	version		2.0
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		666
+
+EnableVertexAttribArray(index)
+	return		void
+	param		index		UInt32 in value
+	dlflags		notlistable
+	category	VERSION_2_0
+	version		2.0
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		665
+
+GetActiveAttrib(program, index, bufSize, length, size, type, name)
+	return		void
+	param		program		UInt32 in value
+	param		index		UInt32 in value
+	param		bufSize		SizeI in value
+	param		length		SizeI out array [1]
+	param		size		Int32 out array [1]
+	param		type		GLenum out array [1]
+	param		name		Char out array []
+	category	VERSION_2_0
+	dlflags		notlistable
+	version		2.0
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetActiveUniform(program, index, bufSize, length, size, type, name)
+	return		void
+	param		program		UInt32 in value
+	param		index		UInt32 in value
+	param		bufSize		SizeI in value
+	param		length		SizeI out array [1]
+	param		size		Int32 out array [1]
+	param		type		GLenum out array [1]
+	param		name		Char out array []
+	category	VERSION_2_0
+	dlflags		notlistable
+	version		2.0
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetAttachedShaders(program, maxCount, count, obj)
+	return		void
+	param		program		UInt32 in value
+	param		maxCount	SizeI in value
+	param		count		SizeI out array [1]
+	param		obj		UInt32 out array [count]
+	category	VERSION_2_0
+	dlflags		notlistable
+	version		2.0
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetAttribLocation(program, name)
+	return		Int32
+	param		program		UInt32 in value
+	param		name		Char in array []
+	category	VERSION_2_0
+	dlflags		notlistable
+	version		2.0
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetProgramiv(program, pname, params)
+	return		void
+	param		program		UInt32 in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [pname]
+	category	VERSION_2_0
+	dlflags		notlistable
+	version		2.0
+	extension
+	glxsingle	199
+	offset		?
+
+GetProgramInfoLog(program, bufSize, length, infoLog)
+	return		void
+	param		program		UInt32 in value
+	param		bufSize		SizeI in value
+	param		length		SizeI out array [1]
+	param		infoLog		Char out array [length]
+	category	VERSION_2_0
+	dlflags		notlistable
+	version		2.0
+	extension
+	glxsingle	201
+	offset		?
+
+GetShaderiv(shader, pname, params)
+	return		void
+	param		shader		UInt32 in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [pname]
+	category	VERSION_2_0
+	dlflags		notlistable
+	version		2.0
+	extension
+	glxsingle	198
+	offset		?
+
+GetShaderInfoLog(shader, bufSize, length, infoLog)
+	return		void
+	param		shader		UInt32 in value
+	param		bufSize		SizeI in value
+	param		length		SizeI out array [1]
+	param		infoLog		Char out array [length]
+	category	VERSION_2_0
+	dlflags		notlistable
+	version		2.0
+	extension
+	glxsingle	200
+	offset		?
+
+GetShaderSource(shader, bufSize, length, source)
+	return		void
+	param		shader		UInt32 in value
+	param		bufSize		SizeI in value
+	param		length		SizeI out array [1]
+	param		source		Char out array [length]
+	category	VERSION_2_0
+	dlflags		notlistable
+	version		2.0
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetUniformLocation(program, name)
+	return		Int32
+	param		program		UInt32 in value
+	param		name		Char in array []
+	category	VERSION_2_0
+	dlflags		notlistable
+	version		2.0
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetUniformfv(program, location, params)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		params		Float32 out array [COMPSIZE(location)]
+	category	VERSION_2_0
+	dlflags		notlistable
+	version		2.0
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetUniformiv(program, location, params)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		params		Int32 out array [COMPSIZE(location)]
+	category	VERSION_2_0
+	dlflags		notlistable
+	version		2.0
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetVertexAttribdv(index, pname, params)
+	return		void
+	param		index		UInt32 in value
+	param		pname		VertexAttribPropertyARB in value
+	param		params		Float64 out array [4]
+	dlflags		notlistable
+	category	VERSION_2_0
+	version		2.0
+	extension	soft WINSOFT NV10
+	glxvendorpriv	1301
+	offset		588
+
+GetVertexAttribfv(index, pname, params)
+	return		void
+	param		index		UInt32 in value
+	param		pname		VertexAttribPropertyARB in value
+	param		params		Float32 out array [4]
+	dlflags		notlistable
+	category	VERSION_2_0
+	version		2.0
+	extension	soft WINSOFT NV10
+	glxvendorpriv	1302
+	offset		589
+
+GetVertexAttribiv(index, pname, params)
+	return		void
+	param		index		UInt32 in value
+	param		pname		VertexAttribPropertyARB in value
+	param		params		Int32 out array [4]
+	dlflags		notlistable
+	category	VERSION_2_0
+	version		2.0
+	extension	soft WINSOFT NV10
+	glxvendorpriv	1303
+	offset		590
+
+GetVertexAttribPointerv(index, pname, pointer)
+	return		void
+	param		index		UInt32 in value
+	param		pname		VertexAttribPointerPropertyARB in value
+	param		pointer		VoidPointer out array [1]
+	dlflags		notlistable
+	category	VERSION_2_0
+	version		2.0
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		591
+
+IsProgram(program)
+	return		Boolean
+	param		program		UInt32 in value
+	dlflags		notlistable
+	category	VERSION_2_0
+	version		2.0
+	extension	soft WINSOFT NV10
+	glxsingle	197
+	offset		592
+
+IsShader(shader)
+	return		Boolean
+	param		shader		UInt32 in value
+	dlflags		notlistable
+	category	VERSION_2_0
+	version		2.0
+	extension	soft WINSOFT NV10
+	glxsingle	196
+	offset		?
+
+LinkProgram(program)
+	return		void
+	param		program		UInt32 in value
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ShaderSource(shader, count, string, length)
+	return		void
+	param		shader		UInt32 in value
+	param		count		SizeI in value
+	param		string		ConstCharPointer in array [count]
+	param		length		Int32 in array [1]
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+UseProgram(program)
+	return		void
+	param		program		UInt32 in value
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform1f(location, v0)
+	return		void
+	param		location	Int32 in value
+	param		v0		Float32 in value
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform2f(location, v0, v1)
+	return		void
+	param		location	Int32 in value
+	param		v0		Float32 in value
+	param		v1		Float32 in value
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform3f(location, v0, v1, v2)
+	return		void
+	param		location	Int32 in value
+	param		v0		Float32 in value
+	param		v1		Float32 in value
+	param		v2		Float32 in value
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform4f(location, v0, v1, v2, v3)
+	return		void
+	param		location	Int32 in value
+	param		v0		Float32 in value
+	param		v1		Float32 in value
+	param		v2		Float32 in value
+	param		v3		Float32 in value
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform1i(location, v0)
+	return		void
+	param		location	Int32 in value
+	param		v0		Int32 in value
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform2i(location, v0, v1)
+	return		void
+	param		location	Int32 in value
+	param		v0		Int32 in value
+	param		v1		Int32 in value
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform3i(location, v0, v1, v2)
+	return		void
+	param		location	Int32 in value
+	param		v0		Int32 in value
+	param		v1		Int32 in value
+	param		v2		Int32 in value
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform4i(location, v0, v1, v2, v3)
+	return		void
+	param		location	Int32 in value
+	param		v0		Int32 in value
+	param		v1		Int32 in value
+	param		v2		Int32 in value
+	param		v3		Int32 in value
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform1fv(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float32 in array [count]
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform2fv(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float32 in array [count]
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform3fv(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float32 in array [count]
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform4fv(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float32 in array [count]
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform1iv(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Int32 in array [count]
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform2iv(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Int32 in array [count]
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform3iv(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Int32 in array [count]
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform4iv(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Int32 in array [count]
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+UniformMatrix2fv(location, count, transpose, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [count]
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+UniformMatrix3fv(location, count, transpose, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [count]
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+UniformMatrix4fv(location, count, transpose, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [count]
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ValidateProgram(program)
+	return		void
+	param		program		UInt32 in value
+	category	VERSION_2_0
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttrib1d(index, x)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float64 in value
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	vectorequiv	VertexAttrib1dv
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		603
+
+VertexAttrib1dv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float64 in array [1]
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	extension	soft WINSOFT NV10
+	glxropcode	4197
+	offset		604
+
+VertexAttrib1f(index, x)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float32 in value
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	vectorequiv	VertexAttrib1fv
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		605
+
+VertexAttrib1fv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float32 in array [1]
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	extension	soft WINSOFT NV10
+	glxropcode	4193
+	offset		606
+
+VertexAttrib1s(index, x)
+	return		void
+	param		index		UInt32 in value
+	param		x		Int16 in value
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	vectorequiv	VertexAttrib1sv
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		607
+
+VertexAttrib1sv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int16 in array [1]
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	extension	soft WINSOFT NV10
+	glxropcode	4189
+	offset		608
+
+VertexAttrib2d(index, x, y)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	vectorequiv	VertexAttrib2dv
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		609
+
+VertexAttrib2dv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float64 in array [2]
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	extension	soft WINSOFT NV10
+	glxropcode	4198
+	offset		610
+
+VertexAttrib2f(index, x, y)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	vectorequiv	VertexAttrib2fv
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		611
+
+VertexAttrib2fv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float32 in array [2]
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	extension	soft WINSOFT NV10
+	glxropcode	4194
+	offset		612
+
+VertexAttrib2s(index, x, y)
+	return		void
+	param		index		UInt32 in value
+	param		x		Int16 in value
+	param		y		Int16 in value
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	vectorequiv	VertexAttrib2sv
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		613
+
+VertexAttrib2sv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int16 in array [2]
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	extension	soft WINSOFT NV10
+	glxropcode	4190
+	offset		614
+
+VertexAttrib3d(index, x, y, z)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	param		z		Float64 in value
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	vectorequiv	VertexAttrib3dv
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		615
+
+VertexAttrib3dv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float64 in array [3]
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	extension	soft WINSOFT NV10
+	glxropcode	4199
+	offset		616
+
+VertexAttrib3f(index, x, y, z)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	vectorequiv	VertexAttrib3fv
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		617
+
+VertexAttrib3fv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float32 in array [3]
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	extension	soft WINSOFT NV10
+	glxropcode	4195
+	offset		618
+
+VertexAttrib3s(index, x, y, z)
+	return		void
+	param		index		UInt32 in value
+	param		x		Int16 in value
+	param		y		Int16 in value
+	param		z		Int16 in value
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	vectorequiv	VertexAttrib3sv
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		619
+
+VertexAttrib3sv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int16 in array [3]
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	extension	soft WINSOFT NV10
+	glxropcode	4191
+	offset		620
+
+VertexAttrib4Nbv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int8 in array [4]
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		659
+
+VertexAttrib4Niv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int32 in array [4]
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		661
+
+VertexAttrib4Nsv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int16 in array [4]
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		660
+
+VertexAttrib4Nub(index, x, y, z, w)
+	return		void
+	param		index		UInt32 in value
+	param		x		UInt8 in value
+	param		y		UInt8 in value
+	param		z		UInt8 in value
+	param		w		UInt8 in value
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		627
+
+VertexAttrib4Nubv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt8 in array [4]
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	glxropcode	4201
+	offset		628
+
+VertexAttrib4Nuiv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt32 in array [4]
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		663
+
+VertexAttrib4Nusv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt16 in array [4]
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		662
+
+VertexAttrib4bv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int8 in array [4]
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		654
+
+VertexAttrib4d(index, x, y, z, w)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	param		z		Float64 in value
+	param		w		Float64 in value
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	vectorequiv	VertexAttrib4dv
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		621
+
+VertexAttrib4dv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float64 in array [4]
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	extension	soft WINSOFT NV10
+	glxropcode	4200
+	offset		622
+
+VertexAttrib4f(index, x, y, z, w)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	param		w		Float32 in value
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	vectorequiv	VertexAttrib4fv
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		623
+
+VertexAttrib4fv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float32 in array [4]
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	extension	soft WINSOFT NV10
+	glxropcode	4196
+	offset		624
+
+VertexAttrib4iv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int32 in array [4]
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		655
+
+VertexAttrib4s(index, x, y, z, w)
+	return		void
+	param		index		UInt32 in value
+	param		x		Int16 in value
+	param		y		Int16 in value
+	param		z		Int16 in value
+	param		w		Int16 in value
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	vectorequiv	VertexAttrib4sv
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		625
+
+VertexAttrib4sv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int16 in array [4]
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	glxropcode	4192
+	offset		626
+
+VertexAttrib4ubv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt8 in array [4]
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		656
+
+VertexAttrib4uiv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt32 in array [4]
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		658
+
+VertexAttrib4usv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt16 in array [4]
+	category	VERSION_2_0
+	version		2.0
+	deprecated	3.1
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		657
+
+VertexAttribPointer(index, size, type, normalized, stride, pointer)
+	return		void
+	param		index		UInt32 in value
+	param		size		Int32 in value
+	param		type		VertexAttribPointerTypeARB in value
+	param		normalized	Boolean in value
+	param		stride		SizeI in value
+	param		pointer		Void in array [COMPSIZE(size/type/stride)] retained
+	dlflags		notlistable
+	category	VERSION_2_0
+	version		2.0
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		664
+
+
+###############################################################################
+###############################################################################
+#
+# OpenGL 2.1 commands
+#
+###############################################################################
+###############################################################################
+
+# OpenGL 2.1 (ARB_pixel_buffer_object) commands - none
+
+# OpenGL 2.1 (EXT_texture_sRGB) commands - none
+
+# New commands in OpenGL 2.1
+
+UniformMatrix2x3fv(location, count, transpose, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [6]
+	category	VERSION_2_1
+	version		2.1
+	extension
+	glxropcode	305
+	glxflags	ignore
+	offset		?
+
+UniformMatrix3x2fv(location, count, transpose, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [6]
+	category	VERSION_2_1
+	version		2.1
+	extension
+	glxropcode	306
+	offset		?
+
+UniformMatrix2x4fv(location, count, transpose, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [8]
+	category	VERSION_2_1
+	version		2.1
+	extension
+	glxropcode	307
+	offset		?
+
+UniformMatrix4x2fv(location, count, transpose, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [8]
+	category	VERSION_2_1
+	version		2.1
+	extension
+	glxropcode	308
+	offset		?
+
+UniformMatrix3x4fv(location, count, transpose, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [12]
+	category	VERSION_2_1
+	version		2.1
+	extension
+	glxropcode	309
+	offset		?
+
+UniformMatrix4x3fv(location, count, transpose, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [12]
+	category	VERSION_2_1
+	version		2.1
+	extension
+	glxropcode	310
+	offset		?
+
+###############################################################################
+###############################################################################
+#
+# OpenGL 3.0 commands
+#
+###############################################################################
+###############################################################################
+
+# OpenGL 3.0 (EXT_draw_buffers2) commands
+
+ColorMaski(index, r, g, b, a)
+	return		void
+	param		index		UInt32 in value
+	param		r		Boolean in value
+	param		g		Boolean in value
+	param		b		Boolean in value
+	param		a		Boolean in value
+	category	VERSION_3_0
+	version		3.0
+	extension
+	glxflags	ignore
+	glfflags	ignore
+
+GetBooleani_v(target, index, data)
+	return		void
+	param		target		GLenum in value
+	param		index		UInt32 in value
+	param		data		Boolean out array [COMPSIZE(target)]
+	category	VERSION_3_0
+	version		3.0
+	extension
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+
+GetIntegeri_v(target, index, data)
+	return		void
+	param		target		GLenum in value
+	param		index		UInt32 in value
+	param		data		Int32 out array [COMPSIZE(target)]
+	category	VERSION_3_0
+	version		3.0
+	extension
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+
+Enablei(target, index)
+	return		void
+	param		target		GLenum in value
+	param		index		UInt32 in value
+	category	VERSION_3_0
+	version		3.0
+	extension
+	glxflags	ignore
+	glfflags	ignore
+
+Disablei(target, index)
+	return		void
+	param		target		GLenum in value
+	param		index		UInt32 in value
+	category	VERSION_3_0
+	version		3.0
+	extension
+	glxflags	ignore
+	glfflags	ignore
+
+IsEnabledi(target, index)
+	return		Boolean
+	param		target		GLenum in value
+	param		index		UInt32 in value
+	category	VERSION_3_0
+	version		3.0
+	extension
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+
+# OpenGL 3.0 (EXT_transform_feedback) commands
+
+BeginTransformFeedback(primitiveMode)
+	return		void
+	param		primitiveMode	GLenum in value
+	category	VERSION_3_0
+	version		3.0
+	extension
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+
+EndTransformFeedback()
+	return		void
+	category	VERSION_3_0
+	version		3.0
+	extension
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+
+BindBufferRange(target, index, buffer, offset, size)
+	return		void
+	param		target		GLenum in value
+	param		index		UInt32 in value
+	param		buffer		UInt32 in value
+	param		offset		BufferOffset in value
+	param		size		BufferSize in value
+	category	VERSION_3_0
+	version		3.0
+	extension
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+
+BindBufferBase(target, index, buffer)
+	return		void
+	param		target		GLenum in value
+	param		index		UInt32 in value
+	param		buffer		UInt32 in value
+	category	VERSION_3_0
+	version		3.0
+	extension
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+
+TransformFeedbackVaryings(program, count, varyings, bufferMode)
+	return		void
+	param		program		UInt32 in value
+	param		count		SizeI in value
+	param		varyings	ConstCharPointer in array [count]
+	param		bufferMode	GLenum in value
+	category	VERSION_3_0
+	version		3.0
+	extension
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+
+GetTransformFeedbackVarying(program, index, bufSize, length, size, type, name)
+	return		void
+	param		program		UInt32 in value
+	param		index		UInt32 in value
+	param		bufSize		SizeI in value
+	param		length		SizeI out array [1]
+	param		size		SizeI out array [1]
+	param		type		GLenum out array [1]
+	param		name		Char out array [COMPSIZE(length)]
+	category	VERSION_3_0
+	dlflags		notlistable
+	version		3.0
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+ClampColor(target, clamp)
+	return		void
+	param		target		ClampColorTargetARB in value
+	param		clamp		ClampColorModeARB in value
+	category	VERSION_3_0
+	version		3.0
+	extension
+	glxropcode	234
+	glxflags	ignore
+	offset		?
+
+BeginConditionalRender(id, mode)
+	return		void
+	param		id		UInt32 in value
+	param		mode		TypeEnum in value
+	category	VERSION_3_0
+	version		3.0
+	glfflags	ignore
+	glxflags	ignore
+
+EndConditionalRender()
+	return		void
+	category	VERSION_3_0
+	version		3.0
+	glfflags	ignore
+	glxflags	ignore
+
+VertexAttribIPointer(index, size, type, stride, pointer)
+	return		void
+	param		index		UInt32 in value
+	param		size		Int32 in value
+	param		type		VertexAttribEnum in value
+	param		stride		SizeI in value
+	param		pointer		Void in array [COMPSIZE(size/type/stride)] retained
+	category	VERSION_3_0
+	version		3.0
+	dlflags		notlistable
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+GetVertexAttribIiv(index, pname, params)
+	return		void
+	param		index		UInt32 in value
+	param		pname		VertexAttribEnum in value
+	param		params		Int32 out array [1]
+	category	VERSION_3_0
+	version		3.0
+	dlflags		notlistable
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+GetVertexAttribIuiv(index, pname, params)
+	return		void
+	param		index		UInt32 in value
+	param		pname		VertexAttribEnum in value
+	param		params		UInt32 out array [1]
+	category	VERSION_3_0
+	version		3.0
+	dlflags		notlistable
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+# OpenGL 3.0 (NV_vertex_program4) commands
+
+VertexAttribI1i(index, x)
+	return		void
+	param		index		UInt32 in value
+	param		x		Int32 in value
+	category	VERSION_3_0
+	version		3.0
+	deprecated	3.1
+	beginend	allow-inside
+	vectorequiv	VertexAttribI1iv
+	glxvectorequiv	VertexAttribI1iv
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+VertexAttribI2i(index, x, y)
+	return		void
+	param		index		UInt32 in value
+	param		x		Int32 in value
+	param		y		Int32 in value
+	category	VERSION_3_0
+	version		3.0
+	deprecated	3.1
+	beginend	allow-inside
+	vectorequiv	VertexAttribI2iv
+	glxvectorequiv	VertexAttribI2iv
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+VertexAttribI3i(index, x, y, z)
+	return		void
+	param		index		UInt32 in value
+	param		x		Int32 in value
+	param		y		Int32 in value
+	param		z		Int32 in value
+	category	VERSION_3_0
+	version		3.0
+	deprecated	3.1
+	beginend	allow-inside
+	vectorequiv	VertexAttribI3iv
+	glxvectorequiv	VertexAttribI3iv
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+VertexAttribI4i(index, x, y, z, w)
+	return		void
+	param		index		UInt32 in value
+	param		x		Int32 in value
+	param		y		Int32 in value
+	param		z		Int32 in value
+	param		w		Int32 in value
+	category	VERSION_3_0
+	version		3.0
+	deprecated	3.1
+	beginend	allow-inside
+	vectorequiv	VertexAttribI4iv
+	glxvectorequiv	VertexAttribI4iv
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+VertexAttribI1ui(index, x)
+	return		void
+	param		index		UInt32 in value
+	param		x		UInt32 in value
+	category	VERSION_3_0
+	version		3.0
+	deprecated	3.1
+	beginend	allow-inside
+	vectorequiv	VertexAttribI1uiv
+	glxvectorequiv	VertexAttribI1uiv
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+VertexAttribI2ui(index, x, y)
+	return		void
+	param		index		UInt32 in value
+	param		x		UInt32 in value
+	param		y		UInt32 in value
+	category	VERSION_3_0
+	version		3.0
+	deprecated	3.1
+	beginend	allow-inside
+	vectorequiv	VertexAttribI2uiv
+	glxvectorequiv	VertexAttribI2uiv
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+VertexAttribI3ui(index, x, y, z)
+	return		void
+	param		index		UInt32 in value
+	param		x		UInt32 in value
+	param		y		UInt32 in value
+	param		z		UInt32 in value
+	category	VERSION_3_0
+	version		3.0
+	deprecated	3.1
+	beginend	allow-inside
+	vectorequiv	VertexAttribI3uiv
+	glxvectorequiv	VertexAttribI3uiv
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+VertexAttribI4ui(index, x, y, z, w)
+	return		void
+	param		index		UInt32 in value
+	param		x		UInt32 in value
+	param		y		UInt32 in value
+	param		z		UInt32 in value
+	param		w		UInt32 in value
+	category	VERSION_3_0
+	version		3.0
+	deprecated	3.1
+	beginend	allow-inside
+	vectorequiv	VertexAttribI4uiv
+	glxvectorequiv	VertexAttribI4uiv
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+VertexAttribI1iv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int32 in array [1]
+	category	VERSION_3_0
+	version		3.0
+	deprecated	3.1
+	beginend	allow-inside
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+VertexAttribI2iv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int32 in array [2]
+	category	VERSION_3_0
+	version		3.0
+	deprecated	3.1
+	beginend	allow-inside
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+VertexAttribI3iv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int32 in array [3]
+	category	VERSION_3_0
+	version		3.0
+	deprecated	3.1
+	beginend	allow-inside
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+VertexAttribI4iv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int32 in array [4]
+	category	VERSION_3_0
+	version		3.0
+	deprecated	3.1
+	beginend	allow-inside
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+VertexAttribI1uiv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt32 in array [1]
+	category	VERSION_3_0
+	version		3.0
+	deprecated	3.1
+	beginend	allow-inside
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+VertexAttribI2uiv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt32 in array [2]
+	category	VERSION_3_0
+	version		3.0
+	deprecated	3.1
+	beginend	allow-inside
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+VertexAttribI3uiv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt32 in array [3]
+	category	VERSION_3_0
+	version		3.0
+	deprecated	3.1
+	beginend	allow-inside
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+VertexAttribI4uiv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt32 in array [4]
+	category	VERSION_3_0
+	version		3.0
+	deprecated	3.1
+	beginend	allow-inside
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+VertexAttribI4bv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int8 in array [4]
+	category	VERSION_3_0
+	version		3.0
+	deprecated	3.1
+	beginend	allow-inside
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+VertexAttribI4sv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int16 in array [4]
+	category	VERSION_3_0
+	version		3.0
+	deprecated	3.1
+	beginend	allow-inside
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+VertexAttribI4ubv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt8 in array [4]
+	category	VERSION_3_0
+	version		3.0
+	deprecated	3.1
+	beginend	allow-inside
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+VertexAttribI4usv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt16 in array [4]
+	category	VERSION_3_0
+	version		3.0
+	deprecated	3.1
+	beginend	allow-inside
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+# OpenGL 3.0 (EXT_gpu_shader4) commands
+
+GetUniformuiv(program, location, params)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		params		UInt32 out array [COMPSIZE(program/location)]
+	category	VERSION_3_0
+	dlflags		notlistable
+	version		3.0
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+BindFragDataLocation(program, color, name)
+	return		void
+	param		program		UInt32 in value
+	param		color		UInt32 in value
+	param		name		Char in array [COMPSIZE(name)]
+	category	VERSION_3_0
+	dlflags		notlistable
+	version		3.0
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+GetFragDataLocation(program, name)
+	return		Int32
+	param		program		UInt32 in value
+	param		name		Char in array [COMPSIZE(name)]
+	category	VERSION_3_0
+	dlflags		notlistable
+	version		3.0
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+Uniform1ui(location, v0)
+	return		void
+	param		location	Int32 in value
+	param		v0		UInt32 in value
+	category	VERSION_3_0
+	version		3.0
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+Uniform2ui(location, v0, v1)
+	return		void
+	param		location	Int32 in value
+	param		v0		UInt32 in value
+	param		v1		UInt32 in value
+	category	VERSION_3_0
+	version		3.0
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+Uniform3ui(location, v0, v1, v2)
+	return		void
+	param		location	Int32 in value
+	param		v0		UInt32 in value
+	param		v1		UInt32 in value
+	param		v2		UInt32 in value
+	category	VERSION_3_0
+	version		3.0
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+Uniform4ui(location, v0, v1, v2, v3)
+	return		void
+	param		location	Int32 in value
+	param		v0		UInt32 in value
+	param		v1		UInt32 in value
+	param		v2		UInt32 in value
+	param		v3		UInt32 in value
+	category	VERSION_3_0
+	version		3.0
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+Uniform1uiv(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt32 in array [count]
+	category	VERSION_3_0
+	version		3.0
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+Uniform2uiv(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt32 in array [count*2]
+	category	VERSION_3_0
+	version		3.0
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+Uniform3uiv(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt32 in array [count*3]
+	category	VERSION_3_0
+	version		3.0
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+Uniform4uiv(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt32 in array [count*4]
+	category	VERSION_3_0
+	version		3.0
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+# OpenGL 3.0 (EXT_texture_integer) commands
+
+TexParameterIiv(target, pname, params)
+	return		void
+	param		target		TextureTarget in value
+	param		pname		TextureParameterName in value
+	param		params		Int32 in array [COMPSIZE(pname)]
+	category	VERSION_3_0
+	version		3.0
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+TexParameterIuiv(target, pname, params)
+	return		void
+	param		target		TextureTarget in value
+	param		pname		TextureParameterName in value
+	param		params		UInt32 in array [COMPSIZE(pname)]
+	category	VERSION_3_0
+	version		3.0
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+GetTexParameterIiv(target, pname, params)
+	return		void
+	param		target		TextureTarget in value
+	param		pname		GetTextureParameter in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	VERSION_3_0
+	dlflags		notlistable
+	version		3.0
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+GetTexParameterIuiv(target, pname, params)
+	return		void
+	param		target		TextureTarget in value
+	param		pname		GetTextureParameter in value
+	param		params		UInt32 out array [COMPSIZE(pname)]
+	category	VERSION_3_0
+	dlflags		notlistable
+	version		3.0
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+# New commands in OpenGL 3.0
+
+ClearBufferiv(buffer, drawbuffer, value)
+	return		void
+	param		buffer		GLenum in value
+	param		drawbuffer	DrawBufferName in value
+	param		value		Int32 in array [COMPSIZE(buffer)]
+	category	VERSION_3_0
+	version		3.0
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+ClearBufferuiv(buffer, drawbuffer, value)
+	return		void
+	param		buffer		GLenum in value
+	param		drawbuffer	DrawBufferName in value
+	param		value		UInt32 in array [COMPSIZE(buffer)]
+	category	VERSION_3_0
+	version		3.0
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+ClearBufferfv(buffer, drawbuffer, value)
+	return		void
+	param		buffer		GLenum in value
+	param		drawbuffer	DrawBufferName in value
+	param		value		Float32 in array [COMPSIZE(buffer)]
+	category	VERSION_3_0
+	version		3.0
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+ClearBufferfi(buffer, drawbuffer, depth, stencil)
+	return		void
+	param		buffer		GLenum in value
+	param		drawbuffer	DrawBufferName in value
+	param		depth		Float32 in value
+	param		stencil		Int32 in value
+	category	VERSION_3_0
+	version		3.0
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+GetStringi(name, index)
+	return		String
+	param		name		GLenum in value
+	param		index		UInt32 in value
+	category	VERSION_3_0
+	version		3.0
+	extension
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode
+	glfflags	ignore
+	glxsingle	?
+
+passthru: /* OpenGL 3.0 also reuses entry points from these extensions: */
+passthru: /* ARB_framebuffer_object */
+passthru: /* ARB_map_buffer_range */
+passthru: /* ARB_vertex_array_object */
+
+###############################################################################
+###############################################################################
+#
+# OpenGL 3.0 deprecated commands
+#
+###############################################################################
+###############################################################################
+
+# (none - VertexAttribI* were moved back into non-deprecated)
+
+
+###############################################################################
+###############################################################################
+#
+# OpenGL 3.1 commands
+#
+###############################################################################
+###############################################################################
+
+# New commands in OpenGL 3.1 - none
+
+# OpenGL 3.1 (ARB_draw_instanced) commands
+
+DrawArraysInstanced(mode, first, count, instancecount)
+	return		void
+	param		mode		BeginMode in value
+	param		first		Int32 in value
+	param		count		SizeI in value
+	param		instancecount	SizeI in value
+	category	VERSION_3_1
+	version		3.1
+	extension
+	dlflags		notlistable
+	vectorequiv	ArrayElement
+	glfflags	ignore
+	glxflags	ignore
+
+DrawElementsInstanced(mode, count, type, indices, instancecount)
+	return		void
+	param		mode		BeginMode in value
+	param		count		SizeI in value
+	param		type		DrawElementsType in value
+	param		indices		Void in array [COMPSIZE(count/type)]
+	param		instancecount	SizeI in value
+	category	VERSION_3_1
+	version		3.1
+	extension
+	dlflags		notlistable
+	vectorequiv	ArrayElement
+	glfflags	ignore
+	glxflags	ignore
+
+# OpenGL 3.1 (ARB_texture_buffer_object) commands
+
+TexBuffer(target, internalformat, buffer)
+	return		void
+	param		target		TextureTarget in value
+	param		internalformat	GLenum in value
+	param		buffer		UInt32 in value
+	category	VERSION_3_1
+	version		3.1
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+# OpenGL 3.1 (ARB_texture_rectangle) commands - none
+
+# OpenGL 3.1 (SNORM texture) commands - none
+
+# OpenGL 3.1 (NV_primitive_restart) commands
+# This is *not* an alias of PrimitiveRestartIndexNV, since it sets
+# server instead of client state.
+
+PrimitiveRestartIndex(index)
+	return		void
+	param		index		UInt32 in value
+	category	VERSION_3_1
+	version		3.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+passthru: /* OpenGL 3.1 also reuses entry points from these extensions: */
+passthru: /* ARB_copy_buffer */
+passthru: /* ARB_uniform_buffer_object */
+
+
+###############################################################################
+###############################################################################
+#
+# OpenGL 3.2 commands
+#
+###############################################################################
+###############################################################################
+
+# New commands in OpenGL 3.2
+
+GetInteger64i_v(target, index, data)
+	return		void
+	param		target		GLenum in value
+	param		index		UInt32 in value
+	param		data		Int64 out array [COMPSIZE(target)]
+	category	VERSION_3_2
+	version		3.2
+	extension
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+
+
+GetBufferParameteri64v(target, pname, params)
+	return		void
+	param		target		BufferTargetARB in value
+	param		pname		BufferPNameARB in value
+	param		params		Int64 out array [COMPSIZE(pname)]
+	category	VERSION_3_2
+	dlflags		notlistable
+	version		3.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+
+# OpenGL 3.2 (ARB_depth_clamp) commands - none
+# OpenGL 3.2 (ARB_fragment_coord_conventions) commands - none
+
+# OpenGL 3.2 (ARB_geometry_shader4) commands
+# ProgramParameteriARB was NOT promoted to core 3.2, but
+# IS part of core 4.1 through other ARB extensions.
+
+FramebufferTexture(target, attachment, texture, level)
+	return		void
+	param		target		GLenum in value
+	param		attachment	GLenum in value
+	param		texture		UInt32 in value
+	param		level		Int32 in value
+	category	VERSION_3_2
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+# FramebufferTextureLayer already declared in ARB_framebuffer_object
+# FramebufferTextureLayer(target, attachment, texture, level, layer)
+
+# Not promoted to the core along with the rest
+# FramebufferTextureFace(target, attachment, texture, level, face)
+
+# OpenGL 3.2  (ARB_seamless_cube_map) commands - none
+# OpenGL 3.2  (ARB_vertex_array_bgra) commands - none
+
+passthru: /* OpenGL 3.2 also reuses entry points from these extensions: */
+passthru: /* ARB_draw_elements_base_vertex */
+passthru: /* ARB_provoking_vertex */
+passthru: /* ARB_sync */
+passthru: /* ARB_texture_multisample */
+
+
+###############################################################################
+###############################################################################
+#
+# OpenGL 3.3 commands
+#
+###############################################################################
+###############################################################################
+
+# New commands in OpenGL 3.3
+
+# OpenGL 3.3 (ARB_instanced_arrays) commands
+
+VertexAttribDivisor(index, divisor)
+	return		void
+	param		index		UInt32 in value
+	param		divisor		UInt32 in value
+	category	VERSION_3_3
+	version		1.1
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+passthru: /* OpenGL 3.3 also reuses entry points from these extensions: */
+passthru: /* ARB_blend_func_extended */
+passthru: /* ARB_sampler_objects */
+passthru: /* ARB_explicit_attrib_location, but it has none */
+passthru: /* ARB_occlusion_query2 (no entry points) */
+passthru: /* ARB_shader_bit_encoding (no entry points) */
+passthru: /* ARB_texture_rgb10_a2ui (no entry points) */
+passthru: /* ARB_texture_swizzle (no entry points) */
+passthru: /* ARB_timer_query */
+passthru: /* ARB_vertex_type_2_10_10_10_rev */
+
+
+###############################################################################
+###############################################################################
+#
+# OpenGL 4.0 commands
+#
+###############################################################################
+###############################################################################
+
+# New commands in OpenGL 4.0
+
+# OpenGL 4.0 (ARB_sample_shading) commands
+
+MinSampleShading(value)
+	return		void
+	param		value		ColorF in value
+	category	VERSION_4_0
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+# OpenGL 4.0 (ARB_draw_buffers_blend) commands
+
+BlendEquationi(buf, mode)
+	return		void
+	param		buf		UInt32 in value
+	param		mode		GLenum in value
+	category	VERSION_4_0
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+BlendEquationSeparatei(buf, modeRGB, modeAlpha)
+	return		void
+	param		buf		UInt32 in value
+	param		modeRGB		GLenum in value
+	param		modeAlpha	GLenum in value
+	category	VERSION_4_0
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+BlendFunci(buf, src, dst)
+	return		void
+	param		buf		UInt32 in value
+	param		src		GLenum in value
+	param		dst		GLenum in value
+	category	VERSION_4_0
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+BlendFuncSeparatei(buf, srcRGB, dstRGB, srcAlpha, dstAlpha)
+	return		void
+	param		buf		UInt32 in value
+	param		srcRGB		GLenum in value
+	param		dstRGB		GLenum in value
+	param		srcAlpha	GLenum in value
+	param		dstAlpha	GLenum in value
+	category	VERSION_4_0
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+passthru: /* OpenGL 4.0 also reuses entry points from these extensions: */
+passthru: /* ARB_texture_query_lod (no entry points) */
+passthru: /* ARB_draw_indirect */
+passthru: /* ARB_gpu_shader5 (no entry points) */
+passthru: /* ARB_gpu_shader_fp64 */
+passthru: /* ARB_shader_subroutine */
+passthru: /* ARB_tessellation_shader */
+passthru: /* ARB_texture_buffer_object_rgb32 (no entry points) */
+passthru: /* ARB_texture_cube_map_array (no entry points) */
+passthru: /* ARB_texture_gather (no entry points) */
+passthru: /* ARB_transform_feedback2 */
+passthru: /* ARB_transform_feedback3 */
+
+
+###############################################################################
+###############################################################################
+#
+# OpenGL 4.1 commands
+#
+###############################################################################
+###############################################################################
+
+# New commands in OpenGL 4.1 - none
+newcategory: VERSION_4_1
+
+passthru: /* OpenGL 4.1 reuses entry points from these extensions: */
+passthru: /* ARB_ES2_compatibility */
+passthru: /* ARB_get_program_binary */
+passthru: /* ARB_separate_shader_objects */
+passthru: /* ARB_shader_precision (no entry points) */
+passthru: /* ARB_vertex_attrib_64bit */
+passthru: /* ARB_viewport_array */
+
+
+###############################################################################
+###############################################################################
+#
+# OpenGL 4.2 commands
+#
+###############################################################################
+###############################################################################
+
+# New commands in OpenGL 4.2 - none
+newcategory: VERSION_4_2
+
+passthru: /* OpenGL 4.2 reuses entry points from these extensions: */
+passthru: /* ARB_base_instance */
+passthru: /* ARB_shading_language_420pack (no entry points) */
+passthru: /* ARB_transform_feedback_instanced */
+passthru: /* ARB_compressed_texture_pixel_storage (no entry points) */
+passthru: /* ARB_conservative_depth (no entry points) */
+passthru: /* ARB_internalformat_query */
+passthru: /* ARB_map_buffer_alignment (no entry points) */
+passthru: /* ARB_shader_atomic_counters */
+passthru: /* ARB_shader_image_load_store */
+passthru: /* ARB_shading_language_packing (no entry points) */
+passthru: /* ARB_texture_storage */
+
+
+###############################################################################
+###############################################################################
+#
+# OpenGL 4.3 commands
+#
+###############################################################################
+###############################################################################
+
+# New commands in OpenGL 4.3 - none
+newcategory: VERSION_4_3
+
+passthru: /* OpenGL 4.3 reuses entry points from these extensions: */
+passthru: /* ARB_arrays_of_arrays (no entry points, GLSL only) */
+passthru: /* ARB_fragment_layer_viewport (no entry points, GLSL only) */
+passthru: /* ARB_shader_image_size (no entry points, GLSL only) */
+passthru: /* ARB_ES3_compatibility (no entry points) */
+passthru: /* ARB_clear_buffer_object */
+passthru: /* ARB_compute_shader */
+passthru: /* ARB_copy_image */
+passthru: /* KHR_debug (includes ARB_debug_output commands promoted to KHR without suffixes) */
+passthru: /* ARB_explicit_uniform_location (no entry points) */
+passthru: /* ARB_framebuffer_no_attachments */
+passthru: /* ARB_internalformat_query2 */
+passthru: /* ARB_invalidate_subdata */
+passthru: /* ARB_multi_draw_indirect */
+passthru: /* ARB_program_interface_query */
+passthru: /* ARB_robust_buffer_access_behavior (no entry points) */
+passthru: /* ARB_shader_storage_buffer_object */
+passthru: /* ARB_stencil_texturing (no entry points) */
+passthru: /* ARB_texture_buffer_range */
+passthru: /* ARB_texture_query_levels (no entry points) */
+passthru: /* ARB_texture_storage_multisample */
+passthru: /* ARB_texture_view */
+passthru: /* ARB_vertex_attrib_binding */
+
+###############################################################################
+###############################################################################
+#
+# ARB extensions, in order by ARB extension number
+#
+###############################################################################
+###############################################################################
+
+###############################################################################
+#
+# ARB Extension #1
+# ARB_multitexture commands
+#
+###############################################################################
+
+ActiveTextureARB(texture)
+	return		void
+	param		texture		TextureUnit in value
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	glxropcode	197
+	alias		ActiveTexture
+
+ClientActiveTextureARB(texture)
+	return		void
+	param		texture		TextureUnit in value
+	category	ARB_multitexture
+	dlflags		notlistable
+	glxflags	ARB client-handcode client-intercept server-handcode
+	version		1.2
+	alias		ClientActiveTexture
+
+MultiTexCoord1dARB(target, s)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordD in value
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	vectorequiv	MultiTexCoord1dv
+
+MultiTexCoord1dvARB(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordD in array [1]
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	glxropcode	198
+	alias		MultiTexCoord1dv
+
+MultiTexCoord1fARB(target, s)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordF in value
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	vectorequiv	MultiTexCoord1fv
+
+MultiTexCoord1fvARB(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordF in array [1]
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	glxropcode	199
+	alias		MultiTexCoord1fv
+
+MultiTexCoord1iARB(target, s)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordI in value
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	vectorequiv	MultiTexCoord1iv
+
+MultiTexCoord1ivARB(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordI in array [1]
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	glxropcode	200
+	alias		MultiTexCoord1iv
+
+MultiTexCoord1sARB(target, s)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordS in value
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	vectorequiv	MultiTexCoord1sv
+
+MultiTexCoord1svARB(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordS in array [1]
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	glxropcode	201
+	alias		MultiTexCoord1sv
+
+MultiTexCoord2dARB(target, s, t)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordD in value
+	param		t		CoordD in value
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	vectorequiv	MultiTexCoord2dv
+
+MultiTexCoord2dvARB(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordD in array [2]
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	glxropcode	202
+	alias		MultiTexCoord2dv
+
+MultiTexCoord2fARB(target, s, t)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordF in value
+	param		t		CoordF in value
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	vectorequiv	MultiTexCoord2fv
+
+MultiTexCoord2fvARB(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordF in array [2]
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	glxropcode	203
+	alias		MultiTexCoord2fv
+
+MultiTexCoord2iARB(target, s, t)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordI in value
+	param		t		CoordI in value
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	vectorequiv	MultiTexCoord2iv
+
+MultiTexCoord2ivARB(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordI in array [2]
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	glxropcode	204
+	alias		MultiTexCoord2iv
+
+MultiTexCoord2sARB(target, s, t)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordS in value
+	param		t		CoordS in value
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	vectorequiv	MultiTexCoord2sv
+
+MultiTexCoord2svARB(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordS in array [2]
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	glxropcode	205
+	alias		MultiTexCoord2sv
+
+MultiTexCoord3dARB(target, s, t, r)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordD in value
+	param		t		CoordD in value
+	param		r		CoordD in value
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	vectorequiv	MultiTexCoord3dv
+
+MultiTexCoord3dvARB(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordD in array [3]
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	glxropcode	206
+	alias		MultiTexCoord3dv
+
+MultiTexCoord3fARB(target, s, t, r)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordF in value
+	param		t		CoordF in value
+	param		r		CoordF in value
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	vectorequiv	MultiTexCoord3fv
+
+MultiTexCoord3fvARB(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordF in array [3]
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	glxropcode	207
+	alias		MultiTexCoord3fv
+
+MultiTexCoord3iARB(target, s, t, r)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordI in value
+	param		t		CoordI in value
+	param		r		CoordI in value
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	vectorequiv	MultiTexCoord3iv
+
+MultiTexCoord3ivARB(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordI in array [3]
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	glxropcode	208
+	alias		MultiTexCoord3iv
+
+MultiTexCoord3sARB(target, s, t, r)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordS in value
+	param		t		CoordS in value
+	param		r		CoordS in value
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	vectorequiv	MultiTexCoord3sv
+
+MultiTexCoord3svARB(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordS in array [3]
+	category	ARB_multitexture
+	version		1.2
+	glxflags	ARB
+	glxropcode	209
+	alias		MultiTexCoord3sv
+
+MultiTexCoord4dARB(target, s, t, r, q)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordD in value
+	param		t		CoordD in value
+	param		r		CoordD in value
+	param		q		CoordD in value
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	vectorequiv	MultiTexCoord4dv
+
+MultiTexCoord4dvARB(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordD in array [4]
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	glxropcode	210
+	alias		MultiTexCoord4dv
+
+MultiTexCoord4fARB(target, s, t, r, q)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordF in value
+	param		t		CoordF in value
+	param		r		CoordF in value
+	param		q		CoordF in value
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	vectorequiv	MultiTexCoord4fv
+
+MultiTexCoord4fvARB(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordF in array [4]
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	glxropcode	211
+	alias		MultiTexCoord4fv
+
+MultiTexCoord4iARB(target, s, t, r, q)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordI in value
+	param		t		CoordI in value
+	param		r		CoordI in value
+	param		q		CoordI in value
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	vectorequiv	MultiTexCoord4iv
+
+MultiTexCoord4ivARB(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordI in array [4]
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	glxropcode	212
+	alias		MultiTexCoord4iv
+
+MultiTexCoord4sARB(target, s, t, r, q)
+	return		void
+	param		target		TextureUnit in value
+	param		s		CoordS in value
+	param		t		CoordS in value
+	param		r		CoordS in value
+	param		q		CoordS in value
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	vectorequiv	MultiTexCoord4sv
+
+MultiTexCoord4svARB(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		CoordS in array [4]
+	category	ARB_multitexture
+	glxflags	ARB
+	version		1.2
+	glxropcode	213
+	alias		MultiTexCoord4sv
+
+################################################################################
+#
+# ARB Extension #2 - GLX_ARB_get_proc_address
+#
+###############################################################################
+
+################################################################################
+#
+# ARB Extension #3
+# ARB_transpose_matrix commands
+#
+###############################################################################
+
+LoadTransposeMatrixfARB(m)
+	return		void
+	param		m		Float32 in array [16]
+	category	ARB_transpose_matrix
+	glxflags	ARB client-handcode client-intercept server-handcode
+	version		1.2
+	alias		LoadTransposeMatrixf
+
+LoadTransposeMatrixdARB(m)
+	return		void
+	param		m		Float64 in array [16]
+	category	ARB_transpose_matrix
+	glxflags	ARB client-handcode client-intercept server-handcode
+	version		1.2
+	alias		LoadTransposeMatrixd
+
+MultTransposeMatrixfARB(m)
+	return		void
+	param		m		Float32 in array [16]
+	category	ARB_transpose_matrix
+	glxflags	ARB client-handcode client-intercept server-handcode
+	version		1.2
+	alias		MultTransposeMatrixf
+
+MultTransposeMatrixdARB(m)
+	return		void
+	param		m		Float64 in array [16]
+	category	ARB_transpose_matrix
+	glxflags	ARB client-handcode client-intercept server-handcode
+	version		1.2
+	alias		MultTransposeMatrixd
+
+################################################################################
+#
+# ARB Extension #4 - WGL_ARB_buffer_region
+#
+###############################################################################
+
+################################################################################
+#
+# ARB Extension #5
+# ARB_multisample commands
+#
+###############################################################################
+
+SampleCoverageARB(value, invert)
+	return		void
+	param		value		Float32 in value
+	param		invert		Boolean in value
+	category	ARB_multisample
+	glxflags	ARB
+	version		1.2
+	alias		SampleCoverage
+
+################################################################################
+#
+# ARB Extension #6
+# ARB_texture_env_add commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_texture_env_add
+
+################################################################################
+#
+# ARB Extension #7
+# ARB_texture_cube_map commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_texture_cube_map
+
+################################################################################
+#
+# ARB Extension #8 - WGL_ARB_extensions_string
+# ARB Extension #9 - WGL_ARB_pixel_format commands
+# ARB Extension #10 - WGL_ARB_make_current_read commands
+# ARB Extension #11 - WGL_ARB_pbuffer
+#
+###############################################################################
+
+################################################################################
+#
+# ARB Extension #12
+# ARB_texture_compression commands
+#
+###############################################################################
+
+# Arguably TexelInternalFormat, not PixelInternalFormat
+CompressedTexImage3DARB(target, level, internalformat, width, height, depth, border, imageSize, data)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	PixelInternalFormat in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		border		CheckedInt32 in value
+	param		imageSize	SizeI in value
+	param		data		CompressedTextureARB in array [imageSize]
+	category	ARB_texture_compression
+	dlflags		handcode
+	glxflags	ARB client-handcode server-handcode
+	version		1.2
+	glxropcode	216
+	alias		CompressedTexImage3D
+	wglflags	client-handcode server-handcode
+
+# Arguably TexelInternalFormat, not PixelInternalFormat
+CompressedTexImage2DARB(target, level, internalformat, width, height, border, imageSize, data)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	PixelInternalFormat in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		border		CheckedInt32 in value
+	param		imageSize	SizeI in value
+	param		data		CompressedTextureARB in array [imageSize]
+	category	ARB_texture_compression
+	dlflags		handcode
+	glxflags	ARB client-handcode server-handcode
+	version		1.2
+	glxropcode	215
+	alias		CompressedTexImage2D
+	wglflags	client-handcode server-handcode
+
+# Arguably TexelInternalFormat, not PixelInternalFormat
+CompressedTexImage1DARB(target, level, internalformat, width, border, imageSize, data)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	PixelInternalFormat in value
+	param		width		SizeI in value
+	param		border		CheckedInt32 in value
+	param		imageSize	SizeI in value
+	param		data		CompressedTextureARB in array [imageSize]
+	category	ARB_texture_compression
+	dlflags		handcode
+	glxflags	ARB client-handcode server-handcode
+	version		1.2
+	glxropcode	214
+	alias		CompressedTexImage1D
+	wglflags	client-handcode server-handcode
+
+CompressedTexSubImage3DARB(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		yoffset		CheckedInt32 in value
+	param		zoffset		CheckedInt32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		format		PixelFormat in value
+	param		imageSize	SizeI in value
+	param		data		CompressedTextureARB in array [imageSize]
+	category	ARB_texture_compression
+	dlflags		handcode
+	glxflags	ARB client-handcode server-handcode
+	version		1.2
+	glxropcode	219
+	alias		CompressedTexSubImage3D
+	wglflags	client-handcode server-handcode
+
+CompressedTexSubImage2DARB(target, level, xoffset, yoffset, width, height, format, imageSize, data)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		yoffset		CheckedInt32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		format		PixelFormat in value
+	param		imageSize	SizeI in value
+	param		data		CompressedTextureARB in array [imageSize]
+	category	ARB_texture_compression
+	dlflags		handcode
+	glxflags	ARB client-handcode server-handcode
+	version		1.2
+	glxropcode	218
+	alias		CompressedTexSubImage2D
+	wglflags	client-handcode server-handcode
+
+CompressedTexSubImage1DARB(target, level, xoffset, width, format, imageSize, data)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		width		SizeI in value
+	param		format		PixelFormat in value
+	param		imageSize	SizeI in value
+	param		data		CompressedTextureARB in array [imageSize]
+	category	ARB_texture_compression
+	dlflags		handcode
+	glxflags	ARB client-handcode server-handcode
+	version		1.2
+	glxropcode	217
+	alias		CompressedTexSubImage1D
+	wglflags	client-handcode server-handcode
+
+GetCompressedTexImageARB(target, level, img)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		img		CompressedTextureARB out array [COMPSIZE(target/level)]
+	category	ARB_texture_compression
+	dlflags		notlistable
+	glxflags	ARB client-handcode server-handcode
+	version		1.2
+	glxsingle	160
+	alias		GetCompressedTexImage
+	wglflags	client-handcode server-handcode
+
+################################################################################
+#
+# ARB Extension #13
+# ARB_texture_border_clamp commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_texture_border_clamp
+
+###############################################################################
+#
+# ARB Extension #14
+# ARB_point_parameters commands
+#
+###############################################################################
+
+PointParameterfARB(pname, param)
+	return		void
+	param		pname		PointParameterNameARB in value
+	param		param		CheckedFloat32 in value
+	category	ARB_point_parameters
+	version		1.0
+	glxflags	ARB
+	glxropcode	2065
+	extension
+	alias		PointParameterf
+
+PointParameterfvARB(pname, params)
+	return		void
+	param		pname		PointParameterNameARB in value
+	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
+	category	ARB_point_parameters
+	version		1.0
+	glxflags	ARB
+	glxropcode	2066
+	extension
+	alias		PointParameterfv
+
+################################################################################
+#
+# ARB Extension #15
+# ARB_vertex_blend commands
+#
+###############################################################################
+
+WeightbvARB(size, weights)
+	return		void
+	param		size		Int32 in value
+	param		weights		Int8 in array [size]
+	category	ARB_vertex_blend
+	version		1.1
+	extension
+	glxropcode	220
+	glxflags	ignore
+	offset		?
+
+WeightsvARB(size, weights)
+	return		void
+	param		size		Int32 in value
+	param		weights		Int16 in array [size]
+	category	ARB_vertex_blend
+	version		1.1
+	extension
+	glxropcode	222
+	glxflags	ignore
+	offset		?
+
+WeightivARB(size, weights)
+	return		void
+	param		size		Int32 in value
+	param		weights		Int32 in array [size]
+	category	ARB_vertex_blend
+	version		1.1
+	extension
+	glxropcode	224
+	glxflags	ignore
+	offset		?
+
+WeightfvARB(size, weights)
+	return		void
+	param		size		Int32 in value
+	param		weights		Float32 in array [size]
+	category	ARB_vertex_blend
+	version		1.1
+	extension
+	glxropcode	227
+	glxflags	ignore
+	offset		?
+
+WeightdvARB(size, weights)
+	return		void
+	param		size		Int32 in value
+	param		weights		Float64 in array [size]
+	category	ARB_vertex_blend
+	version		1.1
+	extension
+	glxropcode	228
+	glxflags	ignore
+	offset		?
+
+WeightubvARB(size, weights)
+	return		void
+	param		size		Int32 in value
+	param		weights		UInt8 in array [size]
+	category	ARB_vertex_blend
+	version		1.1
+	extension
+	glxropcode	221
+	glxflags	ignore
+	offset		?
+
+WeightusvARB(size, weights)
+	return		void
+	param		size		Int32 in value
+	param		weights		UInt16 in array [size]
+	category	ARB_vertex_blend
+	version		1.1
+	extension
+	glxropcode	223
+	glxflags	ignore
+	offset		?
+
+WeightuivARB(size, weights)
+	return		void
+	param		size		Int32 in value
+	param		weights		UInt32 in array [size]
+	category	ARB_vertex_blend
+	version		1.1
+	extension
+	glxropcode	225
+	glxflags	ignore
+	offset		?
+
+WeightPointerARB(size, type, stride, pointer)
+	return		void
+	param		size		Int32 in value
+	param		type		WeightPointerTypeARB in value
+	param		stride		SizeI in value
+	param		pointer		Void in array [COMPSIZE(type/stride)] retained
+	category	ARB_vertex_blend
+	version		1.1
+	extension
+	dlflags		notlistable
+	glxflags	ignore
+	offset		?
+
+VertexBlendARB(count)
+	return		void
+	param		count		Int32 in value
+	category	ARB_vertex_blend
+	version		1.1
+	extension
+	glxropcode	226
+	glxflags	ignore
+	offset		?
+
+################################################################################
+#
+# ARB Extension #16
+# ARB_matrix_palette commands
+#
+###############################################################################
+
+CurrentPaletteMatrixARB(index)
+	return		void
+	param		index		Int32 in value
+	category	ARB_matrix_palette
+	version		1.1
+	extension
+	glxropcode	4329
+	glxflags	ignore
+	offset		?
+
+MatrixIndexubvARB(size, indices)
+	return		void
+	param		size		Int32 in value
+	param		indices		UInt8 in array [size]
+	category	ARB_matrix_palette
+	version		1.1
+	extension
+	glxropcode	4326
+	glxflags	ignore
+	offset		?
+
+MatrixIndexusvARB(size, indices)
+	return		void
+	param		size		Int32 in value
+	param		indices		UInt16 in array [size]
+	category	ARB_matrix_palette
+	version		1.1
+	extension
+	glxropcode	4327
+	glxflags	ignore
+	offset		?
+
+MatrixIndexuivARB(size, indices)
+	return		void
+	param		size		Int32 in value
+	param		indices		UInt32 in array [size]
+	category	ARB_matrix_palette
+	version		1.1
+	extension
+	glxropcode	4328
+	glxflags	ignore
+	offset		?
+
+MatrixIndexPointerARB(size, type, stride, pointer)
+	return		void
+	param		size		Int32 in value
+	param		type		MatrixIndexPointerTypeARB in value
+	param		stride		SizeI in value
+	param		pointer		Void in array [COMPSIZE(type/stride)] retained
+	category	ARB_matrix_palette
+	version		1.1
+	extension
+	dlflags		notlistable
+	glxflags	ignore
+	offset		?
+
+################################################################################
+#
+# ARB Extension #17
+# ARB_texture_env_combine commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_texture_env_combine
+
+################################################################################
+#
+# ARB Extension #18
+# ARB_texture_env_crossbar commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_texture_env_crossbar
+
+################################################################################
+#
+# ARB Extension #19
+# ARB_texture_env_dot3 commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_texture_env_dot3
+
+###############################################################################
+#
+# ARB Extension #20 - WGL_ARB_render_texture
+#
+###############################################################################
+
+###############################################################################
+#
+# ARB Extension #21
+# ARB_texture_mirrored_repeat commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_texture_mirrored_repeat
+
+###############################################################################
+#
+# ARB Extension #22
+# ARB_depth_texture commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_depth_texture
+
+###############################################################################
+#
+# ARB Extension #23
+# ARB_shadow commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_shadow
+
+###############################################################################
+#
+# ARB Extension #24
+# ARB_shadow_ambient commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_shadow_ambient
+
+###############################################################################
+#
+# ARB Extension #25
+# ARB_window_pos commands
+# Note: all entry points use glxropcode ropcode 230, with 3 float parameters
+#
+###############################################################################
+
+WindowPos2dARB(x, y)
+	return		void
+	param		x		CoordD in value
+	param		y		CoordD in value
+	category	ARB_window_pos
+	vectorequiv	WindowPos2dvARB
+	version		1.0
+	alias		WindowPos2d
+
+WindowPos2dvARB(v)
+	return		void
+	param		v		CoordD in array [2]
+	category	ARB_window_pos
+	version		1.0
+	glxropcode	230
+	glxflags	client-handcode server-handcode
+	alias		WindowPos2dv
+
+WindowPos2fARB(x, y)
+	return		void
+	param		x		CoordF in value
+	param		y		CoordF in value
+	category	ARB_window_pos
+	vectorequiv	WindowPos2fvARB
+	version		1.0
+	alias		WindowPos2f
+
+WindowPos2fvARB(v)
+	return		void
+	param		v		CoordF in array [2]
+	category	ARB_window_pos
+	version		1.0
+	glxropcode	230
+	glxflags	client-handcode server-handcode
+	alias		WindowPos2fv
+
+WindowPos2iARB(x, y)
+	return		void
+	param		x		CoordI in value
+	param		y		CoordI in value
+	category	ARB_window_pos
+	vectorequiv	WindowPos2ivARB
+	version		1.0
+	alias		WindowPos2i
+
+WindowPos2ivARB(v)
+	return		void
+	param		v		CoordI in array [2]
+	category	ARB_window_pos
+	version		1.0
+	glxropcode	230
+	glxflags	client-handcode server-handcode
+	alias		WindowPos2iv
+
+WindowPos2sARB(x, y)
+	return		void
+	param		x		CoordS in value
+	param		y		CoordS in value
+	category	ARB_window_pos
+	vectorequiv	WindowPos2svARB
+	version		1.0
+	alias		WindowPos2s
+
+WindowPos2svARB(v)
+	return		void
+	param		v		CoordS in array [2]
+	category	ARB_window_pos
+	version		1.0
+	glxropcode	230
+	glxflags	client-handcode server-handcode
+	alias		WindowPos2sv
+
+WindowPos3dARB(x, y, z)
+	return		void
+	param		x		CoordD in value
+	param		y		CoordD in value
+	param		z		CoordD in value
+	vectorequiv	WindowPos3dvARB
+	category	ARB_window_pos
+	version		1.0
+	alias		WindowPos3d
+
+WindowPos3dvARB(v)
+	return		void
+	param		v		CoordD in array [3]
+	category	ARB_window_pos
+	version		1.0
+	glxropcode	230
+	glxflags	client-handcode server-handcode
+	alias		WindowPos3dv
+
+WindowPos3fARB(x, y, z)
+	return		void
+	param		x		CoordF in value
+	param		y		CoordF in value
+	param		z		CoordF in value
+	category	ARB_window_pos
+	vectorequiv	WindowPos3fvARB
+	version		1.0
+	alias		WindowPos3f
+
+WindowPos3fvARB(v)
+	return		void
+	param		v		CoordF in array [3]
+	category	ARB_window_pos
+	version		1.0
+	glxropcode	230
+	glxflags	client-handcode server-handcode
+	alias		WindowPos3fv
+
+WindowPos3iARB(x, y, z)
+	return		void
+	param		x		CoordI in value
+	param		y		CoordI in value
+	param		z		CoordI in value
+	category	ARB_window_pos
+	vectorequiv	WindowPos3ivARB
+	version		1.0
+	alias		WindowPos3i
+
+WindowPos3ivARB(v)
+	return		void
+	param		v		CoordI in array [3]
+	category	ARB_window_pos
+	version		1.0
+	glxropcode	230
+	glxflags	client-handcode server-handcode
+	alias		WindowPos3iv
+
+WindowPos3sARB(x, y, z)
+	return		void
+	param		x		CoordS in value
+	param		y		CoordS in value
+	param		z		CoordS in value
+	category	ARB_window_pos
+	vectorequiv	WindowPos3svARB
+	version		1.0
+	alias		WindowPos3s
+
+WindowPos3svARB(v)
+	return		void
+	param		v		CoordS in array [3]
+	category	ARB_window_pos
+	version		1.0
+	glxropcode	230
+	glxflags	client-handcode server-handcode
+	alias		WindowPos3sv
+
+###############################################################################
+#
+# ARB Extension #26
+# ARB_vertex_program commands
+#
+###############################################################################
+
+VertexAttrib1dARB(index, x)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float64 in value
+	category	ARB_vertex_program
+	version		1.3
+	vectorequiv	VertexAttrib1dvARB
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib1d
+
+VertexAttrib1dvARB(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float64 in array [1]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxropcode	4197
+	alias		VertexAttrib1dv
+
+VertexAttrib1fARB(index, x)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float32 in value
+	category	ARB_vertex_program
+	version		1.3
+	vectorequiv	VertexAttrib1fvARB
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib1f
+
+VertexAttrib1fvARB(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float32 in array [1]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxropcode	4193
+	alias		VertexAttrib1fv
+
+VertexAttrib1sARB(index, x)
+	return		void
+	param		index		UInt32 in value
+	param		x		Int16 in value
+	category	ARB_vertex_program
+	version		1.3
+	vectorequiv	VertexAttrib1svARB
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib1s
+
+VertexAttrib1svARB(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int16 in array [1]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxropcode	4189
+	alias		VertexAttrib1sv
+
+VertexAttrib2dARB(index, x, y)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	category	ARB_vertex_program
+	version		1.3
+	vectorequiv	VertexAttrib2dvARB
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib2d
+
+VertexAttrib2dvARB(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float64 in array [2]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxropcode	4198
+	alias		VertexAttrib2dv
+
+VertexAttrib2fARB(index, x, y)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	category	ARB_vertex_program
+	version		1.3
+	vectorequiv	VertexAttrib2fvARB
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib2f
+
+VertexAttrib2fvARB(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float32 in array [2]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxropcode	4194
+	alias		VertexAttrib2fv
+
+VertexAttrib2sARB(index, x, y)
+	return		void
+	param		index		UInt32 in value
+	param		x		Int16 in value
+	param		y		Int16 in value
+	category	ARB_vertex_program
+	version		1.3
+	vectorequiv	VertexAttrib2svARB
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib2s
+
+VertexAttrib2svARB(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int16 in array [2]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxropcode	4190
+	alias		VertexAttrib2sv
+
+VertexAttrib3dARB(index, x, y, z)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	param		z		Float64 in value
+	category	ARB_vertex_program
+	version		1.3
+	vectorequiv	VertexAttrib3dvARB
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib3d
+
+VertexAttrib3dvARB(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float64 in array [3]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxropcode	4199
+	alias		VertexAttrib3dv
+
+VertexAttrib3fARB(index, x, y, z)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	category	ARB_vertex_program
+	version		1.3
+	vectorequiv	VertexAttrib3fvARB
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib3f
+
+VertexAttrib3fvARB(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float32 in array [3]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxropcode	4195
+	alias		VertexAttrib3fv
+
+VertexAttrib3sARB(index, x, y, z)
+	return		void
+	param		index		UInt32 in value
+	param		x		Int16 in value
+	param		y		Int16 in value
+	param		z		Int16 in value
+	category	ARB_vertex_program
+	version		1.3
+	vectorequiv	VertexAttrib3svARB
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib3s
+
+VertexAttrib3svARB(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int16 in array [3]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxropcode	4191
+	alias		VertexAttrib3sv
+
+VertexAttrib4NbvARB(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int8 in array [4]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib4Nbv
+
+VertexAttrib4NivARB(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int32 in array [4]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib4Niv
+
+VertexAttrib4NsvARB(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int16 in array [4]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib4Nsv
+
+VertexAttrib4NubARB(index, x, y, z, w)
+	return		void
+	param		index		UInt32 in value
+	param		x		UInt8 in value
+	param		y		UInt8 in value
+	param		z		UInt8 in value
+	param		w		UInt8 in value
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib4Nub
+
+VertexAttrib4NubvARB(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt8 in array [4]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxropcode	4201
+	alias		VertexAttrib4Nubv
+
+VertexAttrib4NuivARB(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt32 in array [4]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib4Nuiv
+
+VertexAttrib4NusvARB(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt16 in array [4]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib4Nusv
+
+VertexAttrib4bvARB(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int8 in array [4]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib4bv
+
+VertexAttrib4dARB(index, x, y, z, w)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	param		z		Float64 in value
+	param		w		Float64 in value
+	category	ARB_vertex_program
+	version		1.3
+	vectorequiv	VertexAttrib4dvARB
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib4d
+
+VertexAttrib4dvARB(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float64 in array [4]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxropcode	4200
+	alias		VertexAttrib4dv
+
+VertexAttrib4fARB(index, x, y, z, w)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	param		w		Float32 in value
+	category	ARB_vertex_program
+	version		1.3
+	vectorequiv	VertexAttrib4fvARB
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib4f
+
+VertexAttrib4fvARB(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float32 in array [4]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxropcode	4196
+	alias		VertexAttrib4fv
+
+VertexAttrib4ivARB(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int32 in array [4]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib4iv
+
+VertexAttrib4sARB(index, x, y, z, w)
+	return		void
+	param		index		UInt32 in value
+	param		x		Int16 in value
+	param		y		Int16 in value
+	param		z		Int16 in value
+	param		w		Int16 in value
+	category	ARB_vertex_program
+	version		1.3
+	vectorequiv	VertexAttrib4svARB
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib4s
+
+VertexAttrib4svARB(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int16 in array [4]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxropcode	4192
+	alias		VertexAttrib4sv
+
+VertexAttrib4ubvARB(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt8 in array [4]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib4ubv
+
+VertexAttrib4uivARB(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt32 in array [4]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib4uiv
+
+VertexAttrib4usvARB(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt16 in array [4]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib4usv
+
+VertexAttribPointerARB(index, size, type, normalized, stride, pointer)
+	return		void
+	param		index		UInt32 in value
+	param		size		Int32 in value
+	param		type		VertexAttribPointerTypeARB in value
+	param		normalized	Boolean in value
+	param		stride		SizeI in value
+	param		pointer		Void in array [COMPSIZE(size/type/stride)] retained
+	dlflags		notlistable
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	alias		VertexAttribPointer
+
+EnableVertexAttribArrayARB(index)
+	return		void
+	param		index		UInt32 in value
+	dlflags		notlistable
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	alias		EnableVertexAttribArray
+
+DisableVertexAttribArrayARB(index)
+	return		void
+	param		index		UInt32 in value
+	dlflags		notlistable
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	alias		DisableVertexAttribArray
+
+ProgramStringARB(target, format, len, string)
+	return		void
+	param		target		ProgramTargetARB in value
+	param		format		ProgramFormatARB in value
+	param		len		SizeI in value
+	param		string		Void in array [len]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		667
+
+BindProgramARB(target, program)
+	return		void
+	param		target		ProgramTargetARB in value
+	param		program		UInt32 in value
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxropcode	4180
+	offset		579
+
+DeleteProgramsARB(n, programs)
+	return		void
+	param		n		SizeI in value
+	param		programs	UInt32 in array [n]
+	dlflags		notlistable
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxvendorpriv	1294
+	offset		580
+
+GenProgramsARB(n, programs)
+	return		void
+	param		n		SizeI in value
+	param		programs	UInt32 out array [n]
+	dlflags		notlistable
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxvendorpriv	1295
+	offset		582
+
+ProgramEnvParameter4dARB(target, index, x, y, z, w)
+	return		void
+	param		target		ProgramTargetARB in value
+	param		index		UInt32 in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	param		z		Float64 in value
+	param		w		Float64 in value
+	category	ARB_vertex_program
+	version		1.3
+	vectorequiv	ProgramEnvParameter4dvARB
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		668
+
+ProgramEnvParameter4dvARB(target, index, params)
+	return		void
+	param		target		ProgramTargetARB in value
+	param		index		UInt32 in value
+	param		params		Float64 in array [4]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		669
+
+ProgramEnvParameter4fARB(target, index, x, y, z, w)
+	return		void
+	param		target		ProgramTargetARB in value
+	param		index		UInt32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	param		w		Float32 in value
+	category	ARB_vertex_program
+	version		1.3
+	vectorequiv	ProgramEnvParameter4fvARB
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		670
+
+ProgramEnvParameter4fvARB(target, index, params)
+	return		void
+	param		target		ProgramTargetARB in value
+	param		index		UInt32 in value
+	param		params		Float32 in array [4]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		671
+
+ProgramLocalParameter4dARB(target, index, x, y, z, w)
+	return		void
+	param		target		ProgramTargetARB in value
+	param		index		UInt32 in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	param		z		Float64 in value
+	param		w		Float64 in value
+	category	ARB_vertex_program
+	version		1.3
+	vectorequiv	ProgramLocalParameter4dvARB
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		672
+
+ProgramLocalParameter4dvARB(target, index, params)
+	return		void
+	param		target		ProgramTargetARB in value
+	param		index		UInt32 in value
+	param		params		Float64 in array [4]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		673
+
+ProgramLocalParameter4fARB(target, index, x, y, z, w)
+	return		void
+	param		target		ProgramTargetARB in value
+	param		index		UInt32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	param		w		Float32 in value
+	category	ARB_vertex_program
+	version		1.3
+	vectorequiv	ProgramLocalParameter4fvARB
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		674
+
+ProgramLocalParameter4fvARB(target, index, params)
+	return		void
+	param		target		ProgramTargetARB in value
+	param		index		UInt32 in value
+	param		params		Float32 in array [4]
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		675
+
+GetProgramEnvParameterdvARB(target, index, params)
+	return		void
+	param		target		ProgramTargetARB in value
+	param		index		UInt32 in value
+	param		params		Float64 out array [4]
+	dlflags		notlistable
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		676
+
+GetProgramEnvParameterfvARB(target, index, params)
+	return		void
+	param		target		ProgramTargetARB in value
+	param		index		UInt32 in value
+	param		params		Float32 out array [4]
+	dlflags		notlistable
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		677
+
+GetProgramLocalParameterdvARB(target, index, params)
+	return		void
+	param		target		ProgramTargetARB in value
+	param		index		UInt32 in value
+	param		params		Float64 out array [4]
+	dlflags		notlistable
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		678
+
+GetProgramLocalParameterfvARB(target, index, params)
+	return		void
+	param		target		ProgramTargetARB in value
+	param		index		UInt32 in value
+	param		params		Float32 out array [4]
+	dlflags		notlistable
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		679
+
+GetProgramivARB(target, pname, params)
+	return		void
+	param		target		ProgramTargetARB in value
+	param		pname		ProgramPropertyARB in value
+	param		params		Int32 out array [1]
+	dlflags		notlistable
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		680
+
+GetProgramStringARB(target, pname, string)
+	return		void
+	param		target		ProgramTargetARB in value
+	param		pname		ProgramStringPropertyARB in value
+	param		string		Void out array [COMPSIZE(target,pname)]
+	dlflags		notlistable
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		681
+
+GetVertexAttribdvARB(index, pname, params)
+	return		void
+	param		index		UInt32 in value
+	param		pname		VertexAttribPropertyARB in value
+	param		params		Float64 out array [4]
+	dlflags		notlistable
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxvendorpriv	1301
+	alias		GetVertexAttribdv
+
+GetVertexAttribfvARB(index, pname, params)
+	return		void
+	param		index		UInt32 in value
+	param		pname		VertexAttribPropertyARB in value
+	param		params		Float32 out array [4]
+	dlflags		notlistable
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxvendorpriv	1302
+	alias		GetVertexAttribfv
+
+GetVertexAttribivARB(index, pname, params)
+	return		void
+	param		index		UInt32 in value
+	param		pname		VertexAttribPropertyARB in value
+	param		params		Int32 out array [4]
+	dlflags		notlistable
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxvendorpriv	1303
+	alias		GetVertexAttribiv
+
+GetVertexAttribPointervARB(index, pname, pointer)
+	return		void
+	param		index		UInt32 in value
+	param		pname		VertexAttribPointerPropertyARB in value
+	param		pointer		VoidPointer out array [1]
+	dlflags		notlistable
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	alias		GetVertexAttribPointerv
+
+IsProgramARB(program)
+	return		Boolean
+	param		program		UInt32 in value
+	dlflags		notlistable
+	category	ARB_vertex_program
+	version		1.3
+	extension	soft WINSOFT NV10
+	glxvendorpriv	1304
+	alias		IsProgram
+
+
+###############################################################################
+#
+# ARB Extension #27
+# ARB_fragment_program commands
+#
+###############################################################################
+
+# All ARB_fragment_program entry points are shared with ARB_vertex_program,
+#   and are only included in that #define block, for now.
+newcategory: ARB_fragment_program
+passthru: /* All ARB_fragment_program entry points are shared with ARB_vertex_program. */
+
+###############################################################################
+#
+# ARB Extension #28
+# ARB_vertex_buffer_object commands
+#
+###############################################################################
+
+BindBufferARB(target, buffer)
+	return		void
+	param		target		BufferTargetARB in value
+	param		buffer		UInt32 in value
+	category	ARB_vertex_buffer_object
+	version		1.2
+	extension
+	alias		BindBuffer
+
+DeleteBuffersARB(n, buffers)
+	return		void
+	param		n		SizeI in value
+	param		buffers		ConstUInt32 in array [n]
+	category	ARB_vertex_buffer_object
+	version		1.2
+	extension
+	alias		DeleteBuffers
+
+GenBuffersARB(n, buffers)
+	return		void
+	param		n		SizeI in value
+	param		buffers		UInt32 out array [n]
+	category	ARB_vertex_buffer_object
+	version		1.2
+	extension
+	alias		GenBuffers
+
+IsBufferARB(buffer)
+	return		Boolean
+	param		buffer		UInt32 in value
+	category	ARB_vertex_buffer_object
+	version		1.2
+	extension
+	alias		IsBuffer
+
+BufferDataARB(target, size, data, usage)
+	return		void
+	param		target		BufferTargetARB in value
+	param		size		BufferSizeARB in value
+	param		data		ConstVoid in array [size]
+	param		usage		BufferUsageARB in value
+	category	ARB_vertex_buffer_object
+	version		1.2
+	extension
+	alias		BufferData
+
+BufferSubDataARB(target, offset, size, data)
+	return		void
+	param		target		BufferTargetARB in value
+	param		offset		BufferOffsetARB in value
+	param		size		BufferSizeARB in value
+	param		data		ConstVoid in array [size]
+	category	ARB_vertex_buffer_object
+	version		1.2
+	extension
+	alias		BufferSubData
+
+GetBufferSubDataARB(target, offset, size, data)
+	return		void
+	param		target		BufferTargetARB in value
+	param		offset		BufferOffsetARB in value
+	param		size		BufferSizeARB in value
+	param		data		Void out array [size]
+	category	ARB_vertex_buffer_object
+	dlflags		notlistable
+	version		1.2
+	extension
+	alias		GetBufferSubData
+
+MapBufferARB(target, access)
+	return		VoidPointer
+	param		target		BufferTargetARB in value
+	param		access		BufferAccessARB in value
+	category	ARB_vertex_buffer_object
+	version		1.2
+	extension
+	alias		MapBuffer
+
+UnmapBufferARB(target)
+	return		Boolean
+	param		target		BufferTargetARB in value
+	category	ARB_vertex_buffer_object
+	version		1.2
+	extension
+	alias		UnmapBuffer
+
+GetBufferParameterivARB(target, pname, params)
+	return		void
+	param		target		BufferTargetARB in value
+	param		pname		BufferPNameARB in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	ARB_vertex_buffer_object
+	dlflags		notlistable
+	version		1.2
+	extension
+	alias		GetBufferParameteriv
+
+GetBufferPointervARB(target, pname, params)
+	return		void
+	param		target		BufferTargetARB in value
+	param		pname		BufferPointerNameARB in value
+	param		params		VoidPointer out array [1]
+	category	ARB_vertex_buffer_object
+	dlflags		notlistable
+	version		1.2
+	extension
+	alias		GetBufferPointerv
+
+###############################################################################
+#
+# ARB Extension #29
+# ARB_occlusion_query commands
+#
+###############################################################################
+
+GenQueriesARB(n, ids)
+	return		void
+	param		n		SizeI in value
+	param		ids		UInt32 out array [n]
+	category	ARB_occlusion_query
+	version		1.5
+	extension
+	alias		GenQueries
+
+DeleteQueriesARB(n, ids)
+	return		void
+	param		n		SizeI in value
+	param		ids		UInt32 in array [n]
+	category	ARB_occlusion_query
+	version		1.5
+	extension
+	alias		DeleteQueries
+
+IsQueryARB(id)
+	return		Boolean
+	param		id		UInt32 in value
+	category	ARB_occlusion_query
+	version		1.5
+	extension
+	alias		IsQuery
+
+BeginQueryARB(target, id)
+	return		void
+	param		target		GLenum in value
+	param		id		UInt32 in value
+	category	ARB_occlusion_query
+	version		1.5
+	extension
+	alias		BeginQuery
+
+EndQueryARB(target)
+	return		void
+	param		target		GLenum in value
+	category	ARB_occlusion_query
+	version		1.5
+	extension
+	alias		EndQuery
+
+GetQueryivARB(target, pname, params)
+	return		void
+	param		target		GLenum in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [pname]
+	category	ARB_occlusion_query
+	dlflags		notlistable
+	version		1.5
+	extension
+	alias		GetQueryiv
+
+GetQueryObjectivARB(id, pname, params)
+	return		void
+	param		id		UInt32 in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [pname]
+	category	ARB_occlusion_query
+	dlflags		notlistable
+	version		1.5
+	extension
+	alias		GetQueryObjectiv
+
+GetQueryObjectuivARB(id, pname, params)
+	return		void
+	param		id		UInt32 in value
+	param		pname		GLenum in value
+	param		params		UInt32 out array [pname]
+	category	ARB_occlusion_query
+	dlflags		notlistable
+	version		1.5
+	extension
+	alias		GetQueryObjectuiv
+
+###############################################################################
+#
+# ARB Extension #30
+# ARB_shader_objects commands
+#
+###############################################################################
+
+DeleteObjectARB(obj)
+	return		void
+	param		obj		handleARB in value
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetHandleARB(pname)
+	return		handleARB
+	param		pname		GLenum in value
+	category	ARB_shader_objects
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+DetachObjectARB(containerObj, attachedObj)
+	return		void
+	param		containerObj	handleARB in value
+	param		attachedObj	handleARB in value
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		DetachShader
+
+CreateShaderObjectARB(shaderType)
+	return		handleARB
+	param		shaderType	GLenum in value
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		CreateShader
+
+ShaderSourceARB(shaderObj, count, string, length)
+	return		void
+	param		shaderObj	handleARB in value
+	param		count		SizeI in value
+	param		string		charPointerARB in array [count]
+	param		length		Int32 in array [1]
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		ShaderSource
+
+CompileShaderARB(shaderObj)
+	return		void
+	param		shaderObj	handleARB in value
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		CompileShader
+
+CreateProgramObjectARB()
+	return		handleARB
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		CreateProgram
+
+AttachObjectARB(containerObj, obj)
+	return		void
+	param		containerObj	handleARB in value
+	param		obj		handleARB in value
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		AttachShader
+
+LinkProgramARB(programObj)
+	return		void
+	param		programObj	handleARB in value
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		LinkProgram
+
+UseProgramObjectARB(programObj)
+	return		void
+	param		programObj	handleARB in value
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		UseProgram
+
+ValidateProgramARB(programObj)
+	return		void
+	param		programObj	handleARB in value
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		ValidateProgram
+
+Uniform1fARB(location, v0)
+	return		void
+	param		location	Int32 in value
+	param		v0		Float32 in value
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		Uniform1f
+
+Uniform2fARB(location, v0, v1)
+	return		void
+	param		location	Int32 in value
+	param		v0		Float32 in value
+	param		v1		Float32 in value
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		Uniform2f
+
+Uniform3fARB(location, v0, v1, v2)
+	return		void
+	param		location	Int32 in value
+	param		v0		Float32 in value
+	param		v1		Float32 in value
+	param		v2		Float32 in value
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		Uniform3f
+
+Uniform4fARB(location, v0, v1, v2, v3)
+	return		void
+	param		location	Int32 in value
+	param		v0		Float32 in value
+	param		v1		Float32 in value
+	param		v2		Float32 in value
+	param		v3		Float32 in value
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		Uniform4f
+
+Uniform1iARB(location, v0)
+	return		void
+	param		location	Int32 in value
+	param		v0		Int32 in value
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		Uniform1i
+
+Uniform2iARB(location, v0, v1)
+	return		void
+	param		location	Int32 in value
+	param		v0		Int32 in value
+	param		v1		Int32 in value
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		Uniform2i
+
+Uniform3iARB(location, v0, v1, v2)
+	return		void
+	param		location	Int32 in value
+	param		v0		Int32 in value
+	param		v1		Int32 in value
+	param		v2		Int32 in value
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		Uniform3i
+
+Uniform4iARB(location, v0, v1, v2, v3)
+	return		void
+	param		location	Int32 in value
+	param		v0		Int32 in value
+	param		v1		Int32 in value
+	param		v2		Int32 in value
+	param		v3		Int32 in value
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		Uniform4i
+
+Uniform1fvARB(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float32 in array [count]
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		Uniform1fv
+
+Uniform2fvARB(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float32 in array [count]
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		Uniform2fv
+
+Uniform3fvARB(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float32 in array [count]
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		Uniform3fv
+
+Uniform4fvARB(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float32 in array [count]
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		Uniform4fv
+
+Uniform1ivARB(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Int32 in array [count]
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		Uniform1iv
+
+Uniform2ivARB(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Int32 in array [count]
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		Uniform2iv
+
+Uniform3ivARB(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Int32 in array [count]
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		Uniform3iv
+
+Uniform4ivARB(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Int32 in array [count]
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		Uniform4iv
+
+UniformMatrix2fvARB(location, count, transpose, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [count]
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		UniformMatrix2fv
+
+UniformMatrix3fvARB(location, count, transpose, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [count]
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		UniformMatrix3fv
+
+UniformMatrix4fvARB(location, count, transpose, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [count]
+	category	ARB_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		UniformMatrix4fv
+
+GetObjectParameterfvARB(obj, pname, params)
+	return		void
+	param		obj		handleARB in value
+	param		pname		GLenum in value
+	param		params		Float32 out array [pname]
+	category	ARB_shader_objects
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetObjectParameterivARB(obj, pname, params)
+	return		void
+	param		obj		handleARB in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [pname]
+	category	ARB_shader_objects
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetInfoLogARB(obj, maxLength, length, infoLog)
+	return		void
+	param		obj		handleARB in value
+	param		maxLength	SizeI in value
+	param		length		SizeI out array [1]
+	param		infoLog		charARB out array [length]
+	category	ARB_shader_objects
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetAttachedObjectsARB(containerObj, maxCount, count, obj)
+	return		void
+	param		containerObj	handleARB in value
+	param		maxCount	SizeI in value
+	param		count		SizeI out array [1]
+	param		obj		handleARB out array [count]
+	category	ARB_shader_objects
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	alias		GetAttachedShaders
+
+GetUniformLocationARB(programObj, name)
+	return		Int32
+	param		programObj	handleARB in value
+	param		name		charARB in array []
+	category	ARB_shader_objects
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	alias		GetUniformLocation
+
+GetActiveUniformARB(programObj, index, maxLength, length, size, type, name)
+	return		void
+	param		programObj	handleARB in value
+	param		index		UInt32 in value
+	param		maxLength	SizeI in value
+	param		length		SizeI out array [1]
+	param		size		Int32 out array [1]
+	param		type		GLenum out array [1]
+	param		name		charARB out array []
+	category	ARB_shader_objects
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	alias		GetActiveUniform
+
+GetUniformfvARB(programObj, location, params)
+	return		void
+	param		programObj	handleARB in value
+	param		location	Int32 in value
+	param		params		Float32 out array [COMPSIZE(location)]
+	category	ARB_shader_objects
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	alias		GetUniformfv
+
+GetUniformivARB(programObj, location, params)
+	return		void
+	param		programObj	handleARB in value
+	param		location	Int32 in value
+	param		params		Int32 out array [COMPSIZE(location)]
+	category	ARB_shader_objects
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	alias		GetUniformiv
+
+GetShaderSourceARB(obj, maxLength, length, source)
+	return		void
+	param		obj		handleARB in value
+	param		maxLength	SizeI in value
+	param		length		SizeI out array [1]
+	param		source		charARB out array [length]
+	category	ARB_shader_objects
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	alias		GetShaderSource
+
+
+###############################################################################
+#
+# ARB Extension #31
+# ARB_vertex_shader commands
+#
+###############################################################################
+
+BindAttribLocationARB(programObj, index, name)
+	return		void
+	param		programObj	handleARB in value
+	param		index		UInt32 in value
+	param		name		charARB in array []
+	category	ARB_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		BindAttribLocation
+
+GetActiveAttribARB(programObj, index, maxLength, length, size, type, name)
+	return		void
+	param		programObj	handleARB in value
+	param		index		UInt32 in value
+	param		maxLength	SizeI in value
+	param		length		SizeI out array [1]
+	param		size		Int32 out array [1]
+	param		type		GLenum out array [1]
+	param		name		charARB out array []
+	category	ARB_vertex_shader
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	alias		GetActiveAttrib
+
+GetAttribLocationARB(programObj, name)
+	return		Int32
+	param		programObj	handleARB in value
+	param		name		charARB in array []
+	category	ARB_vertex_shader
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	alias		GetAttribLocation
+
+###############################################################################
+#
+# ARB Extension #32
+# ARB_fragment_shader commands
+#
+###############################################################################
+
+#  (none)
+newcategory: ARB_fragment_shader
+
+###############################################################################
+#
+# ARB Extension #33
+# ARB_shading_language_100 commands
+#
+###############################################################################
+
+#  (none)
+newcategory: ARB_shading_language_100
+
+###############################################################################
+#
+# ARB Extension #34
+# ARB_texture_non_power_of_two commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_texture_non_power_of_two
+
+###############################################################################
+#
+# ARB Extension #35
+# ARB_point_sprite commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_point_sprite
+
+###############################################################################
+#
+# ARB Extension #36
+# ARB_fragment_program_shadow commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_fragment_program_shadow
+
+###############################################################################
+#
+# ARB Extension #37
+# ARB_draw_buffers commands
+#
+###############################################################################
+
+DrawBuffersARB(n, bufs)
+	return		void
+	param		n		SizeI in value
+	param		bufs		DrawBufferModeATI in array [n]
+	category	ARB_draw_buffers
+	version		1.5
+	extension
+	alias		DrawBuffers
+
+###############################################################################
+#
+# ARB Extension #38
+# ARB_texture_rectangle commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_texture_rectangle
+
+###############################################################################
+#
+# ARB Extension #39
+# ARB_color_buffer_float commands
+#
+###############################################################################
+
+ClampColorARB(target, clamp)
+	return		void
+	param		target		ClampColorTargetARB in value
+	param		clamp		ClampColorModeARB in value
+	category	ARB_color_buffer_float
+	version		1.5
+	extension
+	glxropcode	234
+	glxflags	ignore
+	alias		ClampColor
+
+###############################################################################
+#
+# ARB Extension #40
+# ARB_half_float_pixel commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_half_float_pixel
+
+###############################################################################
+#
+# ARB Extension #41
+# ARB_texture_float commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_texture_float
+
+###############################################################################
+#
+# ARB Extension #42
+# ARB_pixel_buffer_object commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_pixel_buffer_object
+
+###############################################################################
+#
+# ARB Extension #43
+# ARB_depth_buffer_float commands (also OpenGL 3.0)
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_depth_buffer_float
+
+###############################################################################
+#
+# ARB Extension #44
+# ARB_draw_instanced commands
+#
+###############################################################################
+
+DrawArraysInstancedARB(mode, first, count, primcount)
+	return		void
+	param		mode		BeginMode in value
+	param		first		Int32 in value
+	param		count		SizeI in value
+	param		primcount	SizeI in value
+	category	ARB_draw_instanced
+	version		2.0
+	extension	soft WINSOFT
+	dlflags		notlistable
+	vectorequiv	ArrayElement
+	glfflags	ignore
+	glxflags	ignore
+	alias		DrawArraysInstanced
+
+DrawElementsInstancedARB(mode, count, type, indices, primcount)
+	return		void
+	param		mode		BeginMode in value
+	param		count		SizeI in value
+	param		type		DrawElementsType in value
+	param		indices		Void in array [COMPSIZE(count/type)]
+	param		primcount	SizeI in value
+	category	ARB_draw_instanced
+	version		2.0
+	extension	soft WINSOFT
+	dlflags		notlistable
+	vectorequiv	ArrayElement
+	glfflags	ignore
+	glxflags	ignore
+	alias		DrawElementsInstanced
+
+###############################################################################
+#
+# ARB Extension #45
+# ARB_framebuffer_object commands (also OpenGL 3.0)
+#
+###############################################################################
+
+# Promoted from EXT_framebuffer_object
+IsRenderbuffer(renderbuffer)
+	return		Boolean
+	param		renderbuffer	UInt32 in value
+	category	ARB_framebuffer_object
+	version		3.0
+	extension
+	glxvendorpriv	1422
+	glxflags	ignore
+	offset		?
+
+# GLX opcode changed so it can be differentiated from BindRenderbufferEXT
+# (see ARB_framebuffer_object extension spec revision 23)
+BindRenderbuffer(target, renderbuffer)
+	return		void
+	param		target		RenderbufferTarget in value
+	param		renderbuffer	UInt32 in value
+	category	ARB_framebuffer_object
+	version		3.0
+	extension
+	glxropcode	235
+	glxflags	ignore
+	offset		?
+
+DeleteRenderbuffers(n, renderbuffers)
+	return		void
+	param		n		SizeI in value
+	param		renderbuffers	UInt32 in array [n]
+	category	ARB_framebuffer_object
+	version		3.0
+	extension
+	glxropcode	4317
+	glxflags	ignore
+	offset		?
+
+GenRenderbuffers(n, renderbuffers)
+	return		void
+	param		n		SizeI in value
+	param		renderbuffers	UInt32 out array [n]
+	category	ARB_framebuffer_object
+	version		3.0
+	extension
+	glxvendorpriv	1423
+	glxflags	ignore
+	offset		?
+
+RenderbufferStorage(target, internalformat, width, height)
+	return		void
+	param		target		RenderbufferTarget in value
+	param		internalformat	GLenum in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	category	ARB_framebuffer_object
+	version		3.0
+	extension
+	glxropcode	4318
+	glxflags	ignore
+	offset		?
+
+GetRenderbufferParameteriv(target, pname, params)
+	return		void
+	param		target		RenderbufferTarget in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	ARB_framebuffer_object
+	dlflags		notlistable
+	version		3.0
+	extension
+	glxvendorpriv	1424
+	glxflags	ignore
+	offset		?
+
+IsFramebuffer(framebuffer)
+	return		Boolean
+	param		framebuffer	UInt32 in value
+	category	ARB_framebuffer_object
+	version		3.0
+	extension
+	glxvendorpriv	1425
+	glxflags	ignore
+	offset		?
+
+# GLX opcode changed so it can be differentiated from BindFramebufferEXT
+# (see ARB_framebuffer_object extension spec revision 23)
+BindFramebuffer(target, framebuffer)
+	return		void
+	param		target		FramebufferTarget in value
+	param		framebuffer	UInt32 in value
+	category	ARB_framebuffer_object
+	version		3.0
+	extension
+	glxropcode	236
+	glxflags	ignore
+	offset		?
+
+DeleteFramebuffers(n, framebuffers)
+	return		void
+	param		n		SizeI in value
+	param		framebuffers	UInt32 in array [n]
+	category	ARB_framebuffer_object
+	version		3.0
+	extension
+	glxropcode	4320
+	glxflags	ignore
+	offset		?
+
+GenFramebuffers(n, framebuffers)
+	return		void
+	param		n		SizeI in value
+	param		framebuffers	UInt32 out array [n]
+	category	ARB_framebuffer_object
+	version		3.0
+	extension
+	glxvendorpriv	1426
+	glxflags	ignore
+	offset		?
+
+CheckFramebufferStatus(target)
+	return		GLenum
+	param		target		FramebufferTarget in value
+	category	ARB_framebuffer_object
+	version		3.0
+	extension
+	glxvendorpriv	1427
+	glxflags	ignore
+	offset		?
+
+FramebufferTexture1D(target, attachment, textarget, texture, level)
+	return		void
+	param		target		FramebufferTarget in value
+	param		attachment	FramebufferAttachment in value
+	param		textarget	GLenum in value
+	param		texture		UInt32 in value
+	param		level		Int32 in value
+	category	ARB_framebuffer_object
+	version		3.0
+	extension
+	glxropcode	4321
+	glxflags	ignore
+	offset		?
+
+FramebufferTexture2D(target, attachment, textarget, texture, level)
+	return		void
+	param		target		FramebufferTarget in value
+	param		attachment	FramebufferAttachment in value
+	param		textarget	GLenum in value
+	param		texture		UInt32 in value
+	param		level		Int32 in value
+	category	ARB_framebuffer_object
+	version		3.0
+	extension
+	glxropcode	4322
+	glxflags	ignore
+	offset		?
+
+FramebufferTexture3D(target, attachment, textarget, texture, level, zoffset)
+	return		void
+	param		target		FramebufferTarget in value
+	param		attachment	FramebufferAttachment in value
+	param		textarget	GLenum in value
+	param		texture		UInt32 in value
+	param		level		Int32 in value
+	param		zoffset		Int32 in value
+	category	ARB_framebuffer_object
+	version		3.0
+	extension
+	glxropcode	4323
+	glxflags	ignore
+	offset		?
+
+FramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer)
+	return		void
+	param		target		FramebufferTarget in value
+	param		attachment	FramebufferAttachment in value
+	param		renderbuffertarget	RenderbufferTarget in value
+	param		renderbuffer	UInt32 in value
+	category	ARB_framebuffer_object
+	version		3.0
+	extension
+	glxropcode	4324
+	glxflags	ignore
+	offset		?
+
+GetFramebufferAttachmentParameteriv(target, attachment, pname, params)
+	return		void
+	param		target		FramebufferTarget in value
+	param		attachment	FramebufferAttachment in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	ARB_framebuffer_object
+	dlflags		notlistable
+	version		3.0
+	extension
+	glxvendorpriv	1428
+	glxflags	ignore
+	offset		?
+
+GenerateMipmap(target)
+	return		void
+	param		target		GLenum in value
+	category	ARB_framebuffer_object
+	version		3.0
+	extension
+	glxropcode	4325
+	glxflags	ignore
+	offset		?
+
+# Promoted from EXT_framebuffer_blit
+BlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter)
+	return		void
+	param		srcX0		Int32 in value
+	param		srcY0		Int32 in value
+	param		srcX1		Int32 in value
+	param		srcY1		Int32 in value
+	param		dstX0		Int32 in value
+	param		dstY0		Int32 in value
+	param		dstX1		Int32 in value
+	param		dstY1		Int32 in value
+	param		mask		ClearBufferMask in value
+	param		filter		GLenum in value
+	category	ARB_framebuffer_object
+	version		3.0
+	glxropcode	4330
+	offset		?
+
+# Promoted from EXT_framebuffer_multisample
+RenderbufferStorageMultisample(target, samples, internalformat, width, height)
+	return		void
+	param		target		GLenum in value
+	param		samples		SizeI in value
+	param		internalformat	GLenum in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	category	ARB_framebuffer_object
+	version		3.0
+	glxropcode	4331
+	offset		?
+
+# Promoted from ARB_geometry_shader4
+FramebufferTextureLayer(target, attachment, texture, level, layer)
+	return		void
+	param		target		FramebufferTarget in value
+	param		attachment	FramebufferAttachment in value
+	param		texture		Texture in value
+	param		level		CheckedInt32 in value
+	param		layer		CheckedInt32 in value
+	category	ARB_framebuffer_object
+	version		3.0
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glfflags	ignore
+	glxropcode	237
+	offset		?
+
+
+###############################################################################
+#
+# ARB Extension #46
+# ARB_framebuffer_sRGB commands (also OpenGL 3.0)
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_framebuffer_sRGB
+
+###############################################################################
+#
+# ARB Extension #47
+# ARB_geometry_shader4 commands
+#
+###############################################################################
+
+ProgramParameteriARB(program, pname, value)
+	return		void
+	param		program		UInt32 in value
+	param		pname		ProgramParameterPName in value
+	param		value		Int32 in value
+	category	ARB_geometry_shader4
+	version		3.0
+	extension	soft WINSOFT
+	glfflags	ignore
+	glxflags	ignore
+	alias		ProgramParameteri
+
+FramebufferTextureARB(target, attachment, texture, level)
+	return		void
+	param		target		FramebufferTarget in value
+	param		attachment	FramebufferAttachment in value
+	param		texture		Texture in value
+	param		level		CheckedInt32 in value
+	category	ARB_geometry_shader4
+	version		3.0
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+
+FramebufferTextureLayerARB(target, attachment, texture, level, layer)
+	return		void
+	param		target		FramebufferTarget in value
+	param		attachment	FramebufferAttachment in value
+	param		texture		Texture in value
+	param		level		CheckedInt32 in value
+	param		layer		CheckedInt32 in value
+	category	ARB_geometry_shader4
+	version		3.0
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+	alias		FramebufferTextureLayer
+
+FramebufferTextureFaceARB(target, attachment, texture, level, face)
+	return		void
+	param		target		FramebufferTarget in value
+	param		attachment	FramebufferAttachment in value
+	param		texture		Texture in value
+	param		level		CheckedInt32 in value
+	param		face		TextureTarget in value
+	category	ARB_geometry_shader4
+	version		3.0
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+
+###############################################################################
+#
+# ARB Extension #48
+# ARB_half_float_vertex commands (also OpenGL 3.0)
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_half_float_vertex
+
+###############################################################################
+#
+# ARB Extension #49
+# ARB_instanced_arrays commands
+#
+###############################################################################
+
+VertexAttribDivisorARB(index, divisor)
+	return		void
+	param		index		UInt32 in value
+	param		divisor		UInt32 in value
+	category	ARB_instanced_arrays
+	version		2.0
+	extension
+	glfflags	ignore
+	glxflags	ignore
+
+###############################################################################
+#
+# ARB Extension #50
+# ARB_map_buffer_range commands (also OpenGL 3.0)
+#
+###############################################################################
+
+MapBufferRange(target, offset, length, access)
+	return		VoidPointer
+	param		target		BufferTargetARB in value
+	param		offset		BufferOffset in value
+	param		length		BufferSize in value
+	param		access		BufferAccessMask in value
+	category	ARB_map_buffer_range
+	version		3.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+# Promoted from APPLE_flush_buffer_range
+FlushMappedBufferRange(target, offset, length)
+	return		void
+	param		target		BufferTargetARB in value
+	param		offset		BufferOffset in value
+	param		length		BufferSize in value
+	category	ARB_map_buffer_range
+	version		3.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #51
+# ARB_texture_buffer_object commands
+#
+###############################################################################
+
+TexBufferARB(target, internalformat, buffer)
+	return		void
+	param		target		TextureTarget in value
+	param		internalformat	GLenum in value
+	param		buffer		UInt32 in value
+	category	ARB_texture_buffer_object
+	version		3.0
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	alias		TexBuffer
+
+###############################################################################
+#
+# ARB Extension #52
+# ARB_texture_compression_rgtc commands (also OpenGL 3.0)
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_texture_compression_rgtc
+
+###############################################################################
+#
+# ARB Extension #53
+# ARB_texture_rg commands (also OpenGL 3.0)
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_texture_rg
+
+###############################################################################
+#
+# ARB Extension #54
+# ARB_vertex_array_object commands (also OpenGL 3.0)
+#
+###############################################################################
+
+# Promoted from APPLE_vertex_array_object
+BindVertexArray(array)
+	return		void
+	param		array		UInt32 in value
+	category	ARB_vertex_array_object
+	version		3.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DeleteVertexArrays(n, arrays)
+	return		void
+	param		n		SizeI in value
+	param		arrays		UInt32 in array [n]
+	category	ARB_vertex_array_object
+	version		3.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GenVertexArrays(n, arrays)
+	return		void
+	param		n		SizeI in value
+	param		arrays		UInt32 out array [n]
+	category	ARB_vertex_array_object
+	version		3.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+IsVertexArray(array)
+	return		Boolean
+	param		array		UInt32 in value
+	category	ARB_vertex_array_object
+	version		3.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #55 - WGL_ARB_create_context
+# ARB Extension #56 - GLX_ARB_create_context
+#
+###############################################################################
+
+###############################################################################
+#
+# ARB Extension #57
+# ARB_uniform_buffer_object commands
+#
+###############################################################################
+
+GetUniformIndices(program, uniformCount, uniformNames, uniformIndices)
+	return		void
+	param		program		UInt32 in value
+	param		uniformCount	SizeI in value
+	param		uniformNames	ConstCharPointer in array [COMPSIZE(uniformCount)]
+	param		uniformIndices	UInt32 out array [COMPSIZE(uniformCount)]
+	category	ARB_uniform_buffer_object
+	dlflags		notlistable
+	version		2.0
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetActiveUniformsiv(program, uniformCount, uniformIndices, pname, params)
+	return		void
+	param		program		UInt32 in value
+	param		uniformCount	SizeI in value
+	param		uniformIndices	UInt32 in array [COMPSIZE(uniformCount)]
+	param		pname		GLenum in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	ARB_uniform_buffer_object
+	dlflags		notlistable
+	version		2.0
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetActiveUniformName(program, uniformIndex, bufSize, length, uniformName)
+	return		void
+	param		program		UInt32 in value
+	param		uniformIndex	UInt32 in value
+	param		bufSize		SizeI in value
+	param		length		SizeI out array [1]
+	param		uniformName	Char out array [bufSize]
+	category	ARB_uniform_buffer_object
+	dlflags		notlistable
+	version		2.0
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetUniformBlockIndex(program, uniformBlockName)
+	return		UInt32
+	param		program		UInt32 in value
+	param		uniformBlockName	Char in array [COMPSIZE()]
+	category	ARB_uniform_buffer_object
+	dlflags		notlistable
+	version		2.0
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetActiveUniformBlockiv(program, uniformBlockIndex, pname, params)
+	return		void
+	param		program		UInt32 in value
+	param		uniformBlockIndex	UInt32 in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	ARB_uniform_buffer_object
+	dlflags		notlistable
+	version		2.0
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetActiveUniformBlockName(program, uniformBlockIndex, bufSize, length, uniformBlockName)
+	return		void
+	param		program		UInt32 in value
+	param		uniformBlockIndex	UInt32 in value
+	param		bufSize		SizeI in value
+	param		length		SizeI out array [1]
+	param		uniformBlockName	Char out array [bufSize]
+	category	ARB_uniform_buffer_object
+	dlflags		notlistable
+	version		2.0
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+UniformBlockBinding(program, uniformBlockIndex, uniformBlockBinding)
+	return		void
+	param		program		UInt32 in value
+	param		uniformBlockIndex	UInt32 in value
+	param		uniformBlockBinding	UInt32 in value
+	category	ARB_uniform_buffer_object
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+
+###############################################################################
+#
+# ARB Extension #58
+# ARB_compatibility commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_compatibility
+
+###############################################################################
+#
+# ARB Extension #59
+# ARB_copy_buffer commands
+#
+###############################################################################
+
+CopyBufferSubData(readTarget, writeTarget, readOffset, writeOffset, size)
+	return		void
+	param		readTarget	GLenum in value
+	param		writeTarget	GLenum in value
+	param		readOffset	BufferOffset in value
+	param		writeOffset	BufferOffset in value
+	param		size		BufferSize in value
+	category	ARB_copy_buffer
+	version		3.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #60
+# ARB_shader_texture_lod commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_shader_texture_lod
+
+###############################################################################
+#
+# ARB Extension #61
+# ARB_depth_clamp commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_depth_clamp
+
+###############################################################################
+#
+# ARB Extension #62
+# ARB_draw_elements_base_vertex commands
+#
+###############################################################################
+
+DrawElementsBaseVertex(mode, count, type, indices, basevertex)
+	return		void
+	param		mode		GLenum in value
+	param		count		SizeI in value
+	param		type		DrawElementsType in value
+	param		indices		Void in array [COMPSIZE(count/type)]
+	param		basevertex	Int32 in value
+	category	ARB_draw_elements_base_vertex
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DrawRangeElementsBaseVertex(mode, start, end, count, type, indices, basevertex)
+	return		void
+	param		mode		GLenum in value
+	param		start		UInt32 in value
+	param		end		UInt32 in value
+	param		count		SizeI in value
+	param		type		DrawElementsType in value
+	param		indices		Void in array [COMPSIZE(count/type)]
+	param		basevertex	Int32 in value
+	category	ARB_draw_elements_base_vertex
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DrawElementsInstancedBaseVertex(mode, count, type, indices, instancecount, basevertex)
+	return		void
+	param		mode		GLenum in value
+	param		count		SizeI in value
+	param		type		DrawElementsType in value
+	param		indices		Void in array [COMPSIZE(count/type)]
+	param		instancecount	SizeI in value
+	param		basevertex	Int32 in value
+	category	ARB_draw_elements_base_vertex
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MultiDrawElementsBaseVertex(mode, count, type, indices, drawcount, basevertex)
+	return		void
+	param		mode		GLenum in value
+	param		count		SizeI in array [COMPSIZE(drawcount)]
+	param		type		DrawElementsType in value
+	param		indices		ConstVoidPointer in array [COMPSIZE(drawcount)]
+	param		drawcount	SizeI in value
+	param		basevertex	Int32 in array [COMPSIZE(drawcount)]
+	category	ARB_draw_elements_base_vertex
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #63
+# ARB_fragment_coord_conventions commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_fragment_coord_conventions
+
+###############################################################################
+#
+# ARB Extension #64
+# ARB_provoking_vertex commands
+#
+###############################################################################
+
+ProvokingVertex(mode)
+	return		void
+	param		mode		GLenum in value
+	category	ARB_provoking_vertex
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #65
+# ARB_seamless_cube_map commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_seamless_cube_map
+
+###############################################################################
+#
+# ARB Extension #66
+# ARB_sync commands
+#
+###############################################################################
+
+FenceSync(condition, flags)
+	return		sync
+	param		condition	GLenum in value
+	param		flags		GLbitfield in value
+	category	ARB_sync
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+IsSync(sync)
+	return		Boolean
+	param		sync		sync in value
+	category	ARB_sync
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DeleteSync(sync)
+	return		void
+	param		sync		sync in value
+	category	ARB_sync
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ClientWaitSync(sync, flags, timeout)
+	return		GLenum
+	param		sync		sync in value
+	param		flags		GLbitfield in value
+	param		timeout		UInt64 in value
+	category	ARB_sync
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+WaitSync(sync, flags, timeout)
+	return		void
+	param		sync		sync in value
+	param		flags		GLbitfield in value
+	param		timeout		UInt64 in value
+	category	ARB_sync
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetInteger64v(pname, params)
+	return		void
+	param		pname		GLenum in value
+	param		params		Int64 out array [COMPSIZE(pname)]
+	category	ARB_sync
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetSynciv(sync, pname, bufSize, length, values)
+	return		void
+	param		sync		sync in value
+	param		pname		GLenum in value
+	param		bufSize		SizeI in value
+	param		length		SizeI out array [1]
+	param		values		Int32 out array [length]
+	category	ARB_sync
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #67
+# ARB_texture_multisample commands
+#
+###############################################################################
+
+TexImage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations)
+	return		void
+	param		target		GLenum in value
+	param		samples		SizeI in value
+	param		internalformat	Int32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		fixedsamplelocations	Boolean in value
+	category	ARB_texture_multisample
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TexImage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations)
+	return		void
+	param		target		GLenum in value
+	param		samples		SizeI in value
+	param		internalformat	Int32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		fixedsamplelocations	Boolean in value
+	category	ARB_texture_multisample
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetMultisamplefv(pname, index, val)
+	return		void
+	param		pname		GLenum in value
+	param		index		UInt32 in value
+	param		val		Float32 out array [COMPSIZE(pname)]
+	category	ARB_texture_multisample
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+SampleMaski(index, mask)
+	return		void
+	param		index		UInt32 in value
+	param		mask		GLbitfield in value
+	category	ARB_texture_multisample
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #68
+# ARB_vertex_array_bgra commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_vertex_array_bgra
+
+###############################################################################
+#
+# ARB Extension #69
+# ARB_draw_buffers_blend commands
+#
+###############################################################################
+
+BlendEquationiARB(buf, mode)
+	return		void
+	param		buf		UInt32 in value
+	param		mode		GLenum in value
+	category	ARB_draw_buffers_blend
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+	alias		BlendEquationi
+
+BlendEquationSeparateiARB(buf, modeRGB, modeAlpha)
+	return		void
+	param		buf		UInt32 in value
+	param		modeRGB		GLenum in value
+	param		modeAlpha	GLenum in value
+	category	ARB_draw_buffers_blend
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+	alias		BlendEquationSeparatei
+
+BlendFunciARB(buf, src, dst)
+	return		void
+	param		buf		UInt32 in value
+	param		src		GLenum in value
+	param		dst		GLenum in value
+	category	ARB_draw_buffers_blend
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+	alias		BlendFunci
+
+BlendFuncSeparateiARB(buf, srcRGB, dstRGB, srcAlpha, dstAlpha)
+	return		void
+	param		buf		UInt32 in value
+	param		srcRGB		GLenum in value
+	param		dstRGB		GLenum in value
+	param		srcAlpha	GLenum in value
+	param		dstAlpha	GLenum in value
+	category	ARB_draw_buffers_blend
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+	alias		BlendFuncSeparatei
+
+###############################################################################
+#
+# ARB Extension #70
+# ARB_sample_shading commands
+#
+###############################################################################
+
+MinSampleShadingARB(value)
+	return		void
+	param		value		ColorF in value
+	category	ARB_sample_shading
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+	alias		MinSampleShading
+
+###############################################################################
+#
+# ARB Extension #71
+# ARB_texture_cube_map_array commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_texture_cube_map_array
+
+###############################################################################
+#
+# ARB Extension #72
+# ARB_texture_gather commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_texture_gather
+
+###############################################################################
+#
+# ARB Extension #73
+# ARB_texture_query_lod commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_texture_query_lod
+
+###############################################################################
+#
+# ARB Extension #74 - WGL_ARB_create_context_profile
+# ARB Extension #75 - GLX_ARB_create_context_profile
+#
+###############################################################################
+
+###############################################################################
+#
+# ARB Extension #76
+# ARB_shading_language_include commands
+#
+###############################################################################
+
+NamedStringARB(type, namelen, name, stringlen, string)
+	return		void
+	param		type		GLenum in value
+	param		namelen		Int32 in value
+	param		name		Char in array [namelen]
+	param		stringlen	Int32 in value
+	param		string		Char in array [stringlen]
+	category	ARB_shading_language_include
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DeleteNamedStringARB(namelen, name)
+	return		void
+	param		namelen		Int32 in value
+	param		name		Char in array [namelen]
+	category	ARB_shading_language_include
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+CompileShaderIncludeARB(shader, count, path, length)
+	return		void
+	param		shader		UInt32 in value
+	param		count		SizeI in value
+	param		path		CharPointer in array [count]
+	param		length		Int32 in array [count]
+	category	ARB_shading_language_include
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+IsNamedStringARB(namelen, name)
+	return		Boolean
+	param		namelen		Int32 in value
+	param		name		Char in array [namelen]
+	category	ARB_shading_language_include
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetNamedStringARB(namelen, name, bufSize, stringlen, string)
+	return		void
+	param		namelen		Int32 in value
+	param		name		Char in array [namelen]
+	param		bufSize		SizeI in value
+	param		stringlen	Int32 out array [1]
+	param		string		Char out array [bufSize]
+	category	ARB_shading_language_include
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetNamedStringivARB(namelen, name, pname, params)
+	return		void
+	param		namelen		Int32 in value
+	param		name		Char in array [namelen]
+	param		pname		GLenum in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	ARB_shading_language_include
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #77
+# ARB_texture_compression_bptc commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_texture_compression_bptc
+
+###############################################################################
+#
+# ARB Extension #78
+# ARB_blend_func_extended commands
+#
+###############################################################################
+
+BindFragDataLocationIndexed(program, colorNumber, index, name)
+	return		void
+	param		program		UInt32 in value
+	param		colorNumber	UInt32 in value
+	param		index		UInt32 in value
+	param		name		Char in array []
+	category	ARB_blend_func_extended
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetFragDataIndex(program, name)
+	return		Int32
+	param		program		UInt32 in value
+	param		name		Char in array []
+	category	ARB_blend_func_extended
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #79
+# ARB_explicit_attrib_location commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_explicit_attrib_location
+
+###############################################################################
+#
+# ARB Extension #80
+# ARB_occlusion_query2 commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_occlusion_query2
+
+###############################################################################
+#
+# ARB Extension #81
+# ARB_sampler_objects commands
+#
+###############################################################################
+
+GenSamplers(count, samplers)
+	return		void
+	param		count		SizeI in value
+	param		samplers	UInt32 out array [count]
+	category	ARB_sampler_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DeleteSamplers(count, samplers)
+	return		void
+	param		count		SizeI in value
+	param		samplers	UInt32 in array [count]
+	category	ARB_sampler_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+IsSampler(sampler)
+	return		Boolean
+	param		sampler		UInt32 in value
+	category	ARB_sampler_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+BindSampler(unit, sampler)
+	return		void
+	param		unit		UInt32 in value
+	param		sampler		UInt32 in value
+	category	ARB_sampler_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+SamplerParameteri(sampler, pname, param)
+	return		void
+	param		sampler		UInt32 in value
+	param		pname		GLenum in value
+	param		param		Int32 in value
+	category	ARB_sampler_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+SamplerParameteriv(sampler, pname, param)
+	return		void
+	param		sampler		UInt32 in value
+	param		pname		GLenum in value
+	param		param		Int32 in array [COMPSIZE(pname)]
+	category	ARB_sampler_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+SamplerParameterf(sampler, pname, param)
+	return		void
+	param		sampler		UInt32 in value
+	param		pname		GLenum in value
+	param		param		Float32 in value
+	category	ARB_sampler_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+SamplerParameterfv(sampler, pname, param)
+	return		void
+	param		sampler		UInt32 in value
+	param		pname		GLenum in value
+	param		param		Float32 in array [COMPSIZE(pname)]
+	category	ARB_sampler_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+SamplerParameterIiv(sampler, pname, param)
+	return		void
+	param		sampler		UInt32 in value
+	param		pname		GLenum in value
+	param		param		Int32 in array [COMPSIZE(pname)]
+	category	ARB_sampler_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+SamplerParameterIuiv(sampler, pname, param)
+	return		void
+	param		sampler		UInt32 in value
+	param		pname		GLenum in value
+	param		param		UInt32 in array [COMPSIZE(pname)]
+	category	ARB_sampler_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetSamplerParameteriv(sampler, pname, params)
+	return		void
+	param		sampler		UInt32 in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	ARB_sampler_objects
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetSamplerParameterIiv(sampler, pname, params)
+	return		void
+	param		sampler		UInt32 in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	ARB_sampler_objects
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetSamplerParameterfv(sampler, pname, params)
+	return		void
+	param		sampler		UInt32 in value
+	param		pname		GLenum in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	ARB_sampler_objects
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetSamplerParameterIuiv(sampler, pname, params)
+	return		void
+	param		sampler		UInt32 in value
+	param		pname		GLenum in value
+	param		params		UInt32 out array [COMPSIZE(pname)]
+	category	ARB_sampler_objects
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #82
+# ARB_shader_bit_encoding commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_shader_bit_encoding
+
+###############################################################################
+#
+# ARB Extension #83
+# ARB_texture_rgb10_a2ui commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_texture_rgb10_a2ui
+
+###############################################################################
+#
+# ARB Extension #84
+# ARB_texture_swizzle commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_texture_swizzle
+
+###############################################################################
+#
+# ARB Extension #85
+# ARB_timer_query commands
+#
+###############################################################################
+
+QueryCounter(id, target)
+	return		void
+	param		id		UInt32 in value
+	param		target		GLenum in value
+	category	ARB_timer_query
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetQueryObjecti64v(id, pname, params)
+	return		void
+	param		id		UInt32 in value
+	param		pname		GLenum in value
+	param		params		Int64 out array [COMPSIZE(pname)]
+	category	ARB_timer_query
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetQueryObjectui64v(id, pname, params)
+	return		void
+	param		id		UInt32 in value
+	param		pname		GLenum in value
+	param		params		UInt64 out array [COMPSIZE(pname)]
+	category	ARB_timer_query
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #86
+# ARB_vertex_type_2_10_10_10_rev commands
+#
+###############################################################################
+
+VertexP2ui(type, value)
+	return		void
+	param		type		GLenum in value
+	param		value		UInt32 in value
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexP2uiv(type, value)
+	return		void
+	param		type		GLenum in value
+	param		value		UInt32 in array [1]
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexP3ui(type, value)
+	return		void
+	param		type		GLenum in value
+	param		value		UInt32 in value
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexP3uiv(type, value)
+	return		void
+	param		type		GLenum in value
+	param		value		UInt32 in array [1]
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexP4ui(type, value)
+	return		void
+	param		type		GLenum in value
+	param		value		UInt32 in value
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexP4uiv(type, value)
+	return		void
+	param		type		GLenum in value
+	param		value		UInt32 in array [1]
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TexCoordP1ui(type, coords)
+	return		void
+	param		type		GLenum in value
+	param		coords		UInt32 in value
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TexCoordP1uiv(type, coords)
+	return		void
+	param		type		GLenum in value
+	param		coords		UInt32 in array [1]
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TexCoordP2ui(type, coords)
+	return		void
+	param		type		GLenum in value
+	param		coords		UInt32 in value
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TexCoordP2uiv(type, coords)
+	return		void
+	param		type		GLenum in value
+	param		coords		UInt32 in array [1]
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TexCoordP3ui(type, coords)
+	return		void
+	param		type		GLenum in value
+	param		coords		UInt32 in value
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TexCoordP3uiv(type, coords)
+	return		void
+	param		type		GLenum in value
+	param		coords		UInt32 in array [1]
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TexCoordP4ui(type, coords)
+	return		void
+	param		type		GLenum in value
+	param		coords		UInt32 in value
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TexCoordP4uiv(type, coords)
+	return		void
+	param		type		GLenum in value
+	param		coords		UInt32 in array [1]
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MultiTexCoordP1ui(texture, type, coords)
+	return		void
+	param		texture		GLenum in value
+	param		type		GLenum in value
+	param		coords		UInt32 in value
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MultiTexCoordP1uiv(texture, type, coords)
+	return		void
+	param		texture		GLenum in value
+	param		type		GLenum in value
+	param		coords		UInt32 in array [1]
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MultiTexCoordP2ui(texture, type, coords)
+	return		void
+	param		texture		GLenum in value
+	param		type		GLenum in value
+	param		coords		UInt32 in value
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MultiTexCoordP2uiv(texture, type, coords)
+	return		void
+	param		texture		GLenum in value
+	param		type		GLenum in value
+	param		coords		UInt32 in array [1]
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MultiTexCoordP3ui(texture, type, coords)
+	return		void
+	param		texture		GLenum in value
+	param		type		GLenum in value
+	param		coords		UInt32 in value
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MultiTexCoordP3uiv(texture, type, coords)
+	return		void
+	param		texture		GLenum in value
+	param		type		GLenum in value
+	param		coords		UInt32 in array [1]
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MultiTexCoordP4ui(texture, type, coords)
+	return		void
+	param		texture		GLenum in value
+	param		type		GLenum in value
+	param		coords		UInt32 in value
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MultiTexCoordP4uiv(texture, type, coords)
+	return		void
+	param		texture		GLenum in value
+	param		type		GLenum in value
+	param		coords		UInt32 in array [1]
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+NormalP3ui(type, coords)
+	return		void
+	param		type		GLenum in value
+	param		coords		UInt32 in value
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+NormalP3uiv(type, coords)
+	return		void
+	param		type		GLenum in value
+	param		coords		UInt32 in array [1]
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ColorP3ui(type, color)
+	return		void
+	param		type		GLenum in value
+	param		color		UInt32 in value
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ColorP3uiv(type, color)
+	return		void
+	param		type		GLenum in value
+	param		color		UInt32 in array [1]
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ColorP4ui(type, color)
+	return		void
+	param		type		GLenum in value
+	param		color		UInt32 in value
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ColorP4uiv(type, color)
+	return		void
+	param		type		GLenum in value
+	param		color		UInt32 in array [1]
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+SecondaryColorP3ui(type, color)
+	return		void
+	param		type		GLenum in value
+	param		color		UInt32 in value
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+SecondaryColorP3uiv(type, color)
+	return		void
+	param		type		GLenum in value
+	param		color		UInt32 in array [1]
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribP1ui(index, type, normalized, value)
+	return		void
+	param		index		UInt32 in value
+	param		type		GLenum in value
+	param		normalized	Boolean in value
+	param		value		UInt32 in value
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribP1uiv(index, type, normalized, value)
+	return		void
+	param		index		UInt32 in value
+	param		type		GLenum in value
+	param		normalized	Boolean in value
+	param		value		UInt32 in array [1]
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribP2ui(index, type, normalized, value)
+	return		void
+	param		index		UInt32 in value
+	param		type		GLenum in value
+	param		normalized	Boolean in value
+	param		value		UInt32 in value
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribP2uiv(index, type, normalized, value)
+	return		void
+	param		index		UInt32 in value
+	param		type		GLenum in value
+	param		normalized	Boolean in value
+	param		value		UInt32 in array [1]
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribP3ui(index, type, normalized, value)
+	return		void
+	param		index		UInt32 in value
+	param		type		GLenum in value
+	param		normalized	Boolean in value
+	param		value		UInt32 in value
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribP3uiv(index, type, normalized, value)
+	return		void
+	param		index		UInt32 in value
+	param		type		GLenum in value
+	param		normalized	Boolean in value
+	param		value		UInt32 in array [1]
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribP4ui(index, type, normalized, value)
+	return		void
+	param		index		UInt32 in value
+	param		type		GLenum in value
+	param		normalized	Boolean in value
+	param		value		UInt32 in value
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribP4uiv(index, type, normalized, value)
+	return		void
+	param		index		UInt32 in value
+	param		type		GLenum in value
+	param		normalized	Boolean in value
+	param		value		UInt32 in array [1]
+	category	ARB_vertex_type_2_10_10_10_rev
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #87
+# ARB_draw_indirect commands
+#
+###############################################################################
+
+DrawArraysIndirect(mode, indirect)
+	return		void
+	param		mode		GLenum in value
+	param		indirect	Void in array []
+	category	ARB_draw_indirect
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DrawElementsIndirect(mode, type, indirect)
+	return		void
+	param		mode		GLenum in value
+	param		type		GLenum in value
+	param		indirect	Void in array []
+	category	ARB_draw_indirect
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #88
+# ARB_gpu_shader5 commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_gpu_shader5
+
+###############################################################################
+#
+# ARB Extension #89
+# ARB_gpu_shader_fp64 commands
+#
+###############################################################################
+
+Uniform1d(location, x)
+	return		void
+	param		location	Int32 in value
+	param		x		Float64 in value
+	category	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform2d(location, x, y)
+	return		void
+	param		location	Int32 in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	category	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform3d(location, x, y, z)
+	return		void
+	param		location	Int32 in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	param		z		Float64 in value
+	category	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform4d(location, x, y, z, w)
+	return		void
+	param		location	Int32 in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	param		z		Float64 in value
+	param		w		Float64 in value
+	category	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform1dv(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float64 in array [count]
+	category	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform2dv(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float64 in array [count]
+	category	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform3dv(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float64 in array [count]
+	category	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform4dv(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float64 in array [count]
+	category	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+UniformMatrix2dv(location, count, transpose, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float64 in array [count]
+	category	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+UniformMatrix3dv(location, count, transpose, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float64 in array [count]
+	category	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+UniformMatrix4dv(location, count, transpose, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float64 in array [count]
+	category	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+UniformMatrix2x3dv(location, count, transpose, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float64 in array [count]
+	category	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+UniformMatrix2x4dv(location, count, transpose, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float64 in array [count]
+	category	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+UniformMatrix3x2dv(location, count, transpose, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float64 in array [count]
+	category	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+UniformMatrix3x4dv(location, count, transpose, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float64 in array [count]
+	category	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+UniformMatrix4x2dv(location, count, transpose, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float64 in array [count]
+	category	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+UniformMatrix4x3dv(location, count, transpose, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float64 in array [count]
+	category	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetUniformdv(program, location, params)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		params		Float64 out array [COMPSIZE(location)]
+	category	ARB_gpu_shader_fp64
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #90
+# ARB_shader_subroutine commands
+#
+###############################################################################
+
+GetSubroutineUniformLocation(program, shadertype, name)
+	return		Int32
+	param		program		UInt32 in value
+	param		shadertype	GLenum in value
+	param		name		Char in array []
+	category	ARB_shader_subroutine
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetSubroutineIndex(program, shadertype, name)
+	return		UInt32
+	param		program		UInt32 in value
+	param		shadertype	GLenum in value
+	param		name		Char in array []
+	category	ARB_shader_subroutine
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetActiveSubroutineUniformiv(program, shadertype, index, pname, values)
+	return		void
+	param		program		UInt32 in value
+	param		shadertype	GLenum in value
+	param		index		UInt32 in value
+	param		pname		GLenum in value
+	param		values		Int32 out array [COMPSIZE(pname)]
+	category	ARB_shader_subroutine
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetActiveSubroutineUniformName(program, shadertype, index, bufsize, length, name)
+	return		void
+	param		program		UInt32 in value
+	param		shadertype	GLenum in value
+	param		index		UInt32 in value
+	param		bufsize		SizeI in value
+	param		length		SizeI out array [1]
+	param		name		Char out array [bufsize]
+	category	ARB_shader_subroutine
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetActiveSubroutineName(program, shadertype, index, bufsize, length, name)
+	return		void
+	param		program		UInt32 in value
+	param		shadertype	GLenum in value
+	param		index		UInt32 in value
+	param		bufsize		SizeI in value
+	param		length		SizeI out array [1]
+	param		name		Char out array [bufsize]
+	category	ARB_shader_subroutine
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+UniformSubroutinesuiv(shadertype, count, indices)
+	return		void
+	param		shadertype	GLenum in value
+	param		count		SizeI in value
+	param		indices		UInt32 in array [count]
+	category	ARB_shader_subroutine
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetUniformSubroutineuiv(shadertype, location, params)
+	return		void
+	param		shadertype	GLenum in value
+	param		location	Int32 in value
+	param		params		UInt32 out array [1]
+	category	ARB_shader_subroutine
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetProgramStageiv(program, shadertype, pname, values)
+	return		void
+	param		program		UInt32 in value
+	param		shadertype	GLenum in value
+	param		pname		GLenum in value
+	param		values		Int32 out array [1]
+	category	ARB_shader_subroutine
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #91
+# ARB_tessellation_shader commands
+#
+###############################################################################
+
+PatchParameteri(pname, value)
+	return		void
+	param		pname		GLenum in value
+	param		value		Int32 in value
+	category	ARB_tessellation_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+PatchParameterfv(pname, values)
+	return		void
+	param		pname		GLenum in value
+	param		values		Float32 in array [COMPSIZE(pname)]
+	category	ARB_tessellation_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #92
+# ARB_texture_buffer_object_rgb32 commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_texture_buffer_object_rgb32
+
+###############################################################################
+#
+# ARB Extension #93
+# ARB_transform_feedback2 commands
+#
+###############################################################################
+
+BindTransformFeedback(target, id)
+	return		void
+	param		target		GLenum in value
+	param		id		UInt32 in value
+	category	ARB_transform_feedback2
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DeleteTransformFeedbacks(n, ids)
+	return		void
+	param		n		SizeI in value
+	param		ids		UInt32 in array [n]
+	category	ARB_transform_feedback2
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GenTransformFeedbacks(n, ids)
+	return		void
+	param		n		SizeI in value
+	param		ids		UInt32 out array [n]
+	category	ARB_transform_feedback2
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+IsTransformFeedback(id)
+	return		Boolean
+	param		id		UInt32 in value
+	category	ARB_transform_feedback2
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+PauseTransformFeedback()
+	return		void
+	category	ARB_transform_feedback2
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ResumeTransformFeedback()
+	return		void
+	category	ARB_transform_feedback2
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DrawTransformFeedback(mode, id)
+	return		void
+	param		mode		GLenum in value
+	param		id		UInt32 in value
+	category	ARB_transform_feedback2
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #94
+# ARB_transform_feedback3 commands
+#
+###############################################################################
+
+DrawTransformFeedbackStream(mode, id, stream)
+	return		void
+	param		mode		GLenum in value
+	param		id		UInt32 in value
+	param		stream		UInt32 in value
+	category	ARB_transform_feedback3
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+BeginQueryIndexed(target, index, id)
+	return		void
+	param		target		GLenum in value
+	param		index		UInt32 in value
+	param		id		UInt32 in value
+	category	ARB_transform_feedback3
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+EndQueryIndexed(target, index)
+	return		void
+	param		target		GLenum in value
+	param		index		UInt32 in value
+	category	ARB_transform_feedback3
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetQueryIndexediv(target, index, pname, params)
+	return		void
+	param		target		GLenum in value
+	param		index		UInt32 in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	ARB_transform_feedback3
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #95
+# ARB_ES2_compatibility commands
+#
+###############################################################################
+
+ReleaseShaderCompiler()
+	return		void
+	category	ARB_ES2_compatibility
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ShaderBinary(count, shaders, binaryformat, binary, length)
+	return		void
+	param		count		SizeI in value
+	param		shaders		UInt32 in array [count]
+	param		binaryformat	GLenum in value
+	param		binary		Void in array [length]
+	param		length		SizeI in value
+	category	ARB_ES2_compatibility
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetShaderPrecisionFormat(shadertype, precisiontype, range, precision)
+	return		void
+	param		shadertype	GLenum in value
+	param		precisiontype	GLenum in value
+	param		range		Int32 out array [2]
+	param		precision	Int32 out array [2]
+	category	ARB_ES2_compatibility
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+DepthRangef(n, f)
+	return		void
+	param		n		Float32 in value
+	param		f		Float32 in value
+	category	ARB_ES2_compatibility
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ClearDepthf(d)
+	return		void
+	param		d		Float32 in value
+	category	ARB_ES2_compatibility
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #96
+# ARB_get_program_binary commands
+#
+###############################################################################
+
+GetProgramBinary(program, bufSize, length, binaryFormat, binary)
+	return		void
+	param		program		UInt32 in value
+	param		bufSize		SizeI in value
+	param		length		SizeI out array [1]
+	param		binaryFormat	GLenum out array [1]
+	param		binary		Void out array [COMPSIZE(length)]
+	category	ARB_get_program_binary
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+ProgramBinary(program, binaryFormat, binary, length)
+	return		void
+	param		program		UInt32 in value
+	param		binaryFormat	GLenum in value
+	param		binary		Void in array [length]
+	param		length		SizeI in value
+	category	ARB_get_program_binary
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramParameteri(program, pname, value)
+	return		void
+	param		program		UInt32 in value
+	param		pname		ProgramParameterPName in value
+	param		value		Int32 in value
+	category	ARB_get_program_binary
+	version		3.0
+	extension	soft WINSOFT
+	glfflags	ignore
+	glxflags	ignore
+
+###############################################################################
+#
+# ARB Extension #97
+# ARB_separate_shader_objects commands
+#
+###############################################################################
+
+UseProgramStages(pipeline, stages, program)
+	return		void
+	param		pipeline	UInt32 in value
+	param		stages		GLbitfield in value
+	param		program		UInt32 in value
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ActiveShaderProgram(pipeline, program)
+	return		void
+	param		pipeline	UInt32 in value
+	param		program		UInt32 in value
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+CreateShaderProgramv(type, count, strings)
+	return		UInt32
+	param		type		GLenum in value
+	param		count		SizeI in value
+	param		strings		ConstCharPointer in array [count]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+BindProgramPipeline(pipeline)
+	return		void
+	param		pipeline	UInt32 in value
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DeleteProgramPipelines(n, pipelines)
+	return		void
+	param		n		SizeI in value
+	param		pipelines	UInt32 in array [n]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GenProgramPipelines(n, pipelines)
+	return		void
+	param		n		SizeI in value
+	param		pipelines	UInt32 out array [n]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+IsProgramPipeline(pipeline)
+	return		Boolean
+	param		pipeline	UInt32 in value
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+#@ ProgramParameteri also in ARB_get_program_binary
+
+GetProgramPipelineiv(pipeline, pname, params)
+	return		void
+	param		pipeline	UInt32 in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	ARB_separate_shader_objects
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform1i(program, location, v0)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		Int32 in value
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform1iv(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Int32 in array [1]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform1f(program, location, v0)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		Float32 in value
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform1fv(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float32 in array [1]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform1d(program, location, v0)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		Float64 in value
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform1dv(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float64 in array [1]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform1ui(program, location, v0)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		UInt32 in value
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform1uiv(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt32 in array [1]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform2i(program, location, v0, v1)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		Int32 in value
+	param		v1		Int32 in value
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform2iv(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Int32 in array [2]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform2f(program, location, v0, v1)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		Float32 in value
+	param		v1		Float32 in value
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform2fv(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float32 in array [2]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform2d(program, location, v0, v1)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		Float64 in value
+	param		v1		Float64 in value
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform2dv(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float64 in array [2]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform2ui(program, location, v0, v1)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		UInt32 in value
+	param		v1		UInt32 in value
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform2uiv(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt32 in array [2]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform3i(program, location, v0, v1, v2)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		Int32 in value
+	param		v1		Int32 in value
+	param		v2		Int32 in value
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform3iv(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Int32 in array [3]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform3f(program, location, v0, v1, v2)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		Float32 in value
+	param		v1		Float32 in value
+	param		v2		Float32 in value
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform3fv(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float32 in array [3]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform3d(program, location, v0, v1, v2)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		Float64 in value
+	param		v1		Float64 in value
+	param		v2		Float64 in value
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform3dv(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float64 in array [3]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform3ui(program, location, v0, v1, v2)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		UInt32 in value
+	param		v1		UInt32 in value
+	param		v2		UInt32 in value
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform3uiv(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt32 in array [3]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform4i(program, location, v0, v1, v2, v3)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		Int32 in value
+	param		v1		Int32 in value
+	param		v2		Int32 in value
+	param		v3		Int32 in value
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform4iv(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Int32 in array [4]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform4f(program, location, v0, v1, v2, v3)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		Float32 in value
+	param		v1		Float32 in value
+	param		v2		Float32 in value
+	param		v3		Float32 in value
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform4fv(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float32 in array [4]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform4d(program, location, v0, v1, v2, v3)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		Float64 in value
+	param		v1		Float64 in value
+	param		v2		Float64 in value
+	param		v3		Float64 in value
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform4dv(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float64 in array [4]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform4ui(program, location, v0, v1, v2, v3)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		UInt32 in value
+	param		v1		UInt32 in value
+	param		v2		UInt32 in value
+	param		v3		UInt32 in value
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform4uiv(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt32 in array [4]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformMatrix2fv(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [2]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformMatrix3fv(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [3]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformMatrix4fv(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [4]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformMatrix2dv(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float64 in array [2]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformMatrix3dv(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float64 in array [3]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformMatrix4dv(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float64 in array [4]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformMatrix2x3fv(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [count]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformMatrix3x2fv(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [count]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformMatrix2x4fv(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [count]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformMatrix4x2fv(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [count]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformMatrix3x4fv(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [count]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformMatrix4x3fv(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [count]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformMatrix2x3dv(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float64 in array [count]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformMatrix3x2dv(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float64 in array [count]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformMatrix2x4dv(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float64 in array [count]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformMatrix4x2dv(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float64 in array [count]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformMatrix3x4dv(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float64 in array [count]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformMatrix4x3dv(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float64 in array [count]
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ValidateProgramPipeline(pipeline)
+	return		void
+	param		pipeline	UInt32 in value
+	category	ARB_separate_shader_objects
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetProgramPipelineInfoLog(pipeline, bufSize, length, infoLog)
+	return		void
+	param		pipeline	UInt32 in value
+	param		bufSize		SizeI in value
+	param		length		SizeI out array [1]
+	param		infoLog		Char out array [COMPSIZE(length)]
+	category	ARB_separate_shader_objects
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #98
+# ARB_shader_precision commands
+#
+###############################################################################
+
+###############################################################################
+#
+# ARB Extension #99
+# ARB_vertex_attrib_64bit commands
+#
+###############################################################################
+
+VertexAttribL1d(index, x)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float64 in value
+	category	ARB_vertex_attrib_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL2d(index, x, y)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	category	ARB_vertex_attrib_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL3d(index, x, y, z)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	param		z		Float64 in value
+	category	ARB_vertex_attrib_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL4d(index, x, y, z, w)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	param		z		Float64 in value
+	param		w		Float64 in value
+	category	ARB_vertex_attrib_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL1dv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float64 in array [1]
+	category	ARB_vertex_attrib_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL2dv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float64 in array [2]
+	category	ARB_vertex_attrib_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL3dv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float64 in array [3]
+	category	ARB_vertex_attrib_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL4dv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float64 in array [4]
+	category	ARB_vertex_attrib_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribLPointer(index, size, type, stride, pointer)
+	return		void
+	param		index		UInt32 in value
+	param		size		Int32 in value
+	param		type		GLenum in value
+	param		stride		SizeI in value
+	param		pointer		Void in array [size]
+	category	ARB_vertex_attrib_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetVertexAttribLdv(index, pname, params)
+	return		void
+	param		index		UInt32 in value
+	param		pname		GLenum in value
+	param		params		Float64 out array [COMPSIZE(pname)]
+	category	ARB_vertex_attrib_64bit
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+#@ VertexArrayVertexAttribLOffsetEXT also in EXT_vertex_attrib_64bit
+
+###############################################################################
+#
+# ARB Extension #100
+# ARB_viewport_array commands
+#
+###############################################################################
+
+ViewportArrayv(first, count, v)
+	return		void
+	param		first		UInt32 in value
+	param		count		SizeI in value
+	param		v		Float32 in array [COMPSIZE(count)]
+	category	ARB_viewport_array
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ViewportIndexedf(index, x, y, w, h)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		w		Float32 in value
+	param		h		Float32 in value
+	category	ARB_viewport_array
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ViewportIndexedfv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float32 in array [4]
+	category	ARB_viewport_array
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ScissorArrayv(first, count, v)
+	return		void
+	param		first		UInt32 in value
+	param		count		SizeI in value
+	param		v		Int32 in array [COMPSIZE(count)]
+	category	ARB_viewport_array
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ScissorIndexed(index, left, bottom, width, height)
+	return		void
+	param		index		UInt32 in value
+	param		left		Int32 in value
+	param		bottom		Int32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	category	ARB_viewport_array
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ScissorIndexedv(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int32 in array [4]
+	category	ARB_viewport_array
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DepthRangeArrayv(first, count, v)
+	return		void
+	param		first		UInt32 in value
+	param		count		SizeI in value
+	param		v		Float64 in array [COMPSIZE(count)]
+	category	ARB_viewport_array
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DepthRangeIndexed(index, n, f)
+	return		void
+	param		index		UInt32 in value
+	param		n		Float64 in value
+	param		f		Float64 in value
+	category	ARB_viewport_array
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetFloati_v(target, index, data)
+	return		void
+	param		target		GLenum in value
+	param		index		UInt32 in value
+	param		data		Float32 out array [COMPSIZE(target)]
+	category	ARB_viewport_array
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetDoublei_v(target, index, data)
+	return		void
+	param		target		GLenum in value
+	param		index		UInt32 in value
+	param		data		Float64 out array [COMPSIZE(target)]
+	category	ARB_viewport_array
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #101 - GLX_ARB_create_context_robustness
+# ARB Extension #102 - WGL_ARB_create_context_robustness
+#
+###############################################################################
+
+###############################################################################
+#
+# ARB Extension #103
+# ARB_cl_event commands
+#
+###############################################################################
+
+CreateSyncFromCLeventARB(context, event, flags)
+	return		sync
+	param		context		cl_context in value
+	param		event		cl_event in value
+	param		flags		GLbitfield in value
+	category	ARB_cl_event
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #104
+# ARB_debug_output commands
+#
+###############################################################################
+
+DebugMessageControlARB(source, type, severity, count, ids, enabled)
+	return		void
+	param		source		GLenum in value
+	param		type		GLenum in value
+	param		severity	GLenum in value
+	param		count		SizeI in value
+	param		ids		UInt32 in array [count]
+	param		enabled		Boolean in value
+	category	ARB_debug_output
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DebugMessageInsertARB(source, type, id, severity, length, buf)
+	return		void
+	param		source		GLenum in value
+	param		type		GLenum in value
+	param		id		UInt32 in value
+	param		severity	GLenum in value
+	param		length		SizeI in value
+	param		buf		Char in array [length]
+	category	ARB_debug_output
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DebugMessageCallbackARB(callback, userParam)
+	return		void
+	param		callback	GLDEBUGPROCARB in value
+	param		userParam	Void in array [COMPSIZE(callback)]
+	category	ARB_debug_output
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetDebugMessageLogARB(count, bufsize, sources, types, ids, severities, lengths, messageLog)
+	return		UInt32
+	param		count		UInt32 in value
+	param		bufsize		SizeI in value
+	param		sources		GLenum out array [count]
+	param		types		GLenum out array [count]
+	param		ids		UInt32 out array [count]
+	param		severities	GLenum out array [count]
+	param		lengths		SizeI out array [count]
+	param		messageLog	Char out array [COMPSIZE(lengths)]
+	category	ARB_debug_output
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+# GetPointerv is redeclared in this extension
+
+###############################################################################
+#
+# ARB Extension #105
+# ARB_robustness commands
+#
+###############################################################################
+
+GetGraphicsResetStatusARB()
+	return		GLenum
+	category	ARB_robustness
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetnMapdvARB(target, query, bufSize, v)
+	return		void
+	param		target		GLenum in value
+	param		query		GLenum in value
+	param		bufSize		SizeI in value
+	param		v		Float64 out array [bufSize]
+	category	ARB_robustness
+	profile		compatibility
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetnMapfvARB(target, query, bufSize, v)
+	return		void
+	param		target		GLenum in value
+	param		query		GLenum in value
+	param		bufSize		SizeI in value
+	param		v		Float32 out array [bufSize]
+	category	ARB_robustness
+	profile		compatibility
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetnMapivARB(target, query, bufSize, v)
+	return		void
+	param		target		GLenum in value
+	param		query		GLenum in value
+	param		bufSize		SizeI in value
+	param		v		Int32 out array [bufSize]
+	category	ARB_robustness
+	profile		compatibility
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetnPixelMapfvARB(map, bufSize, values)
+	return		void
+	param		map		GLenum in value
+	param		bufSize		SizeI in value
+	param		values		Float32 out array [bufSize]
+	category	ARB_robustness
+	profile		compatibility
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetnPixelMapuivARB(map, bufSize, values)
+	return		void
+	param		map		GLenum in value
+	param		bufSize		SizeI in value
+	param		values		UInt32 out array [bufSize]
+	category	ARB_robustness
+	profile		compatibility
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetnPixelMapusvARB(map, bufSize, values)
+	return		void
+	param		map		GLenum in value
+	param		bufSize		SizeI in value
+	param		values		UInt16 out array [bufSize]
+	category	ARB_robustness
+	profile		compatibility
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetnPolygonStippleARB(bufSize, pattern)
+	return		void
+	param		bufSize		SizeI in value
+	param		pattern		UInt8 out array [bufSize]
+	category	ARB_robustness
+	profile		compatibility
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetnColorTableARB(target, format, type, bufSize, table)
+	return		void
+	param		target		GLenum in value
+	param		format		GLenum in value
+	param		type		GLenum in value
+	param		bufSize		SizeI in value
+	param		table		Void out array [bufSize]
+	category	ARB_robustness
+	profile		compatibility
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetnConvolutionFilterARB(target, format, type, bufSize, image)
+	return		void
+	param		target		GLenum in value
+	param		format		GLenum in value
+	param		type		GLenum in value
+	param		bufSize		SizeI in value
+	param		image		Void out array [bufSize]
+	category	ARB_robustness
+	profile		compatibility
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetnSeparableFilterARB(target, format, type, rowBufSize, row, columnBufSize, column, span)
+	return		void
+	param		target		GLenum in value
+	param		format		GLenum in value
+	param		type		GLenum in value
+	param		rowBufSize	SizeI in value
+	param		row		Void out array [rowBufSize]
+	param		columnBufSize	SizeI in value
+	param		column		Void out array [columnBufSize]
+	param		span		Void out array [0]
+	category	ARB_robustness
+	profile		compatibility
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetnHistogramARB(target, reset, format, type, bufSize, values)
+	return		void
+	param		target		GLenum in value
+	param		reset		Boolean in value
+	param		format		GLenum in value
+	param		type		GLenum in value
+	param		bufSize		SizeI in value
+	param		values		Void out array [bufSize]
+	category	ARB_robustness
+	profile		compatibility
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetnMinmaxARB(target, reset, format, type, bufSize, values)
+	return		void
+	param		target		GLenum in value
+	param		reset		Boolean in value
+	param		format		GLenum in value
+	param		type		GLenum in value
+	param		bufSize		SizeI in value
+	param		values		Void out array [bufSize]
+	category	ARB_robustness
+	profile		compatibility
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetnTexImageARB(target, level, format, type, bufSize, img)
+	return		void
+	param		target		GLenum in value
+	param		level		Int32 in value
+	param		format		GLenum in value
+	param		type		GLenum in value
+	param		bufSize		SizeI in value
+	param		img		Void out array [bufSize]
+	category	ARB_robustness
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+ReadnPixelsARB(x, y, width, height, format, type, bufSize, data)
+	return		void
+	param		x		Int32 in value
+	param		y		Int32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		format		GLenum in value
+	param		type		GLenum in value
+	param		bufSize		SizeI in value
+	param		data		Void out array [bufSize]
+	category	ARB_robustness
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetnCompressedTexImageARB(target, lod, bufSize, img)
+	return		void
+	param		target		GLenum in value
+	param		lod		Int32 in value
+	param		bufSize		SizeI in value
+	param		img		Void out array [bufSize]
+	category	ARB_robustness
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetnUniformfvARB(program, location, bufSize, params)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		bufSize		SizeI in value
+	param		params		Float32 out array [bufSize]
+	category	ARB_robustness
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetnUniformivARB(program, location, bufSize, params)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		bufSize		SizeI in value
+	param		params		Int32 out array [bufSize]
+	category	ARB_robustness
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetnUniformuivARB(program, location, bufSize, params)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		bufSize		SizeI in value
+	param		params		UInt32 out array [bufSize]
+	category	ARB_robustness
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetnUniformdvARB(program, location, bufSize, params)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		bufSize		SizeI in value
+	param		params		Float64 out array [bufSize]
+	category	ARB_robustness
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #106
+# ARB_shader_stencil_export commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_shader_stencil_export
+
+###############################################################################
+#
+# ARB Extension #107
+# ARB_base_instance commands
+#
+###############################################################################
+
+DrawArraysInstancedBaseInstance(mode, first, count, instancecount, baseinstance)
+	return		void
+	param		mode		GLenum in value
+	param		first		Int32 in value
+	param		count		SizeI in value
+	param		instancecount	SizeI in value
+	param		baseinstance	UInt32 in value
+	category	ARB_base_instance
+	version		4.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DrawElementsInstancedBaseInstance(mode, count, type, indices, instancecount, baseinstance)
+	return		void
+	param		mode		GLenum in value
+	param		count		SizeI in value
+	param		type		GLenum in value
+	param		indices		void in array [count]
+	param		instancecount	SizeI in value
+	param		baseinstance	UInt32 in value
+	category	ARB_base_instance
+	version		4.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DrawElementsInstancedBaseVertexBaseInstance(mode, count, type, indices, instancecount, basevertex, baseinstance)
+	return		void
+	param		mode		GLenum in value
+	param		count		SizeI in value
+	param		type		GLenum in value
+	param		indices		void in array [count]
+	param		instancecount	SizeI in value
+	param		basevertex	Int32 in value
+	param		baseinstance	UInt32 in value
+	category	ARB_base_instance
+	version		4.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #108
+# ARB_shading_language_420pack commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_shading_language_420pack
+
+###############################################################################
+#
+# ARB Extension #109
+# ARB_transform_feedback_instanced commands
+#
+###############################################################################
+
+DrawTransformFeedbackInstanced(mode, id, instancecount)
+	return		void
+	param		mode		GLenum in value
+	param		id		UInt32 in value
+	param		instancecount	SizeI in value
+	category	ARB_transform_feedback_instanced
+	version		4.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DrawTransformFeedbackStreamInstanced(mode, id, stream, instancecount)
+	return		void
+	param		mode		GLenum in value
+	param		id		UInt32 in value
+	param		stream		UInt32 in value
+	param		instancecount	SizeI in value
+	category	ARB_transform_feedback_instanced
+	version		4.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #110
+# ARB_compressed_texture_pixel_storage commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_compressed_texture_pixel_storage
+
+###############################################################################
+#
+# ARB Extension #111
+# ARB_conservative_depth commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_conservative_depth
+
+###############################################################################
+#
+# ARB Extension #112
+# ARB_internalformat_query commands
+#
+###############################################################################
+
+GetInternalformativ(target, internalformat, pname, bufSize, params)
+	return		void
+	param		target		GLenum in value
+	param		internalformat	GLenum in value
+	param		pname		GLenum in value
+	param		bufSize		SizeI in value
+	param		params		Int32 out array [bufSize]
+	category	ARB_internalformat_query
+	dlflags		notlistable
+	version		4.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #113
+# ARB_map_buffer_alignment commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_map_buffer_alignment
+
+###############################################################################
+#
+# ARB Extension #114
+# ARB_shader_atomic_counters commands
+#
+###############################################################################
+
+GetActiveAtomicCounterBufferiv(program, bufferIndex, pname, params)
+	return		void
+	param		program		UInt32 in value
+	param		bufferIndex	UInt32 in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	ARB_shader_atomic_counters
+	dlflags		notlistable
+	version		4.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #115
+# ARB_shader_image_load_store commands
+#
+###############################################################################
+
+BindImageTexture(unit, texture, level, layered, layer, access, format)
+	return		void
+	param		unit		UInt32 in value
+	param		texture		UInt32 in value
+	param		level		Int32 in value
+	param		layered		Boolean in value
+	param		layer		Int32 in value
+	param		access		GLenum in value
+	param		format		GLenum in value
+	category	ARB_shader_image_load_store
+	version		4.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MemoryBarrier(barriers)
+	return		void
+	param		barriers	GLbitfield in value
+	category	ARB_shader_image_load_store
+	version		4.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# ARB Extension #116
+# ARB_shading_language_packing commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_shading_language_packing
+
+###############################################################################
+#
+# ARB Extension #117
+# ARB_texture_storage commands
+#
+###############################################################################
+
+TexStorage1D(target, levels, internalformat, width)
+	return		void
+	param		target		GLenum in value
+	param		levels		SizeI in value
+	param		internalformat	GLenum in value
+	param		width		SizeI in value
+	category	ARB_texture_storage
+	version		4.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TexStorage2D(target, levels, internalformat, width, height)
+	return		void
+	param		target		GLenum in value
+	param		levels		SizeI in value
+	param		internalformat	GLenum in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	category	ARB_texture_storage
+	version		4.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TexStorage3D(target, levels, internalformat, width, height, depth)
+	return		void
+	param		target		GLenum in value
+	param		levels		SizeI in value
+	param		internalformat	GLenum in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	category	ARB_texture_storage
+	version		4.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TextureStorage1DEXT(texture, target, levels, internalformat, width)
+	return		void
+	param		texture		UInt32 in value
+	param		target		GLenum in value
+	param		levels		SizeI in value
+	param		internalformat	GLenum in value
+	param		width		SizeI in value
+	category	ARB_texture_storage
+	version		4.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TextureStorage2DEXT(texture, target, levels, internalformat, width, height)
+	return		void
+	param		texture		UInt32 in value
+	param		target		GLenum in value
+	param		levels		SizeI in value
+	param		internalformat	GLenum in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	category	ARB_texture_storage
+	version		4.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TextureStorage3DEXT(texture, target, levels, internalformat, width, height, depth)
+	return		void
+	param		texture		UInt32 in value
+	param		target		GLenum in value
+	param		levels		SizeI in value
+	param		internalformat	GLenum in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	category	ARB_texture_storage
+	version		4.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #ARB118
+# KHR_texture_compression_astc_ldr commands
+#
+###############################################################################
+
+# (none)
+newcategory: KHR_texture_compression_astc_ldr
+
+###############################################################################
+#
+# Extension #ARB119
+# KHR_debug commands
+#
+###############################################################################
+
+# Promoted from ARB_debug_output
+DebugMessageControl(source, type, severity, count, ids, enabled)
+	return		void
+	param		source		GLenum in value
+	param		type		GLenum in value
+	param		severity	GLenum in value
+	param		count		SizeI in value
+	param		ids		UInt32 in array [count]
+	param		enabled		Boolean in value
+	category	KHR_debug
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DebugMessageInsert(source, type, id, severity, length, buf)
+	return		void
+	param		source		GLenum in value
+	param		type		GLenum in value
+	param		id		UInt32 in value
+	param		severity	GLenum in value
+	param		length		SizeI in value
+	param		buf		Char in array [COMPSIZE(buf/length)]
+	category	KHR_debug
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DebugMessageCallback(callback, userParam)
+	return		void
+	param		callback	GLDEBUGPROC in value
+	param		userParam	void in reference
+	category	KHR_debug
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+# bufsize -> logSize? (Bug 9178)
+GetDebugMessageLog(count, bufsize, sources, types, ids, severities, lengths, messageLog)
+	return		UInt32
+	param		count		UInt32 in value
+	param		bufsize		SizeI in value
+	param		sources		GLenum out array [COMPSIZE(count)]
+	param		types		GLenum out array [COMPSIZE(count)]
+	param		ids		UInt32 out array [COMPSIZE(count)]
+	param		severities	GLenum out array [COMPSIZE(count)]
+	param		lengths		SizeI out array [COMPSIZE(count)]
+	param		messageLog	Char out array [COMPSIZE(bufsize)]
+	category	KHR_debug
+	dlflags		notlistable
+	version		4.3
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+PushDebugGroup(source, id, length, message)
+	return		void
+	param		source		GLenum in value
+	param		id		UInt32 in value
+	param		length		SizeI in value
+	param		message		Char in array [COMPSIZE(message/length)]
+	category	KHR_debug
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+PopDebugGroup()
+	return		void
+	category	KHR_debug
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ObjectLabel(identifier, name, length, label)
+	return		void
+	param		identifier	GLenum in value
+	param		name		UInt32 in value
+	param		length		SizeI in value
+	param		label		Char in array [COMPSIZE(label/length)]
+	category	KHR_debug
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetObjectLabel(identifier, name, bufSize, length, label)
+	return		void
+	param		identifier	GLenum in value
+	param		name		UInt32 in value
+	param		bufSize		SizeI in value
+	param		length		SizeI out reference
+	param		label		Char out array [bufSize]
+	category	KHR_debug
+	dlflags		notlistable
+	version		4.3
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+ObjectPtrLabel(ptr, length, label)
+	return		void
+	param		ptr		void in reference
+	param		length		SizeI in value
+	param		label		Char in array [COMPSIZE(label/length)]
+	category	KHR_debug
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetObjectPtrLabel(ptr, bufSize, length, label)
+	return		void
+	param		ptr		void in reference
+	param		bufSize		SizeI in value
+	param		length		SizeI out reference
+	param		label		Char out array [bufSize]
+	category	KHR_debug
+	dlflags		notlistable
+	version		4.3
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+# Also includes GetPointerv (only for OpenGL ES 2, however)
+
+###############################################################################
+#
+# Extension #ARB120
+# ARB_arrays_of_arrays commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_arrays_of_arrays
+
+###############################################################################
+#
+# Extension #ARB121
+# ARB_clear_buffer_object commands
+#
+###############################################################################
+
+ClearBufferData(target, internalformat, format, type, data)
+	return		void
+	param		target		GLenum in value
+	param		internalformat	GLenum in value
+	param		format		GLenum in value
+	param		type		GLenum in value
+	param		data		void in array [COMPSIZE(format/type)]
+	category	ARB_clear_buffer_object
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ClearBufferSubData(target, internalformat, offset, size, format, type, data)
+	return		void
+	param		target		GLenum in value
+	param		internalformat	GLenum in value
+	param		offset		BufferOffset in value
+	param		size		BufferSize in value
+	param		format		GLenum in value
+	param		type		GLenum in value
+	param		data		void in array [COMPSIZE(format/type)]
+	category	ARB_clear_buffer_object
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+# Only for use with DSA extensions
+
+ClearNamedBufferDataEXT(buffer, internalformat, format, type, data)
+	return		void
+	param		buffer		UInt32 in value
+	param		internalformat	GLenum in value
+	param		format		GLenum in value
+	param		type		GLenum in value
+	param		data		void in array [COMPSIZE(format/type)]
+	category	ARB_clear_buffer_object
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ClearNamedBufferSubDataEXT(buffer, internalformat, format, type, offset, size, data)
+	return		void
+	param		buffer		UInt32 in value
+	param		internalformat	GLenum in value
+	param		offset		BufferSize in value
+	param		size		BufferSize in value
+	param		format		GLenum in value
+	param		type		GLenum in value
+	param		data		void in array [COMPSIZE(format/type)]
+	category	ARB_clear_buffer_object
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #ARB122
+# ARB_compute_shader commands
+#
+###############################################################################
+
+DispatchCompute(num_groups_x, num_groups_y, num_groups_z)
+	return		void
+	param		num_groups_x	UInt32 in value
+	param		num_groups_y	UInt32 in value
+	param		num_groups_z	UInt32 in value
+	category	ARB_compute_shader
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DispatchComputeIndirect(indirect)
+	return		void
+	param		indirect	BufferOffset in value
+	category	ARB_compute_shader
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #ARB123
+# ARB_copy_image commands
+#
+###############################################################################
+
+CopyImageSubData(srcName, srcTarget, srcLevel, srcX, srcY, srcZ, dstName, dstTarget, dstLevel, dstX, dstY, dstZ, srcWidth, srcHeight, srcDepth)
+	return		void
+	param		srcName		UInt32 in value
+	param		srcTarget	GLenum in value
+	param		srcLevel	Int32 in value
+	param		srcX		Int32 in value
+	param		srcY		Int32 in value
+	param		srcZ		Int32 in value
+	param		dstName		UInt32 in value
+	param		dstTarget	GLenum in value
+	param		dstLevel	Int32 in value
+	param		dstX		Int32 in value
+	param		dstY		Int32 in value
+	param		dstZ		Int32 in value
+	param		srcWidth	SizeI in value
+	param		srcHeight	SizeI in value
+	param		srcDepth	SizeI in value
+	category	ARB_copy_image
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #ARB124 (renumbered from 142)
+# ARB_texture_view commands
+#
+###############################################################################
+
+TextureView(texture, target, origtexture, internalformat, minlevel, numlevels, minlayer, numlayers)
+	return		void
+	param		texture		UInt32 in value
+	param		target		GLenum in value
+	param		origtexture	UInt32 in value
+	param		internalformat	GLenum in value
+	param		minlevel	UInt32 in value
+	param		numlevels	UInt32 in value
+	param		minlayer	UInt32 in value
+	param		numlayers	UInt32 in value
+	category	ARB_texture_view
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #ARB125 (renumbered from 143)
+# ARB_vertex_attrib_binding commands
+#
+###############################################################################
+
+BindVertexBuffer(bindingindex, buffer, offset, stride)
+	return		void
+	param		bindingindex	UInt32 in value
+	param		buffer		UInt32 in value
+	param		offset		BufferOffset in value
+	param		stride		SizeI in value
+	category	ARB_vertex_attrib_binding
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribFormat(attribindex, size, type, normalized, relativeoffset)
+	return		void
+	param		attribindex	UInt32 in value
+	param		size		Int32 in value
+	param		type		GLenum in value
+	param		normalized	Boolean in value
+	param		relativeoffset	UInt32 in value
+	category	ARB_vertex_attrib_binding
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribIFormat(attribindex, size, type, relativeoffset)
+	return		void
+	param		attribindex	UInt32 in value
+	param		size		Int32 in value
+	param		type		GLenum in value
+	param		relativeoffset	UInt32 in value
+	category	ARB_vertex_attrib_binding
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribLFormat(attribindex, size, type, relativeoffset)
+	return		void
+	param		attribindex	UInt32 in value
+	param		size		Int32 in value
+	param		type		GLenum in value
+	param		relativeoffset	UInt32 in value
+	category	ARB_vertex_attrib_binding
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribBinding(attribindex, bindingindex)
+	return		void
+	param		attribindex	UInt32 in value
+	param		bindingindex	UInt32 in value
+	category	ARB_vertex_attrib_binding
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexBindingDivisor(bindingindex, divisor)
+	return		void
+	param		bindingindex	UInt32 in value
+	param		divisor		UInt32 in value
+	category	ARB_vertex_attrib_binding
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexArrayBindVertexBufferEXT(vaobj, bindingindex, buffer, offset, stride)
+	return		void
+	param		vaobj		UInt32 in value
+	param		bindingindex	UInt32 in value
+	param		buffer		UInt32 in value
+	param		offset		BufferOffset in value
+	param		stride		SizeI in value
+	category	ARB_vertex_attrib_binding
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexArrayVertexAttribFormatEXT(vaobj, attribindex, size, type, normalized, relativeoffset)
+	return		void
+	param		vaobj		UInt32 in value
+	param		attribindex	UInt32 in value
+	param		size		Int32 in value
+	param		type		GLenum in value
+	param		normalized	Boolean in value
+	param		relativeoffset	UInt32 in value
+	category	ARB_vertex_attrib_binding
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexArrayVertexAttribIFormatEXT(vaobj, attribindex, size, type, relativeoffset)
+	return		void
+	param		vaobj		UInt32 in value
+	param		attribindex	UInt32 in value
+	param		size		Int32 in value
+	param		type		GLenum in value
+	param		relativeoffset	UInt32 in value
+	category	ARB_vertex_attrib_binding
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexArrayVertexAttribLFormatEXT(vaobj, attribindex, size, type, relativeoffset)
+	return		void
+	param		vaobj		UInt32 in value
+	param		attribindex	UInt32 in value
+	param		size		Int32 in value
+	param		type		GLenum in value
+	param		relativeoffset	UInt32 in value
+	category	ARB_vertex_attrib_binding
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexArrayVertexAttribBindingEXT(vaobj, attribindex, bindingindex)
+	return		void
+	param		vaobj		UInt32 in value
+	param		attribindex	UInt32 in value
+	param		bindingindex	UInt32 in value
+	category	ARB_vertex_attrib_binding
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexArrayVertexBindingDivisorEXT(vaobj, bindingindex, divisor)
+	return		void
+	param		vaobj		UInt32 in value
+	param		bindingindex	UInt32 in value
+	param		divisor		UInt32 in value
+	category	ARB_vertex_attrib_binding
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #ARB126 (renumbered from 144)
+# ARB_robustness_isolation commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_robustness_isolation
+
+###############################################################################
+#
+# Extension #ARB127
+# ARB_ES3_compatibility commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_ES3_compatibility
+
+###############################################################################
+#
+# Extension #ARB128
+# ARB_explicit_uniform_location commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_explicit_uniform_location
+
+###############################################################################
+#
+# Extension #ARB129
+# ARB_fragment_layer_viewport commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_fragment_layer_viewport
+
+###############################################################################
+#
+# Extension #ARB130
+# ARB_framebuffer_no_attachments commands
+#
+###############################################################################
+
+FramebufferParameteri(target, pname, param)
+	return		void
+	param		target		GLenum in value
+	param		pname		GLenum in value
+	param		param		Int32 in value
+	category	ARB_framebuffer_no_attachments
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetFramebufferParameteriv(target, pname, params)
+	return		void
+	param		target		GLenum in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	ARB_framebuffer_no_attachments
+	dlflags		notlistable
+	version		4.3
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+NamedFramebufferParameteriEXT(framebuffer, pname, param)
+	return		void
+	param		framebuffer	UInt32 in value
+	param		pname		GLenum in value
+	param		param		Int32 in value
+	category	ARB_framebuffer_no_attachments
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetNamedFramebufferParameterivEXT(framebuffer, pname, params)
+	return		void
+	param		framebuffer	UInt32 in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	ARB_framebuffer_no_attachments
+	dlflags		notlistable
+	version		4.3
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #ARB131
+# ARB_internalformat_query2 commands
+#
+###############################################################################
+
+GetInternalformati64v(target, internalformat, pname, bufSize, params)
+	return		void
+	param		target		GLenum in value
+	param		internalformat	GLenum in value
+	param		pname		GLenum in value
+	param		bufSize		SizeI in value
+	param		params		Int64 out array [bufSize]
+	category	ARB_internalformat_query2
+	dlflags		notlistable
+	version		4.3
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #ARB132
+# ARB_invalidate_subdata commands
+#
+###############################################################################
+
+InvalidateTexSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth)
+	return		void
+	param		texture		UInt32 in value
+	param		level		Int32 in value
+	param		xoffset		Int32 in value
+	param		yoffset		Int32 in value
+	param		zoffset		Int32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	category	ARB_invalidate_subdata
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+InvalidateTexImage(texture, level)
+	return		void
+	param		texture		UInt32 in value
+	param		level		Int32 in value
+	category	ARB_invalidate_subdata
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+InvalidateBufferSubData(buffer, offset, length)
+	return		void
+	param		buffer		UInt32 in value
+	param		offset		BufferOffset in value
+	param		length		BufferSize in value
+	category	ARB_invalidate_subdata
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+InvalidateBufferData(buffer)
+	return		void
+	param		buffer		UInt32 in value
+	category	ARB_invalidate_subdata
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+InvalidateFramebuffer(target, numAttachments, attachments)
+	return		void
+	param		target		GLenum in value
+	param		numAttachments	SizeI in value
+	param		attachments	GLenum in array [numAttachments]
+	category	ARB_invalidate_subdata
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+InvalidateSubFramebuffer(target, numAttachments, attachments, x, y, width, height)
+	return		void
+	param		target		GLenum in value
+	param		numAttachments	SizeI in value
+	param		attachments	GLenum in array [numAttachments]
+	param		x		Int32 in value
+	param		y		Int32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	category	ARB_invalidate_subdata
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #ARB133
+# ARB_multi_draw_indirect commands
+#
+###############################################################################
+
+MultiDrawArraysIndirect(mode, indirect, drawcount, stride)
+	return		void
+	param		mode		GLenum in value
+	param		indirect	void in array [COMPSIZE(drawcount/stride)]
+	param		drawcount	SizeI in value
+	param		stride		SizeI in value
+	category	ARB_multi_draw_indirect
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MultiDrawElementsIndirect(mode, type, indirect, drawcount, stride)
+	return		void
+	param		mode		GLenum in value
+	param		type		GLenum in value
+	param		indirect	void in array [COMPSIZE(drawcount/stride)]
+	param		drawcount	SizeI in value
+	param		stride		SizeI in value
+	category	ARB_multi_draw_indirect
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #ARB134
+# ARB_program_interface_query commands
+#
+###############################################################################
+
+GetProgramInterfaceiv(program, programInterface, pname, params)
+	return		void
+	param		program		UInt32 in value
+	param		programInterface	GLenum in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	ARB_program_interface_query
+	dlflags		notlistable
+	version		4.3
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetProgramResourceIndex(program, programInterface, name)
+	return		UInt32
+	param		program		UInt32 in value
+	param		programInterface	GLenum in value
+	param		name		Char in array [COMPSIZE(name)]
+	category	ARB_program_interface_query
+	dlflags		notlistable
+	version		4.3
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetProgramResourceName(program, programInterface, index, bufSize, length, name)
+	return		void
+	param		program		UInt32 in value
+	param		programInterface	GLenum in value
+	param		index		UInt32 in value
+	param		bufSize		SizeI in value
+	param		length		SizeI out reference
+	param		name		Char out array [bufSize]
+	category	ARB_program_interface_query
+	dlflags		notlistable
+	version		4.3
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetProgramResourceiv(program, programInterface, index, propCount, props, bufSize, length, params)
+	return		void
+	param		program		UInt32 in value
+	param		programInterface	GLenum in value
+	param		index		UInt32 in value
+	param		propCount	SizeI in value
+	param		props		GLenum in array [propCount]
+	param		bufSize		SizeI in value
+	param		length		SizeI out reference
+	param		params		Int32 out array [bufSize]
+	category	ARB_program_interface_query
+	dlflags		notlistable
+	version		4.3
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetProgramResourceLocation(program, programInterface, name)
+	return		Int32
+	param		program		UInt32 in value
+	param		programInterface	GLenum in value
+	param		name		Char in array [COMPSIZE(name)]
+	category	ARB_program_interface_query
+	dlflags		notlistable
+	version		4.3
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetProgramResourceLocationIndex(program, programInterface, name)
+	return		Int32
+	param		program		UInt32 in value
+	param		programInterface	GLenum in value
+	param		name		Char in array [COMPSIZE(name)]
+	category	ARB_program_interface_query
+	dlflags		notlistable
+	version		4.3
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #ARB135
+# ARB_robust_buffer_access_behavior commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_robust_buffer_access_behavior
+
+###############################################################################
+#
+# Extension #ARB136
+# ARB_shader_image_size commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_shader_image_size
+
+###############################################################################
+#
+# Extension #ARB137
+# ARB_shader_storage_buffer_object commands
+#
+###############################################################################
+
+ShaderStorageBlockBinding(program, storageBlockIndex, storageBlockBinding)
+	return		void
+	param		program		UInt32 in value
+	param		storageBlockIndex	UInt32 in value
+	param		storageBlockBinding	UInt32 in value
+	category	ARB_shader_storage_buffer_object
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #ARB138
+# ARB_stencil_texturing commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_stencil_texturing
+
+###############################################################################
+#
+# Extension #ARB139
+# ARB_texture_buffer_range commands
+#
+###############################################################################
+
+TexBufferRange(target, internalformat, buffer, offset, size)
+	return		void
+	param		target		GLenum in value
+	param		internalformat	GLenum in value
+	param		buffer		UInt32 in value
+	param		offset		BufferOffset in value
+	param		size		BufferSize in value
+	category	ARB_texture_buffer_range
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TextureBufferRangeEXT(texture, target, internalformat, buffer, offset, size)
+	return		void
+	param		texture		UInt32 in value
+	param		target		GLenum in value
+	param		internalformat	GLenum in value
+	param		buffer		UInt32 in value
+	param		offset		BufferOffset in value
+	param		size		BufferSize in value
+	category	ARB_texture_buffer_range
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #ARB140
+# ARB_texture_query_levels commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_texture_query_levels
+
+###############################################################################
+#
+# Extension #ARB141
+# ARB_texture_storage_multisample commands
+#
+###############################################################################
+
+TexStorage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations)
+	return		void
+	param		target		GLenum in value
+	param		samples		SizeI in value
+	param		internalformat	GLenum in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		fixedsamplelocations	Boolean in value
+	category	ARB_texture_storage_multisample
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TexStorage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations)
+	return		void
+	param		target		GLenum in value
+	param		samples		SizeI in value
+	param		internalformat	GLenum in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		fixedsamplelocations	Boolean in value
+	category	ARB_texture_storage_multisample
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TextureStorage2DMultisampleEXT(texture, target, samples, internalformat, width, height, fixedsamplelocations)
+	return		void
+	param		texture		UInt32 in value
+	param		target		GLenum in value
+	param		samples		SizeI in value
+	param		internalformat	GLenum in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		fixedsamplelocations	Boolean in value
+	category	ARB_texture_storage_multisample
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TextureStorage3DMultisampleEXT(texture, target, samples, internalformat, width, height, depth, fixedsamplelocations)
+	return		void
+	param		texture		UInt32 in value
+	param		target		GLenum in value
+	param		samples		SizeI in value
+	param		internalformat	GLenum in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		fixedsamplelocations	Boolean in value
+	category	ARB_texture_storage_multisample
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+
+###############################################################################
+###############################################################################
+#
+# Non-ARB extensions, in order by registry extension number
+#
+###############################################################################
+###############################################################################
+
+###############################################################################
+#
+# Extension #1
+# EXT_abgr commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_abgr
+
+###############################################################################
+#
+# Extension #2
+# EXT_blend_color commands
+#
+###############################################################################
+
+BlendColorEXT(red, green, blue, alpha)
+	return		void
+	param		red		ColorF in value
+	param		green		ColorF in value
+	param		blue		ColorF in value
+	param		alpha		ColorF in value
+	category	EXT_blend_color
+	version		1.0
+	glxropcode	4096
+	glxflags	EXT
+	extension	soft
+	alias		BlendColor
+
+###############################################################################
+#
+# Extension #3
+# EXT_polygon_offset commands
+#
+###############################################################################
+
+PolygonOffsetEXT(factor, bias)
+	return		void
+	param		factor		Float32 in value
+	param		bias		Float32 in value
+	category	EXT_polygon_offset
+	version		1.0
+	glxropcode	4098
+	glxflags	EXT
+	extension	soft
+	offset		414
+
+###############################################################################
+#
+# Extension #4
+# EXT_texture commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_texture
+
+###############################################################################
+#
+# Extension #5 - skipped
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #6
+# EXT_texture3D commands
+#
+###############################################################################
+
+# Arguably TexelInternalFormat, not PixelInternalFormat
+TexImage3DEXT(target, level, internalformat, width, height, depth, border, format, type, pixels)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	PixelInternalFormat in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		border		CheckedInt32 in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void in array [COMPSIZE(format/type/width/height/depth)]
+	category	EXT_texture3D
+	dlflags		handcode
+	glxflags	client-handcode server-handcode EXT
+	version		1.0
+	glxropcode	4114
+	extension
+	alias		TexImage3D
+
+TexSubImage3DEXT(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		yoffset		CheckedInt32 in value
+	param		zoffset		CheckedInt32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void in array [COMPSIZE(format/type/width/height/depth)]
+	category	EXT_texture3D
+	dlflags		handcode
+	glxflags	client-handcode server-handcode EXT
+	version		1.0
+	glxropcode	4115
+	extension
+	alias		TexSubImage3D
+
+###############################################################################
+#
+# Extension #7
+# SGIS_texture_filter4 commands
+#
+###############################################################################
+
+GetTexFilterFuncSGIS(target, filter, weights)
+	return		void
+	param		target		TextureTarget in value
+	param		filter		TextureFilterSGIS in value
+	param		weights		Float32 out array [COMPSIZE(target/filter)]
+	category	SGIS_texture_filter4
+	dlflags		notlistable
+	version		1.0
+	glxflags	SGI
+	glxvendorpriv	4101
+	extension
+	offset		415
+
+TexFilterFuncSGIS(target, filter, n, weights)
+	return		void
+	param		target		TextureTarget in value
+	param		filter		TextureFilterSGIS in value
+	param		n		SizeI in value
+	param		weights		Float32 in array [n]
+	category	SGIS_texture_filter4
+	glxflags	SGI
+	version		1.0
+	glxropcode	2064
+	extension
+	offset		416
+
+###############################################################################
+#
+# Extension #8 - skipped
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #9
+# EXT_subtexture commands
+#
+###############################################################################
+
+TexSubImage1DEXT(target, level, xoffset, width, format, type, pixels)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		width		SizeI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void in array [COMPSIZE(format/type/width)]
+	category	EXT_subtexture
+	dlflags		handcode
+	glxflags	client-handcode server-handcode EXT
+	version		1.0
+	glxropcode	4099
+	extension
+	alias		TexSubImage1D
+
+TexSubImage2DEXT(target, level, xoffset, yoffset, width, height, format, type, pixels)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		yoffset		CheckedInt32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void in array [COMPSIZE(format/type/width/height)]
+	category	EXT_subtexture
+	dlflags		handcode
+	glxflags	client-handcode server-handcode EXT
+	version		1.0
+	glxropcode	4100
+	extension
+	alias		TexSubImage2D
+
+###############################################################################
+#
+# Extension #10
+# EXT_copy_texture commands
+#
+###############################################################################
+
+# Arguably TexelInternalFormat, not PixelInternalFormat
+CopyTexImage1DEXT(target, level, internalformat, x, y, width, border)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	PixelInternalFormat in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	param		border		CheckedInt32 in value
+	category	EXT_copy_texture
+	version		1.0
+	glxflags	EXT
+	glxropcode	4119
+	extension
+	alias		CopyTexImage1D
+
+# Arguably TexelInternalFormat, not PixelInternalFormat
+CopyTexImage2DEXT(target, level, internalformat, x, y, width, height, border)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	PixelInternalFormat in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		border		CheckedInt32 in value
+	category	EXT_copy_texture
+	version		1.0
+	glxflags	EXT
+	glxropcode	4120
+	extension
+	alias		CopyTexImage2D
+
+CopyTexSubImage1DEXT(target, level, xoffset, x, y, width)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	category	EXT_copy_texture
+	version		1.0
+	glxflags	EXT
+	glxropcode	4121
+	extension
+	alias		CopyTexSubImage1D
+
+CopyTexSubImage2DEXT(target, level, xoffset, yoffset, x, y, width, height)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		yoffset		CheckedInt32 in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	category	EXT_copy_texture
+	version		1.0
+	glxflags	EXT
+	glxropcode	4122
+	extension
+	alias		CopyTexSubImage2D
+
+CopyTexSubImage3DEXT(target, level, xoffset, yoffset, zoffset, x, y, width, height)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		yoffset		CheckedInt32 in value
+	param		zoffset		CheckedInt32 in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	category	EXT_copy_texture
+	version		1.0
+	glxflags	EXT
+	glxropcode	4123
+	extension
+	alias		CopyTexSubImage3D
+
+###############################################################################
+#
+# Extension #11
+# EXT_histogram commands
+#
+###############################################################################
+
+GetHistogramEXT(target, reset, format, type, values)
+	return		void
+	param		target		HistogramTargetEXT in value
+	param		reset		Boolean in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		values		Void out array [COMPSIZE(target/format/type)]
+	category	EXT_histogram
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode EXT
+	version		1.0
+	glxvendorpriv	5
+	extension
+	offset		417
+
+GetHistogramParameterfvEXT(target, pname, params)
+	return		void
+	param		target		HistogramTargetEXT in value
+	param		pname		GetHistogramParameterPNameEXT in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	EXT_histogram
+	dlflags		notlistable
+	version		1.0
+	glxvendorpriv	6
+	glxflags	EXT
+	extension
+	offset		418
+
+GetHistogramParameterivEXT(target, pname, params)
+	return		void
+	param		target		HistogramTargetEXT in value
+	param		pname		GetHistogramParameterPNameEXT in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	EXT_histogram
+	dlflags		notlistable
+	version		1.0
+	glxvendorpriv	7
+	glxflags	EXT
+	extension
+	offset		419
+
+GetMinmaxEXT(target, reset, format, type, values)
+	return		void
+	param		target		MinmaxTargetEXT in value
+	param		reset		Boolean in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		values		Void out array [COMPSIZE(target/format/type)]
+	category	EXT_histogram
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode EXT
+	version		1.0
+	glxvendorpriv	8
+	extension
+	offset		420
+
+GetMinmaxParameterfvEXT(target, pname, params)
+	return		void
+	param		target		MinmaxTargetEXT in value
+	param		pname		GetMinmaxParameterPNameEXT in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	EXT_histogram
+	dlflags		notlistable
+	version		1.0
+	glxvendorpriv	9
+	glxflags	EXT
+	extension
+	offset		421
+
+GetMinmaxParameterivEXT(target, pname, params)
+	return		void
+	param		target		MinmaxTargetEXT in value
+	param		pname		GetMinmaxParameterPNameEXT in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	EXT_histogram
+	dlflags		notlistable
+	version		1.0
+	glxvendorpriv	10
+	glxflags	EXT
+	extension
+	offset		422
+
+HistogramEXT(target, width, internalformat, sink)
+	return		void
+	param		target		HistogramTargetEXT in value
+	param		width		SizeI in value
+	param		internalformat	PixelInternalFormat in value
+	param		sink		Boolean in value
+	category	EXT_histogram
+	version		1.0
+	glxropcode	4110
+	glxflags	EXT
+	extension
+	alias		Histogram
+
+MinmaxEXT(target, internalformat, sink)
+	return		void
+	param		target		MinmaxTargetEXT in value
+	param		internalformat	PixelInternalFormat in value
+	param		sink		Boolean in value
+	category	EXT_histogram
+	version		1.0
+	glxropcode	4111
+	glxflags	EXT
+	extension
+	alias		Minmax
+
+ResetHistogramEXT(target)
+	return		void
+	param		target		HistogramTargetEXT in value
+	category	EXT_histogram
+	version		1.0
+	glxropcode	4112
+	glxflags	EXT
+	extension
+	alias		ResetHistogram
+
+ResetMinmaxEXT(target)
+	return		void
+	param		target		MinmaxTargetEXT in value
+	category	EXT_histogram
+	version		1.0
+	glxropcode	4113
+	glxflags	EXT
+	extension
+	alias		ResetMinmax
+
+###############################################################################
+#
+# Extension #12
+# EXT_convolution commands
+#
+###############################################################################
+
+ConvolutionFilter1DEXT(target, internalformat, width, format, type, image)
+	return		void
+	param		target		ConvolutionTargetEXT in value
+	param		internalformat	PixelInternalFormat in value
+	param		width		SizeI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		image		Void in array [COMPSIZE(format/type/width)]
+	category	EXT_convolution
+	dlflags		handcode
+	glxflags	client-handcode server-handcode EXT
+	version		1.0
+	glxropcode	4101
+	extension
+	alias		ConvolutionFilter1D
+
+ConvolutionFilter2DEXT(target, internalformat, width, height, format, type, image)
+	return		void
+	param		target		ConvolutionTargetEXT in value
+	param		internalformat	PixelInternalFormat in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		image		Void in array [COMPSIZE(format/type/width/height)]
+	category	EXT_convolution
+	dlflags		handcode
+	glxflags	client-handcode server-handcode EXT
+	version		1.0
+	glxropcode	4102
+	extension
+	alias		ConvolutionFilter2D
+
+ConvolutionParameterfEXT(target, pname, params)
+	return		void
+	param		target		ConvolutionTargetEXT in value
+	param		pname		ConvolutionParameterEXT in value
+	param		params		CheckedFloat32 in value
+	category	EXT_convolution
+	version		1.0
+	glxropcode	4103
+	glxflags	EXT
+	extension
+	alias		ConvolutionParameterf
+
+ConvolutionParameterfvEXT(target, pname, params)
+	return		void
+	param		target		ConvolutionTargetEXT in value
+	param		pname		ConvolutionParameterEXT in value
+	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
+	category	EXT_convolution
+	version		1.0
+	glxropcode	4104
+	glxflags	EXT
+	extension
+	alias		ConvolutionParameterfv
+
+ConvolutionParameteriEXT(target, pname, params)
+	return		void
+	param		target		ConvolutionTargetEXT in value
+	param		pname		ConvolutionParameterEXT in value
+	param		params		CheckedInt32 in value
+	category	EXT_convolution
+	version		1.0
+	glxropcode	4105
+	glxflags	EXT
+	extension
+	alias		ConvolutionParameteri
+
+ConvolutionParameterivEXT(target, pname, params)
+	return		void
+	param		target		ConvolutionTargetEXT in value
+	param		pname		ConvolutionParameterEXT in value
+	param		params		CheckedInt32 in array [COMPSIZE(pname)]
+	category	EXT_convolution
+	version		1.0
+	glxropcode	4106
+	glxflags	EXT
+	extension
+	alias		ConvolutionParameteriv
+
+CopyConvolutionFilter1DEXT(target, internalformat, x, y, width)
+	return		void
+	param		target		ConvolutionTargetEXT in value
+	param		internalformat	PixelInternalFormat in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	category	EXT_convolution
+	version		1.0
+	glxropcode	4107
+	glxflags	EXT
+	extension
+	alias		CopyConvolutionFilter1D
+
+CopyConvolutionFilter2DEXT(target, internalformat, x, y, width, height)
+	return		void
+	param		target		ConvolutionTargetEXT in value
+	param		internalformat	PixelInternalFormat in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	category	EXT_convolution
+	version		1.0
+	glxropcode	4108
+	glxflags	EXT
+	extension
+	alias		CopyConvolutionFilter2D
+
+GetConvolutionFilterEXT(target, format, type, image)
+	return		void
+	param		target		ConvolutionTargetEXT in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		image		Void out array [COMPSIZE(target/format/type)]
+	category	EXT_convolution
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode EXT
+	version		1.0
+	glxvendorpriv	1
+	extension
+	offset		423
+
+GetConvolutionParameterfvEXT(target, pname, params)
+	return		void
+	param		target		ConvolutionTargetEXT in value
+	param		pname		ConvolutionParameterEXT in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	EXT_convolution
+	dlflags		notlistable
+	version		1.0
+	glxvendorpriv	2
+	glxflags	EXT
+	extension
+	offset		424
+
+GetConvolutionParameterivEXT(target, pname, params)
+	return		void
+	param		target		ConvolutionTargetEXT in value
+	param		pname		ConvolutionParameterEXT in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	EXT_convolution
+	dlflags		notlistable
+	version		1.0
+	glxvendorpriv	3
+	glxflags	EXT
+	extension
+	offset		425
+
+GetSeparableFilterEXT(target, format, type, row, column, span)
+	return		void
+	param		target		SeparableTargetEXT in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		row		Void out array [COMPSIZE(target/format/type)]
+	param		column		Void out array [COMPSIZE(target/format/type)]
+	param		span		Void out array [COMPSIZE(target/format/type)]
+	category	EXT_convolution
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode EXT
+	version		1.0
+	glxvendorpriv	4
+	extension
+	offset		426
+
+SeparableFilter2DEXT(target, internalformat, width, height, format, type, row, column)
+	return		void
+	param		target		SeparableTargetEXT in value
+	param		internalformat	PixelInternalFormat in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		row		Void in array [COMPSIZE(target/format/type/width)]
+	param		column		Void in array [COMPSIZE(target/format/type/height)]
+	category	EXT_convolution
+	dlflags		handcode
+	glxflags	client-handcode server-handcode EXT
+	version		1.0
+	glxropcode	4109
+	extension
+	alias		SeparableFilter2D
+
+###############################################################################
+#
+# Extension #13
+# SGI_color_matrix commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGI_color_matrix
+
+###############################################################################
+#
+# Extension #14
+# SGI_color_table commands
+#
+###############################################################################
+
+ColorTableSGI(target, internalformat, width, format, type, table)
+	return		void
+	param		target		ColorTableTargetSGI in value
+	param		internalformat	PixelInternalFormat in value
+	param		width		SizeI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		table		Void in array [COMPSIZE(format/type/width)]
+	category	SGI_color_table
+	dlflags		handcode
+	glxflags	client-handcode server-handcode SGI
+	version		1.0
+	glxropcode	2053
+	extension
+	alias		ColorTable
+
+ColorTableParameterfvSGI(target, pname, params)
+	return		void
+	param		target		ColorTableTargetSGI in value
+	param		pname		ColorTableParameterPNameSGI in value
+	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
+	category	SGI_color_table
+	version		1.0
+	glxropcode	2054
+	glxflags	SGI
+	extension
+	alias		ColorTableParameterfv
+
+ColorTableParameterivSGI(target, pname, params)
+	return		void
+	param		target		ColorTableTargetSGI in value
+	param		pname		ColorTableParameterPNameSGI in value
+	param		params		CheckedInt32 in array [COMPSIZE(pname)]
+	category	SGI_color_table
+	version		1.0
+	glxropcode	2055
+	glxflags	SGI
+	extension
+	alias		ColorTableParameteriv
+
+CopyColorTableSGI(target, internalformat, x, y, width)
+	return		void
+	param		target		ColorTableTargetSGI in value
+	param		internalformat	PixelInternalFormat in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	category	SGI_color_table
+	version		1.0
+	glxropcode	2056
+	glxflags	SGI
+	extension
+	alias		CopyColorTable
+
+GetColorTableSGI(target, format, type, table)
+	return		void
+	param		target		ColorTableTargetSGI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		table		Void out array [COMPSIZE(target/format/type)]
+	category	SGI_color_table
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode SGI
+	version		1.0
+	glxvendorpriv	4098
+	extension
+	offset		427
+
+GetColorTableParameterfvSGI(target, pname, params)
+	return		void
+	param		target		ColorTableTargetSGI in value
+	param		pname		GetColorTableParameterPNameSGI in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	SGI_color_table
+	dlflags		notlistable
+	version		1.0
+	glxflags	SGI
+	glxvendorpriv	4099
+	extension
+	offset		428
+
+GetColorTableParameterivSGI(target, pname, params)
+	return		void
+	param		target		ColorTableTargetSGI in value
+	param		pname		GetColorTableParameterPNameSGI in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	SGI_color_table
+	dlflags		notlistable
+	version		1.0
+	glxflags	SGI
+	glxvendorpriv	4100
+	extension
+	offset		429
+
+###############################################################################
+#
+# Extension #15
+# SGIX_pixel_texture commands
+#
+###############################################################################
+
+PixelTexGenSGIX(mode)
+	return		void
+	param		mode		PixelTexGenModeSGIX in value
+	category	SGIX_pixel_texture
+	version		1.0
+	glxflags	SGI
+	glxropcode	2059
+	extension
+	offset		430
+
+###############################################################################
+#
+# Extension #15 (variant)
+# SGIS_pixel_texture commands
+# Both SGIS and SGIX forms have extension #15!
+#
+###############################################################################
+
+PixelTexGenParameteriSGIS(pname, param)
+	return		void
+	param		pname		PixelTexGenParameterNameSGIS in value
+	param		param		CheckedInt32 in value
+	category	SGIS_pixel_texture
+	version		1.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		431
+
+PixelTexGenParameterivSGIS(pname, params)
+	return		void
+	param		pname		PixelTexGenParameterNameSGIS in value
+	param		params		CheckedInt32 in array [COMPSIZE(pname)]
+	category	SGIS_pixel_texture
+	version		1.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		432
+
+PixelTexGenParameterfSGIS(pname, param)
+	return		void
+	param		pname		PixelTexGenParameterNameSGIS in value
+	param		param		CheckedFloat32 in value
+	category	SGIS_pixel_texture
+	version		1.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		433
+
+PixelTexGenParameterfvSGIS(pname, params)
+	return		void
+	param		pname		PixelTexGenParameterNameSGIS in value
+	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
+	category	SGIS_pixel_texture
+	version		1.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		434
+
+GetPixelTexGenParameterivSGIS(pname, params)
+	return		void
+	param		pname		PixelTexGenParameterNameSGIS in value
+	param		params		CheckedInt32 out array [COMPSIZE(pname)]
+	dlflags		notlistable
+	category	SGIS_pixel_texture
+	version		1.0
+	extension
+	glxvendorpriv	?
+	glxflags	ignore
+	offset		435
+
+GetPixelTexGenParameterfvSGIS(pname, params)
+	return		void
+	param		pname		PixelTexGenParameterNameSGIS in value
+	param		params		CheckedFloat32 out array [COMPSIZE(pname)]
+	dlflags		notlistable
+	category	SGIS_pixel_texture
+	version		1.0
+	extension
+	glxvendorpriv	?
+	glxflags	ignore
+	offset		436
+
+###############################################################################
+#
+# Extension #16
+# SGIS_texture4D commands
+#
+###############################################################################
+
+TexImage4DSGIS(target, level, internalformat, width, height, depth, size4d, border, format, type, pixels)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	PixelInternalFormat in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		size4d		SizeI in value
+	param		border		CheckedInt32 in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void in array [COMPSIZE(format/type/width/height/depth/size4d)]
+	category	SGIS_texture4D
+	dlflags		handcode
+	glxflags	client-handcode server-handcode SGI
+	version		1.0
+	glxropcode	2057
+	extension
+	offset		437
+
+TexSubImage4DSGIS(target, level, xoffset, yoffset, zoffset, woffset, width, height, depth, size4d, format, type, pixels)
+	return		void
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		yoffset		CheckedInt32 in value
+	param		zoffset		CheckedInt32 in value
+	param		woffset		CheckedInt32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		size4d		SizeI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void in array [COMPSIZE(format/type/width/height/depth/size4d)]
+	category	SGIS_texture4D
+	dlflags		handcode
+	glxflags	client-handcode server-handcode SGI
+	version		1.0
+	glxropcode	2058
+	extension
+	offset		438
+
+###############################################################################
+#
+# Extension #17
+# SGI_texture_color_table commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGI_texture_color_table
+
+###############################################################################
+#
+# Extension #18
+# EXT_cmyka commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_cmyka
+
+###############################################################################
+#
+# Extension #19 - skipped
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #20
+# EXT_texture_object commands
+#
+###############################################################################
+
+AreTexturesResidentEXT(n, textures, residences)
+	return		Boolean
+	param		n		SizeI in value
+	param		textures	Texture in array [n]
+	param		residences	Boolean out array [n]
+	category	EXT_texture_object
+	glxflags	EXT
+	glxvendorpriv	11
+	dlflags		notlistable
+	version		1.0
+	extension
+	offset		439
+
+BindTextureEXT(target, texture)
+	return		void
+	param		target	TextureTarget in value
+	param		texture Texture in value
+	category	EXT_texture_object
+	version		1.0
+	glxflags	EXT
+	glxropcode	4117
+	extension
+	alias		BindTexture
+
+DeleteTexturesEXT(n, textures)
+	return		void
+	param		n		SizeI in value
+	param		textures	Texture in array [n]
+	category	EXT_texture_object
+	dlflags		notlistable
+	version		1.0
+	glxflags	EXT
+	glxvendorpriv	12
+	extension
+	offset		561
+
+GenTexturesEXT(n, textures)
+	return		void
+	param		n		SizeI in value
+	param		textures	Texture out array [n]
+	category	EXT_texture_object
+	dlflags		notlistable
+	version		1.0
+	glxflags	EXT
+	glxvendorpriv	13
+	extension
+	offset		440
+
+IsTextureEXT(texture)
+	return		Boolean
+	param		texture Texture in value
+	category	EXT_texture_object
+	dlflags		notlistable
+	version		1.0
+	glxflags	EXT
+	glxvendorpriv	14
+	extension
+	offset		441
+
+PrioritizeTexturesEXT(n, textures, priorities)
+	return		void
+	param		n		SizeI in value
+	param		textures	Texture in array [n]
+	param		priorities	ClampedFloat32 in array [n]
+	category	EXT_texture_object
+	glxflags	EXT
+	version		1.0
+	glxropcode	4118
+	extension
+	alias		PrioritizeTextures
+
+###############################################################################
+#
+# Extension #21
+# SGIS_detail_texture commands
+#
+###############################################################################
+
+DetailTexFuncSGIS(target, n, points)
+	return		void
+	param		target		TextureTarget in value
+	param		n		SizeI in value
+	param		points		Float32 in array [n*2]
+	category	SGIS_detail_texture
+	glxflags	SGI
+	version		1.0
+	glxropcode	2051
+	extension
+	offset		442
+
+GetDetailTexFuncSGIS(target, points)
+	return		void
+	param		target		TextureTarget in value
+	param		points		Float32 out array [COMPSIZE(target)]
+	category	SGIS_detail_texture
+	dlflags		notlistable
+	version		1.0
+	glxflags	SGI
+	glxvendorpriv	4096
+	extension
+	offset		443
+
+###############################################################################
+#
+# Extension #22
+# SGIS_sharpen_texture commands
+#
+###############################################################################
+
+SharpenTexFuncSGIS(target, n, points)
+	return		void
+	param		target		TextureTarget in value
+	param		n		SizeI in value
+	param		points		Float32 in array [n*2]
+	category	SGIS_sharpen_texture
+	glxflags	SGI
+	version		1.0
+	glxropcode	2052
+	extension
+	offset		444
+
+GetSharpenTexFuncSGIS(target, points)
+	return		void
+	param		target		TextureTarget in value
+	param		points		Float32 out array [COMPSIZE(target)]
+	category	SGIS_sharpen_texture
+	dlflags		notlistable
+	version		1.0
+	glxflags	SGI
+	glxvendorpriv	4097
+	extension
+	offset		445
+
+###############################################################################
+#
+# EXT_packed_pixels commands
+# Extension #23
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_packed_pixels
+
+###############################################################################
+#
+# Extension #24
+# SGIS_texture_lod commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIS_texture_lod
+
+###############################################################################
+#
+# Extension #25
+# SGIS_multisample commands
+#
+###############################################################################
+
+SampleMaskSGIS(value, invert)
+	return		void
+	param		value		ClampedFloat32 in value
+	param		invert		Boolean in value
+	category	SGIS_multisample
+	version		1.1
+	glxropcode	2048
+	glxflags	SGI
+	extension
+	alias		SampleMaskEXT
+
+SamplePatternSGIS(pattern)
+	return		void
+	param		pattern		SamplePatternSGIS in value
+	category	SGIS_multisample
+	version		1.0
+	glxropcode	2049
+	glxflags	SGI
+	extension
+	alias		SamplePatternEXT
+
+###############################################################################
+#
+# Extension #26 - no specification?
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #27
+# EXT_rescale_normal commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_rescale_normal
+
+###############################################################################
+#
+# Extension #28 - GLX_EXT_visual_info
+# Extension #29 - skipped
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #30
+# EXT_vertex_array commands
+#
+###############################################################################
+
+ArrayElementEXT(i)
+	return		void
+	param		i		Int32 in value
+	category	EXT_vertex_array
+	dlflags		handcode
+	glxflags	client-handcode server-handcode EXT
+	version		1.0
+	extension
+	alias		ArrayElement
+
+ColorPointerEXT(size, type, stride, count, pointer)
+	return		void
+	param		size		Int32 in value
+	param		type		ColorPointerType in value
+	param		stride		SizeI in value
+	param		count		SizeI in value
+	param		pointer		Void in array [COMPSIZE(size/type/stride/count)] retained
+	category	EXT_vertex_array
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode EXT
+	version		1.0
+	extension
+	offset		448
+
+DrawArraysEXT(mode, first, count)
+	return		void
+	param		mode		BeginMode in value
+	param		first		Int32 in value
+	param		count		SizeI in value
+	category	EXT_vertex_array
+	dlflags		handcode
+	glxflags	client-handcode server-handcode EXT
+	version		1.0
+	glxropcode	4116
+	extension
+	alias		DrawArrays
+
+EdgeFlagPointerEXT(stride, count, pointer)
+	return		void
+	param		stride		SizeI in value
+	param		count		SizeI in value
+	param		pointer		Boolean in array [COMPSIZE(stride/count)] retained
+	category	EXT_vertex_array
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode EXT
+	version		1.0
+	extension
+	offset		449
+
+GetPointervEXT(pname, params)
+	return		void
+	param		pname		GetPointervPName in value
+	param		params		VoidPointer out array [1]
+	category	EXT_vertex_array
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode EXT
+	version		1.0
+	extension
+	alias		GetPointerv
+
+IndexPointerEXT(type, stride, count, pointer)
+	return		void
+	param		type		IndexPointerType in value
+	param		stride		SizeI in value
+	param		count		SizeI in value
+	param		pointer		Void in array [COMPSIZE(type/stride/count)] retained
+	category	EXT_vertex_array
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode EXT
+	version		1.0
+	extension
+	offset		450
+
+NormalPointerEXT(type, stride, count, pointer)
+	return		void
+	param		type		NormalPointerType in value
+	param		stride		SizeI in value
+	param		count		SizeI in value
+	param		pointer		Void in array [COMPSIZE(type/stride/count)] retained
+	category	EXT_vertex_array
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode EXT
+	version		1.0
+	extension
+	offset		451
+
+TexCoordPointerEXT(size, type, stride, count, pointer)
+	return		void
+	param		size		Int32 in value
+	param		type		TexCoordPointerType in value
+	param		stride		SizeI in value
+	param		count		SizeI in value
+	param		pointer		Void in array [COMPSIZE(size/type/stride/count)] retained
+	category	EXT_vertex_array
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode EXT
+	version		1.0
+	extension
+	offset		452
+
+VertexPointerEXT(size, type, stride, count, pointer)
+	return		void
+	param		size		Int32 in value
+	param		type		VertexPointerType in value
+	param		stride		SizeI in value
+	param		count		SizeI in value
+	param		pointer		Void in array [COMPSIZE(size/type/stride/count)] retained
+	category	EXT_vertex_array
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode EXT
+	version		1.0
+	extension
+	offset		453
+
+###############################################################################
+#
+# Extension #31
+# EXT_misc_attribute commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_misc_attribute
+
+###############################################################################
+#
+# Extension #32
+# SGIS_generate_mipmap commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIS_generate_mipmap
+
+###############################################################################
+#
+# Extension #33
+# SGIX_clipmap commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_clipmap
+
+###############################################################################
+#
+# Extension #34
+# SGIX_shadow commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_shadow
+
+###############################################################################
+#
+# Extension #35
+# SGIS_texture_edge_clamp commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIS_texture_edge_clamp
+
+###############################################################################
+#
+# Extension #36
+# SGIS_texture_border_clamp commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIS_texture_border_clamp
+
+###############################################################################
+#
+# Extension #37
+# EXT_blend_minmax commands
+#
+###############################################################################
+
+BlendEquationEXT(mode)
+	return		void
+	param		mode		BlendEquationModeEXT in value
+	category	EXT_blend_minmax
+	version		1.0
+	glxropcode	4097
+	glxflags	EXT
+	extension	soft
+	alias		BlendEquation
+
+###############################################################################
+#
+# Extension #38
+# EXT_blend_subtract commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_blend_subtract
+
+###############################################################################
+#
+# Extension #39
+# EXT_blend_logic_op commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_blend_logic_op
+
+###############################################################################
+#
+# Extension #40 - GLX_SGI_swap_control
+# Extension #41 - GLX_SGI_video_sync
+# Extension #42 - GLX_SGI_make_current_read
+# Extension #43 - GLX_SGIX_video_source
+# Extension #44 - GLX_EXT_visual_rating
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #45
+# SGIX_interlace commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_interlace
+
+###############################################################################
+#
+# Extension #46
+# SGIX_pixel_tiles commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_pixel_tiles
+
+###############################################################################
+#
+# Extension #47 - GLX_EXT_import_context
+# Extension #48 - skipped
+# Extension #49 - GLX_SGIX_fbconfig
+# Extension #50 - GLX_SGIX_pbuffer
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #51
+# SGIX_texture_select commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_texture_select
+
+###############################################################################
+#
+# Extension #52
+# SGIX_sprite commands
+#
+###############################################################################
+
+SpriteParameterfSGIX(pname, param)
+	return		void
+	param		pname		SpriteParameterNameSGIX in value
+	param		param		CheckedFloat32 in value
+	category	SGIX_sprite
+	version		1.0
+	glxflags	SGI
+	glxropcode	2060
+	extension
+	offset		454
+
+SpriteParameterfvSGIX(pname, params)
+	return		void
+	param		pname		SpriteParameterNameSGIX in value
+	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
+	category	SGIX_sprite
+	version		1.0
+	glxflags	SGI
+	glxropcode	2061
+	extension
+	offset		455
+
+SpriteParameteriSGIX(pname, param)
+	return		void
+	param		pname		SpriteParameterNameSGIX in value
+	param		param		CheckedInt32 in value
+	category	SGIX_sprite
+	version		1.0
+	glxflags	SGI
+	glxropcode	2062
+	extension
+	offset		456
+
+SpriteParameterivSGIX(pname, params)
+	return		void
+	param		pname		SpriteParameterNameSGIX in value
+	param		params		CheckedInt32 in array [COMPSIZE(pname)]
+	category	SGIX_sprite
+	version		1.0
+	glxflags	SGI
+	glxropcode	2063
+	extension
+	offset		457
+
+###############################################################################
+#
+# Extension #53
+# SGIX_texture_multi_buffer commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_texture_multi_buffer
+
+###############################################################################
+#
+# Extension #54
+# EXT_point_parameters / SGIS_point_parameters commands
+#
+###############################################################################
+
+PointParameterfEXT(pname, param)
+	return		void
+	param		pname		PointParameterNameARB in value
+	param		param		CheckedFloat32 in value
+	category	EXT_point_parameters
+	version		1.0
+	glxflags	SGI
+	extension
+	alias		PointParameterfARB
+
+PointParameterfvEXT(pname, params)
+	return		void
+	param		pname		PointParameterNameARB in value
+	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
+	category	EXT_point_parameters
+	version		1.0
+	glxflags	SGI
+	extension
+	alias		PointParameterfvARB
+
+PointParameterfSGIS(pname, param)
+	return		void
+	param		pname		PointParameterNameARB in value
+	param		param		CheckedFloat32 in value
+	category	SGIS_point_parameters
+	version		1.0
+	glxflags	SGI
+	extension
+	alias		PointParameterfARB
+
+PointParameterfvSGIS(pname, params)
+	return		void
+	param		pname		PointParameterNameARB in value
+	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
+	category	SGIS_point_parameters
+	version		1.0
+	glxflags	SGI
+	extension
+	alias		PointParameterfvARB
+
+###############################################################################
+#
+# Extension #55
+# SGIX_instruments commands
+#
+###############################################################################
+
+GetInstrumentsSGIX()
+	return		Int32
+	dlflags		notlistable
+	category	SGIX_instruments
+	version		1.0
+	glxflags	SGI
+	glxvendorpriv	4102
+	extension
+	offset		460
+
+InstrumentsBufferSGIX(size, buffer)
+	return		void
+	param		size		SizeI in value
+	param		buffer		Int32 out array [size] retained
+	dlflags		notlistable
+	category	SGIX_instruments
+	version		1.0
+	glxflags	SGI
+	glxvendorpriv	4103
+	extension
+	offset		461
+
+PollInstrumentsSGIX(marker_p)
+	return		Int32
+	param		marker_p	Int32 out array [1]
+	dlflags		notlistable
+	category	SGIX_instruments
+	version		1.0
+	glxflags	SGI
+	glxvendorpriv	4104
+	extension
+	offset		462
+
+ReadInstrumentsSGIX(marker)
+	return		void
+	param		marker		Int32 in value
+	category	SGIX_instruments
+	version		1.0
+	glxflags	SGI
+	glxropcode	2077
+	extension
+	offset		463
+
+StartInstrumentsSGIX()
+	return		void
+	category	SGIX_instruments
+	version		1.0
+	glxflags	SGI
+	glxropcode	2069
+	extension
+	offset		464
+
+StopInstrumentsSGIX(marker)
+	return		void
+	param		marker		Int32 in value
+	category	SGIX_instruments
+	version		1.0
+	glxflags	SGI
+	glxropcode	2070
+	extension
+	offset		465
+
+###############################################################################
+#
+# Extension #56
+# SGIX_texture_scale_bias commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_texture_scale_bias
+
+###############################################################################
+#
+# Extension #57
+# SGIX_framezoom commands
+#
+###############################################################################
+
+FrameZoomSGIX(factor)
+	return		void
+	param		factor		CheckedInt32 in value
+	category	SGIX_framezoom
+	version		1.0
+	glxflags	SGI
+	glxropcode	2072
+	extension
+	offset		466
+
+###############################################################################
+#
+# Extension #58
+# SGIX_tag_sample_buffer commands
+#
+###############################################################################
+
+TagSampleBufferSGIX()
+	return		void
+	category	SGIX_tag_sample_buffer
+	version		1.0
+	glxropcode	2050
+	glxflags	SGI
+	extension
+	offset		467
+
+###############################################################################
+#
+# Extension #59
+# SGIX_polynomial_ffd commands
+#
+###############################################################################
+
+DeformationMap3dSGIX(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, w1, w2, wstride, worder, points)
+	return		void
+	param		target		FfdTargetSGIX in value
+	param		u1		CoordD in value
+	param		u2		CoordD in value
+	param		ustride		Int32 in value
+	param		uorder		CheckedInt32 in value
+	param		v1		CoordD in value
+	param		v2		CoordD in value
+	param		vstride		Int32 in value
+	param		vorder		CheckedInt32 in value
+	param		w1		CoordD in value
+	param		w2		CoordD in value
+	param		wstride		Int32 in value
+	param		worder		CheckedInt32 in value
+	param		points		CoordD in array [COMPSIZE(target/ustride/uorder/vstride/vorder/wstride/worder)]
+	dlflags		handcode
+	category	SGIX_polynomial_ffd
+	version		1.0
+	glxflags	SGI ignore
+	glxropcode	2073
+	extension
+	offset		?
+
+DeformationMap3fSGIX(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, w1, w2, wstride, worder, points)
+	return		void
+	param		target		FfdTargetSGIX in value
+	param		u1		CoordF in value
+	param		u2		CoordF in value
+	param		ustride		Int32 in value
+	param		uorder		CheckedInt32 in value
+	param		v1		CoordF in value
+	param		v2		CoordF in value
+	param		vstride		Int32 in value
+	param		vorder		CheckedInt32 in value
+	param		w1		CoordF in value
+	param		w2		CoordF in value
+	param		wstride		Int32 in value
+	param		worder		CheckedInt32 in value
+	param		points		CoordF in array [COMPSIZE(target/ustride/uorder/vstride/vorder/wstride/worder)]
+	category	SGIX_polynomial_ffd
+	dlflags		handcode
+	version		1.0
+	glxflags	SGI ignore
+	glxropcode	2074
+	extension
+	offset		?
+
+DeformSGIX(mask)
+	return		void
+	param		mask		FfdMaskSGIX in value
+	category	SGIX_polynomial_ffd
+	version		1.0
+	glxflags	SGI ignore
+	glxropcode	2075
+	extension
+	offset		?
+
+LoadIdentityDeformationMapSGIX(mask)
+	return		void
+	param		mask		FfdMaskSGIX in value
+	category	SGIX_polynomial_ffd
+	version		1.0
+	glxflags	SGI ignore
+	glxropcode	2076
+	extension
+	offset		?
+
+###############################################################################
+#
+# Extension #60
+# SGIX_reference_plane commands
+#
+###############################################################################
+
+ReferencePlaneSGIX(equation)
+	return		void
+	param		equation	Float64 in array [4]
+	category	SGIX_reference_plane
+	version		1.0
+	glxflags	SGI
+	glxropcode	2071
+	extension
+	offset		468
+
+###############################################################################
+#
+# Extension #61
+# SGIX_flush_raster commands
+#
+###############################################################################
+
+FlushRasterSGIX()
+	return		void
+	category	SGIX_flush_raster
+	version		1.0
+	dlflags		notlistable
+	glxflags	SGI
+	glxvendorpriv	4105
+	extension
+	offset		469
+
+###############################################################################
+#
+# Extension #62 - GLX_SGIX_cushion
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #63
+# SGIX_depth_texture commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_depth_texture
+
+###############################################################################
+#
+# Extension #64
+# SGIS_fog_function commands
+#
+###############################################################################
+
+FogFuncSGIS(n, points)
+	return		void
+	param		n		SizeI in value
+	param		points		Float32 in array [n*2]
+	category	SGIS_fog_function
+	version		1.1
+	glxflags	SGI
+	glxropcode	2067
+	extension
+	offset
+
+# Need to insert GLX information
+GetFogFuncSGIS(points)
+	return		void
+	param		points		Float32 out array [COMPSIZE()]
+	category	SGIS_fog_function
+	version		1.1
+	dlflags		notlistable
+	glxflags	ignore
+	extension
+	offset
+
+###############################################################################
+#
+# Extension #65
+# SGIX_fog_offset commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_fog_offset
+
+###############################################################################
+#
+# Extension #66
+# HP_image_transform commands
+#
+###############################################################################
+
+ImageTransformParameteriHP(target, pname, param)
+	return		void
+	param		target		ImageTransformTargetHP in value
+	param		pname		ImageTransformPNameHP in value
+	param		param		Int32 in value
+	category	HP_image_transform
+	version		1.1
+	glxropcode	?
+	offset		?
+
+ImageTransformParameterfHP(target, pname, param)
+	return		void
+	param		target		ImageTransformTargetHP in value
+	param		pname		ImageTransformPNameHP in value
+	param		param		Float32 in value
+	category	HP_image_transform
+	version		1.1
+	glxropcode	?
+	offset		?
+
+ImageTransformParameterivHP(target, pname, params)
+	return		void
+	param		target		ImageTransformTargetHP in value
+	param		pname		ImageTransformPNameHP in value
+	param		params		Int32 in array [COMPSIZE(pname)]
+	category	HP_image_transform
+	version		1.1
+	glxropcode	?
+	offset		?
+
+ImageTransformParameterfvHP(target, pname, params)
+	return		void
+	param		target		ImageTransformTargetHP in value
+	param		pname		ImageTransformPNameHP in value
+	param		params		Float32 in array [COMPSIZE(pname)]
+	category	HP_image_transform
+	version		1.1
+	glxropcode	?
+	offset		?
+
+GetImageTransformParameterivHP(target, pname, params)
+	return		void
+	param		target		ImageTransformTargetHP in value
+	param		pname		ImageTransformPNameHP in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	dlflags		notlistable
+	category	HP_image_transform
+	version		1.1
+	glxropcode	?
+	offset		?
+
+GetImageTransformParameterfvHP(target, pname, params)
+	return		void
+	param		target		ImageTransformTargetHP in value
+	param		pname		ImageTransformPNameHP in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	HP_image_transform
+	version		1.1
+	glxropcode	?
+	offset		?
+
+###############################################################################
+#
+# Extension #67
+# HP_convolution_border_modes commands
+#
+###############################################################################
+
+# (none)
+newcategory: HP_convolution_border_modes
+
+###############################################################################
+#
+# Extension #68
+# INGR_palette_buffer commands
+#
+###############################################################################
+
+#@ (Intergraph hasn't provided a spec)
+
+###############################################################################
+#
+# Extension #69
+# SGIX_texture_add_env commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_texture_add_env
+
+###############################################################################
+#
+# Extension #70 - skipped
+# Extension #71 - skipped
+# Extension #72 - skipped
+# Extension #73 - skipped
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #74
+# EXT_color_subtable commands
+#
+# This was probably never actually shipped as an EXT - just written up as a
+# reference for OpenGL 1.2 ARB_imaging.
+#
+###############################################################################
+
+ColorSubTableEXT(target, start, count, format, type, data)
+	return		void
+	param		target		ColorTableTarget in value
+	param		start		SizeI in value
+	param		count		SizeI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		data		Void in array [COMPSIZE(format/type/count)]
+	category	EXT_color_subtable
+	version		1.2
+	alias		ColorSubTable
+
+CopyColorSubTableEXT(target, start, x, y, width)
+	return		void
+	param		target		ColorTableTarget in value
+	param		start		SizeI in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	category	EXT_color_subtable
+	version		1.2
+	alias		CopyColorSubTable
+
+###############################################################################
+#
+# Extension #75 - GLU_EXT_object_space_tess
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #76
+# PGI_vertex_hints commands
+#
+###############################################################################
+
+# (none)
+newcategory: PGI_vertex_hints
+
+###############################################################################
+#
+# Extension #77
+# PGI_misc_hints commands
+#
+###############################################################################
+
+HintPGI(target, mode)
+	return		void
+	param		target		HintTargetPGI in value
+	param		mode		Int32 in value
+	category	PGI_misc_hints
+	version		1.1
+	offset		544
+
+###############################################################################
+#
+# Extension #78
+# EXT_paletted_texture commands
+#
+###############################################################################
+
+ColorTableEXT(target, internalFormat, width, format, type, table)
+	return		void
+	param		target		ColorTableTarget in value
+	param		internalFormat	PixelInternalFormat in value
+	param		width		SizeI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		table		Void in array [COMPSIZE(format/type/width)]
+	category	EXT_paletted_texture
+	version		1.1
+	alias		ColorTable
+
+GetColorTableEXT(target, format, type, data)
+	return		void
+	param		target		ColorTableTarget in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		data		Void out array [COMPSIZE(target/format/type)]
+	category	EXT_paletted_texture
+	version		1.1
+	offset		550
+
+GetColorTableParameterivEXT(target, pname, params)
+	return		void
+	param		target		ColorTableTarget in value
+	param		pname		GetColorTableParameterPName in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	EXT_paletted_texture
+	version		1.1
+	offset		551
+
+GetColorTableParameterfvEXT(target, pname, params)
+	return		void
+	param		target		ColorTableTarget in value
+	param		pname		GetColorTableParameterPName in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	EXT_paletted_texture
+	version		1.1
+	offset		552
+
+###############################################################################
+#
+# Extension #79
+# EXT_clip_volume_hint commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_clip_volume_hint
+
+###############################################################################
+#
+# Extension #80
+# SGIX_list_priority commands
+#
+###############################################################################
+
+# @@@ Needs vendorpriv opcodes assigned
+GetListParameterfvSGIX(list, pname, params)
+	return		void
+	param		list		List in value
+	param		pname		ListParameterName in value
+	param		params		CheckedFloat32 out array [COMPSIZE(pname)]
+	dlflags		notlistable
+	glxflags	ignore
+	category	SGIX_list_priority
+	version		1.0
+	glxvendorpriv	?
+	extension
+	offset		470
+
+# @@@ Needs vendorpriv opcodes assigned
+GetListParameterivSGIX(list, pname, params)
+	return		void
+	param		list		List in value
+	param		pname		ListParameterName in value
+	param		params		CheckedInt32 out array [COMPSIZE(pname)]
+	dlflags		notlistable
+	glxflags	ignore
+	category	SGIX_list_priority
+	version		1.0
+	glxvendorpriv	?
+	extension
+	offset		471
+
+ListParameterfSGIX(list, pname, param)
+	return		void
+	param		list		List in value
+	param		pname		ListParameterName in value
+	param		param		CheckedFloat32 in value
+	dlflags		notlistable
+	glxflags	ignore
+	category	SGIX_list_priority
+	version		1.0
+	glxropcode	2078
+	extension
+	offset		472
+
+ListParameterfvSGIX(list, pname, params)
+	return		void
+	param		list		List in value
+	param		pname		ListParameterName in value
+	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
+	dlflags		notlistable
+	glxflags	ignore
+	category	SGIX_list_priority
+	version		1.0
+	glxropcode	2079
+	extension
+	offset		473
+
+ListParameteriSGIX(list, pname, param)
+	return		void
+	param		list		List in value
+	param		pname		ListParameterName in value
+	param		param		CheckedInt32 in value
+	dlflags		notlistable
+	glxflags	ignore
+	category	SGIX_list_priority
+	version		1.0
+	glxropcode	2080
+	extension
+	offset		474
+
+ListParameterivSGIX(list, pname, params)
+	return		void
+	param		list		List in value
+	param		pname		ListParameterName in value
+	param		params		CheckedInt32 in array [COMPSIZE(pname)]
+	dlflags		notlistable
+	glxflags	ignore
+	category	SGIX_list_priority
+	version		1.0
+	glxropcode	2081
+	extension
+	offset		475
+
+###############################################################################
+#
+# Extension #81
+# SGIX_ir_instrument1 commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_ir_instrument1
+
+###############################################################################
+#
+# Extension #82
+# SGIX_calligraphic_fragment commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_calligraphic_fragment
+
+###############################################################################
+#
+# Extension #83 - GLX_SGIX_video_resize
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #84
+# SGIX_texture_lod_bias commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_texture_lod_bias
+
+###############################################################################
+#
+# Extension #85 - skipped
+# Extension #86 - GLX_SGIX_dmbuffer
+# Extension #87 - skipped
+# Extension #88 - skipped
+# Extension #89 - skipped
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #90
+# SGIX_shadow_ambient commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_shadow_ambient
+
+###############################################################################
+#
+# Extension #91 - GLX_SGIX_swap_group
+# Extension #92 - GLX_SGIX_swap_barrier
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #93
+# EXT_index_texture commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_index_texture
+
+###############################################################################
+#
+# Extension #94
+# EXT_index_material commands
+#
+###############################################################################
+
+IndexMaterialEXT(face, mode)
+	return		void
+	param		face		MaterialFace in value
+	param		mode		IndexMaterialParameterEXT in value
+	category	EXT_index_material
+	version		1.1
+	extension	soft
+	glxflags	ignore
+	offset		538
+
+###############################################################################
+#
+# Extension #95
+# EXT_index_func commands
+#
+###############################################################################
+
+IndexFuncEXT(func, ref)
+	return		void
+	param		func		IndexFunctionEXT in value
+	param		ref		ClampedFloat32 in value
+	category	EXT_index_func
+	version		1.1
+	extension	soft
+	glxflags	ignore
+	offset		539
+
+###############################################################################
+#
+# Extension #96
+# EXT_index_array_formats commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_index_array_formats
+
+###############################################################################
+#
+# Extension #97
+# EXT_compiled_vertex_array commands
+#
+###############################################################################
+
+LockArraysEXT(first, count)
+	return		void
+	param		first		Int32 in value
+	param		count		SizeI in value
+	category	EXT_compiled_vertex_array
+	version		1.1
+	dlflags		notlistable
+	extension	soft
+	glxflags	ignore
+	offset		540
+
+UnlockArraysEXT()
+	return		void
+	category	EXT_compiled_vertex_array
+	version		1.1
+	dlflags		notlistable
+	extension	soft
+	glxflags	ignore
+	offset		541
+
+###############################################################################
+#
+# Extension #98
+# EXT_cull_vertex commands
+#
+###############################################################################
+
+CullParameterdvEXT(pname, params)
+	return		void
+	param		pname		CullParameterEXT in value
+	param		params		Float64 out array [4]
+	category	EXT_cull_vertex
+	version		1.1
+	dlflags		notlistable
+	extension	soft
+	glxflags	ignore
+	offset		542
+
+CullParameterfvEXT(pname, params)
+	return		void
+	param		pname		CullParameterEXT in value
+	param		params		Float32 out array [4]
+	category	EXT_cull_vertex
+	version		1.1
+	dlflags		notlistable
+	extension	soft
+	glxflags	ignore
+	offset		543
+
+###############################################################################
+#
+# Extension #99 - skipped
+# Extension #100 - GLU_EXT_nurbs_tessellator
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #101
+# SGIX_ycrcb commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_ycrcb
+
+###############################################################################
+#
+# Extension #102
+# SGIX_fragment_lighting commands
+#
+###############################################################################
+
+FragmentColorMaterialSGIX(face, mode)
+	return		void
+	param		face		MaterialFace in value
+	param		mode		MaterialParameter in value
+	category	SGIX_fragment_lighting
+	glxflags	ignore
+	version		1.0
+	extension
+	offset		476
+
+FragmentLightfSGIX(light, pname, param)
+	return		void
+	param		light		FragmentLightNameSGIX in value
+	param		pname		FragmentLightParameterSGIX in value
+	param		param		CheckedFloat32 in value
+	category	SGIX_fragment_lighting
+	glxflags	ignore
+	version		1.0
+	extension
+	offset		477
+
+FragmentLightfvSGIX(light, pname, params)
+	return		void
+	param		light		FragmentLightNameSGIX in value
+	param		pname		FragmentLightParameterSGIX in value
+	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
+	category	SGIX_fragment_lighting
+	glxflags	ignore
+	version		1.0
+	extension
+	offset		478
+
+FragmentLightiSGIX(light, pname, param)
+	return		void
+	param		light		FragmentLightNameSGIX in value
+	param		pname		FragmentLightParameterSGIX in value
+	param		param		CheckedInt32 in value
+	category	SGIX_fragment_lighting
+	glxflags	ignore
+	version		1.0
+	extension
+	offset		479
+
+FragmentLightivSGIX(light, pname, params)
+	return		void
+	param		light		FragmentLightNameSGIX in value
+	param		pname		FragmentLightParameterSGIX in value
+	param		params		CheckedInt32 in array [COMPSIZE(pname)]
+	category	SGIX_fragment_lighting
+	glxflags	ignore
+	version		1.0
+	extension
+	offset		480
+
+FragmentLightModelfSGIX(pname, param)
+	return		void
+	param		pname		FragmentLightModelParameterSGIX in value
+	param		param		CheckedFloat32 in value
+	category	SGIX_fragment_lighting
+	glxflags	ignore
+	version		1.0
+	extension
+	offset		481
+
+FragmentLightModelfvSGIX(pname, params)
+	return		void
+	param		pname		FragmentLightModelParameterSGIX in value
+	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
+	category	SGIX_fragment_lighting
+	glxflags	ignore
+	version		1.0
+	extension
+	offset		482
+
+FragmentLightModeliSGIX(pname, param)
+	return		void
+	param		pname		FragmentLightModelParameterSGIX in value
+	param		param		CheckedInt32 in value
+	category	SGIX_fragment_lighting
+	glxflags	ignore
+	version		1.0
+	extension
+	offset		483
+
+FragmentLightModelivSGIX(pname, params)
+	return		void
+	param		pname		FragmentLightModelParameterSGIX in value
+	param		params		CheckedInt32 in array [COMPSIZE(pname)]
+	category	SGIX_fragment_lighting
+	glxflags	ignore
+	version		1.0
+	extension
+	offset		484
+
+FragmentMaterialfSGIX(face, pname, param)
+	return		void
+	param		face		MaterialFace in value
+	param		pname		MaterialParameter in value
+	param		param		CheckedFloat32 in value
+	category	SGIX_fragment_lighting
+	glxflags	ignore
+	version		1.0
+	extension
+	offset		485
+
+FragmentMaterialfvSGIX(face, pname, params)
+	return		void
+	param		face		MaterialFace in value
+	param		pname		MaterialParameter in value
+	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
+	category	SGIX_fragment_lighting
+	glxflags	ignore
+	version		1.0
+	extension
+	offset		486
+
+FragmentMaterialiSGIX(face, pname, param)
+	return		void
+	param		face		MaterialFace in value
+	param		pname		MaterialParameter in value
+	param		param		CheckedInt32 in value
+	category	SGIX_fragment_lighting
+	glxflags	ignore
+	version		1.0
+	extension
+	offset		487
+
+FragmentMaterialivSGIX(face, pname, params)
+	return		void
+	param		face		MaterialFace in value
+	param		pname		MaterialParameter in value
+	param		params		CheckedInt32 in array [COMPSIZE(pname)]
+	category	SGIX_fragment_lighting
+	glxflags	ignore
+	version		1.0
+	extension
+	offset		488
+
+GetFragmentLightfvSGIX(light, pname, params)
+	return		void
+	param		light		FragmentLightNameSGIX in value
+	param		pname		FragmentLightParameterSGIX in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	SGIX_fragment_lighting
+	dlflags		notlistable
+	glxflags	ignore
+	version		1.0
+	extension
+	offset		489
+
+GetFragmentLightivSGIX(light, pname, params)
+	return		void
+	param		light		FragmentLightNameSGIX in value
+	param		pname		FragmentLightParameterSGIX in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	SGIX_fragment_lighting
+	dlflags		notlistable
+	glxflags	ignore
+	version		1.0
+	extension
+	offset		490
+
+GetFragmentMaterialfvSGIX(face, pname, params)
+	return		void
+	param		face		MaterialFace in value
+	param		pname		MaterialParameter in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	SGIX_fragment_lighting
+	dlflags		notlistable
+	glxflags	ignore
+	version		1.0
+	extension
+	offset		491
+
+GetFragmentMaterialivSGIX(face, pname, params)
+	return		void
+	param		face		MaterialFace in value
+	param		pname		MaterialParameter in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	SGIX_fragment_lighting
+	dlflags		notlistable
+	glxflags	ignore
+	version		1.0
+	extension
+	offset		492
+
+LightEnviSGIX(pname, param)
+	return		void
+	param		pname		LightEnvParameterSGIX in value
+	param		param		CheckedInt32 in value
+	category	SGIX_fragment_lighting
+	glxflags	ignore
+	version		1.0
+	extension
+	offset		493
+
+###############################################################################
+#
+# Extension #103 - skipped
+# Extension #104 - skipped
+# Extension #105 - skipped
+# Extension #106 - skipped
+# Extension #107 - skipped
+# Extension #108 - skipped
+# Extension #109 - skipped
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #110
+# IBM_rasterpos_clip commands
+#
+###############################################################################
+
+# (none)
+newcategory: IBM_rasterpos_clip
+
+###############################################################################
+#
+# Extension #111
+# HP_texture_lighting commands
+#
+###############################################################################
+
+# (none)
+newcategory: HP_texture_lighting
+
+###############################################################################
+#
+# Extension #112
+# EXT_draw_range_elements commands
+#
+###############################################################################
+
+# Spec entries to be written
+DrawRangeElementsEXT(mode, start, end, count, type, indices)
+	return		void
+	param		mode		BeginMode in value
+	param		start		UInt32 in value
+	param		end		UInt32 in value
+	param		count		SizeI in value
+	param		type		DrawElementsType in value
+	param		indices		Void in array [COMPSIZE(count/type)]
+	category	EXT_draw_range_elements
+	dlflags		handcode
+	glxflags	client-handcode client-intercept server-handcode
+	version		1.1
+	alias		DrawRangeElements
+
+###############################################################################
+#
+# Extension #113
+# WIN_phong_shading commands
+#
+###############################################################################
+
+# (none)
+newcategory: WIN_phong_shading
+
+###############################################################################
+#
+# Extension #114
+# WIN_specular_fog commands
+#
+###############################################################################
+
+# (none)
+newcategory: WIN_specular_fog
+
+###############################################################################
+#
+# Extension #115 - skipped
+# Extension #116 - skipped
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #117
+# EXT_light_texture commands
+#
+###############################################################################
+
+# Spec entries to be written
+ApplyTextureEXT(mode)
+	return		void
+	param		mode		LightTextureModeEXT in value
+	category	EXT_light_texture
+	version		1.1
+	glxropcode	?
+	offset		?
+
+TextureLightEXT(pname)
+	return		void
+	param		pname		LightTexturePNameEXT in value
+	category	EXT_light_texture
+	version		1.1
+	glxropcode	?
+	offset		?
+
+TextureMaterialEXT(face, mode)
+	return		void
+	param		face		MaterialFace in value
+	param		mode		MaterialParameter in value
+	category	EXT_light_texture
+	version		1.1
+	glxropcode	?
+	offset		?
+
+###############################################################################
+#
+# Extension #118 - skipped
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #119
+# SGIX_blend_alpha_minmax commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_blend_alpha_minmax
+
+###############################################################################
+#
+# Extension #120 - skipped
+# Extension #121 - skipped
+# Extension #122 - skipped
+# Extension #123 - skipped
+# Extension #124 - skipped
+# Extension #125 - skipped
+# Extension #126 - skipped
+# Extension #127 - skipped
+# Extension #128 - skipped
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #129
+# EXT_bgra commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_bgra
+
+###############################################################################
+#
+# Extension #130 - skipped
+# Extension #131 - skipped
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #132
+# SGIX_async commands
+#
+###############################################################################
+
+AsyncMarkerSGIX(marker)
+	return		void
+	param		marker		UInt32 in value
+	category	SGIX_async
+	version		1.0
+	glxflags	ignore
+	extension
+	offset		?
+
+FinishAsyncSGIX(markerp)
+	return		Int32
+	param		markerp		UInt32 out array [1]
+	category	SGIX_async
+	version		1.0
+	dlflags		notlistable
+	glxflags	ignore
+	extension
+	offset		?
+
+PollAsyncSGIX(markerp)
+	return		Int32
+	param		markerp		UInt32 out array [1]
+	category	SGIX_async
+	version		1.0
+	dlflags		notlistable
+	glxflags	ignore
+	extension
+	offset		?
+
+GenAsyncMarkersSGIX(range)
+	return		UInt32
+	param		range		SizeI in value
+	category	SGIX_async
+	version		1.0
+	dlflags		notlistable
+	glxflags	ignore
+	extension
+	offset		?
+
+DeleteAsyncMarkersSGIX(marker, range)
+	return		void
+	param		marker		UInt32 in value
+	param		range		SizeI in value
+	category	SGIX_async
+	version		1.0
+	dlflags		notlistable
+	glxflags	ignore
+	extension
+	offset		?
+
+IsAsyncMarkerSGIX(marker)
+	return		Boolean
+	param		marker		UInt32 in value
+	category	SGIX_async
+	version		1.0
+	dlflags		notlistable
+	glxflags	ignore
+	extension
+	offset		?
+
+###############################################################################
+#
+# Extension #133
+# SGIX_async_pixel commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_async_pixel
+
+###############################################################################
+#
+# Extension #134
+# SGIX_async_histogram commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_async_histogram
+
+###############################################################################
+#
+# Extension #135 - skipped (INTEL_texture_scissor was never implemented)
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #136
+# INTEL_parallel_arrays commands
+#
+###############################################################################
+
+VertexPointervINTEL(size, type, pointer)
+	return		void
+	param		size		Int32 in value
+	param		type		VertexPointerType in value
+	param		pointer		VoidPointer in array [4] retained
+	category	INTEL_parallel_arrays
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode EXT
+	version		1.1
+	offset		?
+
+NormalPointervINTEL(type, pointer)
+	return		void
+	param		type		NormalPointerType in value
+	param		pointer		VoidPointer in array [4] retained
+	category	INTEL_parallel_arrays
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode EXT
+	version		1.1
+	offset		?
+
+ColorPointervINTEL(size, type, pointer)
+	return		void
+	param		size		Int32 in value
+	param		type		VertexPointerType in value
+	param		pointer		VoidPointer in array [4] retained
+	category	INTEL_parallel_arrays
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode EXT
+	version		1.1
+	offset		?
+
+TexCoordPointervINTEL(size, type, pointer)
+	return		void
+	param		size		Int32 in value
+	param		type		VertexPointerType in value
+	param		pointer		VoidPointer in array [4] retained
+	category	INTEL_parallel_arrays
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode EXT
+	version		1.1
+	offset		?
+
+
+###############################################################################
+#
+# Extension #137
+# HP_occlusion_test commands
+#
+###############################################################################
+
+# (none)
+newcategory: HP_occlusion_test
+
+###############################################################################
+#
+# Extension #138
+# EXT_pixel_transform commands
+#
+###############################################################################
+
+PixelTransformParameteriEXT(target, pname, param)
+	return		void
+	param		target		PixelTransformTargetEXT in value
+	param		pname		PixelTransformPNameEXT in value
+	param		param		Int32 in value
+	category	EXT_pixel_transform
+	version		1.1
+	glxropcode	16386
+	offset		?
+
+PixelTransformParameterfEXT(target, pname, param)
+	return		void
+	param		target		PixelTransformTargetEXT in value
+	param		pname		PixelTransformPNameEXT in value
+	param		param		Float32 in value
+	category	EXT_pixel_transform
+	version		1.1
+	glxropcode	16385
+	offset		?
+
+PixelTransformParameterivEXT(target, pname, params)
+	return		void
+	param		target		PixelTransformTargetEXT in value
+	param		pname		PixelTransformPNameEXT in value
+	param		params		Int32 in array [1]
+	category	EXT_pixel_transform
+	version		1.1
+	glxropcode	?
+	offset		?
+
+PixelTransformParameterfvEXT(target, pname, params)
+	return		void
+	param		target		PixelTransformTargetEXT in value
+	param		pname		PixelTransformPNameEXT in value
+	param		params		Float32 in array [1]
+	category	EXT_pixel_transform
+	version		1.1
+	glxropcode	?
+	offset		?
+
+GetPixelTransformParameterivEXT(target, pname, params)
+	return		void
+	param		target		GLenum in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	EXT_pixel_transform
+	dlflags		notlistable
+	version		1.1
+	extension
+	glxvendorpriv	2052
+	glxflags	ignore
+	offset		?
+
+GetPixelTransformParameterfvEXT(target, pname, params)
+	return		void
+	param		target		GLenum in value
+	param		pname		GLenum in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	EXT_pixel_transform
+	dlflags		notlistable
+	version		1.1
+	extension
+	glxvendorpriv	2051
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #139
+# EXT_pixel_transform_color_table commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_pixel_transform_color_table
+
+###############################################################################
+#
+# Extension #140 - skipped
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #141
+# EXT_shared_texture_palette commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_shared_texture_palette
+
+###############################################################################
+#
+# Extension #142 - GLX_SGIS_blended_overlay
+# Extension #143 - GLX_SGIS_shared_multisample
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #144
+# EXT_separate_specular_color commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_separate_specular_color
+
+###############################################################################
+#
+# Extension #145
+# EXT_secondary_color commands
+#
+###############################################################################
+
+SecondaryColor3bEXT(red, green, blue)
+	return		void
+	param		red		ColorB in value
+	param		green		ColorB in value
+	param		blue		ColorB in value
+	category	EXT_secondary_color
+	vectorequiv	SecondaryColor3bvEXT
+	version		1.1
+	alias		SecondaryColor3b
+
+SecondaryColor3bvEXT(v)
+	return		void
+	param		v		ColorB in array [3]
+	category	EXT_secondary_color
+	version		1.1
+	glxropcode	4126
+	alias		SecondaryColor3bv
+
+SecondaryColor3dEXT(red, green, blue)
+	return		void
+	param		red		ColorD in value
+	param		green		ColorD in value
+	param		blue		ColorD in value
+	category	EXT_secondary_color
+	vectorequiv	SecondaryColor3dvEXT
+	version		1.1
+	alias		SecondaryColor3d
+
+SecondaryColor3dvEXT(v)
+	return		void
+	param		v		ColorD in array [3]
+	category	EXT_secondary_color
+	version		1.1
+	glxropcode	4130
+	alias		SecondaryColor3dv
+
+SecondaryColor3fEXT(red, green, blue)
+	return		void
+	param		red		ColorF in value
+	param		green		ColorF in value
+	param		blue		ColorF in value
+	category	EXT_secondary_color
+	vectorequiv	SecondaryColor3fvEXT
+	version		1.1
+	alias		SecondaryColor3f
+
+SecondaryColor3fvEXT(v)
+	return		void
+	param		v		ColorF in array [3]
+	category	EXT_secondary_color
+	version		1.1
+	glxropcode	4129
+	alias		SecondaryColor3fv
+
+SecondaryColor3iEXT(red, green, blue)
+	return		void
+	param		red		ColorI in value
+	param		green		ColorI in value
+	param		blue		ColorI in value
+	category	EXT_secondary_color
+	vectorequiv	SecondaryColor3ivEXT
+	version		1.1
+	alias		SecondaryColor3i
+
+SecondaryColor3ivEXT(v)
+	return		void
+	param		v		ColorI in array [3]
+	category	EXT_secondary_color
+	version		1.1
+	glxropcode	4128
+	offset		568
+	alias		SecondaryColor3iv
+
+SecondaryColor3sEXT(red, green, blue)
+	return		void
+	param		red		ColorS in value
+	param		green		ColorS in value
+	param		blue		ColorS in value
+	category	EXT_secondary_color
+	vectorequiv	SecondaryColor3svEXT
+	version		1.1
+	alias		SecondaryColor3s
+
+SecondaryColor3svEXT(v)
+	return		void
+	param		v		ColorS in array [3]
+	category	EXT_secondary_color
+	version		1.1
+	glxropcode	4127
+	alias		SecondaryColor3sv
+
+SecondaryColor3ubEXT(red, green, blue)
+	return		void
+	param		red		ColorUB in value
+	param		green		ColorUB in value
+	param		blue		ColorUB in value
+	category	EXT_secondary_color
+	vectorequiv	SecondaryColor3ubvEXT
+	version		1.1
+	alias		SecondaryColor3ub
+
+SecondaryColor3ubvEXT(v)
+	return		void
+	param		v		ColorUB in array [3]
+	category	EXT_secondary_color
+	version		1.1
+	glxropcode	4131
+	alias		SecondaryColor3ubv
+
+SecondaryColor3uiEXT(red, green, blue)
+	return		void
+	param		red		ColorUI in value
+	param		green		ColorUI in value
+	param		blue		ColorUI in value
+	category	EXT_secondary_color
+	vectorequiv	SecondaryColor3uivEXT
+	version		1.1
+	alias		SecondaryColor3ui
+
+SecondaryColor3uivEXT(v)
+	return		void
+	param		v		ColorUI in array [3]
+	category	EXT_secondary_color
+	version		1.1
+	glxropcode	4133
+	alias		SecondaryColor3uiv
+
+SecondaryColor3usEXT(red, green, blue)
+	return		void
+	param		red		ColorUS in value
+	param		green		ColorUS in value
+	param		blue		ColorUS in value
+	category	EXT_secondary_color
+	vectorequiv	SecondaryColor3usvEXT
+	version		1.1
+	alias		SecondaryColor3us
+
+SecondaryColor3usvEXT(v)
+	return		void
+	param		v		ColorUS in array [3]
+	category	EXT_secondary_color
+	version		1.1
+	glxropcode	4132
+	alias		SecondaryColor3usv
+
+SecondaryColorPointerEXT(size, type, stride, pointer)
+	return		void
+	param		size		Int32 in value
+	param		type		ColorPointerType in value
+	param		stride		SizeI in value
+	param		pointer		Void in array [COMPSIZE(size/type/stride)] retained
+	category	EXT_secondary_color
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode EXT
+	version		1.1
+	extension
+	alias		SecondaryColorPointer
+
+###############################################################################
+#
+# Extension #146
+# EXT_texture_env commands
+#
+###############################################################################
+
+# Dead extension - never implemented (removed from registry!)
+# (none)
+# newcategory: EXT_texture_env
+
+###############################################################################
+#
+# Extension #147
+# EXT_texture_perturb_normal commands
+#
+###############################################################################
+
+TextureNormalEXT(mode)
+	return		void
+	param		mode		TextureNormalModeEXT in value
+	category	EXT_texture_perturb_normal
+	version		1.1
+	glxropcode	?
+	offset		?
+
+###############################################################################
+#
+# Extension #148
+# EXT_multi_draw_arrays commands
+#
+###############################################################################
+
+# first and count are really 'in'
+MultiDrawArraysEXT(mode, first, count, primcount)
+	return		void
+	param		mode		BeginMode in value
+	param		first		Int32 in array [COMPSIZE(primcount)]
+	param		count		SizeI in array [COMPSIZE(primcount)]
+	param		primcount	SizeI in value
+	category	EXT_multi_draw_arrays
+	version		1.1
+	glxropcode	?
+	alias		MultiDrawArrays
+
+MultiDrawElementsEXT(mode, count, type, indices, primcount)
+	return		void
+	param		mode		BeginMode in value
+	param		count		SizeI in array [COMPSIZE(primcount)]
+	param		type		DrawElementsType in value
+	param		indices		VoidPointer in array [COMPSIZE(primcount)]
+	param		primcount	SizeI in value
+	category	EXT_multi_draw_arrays
+	version		1.1
+	glxropcode	?
+	alias		MultiDrawElements
+
+###############################################################################
+#
+# Extension #149
+# EXT_fog_coord commands
+#
+###############################################################################
+
+FogCoordfEXT(coord)
+	return		void
+	param		coord		CoordF in value
+	category	EXT_fog_coord
+	vectorequiv	FogCoordfvEXT
+	version		1.1
+	alias		FogCoordf
+
+FogCoordfvEXT(coord)
+	return		void
+	param		coord		CoordF in array [1]
+	category	EXT_fog_coord
+	version		1.1
+	glxropcode	4124
+	alias		FogCoordfv
+
+FogCoorddEXT(coord)
+	return		void
+	param		coord		CoordD in value
+	category	EXT_fog_coord
+	vectorequiv	FogCoorddvEXT
+	version		1.1
+	alias		FogCoordd
+
+FogCoorddvEXT(coord)
+	return		void
+	param		coord		CoordD in array [1]
+	category	EXT_fog_coord
+	version		1.1
+	glxropcode	4125
+	alias		FogCoorddv
+
+FogCoordPointerEXT(type, stride, pointer)
+	return		void
+	param		type		FogPointerTypeEXT in value
+	param		stride		SizeI in value
+	param		pointer		Void in array [COMPSIZE(type/stride)] retained
+	category	EXT_fog_coord
+	dlflags		notlistable
+	version		1.1
+	glxflags	client-handcode server-handcode EXT
+	alias		FogCoordPointer
+
+###############################################################################
+#
+# Extension #150 - skipped
+# Extension #151 - skipped
+# Extension #152 - skipped
+# Extension #153 - skipped
+# Extension #154 - skipped
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #155
+# REND_screen_coordinates commands
+#
+###############################################################################
+
+# (none)
+newcategory: REND_screen_coordinates
+
+###############################################################################
+#
+# Extension #156
+# EXT_coordinate_frame commands
+#
+###############################################################################
+
+Tangent3bEXT(tx, ty, tz)
+	return		void
+	param		tx		Int8 in value
+	param		ty		Int8 in value
+	param		tz		Int8 in value
+	category	EXT_coordinate_frame
+	vectorequiv	Tangent3bvEXT
+	version		1.1
+	offset		?
+
+Tangent3bvEXT(v)
+	return		void
+	param		v		Int8 in array [3]
+	category	EXT_coordinate_frame
+	version		1.1
+	glxropcode	?
+	offset		?
+
+Tangent3dEXT(tx, ty, tz)
+	return		void
+	param		tx		CoordD in value
+	param		ty		CoordD in value
+	param		tz		CoordD in value
+	category	EXT_coordinate_frame
+	vectorequiv	Tangent3dvEXT
+	version		1.1
+	offset		?
+
+Tangent3dvEXT(v)
+	return		void
+	param		v		CoordD in array [3]
+	category	EXT_coordinate_frame
+	version		1.1
+	glxropcode	?
+	offset		?
+
+Tangent3fEXT(tx, ty, tz)
+	return		void
+	param		tx		CoordF in value
+	param		ty		CoordF in value
+	param		tz		CoordF in value
+	category	EXT_coordinate_frame
+	vectorequiv	Tangent3fvEXT
+	version		1.1
+	offset		?
+
+Tangent3fvEXT(v)
+	return		void
+	param		v		CoordF in array [3]
+	category	EXT_coordinate_frame
+	version		1.1
+	glxropcode	?
+	offset		?
+
+Tangent3iEXT(tx, ty, tz)
+	return		void
+	param		tx		Int32 in value
+	param		ty		Int32 in value
+	param		tz		Int32 in value
+	category	EXT_coordinate_frame
+	vectorequiv	Tangent3ivEXT
+	version		1.1
+	offset		?
+
+Tangent3ivEXT(v)
+	return		void
+	param		v		Int32 in array [3]
+	category	EXT_coordinate_frame
+	version		1.1
+	glxropcode	?
+	offset		?
+
+Tangent3sEXT(tx, ty, tz)
+	return		void
+	param		tx		Int16 in value
+	param		ty		Int16 in value
+	param		tz		Int16 in value
+	category	EXT_coordinate_frame
+	vectorequiv	Tangent3svEXT
+	version		1.1
+	offset		?
+
+Tangent3svEXT(v)
+	return		void
+	param		v		Int16 in array [3]
+	category	EXT_coordinate_frame
+	version		1.1
+	glxropcode	?
+	offset		?
+
+Binormal3bEXT(bx, by, bz)
+	return		void
+	param		bx		Int8 in value
+	param		by		Int8 in value
+	param		bz		Int8 in value
+	category	EXT_coordinate_frame
+	vectorequiv	Binormal3bvEXT
+	version		1.1
+	offset		?
+
+Binormal3bvEXT(v)
+	return		void
+	param		v		Int8 in array [3]
+	category	EXT_coordinate_frame
+	version		1.1
+	glxropcode	?
+	offset		?
+
+Binormal3dEXT(bx, by, bz)
+	return		void
+	param		bx		CoordD in value
+	param		by		CoordD in value
+	param		bz		CoordD in value
+	category	EXT_coordinate_frame
+	vectorequiv	Binormal3dvEXT
+	version		1.1
+	offset		?
+
+Binormal3dvEXT(v)
+	return		void
+	param		v		CoordD in array [3]
+	category	EXT_coordinate_frame
+	version		1.1
+	glxropcode	?
+	offset		?
+
+Binormal3fEXT(bx, by, bz)
+	return		void
+	param		bx		CoordF in value
+	param		by		CoordF in value
+	param		bz		CoordF in value
+	category	EXT_coordinate_frame
+	vectorequiv	Binormal3fvEXT
+	version		1.1
+	offset		?
+
+Binormal3fvEXT(v)
+	return		void
+	param		v		CoordF in array [3]
+	category	EXT_coordinate_frame
+	version		1.1
+	glxropcode	?
+	offset		?
+
+Binormal3iEXT(bx, by, bz)
+	return		void
+	param		bx		Int32 in value
+	param		by		Int32 in value
+	param		bz		Int32 in value
+	category	EXT_coordinate_frame
+	vectorequiv	Binormal3ivEXT
+	version		1.1
+	offset		?
+
+Binormal3ivEXT(v)
+	return		void
+	param		v		Int32 in array [3]
+	category	EXT_coordinate_frame
+	version		1.1
+	glxropcode	?
+	offset		?
+
+Binormal3sEXT(bx, by, bz)
+	return		void
+	param		bx		Int16 in value
+	param		by		Int16 in value
+	param		bz		Int16 in value
+	category	EXT_coordinate_frame
+	vectorequiv	Binormal3svEXT
+	version		1.1
+	offset		?
+
+Binormal3svEXT(v)
+	return		void
+	param		v		Int16 in array [3]
+	category	EXT_coordinate_frame
+	version		1.1
+	glxropcode	?
+	offset		?
+
+TangentPointerEXT(type, stride, pointer)
+	return		void
+	param		type		TangentPointerTypeEXT in value
+	param		stride		SizeI in value
+	param		pointer		Void in array [COMPSIZE(type/stride)] retained
+	category	EXT_coordinate_frame
+	dlflags		notlistable
+	glxflags	client-handcode client-intercept server-handcode
+	version		1.1
+	offset		?
+
+BinormalPointerEXT(type, stride, pointer)
+	return		void
+	param		type		BinormalPointerTypeEXT in value
+	param		stride		SizeI in value
+	param		pointer		Void in array [COMPSIZE(type/stride)] retained
+	category	EXT_coordinate_frame
+	dlflags		notlistable
+	glxflags	client-handcode client-intercept server-handcode
+	version		1.1
+	offset		?
+
+###############################################################################
+#
+# Extension #157 - skipped
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #158
+# EXT_texture_env_combine commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_texture_env_combine
+
+###############################################################################
+#
+# Extension #159
+# APPLE_specular_vector commands
+#
+###############################################################################
+
+# (none)
+newcategory: APPLE_specular_vector
+
+###############################################################################
+#
+# Extension #160
+# APPLE_transform_hint commands
+#
+###############################################################################
+
+# (none)
+newcategory: APPLE_transform_hint
+
+###############################################################################
+#
+# Extension #161
+# SGIX_fog_scale commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_fog_scale
+
+###############################################################################
+#
+# Extension #162 - skipped
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #163
+# SUNX_constant_data commands
+#
+###############################################################################
+
+FinishTextureSUNX()
+	return		void
+	category	SUNX_constant_data
+	version		1.1
+	glxropcode	?
+	offset		?
+
+###############################################################################
+#
+# Extension #164
+# SUN_global_alpha commands
+#
+###############################################################################
+
+GlobalAlphaFactorbSUN(factor)
+	return		void
+	param		factor		Int8 in value
+	category	SUN_global_alpha
+	version		1.1
+	glxropcode	?
+	offset		?
+
+GlobalAlphaFactorsSUN(factor)
+	return		void
+	param		factor		Int16 in value
+	category	SUN_global_alpha
+	version		1.1
+	glxropcode	?
+	offset		?
+
+GlobalAlphaFactoriSUN(factor)
+	return		void
+	param		factor		Int32 in value
+	category	SUN_global_alpha
+	version		1.1
+	glxropcode	?
+	offset		?
+
+GlobalAlphaFactorfSUN(factor)
+	return		void
+	param		factor		Float32 in value
+	category	SUN_global_alpha
+	version		1.1
+	glxropcode	?
+	offset		?
+
+GlobalAlphaFactordSUN(factor)
+	return		void
+	param		factor		Float64 in value
+	category	SUN_global_alpha
+	version		1.1
+	glxropcode	?
+	offset		?
+
+GlobalAlphaFactorubSUN(factor)
+	return		void
+	param		factor		UInt8 in value
+	category	SUN_global_alpha
+	version		1.1
+	glxropcode	?
+	offset		?
+
+GlobalAlphaFactorusSUN(factor)
+	return		void
+	param		factor		UInt16 in value
+	category	SUN_global_alpha
+	version		1.1
+	glxropcode	?
+	offset		?
+
+GlobalAlphaFactoruiSUN(factor)
+	return		void
+	param		factor		UInt32 in value
+	category	SUN_global_alpha
+	version		1.1
+	glxropcode	?
+	offset		?
+
+###############################################################################
+#
+# Extension #165
+# SUN_triangle_list commands
+#
+###############################################################################
+
+ReplacementCodeuiSUN(code)
+	return		void
+	param		code		UInt32 in value
+	category	SUN_triangle_list
+	version		1.1
+	glxropcode	?
+	offset		?
+
+ReplacementCodeusSUN(code)
+	return		void
+	param		code		UInt16 in value
+	category	SUN_triangle_list
+	version		1.1
+	glxropcode	?
+	offset		?
+
+ReplacementCodeubSUN(code)
+	return		void
+	param		code		UInt8 in value
+	category	SUN_triangle_list
+	version		1.1
+	glxropcode	?
+	offset		?
+
+ReplacementCodeuivSUN(code)
+	return		void
+	param		code		UInt32 in array [COMPSIZE()]
+	category	SUN_triangle_list
+	version		1.1
+	glxropcode	?
+	offset		?
+
+ReplacementCodeusvSUN(code)
+	return		void
+	param		code		UInt16 in array [COMPSIZE()]
+	category	SUN_triangle_list
+	version		1.1
+	glxropcode	?
+	offset		?
+
+ReplacementCodeubvSUN(code)
+	return		void
+	param		code		UInt8 in array [COMPSIZE()]
+	category	SUN_triangle_list
+	version		1.1
+	glxropcode	?
+	offset		?
+
+ReplacementCodePointerSUN(type, stride, pointer)
+	return		void
+	param		type		ReplacementCodeTypeSUN in value
+	param		stride		SizeI in value
+	param		pointer		VoidPointer in array [COMPSIZE(type/stride)] retained
+	category	SUN_triangle_list
+	version		1.1
+	glxropcode	?
+	offset		?
+
+###############################################################################
+#
+# Extension #166
+# SUN_vertex commands
+#
+###############################################################################
+
+Color4ubVertex2fSUN(r, g, b, a, x, y)
+	return		void
+	param		r		UInt8 in value
+	param		g		UInt8 in value
+	param		b		UInt8 in value
+	param		a		UInt8 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+Color4ubVertex2fvSUN(c, v)
+	return		void
+	param		c		UInt8 in array [4]
+	param		v		Float32 in array [2]
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+Color4ubVertex3fSUN(r, g, b, a, x, y, z)
+	return		void
+	param		r		UInt8 in value
+	param		g		UInt8 in value
+	param		b		UInt8 in value
+	param		a		UInt8 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+Color4ubVertex3fvSUN(c, v)
+	return		void
+	param		c		UInt8 in array [4]
+	param		v		Float32 in array [3]
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+Color3fVertex3fSUN(r, g, b, x, y, z)
+	return		void
+	param		r		Float32 in value
+	param		g		Float32 in value
+	param		b		Float32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+Color3fVertex3fvSUN(c, v)
+	return		void
+	param		c		Float32 in array [3]
+	param		v		Float32 in array [3]
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+Normal3fVertex3fSUN(nx, ny, nz, x, y, z)
+	return		void
+	param		nx		Float32 in value
+	param		ny		Float32 in value
+	param		nz		Float32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+Normal3fVertex3fvSUN(n, v)
+	return		void
+	param		n		Float32 in array [3]
+	param		v		Float32 in array [3]
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+Color4fNormal3fVertex3fSUN(r, g, b, a, nx, ny, nz, x, y, z)
+	return		void
+	param		r		Float32 in value
+	param		g		Float32 in value
+	param		b		Float32 in value
+	param		a		Float32 in value
+	param		nx		Float32 in value
+	param		ny		Float32 in value
+	param		nz		Float32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+Color4fNormal3fVertex3fvSUN(c, n, v)
+	return		void
+	param		c		Float32 in array [4]
+	param		n		Float32 in array [3]
+	param		v		Float32 in array [3]
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+TexCoord2fVertex3fSUN(s, t, x, y, z)
+	return		void
+	param		s		Float32 in value
+	param		t		Float32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+TexCoord2fVertex3fvSUN(tc, v)
+	return		void
+	param		tc		Float32 in array [2]
+	param		v		Float32 in array [3]
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+TexCoord4fVertex4fSUN(s, t, p, q, x, y, z, w)
+	return		void
+	param		s		Float32 in value
+	param		t		Float32 in value
+	param		p		Float32 in value
+	param		q		Float32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	param		w		Float32 in value
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+TexCoord4fVertex4fvSUN(tc, v)
+	return		void
+	param		tc		Float32 in array [4]
+	param		v		Float32 in array [4]
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+TexCoord2fColor4ubVertex3fSUN(s, t, r, g, b, a, x, y, z)
+	return		void
+	param		s		Float32 in value
+	param		t		Float32 in value
+	param		r		UInt8 in value
+	param		g		UInt8 in value
+	param		b		UInt8 in value
+	param		a		UInt8 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+TexCoord2fColor4ubVertex3fvSUN(tc, c, v)
+	return		void
+	param		tc		Float32 in array [2]
+	param		c		UInt8 in array [4]
+	param		v		Float32 in array [3]
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+TexCoord2fColor3fVertex3fSUN(s, t, r, g, b, x, y, z)
+	return		void
+	param		s		Float32 in value
+	param		t		Float32 in value
+	param		r		Float32 in value
+	param		g		Float32 in value
+	param		b		Float32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+TexCoord2fColor3fVertex3fvSUN(tc, c, v)
+	return		void
+	param		tc		Float32 in array [2]
+	param		c		Float32 in array [3]
+	param		v		Float32 in array [3]
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+TexCoord2fNormal3fVertex3fSUN(s, t, nx, ny, nz, x, y, z)
+	return		void
+	param		s		Float32 in value
+	param		t		Float32 in value
+	param		nx		Float32 in value
+	param		ny		Float32 in value
+	param		nz		Float32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+TexCoord2fNormal3fVertex3fvSUN(tc, n, v)
+	return		void
+	param		tc		Float32 in array [2]
+	param		n		Float32 in array [3]
+	param		v		Float32 in array [3]
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+TexCoord2fColor4fNormal3fVertex3fSUN(s, t, r, g, b, a, nx, ny, nz, x, y, z)
+	return		void
+	param		s		Float32 in value
+	param		t		Float32 in value
+	param		r		Float32 in value
+	param		g		Float32 in value
+	param		b		Float32 in value
+	param		a		Float32 in value
+	param		nx		Float32 in value
+	param		ny		Float32 in value
+	param		nz		Float32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+TexCoord2fColor4fNormal3fVertex3fvSUN(tc, c, n, v)
+	return		void
+	param		tc		Float32 in array [2]
+	param		c		Float32 in array [4]
+	param		n		Float32 in array [3]
+	param		v		Float32 in array [3]
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+TexCoord4fColor4fNormal3fVertex4fSUN(s, t, p, q, r, g, b, a, nx, ny, nz, x, y, z, w)
+	return		void
+	param		s		Float32 in value
+	param		t		Float32 in value
+	param		p		Float32 in value
+	param		q		Float32 in value
+	param		r		Float32 in value
+	param		g		Float32 in value
+	param		b		Float32 in value
+	param		a		Float32 in value
+	param		nx		Float32 in value
+	param		ny		Float32 in value
+	param		nz		Float32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	param		w		Float32 in value
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+TexCoord4fColor4fNormal3fVertex4fvSUN(tc, c, n, v)
+	return		void
+	param		tc		Float32 in array [4]
+	param		c		Float32 in array [4]
+	param		n		Float32 in array [3]
+	param		v		Float32 in array [4]
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+ReplacementCodeuiVertex3fSUN(rc, x, y, z)
+	return		void
+	param		rc		ReplacementCodeSUN in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+ReplacementCodeuiVertex3fvSUN(rc, v)
+	return		void
+	param		rc		ReplacementCodeSUN in array [1]
+	param		v		Float32 in array [3]
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+ReplacementCodeuiColor4ubVertex3fSUN(rc, r, g, b, a, x, y, z)
+	return		void
+	param		rc		ReplacementCodeSUN in value
+	param		r		UInt8 in value
+	param		g		UInt8 in value
+	param		b		UInt8 in value
+	param		a		UInt8 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+ReplacementCodeuiColor4ubVertex3fvSUN(rc, c, v)
+	return		void
+	param		rc		ReplacementCodeSUN in array [1]
+	param		c		UInt8 in array [4]
+	param		v		Float32 in array [3]
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+ReplacementCodeuiColor3fVertex3fSUN(rc, r, g, b, x, y, z)
+	return		void
+	param		rc		ReplacementCodeSUN in value
+	param		r		Float32 in value
+	param		g		Float32 in value
+	param		b		Float32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+ReplacementCodeuiColor3fVertex3fvSUN(rc, c, v)
+	return		void
+	param		rc		ReplacementCodeSUN in array [1]
+	param		c		Float32 in array [3]
+	param		v		Float32 in array [3]
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+ReplacementCodeuiNormal3fVertex3fSUN(rc, nx, ny, nz, x, y, z)
+	return		void
+	param		rc		ReplacementCodeSUN in value
+	param		nx		Float32 in value
+	param		ny		Float32 in value
+	param		nz		Float32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+ReplacementCodeuiNormal3fVertex3fvSUN(rc, n, v)
+	return		void
+	param		rc		ReplacementCodeSUN in array [1]
+	param		n		Float32 in array [3]
+	param		v		Float32 in array [3]
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+ReplacementCodeuiColor4fNormal3fVertex3fSUN(rc, r, g, b, a, nx, ny, nz, x, y, z)
+	return		void
+	param		rc		ReplacementCodeSUN in value
+	param		r		Float32 in value
+	param		g		Float32 in value
+	param		b		Float32 in value
+	param		a		Float32 in value
+	param		nx		Float32 in value
+	param		ny		Float32 in value
+	param		nz		Float32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+ReplacementCodeuiColor4fNormal3fVertex3fvSUN(rc, c, n, v)
+	return		void
+	param		rc		ReplacementCodeSUN in array [1]
+	param		c		Float32 in array [4]
+	param		n		Float32 in array [3]
+	param		v		Float32 in array [3]
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+ReplacementCodeuiTexCoord2fVertex3fSUN(rc, s, t, x, y, z)
+	return		void
+	param		rc		ReplacementCodeSUN in value
+	param		s		Float32 in value
+	param		t		Float32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+ReplacementCodeuiTexCoord2fVertex3fvSUN(rc, tc, v)
+	return		void
+	param		rc		ReplacementCodeSUN in array [1]
+	param		tc		Float32 in array [2]
+	param		v		Float32 in array [3]
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN(rc, s, t, nx, ny, nz, x, y, z)
+	return		void
+	param		rc		ReplacementCodeSUN in value
+	param		s		Float32 in value
+	param		t		Float32 in value
+	param		nx		Float32 in value
+	param		ny		Float32 in value
+	param		nz		Float32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN(rc, tc, n, v)
+	return		void
+	param		rc		ReplacementCodeSUN in array [1]
+	param		tc		Float32 in array [2]
+	param		n		Float32 in array [3]
+	param		v		Float32 in array [3]
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN(rc, s, t, r, g, b, a, nx, ny, nz, x, y, z)
+	return		void
+	param		rc		ReplacementCodeSUN in value
+	param		s		Float32 in value
+	param		t		Float32 in value
+	param		r		Float32 in value
+	param		g		Float32 in value
+	param		b		Float32 in value
+	param		a		Float32 in value
+	param		nx		Float32 in value
+	param		ny		Float32 in value
+	param		nz		Float32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN(rc, tc, c, n, v)
+	return		void
+	param		rc		ReplacementCodeSUN in array [1]
+	param		tc		Float32 in array [2]
+	param		c		Float32 in array [4]
+	param		n		Float32 in array [3]
+	param		v		Float32 in array [3]
+	category	SUN_vertex
+	version		1.1
+	glxropcode	?
+	offset		?
+
+###############################################################################
+#
+# Extension #167 - WGL_EXT_display_color_table
+# Extension #168 - WGL_EXT_extensions_string
+# Extension #169 - WGL_EXT_make_current_read
+# Extension #170 - WGL_EXT_pixel_format
+# Extension #171 - WGL_EXT_pbuffer
+# Extension #172 - WGL_EXT_swap_control
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #173
+# EXT_blend_func_separate commands (also INGR_blend_func_separate)
+#
+###############################################################################
+
+BlendFuncSeparateEXT(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha)
+	return		void
+	param		sfactorRGB	BlendFuncSeparateParameterEXT in value
+	param		dfactorRGB	BlendFuncSeparateParameterEXT in value
+	param		sfactorAlpha	BlendFuncSeparateParameterEXT in value
+	param		dfactorAlpha	BlendFuncSeparateParameterEXT in value
+	category	EXT_blend_func_separate
+	glxropcode	4134
+	version		1.0
+	extension
+	alias		BlendFuncSeparate
+
+BlendFuncSeparateINGR(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha)
+	return		void
+	param		sfactorRGB	BlendFuncSeparateParameterEXT in value
+	param		dfactorRGB	BlendFuncSeparateParameterEXT in value
+	param		sfactorAlpha	BlendFuncSeparateParameterEXT in value
+	param		dfactorAlpha	BlendFuncSeparateParameterEXT in value
+	category	INGR_blend_func_separate
+	glxropcode	4134
+	version		1.0
+	extension
+	alias		BlendFuncSeparateEXT
+
+###############################################################################
+#
+# Extension #174
+# INGR_color_clamp commands
+#
+###############################################################################
+
+# (none)
+newcategory: INGR_color_clamp
+
+###############################################################################
+#
+# Extension #175
+# INGR_interlace_read commands
+#
+###############################################################################
+
+# (none)
+newcategory: INGR_interlace_read
+
+###############################################################################
+#
+# Extension #176
+# EXT_stencil_wrap commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_stencil_wrap
+
+###############################################################################
+#
+# Extension #177 - skipped
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #178
+# EXT_422_pixels commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_422_pixels
+
+###############################################################################
+#
+# Extension #179
+# NV_texgen_reflection commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_texgen_reflection
+
+###############################################################################
+#
+# Extension #???
+# @   EXT_texture_cube_map commands
+#
+###############################################################################
+
+# (none)
+
+###############################################################################
+#
+# Extension #180 - skipped
+# Extension #181 - skipped
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #182
+# SUN_convolution_border_modes commands
+#
+###############################################################################
+
+# (none)
+newcategory: SUN_convolution_border_modes
+
+###############################################################################
+#
+# Extension #183 - GLX_SUN_get_transparent_index
+# Extension #184 - skipped
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #185
+# EXT_texture_env_add commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_texture_env_add
+
+###############################################################################
+#
+# Extension #186
+# EXT_texture_lod_bias commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_texture_lod_bias
+
+###############################################################################
+#
+# Extension #187
+# EXT_texture_filter_anisotropic commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_texture_filter_anisotropic
+
+###############################################################################
+#
+# Extension #188
+# EXT_vertex_weighting commands
+#
+###############################################################################
+
+# GLX stuff to be written
+VertexWeightfEXT(weight)
+	return		void
+	param		weight		Float32 in value
+	category	EXT_vertex_weighting
+	vectorequiv	VertexWeightfvEXT
+	version		1.1
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		494
+
+VertexWeightfvEXT(weight)
+	return		void
+	param		weight		Float32 in array [1]
+	category	EXT_vertex_weighting
+	version		1.1
+	extension	soft WINSOFT NV10
+	glxropcode	4135
+	glxflags	ignore
+	offset		495
+
+VertexWeightPointerEXT(size, type, stride, pointer)
+	return		void
+	param		size		Int32 in value
+	param		type		VertexWeightPointerTypeEXT in value
+	param		stride		SizeI in value
+	param		pointer		Void in array [COMPSIZE(type/stride)] retained
+	category	EXT_vertex_weighting
+	version		1.1
+	extension	soft WINSOFT NV10
+	dlflags		notlistable
+	glxflags	ignore
+	offset		496
+
+###############################################################################
+#
+# Extension #189
+# NV_light_max_exponent commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_light_max_exponent
+
+###############################################################################
+#
+# Extension #190
+# NV_vertex_array_range commands
+#
+###############################################################################
+
+FlushVertexArrayRangeNV()
+	return		void
+	category	NV_vertex_array_range
+	version		1.1
+	extension	soft WINSOFT NV10
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode ignore
+	offset		497
+
+VertexArrayRangeNV(length, pointer)
+	return		void
+	param		length		SizeI in value
+	param		pointer		Void in array [COMPSIZE(length)] retained
+	category	NV_vertex_array_range
+	version		1.1
+	extension	soft WINSOFT NV10
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode ignore
+	offset		498
+
+###############################################################################
+#
+# Extension #191
+# NV_register_combiners commands
+#
+###############################################################################
+
+CombinerParameterfvNV(pname, params)
+	return		void
+	param		pname		CombinerParameterNV in value
+	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
+	category	NV_register_combiners
+	version		1.1
+	extension	soft WINSOFT NV10
+	glxropcode	4137
+	glxflags	ignore
+	offset		499
+
+CombinerParameterfNV(pname, param)
+	return		void
+	param		pname		CombinerParameterNV in value
+	param		param		Float32 in value
+	category	NV_register_combiners
+	version		1.1
+	extension	soft WINSOFT NV10
+	glxropcode	4136
+	glxflags	ignore
+	offset		500
+
+CombinerParameterivNV(pname, params)
+	return		void
+	param		pname		CombinerParameterNV in value
+	param		params		CheckedInt32 in array [COMPSIZE(pname)]
+	category	NV_register_combiners
+	version		1.1
+	extension	soft WINSOFT NV10
+	glxropcode	4139
+	glxflags	ignore
+	offset		501
+
+CombinerParameteriNV(pname, param)
+	return		void
+	param		pname		CombinerParameterNV in value
+	param		param		Int32 in value
+	category	NV_register_combiners
+	version		1.1
+	extension	soft WINSOFT NV10
+	glxropcode	4138
+	glxflags	ignore
+	offset		502
+
+CombinerInputNV(stage, portion, variable, input, mapping, componentUsage)
+	return		void
+	param		stage		CombinerStageNV in value
+	param		portion		CombinerPortionNV in value
+	param		variable	CombinerVariableNV in value
+	param		input		CombinerRegisterNV in value
+	param		mapping		CombinerMappingNV in value
+	param		componentUsage	CombinerComponentUsageNV in value
+	category	NV_register_combiners
+	version		1.1
+	extension	soft WINSOFT NV10
+	glxropcode	4140
+	glxflags	ignore
+	offset		503
+
+CombinerOutputNV(stage, portion, abOutput, cdOutput, sumOutput, scale, bias, abDotProduct, cdDotProduct, muxSum)
+	return		void
+	param		stage		CombinerStageNV in value
+	param		portion		CombinerPortionNV in value
+	param		abOutput	CombinerRegisterNV in value
+	param		cdOutput	CombinerRegisterNV in value
+	param		sumOutput	CombinerRegisterNV in value
+	param		scale		CombinerScaleNV in value
+	param		bias		CombinerBiasNV in value
+	param		abDotProduct	Boolean in value
+	param		cdDotProduct	Boolean in value
+	param		muxSum		Boolean in value
+	category	NV_register_combiners
+	version		1.1
+	extension	soft WINSOFT NV10
+	glxropcode	4141
+	glxflags	ignore
+	offset		504
+
+FinalCombinerInputNV(variable, input, mapping, componentUsage)
+	return		void
+	param		variable	CombinerVariableNV in value
+	param		input		CombinerRegisterNV in value
+	param		mapping		CombinerMappingNV in value
+	param		componentUsage	CombinerComponentUsageNV in value
+	category	NV_register_combiners
+	version		1.1
+	extension	soft WINSOFT NV10
+	glxropcode	4142
+	glxflags	ignore
+	offset		505
+
+GetCombinerInputParameterfvNV(stage, portion, variable, pname, params)
+	return		void
+	param		stage		CombinerStageNV in value
+	param		portion		CombinerPortionNV in value
+	param		variable	CombinerVariableNV in value
+	param		pname		CombinerParameterNV in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	dlflags		notlistable
+	category	NV_register_combiners
+	version		1.1
+	extension	soft WINSOFT NV10
+	glxvendorpriv	1270
+	glxflags	ignore
+	offset		506
+
+GetCombinerInputParameterivNV(stage, portion, variable, pname, params)
+	return		void
+	param		stage		CombinerStageNV in value
+	param		portion		CombinerPortionNV in value
+	param		variable	CombinerVariableNV in value
+	param		pname		CombinerParameterNV in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	dlflags		notlistable
+	category	NV_register_combiners
+	version		1.1
+	extension	soft WINSOFT NV10
+	glxvendorpriv	1271
+	glxflags	ignore
+	offset		507
+
+GetCombinerOutputParameterfvNV(stage, portion, pname, params)
+	return		void
+	param		stage		CombinerStageNV in value
+	param		portion		CombinerPortionNV in value
+	param		pname		CombinerParameterNV in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	dlflags		notlistable
+	category	NV_register_combiners
+	version		1.1
+	extension	soft WINSOFT NV10
+	glxvendorpriv	1272
+	glxflags	ignore
+	offset		508
+
+GetCombinerOutputParameterivNV(stage, portion, pname, params)
+	return		void
+	param		stage		CombinerStageNV in value
+	param		portion		CombinerPortionNV in value
+	param		pname		CombinerParameterNV in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	dlflags		notlistable
+	category	NV_register_combiners
+	version		1.1
+	extension	soft WINSOFT NV10
+	glxvendorpriv	1273
+	glxflags	ignore
+	offset		509
+
+GetFinalCombinerInputParameterfvNV(variable, pname, params)
+	return		void
+	param		variable	CombinerVariableNV in value
+	param		pname		CombinerParameterNV in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	dlflags		notlistable
+	category	NV_register_combiners
+	version		1.1
+	extension	soft WINSOFT NV10
+	glxvendorpriv	1274
+	glxflags	ignore
+	offset		510
+
+GetFinalCombinerInputParameterivNV(variable, pname, params)
+	return		void
+	param		variable	CombinerVariableNV in value
+	param		pname		CombinerParameterNV in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	dlflags		notlistable
+	category	NV_register_combiners
+	version		1.1
+	extension	soft WINSOFT NV10
+	glxvendorpriv	1275
+	glxflags	ignore
+	offset		511
+
+###############################################################################
+#
+# Extension #192
+# NV_fog_distance commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_fog_distance
+
+###############################################################################
+#
+# Extension #193
+# NV_texgen_emboss commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_texgen_emboss
+
+###############################################################################
+#
+# Extension #194
+# NV_blend_square commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_blend_square
+
+###############################################################################
+#
+# Extension #195
+# NV_texture_env_combine4 commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_texture_env_combine4
+
+###############################################################################
+#
+# Extension #196
+# MESA_resize_buffers commands
+#
+###############################################################################
+
+ResizeBuffersMESA()
+	return		void
+	category	MESA_resize_buffers
+	version		1.0
+	glxropcode	?
+	offset		512
+
+###############################################################################
+#
+# Extension #197
+# MESA_window_pos commands
+#
+# Note that the 2- and 3-component versions are now aliases of ARB
+# entry points.
+#
+###############################################################################
+
+WindowPos2dMESA(x, y)
+	return		void
+	param		x		CoordD in value
+	param		y		CoordD in value
+	category	MESA_window_pos
+	vectorequiv	WindowPos2dvMESA
+	version		1.0
+	alias		WindowPos2dARB
+
+WindowPos2dvMESA(v)
+	return		void
+	param		v		CoordD in array [2]
+	category	MESA_window_pos
+	version		1.0
+	glxropcode	?
+	alias		WindowPos2dvARB
+
+WindowPos2fMESA(x, y)
+	return		void
+	param		x		CoordF in value
+	param		y		CoordF in value
+	category	MESA_window_pos
+	vectorequiv	WindowPos2fvMESA
+	version		1.0
+	alias		WindowPos2fARB
+
+WindowPos2fvMESA(v)
+	return		void
+	param		v		CoordF in array [2]
+	category	MESA_window_pos
+	version		1.0
+	glxropcode	?
+	alias		WindowPos2fvARB
+
+WindowPos2iMESA(x, y)
+	return		void
+	param		x		CoordI in value
+	param		y		CoordI in value
+	category	MESA_window_pos
+	vectorequiv	WindowPos2ivMESA
+	version		1.0
+	alias		WindowPos2iARB
+
+WindowPos2ivMESA(v)
+	return		void
+	param		v		CoordI in array [2]
+	category	MESA_window_pos
+	version		1.0
+	glxropcode	?
+	alias		WindowPos2ivARB
+
+WindowPos2sMESA(x, y)
+	return		void
+	param		x		CoordS in value
+	param		y		CoordS in value
+	category	MESA_window_pos
+	vectorequiv	WindowPos2svMESA
+	version		1.0
+	alias		WindowPos2sARB
+
+WindowPos2svMESA(v)
+	return		void
+	param		v		CoordS in array [2]
+	category	MESA_window_pos
+	version		1.0
+	glxropcode	?
+	alias		WindowPos2svARB
+
+WindowPos3dMESA(x, y, z)
+	return		void
+	param		x		CoordD in value
+	param		y		CoordD in value
+	param		z		CoordD in value
+	vectorequiv	WindowPos3dvMESA
+	category	MESA_window_pos
+	version		1.0
+	alias		WindowPos3dARB
+
+WindowPos3dvMESA(v)
+	return		void
+	param		v		CoordD in array [3]
+	category	MESA_window_pos
+	version		1.0
+	glxropcode	?
+	alias		WindowPos3dvARB
+
+WindowPos3fMESA(x, y, z)
+	return		void
+	param		x		CoordF in value
+	param		y		CoordF in value
+	param		z		CoordF in value
+	category	MESA_window_pos
+	vectorequiv	WindowPos3fvMESA
+	version		1.0
+	alias		WindowPos3fARB
+
+WindowPos3fvMESA(v)
+	return		void
+	param		v		CoordF in array [3]
+	category	MESA_window_pos
+	version		1.0
+	glxropcode	?
+	alias		WindowPos3fvARB
+
+WindowPos3iMESA(x, y, z)
+	return		void
+	param		x		CoordI in value
+	param		y		CoordI in value
+	param		z		CoordI in value
+	category	MESA_window_pos
+	vectorequiv	WindowPos3ivMESA
+	version		1.0
+	alias		WindowPos3iARB
+
+WindowPos3ivMESA(v)
+	return		void
+	param		v		CoordI in array [3]
+	category	MESA_window_pos
+	version		1.0
+	glxropcode	?
+	alias		WindowPos3ivARB
+
+WindowPos3sMESA(x, y, z)
+	return		void
+	param		x		CoordS in value
+	param		y		CoordS in value
+	param		z		CoordS in value
+	category	MESA_window_pos
+	vectorequiv	WindowPos3svMESA
+	version		1.0
+	alias		WindowPos3sARB
+
+WindowPos3svMESA(v)
+	return		void
+	param		v		CoordS in array [3]
+	category	MESA_window_pos
+	version		1.0
+	glxropcode	?
+	alias		WindowPos3svARB
+
+WindowPos4dMESA(x, y, z, w)
+	return		void
+	param		x		CoordD in value
+	param		y		CoordD in value
+	param		z		CoordD in value
+	param		w		CoordD in value
+	vectorequiv	WindowPos4dvMESA
+	category	MESA_window_pos
+	version		1.0
+	offset		529
+
+WindowPos4dvMESA(v)
+	return		void
+	param		v		CoordD in array [4]
+	category	MESA_window_pos
+	version		1.0
+	glxropcode	?
+	offset		530
+
+WindowPos4fMESA(x, y, z, w)
+	return		void
+	param		x		CoordF in value
+	param		y		CoordF in value
+	param		z		CoordF in value
+	param		w		CoordF in value
+	category	MESA_window_pos
+	vectorequiv	WindowPos4fvMESA
+	version		1.0
+	offset		531
+
+WindowPos4fvMESA(v)
+	return		void
+	param		v		CoordF in array [4]
+	category	MESA_window_pos
+	version		1.0
+	glxropcode	?
+	offset		532
+
+WindowPos4iMESA(x, y, z, w)
+	return		void
+	param		x		CoordI in value
+	param		y		CoordI in value
+	param		z		CoordI in value
+	param		w		CoordI in value
+	category	MESA_window_pos
+	vectorequiv	WindowPos4ivMESA
+	version		1.0
+	offset		533
+
+WindowPos4ivMESA(v)
+	return		void
+	param		v		CoordI in array [4]
+	category	MESA_window_pos
+	version		1.0
+	glxropcode	?
+	offset		534
+
+WindowPos4sMESA(x, y, z, w)
+	return		void
+	param		x		CoordS in value
+	param		y		CoordS in value
+	param		z		CoordS in value
+	param		w		CoordS in value
+	category	MESA_window_pos
+	vectorequiv	WindowPos4svMESA
+	version		1.0
+	offset		535
+
+WindowPos4svMESA(v)
+	return		void
+	param		v		CoordS in array [4]
+	category	MESA_window_pos
+	version		1.0
+	glxropcode	?
+	offset		536
+
+###############################################################################
+#
+# Extension #198
+# EXT_texture_compression_s3tc commands
+#
+###############################################################################
+
+#@@ (none yet)
+
+###############################################################################
+#
+# Extension #199
+# IBM_cull_vertex commands
+#
+###############################################################################
+
+# (none)
+newcategory: IBM_cull_vertex
+
+###############################################################################
+#
+# Extension #200
+# IBM_multimode_draw_arrays commands
+#
+###############################################################################
+
+MultiModeDrawArraysIBM(mode, first, count, primcount, modestride)
+	return		void
+	param		mode		BeginMode in array [COMPSIZE(primcount)]
+	param		first		Int32 in array [COMPSIZE(primcount)]
+	param		count		SizeI in array [COMPSIZE(primcount)]
+	param		primcount	SizeI in value
+	param		modestride	Int32 in value
+	category	IBM_multimode_draw_arrays
+	version		1.1
+	glxropcode	?
+	offset		708
+
+
+MultiModeDrawElementsIBM(mode, count, type, indices, primcount, modestride)
+	return		void
+	param		mode		BeginMode in array [COMPSIZE(primcount)]
+	param		count		SizeI in array [COMPSIZE(primcount)]
+	param		type		DrawElementsType in value
+	param		indices		ConstVoidPointer in array [COMPSIZE(primcount)]
+	param		primcount	SizeI in value
+	param		modestride	Int32 in value
+	category	IBM_multimode_draw_arrays
+	version		1.1
+	glxropcode	?
+	offset		709
+
+###############################################################################
+#
+# Extension #201
+# IBM_vertex_array_lists commands
+#
+###############################################################################
+
+ColorPointerListIBM(size, type, stride, pointer, ptrstride)
+	return		void
+	param		size		Int32 in value
+	param		type		ColorPointerType in value
+	param		stride		Int32 in value
+	param		pointer		VoidPointer in array [COMPSIZE(size/type/stride)] retained
+	param		ptrstride	Int32 in value
+	category	IBM_vertex_array_lists
+	version		1.1
+	glxropcode	?
+	offset		?
+
+SecondaryColorPointerListIBM(size, type, stride, pointer, ptrstride)
+	return		void
+	param		size		Int32 in value
+	param		type		SecondaryColorPointerTypeIBM in value
+	param		stride		Int32 in value
+	param		pointer		VoidPointer in array [COMPSIZE(size/type/stride)] retained
+	param		ptrstride	Int32 in value
+	category	IBM_vertex_array_lists
+	version		1.1
+	glxropcode	?
+	offset		?
+
+EdgeFlagPointerListIBM(stride, pointer, ptrstride)
+	return		void
+	param		stride		Int32 in value
+	param		pointer		BooleanPointer in array [COMPSIZE(stride)] retained
+	param		ptrstride	Int32 in value
+	category	IBM_vertex_array_lists
+	version		1.1
+	glxropcode	?
+	offset		?
+
+FogCoordPointerListIBM(type, stride, pointer, ptrstride)
+	return		void
+	param		type		FogPointerTypeIBM in value
+	param		stride		Int32 in value
+	param		pointer		VoidPointer in array [COMPSIZE(type/stride)] retained
+	param		ptrstride	Int32 in value
+	category	IBM_vertex_array_lists
+	version		1.1
+	glxropcode	?
+	offset		?
+
+IndexPointerListIBM(type, stride, pointer, ptrstride)
+	return		void
+	param		type		IndexPointerType in value
+	param		stride		Int32 in value
+	param		pointer		VoidPointer in array [COMPSIZE(type/stride)] retained
+	param		ptrstride	Int32 in value
+	category	IBM_vertex_array_lists
+	version		1.1
+	glxropcode	?
+	offset		?
+
+NormalPointerListIBM(type, stride, pointer, ptrstride)
+	return		void
+	param		type		NormalPointerType in value
+	param		stride		Int32 in value
+	param		pointer		VoidPointer in array [COMPSIZE(type/stride)] retained
+	param		ptrstride	Int32 in value
+	category	IBM_vertex_array_lists
+	version		1.1
+	glxropcode	?
+	offset		?
+
+TexCoordPointerListIBM(size, type, stride, pointer, ptrstride)
+	return		void
+	param		size		Int32 in value
+	param		type		TexCoordPointerType in value
+	param		stride		Int32 in value
+	param		pointer		VoidPointer in array [COMPSIZE(size/type/stride)] retained
+	param		ptrstride	Int32 in value
+	category	IBM_vertex_array_lists
+	version		1.1
+	glxropcode	?
+	offset		?
+
+VertexPointerListIBM(size, type, stride, pointer, ptrstride)
+	return		void
+	param		size		Int32 in value
+	param		type		VertexPointerType in value
+	param		stride		Int32 in value
+	param		pointer		VoidPointer in array [COMPSIZE(size/type/stride)] retained
+	param		ptrstride	Int32 in value
+	category	IBM_vertex_array_lists
+	version		1.1
+	glxropcode	?
+	offset		?
+
+###############################################################################
+#
+# Extension #202
+# SGIX_subsample commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_subsample
+
+###############################################################################
+#
+# Extension #203
+# SGIX_ycrcba commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_ycrcba
+
+###############################################################################
+#
+# Extension #204
+# SGIX_ycrcb_subsample commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_ycrcb_subsample
+
+###############################################################################
+#
+# Extension #205
+# SGIX_depth_pass_instrument commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_depth_pass_instrument
+
+###############################################################################
+#
+# Extension #206
+# 3DFX_texture_compression_FXT1 commands
+#
+###############################################################################
+
+# (none)
+newcategory: 3DFX_texture_compression_FXT1
+
+###############################################################################
+#
+# Extension #207
+# 3DFX_multisample commands
+#
+###############################################################################
+
+# (none)
+newcategory: 3DFX_multisample
+
+###############################################################################
+#
+# Extension #208
+# 3DFX_tbuffer commands
+#
+###############################################################################
+
+TbufferMask3DFX(mask)
+	return		void
+	param		mask		UInt32 in value
+	category	3DFX_tbuffer
+	version		1.2
+	glxropcode	?
+	offset		553
+
+###############################################################################
+#
+# Extension #209
+# EXT_multisample commands
+#
+###############################################################################
+
+SampleMaskEXT(value, invert)
+	return		void
+	param		value		ClampedFloat32 in value
+	param		invert		Boolean in value
+	category	EXT_multisample
+	version		1.0
+	glxropcode	?
+	extension
+	offset		446
+
+SamplePatternEXT(pattern)
+	return		void
+	param		pattern		SamplePatternEXT in value
+	category	EXT_multisample
+	version		1.0
+	glxropcode	?
+	glxflags
+	extension
+	offset		447
+
+###############################################################################
+#
+# Extension #210
+# SGIX_vertex_preclip commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_vertex_preclip
+
+###############################################################################
+#
+# Extension #211
+# SGIX_convolution_accuracy commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_convolution_accuracy
+
+###############################################################################
+#
+# Extension #212
+# SGIX_resample commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_resample
+
+###############################################################################
+#
+# Extension #213
+# SGIS_point_line_texgen commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIS_point_line_texgen
+
+###############################################################################
+#
+# Extension #214
+# SGIS_texture_color_mask commands
+#
+###############################################################################
+
+TextureColorMaskSGIS(red, green, blue, alpha)
+	return		void
+	param		red		Boolean in value
+	param		green		Boolean in value
+	param		blue		Boolean in value
+	param		alpha		Boolean in value
+	category	SGIS_texture_color_mask
+	version		1.1
+	glxropcode	2082
+	extension
+	offset		?
+
+###############################################################################
+#
+# Extension #215 - GLX_MESA_copy_sub_buffer
+# Extension #216 - GLX_MESA_pixmap_colormap
+# Extension #217 - GLX_MESA_release_buffers
+# Extension #218 - GLX_MESA_set_3dfx_mode
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #219
+# SGIX_igloo_interface commands
+#
+###############################################################################
+
+IglooInterfaceSGIX(pname, params)
+	return		void
+	dlflags		notlistable
+	param		pname		IglooFunctionSelectSGIX in value
+	param		params		IglooParameterSGIX in array [COMPSIZE(pname)]
+	category	SGIX_igloo_interface
+	version		1.0
+	glxflags	SGI ignore
+	extension
+	glxropcode	200
+	offset		?
+
+###############################################################################
+#
+# Extension #220
+# EXT_texture_env_dot3 commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_texture_env_dot3
+
+###############################################################################
+#
+# Extension #221
+# ATI_texture_mirror_once commands
+#
+###############################################################################
+# (none)
+newcategory: ATI_texture_mirror_once
+
+###############################################################################
+#
+# Extension #222
+# NV_fence commands
+#
+###############################################################################
+
+DeleteFencesNV(n, fences)
+	return		void
+	param		n		SizeI in value
+	param		fences		FenceNV in array [n]
+	category	NV_fence
+	dlflags		notlistable
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxvendorpriv	1276
+	glxflags	ignore
+	offset		647
+
+GenFencesNV(n, fences)
+	return		void
+	param		n		SizeI in value
+	param		fences		FenceNV out array [n]
+	category	NV_fence
+	dlflags		notlistable
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxvendorpriv	1277
+	glxflags	ignore
+	offset		648
+
+IsFenceNV(fence)
+	return		Boolean
+	param		fence		FenceNV in value
+	category	NV_fence
+	dlflags		notlistable
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxvendorpriv	1278
+	glxflags	ignore
+	offset		649
+
+TestFenceNV(fence)
+	return		Boolean
+	param		fence		FenceNV in value
+	category	NV_fence
+	dlflags		notlistable
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxvendorpriv	1279
+	glxflags	ignore
+	offset		650
+
+GetFenceivNV(fence, pname, params)
+	return		void
+	param		fence		FenceNV in value
+	param		pname		FenceParameterNameNV in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	NV_fence
+	dlflags		notlistable
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxvendorpriv	1280
+	glxflags	ignore
+	offset		651
+
+FinishFenceNV(fence)
+	return		void
+	param		fence		FenceNV in value
+	category	NV_fence
+	dlflags		notlistable
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxvendorpriv	1312
+	glxflags	ignore
+	offset		652
+
+SetFenceNV(fence, condition)
+	return		void
+	param		fence		FenceNV in value
+	param		condition	FenceConditionNV in value
+	category	NV_fence
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		653
+
+###############################################################################
+#
+# Extension #225
+# NV_evaluators commands
+#
+###############################################################################
+
+MapControlPointsNV(target, index, type, ustride, vstride, uorder, vorder, packed, points)
+	return		void
+	param		target		EvalTargetNV in value
+	param		index		UInt32 in value
+	param		type		MapTypeNV in value
+	param		ustride		SizeI in value
+	param		vstride		SizeI in value
+	param		uorder		CheckedInt32 in value
+	param		vorder		CheckedInt32 in value
+	param		packed		Boolean in value
+	param		points		Void in array [COMPSIZE(target/uorder/vorder)]
+	category	NV_evaluators
+	dlflags		handcode
+	version		1.1
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		?
+
+MapParameterivNV(target, pname, params)
+	return		void
+	param		target		EvalTargetNV in value
+	param		pname		MapParameterNV in value
+	param		params		CheckedInt32 in array [COMPSIZE(target/pname)]
+	category	NV_evaluators
+	version		1.1
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		?
+
+MapParameterfvNV(target, pname, params)
+	return		void
+	param		target		EvalTargetNV in value
+	param		pname		MapParameterNV in value
+	param		params		CheckedFloat32 in array [COMPSIZE(target/pname)]
+	category	NV_evaluators
+	version		1.1
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		?
+
+GetMapControlPointsNV(target, index, type, ustride, vstride, packed, points)
+	return		void
+	param		target		EvalTargetNV in value
+	param		index		UInt32 in value
+	param		type		MapTypeNV in value
+	param		ustride		SizeI in value
+	param		vstride		SizeI in value
+	param		packed		Boolean in value
+	param		points		Void out array [COMPSIZE(target)]
+	category	NV_evaluators
+	dlflags		notlistable
+	version		1.1
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		?
+
+GetMapParameterivNV(target, pname, params)
+	return		void
+	param		target		EvalTargetNV in value
+	param		pname		MapParameterNV in value
+	param		params		Int32 out array [COMPSIZE(target/pname)]
+	category	NV_evaluators
+	dlflags		notlistable
+	version		1.1
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		?
+
+GetMapParameterfvNV(target, pname, params)
+	return		void
+	param		target		EvalTargetNV in value
+	param		pname		MapParameterNV in value
+	param		params		Float32 out array [COMPSIZE(target/pname)]
+	category	NV_evaluators
+	dlflags		notlistable
+	version		1.1
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		?
+
+GetMapAttribParameterivNV(target, index, pname, params)
+	return		void
+	param		target		EvalTargetNV in value
+	param		index		UInt32 in value
+	param		pname		MapAttribParameterNV in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	NV_evaluators
+	dlflags		notlistable
+	version		1.1
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		?
+
+GetMapAttribParameterfvNV(target, index, pname, params)
+	return		void
+	param		target		EvalTargetNV in value
+	param		index		UInt32 in value
+	param		pname		MapAttribParameterNV in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	NV_evaluators
+	dlflags		notlistable
+	version		1.1
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		?
+
+EvalMapsNV(target, mode)
+	return		void
+	param		target		EvalTargetNV in value
+	param		mode		EvalMapsModeNV in value
+	category	NV_evaluators
+	version		1.1
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #226
+# NV_packed_depth_stencil commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_packed_depth_stencil
+
+###############################################################################
+#
+# Extension #227
+# NV_register_combiners2 commands
+#
+###############################################################################
+
+CombinerStageParameterfvNV(stage, pname, params)
+	return		void
+	param		stage		CombinerStageNV in value
+	param		pname		CombinerParameterNV in value
+	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
+	category	NV_register_combiners2
+	version		1.1
+	extension
+	glxflags	ignore
+	offset		?
+
+GetCombinerStageParameterfvNV(stage, pname, params)
+	return		void
+	param		stage		CombinerStageNV in value
+	param		pname		CombinerParameterNV in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	dlflags		notlistable
+	category	NV_register_combiners2
+	version		1.1
+	extension
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #228
+# NV_texture_compression_vtc commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_texture_compression_vtc
+
+###############################################################################
+#
+# Extension #229
+# NV_texture_rectangle commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_texture_rectangle
+
+###############################################################################
+#
+# Extension #230
+# NV_texture_shader commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_texture_shader
+
+###############################################################################
+#
+# Extension #231
+# NV_texture_shader2 commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_texture_shader2
+
+###############################################################################
+#
+# Extension #232
+# NV_vertex_array_range2 commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_vertex_array_range2
+
+###############################################################################
+#
+# Extension #233
+# NV_vertex_program commands
+#
+###############################################################################
+
+AreProgramsResidentNV(n, programs, residences)
+	return		Boolean
+	param		n		SizeI in value
+	param		programs	UInt32 in array [n]
+	param		residences	Boolean out array [n]
+	category	NV_vertex_program
+	dlflags		notlistable
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	glxvendorpriv	1293
+	offset		578
+
+BindProgramNV(target, id)
+	return		void
+	param		target		VertexAttribEnumNV in value
+	param		id		UInt32 in value
+	category	NV_vertex_program
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4180
+	alias		BindProgramARB
+
+DeleteProgramsNV(n, programs)
+	return		void
+	param		n		SizeI in value
+	param		programs	UInt32 in array [n]
+	category	NV_vertex_program
+	dlflags		notlistable
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxvendorpriv	1294
+	alias		DeleteProgramsARB
+
+ExecuteProgramNV(target, id, params)
+	return		void
+	param		target		VertexAttribEnumNV in value
+	param		id		UInt32 in value
+	param		params		Float32 in array [4]
+	category	NV_vertex_program
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	glxropcode	4181
+	offset		581
+
+GenProgramsNV(n, programs)
+	return		void
+	param		n		SizeI in value
+	param		programs	UInt32 out array [n]
+	category	NV_vertex_program
+	dlflags		notlistable
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxvendorpriv	1295
+	alias		GenProgramsARB
+
+GetProgramParameterdvNV(target, index, pname, params)
+	return		void
+	param		target		VertexAttribEnumNV in value
+	param		index		UInt32 in value
+	param		pname		VertexAttribEnumNV in value
+	param		params		Float64 out array [4]
+	category	NV_vertex_program
+	dlflags		notlistable
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	glxvendorpriv	1297
+	offset		583
+
+GetProgramParameterfvNV(target, index, pname, params)
+	return		void
+	param		target		VertexAttribEnumNV in value
+	param		index		UInt32 in value
+	param		pname		VertexAttribEnumNV in value
+	param		params		Float32 out array [4]
+	category	NV_vertex_program
+	dlflags		notlistable
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	glxvendorpriv	1296
+	offset		584
+
+# GetProgramParameterSigneddvNV(target, index, pname, params)
+#	  return	  void
+#	  param		  target	  VertexAttribEnumNV in value
+#	  param		  index		  Int32 in value
+#	  param		  pname		  VertexAttribEnumNV in value
+#	  param		  params	  Float64 out array [4]
+#	  category	  NV_vertex_program1_1_dcc
+#	  dlflags	  notlistable
+#	  version	  1.2
+#	  extension	  soft WINSOFT NV20
+#	  glxflags	  ignore
+#	  offset	  ?
+#
+# GetProgramParameterSignedfvNV(target, index, pname, params)
+#	  return	  void
+#	  param		  target	  VertexAttribEnumNV in value
+#	  param		  index		  Int32 in value
+#	  param		  pname		  VertexAttribEnumNV in value
+#	  param		  params	  Float32 out array [4]
+#	  category	  NV_vertex_program1_1_dcc
+#	  dlflags	  notlistable
+#	  version	  1.2
+#	  extension	  soft WINSOFT NV20
+#	  glxflags	  ignore
+#	  offset	  ?
+
+GetProgramivNV(id, pname, params)
+	return		void
+	param		id		UInt32 in value
+	param		pname		VertexAttribEnumNV in value
+	param		params		Int32 out array [4]
+	category	NV_vertex_program
+	dlflags		notlistable
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	glxvendorpriv	1298
+	offset		585
+
+GetProgramStringNV(id, pname, program)
+	return		void
+	param		id		UInt32 in value
+	param		pname		VertexAttribEnumNV in value
+	param		program		ProgramCharacterNV out array [COMPSIZE(id/pname)]
+	category	NV_vertex_program
+	dlflags		notlistable
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	glxvendorpriv	1299
+	offset		586
+
+GetTrackMatrixivNV(target, address, pname, params)
+	return		void
+	param		target		VertexAttribEnumNV in value
+	param		address		UInt32 in value
+	param		pname		VertexAttribEnumNV in value
+	param		params		Int32 out array [1]
+	category	NV_vertex_program
+	dlflags		notlistable
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	glxvendorpriv	1300
+	offset		587
+
+GetVertexAttribdvNV(index, pname, params)
+	return		void
+	param		index		UInt32 in value
+	param		pname		VertexAttribEnumNV in value
+	param		params		Float64 out array [1]
+	category	NV_vertex_program
+	dlflags		notlistable
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxvendorpriv	1301
+	alias		GetVertexAttribdv
+
+GetVertexAttribfvNV(index, pname, params)
+	return		void
+	param		index		UInt32 in value
+	param		pname		VertexAttribEnumNV in value
+	param		params		Float32 out array [1]
+	category	NV_vertex_program
+	dlflags		notlistable
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxvendorpriv	1302
+	alias		GetVertexAttribfv
+
+GetVertexAttribivNV(index, pname, params)
+	return		void
+	param		index		UInt32 in value
+	param		pname		VertexAttribEnumNV in value
+	param		params		Int32 out array [1]
+	category	NV_vertex_program
+	dlflags		notlistable
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxvendorpriv	1303
+	alias		GetVertexAttribiv
+
+GetVertexAttribPointervNV(index, pname, pointer)
+	return		void
+	param		index		UInt32 in value
+	param		pname		VertexAttribEnumNV in value
+	param		pointer		VoidPointer out array [1]
+	category	NV_vertex_program
+	dlflags		notlistable
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	alias		GetVertexAttribPointerv
+
+IsProgramNV(id)
+	return		Boolean
+	param		id		UInt32 in value
+	category	NV_vertex_program
+	dlflags		notlistable
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxvendorpriv	1304
+	alias		IsProgram
+
+LoadProgramNV(target, id, len, program)
+	return		void
+	param		target		VertexAttribEnumNV in value
+	param		id		UInt32 in value
+	param		len		SizeI in value
+	param		program		UInt8 in array [len]
+	category	NV_vertex_program
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4183
+	offset		593
+
+ProgramParameter4dNV(target, index, x, y, z, w)
+	return		void
+	param		target		VertexAttribEnumNV in value
+	param		index		UInt32 in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	param		z		Float64 in value
+	param		w		Float64 in value
+	category	NV_vertex_program
+	version		1.2
+	vectorequiv	ProgramParameter4dvNV
+	extension	soft WINSOFT NV10
+	offset		594
+
+ProgramParameter4dvNV(target, index, v)
+	return		void
+	param		target		VertexAttribEnumNV in value
+	param		index		UInt32 in value
+	param		v		Float64 in array [4]
+	category	NV_vertex_program
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4185
+	offset		595
+
+ProgramParameter4fNV(target, index, x, y, z, w)
+	return		void
+	param		target		VertexAttribEnumNV in value
+	param		index		UInt32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	param		w		Float32 in value
+	category	NV_vertex_program
+	version		1.2
+	vectorequiv	ProgramParameter4fvNV
+	extension	soft WINSOFT NV10
+	offset		596
+
+ProgramParameter4fvNV(target, index, v)
+	return		void
+	param		target		VertexAttribEnumNV in value
+	param		index		UInt32 in value
+	param		v		Float32 in array [4]
+	category	NV_vertex_program
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4184
+	offset		597
+
+ProgramParameters4dvNV(target, index, count, v)
+	return		void
+	param		target		VertexAttribEnumNV in value
+	param		index		UInt32 in value
+	param		count		SizeI in value
+	param		v		Float64 in array [count*4]
+	category	NV_vertex_program
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4187
+	offset		598
+
+ProgramParameters4fvNV(target, index, count, v)
+	return		void
+	param		target		VertexAttribEnumNV in value
+	param		index		UInt32 in value
+	param		count		SizeI in value
+	param		v		Float32 in array [count*4]
+	category	NV_vertex_program
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4186
+	offset		599
+
+# ProgramParameterSigned4dNV(target, index, x, y, z, w)
+#	  return	  void
+#	  param		  target	  VertexAttribEnumNV in value
+#	  param		  index		  Int32 in value
+#	  param		  x		  Float64 in value
+#	  param		  y		  Float64 in value
+#	  param		  z		  Float64 in value
+#	  param		  w		  Float64 in value
+#	  category	  NV_vertex_program1_1_dcc
+#	  version	  1.2
+#	  vectorequiv	  ProgramParameterSigned4dvNV
+#	  extension	  soft WINSOFT NV20
+#	  offset	  ?
+#
+# ProgramParameterSigned4dvNV(target, index, v)
+#	  return	  void
+#	  param		  target	  VertexAttribEnumNV in value
+#	  param		  index		  Int32 in value
+#	  param		  v		  Float64 in array [4]
+#	  category	  NV_vertex_program1_1_dcc
+#	  version	  1.2
+#	  extension	  soft WINSOFT NV20
+#	  glxflags	  ignore
+#	  offset	  ?
+#
+# ProgramParameterSigned4fNV(target, index, x, y, z, w)
+#	  return	  void
+#	  param		  target	  VertexAttribEnumNV in value
+#	  param		  index		  Int32 in value
+#	  param		  x		  Float32 in value
+#	  param		  y		  Float32 in value
+#	  param		  z		  Float32 in value
+#	  param		  w		  Float32 in value
+#	  category	  NV_vertex_program1_1_dcc
+#	  version	  1.2
+#	  vectorequiv	  ProgramParameterSigned4fvNV
+#	  extension	  soft WINSOFT NV20
+#	  offset	  ?
+#
+# ProgramParameterSigned4fvNV(target, index, v)
+#	  return	  void
+#	  param		  target	  VertexAttribEnumNV in value
+#	  param		  index		  Int32 in value
+#	  param		  v		  Float32 in array [4]
+#	  category	  NV_vertex_program1_1_dcc
+#	  version	  1.2
+#	  extension	  soft WINSOFT NV20
+#	  glxflags	  ignore
+#	  offset	  ?
+#
+# ProgramParametersSigned4dvNV(target, index, count, v)
+#	  return	  void
+#	  param		  target	  VertexAttribEnumNV in value
+#	  param		  index		  Int32 in value
+#	  param		  count		  SizeI in value
+#	  param		  v		  Float64 in array [count*4]
+#	  category	  NV_vertex_program1_1_dcc
+#	  version	  1.2
+#	  extension	  soft WINSOFT NV20
+#	  glxflags	  ignore
+#	  offset	  ?
+#
+# ProgramParametersSigned4fvNV(target, index, count, v)
+#	  return	  void
+#	  param		  target	  VertexAttribEnumNV in value
+#	  param		  index		  Int32 in value
+#	  param		  count		  SizeI in value
+#	  param		  v		  Float32 in array [count*4]
+#	  category	  NV_vertex_program1_1_dcc
+#	  version	  1.2
+#	  extension	  soft WINSOFT NV20
+#	  glxflags	  ignore
+#	  offset	  ?
+
+RequestResidentProgramsNV(n, programs)
+	return		void
+	param		n		SizeI in value
+	param		programs	UInt32 in array [n]
+	category	NV_vertex_program
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4182
+	offset		600
+
+TrackMatrixNV(target, address, matrix, transform)
+	return		void
+	param		target		VertexAttribEnumNV in value
+	param		address		UInt32 in value
+	param		matrix		VertexAttribEnumNV in value
+	param		transform	VertexAttribEnumNV in value
+	category	NV_vertex_program
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4188
+	offset		601
+
+VertexAttribPointerNV(index, fsize, type, stride, pointer)
+	return		void
+	param		index		UInt32 in value
+	param		fsize		Int32 in value
+	param		type		VertexAttribEnumNV in value
+	param		stride		SizeI in value
+	param		pointer		Void in array [COMPSIZE(fsize/type/stride)] retained
+	category	NV_vertex_program
+	dlflags		notlistable
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxflags	ignore
+	offset		602
+
+VertexAttrib1dNV(index, x)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float64 in value
+	category	NV_vertex_program
+	version		1.2
+	vectorequiv	VertexAttrib1dvNV
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib1d
+
+VertexAttrib1dvNV(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float64 in array [1]
+	category	NV_vertex_program
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4197
+	alias		VertexAttrib1dv
+
+VertexAttrib1fNV(index, x)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float32 in value
+	category	NV_vertex_program
+	version		1.2
+	vectorequiv	VertexAttrib1fvNV
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib1f
+
+VertexAttrib1fvNV(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float32 in array [1]
+	category	NV_vertex_program
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4193
+	alias		VertexAttrib1fv
+
+VertexAttrib1sNV(index, x)
+	return		void
+	param		index		UInt32 in value
+	param		x		Int16 in value
+	category	NV_vertex_program
+	version		1.2
+	vectorequiv	VertexAttrib1svNV
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib1s
+
+VertexAttrib1svNV(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int16 in array [1]
+	category	NV_vertex_program
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4189
+	alias		VertexAttrib1sv
+
+VertexAttrib2dNV(index, x, y)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	category	NV_vertex_program
+	version		1.2
+	vectorequiv	VertexAttrib2dvNV
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib2d
+
+VertexAttrib2dvNV(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float64 in array [2]
+	category	NV_vertex_program
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4198
+	alias		VertexAttrib2dv
+
+VertexAttrib2fNV(index, x, y)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	category	NV_vertex_program
+	version		1.2
+	vectorequiv	VertexAttrib2fvNV
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib2f
+
+VertexAttrib2fvNV(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float32 in array [2]
+	category	NV_vertex_program
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4194
+	alias		VertexAttrib2fv
+
+VertexAttrib2sNV(index, x, y)
+	return		void
+	param		index		UInt32 in value
+	param		x		Int16 in value
+	param		y		Int16 in value
+	category	NV_vertex_program
+	version		1.2
+	vectorequiv	VertexAttrib2svNV
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib2s
+
+VertexAttrib2svNV(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int16 in array [2]
+	category	NV_vertex_program
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4190
+	alias		VertexAttrib2sv
+
+VertexAttrib3dNV(index, x, y, z)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	param		z		Float64 in value
+	category	NV_vertex_program
+	version		1.2
+	vectorequiv	VertexAttrib3dvNV
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib3d
+
+VertexAttrib3dvNV(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float64 in array [3]
+	category	NV_vertex_program
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4199
+	alias		VertexAttrib3dv
+
+VertexAttrib3fNV(index, x, y, z)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	category	NV_vertex_program
+	version		1.2
+	vectorequiv	VertexAttrib3fvNV
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib3f
+
+VertexAttrib3fvNV(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float32 in array [3]
+	category	NV_vertex_program
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4195
+	alias		VertexAttrib3fv
+
+VertexAttrib3sNV(index, x, y, z)
+	return		void
+	param		index		UInt32 in value
+	param		x		Int16 in value
+	param		y		Int16 in value
+	param		z		Int16 in value
+	category	NV_vertex_program
+	version		1.2
+	vectorequiv	VertexAttrib3svNV
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib3s
+
+VertexAttrib3svNV(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int16 in array [3]
+	category	NV_vertex_program
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4191
+	alias		VertexAttrib3sv
+
+VertexAttrib4dNV(index, x, y, z, w)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	param		z		Float64 in value
+	param		w		Float64 in value
+	category	NV_vertex_program
+	version		1.2
+	vectorequiv	VertexAttrib4dvNV
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib4d
+
+VertexAttrib4dvNV(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float64 in array [4]
+	category	NV_vertex_program
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4200
+	alias		VertexAttrib4dv
+
+VertexAttrib4fNV(index, x, y, z, w)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	param		w		Float32 in value
+	category	NV_vertex_program
+	version		1.2
+	vectorequiv	VertexAttrib4fvNV
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib4f
+
+VertexAttrib4fvNV(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float32 in array [4]
+	category	NV_vertex_program
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4196
+	alias		VertexAttrib4fv
+
+VertexAttrib4sNV(index, x, y, z, w)
+	return		void
+	param		index		UInt32 in value
+	param		x		Int16 in value
+	param		y		Int16 in value
+	param		z		Int16 in value
+	param		w		Int16 in value
+	category	NV_vertex_program
+	version		1.2
+	vectorequiv	VertexAttrib4svNV
+	extension	soft WINSOFT NV10
+	alias		VertexAttrib4s
+
+VertexAttrib4svNV(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int16 in array [4]
+	category	NV_vertex_program
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4192
+	alias		VertexAttrib4sv
+
+VertexAttrib4ubNV(index, x, y, z, w)
+	return		void
+	param		index		UInt32 in value
+	param		x		ColorUB in value
+	param		y		ColorUB in value
+	param		z		ColorUB in value
+	param		w		ColorUB in value
+	category	NV_vertex_program
+	version		1.2
+	extension	soft WINSOFT NV10
+	vectorequiv	VertexAttrib4ubvNV
+	alias		VertexAttrib4Nub
+
+VertexAttrib4ubvNV(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		ColorUB in array [4]
+	category	NV_vertex_program
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4201
+	alias		VertexAttrib4Nubv
+
+VertexAttribs1dvNV(index, count, v)
+	return		void
+	param		index		UInt32 in value
+	param		count		SizeI in value
+	param		v		Float64 in array [count]
+	category	NV_vertex_program
+	dlflags		handcode
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4210
+	offset		629
+
+VertexAttribs1fvNV(index, count, v)
+	return		void
+	param		index		UInt32 in value
+	param		count		SizeI in value
+	param		v		Float32 in array [count]
+	category	NV_vertex_program
+	dlflags		handcode
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4206
+	offset		630
+
+VertexAttribs1svNV(index, count, v)
+	return		void
+	param		index		UInt32 in value
+	param		count		SizeI in value
+	param		v		Int16 in array [count]
+	category	NV_vertex_program
+	dlflags		handcode
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4202
+	offset		631
+
+VertexAttribs2dvNV(index, count, v)
+	return		void
+	param		index		UInt32 in value
+	param		count		SizeI in value
+	param		v		Float64 in array [count*2]
+	category	NV_vertex_program
+	dlflags		handcode
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4211
+	offset		632
+
+VertexAttribs2fvNV(index, count, v)
+	return		void
+	param		index		UInt32 in value
+	param		count		SizeI in value
+	param		v		Float32 in array [count*2]
+	category	NV_vertex_program
+	dlflags		handcode
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4207
+	offset		633
+
+VertexAttribs2svNV(index, count, v)
+	return		void
+	param		index		UInt32 in value
+	param		count		SizeI in value
+	param		v		Int16 in array [count*2]
+	category	NV_vertex_program
+	dlflags		handcode
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4203
+	offset		634
+
+VertexAttribs3dvNV(index, count, v)
+	return		void
+	param		index		UInt32 in value
+	param		count		SizeI in value
+	param		v		Float64 in array [count*3]
+	category	NV_vertex_program
+	dlflags		handcode
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4212
+	offset		635
+
+VertexAttribs3fvNV(index, count, v)
+	return		void
+	param		index		UInt32 in value
+	param		count		SizeI in value
+	param		v		Float32 in array [count*3]
+	category	NV_vertex_program
+	dlflags		handcode
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4208
+	offset		636
+
+VertexAttribs3svNV(index, count, v)
+	return		void
+	param		index		UInt32 in value
+	param		count		SizeI in value
+	param		v		Int16 in array [count*3]
+	category	NV_vertex_program
+	dlflags		handcode
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4204
+	offset		637
+
+VertexAttribs4dvNV(index, count, v)
+	return		void
+	param		index		UInt32 in value
+	param		count		SizeI in value
+	param		v		Float64 in array [count*4]
+	category	NV_vertex_program
+	dlflags		handcode
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4213
+	offset		638
+
+VertexAttribs4fvNV(index, count, v)
+	return		void
+	param		index		UInt32 in value
+	param		count		SizeI in value
+	param		v		Float32 in array [count*4]
+	category	NV_vertex_program
+	dlflags		handcode
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4209
+	offset		639
+
+VertexAttribs4svNV(index, count, v)
+	return		void
+	param		index		UInt32 in value
+	param		count		SizeI in value
+	param		v		Int16 in array [count*4]
+	category	NV_vertex_program
+	dlflags		handcode
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4205
+	offset		640
+
+VertexAttribs4ubvNV(index, count, v)
+	return		void
+	param		index		UInt32 in value
+	param		count		SizeI in value
+	param		v		ColorUB in array [count*4]
+	category	NV_vertex_program
+	dlflags		handcode
+	version		1.2
+	extension	soft WINSOFT NV10
+	glxropcode	4214
+	offset		641
+
+
+###############################################################################
+#
+# Extension #234 - GLX_SGIX_visual_select_group
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #235
+# SGIX_texture_coordinate_clamp commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_texture_coordinate_clamp
+
+###############################################################################
+#
+# Extension #236
+# SGIX_scalebias_hint commands
+#
+###############################################################################
+
+# (none)
+newcategory: SGIX_scalebias_hint
+
+###############################################################################
+#
+# Extension #237 - GLX_OML_swap_method commands
+# Extension #238 - GLX_OML_sync_control commands
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #239
+# OML_interlace commands
+#
+###############################################################################
+
+# (none)
+newcategory: OML_interlace
+
+###############################################################################
+#
+# Extension #240
+# OML_subsample commands
+#
+###############################################################################
+
+# (none)
+newcategory: OML_subsample
+
+###############################################################################
+#
+# Extension #241
+# OML_resample commands
+#
+###############################################################################
+
+# (none)
+newcategory: OML_resample
+
+###############################################################################
+#
+# Extension #242 - WGL_OML_sync_control commands
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #243
+# NV_copy_depth_to_color commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_copy_depth_to_color
+
+###############################################################################
+#
+# Extension #244
+# ATI_envmap_bumpmap commands
+#
+###############################################################################
+
+TexBumpParameterivATI(pname, param)
+	return		void
+	param		pname		TexBumpParameterATI in value
+	param		param		Int32 in array [COMPSIZE(pname)]
+	category	ATI_envmap_bumpmap
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TexBumpParameterfvATI(pname, param)
+	return		void
+	param		pname		TexBumpParameterATI in value
+	param		param		Float32 in array [COMPSIZE(pname)]
+	category	ATI_envmap_bumpmap
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetTexBumpParameterivATI(pname, param)
+	return		void
+	param		pname		GetTexBumpParameterATI in value
+	param		param		Int32 out array [COMPSIZE(pname)]
+	category	ATI_envmap_bumpmap
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetTexBumpParameterfvATI(pname, param)
+	return		void
+	param		pname		GetTexBumpParameterATI in value
+	param		param		Float32 out array [COMPSIZE(pname)]
+	category	ATI_envmap_bumpmap
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #245
+# ATI_fragment_shader commands
+#
+###############################################################################
+
+GenFragmentShadersATI(range)
+	return		UInt32
+	param		range		UInt32 in value
+	category	ATI_fragment_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+BindFragmentShaderATI(id)
+	return		void
+	param		id		UInt32 in value
+	category	ATI_fragment_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DeleteFragmentShaderATI(id)
+	return		void
+	param		id		UInt32 in value
+	category	ATI_fragment_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+BeginFragmentShaderATI()
+	return		void
+	category	ATI_fragment_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+EndFragmentShaderATI()
+	return		void
+	category	ATI_fragment_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+PassTexCoordATI(dst, coord, swizzle)
+	return		void
+	param		dst		UInt32 in value
+	param		coord		UInt32 in value
+	param		swizzle		SwizzleOpATI in value
+	category	ATI_fragment_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+SampleMapATI(dst, interp, swizzle)
+	return		void
+	param		dst		UInt32 in value
+	param		interp		UInt32 in value
+	param		swizzle		SwizzleOpATI in value
+	category	ATI_fragment_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ColorFragmentOp1ATI(op, dst, dstMask, dstMod, arg1, arg1Rep, arg1Mod)
+	return		void
+	param		op		FragmentOpATI in value
+	param		dst		UInt32 in value
+	param		dstMask		UInt32 in value
+	param		dstMod		UInt32 in value
+	param		arg1		UInt32 in value
+	param		arg1Rep		UInt32 in value
+	param		arg1Mod		UInt32 in value
+	category	ATI_fragment_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ColorFragmentOp2ATI(op, dst, dstMask, dstMod, arg1, arg1Rep, arg1Mod, arg2, arg2Rep, arg2Mod)
+	return		void
+	param		op		FragmentOpATI in value
+	param		dst		UInt32 in value
+	param		dstMask		UInt32 in value
+	param		dstMod		UInt32 in value
+	param		arg1		UInt32 in value
+	param		arg1Rep		UInt32 in value
+	param		arg1Mod		UInt32 in value
+	param		arg2		UInt32 in value
+	param		arg2Rep		UInt32 in value
+	param		arg2Mod		UInt32 in value
+	category	ATI_fragment_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ColorFragmentOp3ATI(op, dst, dstMask, dstMod, arg1, arg1Rep, arg1Mod, arg2, arg2Rep, arg2Mod, arg3, arg3Rep, arg3Mod)
+	return		void
+	param		op		FragmentOpATI in value
+	param		dst		UInt32 in value
+	param		dstMask		UInt32 in value
+	param		dstMod		UInt32 in value
+	param		arg1		UInt32 in value
+	param		arg1Rep		UInt32 in value
+	param		arg1Mod		UInt32 in value
+	param		arg2		UInt32 in value
+	param		arg2Rep		UInt32 in value
+	param		arg2Mod		UInt32 in value
+	param		arg3		UInt32 in value
+	param		arg3Rep		UInt32 in value
+	param		arg3Mod		UInt32 in value
+	category	ATI_fragment_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+AlphaFragmentOp1ATI(op, dst, dstMod, arg1, arg1Rep, arg1Mod)
+	return		void
+	param		op		FragmentOpATI in value
+	param		dst		UInt32 in value
+	param		dstMod		UInt32 in value
+	param		arg1		UInt32 in value
+	param		arg1Rep		UInt32 in value
+	param		arg1Mod		UInt32 in value
+	category	ATI_fragment_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+AlphaFragmentOp2ATI(op, dst, dstMod, arg1, arg1Rep, arg1Mod, arg2, arg2Rep, arg2Mod)
+	return		void
+	param		op		FragmentOpATI in value
+	param		dst		UInt32 in value
+	param		dstMod		UInt32 in value
+	param		arg1		UInt32 in value
+	param		arg1Rep		UInt32 in value
+	param		arg1Mod		UInt32 in value
+	param		arg2		UInt32 in value
+	param		arg2Rep		UInt32 in value
+	param		arg2Mod		UInt32 in value
+	category	ATI_fragment_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+AlphaFragmentOp3ATI(op, dst, dstMod, arg1, arg1Rep, arg1Mod, arg2, arg2Rep, arg2Mod, arg3, arg3Rep, arg3Mod)
+	return		void
+	param		op		FragmentOpATI in value
+	param		dst		UInt32 in value
+	param		dstMod		UInt32 in value
+	param		arg1		UInt32 in value
+	param		arg1Rep		UInt32 in value
+	param		arg1Mod		UInt32 in value
+	param		arg2		UInt32 in value
+	param		arg2Rep		UInt32 in value
+	param		arg2Mod		UInt32 in value
+	param		arg3		UInt32 in value
+	param		arg3Rep		UInt32 in value
+	param		arg3Mod		UInt32 in value
+	category	ATI_fragment_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+SetFragmentShaderConstantATI(dst, value)
+	return		void
+	param		dst		UInt32 in value
+	param		value		ConstFloat32 in array [4]
+	category	ATI_fragment_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #246
+# ATI_pn_triangles commands
+#
+###############################################################################
+
+PNTrianglesiATI(pname, param)
+	return		void
+	param		pname		PNTrianglesPNameATI in value
+	param		param		Int32 in value
+	category	ATI_pn_triangles
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+PNTrianglesfATI(pname, param)
+	return		void
+	param		pname		PNTrianglesPNameATI in value
+	param		param		Float32 in value
+	category	ATI_pn_triangles
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #247
+# ATI_vertex_array_object commands
+#
+###############################################################################
+
+NewObjectBufferATI(size, pointer, usage)
+	return		UInt32
+	param		size		SizeI in value
+	param		pointer		ConstVoid in array [size]
+	param		usage		ArrayObjectUsageATI in value
+	category	ATI_vertex_array_object
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+IsObjectBufferATI(buffer)
+	return		Boolean
+	param		buffer		UInt32 in value
+	category	ATI_vertex_array_object
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+UpdateObjectBufferATI(buffer, offset, size, pointer, preserve)
+	return		void
+	param		buffer		UInt32 in value
+	param		offset		UInt32 in value
+	param		size		SizeI in value
+	param		pointer		ConstVoid in array [size]
+	param		preserve	PreserveModeATI in value
+	category	ATI_vertex_array_object
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetObjectBufferfvATI(buffer, pname, params)
+	return		void
+	param		buffer		UInt32 in value
+	param		pname		ArrayObjectPNameATI in value
+	param		params		Float32 out array [1]
+	category	ATI_vertex_array_object
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetObjectBufferivATI(buffer, pname, params)
+	return		void
+	param		buffer		UInt32 in value
+	param		pname		ArrayObjectPNameATI in value
+	param		params		Int32 out array [1]
+	category	ATI_vertex_array_object
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+FreeObjectBufferATI(buffer)
+	return		void
+	param		buffer		UInt32 in value
+	category	ATI_vertex_array_object
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ArrayObjectATI(array, size, type, stride, buffer, offset)
+	return		void
+	param		array		EnableCap in value
+	param		size		Int32 in value
+	param		type		ScalarType in value
+	param		stride		SizeI in value
+	param		buffer		UInt32 in value
+	param		offset		UInt32 in value
+	category	ATI_vertex_array_object
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetArrayObjectfvATI(array, pname, params)
+	return		void
+	param		array		EnableCap in value
+	param		pname		ArrayObjectPNameATI in value
+	param		params		Float32 out array [1]
+	category	ATI_vertex_array_object
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetArrayObjectivATI(array, pname, params)
+	return		void
+	param		array		EnableCap in value
+	param		pname		ArrayObjectPNameATI in value
+	param		params		Int32 out array [1]
+	category	ATI_vertex_array_object
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+VariantArrayObjectATI(id, type, stride, buffer, offset)
+	return		void
+	param		id		UInt32 in value
+	param		type		ScalarType in value
+	param		stride		SizeI in value
+	param		buffer		UInt32 in value
+	param		offset		UInt32 in value
+	category	ATI_vertex_array_object
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetVariantArrayObjectfvATI(id, pname, params)
+	return		void
+	param		id		UInt32 in value
+	param		pname		ArrayObjectPNameATI in value
+	param		params		Float32 out array [1]
+	category	ATI_vertex_array_object
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetVariantArrayObjectivATI(id, pname, params)
+	return		void
+	param		id		UInt32 in value
+	param		pname		ArrayObjectPNameATI in value
+	param		params		Int32 out array [1]
+	category	ATI_vertex_array_object
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #248
+# EXT_vertex_shader commands
+#
+###############################################################################
+
+BeginVertexShaderEXT()
+	return		void
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+EndVertexShaderEXT()
+	return		void
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+BindVertexShaderEXT(id)
+	return		void
+	param		id		UInt32 in value
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GenVertexShadersEXT(range)
+	return		UInt32
+	param		range		UInt32 in value
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DeleteVertexShaderEXT(id)
+	return		void
+	param		id		UInt32 in value
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ShaderOp1EXT(op, res, arg1)
+	return		void
+	param		op		VertexShaderOpEXT in value
+	param		res		UInt32 in value
+	param		arg1		UInt32 in value
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ShaderOp2EXT(op, res, arg1, arg2)
+	return		void
+	param		op		VertexShaderOpEXT in value
+	param		res		UInt32 in value
+	param		arg1		UInt32 in value
+	param		arg2		UInt32 in value
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ShaderOp3EXT(op, res, arg1, arg2, arg3)
+	return		void
+	param		op		VertexShaderOpEXT in value
+	param		res		UInt32 in value
+	param		arg1		UInt32 in value
+	param		arg2		UInt32 in value
+	param		arg3		UInt32 in value
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+SwizzleEXT(res, in, outX, outY, outZ, outW)
+	return		void
+	param		res		UInt32 in value
+	param		in		UInt32 in value
+	param		outX		VertexShaderCoordOutEXT in value
+	param		outY		VertexShaderCoordOutEXT in value
+	param		outZ		VertexShaderCoordOutEXT in value
+	param		outW		VertexShaderCoordOutEXT in value
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+WriteMaskEXT(res, in, outX, outY, outZ, outW)
+	return		void
+	param		res		UInt32 in value
+	param		in		UInt32 in value
+	param		outX		VertexShaderWriteMaskEXT in value
+	param		outY		VertexShaderWriteMaskEXT in value
+	param		outZ		VertexShaderWriteMaskEXT in value
+	param		outW		VertexShaderWriteMaskEXT in value
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+InsertComponentEXT(res, src, num)
+	return		void
+	param		res		UInt32 in value
+	param		src		UInt32 in value
+	param		num		UInt32 in value
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ExtractComponentEXT(res, src, num)
+	return		void
+	param		res		UInt32 in value
+	param		src		UInt32 in value
+	param		num		UInt32 in value
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GenSymbolsEXT(datatype, storagetype, range, components)
+	return		UInt32
+	param		datatype	DataTypeEXT in value
+	param		storagetype	VertexShaderStorageTypeEXT in value
+	param		range		ParameterRangeEXT in value
+	param		components	UInt32 in value
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+SetInvariantEXT(id, type, addr)
+	return		void
+	param		id		UInt32 in value
+	param		type		ScalarType in value
+	param		addr		Void in array [COMPSIZE(id/type)]
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+SetLocalConstantEXT(id, type, addr)
+	return		void
+	param		id		UInt32 in value
+	param		type		ScalarType in value
+	param		addr		Void in array [COMPSIZE(id/type)]
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VariantbvEXT(id, addr)
+	return		void
+	param		id		UInt32 in value
+	param		addr		Int8 in array [COMPSIZE(id)]
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VariantsvEXT(id, addr)
+	return		void
+	param		id		UInt32 in value
+	param		addr		Int16 in array [COMPSIZE(id)]
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VariantivEXT(id, addr)
+	return		void
+	param		id		UInt32 in value
+	param		addr		Int32 in array [COMPSIZE(id)]
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VariantfvEXT(id, addr)
+	return		void
+	param		id		UInt32 in value
+	param		addr		Float32 in array [COMPSIZE(id)]
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VariantdvEXT(id, addr)
+	return		void
+	param		id		UInt32 in value
+	param		addr		Float64 in array [COMPSIZE(id)]
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VariantubvEXT(id, addr)
+	return		void
+	param		id		UInt32 in value
+	param		addr		UInt8 in array [COMPSIZE(id)]
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VariantusvEXT(id, addr)
+	return		void
+	param		id		UInt32 in value
+	param		addr		UInt16 in array [COMPSIZE(id)]
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VariantuivEXT(id, addr)
+	return		void
+	param		id		UInt32 in value
+	param		addr		UInt32 in array [COMPSIZE(id)]
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VariantPointerEXT(id, type, stride, addr)
+	return		void
+	param		id		UInt32 in value
+	param		type		ScalarType in value
+	param		stride		UInt32 in value
+	param		addr		Void in array [COMPSIZE(id/type/stride)]
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+EnableVariantClientStateEXT(id)
+	return		void
+	param		id		UInt32 in value
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DisableVariantClientStateEXT(id)
+	return		void
+	param		id		UInt32 in value
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+BindLightParameterEXT(light, value)
+	return		UInt32
+	param		light		LightName in value
+	param		value		LightParameter in value
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+BindMaterialParameterEXT(face, value)
+	return		UInt32
+	param		face		MaterialFace in value
+	param		value		MaterialParameter in value
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+BindTexGenParameterEXT(unit, coord, value)
+	return		UInt32
+	param		unit		TextureUnit in value
+	param		coord		TextureCoordName in value
+	param		value		TextureGenParameter in value
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+BindTextureUnitParameterEXT(unit, value)
+	return		UInt32
+	param		unit		TextureUnit in value
+	param		value		VertexShaderTextureUnitParameter in value
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+BindParameterEXT(value)
+	return		UInt32
+	param		value		VertexShaderParameterEXT in value
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+IsVariantEnabledEXT(id, cap)
+	return		Boolean
+	param		id		UInt32 in value
+	param		cap		VariantCapEXT in value
+	category	EXT_vertex_shader
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetVariantBooleanvEXT(id, value, data)
+	return		void
+	param		id		UInt32 in value
+	param		value		GetVariantValueEXT in value
+	param		data		Boolean out array [COMPSIZE(id)]
+	category	EXT_vertex_shader
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetVariantIntegervEXT(id, value, data)
+	return		void
+	param		id		UInt32 in value
+	param		value		GetVariantValueEXT in value
+	param		data		Int32 out array [COMPSIZE(id)]
+	category	EXT_vertex_shader
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetVariantFloatvEXT(id, value, data)
+	return		void
+	param		id		UInt32 in value
+	param		value		GetVariantValueEXT in value
+	param		data		Float32 out array [COMPSIZE(id)]
+	category	EXT_vertex_shader
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetVariantPointervEXT(id, value, data)
+	return		void
+	param		id		UInt32 in value
+	param		value		GetVariantValueEXT in value
+	param		data		VoidPointer out array [COMPSIZE(id)]
+	category	EXT_vertex_shader
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetInvariantBooleanvEXT(id, value, data)
+	return		void
+	param		id		UInt32 in value
+	param		value		GetVariantValueEXT in value
+	param		data		Boolean out array [COMPSIZE(id)]
+	category	EXT_vertex_shader
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetInvariantIntegervEXT(id, value, data)
+	return		void
+	param		id		UInt32 in value
+	param		value		GetVariantValueEXT in value
+	param		data		Int32 out array [COMPSIZE(id)]
+	category	EXT_vertex_shader
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetInvariantFloatvEXT(id, value, data)
+	return		void
+	param		id		UInt32 in value
+	param		value		GetVariantValueEXT in value
+	param		data		Float32 out array [COMPSIZE(id)]
+	category	EXT_vertex_shader
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetLocalConstantBooleanvEXT(id, value, data)
+	return		void
+	param		id		UInt32 in value
+	param		value		GetVariantValueEXT in value
+	param		data		Boolean out array [COMPSIZE(id)]
+	category	EXT_vertex_shader
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetLocalConstantIntegervEXT(id, value, data)
+	return		void
+	param		id		UInt32 in value
+	param		value		GetVariantValueEXT in value
+	param		data		Int32 out array [COMPSIZE(id)]
+	category	EXT_vertex_shader
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetLocalConstantFloatvEXT(id, value, data)
+	return		void
+	param		id		UInt32 in value
+	param		value		GetVariantValueEXT in value
+	param		data		Float32 out array [COMPSIZE(id)]
+	category	EXT_vertex_shader
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #249
+# ATI_vertex_streams commands
+#
+###############################################################################
+
+VertexStream1sATI(stream, x)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		x		Int16 in value
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream1svATI(stream, coords)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		coords		Int16 in array [1]
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream1iATI(stream, x)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		x		Int32 in value
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream1ivATI(stream, coords)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		coords		Int32 in array [1]
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream1fATI(stream, x)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		x		Float32 in value
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream1fvATI(stream, coords)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		coords		Float32 in array [1]
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream1dATI(stream, x)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		x		Float64 in value
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream1dvATI(stream, coords)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		coords		Float64 in array [1]
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream2sATI(stream, x, y)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		x		Int16 in value
+	param		y		Int16 in value
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream2svATI(stream, coords)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		coords		Int16 in array [2]
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream2iATI(stream, x, y)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		x		Int32 in value
+	param		y		Int32 in value
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream2ivATI(stream, coords)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		coords		Int32 in array [2]
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream2fATI(stream, x, y)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream2fvATI(stream, coords)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		coords		Float32 in array [2]
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream2dATI(stream, x, y)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream2dvATI(stream, coords)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		coords		Float64 in array [2]
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream3sATI(stream, x, y, z)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		x		Int16 in value
+	param		y		Int16 in value
+	param		z		Int16 in value
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream3svATI(stream, coords)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		coords		Int16 in array [3]
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream3iATI(stream, x, y, z)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		x		Int32 in value
+	param		y		Int32 in value
+	param		z		Int32 in value
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream3ivATI(stream, coords)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		coords		Int32 in array [3]
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream3fATI(stream, x, y, z)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream3fvATI(stream, coords)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		coords		Float32 in array [3]
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream3dATI(stream, x, y, z)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	param		z		Float64 in value
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream3dvATI(stream, coords)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		coords		Float64 in array [3]
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream4sATI(stream, x, y, z, w)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		x		Int16 in value
+	param		y		Int16 in value
+	param		z		Int16 in value
+	param		w		Int16 in value
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream4svATI(stream, coords)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		coords		Int16 in array [4]
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream4iATI(stream, x, y, z, w)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		x		Int32 in value
+	param		y		Int32 in value
+	param		z		Int32 in value
+	param		w		Int32 in value
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream4ivATI(stream, coords)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		coords		Int32 in array [4]
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream4fATI(stream, x, y, z, w)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	param		w		Float32 in value
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream4fvATI(stream, coords)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		coords		Float32 in array [4]
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream4dATI(stream, x, y, z, w)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	param		z		Float64 in value
+	param		w		Float64 in value
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexStream4dvATI(stream, coords)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		coords		Float64 in array [4]
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+NormalStream3bATI(stream, nx, ny, nz)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		nx		Int8 in value
+	param		ny		Int8 in value
+	param		nz		Int8 in value
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+NormalStream3bvATI(stream, coords)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		coords		Int8 in array [3]
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+NormalStream3sATI(stream, nx, ny, nz)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		nx		Int16 in value
+	param		ny		Int16 in value
+	param		nz		Int16 in value
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+NormalStream3svATI(stream, coords)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		coords		Int16 in array [3]
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+NormalStream3iATI(stream, nx, ny, nz)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		nx		Int32 in value
+	param		ny		Int32 in value
+	param		nz		Int32 in value
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+NormalStream3ivATI(stream, coords)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		coords		Int32 in array [3]
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+NormalStream3fATI(stream, nx, ny, nz)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		nx		Float32 in value
+	param		ny		Float32 in value
+	param		nz		Float32 in value
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+NormalStream3fvATI(stream, coords)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		coords		Float32 in array [3]
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+NormalStream3dATI(stream, nx, ny, nz)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		nx		Float64 in value
+	param		ny		Float64 in value
+	param		nz		Float64 in value
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+NormalStream3dvATI(stream, coords)
+	return		void
+	param		stream		VertexStreamATI in value
+	param		coords		Float64 in array [3]
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ClientActiveVertexStreamATI(stream)
+	return		void
+	param		stream		VertexStreamATI in value
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexBlendEnviATI(pname, param)
+	return		void
+	param		pname		VertexStreamATI in value
+	param		param		Int32 in value
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexBlendEnvfATI(pname, param)
+	return		void
+	param		pname		VertexStreamATI in value
+	param		param		Float32 in value
+	category	ATI_vertex_streams
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #250 - WGL_I3D_digital_video_control
+# Extension #251 - WGL_I3D_gamma
+# Extension #252 - WGL_I3D_genlock
+# Extension #253 - WGL_I3D_image_buffer
+# Extension #254 - WGL_I3D_swap_frame_lock
+# Extension #255 - WGL_I3D_swap_frame_usage
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #256
+# ATI_element_array commands
+#
+###############################################################################
+
+ElementPointerATI(type, pointer)
+	return		void
+	param		type		ElementPointerTypeATI in value
+	param		pointer		Void in array [COMPSIZE(type)] retained
+	category	ATI_element_array
+	dlflags		notlistable
+	glxflags	client-handcode client-intercept server-handcode
+	version		1.2
+	offset		?
+
+DrawElementArrayATI(mode, count)
+	return		void
+	param		mode		BeginMode in value
+	param		count		SizeI in value
+	category	ATI_element_array
+	dlflags		handcode
+	glxflags	client-handcode client-intercept server-handcode
+	version		1.2
+	offset		?
+
+DrawRangeElementArrayATI(mode, start, end, count)
+	return		void
+	param		mode		BeginMode in value
+	param		start		UInt32 in value
+	param		end		UInt32 in value
+	param		count		SizeI in value
+	category	ATI_element_array
+	dlflags		handcode
+	glxflags	client-handcode client-intercept server-handcode
+	version		1.2
+	offset		?
+
+###############################################################################
+#
+# Extension #257
+# SUN_mesh_array commands
+#
+###############################################################################
+
+DrawMeshArraysSUN(mode, first, count, width)
+	return		void
+	param		mode		BeginMode in value
+	param		first		Int32 in value
+	param		count		SizeI in value
+	param		width		SizeI in value
+	category	SUN_mesh_array
+	dlflags		handcode
+	glxflags	client-handcode client-intercept server-handcode
+	version		1.1
+	glxropcode	?
+	offset		?
+
+###############################################################################
+#
+# Extension #258
+# SUN_slice_accum commands
+#
+###############################################################################
+
+# (none)
+newcategory: SUN_slice_accum
+
+###############################################################################
+#
+# Extension #259
+# NV_multisample_filter_hint commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_multisample_filter_hint
+
+###############################################################################
+#
+# Extension #260
+# NV_depth_clamp commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_depth_clamp
+
+###############################################################################
+#
+# Extension #261
+# NV_occlusion_query commands
+#
+###############################################################################
+
+GenOcclusionQueriesNV(n, ids)
+	return		void
+	param		n		SizeI in value
+	param		ids		UInt32 out array [n]
+	dlflags		notlistable
+	category	NV_occlusion_query
+	version		1.2
+	extension	soft WINSOFT NV20
+	glxflags	ignore
+
+DeleteOcclusionQueriesNV(n, ids)
+	return		void
+	param		n		SizeI in value
+	param		ids		UInt32 in array [n]
+	dlflags		notlistable
+	category	NV_occlusion_query
+	version		1.2
+	extension	soft WINSOFT NV20
+	glxflags	ignore
+
+IsOcclusionQueryNV(id)
+	return		Boolean
+	param		id		UInt32 in value
+	dlflags		notlistable
+	category	NV_occlusion_query
+	version		1.2
+	extension	soft WINSOFT NV20
+	glxflags	ignore
+
+BeginOcclusionQueryNV(id)
+	return		void
+	param		id		UInt32 in value
+	category	NV_occlusion_query
+	version		1.2
+	extension	soft WINSOFT NV20
+	glxflags	ignore
+
+EndOcclusionQueryNV()
+	return		void
+	category	NV_occlusion_query
+	version		1.2
+	extension	soft WINSOFT NV20
+	glxflags	ignore
+
+GetOcclusionQueryivNV(id, pname, params)
+	return		void
+	param		id		UInt32 in value
+	param		pname		OcclusionQueryParameterNameNV in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	dlflags		notlistable
+	category	NV_occlusion_query
+	version		1.2
+	extension	soft WINSOFT NV20
+	glxflags	ignore
+
+GetOcclusionQueryuivNV(id, pname, params)
+	return		void
+	param		id		UInt32 in value
+	param		pname		OcclusionQueryParameterNameNV in value
+	param		params		UInt32 out array [COMPSIZE(pname)]
+	dlflags		notlistable
+	category	NV_occlusion_query
+	version		1.2
+	extension	soft WINSOFT NV20
+	glxflags	ignore
+
+###############################################################################
+#
+# Extension #262
+# NV_point_sprite commands
+#
+###############################################################################
+
+PointParameteriNV(pname, param)
+	return		void
+	param		pname		PointParameterNameARB in value
+	param		param		Int32 in value
+	category	NV_point_sprite
+	version		1.2
+	extension	soft WINSOFT NV20
+	glxropcode	4221
+	alias		PointParameteri
+
+PointParameterivNV(pname, params)
+	return		void
+	param		pname		PointParameterNameARB in value
+	param		params		Int32 in array [COMPSIZE(pname)]
+	category	NV_point_sprite
+	version		1.2
+	extension	soft WINSOFT NV20
+	glxropcode	4222
+	alias		PointParameteriv
+
+###############################################################################
+#
+# Extension #263 - WGL_NV_render_depth_texture
+# Extension #264 - WGL_NV_render_texture_rectangle
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #265
+# NV_texture_shader3 commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_texture_shader3
+
+###############################################################################
+#
+# Extension #266
+# NV_vertex_program1_1 commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_vertex_program1_1
+
+###############################################################################
+#
+# Extension #267
+# EXT_shadow_funcs commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_shadow_funcs
+
+###############################################################################
+#
+# Extension #268
+# EXT_stencil_two_side commands
+#
+###############################################################################
+
+ActiveStencilFaceEXT(face)
+	return		void
+	param		face		StencilFaceDirection in value
+	category	EXT_stencil_two_side
+	version		1.3
+	glxropcode	4220
+	offset		646
+
+###############################################################################
+#
+# Extension #269
+# ATI_text_fragment_shader commands
+#
+###############################################################################
+
+# Uses ARB_vertex_program entry points
+newcategory: ATI_text_fragment_shader
+
+###############################################################################
+#
+# Extension #270
+# APPLE_client_storage commands
+#
+###############################################################################
+
+# (none)
+newcategory: APPLE_client_storage
+
+###############################################################################
+#
+# Extension #271
+# APPLE_element_array commands
+#
+###############################################################################
+
+# @@ Need to verify/add GLX protocol
+
+# @@@ like #256 ATI_element_array
+ElementPointerAPPLE(type, pointer)
+	return		void
+	param		type		ElementPointerTypeATI in value
+	param		pointer		Void in array [type]
+	category	APPLE_element_array
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DrawElementArrayAPPLE(mode, first, count)
+	return		void
+	param		mode		BeginMode in value
+	param		first		Int32 in value
+	param		count		SizeI in value
+	category	APPLE_element_array
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DrawRangeElementArrayAPPLE(mode, start, end, first, count)
+	return		void
+	param		mode		BeginMode in value
+	param		start		UInt32 in value
+	param		end		UInt32 in value
+	param		first		Int32 in value
+	param		count		SizeI in value
+	category	APPLE_element_array
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MultiDrawElementArrayAPPLE(mode, first, count, primcount)
+	return		void
+	param		mode		BeginMode in value
+	param		first		Int32 in array [primcount]
+	param		count		SizeI in array [primcount]
+	param		primcount	SizeI in value
+	category	APPLE_element_array
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MultiDrawRangeElementArrayAPPLE(mode, start, end, first, count, primcount)
+	return		void
+	param		mode		BeginMode in value
+	param		start		UInt32 in value
+	param		end		UInt32 in value
+	param		first		Int32 in array [primcount]
+	param		count		SizeI in array [primcount]
+	param		primcount	SizeI in value
+	category	APPLE_element_array
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #272
+# APPLE_fence commands
+#
+###############################################################################
+
+# @@ Need to verify/add GLX protocol
+
+# @@@ like #222 NV_fence
+GenFencesAPPLE(n, fences)
+	return		void
+	param		n		SizeI in value
+	param		fences		FenceNV out array [n]
+	category	APPLE_fence
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DeleteFencesAPPLE(n, fences)
+	return		void
+	param		n		SizeI in value
+	param		fences		FenceNV in array [n]
+	category	APPLE_fence
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+SetFenceAPPLE(fence)
+	return		void
+	param		fence		FenceNV in value
+	category	APPLE_fence
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+IsFenceAPPLE(fence)
+	return		Boolean
+	param		fence		FenceNV in value
+	category	APPLE_fence
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TestFenceAPPLE(fence)
+	return		Boolean
+	param		fence		FenceNV in value
+	category	APPLE_fence
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+FinishFenceAPPLE(fence)
+	return		void
+	param		fence		FenceNV in value
+	category	APPLE_fence
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TestObjectAPPLE(object, name)
+	return		Boolean
+	param		object		ObjectTypeAPPLE in value
+	param		name		UInt32 in value
+	category	APPLE_fence
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+FinishObjectAPPLE(object, name)
+	return		void
+	param		object		ObjectTypeAPPLE in value
+	param		name		Int32 in value
+	category	APPLE_fence
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #273
+# APPLE_vertex_array_object commands
+#
+###############################################################################
+
+BindVertexArrayAPPLE(array)
+	return		void
+	param		array		UInt32 in value
+	category	APPLE_vertex_array_object
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		BindVertexArray
+
+DeleteVertexArraysAPPLE(n, arrays)
+	return		void
+	param		n		SizeI in value
+	param		arrays		UInt32 in array [n]
+	category	APPLE_vertex_array_object
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		DeleteVertexArrays
+
+GenVertexArraysAPPLE(n, arrays)
+	return		void
+	param		n		SizeI in value
+	param		arrays		UInt32 out array [n]
+	category	APPLE_vertex_array_object
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		GenVertexArray
+
+IsVertexArrayAPPLE(array)
+	return		Boolean
+	param		array		UInt32 in value
+	category	APPLE_vertex_array_object
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		IsVertexArray
+
+###############################################################################
+#
+# Extension #274
+# APPLE_vertex_array_range commands
+#
+###############################################################################
+
+# @@ Need to verify/add GLX protocol
+
+# @@@ like #190 NV_vertex_array_range,
+VertexArrayRangeAPPLE(length, pointer)
+	return		void
+	param		length		SizeI in value
+	param		pointer		Void out array [length]
+	category	APPLE_vertex_array_range
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+FlushVertexArrayRangeAPPLE(length, pointer)
+	return		void
+	param		length		SizeI in value
+	param		pointer		Void out array [length]
+	category	APPLE_vertex_array_range
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexArrayParameteriAPPLE(pname, param)
+	return		void
+	param		pname		VertexArrayPNameAPPLE in value
+	param		param		Int32 in value
+	category	APPLE_vertex_array_range
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #275
+# APPLE_ycbcr_422 commands
+#
+###############################################################################
+
+# (none)
+newcategory: APPLE_ycbcr_422
+
+###############################################################################
+#
+# Extension #276
+# S3_s3tc commands
+#
+###############################################################################
+
+# (none)
+newcategory: S3_s3tc
+
+###############################################################################
+#
+# Extension #277
+# ATI_draw_buffers commands
+#
+###############################################################################
+
+DrawBuffersATI(n, bufs)
+	return		void
+	param		n		SizeI in value
+	param		bufs		DrawBufferModeATI in array [n]
+	category	ATI_draw_buffers
+	version		1.2
+	extension
+	glxropcode	233
+	alias		DrawBuffers
+
+###############################################################################
+#
+# Extension #278 - WGL_ATI_pixel_format_float
+#
+###############################################################################
+newcategory: ATI_pixel_format_float
+passthru: /* This is really a WGL extension, but defines some associated GL enums.
+passthru:  * ATI does not export "GL_ATI_pixel_format_float" in the GL_EXTENSIONS string.
+passthru:  */
+
+###############################################################################
+#
+# Extension #279
+# ATI_texture_env_combine3 commands
+#
+###############################################################################
+
+# (none)
+newcategory: ATI_texture_env_combine3
+
+###############################################################################
+#
+# Extension #280
+# ATI_texture_float commands
+#
+###############################################################################
+
+# (none)
+newcategory: ATI_texture_float
+
+###############################################################################
+#
+# Extension #281 (also WGL_NV_float_buffer)
+# NV_float_buffer commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_float_buffer
+
+###############################################################################
+#
+# Extension #282
+# NV_fragment_program commands
+#
+###############################################################################
+
+# @@ Need to verify/add GLX protocol
+
+# Some NV_fragment_program entry points are shared with ARB_vertex_program,
+#   and are only included in that #define block, for now.
+newcategory: NV_fragment_program
+passthru: /* Some NV_fragment_program entry points are shared with ARB_vertex_program. */
+
+ProgramNamedParameter4fNV(id, len, name, x, y, z, w)
+	return		void
+	param		id		UInt32 in value
+	param		len		SizeI in value
+	param		name		UInt8 in array [1]
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	param		w		Float32 in value
+	category	NV_fragment_program
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		682
+
+ProgramNamedParameter4dNV(id, len, name, x, y, z, w)
+	return		void
+	param		id		UInt32 in value
+	param		len		SizeI in value
+	param		name		UInt8 in array [1]
+	param		x		Float64 in value
+	param		y		Float64 in value
+	param		z		Float64 in value
+	param		w		Float64 in value
+	category	NV_fragment_program
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		683
+
+ProgramNamedParameter4fvNV(id, len, name, v)
+	return		void
+	param		id		UInt32 in value
+	param		len		SizeI in value
+	param		name		UInt8 in array [1]
+	param		v		Float32 in array [4]
+	category	NV_fragment_program
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		684
+
+ProgramNamedParameter4dvNV(id, len, name, v)
+	return		void
+	param		id		UInt32 in value
+	param		len		SizeI in value
+	param		name		UInt8 in array [1]
+	param		v		Float64 in array [4]
+	category	NV_fragment_program
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		685
+
+GetProgramNamedParameterfvNV(id, len, name, params)
+	return		void
+	param		id		UInt32 in value
+	param		len		SizeI in value
+	param		name		UInt8 in array [1]
+	param		params		Float32 out array [4]
+	category	NV_fragment_program
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		686
+
+GetProgramNamedParameterdvNV(id, len, name, params)
+	return		void
+	param		id		UInt32 in value
+	param		len		SizeI in value
+	param		name		UInt8 in array [1]
+	param		params		Float64 out array [4]
+	category	NV_fragment_program
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		687
+
+###############################################################################
+#
+# Extension #283
+# NV_half_float commands
+#
+###############################################################################
+
+# @@ Need to verify/add GLX protocol
+
+Vertex2hNV(x, y)
+	return		void
+	param		x		Half16NV in value
+	param		y		Half16NV in value
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Vertex2hvNV(v)
+	return		void
+	param		v		Half16NV in array [2]
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Vertex3hNV(x, y, z)
+	return		void
+	param		x		Half16NV in value
+	param		y		Half16NV in value
+	param		z		Half16NV in value
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Vertex3hvNV(v)
+	return		void
+	param		v		Half16NV in array [3]
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Vertex4hNV(x, y, z, w)
+	return		void
+	param		x		Half16NV in value
+	param		y		Half16NV in value
+	param		z		Half16NV in value
+	param		w		Half16NV in value
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Vertex4hvNV(v)
+	return		void
+	param		v		Half16NV in array [4]
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Normal3hNV(nx, ny, nz)
+	return		void
+	param		nx		Half16NV in value
+	param		ny		Half16NV in value
+	param		nz		Half16NV in value
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Normal3hvNV(v)
+	return		void
+	param		v		Half16NV in array [3]
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Color3hNV(red, green, blue)
+	return		void
+	param		red		Half16NV in value
+	param		green		Half16NV in value
+	param		blue		Half16NV in value
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Color3hvNV(v)
+	return		void
+	param		v		Half16NV in array [3]
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Color4hNV(red, green, blue, alpha)
+	return		void
+	param		red		Half16NV in value
+	param		green		Half16NV in value
+	param		blue		Half16NV in value
+	param		alpha		Half16NV in value
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Color4hvNV(v)
+	return		void
+	param		v		Half16NV in array [4]
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TexCoord1hNV(s)
+	return		void
+	param		s		Half16NV in value
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TexCoord1hvNV(v)
+	return		void
+	param		v		Half16NV in array [1]
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TexCoord2hNV(s, t)
+	return		void
+	param		s		Half16NV in value
+	param		t		Half16NV in value
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TexCoord2hvNV(v)
+	return		void
+	param		v		Half16NV in array [2]
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TexCoord3hNV(s, t, r)
+	return		void
+	param		s		Half16NV in value
+	param		t		Half16NV in value
+	param		r		Half16NV in value
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TexCoord3hvNV(v)
+	return		void
+	param		v		Half16NV in array [3]
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TexCoord4hNV(s, t, r, q)
+	return		void
+	param		s		Half16NV in value
+	param		t		Half16NV in value
+	param		r		Half16NV in value
+	param		q		Half16NV in value
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TexCoord4hvNV(v)
+	return		void
+	param		v		Half16NV in array [4]
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MultiTexCoord1hNV(target, s)
+	return		void
+	param		target		TextureUnit in value
+	param		s		Half16NV in value
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MultiTexCoord1hvNV(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		Half16NV in array [1]
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MultiTexCoord2hNV(target, s, t)
+	return		void
+	param		target		TextureUnit in value
+	param		s		Half16NV in value
+	param		t		Half16NV in value
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MultiTexCoord2hvNV(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		Half16NV in array [2]
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MultiTexCoord3hNV(target, s, t, r)
+	return		void
+	param		target		TextureUnit in value
+	param		s		Half16NV in value
+	param		t		Half16NV in value
+	param		r		Half16NV in value
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MultiTexCoord3hvNV(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		Half16NV in array [3]
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MultiTexCoord4hNV(target, s, t, r, q)
+	return		void
+	param		target		TextureUnit in value
+	param		s		Half16NV in value
+	param		t		Half16NV in value
+	param		r		Half16NV in value
+	param		q		Half16NV in value
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MultiTexCoord4hvNV(target, v)
+	return		void
+	param		target		TextureUnit in value
+	param		v		Half16NV in array [4]
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+FogCoordhNV(fog)
+	return		void
+	param		fog		Half16NV in value
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+FogCoordhvNV(fog)
+	return		void
+	param		fog		Half16NV in array [1]
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+SecondaryColor3hNV(red, green, blue)
+	return		void
+	param		red		Half16NV in value
+	param		green		Half16NV in value
+	param		blue		Half16NV in value
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+SecondaryColor3hvNV(v)
+	return		void
+	param		v		Half16NV in array [3]
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexWeighthNV(weight)
+	return		void
+	param		weight		Half16NV in value
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexWeighthvNV(weight)
+	return		void
+	param		weight		Half16NV in array [1]
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttrib1hNV(index, x)
+	return		void
+	param		index		UInt32 in value
+	param		x		Half16NV in value
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttrib1hvNV(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Half16NV in array [1]
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttrib2hNV(index, x, y)
+	return		void
+	param		index		UInt32 in value
+	param		x		Half16NV in value
+	param		y		Half16NV in value
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttrib2hvNV(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Half16NV in array [2]
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttrib3hNV(index, x, y, z)
+	return		void
+	param		index		UInt32 in value
+	param		x		Half16NV in value
+	param		y		Half16NV in value
+	param		z		Half16NV in value
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttrib3hvNV(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Half16NV in array [3]
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttrib4hNV(index, x, y, z, w)
+	return		void
+	param		index		UInt32 in value
+	param		x		Half16NV in value
+	param		y		Half16NV in value
+	param		z		Half16NV in value
+	param		w		Half16NV in value
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttrib4hvNV(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Half16NV in array [4]
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribs1hvNV(index, n, v)
+	return		void
+	param		index		UInt32 in value
+	param		n		SizeI in value
+	param		v		Half16NV in array [n]
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribs2hvNV(index, n, v)
+	return		void
+	param		index		UInt32 in value
+	param		n		SizeI in value
+	param		v		Half16NV in array [n]
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribs3hvNV(index, n, v)
+	return		void
+	param		index		UInt32 in value
+	param		n		SizeI in value
+	param		v		Half16NV in array [n]
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribs4hvNV(index, n, v)
+	return		void
+	param		index		UInt32 in value
+	param		n		SizeI in value
+	param		v		Half16NV in array [n]
+	category	NV_half_float
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #284
+# NV_pixel_data_range commands
+#
+###############################################################################
+
+# @@ Need to verify/add GLX protocol
+
+PixelDataRangeNV(target, length, pointer)
+	return		void
+	param		target		PixelDataRangeTargetNV in value
+	param		length		SizeI in value
+	param		pointer		Void in array [length]
+	category	NV_pixel_data_range
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+FlushPixelDataRangeNV(target)
+	return		void
+	param		target		PixelDataRangeTargetNV in value
+	category	NV_pixel_data_range
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #285
+# NV_primitive_restart commands
+#
+###############################################################################
+
+# @@ Need to verify/add GLX protocol
+
+PrimitiveRestartNV()
+	return		void
+	category	NV_primitive_restart
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+PrimitiveRestartIndexNV(index)
+	return		void
+	param		index		UInt32 in value
+	category	NV_primitive_restart
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+
+###############################################################################
+#
+# Extension #286
+# NV_texture_expand_normal commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_texture_expand_normal
+
+###############################################################################
+#
+# Extension #287
+# NV_vertex_program2 commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_vertex_program2
+
+###############################################################################
+#
+# Extension #288
+# ATI_map_object_buffer commands
+#
+###############################################################################
+
+# @@ Need to verify/add GLX protocol
+
+MapObjectBufferATI(buffer)
+	return		VoidPointer
+	param		buffer		UInt32 in value
+	category	ATI_map_object_buffer
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+UnmapObjectBufferATI(buffer)
+	return		void
+	param		buffer		UInt32 in value
+	category	ATI_map_object_buffer
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #289
+# ATI_separate_stencil commands
+#
+###############################################################################
+
+# @@ Need to verify/add GLX protocol
+
+StencilOpSeparateATI(face, sfail, dpfail, dppass)
+	return		void
+	param		face		StencilFaceDirection in value
+	param		sfail		StencilOp in value
+	param		dpfail		StencilOp in value
+	param		dppass		StencilOp in value
+	category	ATI_separate_stencil
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		StencilOpSeparate
+
+StencilFuncSeparateATI(frontfunc, backfunc, ref, mask)
+	return		void
+	param		frontfunc	StencilFunction in value
+	param		backfunc	StencilFunction in value
+	param		ref		ClampedStencilValue in value
+	param		mask		MaskedStencilValue in value
+	category	ATI_separate_stencil
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		StencilFuncSeparate
+
+###############################################################################
+#
+# Extension #290
+# ATI_vertex_attrib_array_object commands
+#
+###############################################################################
+
+# @@ Need to verify/add GLX protocol
+
+VertexAttribArrayObjectATI(index, size, type, normalized, stride, buffer, offset)
+	return		void
+	param		index		UInt32 in value
+	param		size		Int32 in value
+	param		type		VertexAttribPointerTypeARB in value
+	param		normalized	Boolean in value
+	param		stride		SizeI in value
+	param		buffer		UInt32 in value
+	param		offset		UInt32 in value
+	category	ATI_vertex_attrib_array_object
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetVertexAttribArrayObjectfvATI(index, pname, params)
+	return		void
+	param		index		UInt32 in value
+	param		pname		ArrayObjectPNameATI in value
+	param		params		Float32 out array [pname]
+	category	ATI_vertex_attrib_array_object
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetVertexAttribArrayObjectivATI(index, pname, params)
+	return		void
+	param		index		UInt32 in value
+	param		pname		ArrayObjectPNameATI in value
+	param		params		Int32 out array [pname]
+	category	ATI_vertex_attrib_array_object
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #291 - OpenGL ES only, not in glext.h
+# OES_byte_coordinates commands
+#
+###############################################################################
+
+# void Vertex{234}bOES(T coords)
+# void Vertex{234}bvOES(T *coords)
+# void TexCoord{1234}bOES(T coords)
+# void TexCoord{1234}bvOES(T *coords)
+# void MultiTexCoord{1234}bOES(enum texture, T coords)
+# void MultiTexCoord{1234}bvOES(enum texture, T *coords)
+# All are handcode - mapped to non-byte GLX protocol on client side
+
+# newcategory: OES_byte_coordinates
+
+###############################################################################
+#
+# Extension #292 - OpenGL ES only, not in glext.h
+# OES_fixed_point commands
+#
+###############################################################################
+
+# Too many to list in just a comment - see spec in the extension registry
+# All are handcode - mapped to non-byte GLX protocol on client side
+
+# newcategory: OES_fixed_point
+
+###############################################################################
+#
+# Extension #293 - OpenGL ES only, not in glext.h
+# OES_single_precision commands
+#
+###############################################################################
+
+# void DepthRangefOES(clampf n, clampf f)
+# void FrustumfOES(float l, float r, float b, float t, float n, float f)
+# void OrthofOES(float l, float r, float b, float t, float n, float f)
+# void ClipPlanefOES(enum plane, const float* equation)
+# void glClearDepthfOES(clampd depth)
+# GLX ropcodes 4308-4312 (not respectively, see extension spec)
+# void GetClipPlanefOES(enum plane, float* equation)
+# GLX vendor private 1421
+
+# newcategory: OES_single_precision
+
+###############################################################################
+#
+# Extension #294 - OpenGL ES only, not in glext.h
+# OES_compressed_paletted_texture commands
+#
+###############################################################################
+
+# (none)
+# newcategory: OES_compressed_paletted_texture
+
+###############################################################################
+#
+# Extension #295 - This is an OpenGL ES extension, but also implemented in Mesa
+# OES_read_format commands
+#
+###############################################################################
+
+# (none)
+newcategory: OES_read_format
+
+###############################################################################
+#
+# Extension #296 - OpenGL ES only, not in glext.h
+# OES_query_matrix commands
+#
+###############################################################################
+
+# bitfield queryMatrixxOES(fixed mantissa[16], int exponent[16])
+# All are handcode - mapped to non-byte GLX protocol on client side
+
+# newcategory: OES_query_matrix
+
+###############################################################################
+#
+# Extension #297
+# EXT_depth_bounds_test commands
+#
+###############################################################################
+
+DepthBoundsEXT(zmin, zmax)
+	return		void
+	param		zmin		ClampedFloat64 in value
+	param		zmax		ClampedFloat64 in value
+	category	EXT_depth_bounds_test
+	version		1.2
+	extension
+	glxropcode	4229
+	offset		699
+
+###############################################################################
+#
+# Extension #298
+# EXT_texture_mirror_clamp commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_texture_mirror_clamp
+
+###############################################################################
+#
+# Extension #299
+# EXT_blend_equation_separate commands
+#
+###############################################################################
+
+BlendEquationSeparateEXT(modeRGB, modeAlpha)
+	return		void
+	param		modeRGB		BlendEquationModeEXT in value
+	param		modeAlpha	BlendEquationModeEXT in value
+	category	EXT_blend_equation_separate
+	version		1.2
+	extension
+	glxropcode	4228
+	alias		BlendEquationSeparate
+
+###############################################################################
+#
+# Extension #300
+# MESA_pack_invert commands
+#
+###############################################################################
+
+# (none)
+newcategory: MESA_pack_invert
+
+###############################################################################
+#
+# Extension #301
+# MESA_ycbcr_texture commands
+#
+###############################################################################
+
+# (none)
+newcategory: MESA_ycbcr_texture
+
+###############################################################################
+#
+# Extension #301
+# MESA_ycbcr_texture commands
+#
+###############################################################################
+
+# (none)
+newcategory: MESA_ycbcr_texture
+
+###############################################################################
+#
+# Extension #302
+# EXT_pixel_buffer_object commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_pixel_buffer_object
+
+###############################################################################
+#
+# Extension #303
+# NV_fragment_program_option commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_fragment_program_option
+
+###############################################################################
+#
+# Extension #304
+# NV_fragment_program2 commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_fragment_program2
+
+###############################################################################
+#
+# Extension #305
+# NV_vertex_program2_option commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_vertex_program2_option
+
+###############################################################################
+#
+# Extension #306
+# NV_vertex_program3 commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_vertex_program3
+
+###############################################################################
+#
+# Extension #307 - GLX_SGIX_hyperpipe commands
+# Extension #308 - GLX_MESA_agp_offset commands
+# Extension #309 - GL_EXT_texture_compression_dxt1 (OpenGL ES only, subset of _st3c version)
+#
+###############################################################################
+
+# (none)
+# newcategory: EXT_texture_compression_dxt1
+
+###############################################################################
+#
+# Extension #310
+# EXT_framebuffer_object commands
+#
+###############################################################################
+
+IsRenderbufferEXT(renderbuffer)
+	return		Boolean
+	param		renderbuffer	UInt32 in value
+	category	EXT_framebuffer_object
+	version		1.2
+	extension
+	glxvendorpriv	1422
+	glxflags	ignore
+	alias		IsRenderbuffer
+
+# Not aliased to BindRenderbuffer
+BindRenderbufferEXT(target, renderbuffer)
+	return		void
+	param		target		RenderbufferTarget in value
+	param		renderbuffer	UInt32 in value
+	category	EXT_framebuffer_object
+	version		1.2
+	extension
+	glxropcode	4316
+	glxflags	ignore
+
+DeleteRenderbuffersEXT(n, renderbuffers)
+	return		void
+	param		n		SizeI in value
+	param		renderbuffers	UInt32 in array [n]
+	category	EXT_framebuffer_object
+	version		1.2
+	extension
+	glxropcode	4317
+	glxflags	ignore
+	alias		DeleteRenderbuffers
+
+GenRenderbuffersEXT(n, renderbuffers)
+	return		void
+	param		n		SizeI in value
+	param		renderbuffers	UInt32 out array [n]
+	category	EXT_framebuffer_object
+	version		1.2
+	extension
+	glxvendorpriv	1423
+	glxflags	ignore
+	alias		GenRenderbuffers
+
+RenderbufferStorageEXT(target, internalformat, width, height)
+	return		void
+	param		target		RenderbufferTarget in value
+	param		internalformat	GLenum in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	category	EXT_framebuffer_object
+	version		1.2
+	extension
+	glxropcode	4318
+	glxflags	ignore
+	alias		RenderbufferStorage
+
+GetRenderbufferParameterivEXT(target, pname, params)
+	return		void
+	param		target		RenderbufferTarget in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	EXT_framebuffer_object
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxvendorpriv	1424
+	glxflags	ignore
+	alias		GetRenderbufferParameteriv
+
+IsFramebufferEXT(framebuffer)
+	return		Boolean
+	param		framebuffer	UInt32 in value
+	category	EXT_framebuffer_object
+	version		1.2
+	extension
+	glxvendorpriv	1425
+	glxflags	ignore
+	alias		IsFramebuffer
+
+# Not aliased to BindFramebuffer
+BindFramebufferEXT(target, framebuffer)
+	return		void
+	param		target		FramebufferTarget in value
+	param		framebuffer	UInt32 in value
+	category	EXT_framebuffer_object
+	version		1.2
+	extension
+	glxropcode	4319
+	glxflags	ignore
+
+DeleteFramebuffersEXT(n, framebuffers)
+	return		void
+	param		n		SizeI in value
+	param		framebuffers	UInt32 in array [n]
+	category	EXT_framebuffer_object
+	version		1.2
+	extension
+	glxropcode	4320
+	glxflags	ignore
+	alias		DeleteFramebuffers
+
+GenFramebuffersEXT(n, framebuffers)
+	return		void
+	param		n		SizeI in value
+	param		framebuffers	UInt32 out array [n]
+	category	EXT_framebuffer_object
+	version		1.2
+	extension
+	glxvendorpriv	1426
+	glxflags	ignore
+	alias		GenFramebuffers
+
+CheckFramebufferStatusEXT(target)
+	return		GLenum
+	param		target		FramebufferTarget in value
+	category	EXT_framebuffer_object
+	version		1.2
+	extension
+	glxvendorpriv	1427
+	glxflags	ignore
+	alias		CheckFramebufferStatus
+
+FramebufferTexture1DEXT(target, attachment, textarget, texture, level)
+	return		void
+	param		target		FramebufferTarget in value
+	param		attachment	FramebufferAttachment in value
+	param		textarget	GLenum in value
+	param		texture		UInt32 in value
+	param		level		Int32 in value
+	category	EXT_framebuffer_object
+	version		1.2
+	extension
+	glxropcode	4321
+	glxflags	ignore
+	alias		FramebufferTexture1D
+
+FramebufferTexture2DEXT(target, attachment, textarget, texture, level)
+	return		void
+	param		target		FramebufferTarget in value
+	param		attachment	FramebufferAttachment in value
+	param		textarget	GLenum in value
+	param		texture		UInt32 in value
+	param		level		Int32 in value
+	category	EXT_framebuffer_object
+	version		1.2
+	extension
+	glxropcode	4322
+	glxflags	ignore
+	alias		FramebufferTexture2D
+
+FramebufferTexture3DEXT(target, attachment, textarget, texture, level, zoffset)
+	return		void
+	param		target		FramebufferTarget in value
+	param		attachment	FramebufferAttachment in value
+	param		textarget	GLenum in value
+	param		texture		UInt32 in value
+	param		level		Int32 in value
+	param		zoffset		Int32 in value
+	category	EXT_framebuffer_object
+	version		1.2
+	extension
+	glxropcode	4323
+	glxflags	ignore
+	alias		FramebufferTexture3D
+
+FramebufferRenderbufferEXT(target, attachment, renderbuffertarget, renderbuffer)
+	return		void
+	param		target		FramebufferTarget in value
+	param		attachment	FramebufferAttachment in value
+	param		renderbuffertarget	RenderbufferTarget in value
+	param		renderbuffer	UInt32 in value
+	category	EXT_framebuffer_object
+	version		1.2
+	extension
+	glxropcode	4324
+	glxflags	ignore
+	alias		FramebufferRenderbuffer
+
+GetFramebufferAttachmentParameterivEXT(target, attachment, pname, params)
+	return		void
+	param		target		FramebufferTarget in value
+	param		attachment	FramebufferAttachment in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	EXT_framebuffer_object
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxvendorpriv	1428
+	glxflags	ignore
+	alias		GetFramebufferAttachmentParameteriv
+
+GenerateMipmapEXT(target)
+	return		void
+	param		target		GLenum in value
+	category	EXT_framebuffer_object
+	version		1.2
+	extension
+	glxropcode	4325
+	glxflags	ignore
+	alias		GenerateMipmap
+
+
+###############################################################################
+#
+# Extension #311
+# GREMEDY_string_marker commands
+#
+###############################################################################
+
+StringMarkerGREMEDY(len, string)
+	return		void
+	param		len		SizeI in value
+	param		string		Void in array [len]
+	category	GREMEDY_string_marker
+	version		1.0
+	extension
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #312
+# EXT_packed_depth_stencil commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_packed_depth_stencil
+
+###############################################################################
+#
+# Extension #313 - WGL_3DL_stereo_control
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #314
+# EXT_stencil_clear_tag commands
+#
+###############################################################################
+
+StencilClearTagEXT(stencilTagBits, stencilClearTag)
+	return		void
+	param		stencilTagBits	SizeI in value
+	param		stencilClearTag UInt32 in value
+	category	EXT_stencil_clear_tag
+	version		1.5
+	extension
+	glxropcode	4223
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #315
+# EXT_texture_sRGB commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_texture_sRGB
+
+###############################################################################
+#
+# Extension #316
+# EXT_framebuffer_blit commands
+#
+###############################################################################
+
+BlitFramebufferEXT(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter)
+	return		void
+	param		srcX0		Int32 in value
+	param		srcY0		Int32 in value
+	param		srcX1		Int32 in value
+	param		srcY1		Int32 in value
+	param		dstX0		Int32 in value
+	param		dstY0		Int32 in value
+	param		dstX1		Int32 in value
+	param		dstY1		Int32 in value
+	param		mask		ClearBufferMask in value
+	param		filter		GLenum in value
+	category	EXT_framebuffer_blit
+	version		1.5
+	glxropcode	4330
+	alias		BlitFramebuffer
+
+###############################################################################
+#
+# Extension #317
+# EXT_framebuffer_multisample commands
+#
+###############################################################################
+
+RenderbufferStorageMultisampleEXT(target, samples, internalformat, width, height)
+	return		void
+	param		target		GLenum in value
+	param		samples		SizeI in value
+	param		internalformat	GLenum in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	category	EXT_framebuffer_multisample
+	version		1.5
+	glxropcode	4331
+	alias		RenderbufferStorageMultisample
+
+###############################################################################
+#
+# Extension #318
+# MESAX_texture_stack commands
+#
+###############################################################################
+
+# (none)
+newcategory: MESAX_texture_stack
+
+###############################################################################
+#
+# Extension #319
+# EXT_timer_query commands
+#
+###############################################################################
+
+GetQueryObjecti64vEXT(id, pname, params)
+	return		void
+	param		id		UInt32 in value
+	param		pname		GLenum in value
+	param		params		Int64EXT out array [pname]
+	category	EXT_timer_query
+	dlflags		notlistable
+	version		1.5
+	glxvendorpriv	1328
+	glxflags	ignore
+	offset		?
+
+GetQueryObjectui64vEXT(id, pname, params)
+	return		void
+	param		id		UInt32 in value
+	param		pname		GLenum in value
+	param		params		UInt64EXT out array [pname]
+	category	EXT_timer_query
+	dlflags		notlistable
+	version		1.5
+	glxvendorpriv	1329
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #320
+# EXT_gpu_program_parameters commands
+#
+###############################################################################
+
+ProgramEnvParameters4fvEXT(target, index, count, params)
+	return		void
+	param		target		ProgramTargetARB in value
+	param		index		UInt32 in value
+	param		count		SizeI in value
+	param		params		Float32 in array [count*4]
+	category	EXT_gpu_program_parameters
+	version		1.2
+	glxropcode	4281
+	offset		?
+
+ProgramLocalParameters4fvEXT(target, index, count, params)
+	return		void
+	param		target		ProgramTargetARB in value
+	param		index		UInt32 in value
+	param		count		SizeI in value
+	param		params		Float32 in array [count*4]
+	category	EXT_gpu_program_parameters
+	version		1.2
+	glxropcode	4282
+	offset		?
+
+###############################################################################
+#
+# Extension #321
+# APPLE_flush_buffer_range commands
+#
+###############################################################################
+
+BufferParameteriAPPLE(target, pname, param)
+	return		void
+	param		target		GLenum in value
+	param		pname		GLenum in value
+	param		param		Int32 in value
+	category	APPLE_flush_buffer_range
+	version		1.5
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+FlushMappedBufferRangeAPPLE(target, offset, size)
+	return		void
+	param		target		GLenum in value
+	param		offset		BufferOffset in value
+	param		size		BufferSize in value
+	category	APPLE_flush_buffer_range
+	version		1.5
+	extension
+	glxropcode	?
+	glxflags	ignore
+	alias		FlushMappedBufferRange
+
+###############################################################################
+#
+# Extension #322
+# NV_gpu_program4 commands
+#
+###############################################################################
+
+ProgramLocalParameterI4iNV(target, index, x, y, z, w)
+	return		void
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		x		Int32 in value
+	param		y		Int32 in value
+	param		z		Int32 in value
+	param		w		Int32 in value
+	category	NV_gpu_program4
+	version		1.3
+	vectorequiv	ProgramLocalParameterI4ivNV
+	glxvectorequiv	ProgramLocalParameterI4ivNV
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+
+ProgramLocalParameterI4ivNV(target, index, params)
+	return		void
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		params		Int32 in array [4]
+	category	NV_gpu_program4
+	version		1.3
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+
+ProgramLocalParametersI4ivNV(target, index, count, params)
+	return		void
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		count		SizeI in value
+	param		params		Int32 in array [count*4]
+	category	NV_gpu_program4
+	version		1.3
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+
+ProgramLocalParameterI4uiNV(target, index, x, y, z, w)
+	return		void
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		x		UInt32 in value
+	param		y		UInt32 in value
+	param		z		UInt32 in value
+	param		w		UInt32 in value
+	category	NV_gpu_program4
+	version		1.3
+	vectorequiv	ProgramLocalParameterI4uivNV
+	glxvectorequiv	ProgramLocalParameterI4uivNV
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+
+ProgramLocalParameterI4uivNV(target, index, params)
+	return		void
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		params		UInt32 in array [4]
+	category	NV_gpu_program4
+	version		1.3
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+
+ProgramLocalParametersI4uivNV(target, index, count, params)
+	return		void
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		count		SizeI in value
+	param		params		UInt32 in array [count*4]
+	category	NV_gpu_program4
+	version		1.3
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+
+ProgramEnvParameterI4iNV(target, index, x, y, z, w)
+	return		void
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		x		Int32 in value
+	param		y		Int32 in value
+	param		z		Int32 in value
+	param		w		Int32 in value
+	category	NV_gpu_program4
+	version		1.3
+	vectorequiv	ProgramEnvParameterI4ivNV
+	glxvectorequiv	ProgramEnvParameterI4ivNV
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+
+ProgramEnvParameterI4ivNV(target, index, params)
+	return		void
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		params		Int32 in array [4]
+	category	NV_gpu_program4
+	version		1.3
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+
+ProgramEnvParametersI4ivNV(target, index, count, params)
+	return		void
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		count		SizeI in value
+	param		params		Int32 in array [count*4]
+	category	NV_gpu_program4
+	version		1.3
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+
+ProgramEnvParameterI4uiNV(target, index, x, y, z, w)
+	return		void
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		x		UInt32 in value
+	param		y		UInt32 in value
+	param		z		UInt32 in value
+	param		w		UInt32 in value
+	category	NV_gpu_program4
+	version		1.3
+	vectorequiv	ProgramEnvParameterI4uivNV
+	glxvectorequiv	ProgramEnvParameterI4uivNV
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+
+ProgramEnvParameterI4uivNV(target, index, params)
+	return		void
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		params		UInt32 in array [4]
+	category	NV_gpu_program4
+	version		1.3
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+
+ProgramEnvParametersI4uivNV(target, index, count, params)
+	return		void
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		count		SizeI in value
+	param		params		UInt32 in array [count*4]
+	category	NV_gpu_program4
+	version		1.3
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+
+GetProgramLocalParameterIivNV(target, index, params)
+	return		void
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		params		Int32 out array [4]
+	dlflags		notlistable
+	category	NV_gpu_program4
+	version		1.3
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+
+GetProgramLocalParameterIuivNV(target, index, params)
+	return		void
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		params		UInt32 out array [4]
+	dlflags		notlistable
+	category	NV_gpu_program4
+	version		1.3
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+
+GetProgramEnvParameterIivNV(target, index, params)
+	return		void
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		params		Int32 out array [4]
+	dlflags		notlistable
+	category	NV_gpu_program4
+	version		1.3
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+
+GetProgramEnvParameterIuivNV(target, index, params)
+	return		void
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		params		UInt32 out array [4]
+	dlflags		notlistable
+	category	NV_gpu_program4
+	version		1.3
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+
+###############################################################################
+#
+# Extension #323
+# NV_geometry_program4 commands
+#
+###############################################################################
+
+ProgramVertexLimitNV(target, limit)
+	return		void
+	param		target		ProgramTarget in value
+	param		limit		Int32 in value
+	category	NV_geometry_program4
+	version		2.0
+	extension	soft WINSOFT
+	glfflags	ignore
+	glxflags	ignore
+
+FramebufferTextureEXT(target, attachment, texture, level)
+	return		void
+	param		target		FramebufferTarget in value
+	param		attachment	FramebufferAttachment in value
+	param		texture		Texture in value
+	param		level		CheckedInt32 in value
+	category	NV_geometry_program4
+	version		2.0
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+	alias		FramebufferTextureARB
+
+FramebufferTextureLayerEXT(target, attachment, texture, level, layer)
+	return		void
+	param		target		FramebufferTarget in value
+	param		attachment	FramebufferAttachment in value
+	param		texture		Texture in value
+	param		level		CheckedInt32 in value
+	param		layer		CheckedInt32 in value
+	category	NV_geometry_program4
+	version		2.0
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+	alias		FramebufferTextureLayer
+
+FramebufferTextureFaceEXT(target, attachment, texture, level, face)
+	return		void
+	param		target		FramebufferTarget in value
+	param		attachment	FramebufferAttachment in value
+	param		texture		Texture in value
+	param		level		CheckedInt32 in value
+	param		face		TextureTarget in value
+	category	NV_geometry_program4
+	version		2.0
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+	alias		FramebufferTextureFaceARB
+
+###############################################################################
+#
+# Extension #324
+# EXT_geometry_shader4 commands
+#
+###############################################################################
+
+ProgramParameteriEXT(program, pname, value)
+	return		void
+	param		program		UInt32 in value
+	param		pname		ProgramParameterPName in value
+	param		value		Int32 in value
+	category	EXT_geometry_shader4
+	version		2.0
+	extension	soft WINSOFT
+	glfflags	ignore
+	glxflags	ignore
+	alias		ProgramParameteriARB
+
+###############################################################################
+#
+# Extension #325
+# NV_vertex_program4 commands
+#
+###############################################################################
+
+VertexAttribI1iEXT(index, x)
+	return		void
+	param		index		UInt32 in value
+	param		x		Int32 in value
+	category	NV_vertex_program4
+	beginend	allow-inside
+	vectorequiv	VertexAttribI1ivEXT
+	glxvectorequiv	VertexAttribI1ivEXT
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore
+	alias		VertexAttribI1i
+
+VertexAttribI2iEXT(index, x, y)
+	return		void
+	param		index		UInt32 in value
+	param		x		Int32 in value
+	param		y		Int32 in value
+	category	NV_vertex_program4
+	beginend	allow-inside
+	vectorequiv	VertexAttribI2ivEXT
+	glxvectorequiv	VertexAttribI2ivEXT
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore
+	alias		VertexAttribI2i
+
+VertexAttribI3iEXT(index, x, y, z)
+	return		void
+	param		index		UInt32 in value
+	param		x		Int32 in value
+	param		y		Int32 in value
+	param		z		Int32 in value
+	category	NV_vertex_program4
+	beginend	allow-inside
+	vectorequiv	VertexAttribI3ivEXT
+	glxvectorequiv	VertexAttribI3ivEXT
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore
+	alias		VertexAttribI3i
+
+VertexAttribI4iEXT(index, x, y, z, w)
+	return		void
+	param		index		UInt32 in value
+	param		x		Int32 in value
+	param		y		Int32 in value
+	param		z		Int32 in value
+	param		w		Int32 in value
+	category	NV_vertex_program4
+	beginend	allow-inside
+	vectorequiv	VertexAttribI4ivEXT
+	glxvectorequiv	VertexAttribI4ivEXT
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore
+	alias		VertexAttribI4i
+
+VertexAttribI1uiEXT(index, x)
+	return		void
+	param		index		UInt32 in value
+	param		x		UInt32 in value
+	category	NV_vertex_program4
+	beginend	allow-inside
+	vectorequiv	VertexAttribI1uivEXT
+	glxvectorequiv	VertexAttribI1uivEXT
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore
+	alias		VertexAttribI1ui
+
+VertexAttribI2uiEXT(index, x, y)
+	return		void
+	param		index		UInt32 in value
+	param		x		UInt32 in value
+	param		y		UInt32 in value
+	category	NV_vertex_program4
+	beginend	allow-inside
+	vectorequiv	VertexAttribI2uivEXT
+	glxvectorequiv	VertexAttribI2uivEXT
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore
+	alias		VertexAttribI2ui
+
+VertexAttribI3uiEXT(index, x, y, z)
+	return		void
+	param		index		UInt32 in value
+	param		x		UInt32 in value
+	param		y		UInt32 in value
+	param		z		UInt32 in value
+	category	NV_vertex_program4
+	beginend	allow-inside
+	vectorequiv	VertexAttribI3uivEXT
+	glxvectorequiv	VertexAttribI3uivEXT
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore
+	alias		VertexAttribI3ui
+
+VertexAttribI4uiEXT(index, x, y, z, w)
+	return		void
+	param		index		UInt32 in value
+	param		x		UInt32 in value
+	param		y		UInt32 in value
+	param		z		UInt32 in value
+	param		w		UInt32 in value
+	category	NV_vertex_program4
+	beginend	allow-inside
+	vectorequiv	VertexAttribI4uivEXT
+	glxvectorequiv	VertexAttribI4uivEXT
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore
+	alias		VertexAttribI4ui
+
+VertexAttribI1ivEXT(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int32 in array [1]
+	category	NV_vertex_program4
+	beginend	allow-inside
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore
+	alias		VertexAttribI1iv
+
+VertexAttribI2ivEXT(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int32 in array [2]
+	category	NV_vertex_program4
+	beginend	allow-inside
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore
+	alias		VertexAttribI2iv
+
+VertexAttribI3ivEXT(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int32 in array [3]
+	category	NV_vertex_program4
+	beginend	allow-inside
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore
+	alias		VertexAttribI3iv
+
+VertexAttribI4ivEXT(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int32 in array [4]
+	category	NV_vertex_program4
+	beginend	allow-inside
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore
+	alias		VertexAttribI4iv
+
+VertexAttribI1uivEXT(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt32 in array [1]
+	category	NV_vertex_program4
+	beginend	allow-inside
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore
+	alias		VertexAttribI1uiv
+
+VertexAttribI2uivEXT(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt32 in array [2]
+	category	NV_vertex_program4
+	beginend	allow-inside
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore
+	alias		VertexAttribI2uiv
+
+VertexAttribI3uivEXT(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt32 in array [3]
+	category	NV_vertex_program4
+	beginend	allow-inside
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore
+	alias		VertexAttribI3uiv
+
+VertexAttribI4uivEXT(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt32 in array [4]
+	category	NV_vertex_program4
+	beginend	allow-inside
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore
+	alias		VertexAttribI4uiv
+
+VertexAttribI4bvEXT(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int8 in array [4]
+	category	NV_vertex_program4
+	beginend	allow-inside
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore
+	alias		VertexAttribI4bv
+
+VertexAttribI4svEXT(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int16 in array [4]
+	category	NV_vertex_program4
+	beginend	allow-inside
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore
+	alias		VertexAttribI4sv
+
+VertexAttribI4ubvEXT(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt8 in array [4]
+	category	NV_vertex_program4
+	beginend	allow-inside
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore
+	alias		VertexAttribI4ubv
+
+VertexAttribI4usvEXT(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt16 in array [4]
+	category	NV_vertex_program4
+	beginend	allow-inside
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore
+	alias		VertexAttribI4usv
+
+VertexAttribIPointerEXT(index, size, type, stride, pointer)
+	return		void
+	param		index		UInt32 in value
+	param		size		Int32 in value
+	param		type		VertexAttribEnum in value
+	param		stride		SizeI in value
+	param		pointer		Void in array [COMPSIZE(size/type/stride)] retained
+	category	NV_vertex_program4
+	dlflags		notlistable
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore
+	alias		VertexAttribIPointer
+
+GetVertexAttribIivEXT(index, pname, params)
+	return		void
+	param		index		UInt32 in value
+	param		pname		VertexAttribEnum in value
+	param		params		Int32 out array [1]
+	category	NV_vertex_program4
+	dlflags		notlistable
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore
+	alias		GetVertexAttribIiv
+
+GetVertexAttribIuivEXT(index, pname, params)
+	return		void
+	param		index		UInt32 in value
+	param		pname		VertexAttribEnum in value
+	param		params		UInt32 out array [1]
+	category	NV_vertex_program4
+	dlflags		notlistable
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore
+	alias		GetVertexAttribIuiv
+
+###############################################################################
+#
+# Extension #326
+# EXT_gpu_shader4 commands
+#
+###############################################################################
+
+GetUniformuivEXT(program, location, params)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		params		UInt32 out array [COMPSIZE(program/location)]
+	category	EXT_gpu_shader4
+	dlflags		notlistable
+	version		2.0
+	extension	soft WINSOFT
+	glfflags	ignore
+	glxflags	ignore
+	alias		GetUniformuiv
+
+BindFragDataLocationEXT(program, color, name)
+	return		void
+	param		program		UInt32 in value
+	param		color		UInt32 in value
+	param		name		Char in array [COMPSIZE(name)]
+	category	EXT_gpu_shader4
+	dlflags		notlistable
+	version		2.0
+	extension	soft WINSOFT
+	glfflags	ignore
+	glxflags	ignore
+	alias		BindFragDataLocation
+
+GetFragDataLocationEXT(program, name)
+	return		Int32
+	param		program		UInt32 in value
+	param		name		Char in array [COMPSIZE(name)]
+	category	EXT_gpu_shader4
+	dlflags		notlistable
+	version		2.0
+	extension	soft WINSOFT
+	glfflags	ignore
+	glxflags	ignore
+	alias		GetFragDataLocation
+
+Uniform1uiEXT(location, v0)
+	return		void
+	param		location	Int32 in value
+	param		v0		UInt32 in value
+	category	EXT_gpu_shader4
+	version		2.0
+	extension	soft WINSOFT
+	glfflags	ignore
+	glxflags	ignore
+	alias		Uniform1ui
+
+Uniform2uiEXT(location, v0, v1)
+	return		void
+	param		location	Int32 in value
+	param		v0		UInt32 in value
+	param		v1		UInt32 in value
+	category	EXT_gpu_shader4
+	version		2.0
+	extension	soft WINSOFT
+	glfflags	ignore
+	glxflags	ignore
+	alias		Uniform2ui
+
+Uniform3uiEXT(location, v0, v1, v2)
+	return		void
+	param		location	Int32 in value
+	param		v0		UInt32 in value
+	param		v1		UInt32 in value
+	param		v2		UInt32 in value
+	category	EXT_gpu_shader4
+	version		2.0
+	extension	soft WINSOFT
+	glfflags	ignore
+	glxflags	ignore
+	alias		Uniform3ui
+
+Uniform4uiEXT(location, v0, v1, v2, v3)
+	return		void
+	param		location	Int32 in value
+	param		v0		UInt32 in value
+	param		v1		UInt32 in value
+	param		v2		UInt32 in value
+	param		v3		UInt32 in value
+	category	EXT_gpu_shader4
+	version		2.0
+	extension	soft WINSOFT
+	glfflags	ignore
+	glxflags	ignore
+	alias		Uniform4ui
+
+Uniform1uivEXT(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt32 in array [count]
+	category	EXT_gpu_shader4
+	version		2.0
+	extension	soft WINSOFT
+	glfflags	ignore
+	glxflags	ignore
+	alias		Uniform1uiv
+
+Uniform2uivEXT(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt32 in array [count*2]
+	category	EXT_gpu_shader4
+	version		2.0
+	extension	soft WINSOFT
+	glfflags	ignore
+	glxflags	ignore
+	alias		Uniform2uiv
+
+Uniform3uivEXT(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt32 in array [count*3]
+	category	EXT_gpu_shader4
+	version		2.0
+	extension	soft WINSOFT
+	glfflags	ignore
+	glxflags	ignore
+	alias		Uniform3uiv
+
+Uniform4uivEXT(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt32 in array [count*4]
+	category	EXT_gpu_shader4
+	version		2.0
+	extension	soft WINSOFT
+	glfflags	ignore
+	glxflags	ignore
+	alias		Uniform4uiv
+
+###############################################################################
+#
+# Extension #327
+# EXT_draw_instanced commands
+#
+###############################################################################
+
+DrawArraysInstancedEXT(mode, start, count, primcount)
+	return		void
+	param		mode		BeginMode in value
+	param		start		Int32 in value
+	param		count		SizeI in value
+	param		primcount	SizeI in value
+	category	EXT_draw_instanced
+	version		2.0
+	extension	soft WINSOFT
+	dlflags		notlistable
+	vectorequiv	ArrayElement
+	glfflags	ignore
+	glxflags	ignore
+	alias		DrawArraysInstancedARB
+
+DrawElementsInstancedEXT(mode, count, type, indices, primcount)
+	return		void
+	param		mode		BeginMode in value
+	param		count		SizeI in value
+	param		type		DrawElementsType in value
+	param		indices		Void in array [COMPSIZE(count/type)]
+	param		primcount	SizeI in value
+	category	EXT_draw_instanced
+	version		2.0
+	extension	soft WINSOFT
+	dlflags		notlistable
+	vectorequiv	ArrayElement
+	glfflags	ignore
+	glxflags	ignore
+	alias		DrawElementsInstancedARB
+
+###############################################################################
+#
+# Extension #328
+# EXT_packed_float commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_packed_float
+
+###############################################################################
+#
+# Extension #329
+# EXT_texture_array commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_texture_array
+
+###############################################################################
+#
+# Extension #330
+# EXT_texture_buffer_object commands
+#
+###############################################################################
+
+TexBufferEXT(target, internalformat, buffer)
+	return		void
+	param		target		TextureTarget in value
+	param		internalformat	GLenum in value
+	param		buffer		UInt32 in value
+	category	EXT_texture_buffer_object
+	version		2.0
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+	alias		TexBufferARB
+
+###############################################################################
+#
+# Extension #331
+# EXT_texture_compression_latc commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_texture_compression_latc
+
+###############################################################################
+#
+# Extension #332
+# EXT_texture_compression_rgtc commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_texture_compression_rgtc
+
+###############################################################################
+#
+# Extension #333
+# EXT_texture_shared_exponent commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_texture_shared_exponent
+
+###############################################################################
+#
+# Extension #334
+# NV_depth_buffer_float commands
+#
+###############################################################################
+
+DepthRangedNV(zNear, zFar)
+	return		void
+	param		zNear		Float64 in value
+	param		zFar		Float64 in value
+	category	NV_depth_buffer_float
+	extension	soft WINSOFT NV50
+	version		2.0
+	glfflags	ignore
+	glxflags	ignore
+
+ClearDepthdNV(depth)
+	return		void
+	param		depth		Float64 in value
+	category	NV_depth_buffer_float
+	extension	soft WINSOFT NV50
+	version		2.0
+	glfflags	ignore
+	glxflags	ignore
+
+DepthBoundsdNV(zmin, zmax)
+	return		void
+	param		zmin		Float64 in value
+	param		zmax		Float64 in value
+	category	NV_depth_buffer_float
+	extension	soft WINSOFT NV50
+	version		2.0
+	glfflags	ignore
+	glxflags	ignore
+
+###############################################################################
+#
+# Extension #335
+# NV_fragment_program4 commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_fragment_program4
+
+###############################################################################
+#
+# Extension #336
+# NV_framebuffer_multisample_coverage commands
+#
+###############################################################################
+
+RenderbufferStorageMultisampleCoverageNV(target, coverageSamples, colorSamples, internalformat, width, height)
+	return		void
+	param		target		RenderbufferTarget in value
+	param		coverageSamples SizeI in value
+	param		colorSamples	SizeI in value
+	param		internalformat	PixelInternalFormat in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	category	NV_framebuffer_multisample_coverage
+	version		1.5
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+
+###############################################################################
+#
+# Extension #337
+# EXT_framebuffer_sRGB commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_framebuffer_sRGB
+
+###############################################################################
+#
+# Extension #338
+# NV_geometry_shader4 commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_geometry_shader4
+
+###############################################################################
+#
+# Extension #339
+# NV_parameter_buffer_object commands
+#
+###############################################################################
+
+ProgramBufferParametersfvNV(target, buffer, index, count, params)
+	return		void
+	param		target		ProgramTarget in value
+	param		buffer		UInt32 in value
+	param		index		UInt32 in value
+	param		count		SizeI in value
+	param		params		Float32 in array [count]
+	category	NV_parameter_buffer_object
+	version		1.2
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+
+ProgramBufferParametersIivNV(target, buffer, index, count, params)
+	return		void
+	param		target		ProgramTarget in value
+	param		buffer		UInt32 in value
+	param		index		UInt32 in value
+	param		count		SizeI in value
+	param		params		Int32 in array [count]
+	category	NV_parameter_buffer_object
+	version		1.2
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+
+ProgramBufferParametersIuivNV(target, buffer, index, count, params)
+	return		void
+	param		target		ProgramTarget in value
+	param		buffer		UInt32 in value
+	param		index		UInt32 in value
+	param		count		SizeI in value
+	param		params		UInt32 in array [count]
+	category	NV_parameter_buffer_object
+	version		1.2
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+
+###############################################################################
+#
+# Extension #340
+# EXT_draw_buffers2 commands
+#
+###############################################################################
+
+ColorMaskIndexedEXT(index, r, g, b, a)
+	return		void
+	param		index		UInt32 in value
+	param		r		Boolean in value
+	param		g		Boolean in value
+	param		b		Boolean in value
+	param		a		Boolean in value
+	category	EXT_draw_buffers2
+	version		2.0
+	glxflags	ignore
+	glfflags	ignore
+	extension	soft WINSOFT
+	alias		ColorMaski
+
+GetBooleanIndexedvEXT(target, index, data)
+	return		void
+	param		target		GLenum in value
+	param		index		UInt32 in value
+	param		data		Boolean out array [COMPSIZE(target)]
+	category	EXT_draw_buffers2
+	version		2.0
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+	extension	soft WINSOFT
+	alias		GetBooleani_v
+
+GetIntegerIndexedvEXT(target, index, data)
+	return		void
+	param		target		GLenum in value
+	param		index		UInt32 in value
+	param		data		Int32 out array [COMPSIZE(target)]
+	category	EXT_draw_buffers2
+	version		2.0
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+	extension	soft WINSOFT
+	alias		GetIntegeri_v
+
+EnableIndexedEXT(target, index)
+	return		void
+	param		target		GLenum in value
+	param		index		UInt32 in value
+	category	EXT_draw_buffers2
+	version		2.0
+	glxflags	ignore
+	glfflags	ignore
+	extension	soft WINSOFT
+	alias		Enablei
+
+DisableIndexedEXT(target, index)
+	return		void
+	param		target		GLenum in value
+	param		index		UInt32 in value
+	category	EXT_draw_buffers2
+	version		2.0
+	glxflags	ignore
+	glfflags	ignore
+	extension	soft WINSOFT
+	alias		Disablei
+
+IsEnabledIndexedEXT(target, index)
+	return		Boolean
+	param		target		GLenum in value
+	param		index		UInt32 in value
+	category	EXT_draw_buffers2
+	version		2.0
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+	extension	soft WINSOFT
+	alias		IsEnabledi
+
+###############################################################################
+#
+# Extension #341
+# NV_transform_feedback commands
+#
+###############################################################################
+
+BeginTransformFeedbackNV(primitiveMode)
+	return		void
+	param		primitiveMode	GLenum in value
+	category	NV_transform_feedback
+	version		1.5
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+	extension	soft WINSOFT
+	alias		BeginTransformFeedback
+
+EndTransformFeedbackNV()
+	return		void
+	category	NV_transform_feedback
+	version		1.5
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+	extension	soft WINSOFT
+	alias		EndTransformFeedback
+
+TransformFeedbackAttribsNV(count, attribs, bufferMode)
+	return		void
+	param		count		UInt32 in value
+	param		attribs		Int32 in array [COMPSIZE(count)]
+	param		bufferMode	GLenum in value
+	category	NV_transform_feedback
+	version		1.5
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+	extension	soft WINSOFT
+
+BindBufferRangeNV(target, index, buffer, offset, size)
+	return		void
+	param		target		GLenum in value
+	param		index		UInt32 in value
+	param		buffer		UInt32 in value
+	param		offset		BufferOffset in value
+	param		size		BufferSize in value
+	category	NV_transform_feedback
+	version		1.5
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+	extension	soft WINSOFT
+	alias		BindBufferRange
+
+BindBufferOffsetNV(target, index, buffer, offset)
+	return		void
+	param		target		GLenum in value
+	param		index		UInt32 in value
+	param		buffer		UInt32 in value
+	param		offset		BufferOffset in value
+	category	NV_transform_feedback
+	version		1.5
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+	extension	soft WINSOFT
+	alias		BindBufferOffsetEXT
+
+BindBufferBaseNV(target, index, buffer)
+	return		void
+	param		target		GLenum in value
+	param		index		UInt32 in value
+	param		buffer		UInt32 in value
+	category	NV_transform_feedback
+	version		1.5
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+	extension	soft WINSOFT
+	alias		BindBufferBase
+
+TransformFeedbackVaryingsNV(program, count, locations, bufferMode)
+	return		void
+	param		program		UInt32 in value
+	param		count		SizeI in value
+	param		locations	Int32 in array [count]
+	param		bufferMode	GLenum in value
+	category	NV_transform_feedback
+	version		1.5
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+	extension	soft WINSOFT
+	alias		TransformFeedbackVaryings
+
+ActiveVaryingNV(program, name)
+	return		void
+	param		program		UInt32 in value
+	param		name		Char in array [COMPSIZE(name)]
+	category	NV_transform_feedback
+	version		1.5
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+	extension	soft WINSOFT
+
+GetVaryingLocationNV(program, name)
+	return		Int32
+	param		program		UInt32 in value
+	param		name		Char in array [COMPSIZE(name)]
+	category	NV_transform_feedback
+	dlflags		notlistable
+	version		1.5
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+
+GetActiveVaryingNV(program, index, bufSize, length, size, type, name)
+	return		void
+	param		program		UInt32 in value
+	param		index		UInt32 in value
+	param		bufSize		SizeI in value
+	param		length		SizeI out array [1]
+	param		size		SizeI out array [1]
+	param		type		GLenum out array [1]
+	param		name		Char out array [COMPSIZE(program/index/bufSize)]
+	category	NV_transform_feedback
+	dlflags		notlistable
+	version		1.5
+	extension	soft WINSOFT
+	glfflags	ignore
+	glxflags	ignore
+
+GetTransformFeedbackVaryingNV(program, index, location)
+	return		void
+	param		program		UInt32 in value
+	param		index		UInt32 in value
+	param		location	Int32 out array [1]
+	category	NV_transform_feedback
+	dlflags		notlistable
+	version		1.5
+	extension	soft WINSOFT
+	glfflags	ignore
+	glxflags	ignore
+	alias		GetTransformFeedbackVarying
+
+# These commands require ARB_transform_feedback3
+
+TransformFeedbackStreamAttribsNV(count, attribs, nbuffers, bufstreams, bufferMode)
+	return		void
+	param		count		SizeI in value
+	param		attribs		Int32 in array [count]
+	param		nbuffers	SizeI in value
+	param		bufstreams	Int32 in array [nbuffers]
+	param		bufferMode	GLenum in value
+	category	NV_transform_feedback
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+
+###############################################################################
+#
+# Extension #342
+# EXT_bindable_uniform commands
+#
+###############################################################################
+
+UniformBufferEXT(program, location, buffer)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		buffer		UInt32 in value
+	category	EXT_bindable_uniform
+	version		2.0
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+
+GetUniformBufferSizeEXT(program, location)
+	return		Int32
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	category	EXT_bindable_uniform
+	dlflags		notlistable
+	version		2.0
+	extension	soft WINSOFT
+	glfflags	ignore
+	glxflags	ignore
+
+GetUniformOffsetEXT(program, location)
+	return		BufferOffset
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	category	EXT_bindable_uniform
+	dlflags		notlistable
+	version		2.0
+	extension	soft WINSOFT
+	glfflags	ignore
+	glxflags	ignore
+
+###############################################################################
+#
+# Extension #343
+# EXT_texture_integer extension commands
+#
+###############################################################################
+
+TexParameterIivEXT(target, pname, params)
+	return		void
+	param		target		TextureTarget in value
+	param		pname		TextureParameterName in value
+	param		params		Int32 in array [COMPSIZE(pname)]
+	category	EXT_texture_integer
+	version		2.0
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+	alias		TexParameterIiv
+
+TexParameterIuivEXT(target, pname, params)
+	return		void
+	param		target		TextureTarget in value
+	param		pname		TextureParameterName in value
+	param		params		UInt32 in array [COMPSIZE(pname)]
+	category	EXT_texture_integer
+	version		2.0
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+	alias		TexParameterIuiv
+
+GetTexParameterIivEXT(target, pname, params)
+	return		void
+	param		target		TextureTarget in value
+	param		pname		GetTextureParameter in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	EXT_texture_integer
+	dlflags		notlistable
+	version		1.0
+	version		2.0
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+	alias		GetTexParameterIiv
+
+GetTexParameterIuivEXT(target, pname, params)
+	return		void
+	param		target		TextureTarget in value
+	param		pname		GetTextureParameter in value
+	param		params		UInt32 out array [COMPSIZE(pname)]
+	category	EXT_texture_integer
+	dlflags		notlistable
+	version		1.0
+	version		2.0
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+	alias		GetTexParameterIuiv
+
+ClearColorIiEXT(red, green, blue, alpha)
+	return		void
+	param		red		Int32 in value
+	param		green		Int32 in value
+	param		blue		Int32 in value
+	param		alpha		Int32 in value
+	category	EXT_texture_integer
+	version		2.0
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+
+ClearColorIuiEXT(red, green, blue, alpha)
+	return		void
+	param		red		UInt32 in value
+	param		green		UInt32 in value
+	param		blue		UInt32 in value
+	param		alpha		UInt32 in value
+	category	EXT_texture_integer
+	version		2.0
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+
+###############################################################################
+#
+# Extension #344 - GLX_EXT_texture_from_pixmap
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #345
+# GREMEDY_frame_terminator commands
+#
+###############################################################################
+
+FrameTerminatorGREMEDY()
+	return		void
+	category	GREMEDY_frame_terminator
+	version		1.0
+	extension
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #346
+# NV_conditional_render commands
+#
+###############################################################################
+
+BeginConditionalRenderNV(id, mode)
+	return		void
+	param		id		UInt32 in value
+	param		mode		TypeEnum in value
+	category	NV_conditional_render
+	glfflags	ignore
+	glxflags	ignore
+	alias		BeginConditionalRender
+
+EndConditionalRenderNV()
+	return		void
+	category	NV_conditional_render
+	glfflags	ignore
+	glxflags	ignore
+	alias		EndConditionalRender
+
+###############################################################################
+#
+# Extension #347
+# NV_present_video commands
+#
+###############################################################################
+
+# TBD
+#    void PresentFrameKeyedNV(uint video_slot, uint64EXT minPresentTime,
+#			      uint beginPresentTimeId, uint
+#			      presentDurationId, enum type, enum target0,
+#			      uint fill0, uint key0, enum target1, uint
+#			      fill1, uint key1);
+#
+#    void PresentFrameDualFillNV(uint video_slot, uint64EXT
+#				 minPresentTime, uint beginPresentTimeId,
+#				 uint presentDurationId, enum type, enum
+#				 target0, uint fill0, enum target1, uint
+#				 fill1, enum target2, uint fill2, enum
+#				 target3, uint fill3);
+#
+#    void GetVideoivNV(uint video_slot, enum pname, int *params);
+#    void GetVideouivNV(uint video_slot, enum pname, uint *params);
+#    void GetVideoi64vNV(uint video_slot, enum pname, int64EXT *params);
+#    void GetVideoui64vNV(uint video_slot, enum pname, uint64EXT *params);
+#    void VideoParameterivNV(uint video_slot, enum pname, const int *params);
+
+PresentFrameKeyedNV(video_slot, minPresentTime, beginPresentTimeId, presentDurationId, type, target0, fill0, key0, target1, fill1, key1)
+	return		void
+	param		video_slot	UInt32 in value
+	param		minPresentTime	UInt64EXT in value
+	param		beginPresentTimeId	UInt32 in value
+	param		presentDurationId	UInt32 in value
+	param		type		GLenum in value
+	param		target0		GLenum in value
+	param		fill0		UInt32 in value
+	param		key0		UInt32 in value
+	param		target1		GLenum in value
+	param		fill1		UInt32 in value
+	param		key1		UInt32 in value
+	category	NV_present_video
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+PresentFrameDualFillNV(video_slot, minPresentTime, beginPresentTimeId, presentDurationId, type, target0, fill0, target1, fill1, target2, fill2, target3, fill3)
+	return		void
+	param		video_slot	UInt32 in value
+	param		minPresentTime	UInt64EXT in value
+	param		beginPresentTimeId	UInt32 in value
+	param		presentDurationId	UInt32 in value
+	param		type		GLenum in value
+	param		target0		GLenum in value
+	param		fill0		UInt32 in value
+	param		target1		GLenum in value
+	param		fill1		UInt32 in value
+	param		target2		GLenum in value
+	param		fill2		UInt32 in value
+	param		target3		GLenum in value
+	param		fill3		UInt32 in value
+	category	NV_present_video
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetVideoivNV(video_slot, pname, params)
+	return		void
+	param		video_slot	UInt32 in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	NV_present_video
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetVideouivNV(video_slot, pname, params)
+	return		void
+	param		video_slot	UInt32 in value
+	param		pname		GLenum in value
+	param		params		UInt32 out array [COMPSIZE(pname)]
+	category	NV_present_video
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetVideoi64vNV(video_slot, pname, params)
+	return		void
+	param		video_slot	UInt32 in value
+	param		pname		GLenum in value
+	param		params		Int64EXT out array [COMPSIZE(pname)]
+	category	NV_present_video
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetVideoui64vNV(video_slot, pname, params)
+	return		void
+	param		video_slot	UInt32 in value
+	param		pname		GLenum in value
+	param		params		UInt64EXT out array [COMPSIZE(pname)]
+	category	NV_present_video
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #348 - GLX_NV_video_out
+# Extension #349 - WGL_NV_video_out
+# Extension #350 - GLX_NV_swap_group
+# Extension #351 - WGL_NV_swap_group
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #352
+# EXT_transform_feedback commands
+#
+###############################################################################
+
+# From EXT_draw_buffers2:  GetBooleanIndexedvEXT / GetIntegerIndexedvEXT
+
+BeginTransformFeedbackEXT(primitiveMode)
+	return		void
+	param		primitiveMode	GLenum in value
+	category	EXT_transform_feedback
+	version		2.0
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+	extension	soft WINSOFT
+	alias		BeginTransformFeedback
+
+EndTransformFeedbackEXT()
+	return		void
+	category	EXT_transform_feedback
+	version		2.0
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+	extension	soft WINSOFT
+	alias		EndTransformFeedback
+
+BindBufferRangeEXT(target, index, buffer, offset, size)
+	return		void
+	param		target		GLenum in value
+	param		index		UInt32 in value
+	param		buffer		UInt32 in value
+	param		offset		BufferOffset in value
+	param		size		BufferSize in value
+	category	EXT_transform_feedback
+	version		2.0
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+	extension	soft WINSOFT
+	alias		BindBufferRange
+
+# Not promoted to the OpenGL 3.0 core
+BindBufferOffsetEXT(target, index, buffer, offset)
+	return		void
+	param		target		GLenum in value
+	param		index		UInt32 in value
+	param		buffer		UInt32 in value
+	param		offset		BufferOffset in value
+	category	EXT_transform_feedback
+	version		2.0
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+	extension	soft WINSOFT
+
+BindBufferBaseEXT(target, index, buffer)
+	return		void
+	param		target		GLenum in value
+	param		index		UInt32 in value
+	param		buffer		UInt32 in value
+	category	EXT_transform_feedback
+	version		2.0
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+	extension	soft WINSOFT
+	alias		BindBufferBase
+
+TransformFeedbackVaryingsEXT(program, count, varyings, bufferMode)
+	return		void
+	param		program		UInt32 in value
+	param		count		SizeI in value
+	param		varyings	CharPointer in array [count]
+	param		bufferMode	GLenum in value
+	category	EXT_transform_feedback
+	version		2.0
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+	extension	soft WINSOFT
+	alias		TransformFeedbackVaryings
+
+GetTransformFeedbackVaryingEXT(program, index, bufSize, length, size, type, name)
+	return		void
+	param		program		UInt32 in value
+	param		index		UInt32 in value
+	param		bufSize		SizeI in value
+	param		length		SizeI out array [1]
+	param		size		SizeI out array [1]
+	param		type		GLenum out array [1]
+	param		name		Char out array [COMPSIZE(length)]
+	category	EXT_transform_feedback
+	dlflags		notlistable
+	version		2.0
+	extension	soft WINSOFT
+	glfflags	ignore
+	glxflags	ignore
+	alias		GetTransformFeedbackVarying
+
+###############################################################################
+#
+# Extension #353
+# EXT_direct_state_access commands
+#
+###############################################################################
+
+# New 1.1 client commands
+
+ClientAttribDefaultEXT(mask)
+	return		void
+	param		mask		ClientAttribMask in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glxflags	ignore ### client-handcode client-intercept server-handcode
+
+PushClientAttribDefaultEXT(mask)
+	return		void
+	param		mask		ClientAttribMask in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glxflags	ignore ### client-handcode client-intercept server-handcode
+
+# New 1.0 matrix commands
+
+MatrixLoadfEXT(mode, m)
+	return		void
+	param		mode		MatrixMode in value
+	param		m		Float32 in array [16]
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+
+MatrixLoaddEXT(mode, m)
+	return		void
+	param		mode		MatrixMode in value
+	param		m		Float64 in array [16]
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+
+MatrixMultfEXT(mode, m)
+	return		void
+	param		mode		MatrixMode in value
+	param		m		Float32 in array [16]
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+
+MatrixMultdEXT(mode, m)
+	return		void
+	param		mode		MatrixMode in value
+	param		m		Float64 in array [16]
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+
+MatrixLoadIdentityEXT(mode)
+	return		void
+	param		mode		MatrixMode in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+
+MatrixRotatefEXT(mode, angle, x, y, z)
+	return		void
+	param		mode		MatrixMode in value
+	param		angle		Float32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+
+MatrixRotatedEXT(mode, angle, x, y, z)
+	return		void
+	param		mode		MatrixMode in value
+	param		angle		Float64 in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	param		z		Float64 in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+
+MatrixScalefEXT(mode, x, y, z)
+	return		void
+	param		mode		MatrixMode in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+
+MatrixScaledEXT(mode, x, y, z)
+	return		void
+	param		mode		MatrixMode in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	param		z		Float64 in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+
+MatrixTranslatefEXT(mode, x, y, z)
+	return		void
+	param		mode		MatrixMode in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+
+MatrixTranslatedEXT(mode, x, y, z)
+	return		void
+	param		mode		MatrixMode in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	param		z		Float64 in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+
+MatrixFrustumEXT(mode, left, right, bottom, top, zNear, zFar)
+	return		void
+	param		mode		MatrixMode in value
+	param		left		Float64 in value
+	param		right		Float64 in value
+	param		bottom		Float64 in value
+	param		top		Float64 in value
+	param		zNear		Float64 in value
+	param		zFar		Float64 in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+
+MatrixOrthoEXT(mode, left, right, bottom, top, zNear, zFar)
+	return		void
+	param		mode		MatrixMode in value
+	param		left		Float64 in value
+	param		right		Float64 in value
+	param		bottom		Float64 in value
+	param		top		Float64 in value
+	param		zNear		Float64 in value
+	param		zFar		Float64 in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+
+MatrixPopEXT(mode)
+	return		void
+	param		mode		MatrixMode in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+
+MatrixPushEXT(mode)
+	return		void
+	param		mode		MatrixMode in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+
+# New 1.3 matrix transpose commands
+
+MatrixLoadTransposefEXT(mode, m)
+	return		void
+	param		mode		MatrixMode in value
+	param		m		Float32 in array [16]
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+
+MatrixLoadTransposedEXT(mode, m)
+	return		void
+	param		mode		MatrixMode in value
+	param		m		Float64 in array [16]
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+
+MatrixMultTransposefEXT(mode, m)
+	return		void
+	param		mode		MatrixMode in value
+	param		m		Float32 in array [16]
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+
+MatrixMultTransposedEXT(mode, m)
+	return		void
+	param		mode		MatrixMode in value
+	param		m		Float64 in array [16]
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+
+# New 1.1 texture object commands
+
+TextureParameterfEXT(texture, target, pname, param)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		pname		TextureParameterName in value
+	param		param		CheckedFloat32 in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+	vectorequiv	TextureParameterfvEXT
+
+TextureParameterfvEXT(texture, target, pname, params)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		pname		TextureParameterName in value
+	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+
+TextureParameteriEXT(texture, target, pname, param)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		pname		TextureParameterName in value
+	param		param		CheckedInt32 in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+	vectorequiv	TextureParameterivEXT
+
+TextureParameterivEXT(texture, target, pname, params)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		pname		TextureParameterName in value
+	param		params		CheckedInt32 in array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+
+TextureImage1DEXT(texture, target, level, internalformat, width, border, format, type, pixels)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	TextureInternalFormat in value
+	param		width		SizeI in value
+	param		border		CheckedInt32 in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void in array [COMPSIZE(format/type/width)]
+	category	EXT_direct_state_access
+	dlflags		handcode
+	glxflags	ignore ### client-handcode server-handcode
+	extension	soft WINSOFT
+	glfflags	capture-handcode decode-handcode pixel-unpack
+
+TextureImage2DEXT(texture, target, level, internalformat, width, height, border, format, type, pixels)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	TextureInternalFormat in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		border		CheckedInt32 in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void in array [COMPSIZE(format/type/width/height)]
+	category	EXT_direct_state_access
+	dlflags		handcode
+	glxflags	ignore ### client-handcode server-handcode
+	extension	soft WINSOFT
+	glfflags	capture-handcode decode-handcode pixel-unpack
+
+TextureSubImage1DEXT(texture, target, level, xoffset, width, format, type, pixels)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		width		SizeI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void in array [COMPSIZE(format/type/width)]
+	category	EXT_direct_state_access
+	dlflags		handcode
+	glxflags	ignore ### EXT client-handcode server-handcode
+	glxflags	ignore
+	extension	soft WINSOFT
+	glfflags	ignore
+
+TextureSubImage2DEXT(texture, target, level, xoffset, yoffset, width, height, format, type, pixels)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		yoffset		CheckedInt32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void in array [COMPSIZE(format/type/width/height)]
+	category	EXT_direct_state_access
+	dlflags		handcode
+	glxflags	ignore ### EXT client-handcode server-handcode
+	extension	soft WINSOFT
+	glfflags	ignore
+
+CopyTextureImage1DEXT(texture, target, level, internalformat, x, y, width, border)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	TextureInternalFormat in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	param		border		CheckedInt32 in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore ### EXT
+
+CopyTextureImage2DEXT(texture, target, level, internalformat, x, y, width, height, border)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	TextureInternalFormat in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		border		CheckedInt32 in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore ### EXT
+
+CopyTextureSubImage1DEXT(texture, target, level, xoffset, x, y, width)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore ### EXT
+
+CopyTextureSubImage2DEXT(texture, target, level, xoffset, yoffset, x, y, width, height)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		yoffset		CheckedInt32 in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore ### EXT
+
+# New 1.1 texture object queries
+
+GetTextureImageEXT(texture, target, level, format, type, pixels)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void out array [COMPSIZE(target/level/format/type)]
+	category	EXT_direct_state_access
+	dlflags		notlistable
+	glxflags	ignore ### client-handcode server-handcode
+	extension	soft WINSOFT
+	glfflags	capture-execute capture-handcode decode-handcode pixel-pack
+
+GetTextureParameterfvEXT(texture, target, pname, params)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		pname		GetTextureParameter in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	dlflags		notlistable
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	capture-execute gl-enum
+
+GetTextureParameterivEXT(texture, target, pname, params)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		pname		GetTextureParameter in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	dlflags		notlistable
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	capture-execute gl-enum
+
+GetTextureLevelParameterfvEXT(texture, target, level, pname, params)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		pname		GetTextureParameter in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	dlflags		notlistable
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	capture-execute gl-enum
+
+GetTextureLevelParameterivEXT(texture, target, level, pname, params)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		pname		GetTextureParameter in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	dlflags		notlistable
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	capture-execute gl-enum
+
+# New 1.2 3D texture object commands
+
+TextureImage3DEXT(texture, target, level, internalformat, width, height, depth, border, format, type, pixels)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	TextureInternalFormat in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		border		CheckedInt32 in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void in array [COMPSIZE(format/type/width/height/depth)]
+	category	EXT_direct_state_access
+	dlflags		handcode
+	glxflags	ignore ### client-handcode server-handcode EXT
+	extension	soft WINSOFT
+	glfflags	ignore
+
+TextureSubImage3DEXT(texture, target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		yoffset		CheckedInt32 in value
+	param		zoffset		CheckedInt32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void in array [COMPSIZE(format/type/width/height/depth)]
+	category	EXT_direct_state_access
+	dlflags		handcode
+	glxflags	ignore ### client-handcode server-handcode EXT
+	extension	soft WINSOFT
+	glfflags	ignore
+
+CopyTextureSubImage3DEXT(texture, target, level, xoffset, yoffset, zoffset, x, y, width, height)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		yoffset		CheckedInt32 in value
+	param		zoffset		CheckedInt32 in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	category	EXT_direct_state_access
+	glxflags	ignore ### EXT
+	extension	soft WINSOFT
+	glfflags	ignore
+
+# New 1.1 multitexture commands
+
+MultiTexParameterfEXT(texunit, target, pname, param)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		pname		TextureParameterName in value
+	param		param		CheckedFloat32 in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+	vectorequiv	MultiTexParameterfvEXT
+
+MultiTexParameterfvEXT(texunit, target, pname, params)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		pname		TextureParameterName in value
+	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+
+MultiTexParameteriEXT(texunit, target, pname, param)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		pname		TextureParameterName in value
+	param		param		CheckedInt32 in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+	vectorequiv	MultiTexParameterivEXT
+
+MultiTexParameterivEXT(texunit, target, pname, params)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		pname		TextureParameterName in value
+	param		params		CheckedInt32 in array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+
+MultiTexImage1DEXT(texunit, target, level, internalformat, width, border, format, type, pixels)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	TextureInternalFormat in value
+	param		width		SizeI in value
+	param		border		CheckedInt32 in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void in array [COMPSIZE(format/type/width)]
+	category	EXT_direct_state_access
+	dlflags		handcode
+	glxflags	ignore ### client-handcode server-handcode
+	extension	soft WINSOFT
+	glfflags	capture-handcode decode-handcode pixel-unpack
+
+MultiTexImage2DEXT(texunit, target, level, internalformat, width, height, border, format, type, pixels)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	TextureInternalFormat in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		border		CheckedInt32 in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void in array [COMPSIZE(format/type/width/height)]
+	category	EXT_direct_state_access
+	dlflags		handcode
+	glxflags	ignore ### client-handcode server-handcode
+	extension	soft WINSOFT
+	glfflags	capture-handcode decode-handcode pixel-unpack
+
+MultiTexSubImage1DEXT(texunit, target, level, xoffset, width, format, type, pixels)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		width		SizeI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void in array [COMPSIZE(format/type/width)]
+	category	EXT_direct_state_access
+	dlflags		handcode
+	glxflags	ignore ### EXT client-handcode server-handcode
+	extension	soft WINSOFT
+	glfflags	ignore
+
+MultiTexSubImage2DEXT(texunit, target, level, xoffset, yoffset, width, height, format, type, pixels)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		yoffset		CheckedInt32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void in array [COMPSIZE(format/type/width/height)]
+	category	EXT_direct_state_access
+	dlflags		handcode
+	glxflags	ignore ### EXT client-handcode server-handcode
+	extension	soft WINSOFT
+	glfflags	ignore
+
+CopyMultiTexImage1DEXT(texunit, target, level, internalformat, x, y, width, border)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	TextureInternalFormat in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	param		border		CheckedInt32 in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore ### EXT
+
+CopyMultiTexImage2DEXT(texunit, target, level, internalformat, x, y, width, height, border)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	TextureInternalFormat in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		border		CheckedInt32 in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore ### EXT
+
+CopyMultiTexSubImage1DEXT(texunit, target, level, xoffset, x, y, width)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore ### EXT
+
+CopyMultiTexSubImage2DEXT(texunit, target, level, xoffset, yoffset, x, y, width, height)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		yoffset		CheckedInt32 in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore ### EXT
+
+# New 1.1 multitexture queries
+
+GetMultiTexImageEXT(texunit, target, level, format, type, pixels)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void out array [COMPSIZE(target/level/format/type)]
+	category	EXT_direct_state_access
+	dlflags		notlistable
+	glxflags	ignore ### client-handcode server-handcode
+	extension	soft WINSOFT
+	glfflags	capture-execute capture-handcode decode-handcode pixel-pack
+
+GetMultiTexParameterfvEXT(texunit, target, pname, params)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		pname		GetTextureParameter in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	dlflags		notlistable
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	capture-execute gl-enum
+
+GetMultiTexParameterivEXT(texunit, target, pname, params)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		pname		GetTextureParameter in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	dlflags		notlistable
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	capture-execute gl-enum
+
+GetMultiTexLevelParameterfvEXT(texunit, target, level, pname, params)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		pname		GetTextureParameter in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	dlflags		notlistable
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	capture-execute gl-enum
+
+GetMultiTexLevelParameterivEXT(texunit, target, level, pname, params)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		pname		GetTextureParameter in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	dlflags		notlistable
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	capture-execute gl-enum
+
+# New 1.2 3D multitexture commands
+
+MultiTexImage3DEXT(texunit, target, level, internalformat, width, height, depth, border, format, type, pixels)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	TextureInternalFormat in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		border		CheckedInt32 in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void in array [COMPSIZE(format/type/width/height/depth)]
+	category	EXT_direct_state_access
+	dlflags		handcode
+	glxflags	ignore ### client-handcode server-handcode EXT
+	extension	soft WINSOFT
+	glfflags	ignore
+
+MultiTexSubImage3DEXT(texunit, target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		yoffset		CheckedInt32 in value
+	param		zoffset		CheckedInt32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		format		PixelFormat in value
+	param		type		PixelType in value
+	param		pixels		Void in array [COMPSIZE(format/type/width/height/depth)]
+	category	EXT_direct_state_access
+	dlflags		handcode
+	glxflags	ignore ### client-handcode server-handcode EXT
+	extension	soft WINSOFT
+	glfflags	ignore
+
+CopyMultiTexSubImage3DEXT(texunit, target, level, xoffset, yoffset, zoffset, x, y, width, height)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		yoffset		CheckedInt32 in value
+	param		zoffset		CheckedInt32 in value
+	param		x		WinCoord in value
+	param		y		WinCoord in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	category	EXT_direct_state_access
+	glxflags	ignore ### EXT
+	extension	soft WINSOFT
+	glfflags	ignore
+
+# New 1.2.1 multitexture texture commands
+
+BindMultiTextureEXT(texunit, target, texture)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		texture		Texture in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore ### EXT
+
+EnableClientStateIndexedEXT(array, index)
+	return		void
+	param		array		EnableCap in value
+	param		index		UInt32 in value
+	category	EXT_direct_state_access
+	dlflags		notlistable
+	glxflags	ignore ### client-handcode client-intercept server-handcode
+	extension	soft WINSOFT
+
+DisableClientStateIndexedEXT(array, index)
+	return		void
+	param		array		EnableCap in value
+	param		index		UInt32 in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glxflags	ignore ### client-handcode client-intercept server-handcode
+
+MultiTexCoordPointerEXT(texunit, size, type, stride, pointer)
+	return		void
+	param		texunit		TextureUnit in value
+	param		size		Int32 in value
+	param		type		TexCoordPointerType in value
+	param		stride		SizeI in value
+	param		pointer		Void in array [COMPSIZE(size/type/stride)] retained
+	category	EXT_direct_state_access
+	dlflags		notlistable
+	glxflags	ignore ### client-handcode client-intercept server-handcode
+	extension	soft WINSOFT
+	glfflags	ignore
+
+MultiTexEnvfEXT(texunit, target, pname, param)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureEnvTarget in value
+	param		pname		TextureEnvParameter in value
+	param		param		CheckedFloat32 in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	vectorequiv	MultiTexEnvfvEXT
+	glxflags	ignore
+	glfflags	gl-enum
+
+MultiTexEnvfvEXT(texunit, target, pname, params)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureEnvTarget in value
+	param		pname		TextureEnvParameter in value
+	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	gl-enum
+
+MultiTexEnviEXT(texunit, target, pname, param)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureEnvTarget in value
+	param		pname		TextureEnvParameter in value
+	param		param		CheckedInt32 in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	vectorequiv	MultiTexEnvivEXT
+	glxflags	ignore
+	glfflags	gl-enum
+
+MultiTexEnvivEXT(texunit, target, pname, params)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureEnvTarget in value
+	param		pname		TextureEnvParameter in value
+	param		params		CheckedInt32 in array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	gl-enum
+
+MultiTexGendEXT(texunit, coord, pname, param)
+	return		void
+	param		texunit		TextureUnit in value
+	param		coord		TextureCoordName in value
+	param		pname		TextureGenParameter in value
+	param		param		Float64 in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	vectorequiv	MultiTexGendvEXT
+	glxflags	ignore
+	glfflags	gl-enum
+
+MultiTexGendvEXT(texunit, coord, pname, params)
+	return		void
+	param		texunit		TextureUnit in value
+	param		coord		TextureCoordName in value
+	param		pname		TextureGenParameter in value
+	param		params		Float64 in array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	gl-enum
+
+MultiTexGenfEXT(texunit, coord, pname, param)
+	return		void
+	param		texunit		TextureUnit in value
+	param		coord		TextureCoordName in value
+	param		pname		TextureGenParameter in value
+	param		param		CheckedFloat32 in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	vectorequiv	MultiTexGenfvEXT
+	glxflags	ignore
+	glfflags	gl-enum
+
+MultiTexGenfvEXT(texunit, coord, pname, params)
+	return		void
+	param		texunit		TextureUnit in value
+	param		coord		TextureCoordName in value
+	param		pname		TextureGenParameter in value
+	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	gl-enum
+
+MultiTexGeniEXT(texunit, coord, pname, param)
+	return		void
+	param		texunit		TextureUnit in value
+	param		coord		TextureCoordName in value
+	param		pname		TextureGenParameter in value
+	param		param		CheckedInt32 in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	vectorequiv	MultiTexGenivEXT
+	glxflags	ignore
+	glfflags	gl-enum
+
+MultiTexGenivEXT(texunit, coord, pname, params)
+	return		void
+	param		texunit		TextureUnit in value
+	param		coord		TextureCoordName in value
+	param		pname		TextureGenParameter in value
+	param		params		CheckedInt32 in array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	gl-enum
+
+# New 1.2.1 multitexture texture queries
+
+GetMultiTexEnvfvEXT(texunit, target, pname, params)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureEnvTarget in value
+	param		pname		TextureEnvParameter in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	dlflags		notlistable
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	capture-execute gl-enum
+
+GetMultiTexEnvivEXT(texunit, target, pname, params)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureEnvTarget in value
+	param		pname		TextureEnvParameter in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	dlflags		notlistable
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	capture-execute gl-enum
+
+GetMultiTexGendvEXT(texunit, coord, pname, params)
+	return		void
+	param		texunit		TextureUnit in value
+	param		coord		TextureCoordName in value
+	param		pname		TextureGenParameter in value
+	param		params		Float64 out array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	dlflags		notlistable
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	capture-execute gl-enum
+
+GetMultiTexGenfvEXT(texunit, coord, pname, params)
+	return		void
+	param		texunit		TextureUnit in value
+	param		coord		TextureCoordName in value
+	param		pname		TextureGenParameter in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	dlflags		notlistable
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	capture-execute gl-enum
+
+GetMultiTexGenivEXT(texunit, coord, pname, params)
+	return		void
+	param		texunit		TextureUnit in value
+	param		coord		TextureCoordName in value
+	param		pname		TextureGenParameter in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	dlflags		notlistable
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	capture-execute gl-enum
+
+# From EXT_draw_buffers2
+# EnableIndexedEXT
+# DisableIndexedEXT
+# IsEnabledIndexedEXT
+
+GetFloatIndexedvEXT(target, index, data)
+	return		void
+	param		target		TypeEnum in value
+	param		index		UInt32 in value
+	param		data		Float32 out array [COMPSIZE(target)]
+	category	EXT_direct_state_access
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+	extension	soft WINSOFT
+
+GetDoubleIndexedvEXT(target, index, data)
+	return		void
+	param		target		TypeEnum in value
+	param		index		UInt32 in value
+	param		data		Float64 out array [COMPSIZE(target)]
+	category	EXT_direct_state_access
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+	extension	soft WINSOFT
+
+GetPointerIndexedvEXT(target, index, data)
+	return		void
+	param		target		TypeEnum in value
+	param		index		UInt32 in value
+	param		data		VoidPointer out array [COMPSIZE(target)]
+	category	EXT_direct_state_access
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+	extension	soft WINSOFT
+
+# New compressed texture commands
+
+CompressedTextureImage3DEXT(texture, target, level, internalformat, width, height, depth, border, imageSize, bits)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	TextureInternalFormat in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		border		CheckedInt32 in value
+	param		imageSize	SizeI in value
+	param		bits		Void in array [imageSize]
+	category	EXT_direct_state_access
+	dlflags		handcode
+	glxflags	ignore ### client-handcode server-handcode
+	glfflags	ignore
+	extension	soft WINSOFT
+
+CompressedTextureImage2DEXT(texture, target, level, internalformat, width, height, border, imageSize, bits)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	TextureInternalFormat in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		border		CheckedInt32 in value
+	param		imageSize	SizeI in value
+	param		bits		Void in array [imageSize]
+	category	EXT_direct_state_access
+	dlflags		handcode
+	glxflags	ignore ### client-handcode server-handcode
+	glfflags	ignore
+	extension	soft WINSOFT
+
+CompressedTextureImage1DEXT(texture, target, level, internalformat, width, border, imageSize, bits)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	TextureInternalFormat in value
+	param		width		SizeI in value
+	param		border		CheckedInt32 in value
+	param		imageSize	SizeI in value
+	param		bits		Void in array [imageSize]
+	category	EXT_direct_state_access
+	dlflags		handcode
+	glxflags	ignore ### client-handcode server-handcode
+	glfflags	ignore
+	extension	soft WINSOFT
+
+CompressedTextureSubImage3DEXT(texture, target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, bits)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		yoffset		CheckedInt32 in value
+	param		zoffset		CheckedInt32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		format		PixelFormat in value
+	param		imageSize	SizeI in value
+	param		bits		Void in array [imageSize]
+	category	EXT_direct_state_access
+	dlflags		handcode
+	glxflags	ignore ### client-handcode server-handcode
+	glfflags	ignore
+	extension	soft WINSOFT
+
+CompressedTextureSubImage2DEXT(texture, target, level, xoffset, yoffset, width, height, format, imageSize, bits)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		yoffset		CheckedInt32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		format		PixelFormat in value
+	param		imageSize	SizeI in value
+	param		bits		Void in array [imageSize]
+	category	EXT_direct_state_access
+	dlflags		handcode
+	glxflags	ignore ### client-handcode server-handcode
+	glfflags	ignore
+	extension	soft WINSOFT
+
+CompressedTextureSubImage1DEXT(texture, target, level, xoffset, width, format, imageSize, bits)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		width		SizeI in value
+	param		format		PixelFormat in value
+	param		imageSize	SizeI in value
+	param		bits		Void in array [imageSize]
+	category	EXT_direct_state_access
+	dlflags		handcode
+	glxflags	ignore ### client-handcode server-handcode
+	glfflags	ignore
+	extension	soft WINSOFT
+
+# New compressed texture query
+
+GetCompressedTextureImageEXT(texture, target, lod, img)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		lod		CheckedInt32 in value
+	param		img		Void out array [COMPSIZE(target/lod)]
+	category	EXT_direct_state_access
+	dlflags		notlistable
+	glxflags	ignore ### server-handcode
+	extension	soft WINSOFT
+
+# New compressed multitexture commands
+
+CompressedMultiTexImage3DEXT(texunit, target, level, internalformat, width, height, depth, border, imageSize, bits)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	TextureInternalFormat in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		border		CheckedInt32 in value
+	param		imageSize	SizeI in value
+	param		bits		Void in array [imageSize]
+	category	EXT_direct_state_access
+	dlflags		handcode
+	glxflags	ignore ### client-handcode server-handcode
+	glfflags	ignore
+	extension	soft WINSOFT
+
+CompressedMultiTexImage2DEXT(texunit, target, level, internalformat, width, height, border, imageSize, bits)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	TextureInternalFormat in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		border		CheckedInt32 in value
+	param		imageSize	SizeI in value
+	param		bits		Void in array [imageSize]
+	category	EXT_direct_state_access
+	dlflags		handcode
+	glxflags	ignore ### client-handcode server-handcode
+	glfflags	ignore
+	extension	soft WINSOFT
+
+CompressedMultiTexImage1DEXT(texunit, target, level, internalformat, width, border, imageSize, bits)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		internalformat	TextureInternalFormat in value
+	param		width		SizeI in value
+	param		border		CheckedInt32 in value
+	param		imageSize	SizeI in value
+	param		bits		Void in array [imageSize]
+	category	EXT_direct_state_access
+	dlflags		handcode
+	glxflags	ignore ### client-handcode server-handcode
+	glfflags	ignore
+	extension	soft WINSOFT
+
+CompressedMultiTexSubImage3DEXT(texunit, target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, bits)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		yoffset		CheckedInt32 in value
+	param		zoffset		CheckedInt32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		format		PixelFormat in value
+	param		imageSize	SizeI in value
+	param		bits		Void in array [imageSize]
+	category	EXT_direct_state_access
+	dlflags		handcode
+	glxflags	ignore ### client-handcode server-handcode
+	glfflags	ignore
+	extension	soft WINSOFT
+
+CompressedMultiTexSubImage2DEXT(texunit, target, level, xoffset, yoffset, width, height, format, imageSize, bits)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		yoffset		CheckedInt32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		format		PixelFormat in value
+	param		imageSize	SizeI in value
+	param		bits		Void in array [imageSize]
+	category	EXT_direct_state_access
+	dlflags		handcode
+	glxflags	ignore ### client-handcode server-handcode
+	glfflags	ignore
+	extension	soft WINSOFT
+
+CompressedMultiTexSubImage1DEXT(texunit, target, level, xoffset, width, format, imageSize, bits)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		level		CheckedInt32 in value
+	param		xoffset		CheckedInt32 in value
+	param		width		SizeI in value
+	param		format		PixelFormat in value
+	param		imageSize	SizeI in value
+	param		bits		Void in array [imageSize]
+	category	EXT_direct_state_access
+	dlflags		handcode
+	glxflags	ignore ### client-handcode server-handcode
+	glfflags	ignore
+	extension	soft WINSOFT
+
+# New compressed multitexture query
+
+GetCompressedMultiTexImageEXT(texunit, target, lod, img)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		lod		CheckedInt32 in value
+	param		img		Void out array [COMPSIZE(target/lod)]
+	category	EXT_direct_state_access
+	dlflags		notlistable
+	glxflags	ignore ### server-handcode
+	extension	soft WINSOFT
+
+# New ARB assembly program named commands
+
+NamedProgramStringEXT(program, target, format, len, string)
+	return		void
+	param		program		UInt32 in value
+	param		target		ProgramTarget in value
+	param		format		ProgramFormat in value
+	param		len		SizeI in value
+	param		string		Void in array [len]
+	category	EXT_direct_state_access
+	subcategory	ARB_vertex_program
+	extension	soft WINSOFT
+	glfflags	ignore
+	glxflags	ignore ### client-handcode server-handcode EXT
+	glextmask	GL_MASK_ARB_vertex_program|GL_MASK_ARB_fragment_program
+
+NamedProgramLocalParameter4dEXT(program, target, index, x, y, z, w)
+	return		void
+	param		program		UInt32 in value
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	param		z		Float64 in value
+	param		w		Float64 in value
+	category	EXT_direct_state_access
+	subcategory	ARB_vertex_program
+	vectorequiv	NamedProgramLocalParameter4dvEXT
+	glxvectorequiv	NamedProgramLocalParameter4dvEXT
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore ### EXT
+	glextmask	GL_MASK_ARB_vertex_program|GL_MASK_ARB_fragment_program
+
+NamedProgramLocalParameter4dvEXT(program, target, index, params)
+	return		void
+	param		program		UInt32 in value
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		params		Float64 in array [4]
+	category	EXT_direct_state_access
+	subcategory	ARB_vertex_program
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore ### EXT
+	glextmask	GL_MASK_ARB_vertex_program|GL_MASK_ARB_fragment_program
+
+NamedProgramLocalParameter4fEXT(program, target, index, x, y, z, w)
+	return		void
+	param		program		UInt32 in value
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	param		z		Float32 in value
+	param		w		Float32 in value
+	category	EXT_direct_state_access
+	subcategory	ARB_vertex_program
+	vectorequiv	NamedProgramLocalParameter4fvEXT
+	glxvectorequiv	NamedProgramLocalParameter4fvEXT
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore ### EXT
+	glextmask	GL_MASK_ARB_vertex_program|GL_MASK_ARB_fragment_program
+
+NamedProgramLocalParameter4fvEXT(program, target, index, params)
+	return		void
+	param		program		UInt32 in value
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		params		Float32 in array [4]
+	category	EXT_direct_state_access
+	subcategory	ARB_vertex_program
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore ### EXT
+	glextmask	GL_MASK_ARB_vertex_program|GL_MASK_ARB_fragment_program
+
+# New ARB assembly program named queries
+
+GetNamedProgramLocalParameterdvEXT(program, target, index, params)
+	return		void
+	param		program		UInt32 in value
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		params		Float64 out array [4]
+	dlflags		notlistable
+	category	EXT_direct_state_access
+	subcategory	ARB_vertex_program
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore ### client-handcode server-handcode EXT
+	glextmask	GL_MASK_ARB_vertex_program|GL_MASK_ARB_fragment_program
+
+GetNamedProgramLocalParameterfvEXT(program, target, index, params)
+	return		void
+	param		program		UInt32 in value
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		params		Float32 out array [4]
+	dlflags		notlistable
+	category	EXT_direct_state_access
+	subcategory	ARB_vertex_program
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore ### client-handcode server-handcode EXT
+	glextmask	GL_MASK_ARB_vertex_program|GL_MASK_ARB_fragment_program
+
+GetNamedProgramivEXT(program, target, pname, params)
+	return		void
+	param		program		UInt32 in value
+	param		target		ProgramTarget in value
+	param		pname		ProgramProperty in value
+	param		params		Int32 out array [1]
+	dlflags		notlistable
+	category	EXT_direct_state_access
+	subcategory	ARB_vertex_program
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore ### client-handcode server-handcode EXT
+	glextmask	GL_MASK_ARB_vertex_program|GL_MASK_ARB_fragment_program
+
+GetNamedProgramStringEXT(program, target, pname, string)
+	return		void
+	param		program		UInt32 in value
+	param		target		ProgramTarget in value
+	param		pname		ProgramStringProperty in value
+	param		string		Void out array [COMPSIZE(program,pname)]
+	dlflags		notlistable
+	category	EXT_direct_state_access
+	subcategory	ARB_vertex_program
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore ### client-handcode server-handcode EXT
+	glextmask	GL_MASK_ARB_vertex_program|GL_MASK_ARB_fragment_program
+
+# New EXT_gpu_program_parameters command
+
+NamedProgramLocalParameters4fvEXT(program, target, index, count, params)
+	return		void
+	param		program		UInt32 in value
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		count		SizeI in value
+	param		params		Float32 in array [count*4]
+	category	EXT_direct_state_access
+	subcategory	EXT_gpu_program_parameters
+	extension	soft WINSOFT NV10
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_EXT_gpu_program_parameters
+
+# New NV_gpu_program4 commands
+
+NamedProgramLocalParameterI4iEXT(program, target, index, x, y, z, w)
+	return		void
+	param		program		UInt32 in value
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		x		Int32 in value
+	param		y		Int32 in value
+	param		z		Int32 in value
+	param		w		Int32 in value
+	category	EXT_direct_state_access
+	subcategory	NV_gpu_program4
+	vectorequiv	NamedProgramLocalParameterI4ivEXT
+	glxvectorequiv	NamedProgramLocalParameterI4ivEXT
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_NV_gpu_program4
+
+NamedProgramLocalParameterI4ivEXT(program, target, index, params)
+	return		void
+	param		program		UInt32 in value
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		params		Int32 in array [4]
+	category	EXT_direct_state_access
+	subcategory	NV_gpu_program4
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_NV_gpu_program4
+
+NamedProgramLocalParametersI4ivEXT(program, target, index, count, params)
+	return		void
+	param		program		UInt32 in value
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		count		SizeI in value
+	param		params		Int32 in array [count*4]
+	category	EXT_direct_state_access
+	subcategory	NV_gpu_program4
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_NV_gpu_program4
+
+NamedProgramLocalParameterI4uiEXT(program, target, index, x, y, z, w)
+	return		void
+	param		program		UInt32 in value
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		x		UInt32 in value
+	param		y		UInt32 in value
+	param		z		UInt32 in value
+	param		w		UInt32 in value
+	category	EXT_direct_state_access
+	subcategory	NV_gpu_program4
+	vectorequiv	NamedProgramLocalParameterI4uivEXT
+	glxvectorequiv	NamedProgramLocalParameterI4uivEXT
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_NV_gpu_program4
+
+NamedProgramLocalParameterI4uivEXT(program, target, index, params)
+	return		void
+	param		program		UInt32 in value
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		params		UInt32 in array [4]
+	category	EXT_direct_state_access
+	subcategory	NV_gpu_program4
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_NV_gpu_program4
+
+NamedProgramLocalParametersI4uivEXT(program, target, index, count, params)
+	return		void
+	param		program		UInt32 in value
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		count		SizeI in value
+	param		params		UInt32 in array [count*4]
+	category	EXT_direct_state_access
+	subcategory	NV_gpu_program4
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_NV_gpu_program4
+
+GetNamedProgramLocalParameterIivEXT(program, target, index, params)
+	return		void
+	param		program		UInt32 in value
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		params		Int32 out array [4]
+	dlflags		notlistable
+	category	EXT_direct_state_access
+	subcategory	NV_gpu_program4
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_NV_gpu_program4
+
+GetNamedProgramLocalParameterIuivEXT(program, target, index, params)
+	return		void
+	param		program		UInt32 in value
+	param		target		ProgramTarget in value
+	param		index		UInt32 in value
+	param		params		UInt32 out array [4]
+	dlflags		notlistable
+	category	EXT_direct_state_access
+	subcategory	NV_gpu_program4
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_NV_gpu_program4
+
+# New EXT_texture_integer texture object commands
+
+TextureParameterIivEXT(texture, target, pname, params)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		pname		TextureParameterName in value
+	param		params		CheckedInt32 in array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	subcategory	EXT_texture_integer
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+	glextmask	GL_MASK_EXT_texture_integer
+
+TextureParameterIuivEXT(texture, target, pname, params)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		pname		TextureParameterName in value
+	param		params		UInt32 in array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	subcategory	EXT_texture_integer
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+	glextmask	GL_MASK_EXT_texture_integer
+
+# New EXT_texture_integer texture object queries
+
+GetTextureParameterIivEXT(texture, target, pname, params)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		pname		GetTextureParameter in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	subcategory	EXT_texture_integer
+	dlflags		notlistable
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	capture-execute gl-enum
+	glextmask	GL_MASK_EXT_texture_integer
+
+GetTextureParameterIuivEXT(texture, target, pname, params)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		pname		GetTextureParameter in value
+	param		params		UInt32 out array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	subcategory	EXT_texture_integer
+	dlflags		notlistable
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	capture-execute gl-enum
+	glextmask	GL_MASK_EXT_texture_integer
+
+# New EXT_texture_integer multitexture commands
+
+MultiTexParameterIivEXT(texunit, target, pname, params)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		pname		TextureParameterName in value
+	param		params		CheckedInt32 in array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	subcategory	EXT_texture_integer
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+	glextmask	GL_MASK_EXT_texture_integer
+
+MultiTexParameterIuivEXT(texunit, target, pname, params)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		pname		TextureParameterName in value
+	param		params		UInt32 in array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	subcategory	EXT_texture_integer
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	ignore
+	glextmask	GL_MASK_EXT_texture_integer
+
+# New EXT_texture_integer multitexture queries
+
+GetMultiTexParameterIivEXT(texunit, target, pname, params)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		pname		GetTextureParameter in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	subcategory	EXT_texture_integer
+	dlflags		notlistable
+	extension	soft WINSOFT
+	glfflags	capture-execute gl-enum
+	glxflags	ignore
+	glextmask	GL_MASK_EXT_texture_integer
+
+GetMultiTexParameterIuivEXT(texunit, target, pname, params)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		pname		GetTextureParameter in value
+	param		params		UInt32 out array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	subcategory	EXT_texture_integer
+	dlflags		notlistable
+	extension	soft WINSOFT
+	glfflags	capture-execute gl-enum
+	glxflags	ignore
+	glextmask	GL_MASK_EXT_texture_integer
+
+# New GLSL 2.0 uniform commands
+
+ProgramUniform1fEXT(program, location, v0)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		Float32 in value
+	category	EXT_direct_state_access
+	subcategory	VERSION_2_0
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniform2fEXT(program, location, v0, v1)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		Float32 in value
+	param		v1		Float32 in value
+	category	EXT_direct_state_access
+	subcategory	VERSION_2_0
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniform3fEXT(program, location, v0, v1, v2)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		Float32 in value
+	param		v1		Float32 in value
+	param		v2		Float32 in value
+	category	EXT_direct_state_access
+	subcategory	VERSION_2_0
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniform4fEXT(program, location, v0, v1, v2, v3)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		Float32 in value
+	param		v1		Float32 in value
+	param		v2		Float32 in value
+	param		v3		Float32 in value
+	category	EXT_direct_state_access
+	subcategory	VERSION_2_0
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniform1iEXT(program, location, v0)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		Int32 in value
+	category	EXT_direct_state_access
+	subcategory	VERSION_2_0
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniform2iEXT(program, location, v0, v1)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		Int32 in value
+	param		v1		Int32 in value
+	category	EXT_direct_state_access
+	subcategory	VERSION_2_0
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniform3iEXT(program, location, v0, v1, v2)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		Int32 in value
+	param		v1		Int32 in value
+	param		v2		Int32 in value
+	category	EXT_direct_state_access
+	subcategory	VERSION_2_0
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniform4iEXT(program, location, v0, v1, v2, v3)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		Int32 in value
+	param		v1		Int32 in value
+	param		v2		Int32 in value
+	param		v3		Int32 in value
+	category	EXT_direct_state_access
+	subcategory	VERSION_2_0
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniform1fvEXT(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float32 in array [count]
+	category	EXT_direct_state_access
+	subcategory	VERSION_2_0
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniform2fvEXT(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float32 in array [count*2]
+	category	EXT_direct_state_access
+	subcategory	VERSION_2_0
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniform3fvEXT(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float32 in array [count*3]
+	category	EXT_direct_state_access
+	subcategory	VERSION_2_0
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniform4fvEXT(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float32 in array [count*4]
+	category	EXT_direct_state_access
+	subcategory	VERSION_2_0
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniform1ivEXT(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Int32 in array [count]
+	category	EXT_direct_state_access
+	subcategory	VERSION_2_0
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniform2ivEXT(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Int32 in array [count*2]
+	category	EXT_direct_state_access
+	subcategory	VERSION_2_0
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniform3ivEXT(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Int32 in array [count*3]
+	category	EXT_direct_state_access
+	subcategory	VERSION_2_0
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniform4ivEXT(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Int32 in array [count*4]
+	category	EXT_direct_state_access
+	subcategory	VERSION_2_0
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniformMatrix2fvEXT(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [count*4]
+	category	EXT_direct_state_access
+	subcategory	VERSION_2_0
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniformMatrix3fvEXT(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [count*9]
+	category	EXT_direct_state_access
+	subcategory	VERSION_2_0
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniformMatrix4fvEXT(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [count*16]
+	category	EXT_direct_state_access
+	subcategory	VERSION_2_0
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+# New GLSL 2.1 uniform commands
+
+ProgramUniformMatrix2x3fvEXT(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [count*6]
+	category	EXT_direct_state_access
+	subcategory	VERSION_2_1
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniformMatrix3x2fvEXT(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [count*6]
+	category	EXT_direct_state_access
+	subcategory	VERSION_2_1
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniformMatrix2x4fvEXT(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [count*8]
+	category	EXT_direct_state_access
+	subcategory	VERSION_2_1
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniformMatrix4x2fvEXT(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [count*8]
+	category	EXT_direct_state_access
+	subcategory	VERSION_2_1
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniformMatrix3x4fvEXT(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [count*12]
+	category	EXT_direct_state_access
+	subcategory	VERSION_2_1
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniformMatrix4x3fvEXT(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float32 in array [count*12]
+	category	EXT_direct_state_access
+	subcategory	VERSION_2_1
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+# New EXT_gpu_shader4 commands
+
+ProgramUniform1uiEXT(program, location, v0)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		UInt32 in value
+	category	EXT_direct_state_access
+	subcategory	EXT_gpu_shader4
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniform2uiEXT(program, location, v0, v1)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		UInt32 in value
+	param		v1		UInt32 in value
+	category	EXT_direct_state_access
+	subcategory	EXT_gpu_shader4
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniform3uiEXT(program, location, v0, v1, v2)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		UInt32 in value
+	param		v1		UInt32 in value
+	param		v2		UInt32 in value
+	category	EXT_direct_state_access
+	subcategory	EXT_gpu_shader4
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniform4uiEXT(program, location, v0, v1, v2, v3)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		v0		UInt32 in value
+	param		v1		UInt32 in value
+	param		v2		UInt32 in value
+	param		v3		UInt32 in value
+	category	EXT_direct_state_access
+	subcategory	EXT_gpu_shader4
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniform1uivEXT(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt32 in array [count]
+	category	EXT_direct_state_access
+	subcategory	EXT_gpu_shader4
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniform2uivEXT(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt32 in array [count*2]
+	category	EXT_direct_state_access
+	subcategory	EXT_gpu_shader4
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniform3uivEXT(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt32 in array [count*3]
+	category	EXT_direct_state_access
+	subcategory	EXT_gpu_shader4
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+ProgramUniform4uivEXT(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt32 in array [count*4]
+	category	EXT_direct_state_access
+	subcategory	EXT_gpu_shader4
+	glfflags	ignore
+	glxflags	ignore
+	extension	soft WINSOFT
+	glextmask	GL_MASK_OpenGL_2_0
+
+# New named buffer commands
+
+NamedBufferDataEXT(buffer, size, data, usage)
+	return		void
+	param		buffer		UInt32 in value
+	param		size		Sizeiptr in value
+	param		data		Void in array [COMPSIZE(size)]
+	param		usage		VertexBufferObjectUsage in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+
+NamedBufferSubDataEXT(buffer, offset, size, data)
+	return		void
+	param		buffer		UInt32 in value
+	param		offset		Intptr in value
+	param		size		Sizeiptr in value
+	param		data		Void in array [COMPSIZE(size)]
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+
+MapNamedBufferEXT(buffer, access)
+	return		VoidPointer
+	param		buffer		UInt32 in value
+	param		access		VertexBufferObjectAccess in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+
+UnmapNamedBufferEXT(buffer)
+	return		Boolean
+	param		buffer		UInt32 in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+
+MapNamedBufferRangeEXT(buffer, offset, length, access)
+	return		VoidPointer
+	param		buffer		UInt32 in value
+	param		offset		Intptr in value
+	param		length		Sizeiptr in value
+	param		access		BufferAccessMask in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+
+FlushMappedNamedBufferRangeEXT(buffer, offset, length)
+	return		void
+	param		buffer		UInt32 in value
+	param		offset		Intptr in value
+	param		length		Sizeiptr in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+
+NamedCopyBufferSubDataEXT(readBuffer, writeBuffer, readOffset, writeOffset, size)
+	return		void
+	param		readBuffer	UInt32 in value
+	param		writeBuffer	UInt32 in value
+	param		readOffset	Intptr in value
+	param		writeOffset	Intptr in value
+	param		size		Sizeiptr in value
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+
+# New named buffer queries
+
+GetNamedBufferParameterivEXT(buffer, pname, params)
+	return		void
+	param		buffer		UInt32 in value
+	param		pname		VertexBufferObjectParameter in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+
+GetNamedBufferPointervEXT(buffer, pname, params)
+	return		void
+	param		buffer		UInt32 in value
+	param		pname		VertexBufferObjectParameter in value
+	param		params		VoidPointer out array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+
+GetNamedBufferSubDataEXT(buffer, offset, size, data)
+	return		void
+	param		buffer		UInt32 in value
+	param		offset		Intptr in value
+	param		size		Sizeiptr in value
+	param		data		Void out array [COMPSIZE(size)]
+	category	EXT_direct_state_access
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glxflags	ignore
+	glfflags	ignore
+
+# New named texture buffer texture object command
+
+TextureBufferEXT(texture, target, internalformat, buffer)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		internalformat	TypeEnum in value
+	param		buffer		UInt32 in value
+	category	EXT_direct_state_access
+	subcategory	EXT_texture_buffer_object
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_EXT_texture_buffer_object
+	dlflags		notlistable
+
+# New named texture buffer multitexture command
+
+MultiTexBufferEXT(texunit, target, internalformat, buffer)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		internalformat	TypeEnum in value
+	param		buffer		UInt32 in value
+	category	EXT_direct_state_access
+	subcategory	EXT_texture_buffer_object
+	extension	soft WINSOFT NV50
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_EXT_texture_buffer_object
+	dlflags		notlistable
+
+# New named frame buffer object commands
+
+NamedRenderbufferStorageEXT(renderbuffer, internalformat, width, height)
+	return		void
+	param		renderbuffer	Renderbuffer in value
+	param		internalformat	PixelInternalFormat in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	category	EXT_direct_state_access
+	subcategory	EXT_framebuffer_object
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_EXT_framebuffer_object
+
+GetNamedRenderbufferParameterivEXT(renderbuffer, pname, params)
+	return		void
+	param		renderbuffer	Renderbuffer in value
+	param		pname		RenderbufferParameterName in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	subcategory	EXT_framebuffer_object
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_EXT_framebuffer_object
+
+CheckNamedFramebufferStatusEXT(framebuffer, target)
+	return		FramebufferStatus
+	param		framebuffer	Framebuffer in value
+	param		target		FramebufferTarget in value
+	category	EXT_direct_state_access
+	subcategory	EXT_framebuffer_object
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_EXT_framebuffer_object
+
+NamedFramebufferTexture1DEXT(framebuffer, attachment, textarget, texture, level)
+	return		void
+	param		framebuffer	Framebuffer in value
+	param		attachment	FramebufferAttachment in value
+	param		textarget	TextureTarget in value
+	param		texture		Texture in value
+	param		level		CheckedInt32 in value
+	category	EXT_direct_state_access
+	subcategory	EXT_framebuffer_object
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_EXT_framebuffer_object
+
+NamedFramebufferTexture2DEXT(framebuffer, attachment, textarget, texture, level)
+	return		void
+	param		framebuffer	Framebuffer in value
+	param		attachment	FramebufferAttachment in value
+	param		textarget	TextureTarget in value
+	param		texture		Texture in value
+	param		level		CheckedInt32 in value
+	category	EXT_direct_state_access
+	subcategory	EXT_framebuffer_object
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_EXT_framebuffer_object
+
+NamedFramebufferTexture3DEXT(framebuffer, attachment, textarget, texture, level, zoffset)
+	return		void
+	param		framebuffer	Framebuffer in value
+	param		attachment	FramebufferAttachment in value
+	param		textarget	TextureTarget in value
+	param		texture		Texture in value
+	param		level		CheckedInt32 in value
+	param		zoffset		CheckedInt32 in value
+	category	EXT_direct_state_access
+	subcategory	EXT_framebuffer_object
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_EXT_framebuffer_object
+
+NamedFramebufferRenderbufferEXT(framebuffer, attachment, renderbuffertarget, renderbuffer)
+	return		void
+	param		framebuffer	Framebuffer in value
+	param		attachment	FramebufferAttachment in value
+	param		renderbuffertarget RenderbufferTarget in value
+	param		renderbuffer	Renderbuffer in value
+	category	EXT_direct_state_access
+	subcategory	EXT_framebuffer_object
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_EXT_framebuffer_object
+
+GetNamedFramebufferAttachmentParameterivEXT(framebuffer, attachment, pname, params)
+	return		void
+	param		framebuffer	Framebuffer in value
+	param		attachment	FramebufferAttachment in value
+	param		pname		FramebufferAttachmentParameterName in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	subcategory	EXT_framebuffer_object
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_EXT_framebuffer_object
+
+GenerateTextureMipmapEXT(texture, target)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	category	EXT_direct_state_access
+	subcategory	EXT_framebuffer_object
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_EXT_framebuffer_object
+
+GenerateMultiTexMipmapEXT(texunit, target)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	category	EXT_direct_state_access
+	subcategory	EXT_framebuffer_object
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_EXT_framebuffer_object
+
+FramebufferDrawBufferEXT(framebuffer, mode)
+	return		void
+	param		framebuffer	Framebuffer in value
+	param		mode		DrawBufferMode in value
+	category	EXT_direct_state_access
+	subcategory	EXT_framebuffer_object
+	extension	soft WINSOFT
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_EXT_framebuffer_object
+
+FramebufferDrawBuffersEXT(framebuffer, n, bufs)
+	return		void
+	param		framebuffer	Framebuffer in value
+	param		n		SizeI in value
+	param		bufs		DrawBufferMode in array [n]
+	category	EXT_direct_state_access
+	subcategory	EXT_framebuffer_object
+	extension	soft WINSOFT
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_EXT_framebuffer_object
+
+FramebufferReadBufferEXT(framebuffer, mode)
+	return		void
+	param		framebuffer	Framebuffer in value
+	param		mode		ReadBufferMode in value
+	category	EXT_direct_state_access
+	subcategory	EXT_framebuffer_object
+	extension	soft WINSOFT
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_EXT_framebuffer_object
+
+GetFramebufferParameterivEXT(framebuffer, pname, params)
+	return		void
+	param		framebuffer	Framebuffer in value
+	param		pname		GetFramebufferParameter in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	EXT_direct_state_access
+	subcategory	EXT_framebuffer_object
+	dlflags		notlistable
+	extension	soft WINSOFT
+	glxflags	ignore
+	glfflags	capture-execute gl-enum
+
+# New named framebuffer multisample object commands
+
+NamedRenderbufferStorageMultisampleEXT(renderbuffer, samples, internalformat, width, height)
+	return		void
+	param		renderbuffer	Renderbuffer in value
+	param		samples		SizeI in value
+	param		internalformat	PixelInternalFormat in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	category	EXT_direct_state_access
+	subcategory	EXT_framebuffer_multisample
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_EXT_framebuffer_multisample
+
+# New named framebuffer multisample coverage object commands
+
+NamedRenderbufferStorageMultisampleCoverageEXT(renderbuffer, coverageSamples, colorSamples, internalformat, width, height)
+	return		void
+	param		renderbuffer	Renderbuffer in value
+	param		coverageSamples SizeI in value
+	param		colorSamples	SizeI in value
+	param		internalformat	PixelInternalFormat in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	category	EXT_direct_state_access
+	subcategory	NV_framebuffer_multisample_coverage
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_NV_framebuffer_multisample_coverage
+
+# New named geometry program/shader frame buffer object commands
+
+NamedFramebufferTextureEXT(framebuffer, attachment, texture, level)
+	return		void
+	param		framebuffer	Framebuffer in value
+	param		attachment	FramebufferAttachment in value
+	param		texture		Texture in value
+	param		level		CheckedInt32 in value
+	category	EXT_direct_state_access
+	subcategory	NV_gpu_program4
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_NV_gpu_program4
+
+NamedFramebufferTextureLayerEXT(framebuffer, attachment, texture, level, layer)
+	return		void
+	param		framebuffer	Framebuffer in value
+	param		attachment	FramebufferAttachment in value
+	param		texture		Texture in value
+	param		level		CheckedInt32 in value
+	param		layer		CheckedInt32 in value
+	category	EXT_direct_state_access
+	subcategory	NV_gpu_program4
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_NV_gpu_program4
+
+NamedFramebufferTextureFaceEXT(framebuffer, attachment, texture, level, face)
+	return		void
+	param		framebuffer	Framebuffer in value
+	param		attachment	FramebufferAttachment in value
+	param		texture		Texture in value
+	param		level		CheckedInt32 in value
+	param		face		TextureTarget in value
+	category	EXT_direct_state_access
+	subcategory	NV_gpu_program4
+	extension	soft WINSOFT
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_NV_gpu_program4
+
+# New explicit multisample query and commands
+
+TextureRenderbufferEXT(texture, target, renderbuffer)
+	return		void
+	param		texture		Texture in value
+	param		target		TextureTarget in value
+	param		renderbuffer	UInt32 in value
+	category	EXT_direct_state_access
+	subcategory	NV_explicit_multisample
+	extension	soft WINSOFT NV50
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_NV_explicit_multisample
+
+MultiTexRenderbufferEXT(texunit, target, renderbuffer)
+	return		void
+	param		texunit		TextureUnit in value
+	param		target		TextureTarget in value
+	param		renderbuffer	UInt32 in value
+	category	EXT_direct_state_access
+	subcategory	NV_explicit_multisample
+	extension	soft WINSOFT NV50
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+	glextmask	GL_MASK_NV_explicit_multisample
+
+# New ARB_gpu_shader_fp64 commands
+
+ProgramUniform1dEXT(program, location, x)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		x		Float64 in value
+	category	EXT_direct_state_access
+	subcategory	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform2dEXT(program, location, x, y)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	category	EXT_direct_state_access
+	subcategory	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform3dEXT(program, location, x, y, z)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	param		z		Float64 in value
+	category	EXT_direct_state_access
+	subcategory	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform4dEXT(program, location, x, y, z, w)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	param		z		Float64 in value
+	param		w		Float64 in value
+	category	EXT_direct_state_access
+	subcategory	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform1dvEXT(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float64 in array [count]
+	category	EXT_direct_state_access
+	subcategory	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform2dvEXT(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float64 in array [count]
+	category	EXT_direct_state_access
+	subcategory	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform3dvEXT(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float64 in array [count]
+	category	EXT_direct_state_access
+	subcategory	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform4dvEXT(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Float64 in array [count]
+	category	EXT_direct_state_access
+	subcategory	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformMatrix2dvEXT(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float64 in array [count]
+	category	EXT_direct_state_access
+	subcategory	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformMatrix3dvEXT(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float64 in array [count]
+	category	EXT_direct_state_access
+	subcategory	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformMatrix4dvEXT(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float64 in array [count]
+	category	EXT_direct_state_access
+	subcategory	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformMatrix2x3dvEXT(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float64 in array [count]
+	category	EXT_direct_state_access
+	subcategory	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformMatrix2x4dvEXT(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float64 in array [count]
+	category	EXT_direct_state_access
+	subcategory	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformMatrix3x2dvEXT(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float64 in array [count]
+	category	EXT_direct_state_access
+	subcategory	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformMatrix3x4dvEXT(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float64 in array [count]
+	category	EXT_direct_state_access
+	subcategory	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformMatrix4x2dvEXT(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float64 in array [count]
+	category	EXT_direct_state_access
+	subcategory	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformMatrix4x3dvEXT(program, location, count, transpose, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		transpose	Boolean in value
+	param		value		Float64 in array [count]
+	category	EXT_direct_state_access
+	subcategory	ARB_gpu_shader_fp64
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #354
+# EXT_vertex_array_bgra commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_vertex_array_bgra
+
+###############################################################################
+#
+# Extension #355 - WGL_NV_gpu_affinity
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #356
+# EXT_texture_swizzle commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_texture_swizzle
+
+###############################################################################
+#
+# Extension #357
+# NV_explicit_multisample commands
+#
+###############################################################################
+
+# From EXT_draw_buffers2:  GetBooleanIndexedvEXT / GetIntegerIndexedvEXT
+
+GetMultisamplefvNV(pname, index, val)
+	return		void
+	param		pname		GetMultisamplePNameNV in value
+	param		index		UInt32 in value
+	param		val		Float32 out array [2]
+	category	NV_explicit_multisample
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+
+SampleMaskIndexedNV(index, mask)
+	return		void
+	param		index		UInt32 in value
+	param		mask		SampleMaskNV in value
+	category	NV_explicit_multisample
+	glfflags	ignore
+	glxflags	ignore
+
+TexRenderbufferNV(target, renderbuffer)
+	return		void
+	param		target		TextureTarget in value
+	param		renderbuffer	UInt32 in value
+	category	NV_explicit_multisample
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+
+###############################################################################
+#
+# Extension #358
+# NV_transform_feedback2 commands
+#
+###############################################################################
+
+BindTransformFeedbackNV(target, id)
+	return		void
+	param		target		BufferTargetARB in value
+	param		id		UInt32 in value
+	category	NV_transform_feedback2
+	glfflags	ignore
+	glxflags	ignore
+
+DeleteTransformFeedbacksNV(n, ids)
+	return		void
+	param		n		SizeI in value
+	param		ids		UInt32 in array [n]
+	category	NV_transform_feedback2
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+
+GenTransformFeedbacksNV(n, ids)
+	return		void
+	param		n		SizeI in value
+	param		ids		UInt32 out array [n]
+	category	NV_transform_feedback2
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+
+IsTransformFeedbackNV(id)
+	return		Boolean
+	param		id		UInt32 in value
+	category	NV_transform_feedback2
+	dlflags		notlistable
+	glfflags	ignore
+	glxflags	ignore
+
+PauseTransformFeedbackNV()
+	return		void
+	category	NV_transform_feedback2
+	glfflags	ignore
+	glxflags	ignore
+
+ResumeTransformFeedbackNV()
+	return		void
+	category	NV_transform_feedback2
+	glfflags	ignore
+	glxflags	ignore
+
+DrawTransformFeedbackNV(mode, id)
+	return		void
+	param		mode		GLenum in value
+	param		id		UInt32 in value
+	category	NV_transform_feedback2
+	glfflags	ignore
+	glxflags	ignore
+
+###############################################################################
+#
+# Extension #359
+# ATI_meminfo commands
+#
+###############################################################################
+
+# (none)
+newcategory: ATI_meminfo
+
+###############################################################################
+#
+# Extension #360
+# AMD_performance_monitor commands
+#
+###############################################################################
+
+GetPerfMonitorGroupsAMD(numGroups, groupsSize, groups)
+	return		void
+	param		numGroups	Int32 out array [1]
+	param		groupsSize	SizeI in value
+	param		groups		UInt32 out array [groupsSize]
+	category	AMD_performance_monitor
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetPerfMonitorCountersAMD(group, numCounters, maxActiveCounters, counterSize, counters)
+	return		void
+	param		group		UInt32 in value
+	param		numCounters	Int32 out array [1]
+	param		maxActiveCounters Int32 out array [1]
+	param		counterSize	SizeI in value
+	param		counters	UInt32 out array [counterSize]
+	category	AMD_performance_monitor
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetPerfMonitorGroupStringAMD(group, bufSize, length, groupString)
+	return		void
+	param		group		UInt32 in value
+	param		bufSize		SizeI in value
+	param		length		SizeI out array [1]
+	param		groupString	Char out array [bufSize]
+	category	AMD_performance_monitor
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetPerfMonitorCounterStringAMD(group, counter, bufSize, length, counterString)
+	return		void
+	param		group		UInt32 in value
+	param		counter		UInt32 in value
+	param		bufSize		SizeI in value
+	param		length		SizeI out array [1]
+	param		counterString	Char out array [bufSize]
+	category	AMD_performance_monitor
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetPerfMonitorCounterInfoAMD(group, counter, pname, data)
+	return		void
+	param		group		UInt32 in value
+	param		counter		UInt32 in value
+	param		pname		GLenum in value
+	param		data		Void out array [COMPSIZE(pname)]
+	category	AMD_performance_monitor
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GenPerfMonitorsAMD(n, monitors)
+	return		void
+	param		n		SizeI in value
+	param		monitors	UInt32 out array [n]
+	category	AMD_performance_monitor
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+# 'monitors' is actually in, not out, but extension spec doesn't use const
+DeletePerfMonitorsAMD(n, monitors)
+	return		void
+	param		n		SizeI in value
+	param		monitors	UInt32 out array [n]
+	category	AMD_performance_monitor
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+# 'counterList' is actually in, not out, but extension spec doesn't use const
+SelectPerfMonitorCountersAMD(monitor, enable, group, numCounters, counterList)
+	return		void
+	param		monitor		UInt32 in value
+	param		enable		Boolean in value
+	param		group		UInt32 in value
+	param		numCounters	Int32 in value
+	param		counterList	UInt32 out array [numCounters]
+	category	AMD_performance_monitor
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+BeginPerfMonitorAMD(monitor)
+	return		void
+	param		monitor		UInt32 in value
+	category	AMD_performance_monitor
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+EndPerfMonitorAMD(monitor)
+	return		void
+	param		monitor		UInt32 in value
+	category	AMD_performance_monitor
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetPerfMonitorCounterDataAMD(monitor, pname, dataSize, data, bytesWritten)
+	return		void
+	param		monitor		UInt32 in value
+	param		pname		GLenum in value
+	param		dataSize	SizeI in value
+	param		data		UInt32 out array [dataSize]
+	param		bytesWritten	Int32 out array [1]
+	category	AMD_performance_monitor
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #361 - WGL_AMD_gpu_association
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #362
+# AMD_texture_texture4 commands
+#
+###############################################################################
+
+# (none)
+newcategory: AMD_texture_texture4
+
+###############################################################################
+#
+# Extension #363
+# AMD_vertex_shader_tesselator commands
+#
+###############################################################################
+
+TessellationFactorAMD(factor)
+	return		void
+	param		factor		Float32 in value
+	category	AMD_vertex_shader_tesselator
+	version		2.0
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+TessellationModeAMD(mode)
+	return		void
+	param		mode		GLenum in value
+	category	AMD_vertex_shader_tesselator
+	version		2.0
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #364
+# EXT_provoking_vertex commands
+#
+###############################################################################
+
+ProvokingVertexEXT(mode)
+	return		void
+	param		mode		GLenum in value
+	category	EXT_provoking_vertex
+	version		2.1
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #365
+# EXT_texture_snorm commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_texture_snorm
+
+###############################################################################
+#
+# Extension #366
+# AMD_draw_buffers_blend commands
+#
+###############################################################################
+
+BlendFuncIndexedAMD(buf, src, dst)
+	return		void
+	param		buf		UInt32 in value
+	param		src		GLenum in value
+	param		dst		GLenum in value
+	category	AMD_draw_buffers_blend
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+BlendFuncSeparateIndexedAMD(buf, srcRGB, dstRGB, srcAlpha, dstAlpha)
+	return		void
+	param		buf		UInt32 in value
+	param		srcRGB		GLenum in value
+	param		dstRGB		GLenum in value
+	param		srcAlpha	GLenum in value
+	param		dstAlpha	GLenum in value
+	category	AMD_draw_buffers_blend
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+BlendEquationIndexedAMD(buf, mode)
+	return		void
+	param		buf		UInt32 in value
+	param		mode		GLenum in value
+	category	AMD_draw_buffers_blend
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+BlendEquationSeparateIndexedAMD(buf, modeRGB, modeAlpha)
+	return		void
+	param		buf		UInt32 in value
+	param		modeRGB		GLenum in value
+	param		modeAlpha	GLenum in value
+	category	AMD_draw_buffers_blend
+	version		2.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #367
+# APPLE_texture_range commands
+#
+###############################################################################
+
+TextureRangeAPPLE(target, length, pointer)
+	return		void
+	param		target		GLenum in value
+	param		length		SizeI in value
+	param		pointer		Void in array [length]
+	category	APPLE_texture_range
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetTexParameterPointervAPPLE(target, pname, params)
+	return		void
+	param		target		GLenum in value
+	param		pname		GLenum in value
+	param		params		VoidPointer out array [1]
+	category	APPLE_texture_range
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #368
+# APPLE_float_pixels commands
+#
+###############################################################################
+
+# (none)
+newcategory: APPLE_float_pixels
+
+###############################################################################
+#
+# Extension #369
+# APPLE_vertex_program_evaluators commands
+#
+###############################################################################
+
+EnableVertexAttribAPPLE(index, pname)
+	return		void
+	param		index		UInt32 in value
+	param		pname		GLenum in value
+	category	APPLE_vertex_program_evaluators
+	version		1.5
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DisableVertexAttribAPPLE(index, pname)
+	return		void
+	param		index		UInt32 in value
+	param		pname		GLenum in value
+	category	APPLE_vertex_program_evaluators
+	version		1.5
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+IsVertexAttribEnabledAPPLE(index, pname)
+	return		Boolean
+	param		index		UInt32 in value
+	param		pname		GLenum in value
+	category	APPLE_vertex_program_evaluators
+	version		1.5
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MapVertexAttrib1dAPPLE(index, size, u1, u2, stride, order, points)
+	return		void
+	param		index		UInt32 in value
+	param		size		UInt32 in value
+	param		u1		CoordD in value
+	param		u2		CoordD in value
+	param		stride		Int32 in value
+	param		order		CheckedInt32 in value
+	param		points		CoordD in array [COMPSIZE(size/stride/order)]
+	category	APPLE_vertex_program_evaluators
+	version		1.5
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MapVertexAttrib1fAPPLE(index, size, u1, u2, stride, order, points)
+	return		void
+	param		index		UInt32 in value
+	param		size		UInt32 in value
+	param		u1		CoordF in value
+	param		u2		CoordF in value
+	param		stride		Int32 in value
+	param		order		CheckedInt32 in value
+	param		points		CoordF in array [COMPSIZE(size/stride/order)]
+	category	APPLE_vertex_program_evaluators
+	version		1.5
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MapVertexAttrib2dAPPLE(index, size, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points)
+	return		void
+	param		index		UInt32 in value
+	param		size		UInt32 in value
+	param		u1		CoordD in value
+	param		u2		CoordD in value
+	param		ustride		Int32 in value
+	param		uorder		CheckedInt32 in value
+	param		v1		CoordD in value
+	param		v2		CoordD in value
+	param		vstride		Int32 in value
+	param		vorder		CheckedInt32 in value
+	param		points		CoordD in array [COMPSIZE(size/ustride/uorder/vstride/vorder)]
+	category	APPLE_vertex_program_evaluators
+	version		1.5
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MapVertexAttrib2fAPPLE(index, size, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points)
+	return		void
+	param		index		UInt32 in value
+	param		size		UInt32 in value
+	param		u1		CoordF in value
+	param		u2		CoordF in value
+	param		ustride		Int32 in value
+	param		uorder		CheckedInt32 in value
+	param		v1		CoordF in value
+	param		v2		CoordF in value
+	param		vstride		Int32 in value
+	param		vorder		CheckedInt32 in value
+	param		points		CoordF in array [COMPSIZE(size/ustride/uorder/vstride/vorder)]
+	category	APPLE_vertex_program_evaluators
+	version		1.5
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #370
+# APPLE_aux_depth_stencil commands
+#
+###############################################################################
+
+# (none)
+newcategory: APPLE_aux_depth_stencil
+
+###############################################################################
+#
+# Extension #371
+# APPLE_object_purgeable commands
+#
+###############################################################################
+
+ObjectPurgeableAPPLE(objectType, name, option)
+	return		GLenum
+	param		objectType	GLenum in value
+	param		name		UInt32 in value
+	param		option		GLenum in value
+	category	APPLE_object_purgeable
+	version		1.5
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ObjectUnpurgeableAPPLE(objectType, name, option)
+	return		GLenum
+	param		objectType	GLenum in value
+	param		name		UInt32 in value
+	param		option		GLenum in value
+	category	APPLE_object_purgeable
+	version		1.5
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetObjectParameterivAPPLE(objectType, name, pname, params)
+	return		void
+	param		objectType	GLenum in value
+	param		name		UInt32 in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	APPLE_object_purgeable
+	dlflags		notlistable
+	version		1.5
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #372
+# APPLE_row_bytes commands
+#
+###############################################################################
+
+# (none)
+newcategory: APPLE_row_bytes
+
+###############################################################################
+#
+# Extension #373
+# APPLE_rgb_422 commands
+#
+###############################################################################
+
+# (none)
+newcategory: APPLE_rgb_422
+
+###############################################################################
+#
+# Extension #374
+# NV_video_capture commands
+#
+###############################################################################
+
+BeginVideoCaptureNV(video_capture_slot)
+	return		void
+	param		video_capture_slot	UInt32 in value
+	category	NV_video_capture
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+BindVideoCaptureStreamBufferNV(video_capture_slot, stream, frame_region, offset)
+	return		void
+	param		video_capture_slot	UInt32 in value
+	param		stream		UInt32 in value
+	param		frame_region	GLenum in value
+	param		offset		BufferOffsetARB in value
+	category	NV_video_capture
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+BindVideoCaptureStreamTextureNV(video_capture_slot, stream, frame_region, target, texture)
+	return		void
+	param		video_capture_slot	UInt32 in value
+	param		stream		UInt32 in value
+	param		frame_region	GLenum in value
+	param		target		GLenum in value
+	param		texture		UInt32 in value
+	category	NV_video_capture
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+EndVideoCaptureNV(video_capture_slot)
+	return		void
+	param		video_capture_slot	UInt32 in value
+	category	NV_video_capture
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetVideoCaptureivNV(video_capture_slot, pname, params)
+	return		void
+	param		video_capture_slot	UInt32 in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	NV_video_capture
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetVideoCaptureStreamivNV(video_capture_slot, stream, pname, params)
+	return		void
+	param		video_capture_slot	UInt32 in value
+	param		stream		UInt32 in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	NV_video_capture
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetVideoCaptureStreamfvNV(video_capture_slot, stream, pname, params)
+	return		void
+	param		video_capture_slot	UInt32 in value
+	param		stream		UInt32 in value
+	param		pname		GLenum in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	NV_video_capture
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetVideoCaptureStreamdvNV(video_capture_slot, stream, pname, params)
+	return		void
+	param		video_capture_slot	UInt32 in value
+	param		stream		UInt32 in value
+	param		pname		GLenum in value
+	param		params		Float64 out array [COMPSIZE(pname)]
+	category	NV_video_capture
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+VideoCaptureNV(video_capture_slot, sequence_num, capture_time)
+	return		GLenum
+	param		video_capture_slot	UInt32 in value
+	param		sequence_num	UInt32 out reference
+	param		capture_time	UInt64EXT out reference
+	category	NV_video_capture
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VideoCaptureStreamParameterivNV(video_capture_slot, stream, pname, params)
+	return		void
+	param		video_capture_slot	UInt32 in value
+	param		stream		UInt32 in value
+	param		pname		GLenum in value
+	param		params		Int32 in array [COMPSIZE(pname)]
+	category	NV_video_capture
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VideoCaptureStreamParameterfvNV(video_capture_slot, stream, pname, params)
+	return		void
+	param		video_capture_slot	UInt32 in value
+	param		stream		UInt32 in value
+	param		pname		GLenum in value
+	param		params		Float32 in array [COMPSIZE(pname)]
+	category	NV_video_capture
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VideoCaptureStreamParameterdvNV(video_capture_slot, stream, pname, params)
+	return		void
+	param		video_capture_slot	UInt32 in value
+	param		stream		UInt32 in value
+	param		pname		GLenum in value
+	param		params		Float64 in array [COMPSIZE(pname)]
+	category	NV_video_capture
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #375 - GLX_EXT_swap_control
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #376 - also GLX_NV_copy_image, WGL_NV_copy_image
+# NV_copy_image commands
+#
+###############################################################################
+
+CopyImageSubDataNV(srcName, srcTarget, srcLevel, srcX, srcY, srcZ, dstName, dstTarget, dstLevel, dstX, dstY, dstZ, width, height, depth)
+	return		void
+	param		srcName		UInt32 in value
+	param		srcTarget	GLenum in value
+	param		srcLevel	Int32 in value
+	param		srcX		Int32 in value
+	param		srcY		Int32 in value
+	param		srcZ		Int32 in value
+	param		dstName		UInt32 in value
+	param		dstTarget	GLenum in value
+	param		dstLevel	Int32 in value
+	param		dstX		Int32 in value
+	param		dstY		Int32 in value
+	param		dstZ		Int32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	category	NV_copy_image
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #377
+# EXT_separate_shader_objects commands
+#
+###############################################################################
+
+UseShaderProgramEXT(type, program)
+	return		void
+	param		type		GLenum in value
+	param		program		UInt32 in value
+	category	EXT_separate_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ActiveProgramEXT(program)
+	return		void
+	param		program		UInt32 in value
+	category	EXT_separate_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+CreateShaderProgramEXT(type, string)
+	return		UInt32
+	param		type		GLenum in value
+	param		string		Char in array []
+	category	EXT_separate_shader_objects
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #378
+# NV_parameter_buffer_object2 commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_parameter_buffer_object2
+
+###############################################################################
+#
+# Extension #379
+# NV_shader_buffer_load commands
+#
+###############################################################################
+
+MakeBufferResidentNV(target, access)
+	return		void
+	param		target		GLenum in value
+	param		access		GLenum in value
+	category	NV_shader_buffer_load
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MakeBufferNonResidentNV(target)
+	return		void
+	param		target		GLenum in value
+	category	NV_shader_buffer_load
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+IsBufferResidentNV(target)
+	return		Boolean
+	param		target		GLenum in value
+	category	NV_shader_buffer_load
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MakeNamedBufferResidentNV(buffer, access)
+	return		void
+	param		buffer		UInt32 in value
+	param		access		GLenum in value
+	category	NV_shader_buffer_load
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MakeNamedBufferNonResidentNV(buffer)
+	return		void
+	param		buffer		UInt32 in value
+	category	NV_shader_buffer_load
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+IsNamedBufferResidentNV(buffer)
+	return		Boolean
+	param		buffer		UInt32 in value
+	category	NV_shader_buffer_load
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetBufferParameterui64vNV(target, pname, params)
+	return		void
+	param		target		GLenum in value
+	param		pname		GLenum in value
+	param		params		UInt64EXT out array [COMPSIZE(pname)]
+	category	NV_shader_buffer_load
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetNamedBufferParameterui64vNV(buffer, pname, params)
+	return		void
+	param		buffer		UInt32 in value
+	param		pname		GLenum in value
+	param		params		UInt64EXT out array [COMPSIZE(pname)]
+	category	NV_shader_buffer_load
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetIntegerui64vNV(value, result)
+	return		void
+	param		value		GLenum in value
+	param		result		UInt64EXT out array [COMPSIZE(value)]
+	category	NV_shader_buffer_load
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+Uniformui64NV(location, value)
+	return		void
+	param		location	Int32 in value
+	param		value		UInt64EXT in value
+	category	NV_shader_buffer_load
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniformui64vNV(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt64EXT in array [count]
+	category	NV_shader_buffer_load
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetUniformui64vNV(program, location, params)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		params		UInt64EXT out array [COMPSIZE(program/location)]
+	category	NV_shader_buffer_load
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformui64NV(program, location, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		value		UInt64EXT in value
+	category	NV_shader_buffer_load
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformui64vNV(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt64EXT in array [count]
+	category	NV_shader_buffer_load
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #380
+# NV_vertex_buffer_unified_memory commands
+#
+###############################################################################
+
+BufferAddressRangeNV(pname, index, address, length)
+	return		void
+	param		pname		GLenum in value
+	param		index		UInt32 in value
+	param		address		UInt64EXT in value
+	param		length		BufferSize in value
+	category	NV_vertex_buffer_unified_memory
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexFormatNV(size, type, stride)
+	return		void
+	param		size		Int32 in value
+	param		type		GLenum in value
+	param		stride		SizeI in value
+	category	NV_vertex_buffer_unified_memory
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+NormalFormatNV(type, stride)
+	return		void
+	param		type		GLenum in value
+	param		stride		SizeI in value
+	category	NV_vertex_buffer_unified_memory
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ColorFormatNV(size, type, stride)
+	return		void
+	param		size		Int32 in value
+	param		type		GLenum in value
+	param		stride		SizeI in value
+	category	NV_vertex_buffer_unified_memory
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+IndexFormatNV(type, stride)
+	return		void
+	param		type		GLenum in value
+	param		stride		SizeI in value
+	category	NV_vertex_buffer_unified_memory
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TexCoordFormatNV(size, type, stride)
+	return		void
+	param		size		Int32 in value
+	param		type		GLenum in value
+	param		stride		SizeI in value
+	category	NV_vertex_buffer_unified_memory
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+EdgeFlagFormatNV(stride)
+	return		void
+	param		stride		SizeI in value
+	category	NV_vertex_buffer_unified_memory
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+SecondaryColorFormatNV(size, type, stride)
+	return		void
+	param		size		Int32 in value
+	param		type		GLenum in value
+	param		stride		SizeI in value
+	category	NV_vertex_buffer_unified_memory
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+FogCoordFormatNV(type, stride)
+	return		void
+	param		type		GLenum in value
+	param		stride		SizeI in value
+	category	NV_vertex_buffer_unified_memory
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribFormatNV(index, size, type, normalized, stride)
+	return		void
+	param		index		UInt32 in value
+	param		size		Int32 in value
+	param		type		GLenum in value
+	param		normalized	Boolean in value
+	param		stride		SizeI in value
+	category	NV_vertex_buffer_unified_memory
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribIFormatNV(index, size, type, stride)
+	return		void
+	param		index		UInt32 in value
+	param		size		Int32 in value
+	param		type		GLenum in value
+	param		stride		SizeI in value
+	category	NV_vertex_buffer_unified_memory
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetIntegerui64i_vNV(value, index, result)
+	return		void
+	param		value		GLenum in value
+	param		index		UInt32 in value
+	param		result		UInt64EXT out array [COMPSIZE(value)]
+	category	NV_vertex_buffer_unified_memory
+	dlflags		notlistable
+	version		1.2
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #381
+# NV_texture_barrier commands
+#
+###############################################################################
+
+TextureBarrierNV()
+	return		void
+	category	NV_texture_barrier
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #382
+# AMD_shader_stencil_export commands
+#
+###############################################################################
+
+# (none)
+newcategory: AMD_shader_stencil_export
+
+###############################################################################
+#
+# Extension #383
+# AMD_seamless_cubemap_per_texture commands
+#
+###############################################################################
+
+# (none)
+newcategory: AMD_seamless_cubemap_per_texture
+
+###############################################################################
+#
+# Extension #384 - GLX_INTEL_swap_event
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #385
+# AMD_conservative_depth commands
+#
+###############################################################################
+
+# (none)
+newcategory: AMD_conservative_depth
+
+###############################################################################
+#
+# Extension #386
+# EXT_shader_image_load_store commands
+#
+###############################################################################
+
+BindImageTextureEXT(index, texture, level, layered, layer, access, format)
+	return		void
+	param		index		UInt32 in value
+	param		texture		UInt32 in value
+	param		level		Int32 in value
+	param		layered		Boolean in value
+	param		layer		Int32 in value
+	param		access		GLenum in value
+	param		format		Int32 in value
+	category	EXT_shader_image_load_store
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MemoryBarrierEXT(barriers)
+	return		void
+	param		barriers	GLbitfield in value
+	category	EXT_shader_image_load_store
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #387
+# EXT_vertex_attrib_64bit commands
+#
+###############################################################################
+
+VertexAttribL1dEXT(index, x)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float64 in value
+	category	EXT_vertex_attrib_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL2dEXT(index, x, y)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	category	EXT_vertex_attrib_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL3dEXT(index, x, y, z)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	param		z		Float64 in value
+	category	EXT_vertex_attrib_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL4dEXT(index, x, y, z, w)
+	return		void
+	param		index		UInt32 in value
+	param		x		Float64 in value
+	param		y		Float64 in value
+	param		z		Float64 in value
+	param		w		Float64 in value
+	category	EXT_vertex_attrib_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL1dvEXT(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float64 in array [1]
+	category	EXT_vertex_attrib_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL2dvEXT(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float64 in array [2]
+	category	EXT_vertex_attrib_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL3dvEXT(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float64 in array [3]
+	category	EXT_vertex_attrib_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL4dvEXT(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Float64 in array [4]
+	category	EXT_vertex_attrib_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribLPointerEXT(index, size, type, stride, pointer)
+	return		void
+	param		index		UInt32 in value
+	param		size		Int32 in value
+	param		type		GLenum in value
+	param		stride		SizeI in value
+	param		pointer		Void in array [size]
+	category	EXT_vertex_attrib_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetVertexAttribLdvEXT(index, pname, params)
+	return		void
+	param		index		UInt32 in value
+	param		pname		GLenum in value
+	param		params		Float64 out array [COMPSIZE(pname)]
+	category	EXT_vertex_attrib_64bit
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+# Also in ARB_vertex_array_64bit. Supposedly dependent on another
+# unregistered extension, EXT_direct_state_access_memory
+
+VertexArrayVertexAttribLOffsetEXT(vaobj, buffer, index, size, type, stride, offset)
+	return		void
+	param		vaobj		UInt32 in value
+	param		buffer		UInt32 in value
+	param		index		UInt32 in value
+	param		size		Int32 in value
+	param		type		GLenum in value
+	param		stride		SizeI in value
+	param		offset		BufferOffset in value
+	category	EXT_vertex_attrib_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #388
+# NV_gpu_program5 commands
+#
+###############################################################################
+
+# These commands require ARB_shader_subroutine
+
+ProgramSubroutineParametersuivNV(target, count, params)
+	return		void
+	param		target		GLenum in value
+	param		count		SizeI in value
+	param		params		UInt32 in array [count]
+	category	NV_gpu_program5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetProgramSubroutineParameteruivNV(target, index, param)
+	return		void
+	param		target		GLenum in value
+	param		index		UInt32 in value
+	param		param		UInt32 out array [COMPSIZE(target)]
+	category	NV_gpu_program5
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #389
+# NV_gpu_shader5 commands
+#
+###############################################################################
+
+Uniform1i64NV(location, x)
+	return		void
+	param		location	Int32 in value
+	param		x		Int64EXT in value
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform2i64NV(location, x, y)
+	return		void
+	param		location	Int32 in value
+	param		x		Int64EXT in value
+	param		y		Int64EXT in value
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform3i64NV(location, x, y, z)
+	return		void
+	param		location	Int32 in value
+	param		x		Int64EXT in value
+	param		y		Int64EXT in value
+	param		z		Int64EXT in value
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform4i64NV(location, x, y, z, w)
+	return		void
+	param		location	Int32 in value
+	param		x		Int64EXT in value
+	param		y		Int64EXT in value
+	param		z		Int64EXT in value
+	param		w		Int64EXT in value
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform1i64vNV(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Int64EXT in array [count]
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform2i64vNV(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Int64EXT in array [COMPSIZE(count*2)]
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform3i64vNV(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Int64EXT in array [COMPSIZE(count*3)]
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform4i64vNV(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Int64EXT in array [COMPSIZE(count*4)]
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform1ui64NV(location, x)
+	return		void
+	param		location	Int32 in value
+	param		x		UInt64EXT in value
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform2ui64NV(location, x, y)
+	return		void
+	param		location	Int32 in value
+	param		x		UInt64EXT in value
+	param		y		UInt64EXT in value
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform3ui64NV(location, x, y, z)
+	return		void
+	param		location	Int32 in value
+	param		x		UInt64EXT in value
+	param		y		UInt64EXT in value
+	param		z		UInt64EXT in value
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform4ui64NV(location, x, y, z, w)
+	return		void
+	param		location	Int32 in value
+	param		x		UInt64EXT in value
+	param		y		UInt64EXT in value
+	param		z		UInt64EXT in value
+	param		w		UInt64EXT in value
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform1ui64vNV(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt64EXT in array [count]
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform2ui64vNV(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt64EXT in array [COMPSIZE(count*2)]
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform3ui64vNV(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt64EXT in array [COMPSIZE(count*3)]
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+Uniform4ui64vNV(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt64EXT in array [COMPSIZE(count*4)]
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetUniformi64vNV(program, location, params)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		params		Int64EXT out array [COMPSIZE(location)]
+	category	NV_gpu_shader5
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform1i64NV(program, location, x)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		x		Int64EXT in value
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform2i64NV(program, location, x, y)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		x		Int64EXT in value
+	param		y		Int64EXT in value
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform3i64NV(program, location, x, y, z)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		x		Int64EXT in value
+	param		y		Int64EXT in value
+	param		z		Int64EXT in value
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform4i64NV(program, location, x, y, z, w)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		x		Int64EXT in value
+	param		y		Int64EXT in value
+	param		z		Int64EXT in value
+	param		w		Int64EXT in value
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform1i64vNV(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Int64EXT in array [count]
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform2i64vNV(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Int64EXT in array [COMPSIZE(count*2)]
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform3i64vNV(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Int64EXT in array [COMPSIZE(count*3)]
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform4i64vNV(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		Int64EXT in array [COMPSIZE(count*4)]
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform1ui64NV(program, location, x)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		x		UInt64EXT in value
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform2ui64NV(program, location, x, y)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		x		UInt64EXT in value
+	param		y		UInt64EXT in value
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform3ui64NV(program, location, x, y, z)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		x		UInt64EXT in value
+	param		y		UInt64EXT in value
+	param		z		UInt64EXT in value
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform4ui64NV(program, location, x, y, z, w)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		x		UInt64EXT in value
+	param		y		UInt64EXT in value
+	param		z		UInt64EXT in value
+	param		w		UInt64EXT in value
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform1ui64vNV(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt64EXT in array [count]
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform2ui64vNV(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt64EXT in array [COMPSIZE(count*2)]
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform3ui64vNV(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt64EXT in array [COMPSIZE(count*3)]
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniform4ui64vNV(program, location, count, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt64EXT in array [COMPSIZE(count*4)]
+	category	NV_gpu_shader5
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+#@ GetUniformui64vNV also in NV_shader_buffer_load
+
+###############################################################################
+#
+# Extension #390
+# NV_shader_buffer_store commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_shader_buffer_store
+
+###############################################################################
+#
+# Extension #391
+# NV_tessellation_program5 commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_tessellation_program5
+
+###############################################################################
+#
+# Extension #392
+# NV_vertex_attrib_integer_64bit commands
+#
+###############################################################################
+
+VertexAttribL1i64NV(index, x)
+	return		void
+	param		index		UInt32 in value
+	param		x		Int64EXT in value
+	category	NV_vertex_attrib_integer_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL2i64NV(index, x, y)
+	return		void
+	param		index		UInt32 in value
+	param		x		Int64EXT in value
+	param		y		Int64EXT in value
+	category	NV_vertex_attrib_integer_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL3i64NV(index, x, y, z)
+	return		void
+	param		index		UInt32 in value
+	param		x		Int64EXT in value
+	param		y		Int64EXT in value
+	param		z		Int64EXT in value
+	category	NV_vertex_attrib_integer_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL4i64NV(index, x, y, z, w)
+	return		void
+	param		index		UInt32 in value
+	param		x		Int64EXT in value
+	param		y		Int64EXT in value
+	param		z		Int64EXT in value
+	param		w		Int64EXT in value
+	category	NV_vertex_attrib_integer_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL1i64vNV(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int64EXT in array [1]
+	category	NV_vertex_attrib_integer_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL2i64vNV(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int64EXT in array [2]
+	category	NV_vertex_attrib_integer_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL3i64vNV(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int64EXT in array [3]
+	category	NV_vertex_attrib_integer_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL4i64vNV(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		Int64EXT in array [4]
+	category	NV_vertex_attrib_integer_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL1ui64NV(index, x)
+	return		void
+	param		index		UInt32 in value
+	param		x		UInt64EXT in value
+	category	NV_vertex_attrib_integer_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL2ui64NV(index, x, y)
+	return		void
+	param		index		UInt32 in value
+	param		x		UInt64EXT in value
+	param		y		UInt64EXT in value
+	category	NV_vertex_attrib_integer_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL3ui64NV(index, x, y, z)
+	return		void
+	param		index		UInt32 in value
+	param		x		UInt64EXT in value
+	param		y		UInt64EXT in value
+	param		z		UInt64EXT in value
+	category	NV_vertex_attrib_integer_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL4ui64NV(index, x, y, z, w)
+	return		void
+	param		index		UInt32 in value
+	param		x		UInt64EXT in value
+	param		y		UInt64EXT in value
+	param		z		UInt64EXT in value
+	param		w		UInt64EXT in value
+	category	NV_vertex_attrib_integer_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL1ui64vNV(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt64EXT in array [1]
+	category	NV_vertex_attrib_integer_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL2ui64vNV(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt64EXT in array [2]
+	category	NV_vertex_attrib_integer_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL3ui64vNV(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt64EXT in array [3]
+	category	NV_vertex_attrib_integer_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribL4ui64vNV(index, v)
+	return		void
+	param		index		UInt32 in value
+	param		v		UInt64EXT in array [4]
+	category	NV_vertex_attrib_integer_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetVertexAttribLi64vNV(index, pname, params)
+	return		void
+	param		index		UInt32 in value
+	param		pname		GLenum in value
+	param		params		Int64EXT out array [COMPSIZE(pname)]
+	category	NV_vertex_attrib_integer_64bit
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetVertexAttribLui64vNV(index, pname, params)
+	return		void
+	param		index		UInt32 in value
+	param		pname		GLenum in value
+	param		params		UInt64EXT out array [COMPSIZE(pname)]
+	category	NV_vertex_attrib_integer_64bit
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+#@ VertexAttribLFormatNV also requires NV_vertex_buffer_unified_memory
+
+VertexAttribLFormatNV(index, size, type, stride)
+	return		void
+	param		index		UInt32 in value
+	param		size		Int32 in value
+	param		type		GLenum in value
+	param		stride		SizeI in value
+	category	NV_vertex_attrib_integer_64bit
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #393
+# NV_multisample_coverage commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_multisample_coverage
+
+###############################################################################
+#
+# Extension #394
+# AMD_name_gen_delete commands
+#
+###############################################################################
+
+GenNamesAMD(identifier, num, names)
+	return		void
+	param		identifier	GLenum in value
+	param		num		UInt32 in value
+	param		names		UInt32 out array [num]
+	category	AMD_name_gen_delete
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DeleteNamesAMD(identifier, num, names)
+	return		void
+	param		identifier	GLenum in value
+	param		num		UInt32 in value
+	param		names		UInt32 in array [num]
+	category	AMD_name_gen_delete
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+IsNameAMD(identifier, name)
+	return		Boolean
+	param		identifier	GLenum in value
+	param		name		UInt32 in value
+	category	AMD_name_gen_delete
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #395
+# AMD_debug_output commands
+#
+###############################################################################
+
+DebugMessageEnableAMD(category, severity, count, ids, enabled)
+	return		void
+	param		category	GLenum in value
+	param		severity	GLenum in value
+	param		count		SizeI in value
+	param		ids		UInt32 in array [count]
+	param		enabled		Boolean in value
+	category	AMD_debug_output
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DebugMessageInsertAMD(category, severity, id, length, buf)
+	return		void
+	param		category	GLenum in value
+	param		severity	GLenum in value
+	param		id		UInt32 in value
+	param		length		SizeI in value
+	param		buf		Char in array [length]
+	category	AMD_debug_output
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+DebugMessageCallbackAMD(callback, userParam)
+	return		void
+	param		callback	GLDEBUGPROCAMD in value
+	param		userParam	Void out reference
+	category	AMD_debug_output
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetDebugMessageLogAMD(count, bufsize, categories, severities, ids, lengths, message)
+	return		UInt32
+	param		count		UInt32 in value
+	param		bufsize		SizeI in value
+	param		categories	GLenum out array [count]
+	param		severities	UInt32 out array [count]
+	param		ids		UInt32 out array [count]
+	param		lengths		SizeI out array [count]
+	param		message		Char out array [bufsize]
+	category	AMD_debug_output
+	dlflags		notlistable
+	version		4.1
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #396
+# NV_vdpau_interop commands
+#
+###############################################################################
+
+VDPAUInitNV(vdpDevice, getProcAddress)
+	return		void
+	param		vdpDevice	Void in reference
+	param		getProcAddress	Void in reference
+	category	NV_vdpau_interop
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VDPAUFiniNV()
+	return		void
+	category	NV_vdpau_interop
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VDPAURegisterVideoSurfaceNV(vdpSurface, target, numTextureNames, textureNames)
+	return		vdpauSurfaceNV
+	param		vdpSurface	Void in reference
+	param		target		GLenum in value
+	param		numTextureNames SizeI in value
+	param		textureNames	UInt32 in array [numTextureNames]
+	category	NV_vdpau_interop
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VDPAURegisterOutputSurfaceNV(vdpSurface, target, numTextureNames, textureNames)
+	return		vdpauSurfaceNV
+	param		vdpSurface	Void out reference
+	param		target		GLenum in value
+	param		numTextureNames SizeI in value
+	param		textureNames	UInt32 in array [numTextureNames]
+	category	NV_vdpau_interop
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VDPAUIsSurfaceNV(surface)
+	return		void
+	param		surface		vdpauSurfaceNV in value
+	category	NV_vdpau_interop
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VDPAUUnregisterSurfaceNV(surface)
+	return		void
+	param		surface		vdpauSurfaceNV in value
+	category	NV_vdpau_interop
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VDPAUGetSurfaceivNV(surface, pname, bufSize, length, values)
+	return		void
+	param		surface		vdpauSurfaceNV in value
+	param		pname		GLenum in value
+	param		bufSize		SizeI in value
+	param		length		SizeI out reference
+	param		values		Int32 out array [length]
+	category	NV_vdpau_interop
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VDPAUSurfaceAccessNV(surface, access)
+	return		void
+	param		surface		vdpauSurfaceNV in value
+	param		access		GLenum in value
+	category	NV_vdpau_interop
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VDPAUMapSurfacesNV(numSurfaces, surfaces)
+	return		void
+	param		numSurfaces	SizeI in value
+	param		surfaces	vdpauSurfaceNV in array [numSurfaces]
+	category	NV_vdpau_interop
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VDPAUUnmapSurfacesNV(numSurface, surfaces)
+	return		void
+	param		numSurface	SizeI in value
+	param		surfaces	vdpauSurfaceNV in array [numSurface]
+	category	NV_vdpau_interop
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+
+###############################################################################
+#
+# Extension #397
+# AMD_transform_feedback3_lines_triangles commands
+#
+###############################################################################
+
+# (none)
+newcategory: AMD_transform_feedback3_lines_triangles
+
+###############################################################################
+#
+# Extension #398 - GLX_AMD_gpu_association
+# Extension #399 - GLX_EXT_create_context_es2_profile
+# Extension #400 - WGL_EXT_create_context_es2_profile
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #401
+# AMD_depth_clamp_separate commands
+#
+###############################################################################
+
+# (none)
+newcategory: AMD_depth_clamp_separate
+
+###############################################################################
+#
+# Extension #402
+# EXT_texture_sRGB_decode commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_texture_sRGB_decode
+
+###############################################################################
+#
+# Extension #403
+# NV_texture_multisample commands
+#
+###############################################################################
+
+TexImage2DMultisampleCoverageNV(target, coverageSamples, colorSamples, internalFormat, width, height, fixedSampleLocations)
+	return		void
+	param		target		GLenum in value
+	param		coverageSamples SizeI in value
+	param		colorSamples	SizeI in value
+	param		internalFormat	Int32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		fixedSampleLocations	Boolean in value
+	category	NV_texture_multisample
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TexImage3DMultisampleCoverageNV(target, coverageSamples, colorSamples, internalFormat, width, height, depth, fixedSampleLocations)
+	return		void
+	param		target		GLenum in value
+	param		coverageSamples SizeI in value
+	param		colorSamples	SizeI in value
+	param		internalFormat	Int32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		fixedSampleLocations	Boolean in value
+	category	NV_texture_multisample
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TextureImage2DMultisampleNV(texture, target, samples, internalFormat, width, height, fixedSampleLocations)
+	return		void
+	param		texture		UInt32 in value
+	param		target		GLenum in value
+	param		samples		SizeI in value
+	param		internalFormat	Int32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		fixedSampleLocations	Boolean in value
+	category	NV_texture_multisample
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TextureImage3DMultisampleNV(texture, target, samples, internalFormat, width, height, depth, fixedSampleLocations)
+	return		void
+	param		texture		UInt32 in value
+	param		target		GLenum in value
+	param		samples		SizeI in value
+	param		internalFormat	Int32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		fixedSampleLocations	Boolean in value
+	category	NV_texture_multisample
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TextureImage2DMultisampleCoverageNV(texture, target, coverageSamples, colorSamples, internalFormat, width, height, fixedSampleLocations)
+	return		void
+	param		texture		UInt32 in value
+	param		target		GLenum in value
+	param		coverageSamples SizeI in value
+	param		colorSamples	SizeI in value
+	param		internalFormat	Int32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		fixedSampleLocations	Boolean in value
+	category	NV_texture_multisample
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TextureImage3DMultisampleCoverageNV(texture, target, coverageSamples, colorSamples, internalFormat, width, height, depth, fixedSampleLocations)
+	return		void
+	param		texture		UInt32 in value
+	param		target		GLenum in value
+	param		coverageSamples SizeI in value
+	param		colorSamples	SizeI in value
+	param		internalFormat	Int32 in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		fixedSampleLocations	Boolean in value
+	category	NV_texture_multisample
+	version		4.1
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #404
+# AMD_blend_minmax_factor commands
+#
+###############################################################################
+
+# (none)
+newcategory: AMD_blend_minmax_factor
+
+###############################################################################
+#
+# Extension #405
+# AMD_sample_positions commands
+#
+###############################################################################
+
+SetMultisamplefvAMD(pname, index, val)
+	return		void
+	param		pname		GLenum in value
+	param		index		UInt32 in value
+	param		val		Float32 in array [2]
+	category	AMD_sample_positions
+	glxflags	ignore
+	version		3.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #406
+# EXT_x11_sync_object commands
+#
+###############################################################################
+
+ImportSyncEXT(external_sync_type, external_sync, flags)
+	return		sync
+	param		external_sync_type  GLenum in value
+	param		external_sync	Intptr in value
+	param		flags		GLbitfield in value
+	category	EXT_x11_sync_object
+	glxflags	ignore
+	version		3.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #407 - WGL_NV_DX_interop
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #408
+# AMD_multi_draw_indirect commands
+#
+###############################################################################
+
+MultiDrawArraysIndirectAMD(mode, indirect, primcount, stride)
+	return		void
+	param		mode		GLenum in value
+	param		indirect	Void in array []
+	param		primcount	SizeI in value
+	param		stride		SizeI in value
+	category	AMD_multi_draw_indirect
+	version		4.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MultiDrawElementsIndirectAMD(mode, type, indirect, primcount, stride)
+	return		void
+	param		mode		GLenum in value
+	param		type		GLenum in value
+	param		indirect	Void in array []
+	param		primcount	SizeI in value
+	param		stride		SizeI in value
+	category	AMD_multi_draw_indirect
+	version		4.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #409
+# EXT_framebuffer_multisample_blit_scaled commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_framebuffer_multisample_blit_scaled
+
+###############################################################################
+#
+# Extension #410
+# NV_path_rendering commands
+#
+###############################################################################
+
+# PATH NAME MANAGMENT
+
+GenPathsNV(range)
+	return		Path
+	param		range		    SizeI in value
+	category	NV_path_rendering
+	dlflags		notlistable
+	version		1.1
+	extension
+
+DeletePathsNV(path, range)
+	return		void
+	param		path		Path in value
+	param		range		SizeI in value
+	dlflags		notlistable
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+IsPathNV(path)
+	return		Boolean
+	param		path	     Path in value
+	dlflags		notlistable
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+# PATH SPECIFICATION COMMANDS
+
+PathCommandsNV(path, numCommands, commands, numCoords, coordType, coords)
+	return		void
+	param		path		Path in value
+	param		numCommands	SizeI in value
+	param		commands	PathCommand in array [numCommands]
+	param		numCoords	SizeI in value
+	param		coordType	PathCoordType in value
+	param		coords		Void in array [COMPSIZE(numCoords,coordType)]
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+PathCoordsNV(path, numCoords, coordType, coords)
+	return		void
+	param		path		Path in value
+	param		numCoords	SizeI in value
+	param		coordType	PathCoordType in value
+	param		coords		Void in array [COMPSIZE(numCoords,coordType)]
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+PathSubCommandsNV(path, commandStart, commandsToDelete, numCommands, commands, numCoords, coordType, coords)
+	return		void
+	param		path		Path in value
+	param		commandStart	SizeI in value
+	param		commandsToDelete SizeI in value
+	param		numCommands	SizeI in value
+	param		commands	PathCommand in array [numCommands]
+	param		numCoords	SizeI in value
+	param		coordType	PathCoordType in value
+	param		coords		Void in array [COMPSIZE(numCoords,coordType)]
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+PathSubCoordsNV(path, coordStart, numCoords, coordType, coords)
+	return		void
+	param		path		Path in value
+	param		coordStart	SizeI in value
+	param		numCoords	SizeI in value
+	param		coordType	PathCoordType in value
+	param		coords		Void in array [COMPSIZE(numCoords,coordType)]
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+PathStringNV(path, format, length, pathString)
+	return		void
+	param		path		Path in value
+	param		format		PathStringFormat in value
+	param		length		SizeI in value
+	param		pathString	Void in array [length]
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+PathGlyphsNV(firstPathName, fontTarget, fontName, fontStyle, numGlyphs, type, charcodes, handleMissingGlyphs, pathParameterTemplate, emScale)
+	return		void
+	param		firstPathName	Path in value
+	param		fontTarget	PathFontTarget in value
+	param		fontName	Void in array [COMPSIZE(fontTarget,fontName)]
+	param		fontStyle	PathFontStyle in value
+	param		numGlyphs	SizeI in value
+	param		type		PathElementType in value
+	param		charcodes	Void in array [COMPSIZE(numGlyphs,type,charcodes)]
+	param		handleMissingGlyphs PathHandleMissingGlyphs in value
+	param		pathParameterTemplate Path in value
+	param		emScale		Float32 in value
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+PathGlyphRangeNV(firstPathName, fontTarget, fontName, fontStyle, firstGlyph, numGlyphs, handleMissingGlyphs, pathParameterTemplate, emScale)
+	return		void
+	param		firstPathName	Path in value
+	param		fontTarget	PathFontTarget in value
+	param		fontName	Void in array [COMPSIZE(fontTarget,fontName)]
+	param		fontStyle	PathFontStyle in value
+	param		firstGlyph	UInt32 in value
+	param		numGlyphs	SizeI in value
+	param		handleMissingGlyphs PathHandleMissingGlyphs in value
+	param		pathParameterTemplate Path in value
+	param		emScale		Float32 in value
+	category	NV_path_rendering
+	version		1.1
+	extension
+	dlflags		prepad
+
+WeightPathsNV(resultPath, numPaths, paths, weights)
+	return		void
+	param		resultPath	Path in value
+	param		numPaths	SizeI in value
+	param		paths		Path in array [numPaths]
+	param		weights		Float32 in array [numPaths]
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+CopyPathNV(resultPath, srcPath)
+	return		void
+	param		resultPath	Path in value
+	param		srcPath		Path in value
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+InterpolatePathsNV(resultPath, pathA, pathB, weight)
+	return		void
+	param		resultPath	Path in value
+	param		pathA		Path in value
+	param		pathB		Path in value
+	param		weight		Float32 in value
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+TransformPathNV(resultPath, srcPath, transformType, transformValues)
+	return		void
+	param		resultPath	Path in value
+	param		srcPath		Path in value
+	param		transformType	PathTransformType in value
+	param		transformValues Float32 in array [COMPSIZE(transformType)]
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+PathParameterivNV(path, pname, value)
+	return		void
+	param		path		Path in value
+	param		pname		PathParameter in value
+	param		value		Int32 in array [COMPSIZE(pname)]
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+PathParameteriNV(path, pname, value)
+	return		void
+	param		path		Path in value
+	param		pname		PathParameter in value
+	param		value		Int32 in value
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+PathParameterfvNV(path, pname, value)
+	return		void
+	param		path		Path in value
+	param		pname		PathParameter in value
+	param		value		Float32 in array [COMPSIZE(pname)]
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+PathParameterfNV(path, pname, value)
+	return		void
+	param		path		Path in value
+	param		pname		PathParameter in value
+	param		value		Float32 in value
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+PathDashArrayNV(path, dashCount, dashArray)
+	return		void
+	param		path		Path in value
+	param		dashCount	SizeI in value
+	param		dashArray	Float32 in array [dashCount]
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+# PATH STENCILING
+
+PathStencilFuncNV(func, ref, mask)
+	return		void
+	param		func		StencilFunction in value
+	param		ref		ClampedStencilValue in value
+	param		mask		MaskedStencilValue in value
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+PathStencilDepthOffsetNV(factor, units)
+	return		void
+	param		factor		Float32 in value
+	param		units		Float32 in value
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+StencilFillPathNV(path, fillMode, mask)
+	return		void
+	param		path		Path in value
+	param		fillMode	PathFillMode in value
+	param		mask		MaskedStencilValue in value
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+StencilStrokePathNV(path, reference, mask)
+	return		void
+	param		path		Path in value
+	param		reference	StencilValue in value
+	param		mask		MaskedStencilValue in value
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+StencilFillPathInstancedNV(numPaths, pathNameType, paths, pathBase, fillMode, mask, transformType, transformValues)
+	return		void
+	param		numPaths	SizeI in value
+	param		pathNameType	PathElementType in value
+	param		paths		PathElement in array [COMPSIZE(numPaths,pathNameType,paths)]
+	param		pathBase	Path in value
+	param		fillMode	PathFillMode in value
+	param		mask		MaskedStencilValue in value
+	param		transformType	PathTransformType in value
+	param		transformValues Float32 in array [COMPSIZE(numPaths,transformType)]
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+StencilStrokePathInstancedNV(numPaths, pathNameType, paths, pathBase, reference, mask, transformType, transformValues)
+	return		void
+	param		numPaths	SizeI in value
+	param		pathNameType	PathElementType in value
+	param		paths		PathElement in array [COMPSIZE(numPaths,pathNameType,paths)]
+	param		pathBase	Path in value
+	param		reference	StencilValue in value
+	param		mask		MaskedStencilValue in value
+	param		transformType	PathTransformType in value
+	param		transformValues Float32 in array [COMPSIZE(numPaths,transformType)]
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+# PATH COVERING
+
+PathCoverDepthFuncNV(func)
+	return		void
+	param		func		DepthFunction in value
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+PathColorGenNV(color, genMode, colorFormat, coeffs)
+	return		void
+	param		color		PathColor in value
+	param		genMode		PathGenMode in value
+	param		colorFormat	PathColorFormat in value
+	param		coeffs		Float32 in array [COMPSIZE(genMode,colorFormat)]
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+PathTexGenNV(texCoordSet, genMode, components, coeffs)
+	return		void
+	param		texCoordSet	PathColor in value
+	param		genMode		PathGenMode in value
+	param		components	Int32 in value
+	param		coeffs		Float32 in array [COMPSIZE(genMode,components)]
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+PathFogGenNV(genMode)
+	return		void
+	param		genMode		PathGenMode in value
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+CoverFillPathNV(path, coverMode)
+	return		void
+	param		path		Path in value
+	param		coverMode	PathCoverMode in value
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+CoverStrokePathNV(path, coverMode)
+	return		void
+	param		path		Path in value
+	param		coverMode	PathCoverMode in value
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+CoverFillPathInstancedNV(numPaths, pathNameType, paths, pathBase, coverMode, transformType, transformValues)
+	return		void
+	param		numPaths	SizeI in value
+	param		pathNameType	PathElementType in value
+	param		paths		PathElement in array [COMPSIZE(numPaths,pathNameType,paths)]
+	param		pathBase	Path in value
+	param		coverMode	PathCoverMode in value
+	param		transformType	PathTransformType in value
+	param		transformValues Float32 in array [COMPSIZE(numPaths,transformType)]
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+CoverStrokePathInstancedNV(numPaths, pathNameType, paths, pathBase, coverMode, transformType, transformValues)
+	return		void
+	param		numPaths	SizeI in value
+	param		pathNameType	PathElementType in value
+	param		paths		PathElement in array [COMPSIZE(numPaths,pathNameType,paths)]
+	param		pathBase	Path in value
+	param		coverMode	PathCoverMode in value
+	param		transformType	PathTransformType in value
+	param		transformValues Float32 in array [COMPSIZE(numPaths,transformType)]
+	category	NV_path_rendering
+	version		1.1
+	extension
+
+# PATH QUERIES
+
+GetPathParameterivNV(path, pname, value)
+	return		void
+	param		path		Path in value
+	param		pname		PathParameter in value
+	param		value		Int32 out array [4]
+	category	NV_path_rendering
+	dlflags		notlistable
+	version		1.1
+	extension
+
+GetPathParameterfvNV(path, pname, value)
+	return		void
+	param		path		Path in value
+	param		pname		PathParameter in value
+	param		value		Float32 out array [4]
+	category	NV_path_rendering
+	dlflags		notlistable
+	version		1.1
+	extension
+
+GetPathCommandsNV(path, commands)
+	return		void
+	param		path		Path in value
+	param		commands	PathCommand out array [COMPSIZE(path)]
+	category	NV_path_rendering
+	dlflags		notlistable
+	version		1.1
+	extension
+
+GetPathCoordsNV(path, coords)
+	return		void
+	param		path		Path in value
+	param		coords		Float32 out array [COMPSIZE(path)]
+	category	NV_path_rendering
+	dlflags		notlistable
+	version		1.1
+	extension
+
+GetPathDashArrayNV(path, dashArray)
+	return		void
+	param		path		Path in value
+	param		dashArray	Float32 out array [COMPSIZE(path)]
+	category	NV_path_rendering
+	dlflags		notlistable
+	version		1.1
+	extension
+
+GetPathMetricsNV(metricQueryMask, numPaths, pathNameType, paths, pathBase, stride, metrics)
+	return		void
+	param		metricQueryMask PathMetricMask in value
+	param		numPaths	SizeI in value
+	param		pathNameType	PathElementType in value
+	param		paths		PathElement in array [COMPSIZE(numPaths,pathNameType,paths)]
+	param		pathBase	Path in value
+	param		stride		SizeI in value
+	param		metrics		Float32 out array [COMPSIZE(metricQueryMask,numPaths,stride)]
+	category	NV_path_rendering
+	dlflags		notlistable
+	version		1.1
+	extension
+
+GetPathMetricRangeNV(metricQueryMask, firstPathName, numPaths, stride, metrics)
+	return		void
+	param		metricQueryMask PathMetricMask in value
+	param		firstPathName	Path in value
+	param		numPaths	SizeI in value
+	param		stride		SizeI in value
+	param		metrics		Float32 out array [COMPSIZE(metricQueryMask,numPaths,stride)]
+	category	NV_path_rendering
+	dlflags		notlistable
+	version		1.1
+	extension
+
+GetPathSpacingNV(pathListMode, numPaths, pathNameType, paths, pathBase, advanceScale, kerningScale, transformType, returnedSpacing)
+	return		void
+	param		pathListMode	PathListMode in value
+	param		numPaths	SizeI in value
+	param		pathNameType	PathElementType in value
+	param		paths		PathElement in array [COMPSIZE(numPaths,pathNameType,paths)]
+	param		pathBase	Path in value
+	param		advanceScale	Float32 in value
+	param		kerningScale	Float32 in value
+	param		transformType	PathTransformType in value
+	param		returnedSpacing Float32 out array [COMPSIZE(pathListMode,numPaths)]
+	category	NV_path_rendering
+	dlflags		notlistable
+	version		1.1
+	extension
+
+GetPathColorGenivNV(color, pname, value)
+	return		void
+	param		color		PathColor in value
+	param		pname		PathGenMode in value
+	param		value		Int32 out array [COMPSIZE(pname)]
+	category	NV_path_rendering
+	dlflags		notlistable
+	version		1.1
+	extension
+
+GetPathColorGenfvNV(color, pname, value)
+	return		void
+	param		color		PathColor in value
+	param		pname		PathGenMode in value
+	param		value		Float32 out array [COMPSIZE(pname)]
+	category	NV_path_rendering
+	dlflags		notlistable
+	version		1.1
+	extension
+
+GetPathTexGenivNV(texCoordSet, pname, value)
+	return		void
+	param		texCoordSet	TextureUnit in value
+	param		pname		PathGenMode in value
+	param		value		Int32 out array [COMPSIZE(pname)]
+	category	NV_path_rendering
+	dlflags		notlistable
+	version		1.1
+	extension
+
+GetPathTexGenfvNV(texCoordSet, pname, value)
+	return		void
+	param		texCoordSet	TextureUnit in value
+	param		pname		PathGenMode in value
+	param		value		Float32 out array [COMPSIZE(pname)]
+	category	NV_path_rendering
+	dlflags		notlistable
+	version		1.1
+	extension
+
+IsPointInFillPathNV(path, mask, x, y)
+	return		Boolean
+	param		path		Path in value
+	param		mask		MaskedStencilValue in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	category	NV_path_rendering
+	dlflags		notlistable
+	version		1.1
+	extension
+
+IsPointInStrokePathNV(path, x, y)
+	return		Boolean
+	param		path		Path in value
+	param		x		Float32 in value
+	param		y		Float32 in value
+	category	NV_path_rendering
+	dlflags		notlistable
+	version		1.1
+	extension
+
+GetPathLengthNV(path, startSegment, numSegments)
+	return		Float32
+	param		path		Path in value
+	param		startSegment	SizeI in value
+	param		numSegments	SizeI in value
+	category	NV_path_rendering
+	dlflags		notlistable
+	version		1.1
+	extension
+
+PointAlongPathNV(path, startSegment, numSegments, distance, x, y, tangentX, tangentY)
+	return		Boolean
+	param		path		Path in value
+	param		startSegment	SizeI in value
+	param		numSegments	SizeI in value
+	param		distance	Float32 in value
+	param		x		Float32 out array [1]
+	param		y		Float32 out array [1]
+	param		tangentX	Float32 out array [1]
+	param		tangentY	Float32 out array [1]
+	category	NV_path_rendering
+	dlflags		notlistable
+	version		1.1
+	extension
+
+###############################################################################
+#
+# Extension #411
+# AMD_pinned_memory commands
+#
+###############################################################################
+
+# (none)
+newcategory: AMD_pinned_memory
+
+###############################################################################
+#
+# Extension #412 - WGL_NV_DX_interop2
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #413 - AMD_stencil_operation_extended
+#
+###############################################################################
+
+StencilOpValueAMD(face, value)
+	return		void
+	param		face		StencilFaceDirection in value
+	param		value		UInt32 in value
+	category	AMD_stencil_operation_extended
+	version		1.2
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #414 - GLX_EXT_swap_control_tear
+# Extension #415 - WGL_EXT_swap_control_tear
+#
+###############################################################################
+
+###############################################################################
+#
+# Extension #416
+# AMD_vertex_shader_viewport_index commands
+#
+###############################################################################
+
+# (none)
+newcategory: AMD_vertex_shader_viewport_index
+
+###############################################################################
+#
+# Extension #417
+# AMD_vertex_shader_layer commands
+#
+###############################################################################
+
+# (none)
+newcategory: AMD_vertex_shader_layer
+
+###############################################################################
+#
+# Extension #418
+# NV_bindless_texture commands
+#
+###############################################################################
+
+GetTextureHandleNV(texture)
+	return		UInt64
+	param		texture		UInt32 in value
+	category	NV_bindless_texture
+	dlflags		notlistable
+	version		4.0
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+GetTextureSamplerHandleNV(texture, sampler)
+	return		UInt64
+	param		texture		UInt32 in value
+	param		sampler		UInt32 in value
+	category	NV_bindless_texture
+	dlflags		notlistable
+	version		4.0
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+MakeTextureHandleResidentNV(handle)
+	return		void
+	param		handle		UInt64 in value
+	category	NV_bindless_texture
+	version		4.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MakeTextureHandleNonResidentNV(handle)
+	return		void
+	param		handle		UInt64 in value
+	category	NV_bindless_texture
+	version		4.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+GetImageHandleNV(texture, level, layered, layer, format)
+	return		UInt64
+	param		texture		UInt32 in value
+	param		level		Int32 in value
+	param		layered		Boolean in value
+	param		layer		Int32 in value
+	param		format		GLenum in value
+	category	NV_bindless_texture
+	dlflags		notlistable
+	version		4.0
+	extension
+	glxsingle	?
+	glxflags	ignore
+	offset		?
+
+MakeImageHandleResidentNV(handle, access)
+	return		void
+	param		handle		UInt64 in value
+	param		access		GLenum in value
+	category	NV_bindless_texture
+	version		4.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+MakeImageHandleNonResidentNV(handle)
+	return		void
+	param		handle		UInt64 in value
+	category	NV_bindless_texture
+	version		4.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+UniformHandleui64NV(location, value)
+	return		void
+	param		location	Int32 in value
+	param		value		UInt64 in value
+	category	NV_bindless_texture
+	version		4.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+UniformHandleui64vNV(location, count, value)
+	return		void
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		value		UInt64 in array [count]
+	category	NV_bindless_texture
+	version		4.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformHandleui64NV(program, location, value)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		value		UInt64 in value
+	category	NV_bindless_texture
+	version		4.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+ProgramUniformHandleui64vNV(program, location, count, values)
+	return		void
+	param		program		UInt32 in value
+	param		location	Int32 in value
+	param		count		SizeI in value
+	param		values		UInt64 in array [count]
+	category	NV_bindless_texture
+	version		4.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+IsTextureHandleResidentNV(handle)
+	return		Boolean
+	param		handle		UInt64 in value
+	category	NV_bindless_texture
+	version		4.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+IsImageHandleResidentNV(handle)
+	return		Boolean
+	param		handle		UInt64 in value
+	category	NV_bindless_texture
+	version		4.0
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+###############################################################################
+#
+# Extension #419
+# NV_shader_atomic_float commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_shader_atomic_float
+
+[###############################################################################
+#
+# Extension #420
+# AMD_query_buffer_object commands
+#
+###############################################################################
+
+# (none)
+newcategory: AMD_query_buffer_object
+
+###############################################################################
+#
+# Extension #421
+# AMD_sparse_texture commands
+#
+###############################################################################
+
+TexStorageSparseAMD(target, internalFormat, width, height, depth, layers, flags)
+	return		void
+	param		target		GLenum in value
+	param		internalFormat	GLenum in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		layers		SizeI in value
+	param		flags		GLbitfield in value
+	category	AMD_sparse_texture
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TextureStorageSparseAMD(texture, target, internalFormat, width, height, depth, layers, flags)
+	return		void
+	param		texture		UInt32 in value
+	param		target		GLenum in value
+	param		internalFormat	GLenum in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		layers		SizeI in value
+	param		flags		GLbitfield in value
+	category	AMD_sparse_texture
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
diff --git a/xorg-server/hw/xwin/swrastwgl_dri/gl.tm b/xorg-server/hw/xwin/swrastwgl_dri/gl.tm
new file mode 100644
index 000000000..355a1c8f6
--- /dev/null
+++ b/xorg-server/hw/xwin/swrastwgl_dri/gl.tm
@@ -0,0 +1,349 @@
+AccumOp,*,*,			    GLenum,*,*
+AlphaFunction,*,*,		    GLenum,*,*
+AttribMask,*,*,			    GLbitfield,*,*
+BeginMode,*,*,			    GLenum,*,*
+BinormalPointerTypeEXT,*,*,	    GLenum,*,*
+BlendEquationMode,*,*,		    GLenum,*,*
+BlendEquationModeEXT,*,*,	    GLenum,*,*
+BlendFuncSeparateParameterEXT,*,*,  GLenum,*,*
+BlendingFactorDest,*,*,		    GLenum,*,*
+BlendingFactorSrc,*,*,		    GLenum,*,*
+Boolean,*,*,			    GLboolean,*,*
+BooleanPointer,*,*,		    GLboolean*,*,*
+Char,*,*,			    GLchar,*,*
+CharPointer,*,*,		    GLchar*,*,*
+ConstCharPointer,*,*,		    GLchar* const,*,*
+CheckedFloat32,*,*,		    GLfloat,*,*
+CheckedInt32,*,*,		    GLint,*,*
+ClampColorTargetARB,*,*,	    GLenum,*,*
+ClampColorModeARB,*,*,		    GLenum,*,*
+ClampedColorF,*,*,		    GLclampf,*,*
+ClampedFloat32,*,*,		    GLclampf,*,*
+ClampedFloat64,*,*,		    GLclampd,*,*
+ClampedStencilValue,*,*,	    GLint,*,*
+ClearBufferMask,*,*,		    GLbitfield,*,*
+ClientAttribMask,*,*,		    GLbitfield,*,*
+ClipPlaneName,*,*,		    GLenum,*,*
+ColorB,*,*,			    GLbyte,*,*
+ColorD,*,*,			    GLdouble,*,*
+ColorF,*,*,			    GLfloat,*,*
+ColorI,*,*,			    GLint,*,*
+ColorIndexValueD,*,*,		    GLdouble,*,*
+ColorIndexValueF,*,*,		    GLfloat,*,*
+ColorIndexValueI,*,*,		    GLint,*,*
+ColorIndexValueS,*,*,		    GLshort,*,*
+ColorIndexValueUB,*,*,		    GLubyte,*,*
+ColorMaterialParameter,*,*,	    GLenum,*,*
+ColorPointerType,*,*,		    GLenum,*,*
+ColorS,*,*,			    GLshort,*,*
+ColorTableParameterPName,*,*,	    GLenum,*,*
+ColorTableParameterPNameSGI,*,*,    GLenum,*,*
+ColorTableTarget,*,*,		    GLenum,*,*
+ColorTableTargetSGI,*,*,	    GLenum,*,*
+ColorUB,*,*,			    GLubyte,*,*
+ColorUI,*,*,			    GLuint,*,*
+ColorUS,*,*,			    GLushort,*,*
+CombinerBiasNV,*,*,		    GLenum,*,*
+CombinerComponentUsageNV,*,*,	    GLenum,*,*
+CombinerMappingNV,*,*,		    GLenum,*,*
+CombinerParameterNV,*,*,	    GLenum,*,*
+CombinerPortionNV,*,*,		    GLenum,*,*
+CombinerRegisterNV,*,*,		    GLenum,*,*
+CombinerScaleNV,*,*,		    GLenum,*,*
+CombinerStageNV,*,*,		    GLenum,*,*
+CombinerVariableNV,*,*,		    GLenum,*,*
+CompressedTextureARB,*,*,	    GLvoid,*,*
+ControlPointNV,*,*,		    GLvoid,*,*
+ControlPointTypeNV,*,*,		    GLenum,*,*
+ConvolutionParameter,*,*,	    GLenum,*,*
+ConvolutionParameterEXT,*,*,	    GLenum,*,*
+ConvolutionTarget,*,*,		    GLenum,*,*
+ConvolutionTargetEXT,*,*,	    GLenum,*,*
+CoordD,*,*,			    GLdouble,*,*
+CoordF,*,*,			    GLfloat,*,*
+CoordI,*,*,			    GLint,*,*
+CoordS,*,*,			    GLshort,*,*
+CullFaceMode,*,*,		    GLenum,*,*
+CullParameterEXT,*,*,		    GLenum,*,*
+DepthFunction,*,*,		    GLenum,*,*
+DrawBufferMode,*,*,		    GLenum,*,*
+DrawBufferName,*,*,		    GLint,*,*
+DrawElementsType,*,*,		    GLenum,*,*
+ElementPointerTypeATI,*,*,	    GLenum,*,*
+EnableCap,*,*,			    GLenum,*,*
+ErrorCode,*,*,			    GLenum,*,*
+EvalMapsModeNV,*,*,		    GLenum,*,*
+EvalTargetNV,*,*,		    GLenum,*,*
+FeedbackElement,*,*,		    GLfloat,*,*
+FeedbackType,*,*,		    GLenum,*,*
+FenceNV,*,*,			    GLuint,*,*
+FenceConditionNV,*,*,		    GLenum,*,*
+FenceParameterNameNV,*,*,	    GLenum,*,*
+FfdMaskSGIX,*,*,		    GLbitfield,*,*
+FfdTargetSGIX,*,*,		    GLenum,*,*
+Float32,*,*,			    GLfloat,*,*
+Float32Pointer,*,*,		    GLfloat*,*,*
+Float64,*,*,			    GLdouble,*,*
+Float64Pointer,*,*,		    GLdouble*,*,*
+FogParameter,*,*,		    GLenum,*,*
+FogPointerTypeEXT,*,*,		    GLenum,*,*
+FogPointerTypeIBM,*,*,		    GLenum,*,*
+FragmentLightModelParameterSGIX,*,*,GLenum,*,*
+FragmentLightNameSGIX,*,*,	    GLenum,*,*
+FragmentLightParameterSGIX,*,*,     GLenum,*,*
+FramebufferAttachment,*,*,	    GLenum,*,*
+FramebufferTarget,*,*,		    GLenum,*,*
+FrontFaceDirection,*,*,		    GLenum,*,*
+FunctionPointer,*,*,		    _GLfuncptr,*,*
+GetColorTableParameterPName,*,*,    GLenum,*,*
+GetColorTableParameterPNameSGI,*,*, GLenum,*,*
+GetConvolutionParameterPName,*,*,   GLenum,*,*
+GetHistogramParameterPName,*,*,     GLenum,*,*
+GetHistogramParameterPNameEXT,*,*,  GLenum,*,*
+GetMapQuery,*,*,		    GLenum,*,*
+GetMinmaxParameterPName,*,*,	    GLenum,*,*
+GetMinmaxParameterPNameEXT,*,*,     GLenum,*,*
+GetPName,*,*,			    GLenum,*,*
+GetPointervPName,*,*,		    GLenum,*,*
+GetTextureParameter,*,*,	    GLenum,*,*
+HintMode,*,*,			    GLenum,*,*
+HintTarget,*,*,			    GLenum,*,*
+HintTargetPGI,*,*,		    GLenum,*,*
+HistogramTarget,*,*,		    GLenum,*,*
+HistogramTargetEXT,*,*,		    GLenum,*,*
+IglooFunctionSelectSGIX,*,*,	    GLenum,*,*
+IglooParameterSGIX,*,*,		    GLvoid,*,*
+ImageTransformPNameHP,*,*,	    GLenum,*,*
+ImageTransformTargetHP,*,*,	    GLenum,*,*
+IndexFunctionEXT,*,*,		    GLenum,*,*
+IndexMaterialParameterEXT,*,*,	    GLenum,*,*
+IndexPointerType,*,*,		    GLenum,*,*
+Int16,*,*,			    GLshort,*,*
+Int32,*,*,			    GLint,*,*
+Int8,*,*,			    GLbyte,*,*
+InterleavedArrayFormat,*,*,	    GLenum,*,*
+LightEnvParameterSGIX,*,*,	    GLenum,*,*
+LightModelParameter,*,*,	    GLenum,*,*
+LightName,*,*,			    GLenum,*,*
+LightParameter,*,*,		    GLenum,*,*
+LightTextureModeEXT,*,*,	    GLenum,*,*
+LightTexturePNameEXT,*,*,	    GLenum,*,*
+LineStipple,*,*,		    GLushort,*,*
+List,*,*,			    GLuint,*,*
+ListMode,*,*,			    GLenum,*,*
+ListNameType,*,*,		    GLenum,*,*
+ListParameterName,*,*,		    GLenum,*,*
+LogicOp,*,*,			    GLenum,*,*
+MapAttribParameterNV,*,*,	    GLenum,*,*
+MapParameterNV,*,*,		    GLenum,*,*
+MapTarget,*,*,			    GLenum,*,*
+MapTargetNV,*,*,		    GLenum,*,*
+MapTypeNV,*,*,			    GLenum,*,*
+MaskedColorIndexValueF,*,*,	    GLfloat,*,*
+MaskedColorIndexValueI,*,*,	    GLuint,*,*
+MaskedStencilValue,*,*,		    GLuint,*,*
+MaterialFace,*,*,		    GLenum,*,*
+MaterialParameter,*,*,		    GLenum,*,*
+MatrixIndexPointerTypeARB,*,*,	    GLenum,*,*
+MatrixMode,*,*,			    GLenum,*,*
+MatrixTransformNV,*,*,		    GLenum,*,*
+MeshMode1,*,*,			    GLenum,*,*
+MeshMode2,*,*,			    GLenum,*,*
+MinmaxTarget,*,*,		    GLenum,*,*
+MinmaxTargetEXT,*,*,		    GLenum,*,*
+NormalPointerType,*,*,		    GLenum,*,*
+NurbsCallback,*,*,		    GLenum,*,*
+NurbsObj,*,*,			    GLUnurbs*,*,*
+NurbsProperty,*,*,		    GLenum,*,*
+NurbsTrim,*,*,			    GLenum,*,*
+OcclusionQueryParameterNameNV,*,*,  GLenum,*,*
+PixelCopyType,*,*,		    GLenum,*,*
+PixelFormat,*,*,		    GLenum,*,*
+PixelInternalFormat,*,*,	    GLenum,*,*
+PixelMap,*,*,			    GLenum,*,*
+PixelStoreParameter,*,*,	    GLenum,*,*
+PixelTexGenModeSGIX,*,*,	    GLenum,*,*
+PixelTexGenParameterNameSGIS,*,*,   GLenum,*,*
+PixelTransferParameter,*,*,	    GLenum,*,*
+PixelTransformPNameEXT,*,*,	    GLenum,*,*
+PixelTransformTargetEXT,*,*,	    GLenum,*,*
+PixelType,*,*,			    GLenum,*,*
+PointParameterNameARB,*,*,	    GLenum,*,*
+PolygonMode,*,*,		    GLenum,*,*
+ProgramNV,*,*,			    GLuint,*,*
+ProgramCharacterNV,*,*,		    GLubyte,*,*
+ProgramParameterNV,*,*,		    GLenum,*,*
+ProgramParameterPName,*,*,	    GLenum,*,*
+QuadricCallback,*,*,		    GLenum,*,*
+QuadricDrawStyle,*,*,		    GLenum,*,*
+QuadricNormal,*,*,		    GLenum,*,*
+QuadricObj,*,*,			    GLUquadric*,*,*
+QuadricOrientation,*,*,		    GLenum,*,*
+ReadBufferMode,*,*,		    GLenum,*,*
+RenderbufferTarget,*,*,		    GLenum,*,*
+RenderingMode,*,*,		    GLenum,*,*
+ReplacementCodeSUN,*,*,		    GLuint,*,*
+ReplacementCodeTypeSUN,*,*,	    GLenum,*,*
+SamplePassARB,*,*,		    GLenum,*,*
+SamplePatternEXT,*,*,		    GLenum,*,*
+SamplePatternSGIS,*,*,		    GLenum,*,*
+SecondaryColorPointerTypeIBM,*,*,   GLenum,*,*
+SelectName,*,*,			    GLuint,*,*
+SeparableTarget,*,*,		    GLenum,*,*
+SeparableTargetEXT,*,*,		    GLenum,*,*
+ShadingModel,*,*,		    GLenum,*,*
+SizeI,*,*,			    GLsizei,*,*
+SpriteParameterNameSGIX,*,*,	    GLenum,*,*
+StencilFunction,*,*,		    GLenum,*,*
+StencilFaceDirection,*,*,	    GLenum,*,*
+StencilOp,*,*,			    GLenum,*,*
+StencilValue,*,*,		    GLint,*,*
+String,*,*,			    const GLubyte *,*,*
+StringName,*,*,			    GLenum,*,*
+TangentPointerTypeEXT,*,*,	    GLenum,*,*
+TessCallback,*,*,		    GLenum,*,*
+TessContour,*,*,		    GLenum,*,*
+TessProperty,*,*,		    GLenum,*,*
+TesselatorObj,*,*,		    GLUtesselator*,*,*
+TexCoordPointerType,*,*,	    GLenum,*,*
+Texture,*,*,			    GLuint,*,*
+TextureComponentCount,*,*,	    GLint,*,*
+TextureCoordName,*,*,		    GLenum,*,*
+TextureEnvParameter,*,*,	    GLenum,*,*
+TextureEnvTarget,*,*,		    GLenum,*,*
+TextureFilterSGIS,*,*,		    GLenum,*,*
+TextureGenParameter,*,*,	    GLenum,*,*
+TextureNormalModeEXT,*,*,	    GLenum,*,*
+TextureParameterName,*,*,	    GLenum,*,*
+TextureTarget,*,*,		    GLenum,*,*
+TextureUnit,*,*,		    GLenum,*,*
+UInt16,*,*,			    GLushort,*,*
+UInt32,*,*,			    GLuint,*,*
+UInt8,*,*,			    GLubyte,*,*
+VertexAttribEnum,*,*,		    GLenum,*,*
+VertexAttribEnumNV,*,*,		    GLenum,*,*
+VertexAttribPointerTypeNV,*,*,	    GLenum,*,*
+VertexPointerType,*,*,		    GLenum,*,*
+VertexWeightPointerTypeEXT,*,*,     GLenum,*,*
+Void,*,*,			    GLvoid,*,*
+VoidPointer,*,*,		    GLvoid*,*,*
+ConstVoidPointer,*,*,		    GLvoid* const,*,*
+WeightPointerTypeARB,*,*,	    GLenum,*,*
+WinCoord,*,*,			    GLint,*,*
+void,*,*,			    *,*,*
+ArrayObjectPNameATI,*,*,	    GLenum,*,*
+ArrayObjectUsageATI,*,*,	    GLenum,*,*,
+ConstFloat32,*,*,		    GLfloat,*,*
+ConstInt32,*,*,			    GLint,*,*
+ConstUInt32,*,*,		    GLuint,*,*
+ConstVoid,*,*,			    GLvoid,*,*
+DataTypeEXT,*,*,		    GLenum,*,*
+FragmentOpATI,*,*,		    GLenum,*,*
+GetTexBumpParameterATI,*,*,	    GLenum,*,*
+GetVariantValueEXT,*,*,		    GLenum,*,*
+ParameterRangeEXT,*,*,		    GLenum,*,*
+PreserveModeATI,*,*,		    GLenum,*,*
+ProgramFormatARB,*,*,		    GLenum,*,*
+ProgramTargetARB,*,*,		    GLenum,*,*
+ProgramTarget,*,*,		    GLenum,*,*
+ProgramPropertyARB,*,*,		    GLenum,*,*
+ProgramStringPropertyARB,*,*,	    GLenum,*,*
+ScalarType,*,*,			    GLenum,*,*
+SwizzleOpATI,*,*,		    GLenum,*,*
+TexBumpParameterATI,*,*,	    GLenum,*,*
+VariantCapEXT,*,*,		    GLenum,*,*
+VertexAttribPointerPropertyARB,*,*, GLenum,*,*
+VertexAttribPointerTypeARB,*,*,     GLenum,*,*
+VertexAttribPropertyARB,*,*,	    GLenum,*,*
+VertexShaderCoordOutEXT,*,*,	    GLenum,*,*
+VertexShaderOpEXT,*,*,		    GLenum,*,*
+VertexShaderParameterEXT,*,*,	    GLenum,*,*
+VertexShaderStorageTypeEXT,*,*,     GLenum,*,*
+VertexShaderTextureUnitParameter,*,*,	GLenum,*,*
+VertexShaderWriteMaskEXT,*,*,	    GLenum,*,*
+VertexStreamATI,*,*,		    GLenum,*,*
+PNTrianglesPNameATI,*,*,	    GLenum,*,*
+# ARB_vertex_buffer_object types and core equivalents for new types
+BufferOffset,*,*,		    GLintptr,*,*
+BufferSize,*,*,			    GLsizeiptr,*,*
+BufferAccessARB,*,*,		    GLenum,*,*
+BufferOffsetARB,*,*,		    GLintptrARB,*,*
+BufferPNameARB,*,*,		    GLenum,*,*
+BufferPointerNameARB,*,*,	    GLenum,*,*
+BufferSizeARB,*,*,		    GLsizeiptrARB,*,*
+BufferTargetARB,*,*,		    GLenum,*,*
+BufferUsageARB,*,*,		    GLenum,*,*
+# APPLE_fence
+ObjectTypeAPPLE,*,*,		    GLenum,*,*
+# APPLE_vertex_array_range
+VertexArrayPNameAPPLE,*,*,	    GLenum,*,*
+# ATI_draw_buffers
+DrawBufferModeATI,*,*,		    GLenum,*,*
+# NV_half
+Half16NV,*,*,			    GLhalfNV,*,*
+# NV_pixel_data_range
+PixelDataRangeTargetNV,*,*,	    GLenum,*,*
+# Generic types for as-yet-unspecified enums
+TypeEnum,*,*,			    GLenum,*,*
+GLbitfield,*,*,			    GLbitfield,*,*
+GLenum,*,*,			    GLenum,*,*
+Int64,*,*,			    GLint64,*,*
+UInt64,*,*,			    GLuint64,*,*
+# Object handle & data pointers
+handleARB,*,*,			    GLhandleARB,*,*
+charARB,*,*,			    GLcharARB,*,*
+charPointerARB,*,*,		    GLcharARB*,*,*
+sync,*,*,			    GLsync,*,*,
+# EXT_timer_query
+Int64EXT,*,*,			    GLint64EXT,*,*
+UInt64EXT,*,*,			    GLuint64EXT,*,*
+# EXT_direct_state_access
+FramebufferAttachmentParameterName,*,*, GLenum,*,*
+Framebuffer,*,*,		    GLuint,*,*
+FramebufferStatus,*,*,		    GLenum,*,*
+GetFramebufferParameter,*,*,	    GLenum,*,*
+Intptr,*,*,			    GLintptr,*,*
+ProgramFormat,*,*,		    GLenum,*,*
+ProgramProperty,*,*,		    GLenum,*,*
+ProgramStringProperty,*,*,	    GLenum,*,*
+Renderbuffer,*,*,		    GLuint,*,*
+RenderbufferParameterName,*,*,	    GLenum,*,*
+Sizeiptr,*,*,			    GLsizeiptr,*,*
+TextureInternalFormat,*,*,	    GLenum,*,*
+VertexBufferObjectAccess,*,*,	    GLenum,*,*
+VertexBufferObjectParameter,*,*,    GLenum,*,*
+VertexBufferObjectUsage,*,*,	    GLenum,*,*
+# ARB_map_buffer_range
+BufferAccessMask,*,*,		    GLbitfield,*,*
+# NV_explicit_multisample
+GetMultisamplePNameNV,*,*,	    GLenum,*,*
+SampleMaskNV,*,*,		    GLbitfield,*,*
+# ARB_debug_output
+GLDEBUGPROC,*,*,		    GLDEBUGPROC,*,*
+# ARB_debug_output
+GLDEBUGPROCARB,*,*,		    GLDEBUGPROCARB,*,*
+# AMD_debug_output
+GLDEBUGPROCAMD,*,*,		    GLDEBUGPROCAMD,*,*
+# NV_vdpau_interop
+vdpauSurfaceNV,*,*,		    GLvdpauSurfaceNV,*,*,
+# External API types
+cl_context,*,*,			    struct _cl_context *,*,*
+cl_event,*,*,			    struct _cl_event *,*,*
+Path,*,*,			    GLuint,*,*
+PathColor,*,*,			    GLenum,*,*
+PathColorFormat,*,*,		    GLenum,*,*
+PathCommand,*,*,		    GLubyte,*,*
+PathCoordType,*,*,		    GLenum,*,*
+PathCoverMode,*,*,		    GLenum,*,*
+PathElementType,*,*,		    GLenum,*,*
+PathElement,*,*,		    GLvoid,*,*
+PathFillMode,*,*,		    GLenum,*,*
+PathFontStyle,*,*,		    GLbitfield,*,*
+PathFontTarget,*,*,		    GLenum,*,*
+PathGenMode,*,*,		    GLenum,*,*
+PathListMode,*,*,		    GLenum,*,*
+PathMetricMask,*,*,		    GLbitfield,*,*
+PathParameter,*,*,		    GLenum,*,*
+PathStringFormat,*,*,		    GLenum,*,*
+PathTransformType,*,*,		    GLenum,*,*
+PathHandleMissingGlyphs,*,*,	    GLenum,*,*
diff --git a/xorg-server/hw/xwin/swrastwgl_dri/glwindows.h b/xorg-server/hw/xwin/swrastwgl_dri/glwindows.h
new file mode 100644
index 000000000..3e200644f
--- /dev/null
+++ b/xorg-server/hw/xwin/swrastwgl_dri/glwindows.h
@@ -0,0 +1,39 @@
+/*
+ * File: glwindows.h
+ * Purpose: Header for GLX implementation using native Windows OpenGL library
+ *
+ * Authors: Alexander Gottwald
+ *          Jon TURNEY
+ *
+ * Copyright (c) Jon TURNEY 2009
+ * Copyright (c) Alexander Gottwald 2004
+ *
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include <GL/gl.h>
+
+void glWinCallDelta(void);
+void glxWinPushNativeProvider(void);
+const GLubyte* glGetStringWrapperNonstatic(GLenum name);
+void glAddSwapHintRectWINWrapperNonstatic(GLint x, GLint y, GLsizei width,
+                                          GLsizei height);
+void glWinSetupDispatchTable(void);
diff --git a/xorg-server/hw/xwin/swrastwgl_dri/glwrap.c b/xorg-server/hw/xwin/swrastwgl_dri/glwrap.c
new file mode 100644
index 000000000..6d794b671
--- /dev/null
+++ b/xorg-server/hw/xwin/swrastwgl_dri/glwrap.c
@@ -0,0 +1,151 @@
+/*
+ * File: glwrap.c
+ * Purpose: Wrapper functions for Win32 OpenGL functions
+ *
+ * Authors: Alexander Gottwald
+ *          Jon TURNEY
+ *
+ * Copyright (c) Jon TURNEY 2009
+ * Copyright (c) Alexander Gottwald 2004
+ *
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+// define USE_OPENGL32 makes gl.h declare gl*() function prototypes with stdcall linkage,
+// so our generated wrappers will correctly link with the functions in opengl32.dll
+#define USE_OPENGL32
+
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
+
+#include <X11/Xwindows.h>
+#include <GL/gl.h>
+#include <GL/glext.h>
+#include <glx/glheader.h>
+#include <glx/glxserver.h>
+#include <glx/glxext.h>
+#include <glx/glapi.h>
+#include <glx/dispatch.h>
+#include <glwindows.h>
+#include <winmsg.h>
+
+#ifdef _DEBUG
+static unsigned int glWinIndirectProcCalls = 0;
+static unsigned int glWinDirectProcCalls = 0;
+
+void
+glWinCallDelta(void)
+{
+    static unsigned int glWinIndirectProcCallsLast = 0;
+    static unsigned int glWinDirectProcCallsLast = 0;
+
+    if ((glWinIndirectProcCalls != glWinIndirectProcCallsLast) ||
+        (glWinDirectProcCalls != glWinDirectProcCallsLast)) {
+        glWinDirectProcCallsLast = glWinDirectProcCalls;
+        glWinIndirectProcCallsLast = glWinIndirectProcCalls;
+    }
+}
+#endif
+
+static __inline PROC
+glWinResolveHelper(PROC * cache, char *symbol)
+{
+    PROC proc = NULL;
+
+    /* If not yet cached, call wglGetProcAddress */
+    if ((*cache) == NULL) {
+        proc = wglGetProcAddress(symbol);
+        if (proc == NULL) {
+            ErrorF("glwrap: Can't resolve \"%s\"\n", symbol);
+            (*cache) = (PROC) - 1;
+        }
+        else {
+            ErrorF("glwrap: Resolved \"%s\"\n", symbol);
+            (*cache) = proc;
+        }
+    }
+    /* Cached wglGetProcAddress failure */
+    else if ((*cache) == (PROC) - 1) {
+        proc = 0;
+    }
+    /* Cached wglGetProcAddress result */
+    else {
+        proc = (*cache);
+    }
+
+    return proc;
+}
+
+#ifdef _DEBUG
+#define INCPROCCALLS   glWinIndirectProcCalls++;
+#else
+#define INCPROCCALLS
+#endif
+
+#define RESOLVE_RET(proctype, symbol, retval) \
+    static PROC cache = NULL; \
+    proctype proc = (proctype)glWinResolveHelper(&cache, symbol); \
+    if (proc == NULL) { \
+        __glXErrorCallBack(0); \
+        return retval; \
+    } \
+    INCPROCCALLS
+
+#define RESOLVE(proctype, symbol) RESOLVE_RET(proctype, symbol,)
+
+#define RESOLVED_PROC(proctype) proc
+
+/*
+  Include generated cdecl wrappers for stdcall gl*() functions in opengl32.dll
+
+  OpenGL 1.2 and upward is treated as extensions, function address must
+  found using wglGetProcAddress(), but also stdcall so still need wrappers...
+
+  Include generated dispatch table setup function
+*/
+
+#include "generated_gl_wrappers.c"
+
+/*
+  Special non-static wrapper for glGetString for debug output
+*/
+
+const GLubyte *
+glGetStringWrapperNonstatic(GLenum name)
+{
+    return glGetString(name);
+}
+
+/*
+  Special non-static wrapper for glAddSwapHintRectWIN for copySubBuffers
+*/
+
+typedef void (__stdcall * PFNGLADDSWAPHINTRECTWIN) (GLint x, GLint y,
+                                                    GLsizei width,
+                                                    GLsizei height);
+
+void
+glAddSwapHintRectWINWrapperNonstatic(GLint x, GLint y, GLsizei width,
+                                     GLsizei height)
+{
+    RESOLVE(PFNGLADDSWAPHINTRECTWIN, "glAddSwapHintRectWIN");
+    proc(x, y, width, height);
+}
diff --git a/xorg-server/hw/xwin/swrastwgl_dri/makefile b/xorg-server/hw/xwin/swrastwgl_dri/makefile
new file mode 100644
index 000000000..7a389db7f
--- /dev/null
+++ b/xorg-server/hw/xwin/swrastwgl_dri/makefile
@@ -0,0 +1,15 @@
+SHAREDLIB = swrastwgl_dri
+
+INCLUDES += $(OBJDIR) ..\..\.. ..
+DEFINES += INSERVER HAVE_XWIN_CONFIG_H PTW32_STATIC_LIB
+
+$(OBJDIR)\swrastwgl_dri.dll : ..\..\..\$(SERVOBJDIR)\vcxsrv.exe
+LINKLIBS += ..\..\..\$(SERVOBJDIR)\vcxsrv.lib
+
+CSRCS = swrastwgl_dri.c glwrap.c wgl_ext_api.c
+
+$(OBJDIR)\generated_gl_wrappers.c: gen_gl_wrappers.py gl.spec gl.tm
+	gen_gl_wrappers --spec=gl.spec --typemap=gl.tm --dispatch-header=../../../glx/dispatch.h --staticwrappers > $@
+
+$(OBJDIR)\generated_wgl_wrappers.c: gen_gl_wrappers.py wglext.spec wgl.tm
+	gen_gl_wrappers --spec=wglext.spec --typemap=wgl.tm --prefix=wgl --preresolve > $@
diff --git a/xorg-server/hw/xwin/swrastwgl_dri/swrastwgl_dri.c b/xorg-server/hw/xwin/swrastwgl_dri/swrastwgl_dri.c
new file mode 100644
index 000000000..8597e5b4a
--- /dev/null
+++ b/xorg-server/hw/xwin/swrastwgl_dri/swrastwgl_dri.c
@@ -0,0 +1,1216 @@
+#ifdef HAVE_XWIN_CONFIG_H

+#include <xwin-config.h>

+#endif

+#include <X11/Xwindows.h>

+#include <GL/gl.h>

+#include <GL/glext.h>

+#include <GL/glx.h>

+#include <GL/internal/dri_interface.h>

+#include <stdint.h>

+

+#include <glx/glheader.h>

+#include <glx/glapi.h>

+#include <glx/glapitable.h>

+

+typedef unsigned char BYTE;

+typedef int BOOL;

+

+#ifdef _DEBUG

+#define PRINTF(...) ErrorF( __VA_ARGS__)

+#else

+#define PRINTF(...)

+#endif

+

+#undef PUBLIC

+#define PUBLIC __declspec(dllexport)

+

+BOOL colorIndexMode = FALSE;

+BOOL doubleBuffered = FALSE;

+

+struct __DRIscreenRec

+{

+  int ScreenNum;

+  const __DRIextension **extensions;

+  const __DRIswrastLoaderExtension *swrast_loader;

+};

+

+struct __DRIcontextRec

+{

+  struct _glapi_table *Dispatch;

+

+  void *driverPrivate;

+  void *loaderPrivate;

+  __DRIdrawable *driDrawablePriv;

+  __DRIdrawable *driReadablePriv;

+  __DRIscreen *driScreenPriv;

+};

+

+struct __DRIdrawableRec

+{

+  HDC hDC;

+  HDC hDCFrontBuffer;

+  HGLRC hGLRC;

+  HPALETTE hPalette;

+  HBITMAP hBitmap;

+  int winWidth;

+  int winHeight;

+  int bitsPerPixel;

+  VOID *bits;

+

+  void *driverPrivate;

+  void *loaderPrivate;

+  __DRIscreen *driScreenPriv;

+  int refcount;

+};

+

+/* Struct used to manage color ramps */

+struct colorIndexState

+{

+  GLfloat amb[3];     /* ambient color / bottom of ramp */

+  GLfloat diff[3];    /* diffuse color / middle of ramp */

+  GLfloat spec[3];    /* specular color / top of ramp */

+  GLfloat ratio;      /* ratio of diffuse to specular in ramp */

+  GLint indexes[3];   /* where ramp was placed in palette */

+};

+

+/*

+** Each entry in this array corresponds to a color ramp in the

+** palette.  The indexes member of each struct is updated to

+** reflect the placement of the color ramp in the palette.

+*/

+#define NUM_COLORS (sizeof(colors) / sizeof(colors[0]))

+struct colorIndexState colors[] = {

+    {

+        { 0.0F, 0.0F, 0.0F },

+        { 0.1F, 0.6F, 0.3F },

+        { 1.0F, 1.0F, 1.0F },

+        0.75F, { 0, 0, 0 },

+    },

+    {

+        { 0.0F, 0.0F, 0.0F },

+        { 0.0F, 0.2F, 0.5F },

+        { 1.0F, 1.0F, 1.0F },

+

+        0.75F, { 0, 0, 0 },

+    },

+    {

+        { 0.0F, 0.05F, 0.05F },

+        { 0.6F, 0.0F, 0.8F },

+        { 1.0F, 1.0F, 1.0F },

+        0.75F, { 0, 0, 0 },

+    },

+};

+void setupPalette(__DRIdrawable * pdp)

+{

+    PIXELFORMATDESCRIPTOR pfd;

+    LOGPALETTE* pPal;

+    int pixelFormat = GetPixelFormat(pdp->hDC);

+    int paletteSize;

+

+    PRINTF(__FUNCTION__": pdp %x\n", pdp);

+

+    DescribePixelFormat(pdp->hDC, pixelFormat, sizeof(PIXELFORMATDESCRIPTOR), &pfd);

+

+    /*

+    ** Determine if a palette is needed and if so what size.

+    */

+    if (pfd.dwFlags & PFD_NEED_PALETTE) {

+        paletteSize = 1 << pfd.cColorBits;

+    } else if (pfd.iPixelType == PFD_TYPE_COLORINDEX) {

+        paletteSize = 4096;

+    } else {

+        return;

+    }

+

+    pPal = (LOGPALETTE*)malloc(sizeof(LOGPALETTE) + paletteSize * sizeof(PALETTEENTRY));

+    pPal->palVersion = 0x300;

+    pPal->palNumEntries = paletteSize;

+

+    if (pfd.iPixelType == PFD_TYPE_RGBA)

+    {

+        /*

+        ** Fill the logical paletee with RGB color ramps

+        */

+        int redMask = (1 << pfd.cRedBits) - 1;

+        int greenMask = (1 << pfd.cGreenBits) - 1;

+        int blueMask = (1 << pfd.cBlueBits) - 1;

+        int i;

+

+        for (i=0; i<paletteSize; ++i) {

+            pPal->palPalEntry[i].peRed =

+                    (((i >> pfd.cRedShift) & redMask) * 255) / redMask;

+            pPal->palPalEntry[i].peGreen =

+                    (((i >> pfd.cGreenShift) & greenMask) * 255) / greenMask;

+            pPal->palPalEntry[i].peBlue =

+                    (((i >> pfd.cBlueShift) & blueMask) * 255) / blueMask;

+            pPal->palPalEntry[i].peFlags = 0;

+        }

+    } else {

+        /*

+        ** Fill the logical palette with color ramps.

+        **pcp

+        ** Set up the logical palette so that it can be realized

+        ** into the system palette as an identity palette.

+        **

+        ** 1) The default static entries should be present and at the right

+        **    location.  The easiest way to do this is to grab them from

+        **    the current system palette.

+        **

+        ** 2) All non-static entries should be initialized to unique values.

+        **    The easiest way to do this is to ensure that all of the non-static

+        **    entries have the PC_NOCOLLAPSE flag bit set.

+        */

+        int numRamps = NUM_COLORS;

+        int rampSize = (paletteSize - 20) / numRamps;

+        int extra = (paletteSize - 20) - (numRamps * rampSize);

+        int i, r;

+

+        /*

+        ** Initialize static entries by copying them from the

+        ** current system palette.

+        */

+        GetSystemPaletteEntries(pdp->hDC, 0, paletteSize, &pPal->palPalEntry[0]);

+

+        /*

+        ** Fill in non-static entries with desired colors.

+        */

+        for (r=0; r<numRamps; ++r) {

+            int rampBase = r * rampSize + 10;

+            PALETTEENTRY *pe = &pPal->palPalEntry[rampBase];

+            int diffSize = (int) (rampSize * colors[r].ratio);

+            int specSize = rampSize - diffSize;

+

+            for (i=0; i<rampSize; ++i) {

+                GLfloat *c0, *c1;

+                GLint a;

+

+                if (i < diffSize) {

+                    c0 = colors[r].amb;

+                    c1 = colors[r].diff;

+                    a = (i * 255) / (diffSize - 1);

+                } else {

+                    c0 = colors[r].diff;

+                    c1 = colors[r].spec;

+                    a = ((i - diffSize) * 255) / (specSize - 1);

+                }

+

+                pe[i].peRed = (BYTE) (a * (c1[0] - c0[0]) + 255 * c0[0]);

+                pe[i].peGreen = (BYTE) (a * (c1[1] - c0[1]) + 255 * c0[1]);

+                pe[i].peBlue = (BYTE) (a * (c1[2] - c0[2]) + 255 * c0[2]);

+                pe[i].peFlags = PC_NOCOLLAPSE;

+            }

+

+            colors[r].indexes[0] = rampBase;

+            colors[r].indexes[1] = rampBase + (diffSize-1);

+            colors[r].indexes[2] = rampBase + (rampSize-1);

+        }

+

+        /*

+        ** Initialize any remaining non-static entries.

+        */

+        for (i=0; i<extra; ++i) {

+            int index = numRamps*rampSize+10+i;

+            PALETTEENTRY *pe = &pPal->palPalEntry[index];

+

+            pe->peRed = (BYTE) 0;

+            pe->peGreen = (BYTE) 0;

+            pe->peBlue = (BYTE) 0;

+            pe->peFlags = PC_NOCOLLAPSE;

+        }

+    }

+

+    pdp->hPalette = CreatePalette(pPal);

+    free(pPal);

+

+    if (pdp->hPalette) {

+        SelectPalette(pdp->hDC, pdp->hPalette, FALSE);

+        RealizePalette(pdp->hDC);

+    }

+}

+

+void setupPixelFormat(__DRIdrawable *pdp)

+{

+  PIXELFORMATDESCRIPTOR pfd = {

+      sizeof(PIXELFORMATDESCRIPTOR),    /* size of this pfd */

+      1,                                /* version num */

+      PFD_SUPPORT_OPENGL,               /* support OpenGL */

+      0,                                /* pixel type */

+      0,                                /* 8-bit color depth */

+      0, 0, 0, 0, 0, 0,         /* color bits (ignored) */

+      0,                                /* no alpha buffer */

+      0,                                /* alpha bits (ignored) */

+      0,                                /* no accumulation buffer */

+      0, 0, 0, 0,                       /* accum bits (ignored) */

+      16,                               /* depth buffer */

+      0,                                /* no stencil buffer */

+      0,                                /* no auxiliary buffers */

+      PFD_MAIN_PLANE,                   /* main layer */

+      0,                                /* reserved */

+      0, 0, 0,                  /* no layer, visible, damage masks */

+  };

+  int SelectedPixelFormat;

+  BOOL retVal;

+

+  PRINTF(__FUNCTION__": pdp %x\n", pdp);

+

+  pfd.cColorBits = GetDeviceCaps(pdp->hDC, BITSPIXEL);

+

+  if (colorIndexMode) {

+      pfd.iPixelType = PFD_TYPE_COLORINDEX;

+  } else {

+      pfd.iPixelType = PFD_TYPE_RGBA;

+  }

+

+  if (doubleBuffered) {

+      pfd.dwFlags |= PFD_DOUBLEBUFFER;

+  }

+

+  pfd.dwFlags |= PFD_DRAW_TO_BITMAP;

+

+  SelectedPixelFormat = ChoosePixelFormat(pdp->hDC, &pfd);

+  if (SelectedPixelFormat == 0)

+  {

+    (void) MessageBox(WindowFromDC(pdp->hDC), "Failed to find acceptable pixel format.", "OpenGL application error", MB_ICONERROR | MB_OK);

+    exit(1);

+  }

+

+  retVal = SetPixelFormat(pdp->hDC, SelectedPixelFormat, &pfd);

+  if (retVal != TRUE)

+  {

+    MessageBox(WindowFromDC(pdp->hDC), "Failed to set pixel format.", "OpenGL application error", MB_ICONERROR | MB_OK);

+    exit(1);

+  }

+}

+

+void setupDIB(__DRIdrawable * pdp)

+{

+  HBITMAP hBitmap;

+  BITMAPINFO *bmInfo;

+  BITMAPINFOHEADER *bmHeader;

+  UINT usage;

+  VOID *base;

+  int bmiSize;

+  int bitsPerPixel;

+

+  PRINTF(__FUNCTION__": pdp %x\n", pdp);

+

+  bmiSize = sizeof(*bmInfo);

+  bitsPerPixel = GetDeviceCaps(pdp->hDC, BITSPIXEL);

+  pdp->bitsPerPixel=bitsPerPixel;

+

+  switch (bitsPerPixel) {

+  case 8:

+      /* bmiColors is 256 WORD palette indices */

+      bmiSize += (256 * sizeof(WORD)) - sizeof(RGBQUAD);

+      break;

+  case 16:

+      /* bmiColors is 3 WORD component masks */

+      bmiSize += (3 * sizeof(DWORD)) - sizeof(RGBQUAD);

+      break;

+  case 24:

+  case 32:

+  default:

+      /* bmiColors not used */

+      break;

+  }

+

+  bmInfo = (BITMAPINFO *) calloc(1, bmiSize);

+  bmHeader = &bmInfo->bmiHeader;

+

+  bmHeader->biSize = sizeof(*bmHeader);

+  bmHeader->biWidth = pdp->winWidth;

+  bmHeader->biHeight = pdp->winHeight;

+  bmHeader->biPlanes = 1;                     /* must be 1 */

+  bmHeader->biBitCount = bitsPerPixel;

+  bmHeader->biXPelsPerMeter = 0;

+  bmHeader->biYPelsPerMeter = 0;

+  bmHeader->biClrUsed = 0;                    /* all are used */

+  bmHeader->biClrImportant = 0;               /* all are important */

+

+  switch (bitsPerPixel) {

+  case 8:

+      bmHeader->biCompression = BI_RGB;

+      bmHeader->biSizeImage = 0;

+      usage = DIB_PAL_COLORS;

+      /* bmiColors is 256 WORD palette indices */

+      {

+          WORD *palIndex = (WORD *) &bmInfo->bmiColors[0];

+          int i;

+

+          for (i=0; i<256; i++) {

+              palIndex[i] = i;

+          }

+      }

+      break;

+  case 16:

+      bmHeader->biCompression = BI_RGB;

+      bmHeader->biSizeImage = 0;

+      usage = DIB_RGB_COLORS;

+      /* bmiColors is 3 WORD component masks */

+      {

+          DWORD *compMask = (DWORD *) &bmInfo->bmiColors[0];

+

+          compMask[0] = 0xF800;

+          compMask[1] = 0x07E0;

+          compMask[2] = 0x001F;

+      }

+      break;

+  case 24:

+  case 32:

+  default:

+      bmHeader->biCompression = BI_RGB;

+      bmHeader->biSizeImage = 0;

+      usage = DIB_RGB_COLORS;

+      /* bmiColors not used */

+      break;

+  }

+

+  hBitmap = CreateDIBSection(pdp->hDC, bmInfo, usage, &base, NULL, 0);

+  if (hBitmap == NULL)

+  {

+    (void) MessageBox(WindowFromDC(pdp->hDC), "Failed to create DIBSection.", "OpenGL application error", MB_ICONERROR | MB_OK);

+    exit(1);

+  }

+

+  pdp->bits=base;

+  SelectObject(pdp->hDC, hBitmap);

+  if (pdp->hBitmap) DeleteObject(pdp->hBitmap);

+  pdp->hBitmap = hBitmap;

+

+  free(bmInfo);

+}

+

+static void setupLoaderExtensions(__DRIscreen *psp, const __DRIextension **extensions)

+{

+  int i;

+

+  for (i = 0; extensions[i]; i++)

+  {

+    if (strcmp(extensions[i]->name, __DRI_SWRAST_LOADER) == 0)

+      psp->swrast_loader = (__DRIswrastLoaderExtension *) extensions[i];

+  }

+}

+

+static const __DRItexBufferExtension swrastTexBufferExtension = {

+  { __DRI_TEX_BUFFER, __DRI_TEX_BUFFER_VERSION },

+  NULL,//    swrastSetTexBuffer,

+  NULL //    swrastSetTexBuffer2

+};

+

+static const __DRIextension *dri_screen_extensions[] = {

+  &swrastTexBufferExtension.base,

+  NULL

+};

+

+struct gl_config

+{

+   GLboolean rgbMode;

+   GLboolean floatMode;

+   GLboolean colorIndexMode;  /* XXX is this used anywhere? */

+   GLuint doubleBufferMode;

+   GLuint stereoMode;

+

+   GLboolean haveAccumBuffer;

+   GLboolean haveDepthBuffer;

+   GLboolean haveStencilBuffer;

+

+   GLint redBits, greenBits, blueBits, alphaBits;       /* bits per comp */

+   GLuint redMask, greenMask, blueMask, alphaMask;

+   GLint rgbBits;               /* total bits for rgb */

+   GLint indexBits;             /* total bits for colorindex */

+

+   GLint accumRedBits, accumGreenBits, accumBlueBits, accumAlphaBits;

+   GLint depthBits;

+   GLint stencilBits;

+

+   GLint numAuxBuffers;

+

+   GLint level;

+

+   /* EXT_visual_rating / GLX 1.2 */

+   GLint visualRating;

+

+   /* EXT_visual_info / GLX 1.2 */

+   GLint transparentPixel;

+   /*    colors are floats scaled to ints */

+   GLint transparentRed, transparentGreen, transparentBlue, transparentAlpha;

+   GLint transparentIndex;

+

+   /* ARB_multisample / SGIS_multisample */

+   GLint sampleBuffers;

+   GLint samples;

+

+   /* SGIX_pbuffer / GLX 1.3 */

+   GLint maxPbufferWidth;

+   GLint maxPbufferHeight;

+   GLint maxPbufferPixels;

+   GLint optimalPbufferWidth;   /* Only for SGIX_pbuffer. */

+   GLint optimalPbufferHeight;  /* Only for SGIX_pbuffer. */

+

+   /* OML_swap_method */

+   GLint swapMethod;

+

+   /* EXT_texture_from_pixmap */

+   GLint bindToTextureRgb;

+   GLint bindToTextureRgba;

+   GLint bindToMipmapTexture;

+   GLint bindToTextureTargets;

+   GLint yInverted;

+

+   /* EXT_framebuffer_sRGB */

+   GLint sRGBCapable;

+};

+

+struct __DRIconfigRec {

+    struct gl_config modes;

+};

+

+#define __ATTRIB(attrib, field) \

+    { attrib, offsetof(struct gl_config, field) }

+

+static const struct { unsigned int attrib, offset; } attribMap[] = {

+    __ATTRIB(__DRI_ATTRIB_BUFFER_SIZE,                  rgbBits),

+    __ATTRIB(__DRI_ATTRIB_LEVEL,                        level),

+    __ATTRIB(__DRI_ATTRIB_RED_SIZE,                     redBits),

+    __ATTRIB(__DRI_ATTRIB_GREEN_SIZE,                   greenBits),

+    __ATTRIB(__DRI_ATTRIB_BLUE_SIZE,                    blueBits),

+    __ATTRIB(__DRI_ATTRIB_ALPHA_SIZE,                   alphaBits),

+    __ATTRIB(__DRI_ATTRIB_DEPTH_SIZE,                   depthBits),

+    __ATTRIB(__DRI_ATTRIB_STENCIL_SIZE,                 stencilBits),

+    __ATTRIB(__DRI_ATTRIB_ACCUM_RED_SIZE,               accumRedBits),

+    __ATTRIB(__DRI_ATTRIB_ACCUM_GREEN_SIZE,             accumGreenBits),

+    __ATTRIB(__DRI_ATTRIB_ACCUM_BLUE_SIZE,              accumBlueBits),

+    __ATTRIB(__DRI_ATTRIB_ACCUM_ALPHA_SIZE,             accumAlphaBits),

+    __ATTRIB(__DRI_ATTRIB_SAMPLE_BUFFERS,               sampleBuffers),

+    __ATTRIB(__DRI_ATTRIB_SAMPLES,                      samples),

+    __ATTRIB(__DRI_ATTRIB_DOUBLE_BUFFER,                doubleBufferMode),

+    __ATTRIB(__DRI_ATTRIB_STEREO,                       stereoMode),

+    __ATTRIB(__DRI_ATTRIB_AUX_BUFFERS,                  numAuxBuffers),

+    __ATTRIB(__DRI_ATTRIB_TRANSPARENT_TYPE,             transparentPixel),

+    __ATTRIB(__DRI_ATTRIB_TRANSPARENT_INDEX_VALUE,      transparentPixel),

+    __ATTRIB(__DRI_ATTRIB_TRANSPARENT_RED_VALUE,        transparentRed),

+    __ATTRIB(__DRI_ATTRIB_TRANSPARENT_GREEN_VALUE,      transparentGreen),

+    __ATTRIB(__DRI_ATTRIB_TRANSPARENT_BLUE_VALUE,       transparentBlue),

+    __ATTRIB(__DRI_ATTRIB_TRANSPARENT_ALPHA_VALUE,      transparentAlpha),

+    __ATTRIB(__DRI_ATTRIB_FLOAT_MODE,                   floatMode),

+    __ATTRIB(__DRI_ATTRIB_RED_MASK,                     redMask),

+    __ATTRIB(__DRI_ATTRIB_GREEN_MASK,                   greenMask),

+    __ATTRIB(__DRI_ATTRIB_BLUE_MASK,                    blueMask),

+    __ATTRIB(__DRI_ATTRIB_ALPHA_MASK,                   alphaMask),

+    __ATTRIB(__DRI_ATTRIB_MAX_PBUFFER_WIDTH,            maxPbufferWidth),

+    __ATTRIB(__DRI_ATTRIB_MAX_PBUFFER_HEIGHT,           maxPbufferHeight),

+    __ATTRIB(__DRI_ATTRIB_MAX_PBUFFER_PIXELS,           maxPbufferPixels),

+    __ATTRIB(__DRI_ATTRIB_OPTIMAL_PBUFFER_WIDTH,        optimalPbufferWidth),

+    __ATTRIB(__DRI_ATTRIB_OPTIMAL_PBUFFER_HEIGHT,       optimalPbufferHeight),

+    __ATTRIB(__DRI_ATTRIB_SWAP_METHOD,                  swapMethod),

+    __ATTRIB(__DRI_ATTRIB_BIND_TO_TEXTURE_RGB,          bindToTextureRgb),

+    __ATTRIB(__DRI_ATTRIB_BIND_TO_TEXTURE_RGBA,         bindToTextureRgba),

+    __ATTRIB(__DRI_ATTRIB_BIND_TO_MIPMAP_TEXTURE,       bindToMipmapTexture),

+    __ATTRIB(__DRI_ATTRIB_BIND_TO_TEXTURE_TARGETS,      bindToTextureTargets),

+    __ATTRIB(__DRI_ATTRIB_YINVERTED,                    yInverted),

+    __ATTRIB(__DRI_ATTRIB_FRAMEBUFFER_SRGB_CAPABLE,     sRGBCapable),

+

+    /* The struct field doesn't matter here, these are handled by the

+     * switch in driGetConfigAttribIndex.  We need them in the array

+     * so the iterator includes them though.*/

+    __ATTRIB(__DRI_ATTRIB_RENDER_TYPE,                  level),

+    __ATTRIB(__DRI_ATTRIB_CONFIG_CAVEAT,                level),

+    __ATTRIB(__DRI_ATTRIB_SWAP_METHOD,                  level)

+};

+

+#define ARRAY_SIZE(a) (sizeof (a) / sizeof ((a)[0]))

+

+__DRIconfig **

+driCreateConfigs(GLenum fb_format, GLenum fb_type,

+                 const uint8_t * depth_bits, const uint8_t * stencil_bits,

+                 unsigned num_depth_stencil_bits,

+                 const GLenum * db_modes, unsigned num_db_modes,

+                 const uint8_t * msaa_samples, unsigned num_msaa_modes,

+                 GLboolean enable_accum)

+{

+  static const uint8_t bits_table[4][4] = {

+    /* R  G  B  A */

+     { 3, 3, 2, 0 }, /* Any GL_UNSIGNED_BYTE_3_3_2 */

+     { 5, 6, 5, 0 }, /* Any GL_UNSIGNED_SHORT_5_6_5 */

+     { 8, 8, 8, 0 }, /* Any RGB with any GL_UNSIGNED_INT_8_8_8_8 */

+     { 8, 8, 8, 8 }  /* Any RGBA with any GL_UNSIGNED_INT_8_8_8_8 */

+  };

+

+  static const uint32_t masks_table_rgb[6][4] = {

+     { 0x000000E0, 0x0000001C, 0x00000003, 0x00000000 }, /* 3_3_2       */

+     { 0x00000007, 0x00000038, 0x000000C0, 0x00000000 }, /* 2_3_3_REV   */

+     { 0x0000F800, 0x000007E0, 0x0000001F, 0x00000000 }, /* 5_6_5       */

+     { 0x0000001F, 0x000007E0, 0x0000F800, 0x00000000 }, /* 5_6_5_REV   */

+     { 0xFF000000, 0x00FF0000, 0x0000FF00, 0x00000000 }, /* 8_8_8_8     */

+     { 0x000000FF, 0x0000FF00, 0x00FF0000, 0x00000000 }  /* 8_8_8_8_REV */

+  };

+

+  static const uint32_t masks_table_rgba[6][4] = {

+     { 0x000000E0, 0x0000001C, 0x00000003, 0x00000000 }, /* 3_3_2       */

+     { 0x00000007, 0x00000038, 0x000000C0, 0x00000000 }, /* 2_3_3_REV   */

+     { 0x0000F800, 0x000007E0, 0x0000001F, 0x00000000 }, /* 5_6_5       */

+     { 0x0000001F, 0x000007E0, 0x0000F800, 0x00000000 }, /* 5_6_5_REV   */

+     { 0xFF000000, 0x00FF0000, 0x0000FF00, 0x000000FF }, /* 8_8_8_8     */

+     { 0x000000FF, 0x0000FF00, 0x00FF0000, 0xFF000000 }, /* 8_8_8_8_REV */

+  };

+

+  static const uint32_t masks_table_bgr[6][4] = {

+     { 0x00000007, 0x00000038, 0x000000C0, 0x00000000 }, /* 3_3_2       */

+     { 0x000000E0, 0x0000001C, 0x00000003, 0x00000000 }, /* 2_3_3_REV   */

+     { 0x0000001F, 0x000007E0, 0x0000F800, 0x00000000 }, /* 5_6_5       */

+     { 0x0000F800, 0x000007E0, 0x0000001F, 0x00000000 }, /* 5_6_5_REV   */

+     { 0x0000FF00, 0x00FF0000, 0xFF000000, 0x00000000 }, /* 8_8_8_8     */

+     { 0x00FF0000, 0x0000FF00, 0x000000FF, 0x00000000 }, /* 8_8_8_8_REV */

+  };

+

+  static const uint32_t masks_table_bgra[6][4] = {

+     { 0x00000007, 0x00000038, 0x000000C0, 0x00000000 }, /* 3_3_2       */

+     { 0x000000E0, 0x0000001C, 0x00000003, 0x00000000 }, /* 2_3_3_REV   */

+     { 0x0000001F, 0x000007E0, 0x0000F800, 0x00000000 }, /* 5_6_5       */

+     { 0x0000F800, 0x000007E0, 0x0000001F, 0x00000000 }, /* 5_6_5_REV   */

+     { 0x0000FF00, 0x00FF0000, 0xFF000000, 0x000000FF }, /* 8_8_8_8     */

+     { 0x00FF0000, 0x0000FF00, 0x000000FF, 0xFF000000 }, /* 8_8_8_8_REV */

+  };

+

+  static const uint8_t bytes_per_pixel[6] = {

+     1, /* 3_3_2       */

+     1, /* 2_3_3_REV   */

+     2, /* 5_6_5       */

+     2, /* 5_6_5_REV   */

+     4, /* 8_8_8_8     */

+     4  /* 8_8_8_8_REV */

+

+  };

+

+  const uint8_t  * bits;

+  const uint32_t * masks;

+  int index;

+  __DRIconfig **configs, **c;

+

+  struct gl_config *modes;

+  unsigned i, j, k, h;

+  unsigned num_modes;

+  unsigned num_accum_bits = (enable_accum) ? 2 : 1;

+

+  PRINTF(__FUNCTION__"\n");

+  switch ( fb_type ) {

+     case GL_UNSIGNED_BYTE_3_3_2:

+        index = 0;

+        break;

+     case GL_UNSIGNED_BYTE_2_3_3_REV:

+        index = 1;

+        break;

+     case GL_UNSIGNED_SHORT_5_6_5:

+        index = 2;

+        break;

+     case GL_UNSIGNED_SHORT_5_6_5_REV:

+        index = 3;

+        break;

+     case GL_UNSIGNED_INT_8_8_8_8:

+        index = 4;

+        break;

+     case GL_UNSIGNED_INT_8_8_8_8_REV:

+        index = 5;

+        break;

+     default:

+        fprintf( stderr, "[%s:%u] Unknown framebuffer type 0x%04x.\n",

+              __FUNCTION__, __LINE__, fb_type );

+        return NULL;

+  }

+

+

+  /* Valid types are GL_UNSIGNED_SHORT_5_6_5 and GL_UNSIGNED_INT_8_8_8_8 and

+   * the _REV versions.

+   *

+   * Valid formats are GL_RGBA, GL_RGB, and GL_BGRA.

+   */

+

+  switch ( fb_format ) {

+     case GL_RGB:

+        masks = masks_table_rgb[ index ];

+        break;

+

+     case GL_RGBA:

+        masks = masks_table_rgba[ index ];

+        break;

+

+     case GL_BGR:

+        masks = masks_table_bgr[ index ];

+        break;

+

+     case GL_BGRA:

+        masks = masks_table_bgra[ index ];

+        break;

+

+     default:

+        fprintf( stderr, "[%s:%u] Unknown framebuffer format 0x%04x.\n",

+              __FUNCTION__, __LINE__, fb_format );

+        return NULL;

+  }

+

+  switch ( bytes_per_pixel[ index ] ) {

+     case 1:

+        bits = bits_table[0];

+        break;

+     case 2:

+        bits = bits_table[1];

+        break;

+     default:

+        bits = ((fb_format == GL_RGB) || (fb_format == GL_BGR))

+           ? bits_table[2]

+           : bits_table[3];

+        break;

+  }

+

+  num_modes = num_depth_stencil_bits * num_db_modes * num_accum_bits * num_msaa_modes;

+  configs = calloc(1, (num_modes + 1) * sizeof *configs);

+  if (configs == NULL)

+      return NULL;

+

+  c = configs;

+  for ( k = 0 ; k < num_depth_stencil_bits ; k++ ) {

+      for ( i = 0 ; i < num_db_modes ; i++ ) {

+          for ( h = 0 ; h < num_msaa_modes; h++ ) {

+              for ( j = 0 ; j < num_accum_bits ; j++ ) {

+                  *c = malloc (sizeof **c);

+                  modes = &(*c)->modes;

+                  c++;

+

+                  memset(modes, 0, sizeof *modes);

+                  modes->redBits   = bits[0];

+                  modes->greenBits = bits[1];

+                  modes->blueBits  = bits[2];

+                  modes->alphaBits = bits[3];

+                  modes->redMask   = masks[0];

+                  modes->greenMask = masks[1];

+                  modes->blueMask  = masks[2];

+                  modes->alphaMask = masks[3];

+                  modes->rgbBits   = modes->redBits + modes->greenBits

+                      + modes->blueBits + modes->alphaBits;

+

+                  modes->accumRedBits   = 16 * j;

+                  modes->accumGreenBits = 16 * j;

+                  modes->accumBlueBits  = 16 * j;

+                  modes->accumAlphaBits = (masks[3] != 0) ? 16 * j : 0;

+                  modes->visualRating = (j == 0) ? GLX_NONE : GLX_SLOW_CONFIG;

+

+                  modes->stencilBits = stencil_bits[k];

+                  modes->depthBits = depth_bits[k];

+

+                  modes->transparentPixel = GLX_NONE;

+                  modes->transparentRed = GLX_DONT_CARE;

+                  modes->transparentGreen = GLX_DONT_CARE;

+                  modes->transparentBlue = GLX_DONT_CARE;

+                  modes->transparentAlpha = GLX_DONT_CARE;

+                  modes->transparentIndex = GLX_DONT_CARE;

+                  modes->rgbMode = GL_TRUE;

+

+                  if ( db_modes[i] == GLX_NONE ) {

+                      modes->doubleBufferMode = GL_FALSE;

+                  }

+                  else {

+                      modes->doubleBufferMode = GL_TRUE;

+                      modes->swapMethod = db_modes[i];

+                  }

+

+                  modes->samples = msaa_samples[h];

+                  modes->sampleBuffers = modes->samples ? 1 : 0;

+

+

+                  modes->haveAccumBuffer = ((modes->accumRedBits +

+                                         modes->accumGreenBits +

+                                         modes->accumBlueBits +

+                                         modes->accumAlphaBits) > 0);

+                  modes->haveDepthBuffer = (modes->depthBits > 0);

+                  modes->haveStencilBuffer = (modes->stencilBits > 0);

+

+                  modes->bindToTextureRgb = GL_TRUE;

+                  modes->bindToTextureRgba = GL_TRUE;

+                  modes->bindToMipmapTexture = GL_FALSE;

+                  modes->bindToTextureTargets =

+                      __DRI_ATTRIB_TEXTURE_1D_BIT |

+                      __DRI_ATTRIB_TEXTURE_2D_BIT |

+                      __DRI_ATTRIB_TEXTURE_RECTANGLE_BIT;

+

+                  modes->sRGBCapable = GL_FALSE;

+              }

+          }

+      }

+  }

+  *c = NULL;

+

+  return configs;

+}

+

+static __DRIconfig **

+swrastFillInModes(__DRIscreen *psp,

+                  unsigned pixel_bits, unsigned depth_bits,

+                  unsigned stencil_bits, GLboolean have_back_buffer)

+{

+  __DRIconfig **configs;

+  unsigned depth_buffer_factor;

+  unsigned back_buffer_factor;

+  GLenum fb_format;

+  GLenum fb_type;

+

+  /* GLX_SWAP_COPY_OML is only supported because the Intel driver doesn't

+   * support pageflipping at all.

+   */

+  static const GLenum back_buffer_modes[] = {

+      GLX_NONE, GLX_SWAP_UNDEFINED_OML

+  };

+

+  uint8_t depth_bits_array[4];

+  uint8_t stencil_bits_array[4];

+  uint8_t msaa_samples_array[1];

+

+  (void) psp;

+  (void) have_back_buffer;

+

+  PRINTF(__FUNCTION__"\n");

+

+  depth_bits_array[0] = 0;

+  depth_bits_array[1] = 0;

+  depth_bits_array[2] = depth_bits;

+  depth_bits_array[3] = depth_bits;

+

+  /* Just like with the accumulation buffer, always provide some modes

+   * with a stencil buffer.

+   */

+  stencil_bits_array[0] = 0;

+  stencil_bits_array[1] = (stencil_bits == 0) ? 8 : stencil_bits;

+  stencil_bits_array[2] = 0;

+  stencil_bits_array[3] = (stencil_bits == 0) ? 8 : stencil_bits;

+

+  msaa_samples_array[0] = 0;

+

+  depth_buffer_factor = 4;

+  back_buffer_factor = 2;

+

+  switch (pixel_bits) {

+  case 8:

+      fb_format = GL_RGB;

+      fb_type = GL_UNSIGNED_BYTE_2_3_3_REV;

+      break;

+  case 16:

+      fb_format = GL_RGB;

+      fb_type = GL_UNSIGNED_SHORT_5_6_5;

+      break;

+  case 24:

+      fb_format = GL_BGR;

+      fb_type = GL_UNSIGNED_INT_8_8_8_8_REV;

+      break;

+  case 32:

+      fb_format = GL_BGRA;

+      fb_type = GL_UNSIGNED_INT_8_8_8_8_REV;

+      break;

+  default:

+      fprintf(stderr, "[%s:%u] bad depth %d\n", __FUNCTION__, __LINE__,

+              pixel_bits);

+      return NULL;

+  }

+

+  configs = driCreateConfigs(fb_format, fb_type,

+                             depth_bits_array, stencil_bits_array,

+                             depth_buffer_factor, back_buffer_modes,

+                             back_buffer_factor, msaa_samples_array, 1,

+                             GL_TRUE);

+  if (configs == NULL) {

+      fprintf(stderr, "[%s:%u] Error creating FBConfig!\n", __FUNCTION__,

+              __LINE__);

+      return NULL;

+  }

+

+  return configs;

+}

+

+__DRIconfig **driConcatConfigs(__DRIconfig **a, __DRIconfig **b)

+{

+  __DRIconfig **all;

+  int i, j, index;

+

+  PRINTF(__FUNCTION__"\n");

+

+  i = 0;

+  while (a[i] != NULL)

+      i++;

+  j = 0;

+  while (b[j] != NULL)

+      j++;

+

+  all = malloc((i + j + 1) * sizeof *all);

+  index = 0;

+  for (i = 0; a[i] != NULL; i++)

+      all[index++] = a[i];

+  for (j = 0; b[j] != NULL; j++)

+      all[index++] = b[j];

+  all[index++] = NULL;

+

+  free(a);

+  free(b);

+

+  return all;

+}

+

+static int driGetConfigAttribIndex(const __DRIconfig *config, unsigned int index, unsigned int *value)

+{

+  switch (attribMap[index].attrib) {

+  case __DRI_ATTRIB_RENDER_TYPE:

+      /* no support for color index mode */

+      *value = __DRI_ATTRIB_RGBA_BIT;

+      break;

+  case __DRI_ATTRIB_CONFIG_CAVEAT:

+      if (config->modes.visualRating == GLX_NON_CONFORMANT_CONFIG)

+          *value = __DRI_ATTRIB_NON_CONFORMANT_CONFIG;

+      else if (config->modes.visualRating == GLX_SLOW_CONFIG)

+          *value = __DRI_ATTRIB_SLOW_BIT;

+      else

+          *value = 0;

+      break;

+  case __DRI_ATTRIB_SWAP_METHOD:

+      /* XXX no return value??? */

+      break;

+

+  case __DRI_ATTRIB_FLOAT_MODE:

+      /* this field is not int-sized */

+      *value = config->modes.floatMode;

+      break;

+

+  default:

+      /* any other int-sized field */

+      *value = *(unsigned int *)

+          ((char *) &config->modes + attribMap[index].offset);

+      break;

+  }

+

+    return GL_TRUE;

+}

+

+int driIndexConfigAttrib(const __DRIconfig *config, int index, unsigned int *attrib, unsigned int *value)

+{

+  if (index >= 0 && index < ARRAY_SIZE(attribMap))

+  {

+    *attrib = attribMap[index].attrib;

+    return driGetConfigAttribIndex(config, index, value);

+  }

+

+  return GL_FALSE;

+}

+

+static const __DRIconfig **dri_init_screen(__DRIscreen * psp)

+{

+  __DRIconfig **configs8, **configs16, **configs24, **configs32;

+

+  PRINTF(__FUNCTION__": psp %x\n", psp);

+

+  psp->extensions = dri_screen_extensions;

+

+  configs8  = swrastFillInModes(psp,  8,  8, 0, 1);

+  configs16 = swrastFillInModes(psp, 16, 16, 0, 1);

+  configs24 = swrastFillInModes(psp, 24, 24, 8, 1);

+  configs32 = swrastFillInModes(psp, 32, 24, 8, 1);

+

+  configs16 = driConcatConfigs(configs8, configs16);

+  configs24 = driConcatConfigs(configs16, configs24);

+  configs32 = driConcatConfigs(configs24, configs32);

+

+  return (const __DRIconfig **)configs32;

+}

+

+static __DRIscreen *driCreateNewScreen(int scrn, const __DRIextension **extensions, const __DRIconfig ***driver_configs, void *data)

+{

+  static const __DRIextension *emptyExtensionList[] = { NULL };

+  __DRIscreen *psp;

+

+  HDC hDc = GetDC(NULL);

+  int bitsPerPixel= GetDeviceCaps(hDc, BITSPIXEL);

+  ReleaseDC(NULL, hDc);

+  if (bitsPerPixel<24)

+  {

+    PRINTF(__FUNCTION__": bitsPerPixel not supported %d\n", bitsPerPixel);

+    return NULL;

+  }

+

+  psp = calloc(sizeof(struct __DRIscreenRec),1);

+  if (!psp)

+    return NULL;

+

+  PRINTF(__FUNCTION__": psp %x\n", psp);

+

+  setupLoaderExtensions(psp, extensions);

+

+  psp->extensions = emptyExtensionList;

+  psp->ScreenNum = scrn;

+

+  *driver_configs = dri_init_screen(psp);

+

+  if (*driver_configs == NULL)

+  {

+    free(psp);

+    return NULL;

+  }

+

+  return psp;

+}

+

+static __DRIcontext *driCreateNewContext(__DRIscreen *psp, const __DRIconfig *config,  __DRIcontext *shared, void *data)

+{

+  __DRIcontext *pcp;

+  void * const shareCtx = (shared != NULL) ? shared->driverPrivate : NULL;

+

+  pcp = calloc(sizeof(struct __DRIcontextRec),1);

+  if (!pcp)

+      return NULL;

+

+  PRINTF(__FUNCTION__": psp %x, shared %x, data %x, pcp %x\n", psp, shared, data, pcp);

+

+  pcp->loaderPrivate = data;

+

+  pcp->driScreenPriv = psp;

+  pcp->driDrawablePriv = NULL;

+  pcp->driReadablePriv = NULL;

+

+  pcp->Dispatch=calloc(sizeof(void*), (sizeof(struct _glapi_table) / sizeof(void *) + MAX_EXTENSION_FUNCS));

+  _glapi_set_dispatch(pcp->Dispatch);

+

+  glWinSetupDispatchTable();

+

+  return pcp;

+}

+

+static const __DRIextension **driGetExtensions(__DRIscreen *psp)

+{

+  return psp->extensions;

+}

+

+static void driDrawableCheckSize(__DRIdrawable *pdp)

+{

+  int x;

+  int y;

+  int w;

+  int h;

+  pdp->driScreenPriv->swrast_loader->getDrawableInfo(pdp, &x, &y, &w, &h, pdp->loaderPrivate);

+  if (pdp->winWidth==w && pdp->winHeight==h)

+    return;

+  pdp->winWidth=w;

+  pdp->winHeight=h;

+  setupDIB(pdp);

+}

+static __DRIdrawable *driCreateNewDrawable(__DRIscreen *psp, const __DRIconfig *config, void *data)

+{

+  __DRIdrawable *pdp = calloc(sizeof(struct __DRIdrawableRec),1);

+  if (!pdp)

+      return NULL;

+

+  PRINTF(__FUNCTION__": pdp %x, data %x\n", pdp, data);

+

+  pdp->loaderPrivate = data;

+

+  pdp->driScreenPriv = psp;

+

+  pdp->refcount++;

+

+  pdp->hDCFrontBuffer = GetDC(NULL);

+  pdp->hDC = CreateCompatibleDC(pdp->hDCFrontBuffer);

+

+  driDrawableCheckSize(pdp);

+

+  setupPixelFormat(pdp);

+  setupPalette(pdp);

+  pdp->hGLRC = wglCreateContext(pdp->hDC);

+

+  return pdp;

+}

+

+static __DRIcontext *current_pcp;

+

+static int driBindContext(__DRIcontext *pcp, __DRIdrawable *pdp, __DRIdrawable *prp)

+{

+  PRINTF(__FUNCTION__": pcp %x, pdp %x, prp %x\n",pcp, pdp, prp);

+  

+  if (current_pcp)

+  {

+    driUnbindContext(current_pcp);

+    current_pcp=NULL;

+  }

+

+  /* Bind the drawable to the context */

+  if (pcp)

+  {

+    static int Created=0;

+

+    if (!pdp || !prp)

+    {

+      return GL_TRUE;

+    }

+

+    pcp->driDrawablePriv = pdp;

+    pcp->driReadablePriv = prp;

+    if (pdp)

+    {

+      pdp->refcount++;

+    }

+    if ( prp && pdp != prp )

+    {

+      prp->refcount++;

+    }

+

+    if (wglGetCurrentContext()!=pdp->hGLRC)

+    {

+      if (!wglMakeCurrent(pdp->hDC, pdp->hGLRC))

+        ErrorF("Error making context current: pdp %x\n",pdp);

+      PRINTF("pdp->hDC %x to pdp->hGLRC %x\n",pdp->hDC, pdp->hGLRC);

+    }

+    if (Created)

+    {

+      // initialize wgl extension proc pointers (don't call them before here...)

+      // (but we need to have a current context for them to be resolvable)

+      Created=1;

+      wglResolveExtensionProcs();

+    }

+    current_pcp=pcp;

+    _glapi_set_dispatch(pcp->Dispatch);

+  }

+

+  return GL_TRUE;

+}

+

+static void driDestroyDrawable(__DRIdrawable *pdp)

+{

+  if (pdp)

+  {

+    pdp->refcount--;

+    if (pdp->refcount) return;

+

+    PRINTF(__FUNCTION__": pdp %x\n", pdp);

+

+    wglDeleteContext (pdp->hGLRC);

+    DeleteDC(pdp->hDC);

+    ReleaseDC(NULL, pdp->hDCFrontBuffer);

+    DeleteObject(pdp->hBitmap);

+    if (pdp->hPalette) DeleteObject(pdp->hPalette);

+

+    free(pdp);

+  }

+}

+

+static int driUnbindContext(__DRIcontext *pcp)

+{

+  __DRIdrawable *pdp;

+  __DRIdrawable *prp;

+

+  PRINTF(__FUNCTION__": pcp %x\n", pcp);

+

+  if (pcp == NULL)

+      return GL_FALSE;

+

+  pdp = pcp->driDrawablePriv;

+  prp = pcp->driReadablePriv;

+

+  /* already unbound */

+  if (!pdp && !prp)

+  {

+    PRINTF(__FUNCTION__": pcp %x already unbound\n", pcp);

+    return GL_TRUE;

+  }

+

+  if (wglGetCurrentContext()==pdp->hGLRC)

+  {

+    current_pcp=NULL;

+    wglMakeCurrent(pdp->hDC, NULL);

+    PRINTF("pdp->hDC %x to NULL\n", pdp->hDC);

+  }

+

+  driDestroyDrawable(pdp);

+  if (prp!=pdp)

+    driDestroyDrawable(prp);

+

+  pcp->driDrawablePriv = NULL;

+  pcp->driReadablePriv = NULL;

+  _glapi_set_dispatch(NULL);

+

+  return GL_TRUE;

+}

+

+static void driDestroyContext(__DRIcontext *pcp)

+{

+  PRINTF(__FUNCTION__": pcp %x\n", pcp);

+  if (pcp)

+  {

+    driUnbindContext(pcp);

+    free(pcp);

+  }

+}

+

+static void driDestroyScreen(__DRIscreen *psp)

+{

+  PRINTF(__FUNCTION__": psp %x\n", psp);

+  if (psp)

+  {

+    free(psp);

+  }

+}

+

+static void driSwapBuffers(__DRIdrawable *pdp)

+{

+//    GET_CURRENT_CONTEXT(ctx);

+  /* Revert image */

+  int Row;

+  int UpRow;

+  int ColCount;

+  int HalfRowCount;

+  int *pBits;

+

+  //GdiFlush();

+

+  driDrawableCheckSize(pdp);

+

+  ColCount=pdp->winWidth;

+  HalfRowCount=pdp->winHeight/2;

+  pBits=(int*)pdp->bits;

+

+  for (Row=0,UpRow=2*HalfRowCount-1; Row<HalfRowCount; Row++,UpRow--)

+  {

+    int j;

+    for (j=0; j<ColCount; j++)

+    {

+      int Temp=pBits[Row*ColCount+j];

+      pBits[Row*ColCount+j]=pBits[UpRow*ColCount+j];

+      pBits[UpRow*ColCount+j]=Temp;

+    }

+  }

+

+  pdp->driScreenPriv->swrast_loader->putImage(pdp, __DRI_SWRAST_IMAGE_OP_SWAP, 0, 0, pdp->winWidth, pdp->winHeight, pdp->bits, pdp->loaderPrivate);

+}

+

+const __DRIcoreExtension driCoreExtension = {

+  { __DRI_CORE, __DRI_CORE_VERSION },

+  NULL, /* driCreateNewScreen */

+  driDestroyScreen,

+  driGetExtensions,

+  NULL,//    driGetConfigAttrib,

+  driIndexConfigAttrib,

+  NULL, /* driCreateNewDrawable */

+  driDestroyDrawable,

+  driSwapBuffers,

+  driCreateNewContext,

+  NULL,//    driCopyContext,

+  driDestroyContext,

+  driBindContext,

+  driUnbindContext

+};

+

+const __DRIswrastExtension driWGLExtension = {

+  { __DRI_SWRAST, __DRI_SWRAST_VERSION },

+  driCreateNewScreen,

+  driCreateNewDrawable,

+  NULL //    driCreateNewContextForAPI

+};

+

+/* This is the table of extensions that the loader will dlsym() for. */

+PUBLIC const __DRIextension *__driDriverExtensions[] =

+{

+  &driCoreExtension.base,

+  &driWGLExtension.base,

+  NULL

+};

diff --git a/xorg-server/hw/xwin/swrastwgl_dri/swrastwgl_dri.def b/xorg-server/hw/xwin/swrastwgl_dri/swrastwgl_dri.def
new file mode 100644
index 000000000..8a8e8258e
--- /dev/null
+++ b/xorg-server/hw/xwin/swrastwgl_dri/swrastwgl_dri.def
@@ -0,0 +1,2 @@
+EXPORTS
+ __driDriverExtensions
diff --git a/xorg-server/hw/xwin/swrastwgl_dri/wgl.tm b/xorg-server/hw/xwin/swrastwgl_dri/wgl.tm
new file mode 100644
index 000000000..f7ae79ec8
--- /dev/null
+++ b/xorg-server/hw/xwin/swrastwgl_dri/wgl.tm
@@ -0,0 +1,37 @@
+BOOL,*,*,	    BOOL,*,*
+DWORD,*,*,	    DWORD,*,*
+FLOAT,*,*,	    FLOAT,*,*
+GLbitfield,*,*,     GLbitfield,*,*
+GLboolean,*,*,	    GLboolean,*,*
+GLenum,*,*,	    GLenum,*,*
+GLfloat,*,*,	    GLfloat,*,*
+GLint,*,*,	    GLint,*,*
+GLsizei,*,*,	    GLsizei,*,*
+GLuint,*,*,	    GLuint,*,*
+GLushort,*,*,	    GLushort,*,*
+HANDLE,*,*,	    HANDLE,*,*
+HDC,*,*,	    HDC,*,*
+HGLRC,*,*,	    HGLRC,*,*
+HGPUNV,*,*,	    HGPUNV,*,*
+HPBUFFERARB,*,*,    HPBUFFERARB,*,*
+HPBUFFEREXT,*,*,    HPBUFFEREXT,*,*
+HPVIDEODEV,*,*,     HPVIDEODEV,*,*
+HPGPUNV,*,*,	    HPGPUNV,*,*
+HVIDEOINPUTDEVICENV,*,*,    HVIDEOINPUTDEVICENV,*,*
+HVIDEOOUTPUTDEVICENV,*,*,   HVIDEOOUTPUTDEVICENV,*,*
+INT,*,*,	    INT,*,*
+INT32,*,*,	    INT32,*,*
+INT64,*,*,	    INT64,*,*
+LPVOID,*,*,	    LPVOID,*,*
+PGPU_DEVICE,*,*,    PGPU_DEVICE,*,*
+PROC,*,*,	    PROC,*,*
+String,*,*,	    const char *,*,*
+UINT,*,*,	    UINT,*,*
+USHORT,*,*,	    USHORT,*,*
+VOID,*,*,	    VOID,*,*
+VoidPointer,*,*,    void*,*,*
+float,*,*,	    float,*,*
+int,*,*,	    int,*,*
+uint,*,*,	    unsigned int,*,*
+ulong,*,*,	    unsigned long,*,*
+void,*,*,	    *,*,*
diff --git a/xorg-server/hw/xwin/swrastwgl_dri/wgl_ext_api.c b/xorg-server/hw/xwin/swrastwgl_dri/wgl_ext_api.c
new file mode 100644
index 000000000..c11eb4f14
--- /dev/null
+++ b/xorg-server/hw/xwin/swrastwgl_dri/wgl_ext_api.c
@@ -0,0 +1,77 @@
+/*
+ * File: wgl_ext_api.c
+ * Purpose: Wrapper functions for Win32 OpenGL wgl extension functions
+ *
+ * Authors: Jon TURNEY
+ *
+ * Copyright (c) Jon TURNEY 2009
+ *
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
+
+#include <X11/Xwindows.h>
+#include <GL/gl.h>
+#include <GL/glext.h>
+#include <glx/glxserver.h>
+#include <glx/glxext.h>
+#include "wglext.h"
+#include <wgl_ext_api.h>
+#include "glwindows.h"
+
+#define RESOLVE_DECL(type) \
+    static type type##proc = NULL;
+
+#ifdef _DEBUG
+#define PRERESOLVE(type, symbol) \
+    type##proc = (type)wglGetProcAddress(symbol);
+#else
+#define PRERESOLVE(type, symbol) \
+    type##proc = (type)wglGetProcAddress(symbol);
+#endif
+
+#define RESOLVE_RET(type, symbol, retval) \
+  if (type##proc == NULL) { \
+    ErrorF("wglwrap: Can't resolve \"%s\"\n", symbol); \
+    __glXErrorCallBack(0); \
+    return retval; \
+  }
+
+#define RESOLVE(procname, symbol) RESOLVE_RET(procname, symbol,)
+
+#define RESOLVED_PROC(type) type##proc
+
+/*
+ * Include generated cdecl wrappers for stdcall WGL functions
+ *
+ * There are extensions to the wgl*() API as well; again we call
+ * these functions by using wglGetProcAddress() to get a pointer
+ * to the function, and wrapping it for cdecl/stdcall conversion
+ *
+ * We arrange to resolve the functions up front, as they need a
+ * context to work, as we like to use them to be able to select
+ * a context.  Again, this assumption fails badly on multimontor
+ * systems...
+ */
+
+#include "generated_wgl_wrappers.c"
diff --git a/xorg-server/hw/xwin/swrastwgl_dri/wgl_ext_api.h b/xorg-server/hw/xwin/swrastwgl_dri/wgl_ext_api.h
new file mode 100644
index 000000000..63b1d7ef1
--- /dev/null
+++ b/xorg-server/hw/xwin/swrastwgl_dri/wgl_ext_api.h
@@ -0,0 +1,83 @@
+/*
+ * File: wgl_ext_api.h
+ * Purpose: Wrapper functions for Win32 OpenGL wgl extension functions
+ *
+ * Authors: Jon TURNEY
+ *
+ * Copyright (c) Jon TURNEY 2009
+ *
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef wgl_ext_api_h
+#define wgl_ext_api_h
+
+#include "wglext.h"
+
+void wglResolveExtensionProcs(void);
+
+/*
+  Prototypes for wrapper functions we actually use
+  XXX: should be automatically generated as well
+*/
+
+const char * __stdcall wglGetExtensionsStringARBWrapper(HDC hdc);
+BOOL __stdcall wglMakeContextCurrentARBWrapper(HDC hDrawDC, HDC hReadDC, HGLRC hglrc);
+HDC __stdcall wglGetCurrentReadDCARBWrapper(VOID);
+
+BOOL __stdcall wglGetPixelFormatAttribivARBWrapper(HDC hdc,
+                                         int iPixelFormat,
+                                         int iLayerPlane,
+                                         UINT nAttributes,
+                                         const int *piAttributes,
+                                         int *piValues);
+
+BOOL __stdcall wglGetPixelFormatAttribfvARBWrapper(HDC hdc,
+                                         int iPixelFormat,
+                                         int iLayerPlane,
+                                         UINT nAttributes,
+                                         const int *piAttributes,
+                                         FLOAT * pfValues);
+
+BOOL __stdcall wglChoosePixelFormatARBWrapper(HDC hdc,
+                                    const int *piAttribIList,
+                                    const FLOAT * pfAttribFList,
+                                    UINT nMaxFormats,
+                                    int *piFormats, UINT * nNumFormats);
+
+HPBUFFERARB __stdcall wglCreatePbufferARBWrapper(HDC hDC,
+                                       int iPixelFormat,
+                                       int iWidth,
+                                       int iHeight, const int *piAttribList);
+
+HDC __stdcall wglGetPbufferDCARBWrapper(HPBUFFERARB hPbuffer);
+
+int __stdcall wglReleasePbufferDCARBWrapper(HPBUFFERARB hPbuffer, HDC hDC);
+
+BOOL __stdcall wglDestroyPbufferARBWrapper(HPBUFFERARB hPbuffer);
+
+BOOL __stdcall wglQueryPbufferARBWrapper(HPBUFFERARB hPbuffer,
+                               int iAttribute, int *piValue);
+
+BOOL __stdcall wglSwapIntervalEXTWrapper(int interval);
+
+int __stdcall wglGetSwapIntervalEXTWrapper(void);
+
+#endif                          /* wgl_ext_api_h */
diff --git a/xorg-server/hw/xwin/swrastwgl_dri/wglext.h b/xorg-server/hw/xwin/swrastwgl_dri/wglext.h
new file mode 100644
index 000000000..b5dc7bf7f
--- /dev/null
+++ b/xorg-server/hw/xwin/swrastwgl_dri/wglext.h
@@ -0,0 +1,943 @@
+#ifndef __wglext_h_
+#define __wglext_h_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+** Copyright (c) 2007-2012 The Khronos Group Inc.
+** 
+** Permission is hereby granted, free of charge, to any person obtaining a
+** copy of this software and/or associated documentation files (the
+** "Materials"), to deal in the Materials without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Materials, and to
+** permit persons to whom the Materials are 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 Materials.
+** 
+** THE MATERIALS ARE 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
+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+*/
+
+/* Function declaration macros - to move into glplatform.h */
+
+#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
+#define WIN32_LEAN_AND_MEAN 1
+#include <windows.h>
+#endif
+
+#ifndef APIENTRY
+#define APIENTRY
+#endif
+#ifndef APIENTRYP
+#define APIENTRYP APIENTRY *
+#endif
+#ifndef GLAPI
+#define GLAPI extern
+#endif
+
+/*************************************************************/
+
+/* Header file version number */
+/* wglext.h last updated 2012/01/04 */
+/* Current version at http://www.opengl.org/registry/ */
+#define WGL_WGLEXT_VERSION 24
+
+#ifndef WGL_ARB_buffer_region
+#define WGL_FRONT_COLOR_BUFFER_BIT_ARB 0x00000001
+#define WGL_BACK_COLOR_BUFFER_BIT_ARB  0x00000002
+#define WGL_DEPTH_BUFFER_BIT_ARB       0x00000004
+#define WGL_STENCIL_BUFFER_BIT_ARB     0x00000008
+#endif
+
+#ifndef WGL_ARB_multisample
+#define WGL_SAMPLE_BUFFERS_ARB         0x2041
+#define WGL_SAMPLES_ARB                0x2042
+#endif
+
+#ifndef WGL_ARB_extensions_string
+#endif
+
+#ifndef WGL_ARB_pixel_format
+#define WGL_NUMBER_PIXEL_FORMATS_ARB   0x2000
+#define WGL_DRAW_TO_WINDOW_ARB         0x2001
+#define WGL_DRAW_TO_BITMAP_ARB         0x2002
+#define WGL_ACCELERATION_ARB           0x2003
+#define WGL_NEED_PALETTE_ARB           0x2004
+#define WGL_NEED_SYSTEM_PALETTE_ARB    0x2005
+#define WGL_SWAP_LAYER_BUFFERS_ARB     0x2006
+#define WGL_SWAP_METHOD_ARB            0x2007
+#define WGL_NUMBER_OVERLAYS_ARB        0x2008
+#define WGL_NUMBER_UNDERLAYS_ARB       0x2009
+#define WGL_TRANSPARENT_ARB            0x200A
+#define WGL_TRANSPARENT_RED_VALUE_ARB  0x2037
+#define WGL_TRANSPARENT_GREEN_VALUE_ARB 0x2038
+#define WGL_TRANSPARENT_BLUE_VALUE_ARB 0x2039
+#define WGL_TRANSPARENT_ALPHA_VALUE_ARB 0x203A
+#define WGL_TRANSPARENT_INDEX_VALUE_ARB 0x203B
+#define WGL_SHARE_DEPTH_ARB            0x200C
+#define WGL_SHARE_STENCIL_ARB          0x200D
+#define WGL_SHARE_ACCUM_ARB            0x200E
+#define WGL_SUPPORT_GDI_ARB            0x200F
+#define WGL_SUPPORT_OPENGL_ARB         0x2010
+#define WGL_DOUBLE_BUFFER_ARB          0x2011
+#define WGL_STEREO_ARB                 0x2012
+#define WGL_PIXEL_TYPE_ARB             0x2013
+#define WGL_COLOR_BITS_ARB             0x2014
+#define WGL_RED_BITS_ARB               0x2015
+#define WGL_RED_SHIFT_ARB              0x2016
+#define WGL_GREEN_BITS_ARB             0x2017
+#define WGL_GREEN_SHIFT_ARB            0x2018
+#define WGL_BLUE_BITS_ARB              0x2019
+#define WGL_BLUE_SHIFT_ARB             0x201A
+#define WGL_ALPHA_BITS_ARB             0x201B
+#define WGL_ALPHA_SHIFT_ARB            0x201C
+#define WGL_ACCUM_BITS_ARB             0x201D
+#define WGL_ACCUM_RED_BITS_ARB         0x201E
+#define WGL_ACCUM_GREEN_BITS_ARB       0x201F
+#define WGL_ACCUM_BLUE_BITS_ARB        0x2020
+#define WGL_ACCUM_ALPHA_BITS_ARB       0x2021
+#define WGL_DEPTH_BITS_ARB             0x2022
+#define WGL_STENCIL_BITS_ARB           0x2023
+#define WGL_AUX_BUFFERS_ARB            0x2024
+#define WGL_NO_ACCELERATION_ARB        0x2025
+#define WGL_GENERIC_ACCELERATION_ARB   0x2026
+#define WGL_FULL_ACCELERATION_ARB      0x2027
+#define WGL_SWAP_EXCHANGE_ARB          0x2028
+#define WGL_SWAP_COPY_ARB              0x2029
+#define WGL_SWAP_UNDEFINED_ARB         0x202A
+#define WGL_TYPE_RGBA_ARB              0x202B
+#define WGL_TYPE_COLORINDEX_ARB        0x202C
+#endif
+
+#ifndef WGL_ARB_make_current_read
+#define ERROR_INVALID_PIXEL_TYPE_ARB   0x2043
+#define ERROR_INCOMPATIBLE_DEVICE_CONTEXTS_ARB 0x2054
+#endif
+
+#ifndef WGL_ARB_pbuffer
+#define WGL_DRAW_TO_PBUFFER_ARB        0x202D
+#define WGL_MAX_PBUFFER_PIXELS_ARB     0x202E
+#define WGL_MAX_PBUFFER_WIDTH_ARB      0x202F
+#define WGL_MAX_PBUFFER_HEIGHT_ARB     0x2030
+#define WGL_PBUFFER_LARGEST_ARB        0x2033
+#define WGL_PBUFFER_WIDTH_ARB          0x2034
+#define WGL_PBUFFER_HEIGHT_ARB         0x2035
+#define WGL_PBUFFER_LOST_ARB           0x2036
+#endif
+
+#ifndef WGL_ARB_render_texture
+#define WGL_BIND_TO_TEXTURE_RGB_ARB    0x2070
+#define WGL_BIND_TO_TEXTURE_RGBA_ARB   0x2071
+#define WGL_TEXTURE_FORMAT_ARB         0x2072
+#define WGL_TEXTURE_TARGET_ARB         0x2073
+#define WGL_MIPMAP_TEXTURE_ARB         0x2074
+#define WGL_TEXTURE_RGB_ARB            0x2075
+#define WGL_TEXTURE_RGBA_ARB           0x2076
+#define WGL_NO_TEXTURE_ARB             0x2077
+#define WGL_TEXTURE_CUBE_MAP_ARB       0x2078
+#define WGL_TEXTURE_1D_ARB             0x2079
+#define WGL_TEXTURE_2D_ARB             0x207A
+#define WGL_MIPMAP_LEVEL_ARB           0x207B
+#define WGL_CUBE_MAP_FACE_ARB          0x207C
+#define WGL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x207D
+#define WGL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x207E
+#define WGL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x207F
+#define WGL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x2080
+#define WGL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x2081
+#define WGL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x2082
+#define WGL_FRONT_LEFT_ARB             0x2083
+#define WGL_FRONT_RIGHT_ARB            0x2084
+#define WGL_BACK_LEFT_ARB              0x2085
+#define WGL_BACK_RIGHT_ARB             0x2086
+#define WGL_AUX0_ARB                   0x2087
+#define WGL_AUX1_ARB                   0x2088
+#define WGL_AUX2_ARB                   0x2089
+#define WGL_AUX3_ARB                   0x208A
+#define WGL_AUX4_ARB                   0x208B
+#define WGL_AUX5_ARB                   0x208C
+#define WGL_AUX6_ARB                   0x208D
+#define WGL_AUX7_ARB                   0x208E
+#define WGL_AUX8_ARB                   0x208F
+#define WGL_AUX9_ARB                   0x2090
+#endif
+
+#ifndef WGL_ARB_pixel_format_float
+#define WGL_TYPE_RGBA_FLOAT_ARB        0x21A0
+#endif
+
+#ifndef WGL_ARB_framebuffer_sRGB
+#define WGL_FRAMEBUFFER_SRGB_CAPABLE_ARB 0x20A9
+#endif
+
+#ifndef WGL_ARB_create_context
+#define WGL_CONTEXT_DEBUG_BIT_ARB      0x00000001
+#define WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x00000002
+#define WGL_CONTEXT_MAJOR_VERSION_ARB  0x2091
+#define WGL_CONTEXT_MINOR_VERSION_ARB  0x2092
+#define WGL_CONTEXT_LAYER_PLANE_ARB    0x2093
+#define WGL_CONTEXT_FLAGS_ARB          0x2094
+#define ERROR_INVALID_VERSION_ARB      0x2095
+#endif
+
+#ifndef WGL_ARB_create_context_profile
+#define WGL_CONTEXT_PROFILE_MASK_ARB   0x9126
+#define WGL_CONTEXT_CORE_PROFILE_BIT_ARB 0x00000001
+#define WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB 0x00000002
+#define ERROR_INVALID_PROFILE_ARB      0x2096
+#endif
+
+#ifndef WGL_ARB_create_context_robustness
+#define WGL_CONTEXT_ROBUST_ACCESS_BIT_ARB 0x00000004
+#define WGL_LOSE_CONTEXT_ON_RESET_ARB  0x8252
+#define WGL_CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB 0x8256
+#define WGL_NO_RESET_NOTIFICATION_ARB  0x8261
+#endif
+
+#ifndef WGL_EXT_make_current_read
+#define ERROR_INVALID_PIXEL_TYPE_EXT   0x2043
+#endif
+
+#ifndef WGL_EXT_pixel_format
+#define WGL_NUMBER_PIXEL_FORMATS_EXT   0x2000
+#define WGL_DRAW_TO_WINDOW_EXT         0x2001
+#define WGL_DRAW_TO_BITMAP_EXT         0x2002
+#define WGL_ACCELERATION_EXT           0x2003
+#define WGL_NEED_PALETTE_EXT           0x2004
+#define WGL_NEED_SYSTEM_PALETTE_EXT    0x2005
+#define WGL_SWAP_LAYER_BUFFERS_EXT     0x2006
+#define WGL_SWAP_METHOD_EXT            0x2007
+#define WGL_NUMBER_OVERLAYS_EXT        0x2008
+#define WGL_NUMBER_UNDERLAYS_EXT       0x2009
+#define WGL_TRANSPARENT_EXT            0x200A
+#define WGL_TRANSPARENT_VALUE_EXT      0x200B
+#define WGL_SHARE_DEPTH_EXT            0x200C
+#define WGL_SHARE_STENCIL_EXT          0x200D
+#define WGL_SHARE_ACCUM_EXT            0x200E
+#define WGL_SUPPORT_GDI_EXT            0x200F
+#define WGL_SUPPORT_OPENGL_EXT         0x2010
+#define WGL_DOUBLE_BUFFER_EXT          0x2011
+#define WGL_STEREO_EXT                 0x2012
+#define WGL_PIXEL_TYPE_EXT             0x2013
+#define WGL_COLOR_BITS_EXT             0x2014
+#define WGL_RED_BITS_EXT               0x2015
+#define WGL_RED_SHIFT_EXT              0x2016
+#define WGL_GREEN_BITS_EXT             0x2017
+#define WGL_GREEN_SHIFT_EXT            0x2018
+#define WGL_BLUE_BITS_EXT              0x2019
+#define WGL_BLUE_SHIFT_EXT             0x201A
+#define WGL_ALPHA_BITS_EXT             0x201B
+#define WGL_ALPHA_SHIFT_EXT            0x201C
+#define WGL_ACCUM_BITS_EXT             0x201D
+#define WGL_ACCUM_RED_BITS_EXT         0x201E
+#define WGL_ACCUM_GREEN_BITS_EXT       0x201F
+#define WGL_ACCUM_BLUE_BITS_EXT        0x2020
+#define WGL_ACCUM_ALPHA_BITS_EXT       0x2021
+#define WGL_DEPTH_BITS_EXT             0x2022
+#define WGL_STENCIL_BITS_EXT           0x2023
+#define WGL_AUX_BUFFERS_EXT            0x2024
+#define WGL_NO_ACCELERATION_EXT        0x2025
+#define WGL_GENERIC_ACCELERATION_EXT   0x2026
+#define WGL_FULL_ACCELERATION_EXT      0x2027
+#define WGL_SWAP_EXCHANGE_EXT          0x2028
+#define WGL_SWAP_COPY_EXT              0x2029
+#define WGL_SWAP_UNDEFINED_EXT         0x202A
+#define WGL_TYPE_RGBA_EXT              0x202B
+#define WGL_TYPE_COLORINDEX_EXT        0x202C
+#endif
+
+#ifndef WGL_EXT_pbuffer
+#define WGL_DRAW_TO_PBUFFER_EXT        0x202D
+#define WGL_MAX_PBUFFER_PIXELS_EXT     0x202E
+#define WGL_MAX_PBUFFER_WIDTH_EXT      0x202F
+#define WGL_MAX_PBUFFER_HEIGHT_EXT     0x2030
+#define WGL_OPTIMAL_PBUFFER_WIDTH_EXT  0x2031
+#define WGL_OPTIMAL_PBUFFER_HEIGHT_EXT 0x2032
+#define WGL_PBUFFER_LARGEST_EXT        0x2033
+#define WGL_PBUFFER_WIDTH_EXT          0x2034
+#define WGL_PBUFFER_HEIGHT_EXT         0x2035
+#endif
+
+#ifndef WGL_EXT_depth_float
+#define WGL_DEPTH_FLOAT_EXT            0x2040
+#endif
+
+#ifndef WGL_3DFX_multisample
+#define WGL_SAMPLE_BUFFERS_3DFX        0x2060
+#define WGL_SAMPLES_3DFX               0x2061
+#endif
+
+#ifndef WGL_EXT_multisample
+#define WGL_SAMPLE_BUFFERS_EXT         0x2041
+#define WGL_SAMPLES_EXT                0x2042
+#endif
+
+#ifndef WGL_I3D_digital_video_control
+#define WGL_DIGITAL_VIDEO_CURSOR_ALPHA_FRAMEBUFFER_I3D 0x2050
+#define WGL_DIGITAL_VIDEO_CURSOR_ALPHA_VALUE_I3D 0x2051
+#define WGL_DIGITAL_VIDEO_CURSOR_INCLUDED_I3D 0x2052
+#define WGL_DIGITAL_VIDEO_GAMMA_CORRECTED_I3D 0x2053
+#endif
+
+#ifndef WGL_I3D_gamma
+#define WGL_GAMMA_TABLE_SIZE_I3D       0x204E
+#define WGL_GAMMA_EXCLUDE_DESKTOP_I3D  0x204F
+#endif
+
+#ifndef WGL_I3D_genlock
+#define WGL_GENLOCK_SOURCE_MULTIVIEW_I3D 0x2044
+#define WGL_GENLOCK_SOURCE_EXTENAL_SYNC_I3D 0x2045
+#define WGL_GENLOCK_SOURCE_EXTENAL_FIELD_I3D 0x2046
+#define WGL_GENLOCK_SOURCE_EXTENAL_TTL_I3D 0x2047
+#define WGL_GENLOCK_SOURCE_DIGITAL_SYNC_I3D 0x2048
+#define WGL_GENLOCK_SOURCE_DIGITAL_FIELD_I3D 0x2049
+#define WGL_GENLOCK_SOURCE_EDGE_FALLING_I3D 0x204A
+#define WGL_GENLOCK_SOURCE_EDGE_RISING_I3D 0x204B
+#define WGL_GENLOCK_SOURCE_EDGE_BOTH_I3D 0x204C
+#endif
+
+#ifndef WGL_I3D_image_buffer
+#define WGL_IMAGE_BUFFER_MIN_ACCESS_I3D 0x00000001
+#define WGL_IMAGE_BUFFER_LOCK_I3D      0x00000002
+#endif
+
+#ifndef WGL_I3D_swap_frame_lock
+#endif
+
+#ifndef WGL_NV_render_depth_texture
+#define WGL_BIND_TO_TEXTURE_DEPTH_NV   0x20A3
+#define WGL_BIND_TO_TEXTURE_RECTANGLE_DEPTH_NV 0x20A4
+#define WGL_DEPTH_TEXTURE_FORMAT_NV    0x20A5
+#define WGL_TEXTURE_DEPTH_COMPONENT_NV 0x20A6
+#define WGL_DEPTH_COMPONENT_NV         0x20A7
+#endif
+
+#ifndef WGL_NV_render_texture_rectangle
+#define WGL_BIND_TO_TEXTURE_RECTANGLE_RGB_NV 0x20A0
+#define WGL_BIND_TO_TEXTURE_RECTANGLE_RGBA_NV 0x20A1
+#define WGL_TEXTURE_RECTANGLE_NV       0x20A2
+#endif
+
+#ifndef WGL_ATI_pixel_format_float
+#define WGL_TYPE_RGBA_FLOAT_ATI        0x21A0
+#endif
+
+#ifndef WGL_NV_float_buffer
+#define WGL_FLOAT_COMPONENTS_NV        0x20B0
+#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_R_NV 0x20B1
+#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RG_NV 0x20B2
+#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGB_NV 0x20B3
+#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGBA_NV 0x20B4
+#define WGL_TEXTURE_FLOAT_R_NV         0x20B5
+#define WGL_TEXTURE_FLOAT_RG_NV        0x20B6
+#define WGL_TEXTURE_FLOAT_RGB_NV       0x20B7
+#define WGL_TEXTURE_FLOAT_RGBA_NV      0x20B8
+#endif
+
+#ifndef WGL_3DL_stereo_control
+#define WGL_STEREO_EMITTER_ENABLE_3DL  0x2055
+#define WGL_STEREO_EMITTER_DISABLE_3DL 0x2056
+#define WGL_STEREO_POLARITY_NORMAL_3DL 0x2057
+#define WGL_STEREO_POLARITY_INVERT_3DL 0x2058
+#endif
+
+#ifndef WGL_EXT_pixel_format_packed_float
+#define WGL_TYPE_RGBA_UNSIGNED_FLOAT_EXT 0x20A8
+#endif
+
+#ifndef WGL_EXT_framebuffer_sRGB
+#define WGL_FRAMEBUFFER_SRGB_CAPABLE_EXT 0x20A9
+#endif
+
+#ifndef WGL_NV_present_video
+#define WGL_NUM_VIDEO_SLOTS_NV         0x20F0
+#endif
+
+#ifndef WGL_NV_video_out
+#define WGL_BIND_TO_VIDEO_RGB_NV       0x20C0
+#define WGL_BIND_TO_VIDEO_RGBA_NV      0x20C1
+#define WGL_BIND_TO_VIDEO_RGB_AND_DEPTH_NV 0x20C2
+#define WGL_VIDEO_OUT_COLOR_NV         0x20C3
+#define WGL_VIDEO_OUT_ALPHA_NV         0x20C4
+#define WGL_VIDEO_OUT_DEPTH_NV         0x20C5
+#define WGL_VIDEO_OUT_COLOR_AND_ALPHA_NV 0x20C6
+#define WGL_VIDEO_OUT_COLOR_AND_DEPTH_NV 0x20C7
+#define WGL_VIDEO_OUT_FRAME            0x20C8
+#define WGL_VIDEO_OUT_FIELD_1          0x20C9
+#define WGL_VIDEO_OUT_FIELD_2          0x20CA
+#define WGL_VIDEO_OUT_STACKED_FIELDS_1_2 0x20CB
+#define WGL_VIDEO_OUT_STACKED_FIELDS_2_1 0x20CC
+#endif
+
+#ifndef WGL_NV_swap_group
+#endif
+
+#ifndef WGL_NV_gpu_affinity
+#define WGL_ERROR_INCOMPATIBLE_AFFINITY_MASKS_NV 0x20D0
+#define WGL_ERROR_MISSING_AFFINITY_MASK_NV 0x20D1
+#endif
+
+#ifndef WGL_AMD_gpu_association
+#define WGL_GPU_VENDOR_AMD             0x1F00
+#define WGL_GPU_RENDERER_STRING_AMD    0x1F01
+#define WGL_GPU_OPENGL_VERSION_STRING_AMD 0x1F02
+#define WGL_GPU_FASTEST_TARGET_GPUS_AMD 0x21A2
+#define WGL_GPU_RAM_AMD                0x21A3
+#define WGL_GPU_CLOCK_AMD              0x21A4
+#define WGL_GPU_NUM_PIPES_AMD          0x21A5
+#define WGL_GPU_NUM_SIMD_AMD           0x21A6
+#define WGL_GPU_NUM_RB_AMD             0x21A7
+#define WGL_GPU_NUM_SPI_AMD            0x21A8
+#endif
+
+#ifndef WGL_NV_video_capture
+#define WGL_UNIQUE_ID_NV               0x20CE
+#define WGL_NUM_VIDEO_CAPTURE_SLOTS_NV 0x20CF
+#endif
+
+#ifndef WGL_NV_copy_image
+#endif
+
+#ifndef WGL_NV_multisample_coverage
+#define WGL_COVERAGE_SAMPLES_NV        0x2042
+#define WGL_COLOR_SAMPLES_NV           0x20B9
+#endif
+
+#ifndef WGL_EXT_create_context_es2_profile
+#define WGL_CONTEXT_ES2_PROFILE_BIT_EXT 0x00000004
+#endif
+
+#ifndef WGL_NV_DX_interop
+#define WGL_ACCESS_READ_ONLY_NV        0x00000000
+#define WGL_ACCESS_READ_WRITE_NV       0x00000001
+#define WGL_ACCESS_WRITE_DISCARD_NV    0x00000002
+#endif
+
+#ifndef WGL_NV_DX_interop2
+#endif
+
+#ifndef WGL_EXT_swap_control_tear
+#endif
+
+
+/*************************************************************/
+
+#ifndef WGL_ARB_pbuffer
+DECLARE_HANDLE(HPBUFFERARB);
+#endif
+#ifndef WGL_EXT_pbuffer
+DECLARE_HANDLE(HPBUFFEREXT);
+#endif
+#ifndef WGL_NV_present_video
+DECLARE_HANDLE(HVIDEOOUTPUTDEVICENV);
+#endif
+#ifndef WGL_NV_video_output
+DECLARE_HANDLE(HPVIDEODEV);
+#endif
+#ifndef WGL_NV_gpu_affinity
+DECLARE_HANDLE(HPGPUNV);
+DECLARE_HANDLE(HGPUNV);
+
+typedef struct _GPU_DEVICE {
+    DWORD  cb;
+    CHAR   DeviceName[32];
+    CHAR   DeviceString[128];
+    DWORD  Flags;
+    RECT   rcVirtualScreen;
+} GPU_DEVICE, *PGPU_DEVICE;
+#endif
+#ifndef WGL_NV_video_capture
+DECLARE_HANDLE(HVIDEOINPUTDEVICENV);
+#endif
+
+#ifndef WGL_ARB_buffer_region
+#define WGL_ARB_buffer_region 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern HANDLE WINAPI wglCreateBufferRegionARB (HDC hDC, int iLayerPlane, UINT uType);
+extern VOID WINAPI wglDeleteBufferRegionARB (HANDLE hRegion);
+extern BOOL WINAPI wglSaveBufferRegionARB (HANDLE hRegion, int x, int y, int width, int height);
+extern BOOL WINAPI wglRestoreBufferRegionARB (HANDLE hRegion, int x, int y, int width, int height, int xSrc, int ySrc);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef HANDLE (WINAPI * PFNWGLCREATEBUFFERREGIONARBPROC) (HDC hDC, int iLayerPlane, UINT uType);
+typedef VOID (WINAPI * PFNWGLDELETEBUFFERREGIONARBPROC) (HANDLE hRegion);
+typedef BOOL (WINAPI * PFNWGLSAVEBUFFERREGIONARBPROC) (HANDLE hRegion, int x, int y, int width, int height);
+typedef BOOL (WINAPI * PFNWGLRESTOREBUFFERREGIONARBPROC) (HANDLE hRegion, int x, int y, int width, int height, int xSrc, int ySrc);
+#endif
+
+#ifndef WGL_ARB_multisample
+#define WGL_ARB_multisample 1
+#endif
+
+#ifndef WGL_ARB_extensions_string
+#define WGL_ARB_extensions_string 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern const char * WINAPI wglGetExtensionsStringARB (HDC hdc);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef const char * (WINAPI * PFNWGLGETEXTENSIONSSTRINGARBPROC) (HDC hdc);
+#endif
+
+#ifndef WGL_ARB_pixel_format
+#define WGL_ARB_pixel_format 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern BOOL WINAPI wglGetPixelFormatAttribivARB (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, int *piValues);
+extern BOOL WINAPI wglGetPixelFormatAttribfvARB (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, FLOAT *pfValues);
+extern BOOL WINAPI wglChoosePixelFormatARB (HDC hdc, const int *piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBIVARBPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, int *piValues);
+typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBFVARBPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, FLOAT *pfValues);
+typedef BOOL (WINAPI * PFNWGLCHOOSEPIXELFORMATARBPROC) (HDC hdc, const int *piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats);
+#endif
+
+#ifndef WGL_ARB_make_current_read
+#define WGL_ARB_make_current_read 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern BOOL WINAPI wglMakeContextCurrentARB (HDC hDrawDC, HDC hReadDC, HGLRC hglrc);
+extern HDC WINAPI wglGetCurrentReadDCARB (void);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef BOOL (WINAPI * PFNWGLMAKECONTEXTCURRENTARBPROC) (HDC hDrawDC, HDC hReadDC, HGLRC hglrc);
+typedef HDC (WINAPI * PFNWGLGETCURRENTREADDCARBPROC) (void);
+#endif
+
+#ifndef WGL_ARB_pbuffer
+#define WGL_ARB_pbuffer 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern HPBUFFERARB WINAPI wglCreatePbufferARB (HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int *piAttribList);
+extern HDC WINAPI wglGetPbufferDCARB (HPBUFFERARB hPbuffer);
+extern int WINAPI wglReleasePbufferDCARB (HPBUFFERARB hPbuffer, HDC hDC);
+extern BOOL WINAPI wglDestroyPbufferARB (HPBUFFERARB hPbuffer);
+extern BOOL WINAPI wglQueryPbufferARB (HPBUFFERARB hPbuffer, int iAttribute, int *piValue);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef HPBUFFERARB (WINAPI * PFNWGLCREATEPBUFFERARBPROC) (HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int *piAttribList);
+typedef HDC (WINAPI * PFNWGLGETPBUFFERDCARBPROC) (HPBUFFERARB hPbuffer);
+typedef int (WINAPI * PFNWGLRELEASEPBUFFERDCARBPROC) (HPBUFFERARB hPbuffer, HDC hDC);
+typedef BOOL (WINAPI * PFNWGLDESTROYPBUFFERARBPROC) (HPBUFFERARB hPbuffer);
+typedef BOOL (WINAPI * PFNWGLQUERYPBUFFERARBPROC) (HPBUFFERARB hPbuffer, int iAttribute, int *piValue);
+#endif
+
+#ifndef WGL_ARB_render_texture
+#define WGL_ARB_render_texture 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern BOOL WINAPI wglBindTexImageARB (HPBUFFERARB hPbuffer, int iBuffer);
+extern BOOL WINAPI wglReleaseTexImageARB (HPBUFFERARB hPbuffer, int iBuffer);
+extern BOOL WINAPI wglSetPbufferAttribARB (HPBUFFERARB hPbuffer, const int *piAttribList);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef BOOL (WINAPI * PFNWGLBINDTEXIMAGEARBPROC) (HPBUFFERARB hPbuffer, int iBuffer);
+typedef BOOL (WINAPI * PFNWGLRELEASETEXIMAGEARBPROC) (HPBUFFERARB hPbuffer, int iBuffer);
+typedef BOOL (WINAPI * PFNWGLSETPBUFFERATTRIBARBPROC) (HPBUFFERARB hPbuffer, const int *piAttribList);
+#endif
+
+#ifndef WGL_ARB_pixel_format_float
+#define WGL_ARB_pixel_format_float 1
+#endif
+
+#ifndef WGL_ARB_framebuffer_sRGB
+#define WGL_ARB_framebuffer_sRGB 1
+#endif
+
+#ifndef WGL_ARB_create_context
+#define WGL_ARB_create_context 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern HGLRC WINAPI wglCreateContextAttribsARB (HDC hDC, HGLRC hShareContext, const int *attribList);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef HGLRC (WINAPI * PFNWGLCREATECONTEXTATTRIBSARBPROC) (HDC hDC, HGLRC hShareContext, const int *attribList);
+#endif
+
+#ifndef WGL_ARB_create_context_profile
+#define WGL_ARB_create_context_profile 1
+#endif
+
+#ifndef WGL_ARB_create_context_robustness
+#define WGL_ARB_create_context_robustness 1
+#endif
+
+#ifndef WGL_EXT_display_color_table
+#define WGL_EXT_display_color_table 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern GLboolean WINAPI wglCreateDisplayColorTableEXT (GLushort id);
+extern GLboolean WINAPI wglLoadDisplayColorTableEXT (const GLushort *table, GLuint length);
+extern GLboolean WINAPI wglBindDisplayColorTableEXT (GLushort id);
+extern VOID WINAPI wglDestroyDisplayColorTableEXT (GLushort id);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef GLboolean (WINAPI * PFNWGLCREATEDISPLAYCOLORTABLEEXTPROC) (GLushort id);
+typedef GLboolean (WINAPI * PFNWGLLOADDISPLAYCOLORTABLEEXTPROC) (const GLushort *table, GLuint length);
+typedef GLboolean (WINAPI * PFNWGLBINDDISPLAYCOLORTABLEEXTPROC) (GLushort id);
+typedef VOID (WINAPI * PFNWGLDESTROYDISPLAYCOLORTABLEEXTPROC) (GLushort id);
+#endif
+
+#ifndef WGL_EXT_extensions_string
+#define WGL_EXT_extensions_string 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern const char * WINAPI wglGetExtensionsStringEXT (void);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef const char * (WINAPI * PFNWGLGETEXTENSIONSSTRINGEXTPROC) (void);
+#endif
+
+#ifndef WGL_EXT_make_current_read
+#define WGL_EXT_make_current_read 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern BOOL WINAPI wglMakeContextCurrentEXT (HDC hDrawDC, HDC hReadDC, HGLRC hglrc);
+extern HDC WINAPI wglGetCurrentReadDCEXT (void);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef BOOL (WINAPI * PFNWGLMAKECONTEXTCURRENTEXTPROC) (HDC hDrawDC, HDC hReadDC, HGLRC hglrc);
+typedef HDC (WINAPI * PFNWGLGETCURRENTREADDCEXTPROC) (void);
+#endif
+
+#ifndef WGL_EXT_pbuffer
+#define WGL_EXT_pbuffer 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern HPBUFFEREXT WINAPI wglCreatePbufferEXT (HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int *piAttribList);
+extern HDC WINAPI wglGetPbufferDCEXT (HPBUFFEREXT hPbuffer);
+extern int WINAPI wglReleasePbufferDCEXT (HPBUFFEREXT hPbuffer, HDC hDC);
+extern BOOL WINAPI wglDestroyPbufferEXT (HPBUFFEREXT hPbuffer);
+extern BOOL WINAPI wglQueryPbufferEXT (HPBUFFEREXT hPbuffer, int iAttribute, int *piValue);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef HPBUFFEREXT (WINAPI * PFNWGLCREATEPBUFFEREXTPROC) (HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int *piAttribList);
+typedef HDC (WINAPI * PFNWGLGETPBUFFERDCEXTPROC) (HPBUFFEREXT hPbuffer);
+typedef int (WINAPI * PFNWGLRELEASEPBUFFERDCEXTPROC) (HPBUFFEREXT hPbuffer, HDC hDC);
+typedef BOOL (WINAPI * PFNWGLDESTROYPBUFFEREXTPROC) (HPBUFFEREXT hPbuffer);
+typedef BOOL (WINAPI * PFNWGLQUERYPBUFFEREXTPROC) (HPBUFFEREXT hPbuffer, int iAttribute, int *piValue);
+#endif
+
+#ifndef WGL_EXT_pixel_format
+#define WGL_EXT_pixel_format 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern BOOL WINAPI wglGetPixelFormatAttribivEXT (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int *piAttributes, int *piValues);
+extern BOOL WINAPI wglGetPixelFormatAttribfvEXT (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int *piAttributes, FLOAT *pfValues);
+extern BOOL WINAPI wglChoosePixelFormatEXT (HDC hdc, const int *piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBIVEXTPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int *piAttributes, int *piValues);
+typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBFVEXTPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int *piAttributes, FLOAT *pfValues);
+typedef BOOL (WINAPI * PFNWGLCHOOSEPIXELFORMATEXTPROC) (HDC hdc, const int *piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats);
+#endif
+
+#ifndef WGL_EXT_swap_control
+#define WGL_EXT_swap_control 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern BOOL WINAPI wglSwapIntervalEXT (int interval);
+extern int WINAPI wglGetSwapIntervalEXT (void);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef BOOL (WINAPI * PFNWGLSWAPINTERVALEXTPROC) (int interval);
+typedef int (WINAPI * PFNWGLGETSWAPINTERVALEXTPROC) (void);
+#endif
+
+#ifndef WGL_EXT_depth_float
+#define WGL_EXT_depth_float 1
+#endif
+
+#ifndef WGL_NV_vertex_array_range
+#define WGL_NV_vertex_array_range 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern void* WINAPI wglAllocateMemoryNV (GLsizei size, GLfloat readfreq, GLfloat writefreq, GLfloat priority);
+extern void WINAPI wglFreeMemoryNV (void *pointer);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef void* (WINAPI * PFNWGLALLOCATEMEMORYNVPROC) (GLsizei size, GLfloat readfreq, GLfloat writefreq, GLfloat priority);
+typedef void (WINAPI * PFNWGLFREEMEMORYNVPROC) (void *pointer);
+#endif
+
+#ifndef WGL_3DFX_multisample
+#define WGL_3DFX_multisample 1
+#endif
+
+#ifndef WGL_EXT_multisample
+#define WGL_EXT_multisample 1
+#endif
+
+#ifndef WGL_OML_sync_control
+#define WGL_OML_sync_control 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern BOOL WINAPI wglGetSyncValuesOML (HDC hdc, INT64 *ust, INT64 *msc, INT64 *sbc);
+extern BOOL WINAPI wglGetMscRateOML (HDC hdc, INT32 *numerator, INT32 *denominator);
+extern INT64 WINAPI wglSwapBuffersMscOML (HDC hdc, INT64 target_msc, INT64 divisor, INT64 remainder);
+extern INT64 WINAPI wglSwapLayerBuffersMscOML (HDC hdc, int fuPlanes, INT64 target_msc, INT64 divisor, INT64 remainder);
+extern BOOL WINAPI wglWaitForMscOML (HDC hdc, INT64 target_msc, INT64 divisor, INT64 remainder, INT64 *ust, INT64 *msc, INT64 *sbc);
+extern BOOL WINAPI wglWaitForSbcOML (HDC hdc, INT64 target_sbc, INT64 *ust, INT64 *msc, INT64 *sbc);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef BOOL (WINAPI * PFNWGLGETSYNCVALUESOMLPROC) (HDC hdc, INT64 *ust, INT64 *msc, INT64 *sbc);
+typedef BOOL (WINAPI * PFNWGLGETMSCRATEOMLPROC) (HDC hdc, INT32 *numerator, INT32 *denominator);
+typedef INT64 (WINAPI * PFNWGLSWAPBUFFERSMSCOMLPROC) (HDC hdc, INT64 target_msc, INT64 divisor, INT64 remainder);
+typedef INT64 (WINAPI * PFNWGLSWAPLAYERBUFFERSMSCOMLPROC) (HDC hdc, int fuPlanes, INT64 target_msc, INT64 divisor, INT64 remainder);
+typedef BOOL (WINAPI * PFNWGLWAITFORMSCOMLPROC) (HDC hdc, INT64 target_msc, INT64 divisor, INT64 remainder, INT64 *ust, INT64 *msc, INT64 *sbc);
+typedef BOOL (WINAPI * PFNWGLWAITFORSBCOMLPROC) (HDC hdc, INT64 target_sbc, INT64 *ust, INT64 *msc, INT64 *sbc);
+#endif
+
+#ifndef WGL_I3D_digital_video_control
+#define WGL_I3D_digital_video_control 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern BOOL WINAPI wglGetDigitalVideoParametersI3D (HDC hDC, int iAttribute, int *piValue);
+extern BOOL WINAPI wglSetDigitalVideoParametersI3D (HDC hDC, int iAttribute, const int *piValue);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef BOOL (WINAPI * PFNWGLGETDIGITALVIDEOPARAMETERSI3DPROC) (HDC hDC, int iAttribute, int *piValue);
+typedef BOOL (WINAPI * PFNWGLSETDIGITALVIDEOPARAMETERSI3DPROC) (HDC hDC, int iAttribute, const int *piValue);
+#endif
+
+#ifndef WGL_I3D_gamma
+#define WGL_I3D_gamma 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern BOOL WINAPI wglGetGammaTableParametersI3D (HDC hDC, int iAttribute, int *piValue);
+extern BOOL WINAPI wglSetGammaTableParametersI3D (HDC hDC, int iAttribute, const int *piValue);
+extern BOOL WINAPI wglGetGammaTableI3D (HDC hDC, int iEntries, USHORT *puRed, USHORT *puGreen, USHORT *puBlue);
+extern BOOL WINAPI wglSetGammaTableI3D (HDC hDC, int iEntries, const USHORT *puRed, const USHORT *puGreen, const USHORT *puBlue);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef BOOL (WINAPI * PFNWGLGETGAMMATABLEPARAMETERSI3DPROC) (HDC hDC, int iAttribute, int *piValue);
+typedef BOOL (WINAPI * PFNWGLSETGAMMATABLEPARAMETERSI3DPROC) (HDC hDC, int iAttribute, const int *piValue);
+typedef BOOL (WINAPI * PFNWGLGETGAMMATABLEI3DPROC) (HDC hDC, int iEntries, USHORT *puRed, USHORT *puGreen, USHORT *puBlue);
+typedef BOOL (WINAPI * PFNWGLSETGAMMATABLEI3DPROC) (HDC hDC, int iEntries, const USHORT *puRed, const USHORT *puGreen, const USHORT *puBlue);
+#endif
+
+#ifndef WGL_I3D_genlock
+#define WGL_I3D_genlock 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern BOOL WINAPI wglEnableGenlockI3D (HDC hDC);
+extern BOOL WINAPI wglDisableGenlockI3D (HDC hDC);
+extern BOOL WINAPI wglIsEnabledGenlockI3D (HDC hDC, BOOL *pFlag);
+extern BOOL WINAPI wglGenlockSourceI3D (HDC hDC, UINT uSource);
+extern BOOL WINAPI wglGetGenlockSourceI3D (HDC hDC, UINT *uSource);
+extern BOOL WINAPI wglGenlockSourceEdgeI3D (HDC hDC, UINT uEdge);
+extern BOOL WINAPI wglGetGenlockSourceEdgeI3D (HDC hDC, UINT *uEdge);
+extern BOOL WINAPI wglGenlockSampleRateI3D (HDC hDC, UINT uRate);
+extern BOOL WINAPI wglGetGenlockSampleRateI3D (HDC hDC, UINT *uRate);
+extern BOOL WINAPI wglGenlockSourceDelayI3D (HDC hDC, UINT uDelay);
+extern BOOL WINAPI wglGetGenlockSourceDelayI3D (HDC hDC, UINT *uDelay);
+extern BOOL WINAPI wglQueryGenlockMaxSourceDelayI3D (HDC hDC, UINT *uMaxLineDelay, UINT *uMaxPixelDelay);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef BOOL (WINAPI * PFNWGLENABLEGENLOCKI3DPROC) (HDC hDC);
+typedef BOOL (WINAPI * PFNWGLDISABLEGENLOCKI3DPROC) (HDC hDC);
+typedef BOOL (WINAPI * PFNWGLISENABLEDGENLOCKI3DPROC) (HDC hDC, BOOL *pFlag);
+typedef BOOL (WINAPI * PFNWGLGENLOCKSOURCEI3DPROC) (HDC hDC, UINT uSource);
+typedef BOOL (WINAPI * PFNWGLGETGENLOCKSOURCEI3DPROC) (HDC hDC, UINT *uSource);
+typedef BOOL (WINAPI * PFNWGLGENLOCKSOURCEEDGEI3DPROC) (HDC hDC, UINT uEdge);
+typedef BOOL (WINAPI * PFNWGLGETGENLOCKSOURCEEDGEI3DPROC) (HDC hDC, UINT *uEdge);
+typedef BOOL (WINAPI * PFNWGLGENLOCKSAMPLERATEI3DPROC) (HDC hDC, UINT uRate);
+typedef BOOL (WINAPI * PFNWGLGETGENLOCKSAMPLERATEI3DPROC) (HDC hDC, UINT *uRate);
+typedef BOOL (WINAPI * PFNWGLGENLOCKSOURCEDELAYI3DPROC) (HDC hDC, UINT uDelay);
+typedef BOOL (WINAPI * PFNWGLGETGENLOCKSOURCEDELAYI3DPROC) (HDC hDC, UINT *uDelay);
+typedef BOOL (WINAPI * PFNWGLQUERYGENLOCKMAXSOURCEDELAYI3DPROC) (HDC hDC, UINT *uMaxLineDelay, UINT *uMaxPixelDelay);
+#endif
+
+#ifndef WGL_I3D_image_buffer
+#define WGL_I3D_image_buffer 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern LPVOID WINAPI wglCreateImageBufferI3D (HDC hDC, DWORD dwSize, UINT uFlags);
+extern BOOL WINAPI wglDestroyImageBufferI3D (HDC hDC, LPVOID pAddress);
+extern BOOL WINAPI wglAssociateImageBufferEventsI3D (HDC hDC, const HANDLE *pEvent, const LPVOID *pAddress, const DWORD *pSize, UINT count);
+extern BOOL WINAPI wglReleaseImageBufferEventsI3D (HDC hDC, const LPVOID *pAddress, UINT count);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef LPVOID (WINAPI * PFNWGLCREATEIMAGEBUFFERI3DPROC) (HDC hDC, DWORD dwSize, UINT uFlags);
+typedef BOOL (WINAPI * PFNWGLDESTROYIMAGEBUFFERI3DPROC) (HDC hDC, LPVOID pAddress);
+typedef BOOL (WINAPI * PFNWGLASSOCIATEIMAGEBUFFEREVENTSI3DPROC) (HDC hDC, const HANDLE *pEvent, const LPVOID *pAddress, const DWORD *pSize, UINT count);
+typedef BOOL (WINAPI * PFNWGLRELEASEIMAGEBUFFEREVENTSI3DPROC) (HDC hDC, const LPVOID *pAddress, UINT count);
+#endif
+
+#ifndef WGL_I3D_swap_frame_lock
+#define WGL_I3D_swap_frame_lock 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern BOOL WINAPI wglEnableFrameLockI3D (void);
+extern BOOL WINAPI wglDisableFrameLockI3D (void);
+extern BOOL WINAPI wglIsEnabledFrameLockI3D (BOOL *pFlag);
+extern BOOL WINAPI wglQueryFrameLockMasterI3D (BOOL *pFlag);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef BOOL (WINAPI * PFNWGLENABLEFRAMELOCKI3DPROC) (void);
+typedef BOOL (WINAPI * PFNWGLDISABLEFRAMELOCKI3DPROC) (void);
+typedef BOOL (WINAPI * PFNWGLISENABLEDFRAMELOCKI3DPROC) (BOOL *pFlag);
+typedef BOOL (WINAPI * PFNWGLQUERYFRAMELOCKMASTERI3DPROC) (BOOL *pFlag);
+#endif
+
+#ifndef WGL_I3D_swap_frame_usage
+#define WGL_I3D_swap_frame_usage 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern BOOL WINAPI wglGetFrameUsageI3D (float *pUsage);
+extern BOOL WINAPI wglBeginFrameTrackingI3D (void);
+extern BOOL WINAPI wglEndFrameTrackingI3D (void);
+extern BOOL WINAPI wglQueryFrameTrackingI3D (DWORD *pFrameCount, DWORD *pMissedFrames, float *pLastMissedUsage);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef BOOL (WINAPI * PFNWGLGETFRAMEUSAGEI3DPROC) (float *pUsage);
+typedef BOOL (WINAPI * PFNWGLBEGINFRAMETRACKINGI3DPROC) (void);
+typedef BOOL (WINAPI * PFNWGLENDFRAMETRACKINGI3DPROC) (void);
+typedef BOOL (WINAPI * PFNWGLQUERYFRAMETRACKINGI3DPROC) (DWORD *pFrameCount, DWORD *pMissedFrames, float *pLastMissedUsage);
+#endif
+
+#ifndef WGL_ATI_pixel_format_float
+#define WGL_ATI_pixel_format_float 1
+#endif
+
+#ifndef WGL_NV_float_buffer
+#define WGL_NV_float_buffer 1
+#endif
+
+#ifndef WGL_3DL_stereo_control
+#define WGL_3DL_stereo_control 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern BOOL WINAPI wglSetStereoEmitterState3DL (HDC hDC, UINT uState);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef BOOL (WINAPI * PFNWGLSETSTEREOEMITTERSTATE3DLPROC) (HDC hDC, UINT uState);
+#endif
+
+#ifndef WGL_EXT_pixel_format_packed_float
+#define WGL_EXT_pixel_format_packed_float 1
+#endif
+
+#ifndef WGL_EXT_framebuffer_sRGB
+#define WGL_EXT_framebuffer_sRGB 1
+#endif
+
+#ifndef WGL_NV_present_video
+#define WGL_NV_present_video 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern int WINAPI wglEnumerateVideoDevicesNV (HDC hDC, HVIDEOOUTPUTDEVICENV *phDeviceList);
+extern BOOL WINAPI wglBindVideoDeviceNV (HDC hDC, unsigned int uVideoSlot, HVIDEOOUTPUTDEVICENV hVideoDevice, const int *piAttribList);
+extern BOOL WINAPI wglQueryCurrentContextNV (int iAttribute, int *piValue);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef int (WINAPI * PFNWGLENUMERATEVIDEODEVICESNVPROC) (HDC hDC, HVIDEOOUTPUTDEVICENV *phDeviceList);
+typedef BOOL (WINAPI * PFNWGLBINDVIDEODEVICENVPROC) (HDC hDC, unsigned int uVideoSlot, HVIDEOOUTPUTDEVICENV hVideoDevice, const int *piAttribList);
+typedef BOOL (WINAPI * PFNWGLQUERYCURRENTCONTEXTNVPROC) (int iAttribute, int *piValue);
+#endif
+
+#ifndef WGL_NV_video_output
+#define WGL_NV_video_output 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern BOOL WINAPI wglGetVideoDeviceNV (HDC hDC, int numDevices, HPVIDEODEV *hVideoDevice);
+extern BOOL WINAPI wglReleaseVideoDeviceNV (HPVIDEODEV hVideoDevice);
+extern BOOL WINAPI wglBindVideoImageNV (HPVIDEODEV hVideoDevice, HPBUFFERARB hPbuffer, int iVideoBuffer);
+extern BOOL WINAPI wglReleaseVideoImageNV (HPBUFFERARB hPbuffer, int iVideoBuffer);
+extern BOOL WINAPI wglSendPbufferToVideoNV (HPBUFFERARB hPbuffer, int iBufferType, unsigned long *pulCounterPbuffer, BOOL bBlock);
+extern BOOL WINAPI wglGetVideoInfoNV (HPVIDEODEV hpVideoDevice, unsigned long *pulCounterOutputPbuffer, unsigned long *pulCounterOutputVideo);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef BOOL (WINAPI * PFNWGLGETVIDEODEVICENVPROC) (HDC hDC, int numDevices, HPVIDEODEV *hVideoDevice);
+typedef BOOL (WINAPI * PFNWGLRELEASEVIDEODEVICENVPROC) (HPVIDEODEV hVideoDevice);
+typedef BOOL (WINAPI * PFNWGLBINDVIDEOIMAGENVPROC) (HPVIDEODEV hVideoDevice, HPBUFFERARB hPbuffer, int iVideoBuffer);
+typedef BOOL (WINAPI * PFNWGLRELEASEVIDEOIMAGENVPROC) (HPBUFFERARB hPbuffer, int iVideoBuffer);
+typedef BOOL (WINAPI * PFNWGLSENDPBUFFERTOVIDEONVPROC) (HPBUFFERARB hPbuffer, int iBufferType, unsigned long *pulCounterPbuffer, BOOL bBlock);
+typedef BOOL (WINAPI * PFNWGLGETVIDEOINFONVPROC) (HPVIDEODEV hpVideoDevice, unsigned long *pulCounterOutputPbuffer, unsigned long *pulCounterOutputVideo);
+#endif
+
+#ifndef WGL_NV_swap_group
+#define WGL_NV_swap_group 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern BOOL WINAPI wglJoinSwapGroupNV (HDC hDC, GLuint group);
+extern BOOL WINAPI wglBindSwapBarrierNV (GLuint group, GLuint barrier);
+extern BOOL WINAPI wglQuerySwapGroupNV (HDC hDC, GLuint *group, GLuint *barrier);
+extern BOOL WINAPI wglQueryMaxSwapGroupsNV (HDC hDC, GLuint *maxGroups, GLuint *maxBarriers);
+extern BOOL WINAPI wglQueryFrameCountNV (HDC hDC, GLuint *count);
+extern BOOL WINAPI wglResetFrameCountNV (HDC hDC);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef BOOL (WINAPI * PFNWGLJOINSWAPGROUPNVPROC) (HDC hDC, GLuint group);
+typedef BOOL (WINAPI * PFNWGLBINDSWAPBARRIERNVPROC) (GLuint group, GLuint barrier);
+typedef BOOL (WINAPI * PFNWGLQUERYSWAPGROUPNVPROC) (HDC hDC, GLuint *group, GLuint *barrier);
+typedef BOOL (WINAPI * PFNWGLQUERYMAXSWAPGROUPSNVPROC) (HDC hDC, GLuint *maxGroups, GLuint *maxBarriers);
+typedef BOOL (WINAPI * PFNWGLQUERYFRAMECOUNTNVPROC) (HDC hDC, GLuint *count);
+typedef BOOL (WINAPI * PFNWGLRESETFRAMECOUNTNVPROC) (HDC hDC);
+#endif
+
+#ifndef WGL_NV_gpu_affinity
+#define WGL_NV_gpu_affinity 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern BOOL WINAPI wglEnumGpusNV (UINT iGpuIndex, HGPUNV *phGpu);
+extern BOOL WINAPI wglEnumGpuDevicesNV (HGPUNV hGpu, UINT iDeviceIndex, PGPU_DEVICE lpGpuDevice);
+extern HDC WINAPI wglCreateAffinityDCNV (const HGPUNV *phGpuList);
+extern BOOL WINAPI wglEnumGpusFromAffinityDCNV (HDC hAffinityDC, UINT iGpuIndex, HGPUNV *hGpu);
+extern BOOL WINAPI wglDeleteDCNV (HDC hdc);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef BOOL (WINAPI * PFNWGLENUMGPUSNVPROC) (UINT iGpuIndex, HGPUNV *phGpu);
+typedef BOOL (WINAPI * PFNWGLENUMGPUDEVICESNVPROC) (HGPUNV hGpu, UINT iDeviceIndex, PGPU_DEVICE lpGpuDevice);
+typedef HDC (WINAPI * PFNWGLCREATEAFFINITYDCNVPROC) (const HGPUNV *phGpuList);
+typedef BOOL (WINAPI * PFNWGLENUMGPUSFROMAFFINITYDCNVPROC) (HDC hAffinityDC, UINT iGpuIndex, HGPUNV *hGpu);
+typedef BOOL (WINAPI * PFNWGLDELETEDCNVPROC) (HDC hdc);
+#endif
+
+#ifndef WGL_AMD_gpu_association
+#define WGL_AMD_gpu_association 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern UINT WINAPI wglGetGPUIDsAMD (UINT maxCount, UINT *ids);
+extern INT WINAPI wglGetGPUInfoAMD (UINT id, int property, GLenum dataType, UINT size, void *data);
+extern UINT WINAPI wglGetContextGPUIDAMD (HGLRC hglrc);
+extern HGLRC WINAPI wglCreateAssociatedContextAMD (UINT id);
+extern HGLRC WINAPI wglCreateAssociatedContextAttribsAMD (UINT id, HGLRC hShareContext, const int *attribList);
+extern BOOL WINAPI wglDeleteAssociatedContextAMD (HGLRC hglrc);
+extern BOOL WINAPI wglMakeAssociatedContextCurrentAMD (HGLRC hglrc);
+extern HGLRC WINAPI wglGetCurrentAssociatedContextAMD (void);
+extern VOID WINAPI wglBlitContextFramebufferAMD (HGLRC dstCtx, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef UINT (WINAPI * PFNWGLGETGPUIDSAMDPROC) (UINT maxCount, UINT *ids);
+typedef INT (WINAPI * PFNWGLGETGPUINFOAMDPROC) (UINT id, int property, GLenum dataType, UINT size, void *data);
+typedef UINT (WINAPI * PFNWGLGETCONTEXTGPUIDAMDPROC) (HGLRC hglrc);
+typedef HGLRC (WINAPI * PFNWGLCREATEASSOCIATEDCONTEXTAMDPROC) (UINT id);
+typedef HGLRC (WINAPI * PFNWGLCREATEASSOCIATEDCONTEXTATTRIBSAMDPROC) (UINT id, HGLRC hShareContext, const int *attribList);
+typedef BOOL (WINAPI * PFNWGLDELETEASSOCIATEDCONTEXTAMDPROC) (HGLRC hglrc);
+typedef BOOL (WINAPI * PFNWGLMAKEASSOCIATEDCONTEXTCURRENTAMDPROC) (HGLRC hglrc);
+typedef HGLRC (WINAPI * PFNWGLGETCURRENTASSOCIATEDCONTEXTAMDPROC) (void);
+typedef VOID (WINAPI * PFNWGLBLITCONTEXTFRAMEBUFFERAMDPROC) (HGLRC dstCtx, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+#endif
+
+#ifndef WGL_NV_video_capture
+#define WGL_NV_video_capture 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern BOOL WINAPI wglBindVideoCaptureDeviceNV (UINT uVideoSlot, HVIDEOINPUTDEVICENV hDevice);
+extern UINT WINAPI wglEnumerateVideoCaptureDevicesNV (HDC hDc, HVIDEOINPUTDEVICENV *phDeviceList);
+extern BOOL WINAPI wglLockVideoCaptureDeviceNV (HDC hDc, HVIDEOINPUTDEVICENV hDevice);
+extern BOOL WINAPI wglQueryVideoCaptureDeviceNV (HDC hDc, HVIDEOINPUTDEVICENV hDevice, int iAttribute, int *piValue);
+extern BOOL WINAPI wglReleaseVideoCaptureDeviceNV (HDC hDc, HVIDEOINPUTDEVICENV hDevice);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef BOOL (WINAPI * PFNWGLBINDVIDEOCAPTUREDEVICENVPROC) (UINT uVideoSlot, HVIDEOINPUTDEVICENV hDevice);
+typedef UINT (WINAPI * PFNWGLENUMERATEVIDEOCAPTUREDEVICESNVPROC) (HDC hDc, HVIDEOINPUTDEVICENV *phDeviceList);
+typedef BOOL (WINAPI * PFNWGLLOCKVIDEOCAPTUREDEVICENVPROC) (HDC hDc, HVIDEOINPUTDEVICENV hDevice);
+typedef BOOL (WINAPI * PFNWGLQUERYVIDEOCAPTUREDEVICENVPROC) (HDC hDc, HVIDEOINPUTDEVICENV hDevice, int iAttribute, int *piValue);
+typedef BOOL (WINAPI * PFNWGLRELEASEVIDEOCAPTUREDEVICENVPROC) (HDC hDc, HVIDEOINPUTDEVICENV hDevice);
+#endif
+
+#ifndef WGL_NV_copy_image
+#define WGL_NV_copy_image 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern BOOL WINAPI wglCopyImageSubDataNV (HGLRC hSrcRC, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, HGLRC hDstRC, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef BOOL (WINAPI * PFNWGLCOPYIMAGESUBDATANVPROC) (HGLRC hSrcRC, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, HGLRC hDstRC, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth);
+#endif
+
+#ifndef WGL_NV_multisample_coverage
+#define WGL_NV_multisample_coverage 1
+#endif
+
+#ifndef WGL_NV_DX_interop
+#define WGL_NV_DX_interop 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern BOOL WINAPI wglDXSetResourceShareHandleNV (void *dxObject, HANDLE shareHandle);
+extern HANDLE WINAPI wglDXOpenDeviceNV (void *dxDevice);
+extern BOOL WINAPI wglDXCloseDeviceNV (HANDLE hDevice);
+extern HANDLE WINAPI wglDXRegisterObjectNV (HANDLE hDevice, void *dxObject, GLuint name, GLenum type, GLenum access);
+extern BOOL WINAPI wglDXUnregisterObjectNV (HANDLE hDevice, HANDLE hObject);
+extern BOOL WINAPI wglDXObjectAccessNV (HANDLE hObject, GLenum access);
+extern BOOL WINAPI wglDXLockObjectsNV (HANDLE hDevice, GLint count, HANDLE *hObjects);
+extern BOOL WINAPI wglDXUnlockObjectsNV (HANDLE hDevice, GLint count, HANDLE *hObjects);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef BOOL (WINAPI * PFNWGLDXSETRESOURCESHAREHANDLENVPROC) (void *dxObject, HANDLE shareHandle);
+typedef HANDLE (WINAPI * PFNWGLDXOPENDEVICENVPROC) (void *dxDevice);
+typedef BOOL (WINAPI * PFNWGLDXCLOSEDEVICENVPROC) (HANDLE hDevice);
+typedef HANDLE (WINAPI * PFNWGLDXREGISTEROBJECTNVPROC) (HANDLE hDevice, void *dxObject, GLuint name, GLenum type, GLenum access);
+typedef BOOL (WINAPI * PFNWGLDXUNREGISTEROBJECTNVPROC) (HANDLE hDevice, HANDLE hObject);
+typedef BOOL (WINAPI * PFNWGLDXOBJECTACCESSNVPROC) (HANDLE hObject, GLenum access);
+typedef BOOL (WINAPI * PFNWGLDXLOCKOBJECTSNVPROC) (HANDLE hDevice, GLint count, HANDLE *hObjects);
+typedef BOOL (WINAPI * PFNWGLDXUNLOCKOBJECTSNVPROC) (HANDLE hDevice, GLint count, HANDLE *hObjects);
+#endif
+
+#ifndef WGL_NV_DX_interop2
+#define WGL_NV_DX_interop2 1
+#endif
+
+#ifndef WGL_EXT_swap_control_tear
+#define WGL_EXT_swap_control_tear 1
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/xorg-server/hw/xwin/swrastwgl_dri/wglext.spec b/xorg-server/hw/xwin/swrastwgl_dri/wglext.spec
new file mode 100644
index 000000000..265bb0d06
--- /dev/null
+++ b/xorg-server/hw/xwin/swrastwgl_dri/wglext.spec
@@ -0,0 +1,1205 @@
+# wglext.spec file
+# DON'T REMOVE PREVIOUS LINE!!! libspec depends on it!
+#
+# Copyright (c) 1991-2002 Silicon Graphics, Inc. All Rights Reserved.
+# Copyright (c) 2006-2010 The Khronos Group, Inc.
+#
+# This document is licensed under the SGI Free Software B License Version
+# 2.0. For details, see http://oss.sgi.com/projects/FreeB/ .
+#
+# $Revision: 17027 $ on $Date: 2012-03-05 11:19:50 -0800 (Mon, 05 Mar 2012) $
+
+required-props:
+param:		retval retained
+category:	wgl ARB_buffer_region ARB_extensions_string ARB_pixel_format ARB_make_current_read ARB_pbuffer ARB_render_texture ARB_pixel_format_float EXT_display_color_table EXT_extensions_string EXT_make_current_read EXT_pbuffer EXT_pixel_format EXT_swap_control OML_sync_control I3D_digital_video_control I3D_gamma I3D_genlock I3D_image_buffer I3D_swap_frame_lock I3D_swap_frame_usage NV_vertex_array_range 3DL_stereo_control NV_swap_group NV_video_output NV_present_video ARB_create_context NV_gpu_affinity AMD_gpu_association NV_video_capture NV_copy_image ARB_framebuffer_sRGB NV_DX_interop
+# required-props in wgl.spec (which is not used for anything):
+# dlflags:	  notlistable handcode
+# wglflags:	  client-handcode server-handcode non-dispatch
+
+#
+# Boilerplate to define types used by some extensions. This is done
+#   up front, since it involves some complexities in protecting
+#   the declarations whether or not the -protect flag is given to
+#   the generator scripts.
+#
+
+passthru: #ifndef WGL_ARB_pbuffer
+passthru: DECLARE_HANDLE(HPBUFFERARB);
+passthru: #endif
+passthru: #ifndef WGL_EXT_pbuffer
+passthru: DECLARE_HANDLE(HPBUFFEREXT);
+passthru: #endif
+passthru: #ifndef WGL_NV_present_video
+passthru: DECLARE_HANDLE(HVIDEOOUTPUTDEVICENV);
+passthru: #endif
+passthru: #ifndef WGL_NV_video_output
+passthru: DECLARE_HANDLE(HPVIDEODEV);
+passthru: #endif
+passthru: #ifndef WGL_NV_gpu_affinity
+passthru: DECLARE_HANDLE(HPGPUNV);
+passthru: DECLARE_HANDLE(HGPUNV);
+passthru:
+passthru: typedef struct _GPU_DEVICE {
+passthru:     DWORD  cb;
+passthru:     CHAR   DeviceName[32];
+passthru:     CHAR   DeviceString[128];
+passthru:     DWORD  Flags;
+passthru:     RECT   rcVirtualScreen;
+passthru: } GPU_DEVICE, *PGPU_DEVICE;
+passthru: #endif
+passthru: #ifndef WGL_NV_video_capture
+passthru: DECLARE_HANDLE(HVIDEOINPUTDEVICENV);
+passthru: #endif
+passthru:
+
+
+###############################################################################
+#
+# ARB Extension #4
+# ARB_buffer_region commands
+#
+###############################################################################
+
+CreateBufferRegionARB(hDC, iLayerPlane, uType)
+	return		HANDLE
+	param		hDC		HDC in value
+	param		iLayerPlane	int in value
+	param		uType		UINT in value
+	category	ARB_buffer_region
+
+DeleteBufferRegionARB(hRegion)
+	return		VOID
+	param		hRegion		HANDLE in value
+	category	ARB_buffer_region
+
+SaveBufferRegionARB(hRegion, x, y, width, height)
+	return		BOOL
+	param		hRegion		HANDLE in value
+	param		x		int in value
+	param		y		int in value
+	param		width		int in value
+	param		height		int in value
+	category	ARB_buffer_region
+
+RestoreBufferRegionARB(hRegion, x, y, width, height, xSrc, ySrc)
+	return		BOOL
+	param		hRegion		HANDLE in value
+	param		x		int in value
+	param		y		int in value
+	param		width		int in value
+	param		height		int in value
+	param		xSrc		int in value
+	param		ySrc		int in value
+	category	ARB_buffer_region
+
+###############################################################################
+#
+# ARB Extension #5
+# ARB_multisample commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_multisample
+
+###############################################################################
+#
+# ARB Extension #8
+# ARB_extensions_string commands
+#
+###############################################################################
+
+GetExtensionsStringARB(hdc)
+	return		String
+	param		hdc		HDC in value
+	category	ARB_extensions_string
+
+###############################################################################
+#
+# ARB Extension #9
+# ARB_pixel_format commands
+#
+###############################################################################
+
+GetPixelFormatAttribivARB(hdc, iPixelFormat, iLayerPlane, nAttributes, piAttributes, piValues)
+	return		BOOL
+	param		hdc		HDC in value
+	param		iPixelFormat	int in value
+	param		iLayerPlane	int in value
+	param		nAttributes	UINT in value
+	param		piAttributes	int in array [nAttributes]
+	param		piValues	int out array [nAttributes]
+	category	ARB_pixel_format
+
+GetPixelFormatAttribfvARB(hdc, iPixelFormat, iLayerPlane, nAttributes, piAttributes, pfValues)
+	return		BOOL
+	param		hdc		HDC in value
+	param		iPixelFormat	int in value
+	param		iLayerPlane	int in value
+	param		nAttributes	UINT in value
+	param		piAttributes	int in array [nAttributes]
+	param		pfValues	FLOAT out array [nAttributes]
+	category	ARB_pixel_format
+
+ChoosePixelFormatARB(hdc, piAttribIList, pfAttribFList, nMaxFormats, piFormats, nNumFormats)
+	return		BOOL
+	param		hdc		HDC in value
+	param		piAttribIList	int in array [COMPSIZE()]
+	param		pfAttribFList	FLOAT in array [COMPSIZE()]
+	param		nMaxFormats	UINT in value
+	param		piFormats	int out array [COMPSIZE(nNumFormats)]
+	param		nNumFormats	UINT out reference
+	category	ARB_pixel_format
+
+###############################################################################
+#
+# ARB Extension #10
+# ARB_make_current_read commands
+#
+###############################################################################
+
+MakeContextCurrentARB(hDrawDC, hReadDC, hglrc)
+	return		BOOL
+	param		hDrawDC		HDC in value
+	param		hReadDC		HDC in value
+	param		hglrc		HGLRC in value
+	category	ARB_make_current_read
+
+GetCurrentReadDCARB()
+	return		HDC
+	category	ARB_make_current_read
+
+###############################################################################
+#
+# ARB Extension #11
+# ARB_pbuffer commands
+#
+###############################################################################
+
+CreatePbufferARB(hDC, iPixelFormat, iWidth, iHeight, piAttribList)
+	return		HPBUFFERARB
+	param		hDC		HDC in value
+	param		iPixelFormat	int in value
+	param		iWidth		int in value
+	param		iHeight		int in value
+	param		piAttribList	int in array [COMPSIZE()]
+	category	ARB_pbuffer
+
+GetPbufferDCARB(hPbuffer)
+	return		HDC
+	param		hPbuffer	HPBUFFERARB in value
+	category	ARB_pbuffer
+
+ReleasePbufferDCARB(hPbuffer, hDC)
+	return		int
+	param		hPbuffer	HPBUFFERARB in value
+	param		hDC		HDC in value
+	category	ARB_pbuffer
+
+DestroyPbufferARB(hPbuffer)
+	return		BOOL
+	param		hPbuffer	HPBUFFERARB in value
+	category	ARB_pbuffer
+
+QueryPbufferARB(hPbuffer, iAttribute, piValue)
+	return		BOOL
+	param		hPbuffer	HPBUFFERARB in value
+	param		iAttribute	int in value
+	param		piValue		int out reference
+	category	ARB_pbuffer
+
+###############################################################################
+#
+# ARB Extension #20
+# ARB_render_texture commands
+#
+###############################################################################
+
+BindTexImageARB(hPbuffer, iBuffer)
+	return		BOOL
+	param		hPbuffer	HPBUFFERARB in value
+	param		iBuffer		int in value
+	category	ARB_render_texture
+
+ReleaseTexImageARB(hPbuffer, iBuffer)
+	return		BOOL
+	param		hPbuffer	HPBUFFERARB in value
+	param		iBuffer		int in value
+	category	ARB_render_texture
+
+SetPbufferAttribARB(hPbuffer, piAttribList)
+	return		BOOL
+	param		hPbuffer	HPBUFFERARB in value
+	param		piAttribList	int in array [COMPSIZE()]
+	category	ARB_render_texture
+
+###############################################################################
+#
+# ARB Extension #39
+# ARB_pixel_format_float commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_pixel_format_float
+
+###############################################################################
+#
+# ARB Extension #46
+# ARB_framebuffer_sRGB commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_framebuffer_sRGB
+
+###############################################################################
+#
+# ARB Extension #55
+# ARB_create_context commands
+#
+###############################################################################
+
+CreateContextAttribsARB(hDC, hShareContext, attribList)
+	return		HGLRC
+	param		hDC		HDC in value
+	param		hShareContext	HGLRC in value
+	param		attribList	int in array [COMPSIZE()]
+	category	ARB_create_context
+
+###############################################################################
+#
+# ARB Extension #74
+# ARB_create_context_profile commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_create_context_profile
+
+###############################################################################
+#
+# ARB Extension #102
+# ARB_create_context_robustness commands
+#
+###############################################################################
+
+# (none)
+newcategory: ARB_create_context_robustness
+
+
+###############################################################################
+#
+# Extension #167
+# EXT_display_color_table commands
+#
+###############################################################################
+
+CreateDisplayColorTableEXT(id)
+	return		GLboolean
+	param		id		GLushort in value
+	category	EXT_display_color_table
+
+LoadDisplayColorTableEXT(table, length)
+	return		GLboolean
+	param		table		GLushort in array [length]
+	param		length		GLuint in value
+	category	EXT_display_color_table
+
+BindDisplayColorTableEXT(id)
+	return		GLboolean
+	param		id		GLushort in value
+	category	EXT_display_color_table
+
+DestroyDisplayColorTableEXT(id)
+	return		VOID
+	param		id		GLushort in value
+	category	EXT_display_color_table
+
+###############################################################################
+#
+# Extension #168
+# EXT_extensions_string commands
+#
+###############################################################################
+
+GetExtensionsStringEXT()
+	return		String
+	category	EXT_extensions_string
+
+###############################################################################
+#
+# Extension #169
+# EXT_make_current_read commands
+#
+###############################################################################
+
+MakeContextCurrentEXT(hDrawDC, hReadDC, hglrc)
+	return		BOOL
+	param		hDrawDC		HDC in value
+	param		hReadDC		HDC in value
+	param		hglrc		HGLRC in value
+	category	EXT_make_current_read
+
+GetCurrentReadDCEXT()
+	return		HDC
+	category	EXT_make_current_read
+
+###############################################################################
+#
+# Extension #171
+# EXT_pbuffer commands
+#
+###############################################################################
+
+CreatePbufferEXT(hDC, iPixelFormat, iWidth, iHeight, piAttribList)
+	return		HPBUFFEREXT
+	param		hDC		HDC in value
+	param		iPixelFormat	int in value
+	param		iWidth		int in value
+	param		iHeight		int in value
+	param		piAttribList	int in array [COMPSIZE()]
+	category	EXT_pbuffer
+
+GetPbufferDCEXT(hPbuffer)
+	return		HDC
+	param		hPbuffer	HPBUFFEREXT in value
+	category	EXT_pbuffer
+
+ReleasePbufferDCEXT(hPbuffer, hDC)
+	return		int
+	param		hPbuffer	HPBUFFEREXT in value
+	param		hDC		HDC in value
+	category	EXT_pbuffer
+
+DestroyPbufferEXT(hPbuffer)
+	return		BOOL
+	param		hPbuffer	HPBUFFEREXT in value
+	category	EXT_pbuffer
+
+QueryPbufferEXT(hPbuffer, iAttribute, piValue)
+	return		BOOL
+	param		hPbuffer	HPBUFFEREXT in value
+	param		iAttribute	int in value
+	param		piValue		int out reference
+	category	EXT_pbuffer
+
+###############################################################################
+#
+# Extension #170
+# EXT_pixel_format commands
+#
+###############################################################################
+
+GetPixelFormatAttribivEXT(hdc, iPixelFormat, iLayerPlane, nAttributes, piAttributes, piValues)
+	return		BOOL
+	param		hdc		HDC in value
+	param		iPixelFormat	int in value
+	param		iLayerPlane	int in value
+	param		nAttributes	UINT in value
+	param		piAttributes	int out array [nAttributes]
+	param		piValues	int out array [nAttributes]
+	category	EXT_pixel_format
+
+GetPixelFormatAttribfvEXT(hdc, iPixelFormat, iLayerPlane, nAttributes, piAttributes, pfValues)
+	return		BOOL
+	param		hdc		HDC in value
+	param		iPixelFormat	int in value
+	param		iLayerPlane	int in value
+	param		nAttributes	UINT in value
+	param		piAttributes	int out array [nAttributes]
+	param		pfValues	FLOAT out array [nAttributes]
+	category	EXT_pixel_format
+
+ChoosePixelFormatEXT(hdc, piAttribIList, pfAttribFList, nMaxFormats, piFormats, nNumFormats)
+	return		BOOL
+	param		hdc		HDC in value
+	param		piAttribIList	int in array [COMPSIZE()]
+	param		pfAttribFList	FLOAT in array [COMPSIZE()]
+	param		nMaxFormats	UINT in value
+	param		piFormats	int out array [COMPSIZE(nNumFormats)]
+	param		nNumFormats	UINT out reference
+	category	EXT_pixel_format
+
+###############################################################################
+#
+# Extension #172
+# EXT_swap_control commands
+#
+###############################################################################
+
+SwapIntervalEXT(interval)
+	return		BOOL
+	param		interval	int in value
+	category	EXT_swap_control
+
+GetSwapIntervalEXT()
+	return		int
+	category	EXT_swap_control
+
+###############################################################################
+#
+# Extension #177
+# EXT_depth_float commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_depth_float
+
+###############################################################################
+#
+# Extension #190
+# NV_vertex_array_range commands
+#
+###############################################################################
+
+AllocateMemoryNV(size, readfreq, writefreq, priority)
+	return		VoidPointer
+	param		size		    GLsizei in value
+	param		readfreq	    GLfloat in value
+	param		writefreq	    GLfloat in value
+	param		priority	    GLfloat in value
+	category	NV_vertex_array_range
+
+FreeMemoryNV(pointer)
+	return		void
+	param		pointer		    void out array [1]
+	category	NV_vertex_array_range
+
+###############################################################################
+#
+# Extension #207
+# 3DFX_multisample commands
+#
+###############################################################################
+
+# (none)
+newcategory: 3DFX_multisample
+
+###############################################################################
+#
+# Extension #209
+# EXT_multisample commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_multisample
+
+###############################################################################
+#
+# Extension #242
+# OML_sync_control commands
+#
+###############################################################################
+
+GetSyncValuesOML(hdc, ust, msc, sbc)
+	return		BOOL
+	param		hdc		HDC in value
+	param		ust		INT64 out array [1]
+	param		msc		INT64 out array [1]
+	param		sbc		INT64 out array [1]
+	category	OML_sync_control
+
+GetMscRateOML(hdc, numerator, denominator)
+	return		BOOL
+	param		hdc		HDC in value
+	param		numerator	INT32 out array [1]
+	param		denominator	INT32 out array [1]
+	category	OML_sync_control
+
+SwapBuffersMscOML(hdc, target_msc, divisor, remainder)
+	return		INT64
+	param		hdc		HDC in value
+	param		target_msc	INT64 in value
+	param		divisor		INT64 in value
+	param		remainder	INT64 in value
+	category	OML_sync_control
+
+SwapLayerBuffersMscOML(hdc, fuPlanes, target_msc, divisor, remainder)
+	return		INT64
+	param		hdc		HDC in value
+	param		fuPlanes	int in value
+	param		target_msc	INT64 in value
+	param		divisor		INT64 in value
+	param		remainder	INT64 in value
+	category	OML_sync_control
+
+WaitForMscOML(hdc, target_msc, divisor, remainder , ust, msc, sbc)
+	return		BOOL
+	param		hdc		HDC in value
+	param		target_msc	INT64 in value
+	param		divisor		INT64 in value
+	param		remainder	INT64 in value
+	param		ust		INT64 out array [1]
+	param		msc		INT64 out array [1]
+	param		sbc		INT64 out array [1]
+	category	OML_sync_control
+
+WaitForSbcOML(hdc, target_sbc, ust, msc, sbc)
+	return		BOOL
+	param		hdc		HDC in value
+	param		target_sbc	INT64 in value
+	param		ust		INT64 out array [1]
+	param		msc		INT64 out array [1]
+	param		sbc		INT64 out array [1]
+	category	OML_sync_control
+
+###############################################################################
+#
+# Extension #250
+# I3D_digital_video_control commands
+#
+###############################################################################
+
+GetDigitalVideoParametersI3D(hDC, iAttribute, piValue)
+	return		BOOL
+	param		hDC		HDC in value
+	param		iAttribute	int in value
+	param		piValue		int out array [COMPSIZE(iAttribute)]
+	category	I3D_digital_video_control
+
+SetDigitalVideoParametersI3D(hDC, iAttribute, piValue)
+	return		BOOL
+	param		hDC		HDC in value
+	param		iAttribute	int in value
+	param		piValue		int in array [COMPSIZE(iAttribute)]
+	category	I3D_digital_video_control
+
+###############################################################################
+#
+# Extension #251
+# I3D_gamma commands
+#
+###############################################################################
+
+GetGammaTableParametersI3D(hDC, iAttribute, piValue)
+	return		BOOL
+	param		hDC		HDC in value
+	param		iAttribute	int in value
+	param		piValue		int out array [COMPSIZE(iAttribute)]
+	category	I3D_gamma
+
+SetGammaTableParametersI3D(hDC, iAttribute, piValue)
+	return		BOOL
+	param		hDC		HDC in value
+	param		iAttribute	int in value
+	param		piValue		int in array [COMPSIZE(iAttribute)]
+	category	I3D_gamma
+
+GetGammaTableI3D(hDC, iEntries, puRed, puGreen, puBlue)
+	return		BOOL
+	param		hDC		HDC in value
+	param		iEntries	int in value
+	param		puRed		USHORT out array [iEntries]
+	param		puGreen		USHORT out array [iEntries]
+	param		puBlue		USHORT out array [iEntries]
+	category	I3D_gamma
+
+SetGammaTableI3D(hDC, iEntries, puRed, puGreen, puBlue)
+	return		BOOL
+	param		hDC		HDC in value
+	param		iEntries	int in value
+	param		puRed		USHORT in array [iEntries]
+	param		puGreen		USHORT in array [iEntries]
+	param		puBlue		USHORT in array [iEntries]
+	category	I3D_gamma
+
+###############################################################################
+#
+# Extension #252
+# I3D_genlock commands
+#
+###############################################################################
+
+EnableGenlockI3D(hDC)
+	return		BOOL
+	param		hDC		HDC in value
+	category	I3D_genlock
+
+DisableGenlockI3D(hDC)
+	return		BOOL
+	param		hDC		HDC in value
+	category	I3D_genlock
+
+IsEnabledGenlockI3D(hDC, pFlag)
+	return		BOOL
+	param		hDC		HDC in value
+	param		pFlag		BOOL out reference
+	category	I3D_genlock
+
+GenlockSourceI3D(hDC,  uSource)
+	return		BOOL
+	param		hDC		HDC in value
+	param		uSource		UINT in value
+	category	I3D_genlock
+
+GetGenlockSourceI3D(hDC, uSource)
+	return		BOOL
+	param		hDC		HDC in value
+	param		uSource		UINT out reference
+	category	I3D_genlock
+
+GenlockSourceEdgeI3D(hDC,  uEdge)
+	return		BOOL
+	param		hDC		HDC in value
+	param		uEdge		UINT in value
+	category	I3D_genlock
+
+GetGenlockSourceEdgeI3D(hDC, uEdge)
+	return		BOOL
+	param		hDC		HDC in value
+	param		uEdge		UINT out reference
+	category	I3D_genlock
+
+GenlockSampleRateI3D(hDC,  uRate)
+	return		BOOL
+	param		hDC		HDC in value
+	param		uRate		UINT in value
+	category	I3D_genlock
+
+GetGenlockSampleRateI3D(hDC, uRate)
+	return		BOOL
+	param		hDC		HDC in value
+	param		uRate		UINT out reference
+	category	I3D_genlock
+
+GenlockSourceDelayI3D(hDC,  uDelay)
+	return		BOOL
+	param		hDC		HDC in value
+	param		uDelay		UINT in value
+	category	I3D_genlock
+
+GetGenlockSourceDelayI3D(hDC, uDelay)
+	return		BOOL
+	param		hDC		HDC in value
+	param		uDelay		UINT out reference
+	category	I3D_genlock
+
+QueryGenlockMaxSourceDelayI3D(hDC, uMaxLineDelay, uMaxPixelDelay)
+	return		BOOL
+	param		hDC		HDC in value
+	param		uMaxLineDelay	UINT out reference
+	param		uMaxPixelDelay	UINT out reference
+	category	I3D_genlock
+
+###############################################################################
+#
+# Extension #253
+# I3D_image_buffer commands
+#
+###############################################################################
+
+CreateImageBufferI3D(hDC, dwSize,  uFlags)
+	return		LPVOID
+	param		hDC		HDC in value
+	param		dwSize		DWORD in value
+	param		uFlags		UINT in value
+	category	I3D_image_buffer
+
+DestroyImageBufferI3D(hDC, pAddress)
+	return		BOOL
+	param		hDC		HDC in value
+	param		pAddress	LPVOID in value
+	category	I3D_image_buffer
+
+AssociateImageBufferEventsI3D(hDC,  pEvent, pAddress, pSize,  count)
+	return		BOOL
+	param		hDC		HDC in value
+	param		pEvent		HANDLE in array [count]
+	param		pAddress	LPVOID in array [count]
+	param		pSize		DWORD in array [count]
+	param		count		UINT in value
+	category	I3D_image_buffer
+
+ReleaseImageBufferEventsI3D(hDC, pAddress,  count)
+	return		BOOL
+	param		hDC		HDC in value
+	param		pAddress	LPVOID in array [count]
+	param		count		UINT in value
+	category	I3D_image_buffer
+
+###############################################################################
+#
+# Extension #254
+# I3D_swap_frame_lock commands
+#
+###############################################################################
+
+EnableFrameLockI3D()
+	return		BOOL
+	category	I3D_swap_frame_lock
+
+DisableFrameLockI3D()
+	return		BOOL
+	category	I3D_swap_frame_lock
+
+IsEnabledFrameLockI3D(pFlag)
+	return		BOOL
+	param		pFlag		BOOL out reference
+	category	I3D_swap_frame_lock
+
+QueryFrameLockMasterI3D(pFlag)
+	return		BOOL
+	param		pFlag		BOOL out reference
+	category	I3D_swap_frame_lock
+
+###############################################################################
+#
+# Extension #255
+# I3D_swap_frame_usage commands
+#
+###############################################################################
+
+GetFrameUsageI3D(pUsage)
+	return		BOOL
+	param		pUsage		float out reference
+	category	I3D_swap_frame_usage
+
+BeginFrameTrackingI3D()
+	return		BOOL
+	category	I3D_swap_frame_usage
+
+EndFrameTrackingI3D()
+	return		BOOL
+	category	I3D_swap_frame_usage
+
+QueryFrameTrackingI3D(pFrameCount, pMissedFrames, pLastMissedUsage)
+	return		BOOL
+	param		pFrameCount	DWORD out reference
+	param		pMissedFrames	DWORD out reference
+	param		pLastMissedUsage    float out reference
+	category	I3D_swap_frame_usage
+
+###############################################################################
+#
+# Extension #278
+# ATI_pixel_format_float commands
+#
+###############################################################################
+
+# (none)
+newcategory: ATI_pixel_format_float
+
+###############################################################################
+#
+# Extension #281
+# NV_float_buffer commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_float_buffer
+
+###############################################################################
+#
+# Extension #313
+# 3DL_stereo_control commands
+#
+###############################################################################
+
+SetStereoEmitterState3DL(hDC, uState)
+	return		BOOL
+	param		hDC		HDC in value
+	param		uState		UINT in value
+	category	3DL_stereo_control
+
+###############################################################################
+#
+# Extension #328
+# EXT_pixel_format_packed_float commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_pixel_format_packed_float
+
+###############################################################################
+#
+# Extension #337
+# EXT_framebuffer_sRGB commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_framebuffer_sRGB
+
+###############################################################################
+#
+# Extension #347
+# NV_present_video commands
+#
+###############################################################################
+
+EnumerateVideoDevicesNV(hDC, phDeviceList)
+	return		int
+	param		hDC		HDC in value
+	param		phDeviceList	HVIDEOOUTPUTDEVICENV out array
+	category	NV_present_video
+
+BindVideoDeviceNV(hDC, uVideoSlot, hVideoDevice, piAttribList)
+	return		BOOL
+	param		hDC		HDC in value
+	param		uVideoSlot	uint in value
+	param		hVideoDevice	HVIDEOOUTPUTDEVICENV in value
+	param		piAttribList	int in array [COMPSIZE()]
+	category	NV_present_video
+
+QueryCurrentContextNV(iAttribute, piValue)
+	return		BOOL
+	param		iAttribute	int in value
+	param		piValue		int out array [COMPSIZE()]
+	category	NV_present_video
+
+###############################################################################
+#
+# Extension #349
+# NV_video_output commands
+#
+###############################################################################
+
+GetVideoDeviceNV(hDC, numDevices, hVideoDevice)
+	return		BOOL
+	param		hDC		HDC in value
+	param		numDevices	int in value
+	param		hVideoDevice	HPVIDEODEV out reference
+	category	NV_video_output
+
+ReleaseVideoDeviceNV(hVideoDevice)
+	return		BOOL
+	param		hVideoDevice	HPVIDEODEV in value
+	category	NV_video_output
+
+BindVideoImageNV(hVideoDevice, hPbuffer, iVideoBuffer)
+	return		BOOL
+	param		hVideoDevice	HPVIDEODEV in value
+	param		hPbuffer	HPBUFFERARB in value
+	param		iVideoBuffer	int in value
+	category	NV_video_output
+
+ReleaseVideoImageNV(hPbuffer, iVideoBuffer)
+	return		BOOL
+	param		hPbuffer	HPBUFFERARB in value
+	param		iVideoBuffer	int in value
+	category	NV_video_output
+
+SendPbufferToVideoNV(hPbuffer, iBufferType, pulCounterPbuffer, bBlock)
+	return		BOOL
+	param		hPbuffer	HPBUFFERARB in value
+	param		iBufferType	int in value
+	param		pulCounterPbuffer   ulong out reference
+	param		bBlock		BOOL in value
+	category	NV_video_output
+
+GetVideoInfoNV(hpVideoDevice, pulCounterOutputPbuffer, pulCounterOutputVideo)
+	return		BOOL
+	param		hpVideoDevice	HPVIDEODEV in value
+	param		pulCounterOutputPbuffer ulong out reference
+	param		pulCounterOutputVideo	ulong out reference
+	category	NV_video_output
+
+###############################################################################
+#
+# Extension #351
+# NV_swap_group commands
+#
+###############################################################################
+
+JoinSwapGroupNV(hDC, group)
+	return		BOOL
+	param		hDC		HDC in value
+	param		group		GLuint in value
+	category	NV_swap_group
+
+BindSwapBarrierNV(group, barrier)
+	return		BOOL
+	param		group		GLuint in value
+	param		barrier		GLuint in value
+	category	NV_swap_group
+
+QuerySwapGroupNV(hDC, group, barrier)
+	return		BOOL
+	param		hDC		HDC in value
+	param		group		GLuint out reference
+	param		barrier		GLuint out reference
+	category	NV_swap_group
+
+QueryMaxSwapGroupsNV(hDC, maxGroups, maxBarriers)
+	return		BOOL
+	param		hDC		HDC in value
+	param		maxGroups	GLuint out reference
+	param		maxBarriers	GLuint out reference
+	category	NV_swap_group
+
+QueryFrameCountNV(hDC, count)
+	return		BOOL
+	param		hDC		HDC in value
+	param		count		GLuint out reference
+	category	NV_swap_group
+
+ResetFrameCountNV(hDC)
+	return		BOOL
+	param		hDC		HDC in value
+	category	NV_swap_group
+
+###############################################################################
+#
+# Extension #355
+# NV_gpu_affinity commands
+#
+###############################################################################
+
+EnumGpusNV(iGpuIndex, phGpu)
+	return		BOOL
+	param		iGpuIndex	UINT in value
+	param		phGpu		HGPUNV out reference
+	category	NV_gpu_affinity
+
+EnumGpuDevicesNV(hGpu, iDeviceIndex, lpGpuDevice)
+	return		BOOL
+	param		hGpu		HGPUNV in value
+	param		iDeviceIndex	UINT in value
+	param		lpGpuDevice	PGPU_DEVICE in value
+	category	NV_gpu_affinity
+
+CreateAffinityDCNV(phGpuList)
+	return		HDC
+	param		phGpuList	HGPUNV in array [COMPSIZE()]
+	category	NV_gpu_affinity
+
+EnumGpusFromAffinityDCNV(hAffinityDC, iGpuIndex, hGpu)
+	return		BOOL
+	param		hAffinityDC	HDC in value
+	param		iGpuIndex	UINT in value
+	param		hGpu		HGPUNV out reference
+	category	NV_gpu_affinity
+
+DeleteDCNV(hdc)
+	return		BOOL
+	param		hdc		HDC in value
+	category	NV_gpu_affinity
+
+###############################################################################
+#
+# Extension #361
+# AMD_gpu_association commands
+#
+###############################################################################
+
+GetGPUIDsAMD(maxCount, ids)
+	return		UINT
+	param		maxCount	UINT in value
+	param		ids		UINT out array [maxCount]
+	category	AMD_gpu_association
+
+GetGPUInfoAMD(id, property, dataType, size, data)
+	return		INT
+	param		id		UINT in value
+	param		property	int in value
+	param		dataType	GLenum in value
+	param		size		UINT in value
+	param		data		void out array [COMPSIZE(dataType,size)]
+	category	AMD_gpu_association
+
+GetContextGPUIDAMD(hglrc)
+	return		UINT
+	param		hglrc		HGLRC in value
+	category	AMD_gpu_association
+
+CreateAssociatedContextAMD(id)
+	return		HGLRC
+	param		id		UINT in value
+	category	AMD_gpu_association
+
+CreateAssociatedContextAttribsAMD(id, hShareContext, attribList)
+	return		HGLRC
+	param		id		UINT in value
+	param		hShareContext	HGLRC in value
+	param		attribList	int in array [COMPSIZE()]
+	category	AMD_gpu_association
+
+DeleteAssociatedContextAMD(hglrc)
+	return		BOOL
+	param		hglrc		HGLRC in value
+	category	AMD_gpu_association
+
+MakeAssociatedContextCurrentAMD(hglrc)
+	return		BOOL
+	param		hglrc		HGLRC in value
+	category	AMD_gpu_association
+
+GetCurrentAssociatedContextAMD()
+	return		HGLRC
+	category	AMD_gpu_association
+
+BlitContextFramebufferAMD(dstCtx, srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter)
+	return		VOID
+	param		dstCtx		HGLRC in value
+	param		srcX0		GLint in value
+	param		srcY0		GLint in value
+	param		srcX1		GLint in value
+	param		srcY1		GLint in value
+	param		dstX0		GLint in value
+	param		dstY0		GLint in value
+	param		dstX1		GLint in value
+	param		dstY1		GLint in value
+	param		mask		GLbitfield in value
+	param		filter		GLenum in value
+	category	AMD_gpu_association
+
+###############################################################################
+#
+# Extension #374
+# NV_video_capture commands
+#
+###############################################################################
+
+BindVideoCaptureDeviceNV(uVideoSlot, hDevice)
+	return		BOOL
+	param		uVideoSlot	UINT in value
+	param		hDevice		HVIDEOINPUTDEVICENV in value
+	category	NV_video_capture
+
+EnumerateVideoCaptureDevicesNV(hDc, phDeviceList)
+	return		UINT
+	param		hDc		HDC in value
+	param		phDeviceList	HVIDEOINPUTDEVICENV out reference
+	category	NV_video_capture
+
+LockVideoCaptureDeviceNV(hDc, hDevice)
+	return		BOOL
+	param		hDc		HDC in value
+	param		hDevice		HVIDEOINPUTDEVICENV in value
+	category	NV_video_capture
+
+QueryVideoCaptureDeviceNV(hDc, hDevice, iAttribute, piValue)
+	return		BOOL
+	param		hDc		HDC in value
+	param		hDevice		HVIDEOINPUTDEVICENV in value
+	param		iAttribute	int in value
+	param		piValue		int out reference
+	category	NV_video_capture
+
+ReleaseVideoCaptureDeviceNV(hDc, hDevice)
+	return		BOOL
+	param		hDc		HDC in value
+	param		hDevice		HVIDEOINPUTDEVICENV in value
+	category	NV_video_capture
+
+###############################################################################
+#
+# Extension #376
+# NV_copy_image commands
+#
+###############################################################################
+
+CopyImageSubDataNV(hSrcRC, srcName, srcTarget, srcLevel, srcX, srcY, srcZ, hDstRC, dstName, dstTarget, dstLevel, dstX, dstY, dstZ, width, height, depth)
+	return		BOOL
+	param		hSrcRC		HGLRC in value
+	param		srcName		GLuint in value
+	param		srcTarget	GLenum in value
+	param		srcLevel	GLint in value
+	param		srcX		GLint in value
+	param		srcY		GLint in value
+	param		srcZ		GLint in value
+	param		hDstRC		HGLRC in value
+	param		dstName		GLuint in value
+	param		dstTarget	GLenum in value
+	param		dstLevel	GLint in value
+	param		dstX		GLint in value
+	param		dstY		GLint in value
+	param		dstZ		GLint in value
+	param		width		GLsizei in value
+	param		height		GLsizei in value
+	param		depth		GLsizei in value
+	category	NV_copy_image
+
+###############################################################################
+#
+# Extension #393
+# NV_multisample_coverage commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_multisample_coverage
+
+###############################################################################
+#
+# Extension #407
+# NV_DX_interop commands
+#
+###############################################################################
+
+DXSetResourceShareHandleNV(dxObject, shareHandle)
+	return		BOOL
+	param		dxObject	void out array [1]
+	param		shareHandle	HANDLE in value
+	category	NV_DX_interop
+
+DXOpenDeviceNV(dxDevice)
+	return		HANDLE
+	param		dxDevice	void out array [1]
+	category	NV_DX_interop
+
+DXCloseDeviceNV(hDevice)
+	return		BOOL
+	param		hDevice		HANDLE in value
+	category	NV_DX_interop
+
+DXRegisterObjectNV(hDevice, dxObject, name, type, access)
+	return		HANDLE
+	param		hDevice		HANDLE in value
+	param		dxObject	void out array [1]
+	param		name		GLuint in value
+	param		type		GLenum in value
+	param		access		GLenum in value
+	category	NV_DX_interop
+
+DXUnregisterObjectNV(hDevice, hObject)
+	return		BOOL
+	param		hDevice		HANDLE in value
+	param		hObject		HANDLE in value
+	category	NV_DX_interop
+
+DXObjectAccessNV(hObject, access)
+	return		BOOL
+	param		hObject		HANDLE in value
+	param		access		GLenum in value
+	category	NV_DX_interop
+
+DXLockObjectsNV(hDevice, count, hObjects)
+	return		BOOL
+	param		hDevice		HANDLE in value
+	param		count		GLint in value
+	param		hObjects	HANDLE out array [count]
+	category	NV_DX_interop
+
+DXUnlockObjectsNV(hDevice, count, hObjects)
+	return		BOOL
+	param		hDevice		HANDLE in value
+	param		count		GLint in value
+	param		hObjects	HANDLE out array [count]
+	category	NV_DX_interop
+
+###############################################################################
+#
+# Extension #412
+# NV_DX_interop2 commands
+#
+###############################################################################
+
+# (none)
+newcategory: NV_DX_interop2
+
+###############################################################################
+#
+# Extension #415
+# EXT_swap_control_tear commands
+#
+###############################################################################
+
+# (none)
+newcategory: EXT_swap_control_tear
+
diff --git a/xorg-server/hw/xwin/taskbar.h b/xorg-server/hw/xwin/taskbar.h
new file mode 100644
index 000000000..94f3f9efb
--- /dev/null
+++ b/xorg-server/hw/xwin/taskbar.h
@@ -0,0 +1,39 @@
+/*
+ *Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved.
+ *
+ *Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ *"Software"), to deal in the Software without restriction, including
+ *without limitation the rights to use, copy, modify, merge, publish,
+ *distribute, sublicense, and/or sell copies of the Software, and to
+ *permit persons to whom the Software is furnished to do so, subject to
+ *the following conditions:
+ *
+ *The above copyright notice and this permission notice shall be
+ *included in all copies or substantial portions of the Software.
+ *
+ *THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *NONINFRINGEMENT. IN NO EVENT SHALL THE XFREE86 PROJECT BE LIABLE FOR
+ *ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ *CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ *Except as contained in this notice, the name of the XFree86 Project
+ *shall not be used in advertising or otherwise to promote the sale, use
+ *or other dealings in this Software without prior written authorization
+ *from the XFree86 Project.
+ */
+
+#ifndef _TASKBAR_H
+#define _TASKBAR_H
+
+#include <windows.h>
+#include <propsys.h>
+#include <propkey.h>
+
+typedef HRESULT (__stdcall *SHGETPROPERTYSTOREFORWINDOWPROC)(HWND,REFIID,void**);
+typedef HRESULT (__stdcall *PROPVARIANTCLEARPROC)(PROPVARIANT*);
+
+#endif
diff --git a/xorg-server/hw/xwin/win.h b/xorg-server/hw/xwin/win.h
index fa774bc00..875605241 100644
--- a/xorg-server/hw/xwin/win.h
+++ b/xorg-server/hw/xwin/win.h
@@ -42,11 +42,6 @@
 #define YES					1
 #endif
 
-/* Turn debug messages on or off */
-#ifndef CYGDEBUG
-#define CYGDEBUG				NO
-#endif
-
 /* WM_XBUTTON Messages. They should go into w32api. */
 #ifndef WM_XBUTTONDOWN
 #define WM_XBUTTONDOWN 523
@@ -142,6 +137,9 @@
 #include <errno.h>
 #if defined(XWIN_MULTIWINDOWEXTWM) || defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW)
 #define HANDLE void *
+#ifdef _MSC_VER
+typedef int pid_t;
+#endif
 #include <pthread.h>
 #undef HANDLE
 #endif
@@ -206,43 +204,6 @@
 #include "winwindow.h"
 #include "winmsg.h"
 
-/*
- * Debugging macros
- */
-
-#if CYGDEBUG
-#define DEBUG_MSG(str,...) \
-if (fDebugProcMsg) \
-{ \
-  char *pszTemp; \
-  int iLength; \
-  if (asprintf (&pszTemp, str, ##__VA_ARGS__) != -1) { \
-    MessageBox (NULL, pszTemp, szFunctionName, MB_OK); \
-    free (pszTemp); \
-  } \
-}
-#else
-#define DEBUG_MSG(str,...)
-#endif
-
-#if CYGDEBUG
-#define DEBUG_FN_NAME(str) PTSTR szFunctionName = str
-#else
-#define DEBUG_FN_NAME(str)
-#endif
-
-#if CYGDEBUG || YES
-#define DEBUGVARS BOOL fDebugProcMsg = FALSE
-#else
-#define DEBUGVARS
-#endif
-
-#if CYGDEBUG || YES
-#define DEBUGPROC_MSG fDebugProcMsg = TRUE
-#else
-#define DEBUGPROC_MSG
-#endif
-
 #define PROFILEPOINT(point,thresh)\
 {\
 static unsigned int PROFPT##point = 0;\
@@ -423,9 +384,11 @@ typedef struct {
     Bool fDecoration;
 #ifdef XWIN_MULTIWINDOWEXTWM
     Bool fMWExtWM;
-    Bool fInternalWM;
     Bool fAnotherWMRunning;
 #endif
+#ifdef XWIN_MULTIWINDOWINTWM
+  Bool			fInternalWM;
+#endif
     Bool fRootless;
 #ifdef XWIN_MULTIWINDOW
     Bool fMultiWindow;
@@ -494,17 +457,19 @@ typedef struct _winPrivScreenRec {
 
     /* Privates used by shadow fb and primary fb DirectDraw servers */
     LPDIRECTDRAW pdd;
-    LPDIRECTDRAWSURFACE2 pddsPrimary;
+    LPDIRECTDRAWSURFACE	pddsPrimary;
     LPDIRECTDRAW2 pdd2;
 
     /* Privates used by shadow fb DirectDraw server */
-    LPDIRECTDRAWSURFACE2 pddsShadow;
+    LPDIRECTDRAWSURFACE	pddsShadow;
     LPDDSURFACEDESC pddsdShadow;
 
+#ifdef XWIN_PRIMARYFB
     /* Privates used by primary fb DirectDraw server */
-    LPDIRECTDRAWSURFACE2 pddsOffscreen;
+    LPDIRECTDRAWSURFACE	pddsOffscreen;
     LPDDSURFACEDESC pddsdOffscreen;
     LPDDSURFACEDESC pddsdPrimary;
+#endif
 
     /* Privates used by shadow fb DirectDraw Nonlocking server */
     LPDIRECTDRAW4 pdd4;
@@ -798,7 +763,7 @@ Bool
  winInitClipboard(void);
 
 void
- winFixClipboardChain(void);
+ winFixClipboardChain (int Removed);
 #endif
 
 /*
@@ -825,6 +790,9 @@ Bool
  * windialogs.c
  */
 
+int
+GetLiveClients (winPrivScreenPtr pScreenPriv);
+
 void
  winDisplayExitDialog(winPrivScreenPtr pScreenPriv);
 
@@ -1244,7 +1212,7 @@ winTopLevelWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
  */
 
 void
- winInitNotifyIcon(winPrivScreenPtr pScreenPriv);
+ winInitNotifyIcon (winPrivScreenPtr pScreenPriv, Bool Modify);
 
 void
  winDeleteNotifyIcon(winPrivScreenPtr pScreenPriv);
@@ -1341,22 +1309,19 @@ void
  winMWExtWMMoveResizeXWindow(WindowPtr pWin, int x, int y, int w, int h);
 
 void
- winMWExtWMUpdateIcon(Window id);
-
-void
 
 winMWExtWMUpdateWindowDecoration(win32RootlessWindowPtr pRLWinPriv,
                                  winScreenInfoPtr pScreenInfo);
 
 wBOOL CALLBACK winMWExtWMDecorateWindow(HWND hwnd, LPARAM lParam);
 
-Bool
- winIsInternalWMRunning(winScreenInfoPtr pScreenInfo);
-
 void
  winMWExtWMRestackWindows(ScreenPtr pScreen);
 #endif
-
+#ifdef XWIN_MULTIWINDOWINTWM
+Bool
+ winIsInternalWMRunning (winScreenInfoPtr pScreenInfo);
+#endif
 #ifdef XWIN_MULTIWINDOWEXTWM
 /*
  * winwin32rootlesswndproc.c
@@ -1392,6 +1357,13 @@ void
  winInitializeScreens(int maxscreens);
 
 /*
+ * windisplay.c
+ */
+
+void
+winGetDisplayName(char *szDisplay, unsigned int screen);
+
+/*
  * winrandr.c
  */
 Bool
diff --git a/xorg-server/hw/xwin/winallpriv.c b/xorg-server/hw/xwin/winallpriv.c
index cc3b3d1ba..248d03658 100644
--- a/xorg-server/hw/xwin/winallpriv.c
+++ b/xorg-server/hw/xwin/winallpriv.c
@@ -47,10 +47,8 @@ winAllocatePrivates(ScreenPtr pScreen)
 {
     winPrivScreenPtr pScreenPriv;
 
-#if CYGDEBUG
     winDebug("winAllocateScreenPrivates - g_ulServerGeneration: %d "
              "serverGeneration: %d\n", g_ulServerGeneration, serverGeneration);
-#endif
 
     /* We need a new slot for our privates if the screen gen has changed */
     if (g_ulServerGeneration != serverGeneration) {
@@ -72,7 +70,7 @@ winAllocatePrivates(ScreenPtr pScreen)
 
     /* Register our screen private */
     if (!dixRegisterPrivateKey(g_iScreenPrivateKey, PRIVATE_SCREEN, 0)) {
-        ErrorF("winAllocatePrivates - AllocateScreenPrivate () failed\n");
+        ErrorF ("winAllocatePrivates - dixRegisterPrivateKey () failed\n");
         return FALSE;
     }
 
@@ -112,9 +110,7 @@ winAllocatePrivates(ScreenPtr pScreen)
 Bool
 winInitCmapPrivates(ColormapPtr pcmap, int i)
 {
-#if CYGDEBUG
     winDebug("winInitCmapPrivates\n");
-#endif
 
     /*
      * I see no way that this function can do anything useful
@@ -139,9 +135,7 @@ winAllocateCmapPrivates(ColormapPtr pCmap)
     winPrivCmapPtr pCmapPriv;
     static unsigned long s_ulPrivateGeneration = 0;
 
-#if CYGDEBUG
     winDebug("winAllocateCmapPrivates\n");
-#endif
 
     /* Get a new privates index when the server generation changes */
     if (s_ulPrivateGeneration != serverGeneration) {
@@ -168,9 +162,7 @@ winAllocateCmapPrivates(ColormapPtr pCmap)
     /* Save the cmap private pointer */
     winSetCmapPriv(pCmap, pCmapPriv);
 
-#if CYGDEBUG
     winDebug("winAllocateCmapPrivates - Returning\n");
-#endif
 
     return TRUE;
 }
diff --git a/xorg-server/hw/xwin/winauth.c b/xorg-server/hw/xwin/winauth.c
index 25d1fbd62..18e370ef7 100644
--- a/xorg-server/hw/xwin/winauth.c
+++ b/xorg-server/hw/xwin/winauth.c
@@ -32,6 +32,10 @@
 #include <xwin-config.h>
 #endif
 
+#define GC X11_GC  /* To avoid compilation errors later when including win.h (which also defines the GC type) */
+#include <X11/Xlib.h>
+#undef GC
+
 #include "win.h"
 
 /* Includes for authorization */
@@ -55,16 +59,29 @@ static char *g_pAuthData = NULL;
  * Code to generate a MIT-MAGIC-COOKIE-1, copied from under XCSECURITY
  */
 
+
+
 #ifndef XCSECURITY
 static
     void
 GenerateRandomData(int len, char *buf)
 {
     int fd;
-
+#ifdef _MSC_VER
+    static HANDLE hAdvApi32;
+    static BOOLEAN (_stdcall * RtlGenRandom)(void *,unsigned long);
+
+    if (!hAdvApi32)
+    {
+      hAdvApi32=LoadLibrary("advapi32.dll");
+      RtlGenRandom=(BOOLEAN (_stdcall *)(void*,unsigned long))GetProcAddress(hAdvApi32,"SystemFunction036");
+    }
+    RtlGenRandom(buf, len);
+#else
     fd = open("/dev/urandom", O_RDONLY);
     read(fd, buf, len);
     close(fd);
+#endif
 }
 
 static char cookie[16];         /* 128 bits */
@@ -115,7 +132,6 @@ GenerateAuthorization(unsigned name_length,
 Bool
 winGenerateAuthorization(void)
 {
-    Bool fFreeAuth = FALSE;
     SecurityAuthorizationPtr pAuth = NULL;
 
     /* Call OS layer to generate authorization key */
@@ -126,12 +142,13 @@ winGenerateAuthorization(void)
         ErrorF("winGenerateAuthorization - GenerateAuthorization failed\n");
         goto auth_bailout;
     }
-
+#ifdef WINDBG
     else {
         winDebug("winGenerateAuthorization - GenerateAuthorization success!\n"
                  "AuthDataLen: %d AuthData: %s\n",
                  g_uiAuthDataLen, g_pAuthData);
     }
+#endif
 
 #ifdef XCSECURITY
     /* Allocate structure for additional auth information */
@@ -156,19 +173,16 @@ winGenerateAuthorization(void)
     /* Add the authorization to the server's auth list */
     if (!AddResource(g_authId, SecurityAuthorizationResType, pAuth)) {
         ErrorF("winGenerateAuthorization - AddResource failed for auth.\n");
-        fFreeAuth = TRUE;
         goto auth_bailout;
     }
 
     /* Don't free the auth data, since it is still used internally */
-    pAuth = NULL;
 #endif
 
     return TRUE;
 
  auth_bailout:
-    if (fFreeAuth)
-        free(pAuth);
+    free(pAuth);
 
     return FALSE;
 }
@@ -177,6 +191,7 @@ winGenerateAuthorization(void)
 void
 winSetAuthorization(void)
 {
+  if (g_pAuthData)
     XSetAuthorization(AUTH_NAME,
                       strlen(AUTH_NAME), g_pAuthData, g_uiAuthDataLen);
 }
diff --git a/xorg-server/hw/xwin/winclip.c b/xorg-server/hw/xwin/winclip.c
index 941e9483a..6862603ba 100644
--- a/xorg-server/hw/xwin/winclip.c
+++ b/xorg-server/hw/xwin/winclip.c
@@ -37,6 +37,6 @@
 RegionPtr
 winPixmapToRegionNativeGDI(PixmapPtr pPix)
 {
-    ErrorF("winPixmapToRegion()\n");
+    winDebug("winPixmapToRegion()\n");
     return NULL;
 }
diff --git a/xorg-server/hw/xwin/winclipboard.h b/xorg-server/hw/xwin/winclipboard.h
index 2cd775d6b..7d5db98fe 100644
--- a/xorg-server/hw/xwin/winclipboard.h
+++ b/xorg-server/hw/xwin/winclipboard.h
@@ -34,7 +34,9 @@
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
+#ifndef _MSC_VER
 #include <unistd.h>
+#endif
 #ifdef __CYGWIN__
 #include <sys/select.h>
 #else
@@ -42,6 +44,9 @@
 #endif
 #include <fcntl.h>
 #include <setjmp.h>
+#ifdef _MSC_VER
+typedef int pid_t;
+#endif
 #include <pthread.h>
 
 /* X headers */
@@ -49,7 +54,6 @@
 #include <X11/Xatom.h>
 #include <X11/Xproto.h>
 #include <X11/Xutil.h>
-#include <X11/Xlocale.h>
 
 /* Windows headers */
 #include <X11/Xwindows.h>
@@ -69,19 +73,14 @@
 #define WIN_XEVENTS_SHUTDOWN			1
 #define WIN_XEVENTS_CONVERT			2
 #define WIN_XEVENTS_NOTIFY			3
-#define WIN_CLIPBOARD_RETRIES			40
-#define WIN_CLIPBOARD_DELAY			1
 
-#define WM_WM_REINIT                           (WM_USER + 1)
+#include "winmsg.h"
 
 /*
  * References to external symbols
  */
 
 extern char *display;
-extern void winDebug(const char *format, ...);
-extern void winErrorFVerb(int verb, const char *format, ...);
-
 /*
  * winclipboardinit.c
  */
@@ -126,5 +125,5 @@ winClipboardWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
 int
 
 winClipboardFlushXEvents(HWND hwnd,
-                         int iWindow, Display * pDisplay, Bool fUnicodeSupport);
+                         int iWindow, Display * pDisplay, Bool fUnicodeSupport, Bool ClipboardOpened);
 #endif
diff --git a/xorg-server/hw/xwin/winclipboardinit.c b/xorg-server/hw/xwin/winclipboardinit.c
index 304e6df9f..90fcf0086 100644
--- a/xorg-server/hw/xwin/winclipboardinit.c
+++ b/xorg-server/hw/xwin/winclipboardinit.c
@@ -33,6 +33,9 @@
 #endif
 #include "dixstruct.h"
 #include "winclipboard.h"
+#include "objbase.h"
+#include "ddraw.h"
+#include "winwindow.h"
 
 /*
  * Local typedefs
@@ -126,9 +129,9 @@ winClipboardCreateMessagingWindow(void)
 }
 
 void
-winFixClipboardChain(void)
+winFixClipboardChain(int Removed)
 {
     if (g_fClipboard && g_hwndClipboard) {
-        PostMessage(g_hwndClipboard, WM_WM_REINIT, 0, 0);
+        PostMessage (g_hwndClipboard, WM_WM_REINIT, Removed, 0);
     }
 }
diff --git a/xorg-server/hw/xwin/winclipboardthread.c b/xorg-server/hw/xwin/winclipboardthread.c
index c8508a9b8..5a6328c8f 100644
--- a/xorg-server/hw/xwin/winclipboardthread.c
+++ b/xorg-server/hw/xwin/winclipboardthread.c
@@ -42,25 +42,28 @@
 #include <errno.h>
 #endif
 #include "misc.h"
+#include "winmsg.h"
 
+#ifdef _MSC_VER
+#define snprintf _snprintf
+#endif
 /*
  * References to external symbols
  */
 
 extern Bool g_fUnicodeClipboard;
 extern Bool g_fClipboardStarted;
-extern Bool g_fClipboardLaunched;
-extern Bool g_fClipboard;
+extern Bool	g_fClipboardLaunched;
 extern HWND g_hwndClipboard;
 extern void *g_pClipboardDisplay;
 extern Window g_iClipboardWindow;
+extern Bool		g_fClipboardPrimary;
 
 /*
  * Global variables
  */
 
 static jmp_buf g_jmpEntry;
-static int clipboardRestarts = 0;
 static XIOErrorHandler g_winClipboardOldIOErrorHandler;
 static pthread_t g_winClipboardProcThread;
 
@@ -76,6 +79,8 @@ static int
 static int
  winClipboardIOErrorHandler(Display * pDisplay);
 
+static void
+winClipboardThreadExit(void *arg);
 /*
  * Main thread function
  */
@@ -102,8 +107,9 @@ winClipboardProc(void *pvNotUsed)
     char szDisplay[512];
     int iSelectError;
 
-    winDebug("winClipboardProc - Hello\n");
-    ++clipboardRestarts;
+    pthread_cleanup_push(&winClipboardThreadExit, NULL);
+
+    winDebug ("winClipboardProc - Hello\n");
 
     /* Do we use Unicode clipboard? */
     fUseUnicode = g_fUnicodeClipboard;
@@ -111,16 +117,11 @@ winClipboardProc(void *pvNotUsed)
     /* Save the Unicode support flag in a global */
     g_fUseUnicode = fUseUnicode;
 
-    /* Allow multiple threads to access Xlib */
-    if (XInitThreads() == 0) {
-        ErrorF("winClipboardProc - XInitThreads failed.\n");
-        goto winClipboardProc_Exit;
-    }
-
-    /* See if X supports the current locale */
-    if (XSupportsLocale() == False) {
-        ErrorF("winClipboardProc - Warning: Locale not supported by X.\n");
-    }
+    /* Create Windows messaging window */
+    hwnd = winClipboardCreateMessagingWindow ();
+  
+    /* Save copy of HWND in screen privates */
+    g_hwndClipboard = hwnd;
 
     /* Set error handler */
     XSetErrorHandler(winClipboardErrorHandler);
@@ -135,12 +136,11 @@ winClipboardProc(void *pvNotUsed)
     if (iReturn != WIN_JMP_ERROR_IO && iReturn != WIN_JMP_OKAY) {
         /* setjmp returned an unknown value, exit */
         ErrorF("winClipboardProc - setjmp returned: %d exiting\n", iReturn);
-        goto winClipboardProc_Exit;
+        goto thread_errorexit;
     }
     else if (iReturn == WIN_JMP_ERROR_IO) {
         /* TODO: Cleanup the Win32 window and free any allocated memory */
         ErrorF("winClipboardProc - setjmp returned for IO Error Handler.\n");
-        pthread_exit(NULL);
     }
 
     /* Use our generated cookie for authentication */
@@ -157,10 +157,10 @@ winClipboardProc(void *pvNotUsed)
      * for all screens on the display.  That is why there is only
      * one clipboard client thread.
      */
-    snprintf(szDisplay, 512, "127.0.0.1:%s.0", display);
+    winGetDisplayName(szDisplay,0);
 
     /* Print the display connection string */
-    ErrorF("winClipboardProc - DISPLAY=%s\n", szDisplay);
+    winDebug ("winClipboardProc - DISPLAY=%s\n", szDisplay);
 
     /* Open the X display */
     do {
@@ -180,24 +180,26 @@ winClipboardProc(void *pvNotUsed)
     /* Make sure that the display opened */
     if (pDisplay == NULL) {
         ErrorF("winClipboardProc - Failed opening the display, giving up\n");
-        goto winClipboardProc_Done;
+        goto thread_errorexit;
     }
 
     /* Save the display in the screen privates */
     g_pClipboardDisplay = pDisplay;
 
-    ErrorF("winClipboardProc - XOpenDisplay () returned and "
+    winDebug ("winClipboardProc - XOpenDisplay () returned and "
            "successfully opened the display.\n");
 
     /* Get our connection number */
     iConnectionNumber = ConnectionNumber(pDisplay);
 
+    winDebug("Clipboard is using socket %d\n",iConnectionNumber);
+
 #ifdef HAS_DEVWINDOWS
     /* Open a file descriptor for the windows message queue */
-    fdMessageQueue = open(WIN_MSG_QUEUE_FNAME, O_RDONLY);
+    fdMessageQueue = open (WIN_MSG_QUEUE_FNAME, _O_RDONLY);
     if (fdMessageQueue == -1) {
         ErrorF("winClipboardProc - Failed opening %s\n", WIN_MSG_QUEUE_FNAME);
-        goto winClipboardProc_Done;
+      goto thread_errorexit;
     }
 
     /* Find max of our file descriptors */
@@ -209,6 +211,10 @@ winClipboardProc(void *pvNotUsed)
     /* Create atoms */
     atomClipboard = XInternAtom(pDisplay, "CLIPBOARD", False);
     atomClipboardManager = XInternAtom(pDisplay, "CLIPBOARD_MANAGER", False);
+    XInternAtom (pDisplay, WIN_LOCAL_PROPERTY, False);
+    XInternAtom (pDisplay, "UTF8_STRING", False);
+    XInternAtom (pDisplay, "COMPOUND_TEXT", False);
+    XInternAtom (pDisplay, "TARGETS", False);
 
     /* Create a messaging window */
     iWindow = XCreateSimpleWindow(pDisplay,
@@ -220,7 +226,7 @@ winClipboardProc(void *pvNotUsed)
                                   BlackPixel(pDisplay, 0));
     if (iWindow == 0) {
         ErrorF("winClipboardProc - Could not create an X window.\n");
-        goto winClipboardProc_Done;
+        goto thread_errorexit;
     }
 
     XStoreName(pDisplay, iWindow, "xwinclip");
@@ -233,30 +239,30 @@ winClipboardProc(void *pvNotUsed)
     /* Save the window in the screen privates */
     g_iClipboardWindow = iWindow;
 
-    /* Create Windows messaging window */
-    hwnd = winClipboardCreateMessagingWindow();
-
-    /* Save copy of HWND in screen privates */
-    g_hwndClipboard = hwnd;
-
     /* Assert ownership of selections if Win32 clipboard is owned */
     if (NULL != GetClipboardOwner()) {
-        /* PRIMARY */
-        iReturn = XSetSelectionOwner(pDisplay, XA_PRIMARY,
-                                     iWindow, CurrentTime);
-        if (iReturn == BadAtom || iReturn == BadWindow ||
-            XGetSelectionOwner(pDisplay, XA_PRIMARY) != iWindow) {
-            ErrorF("winClipboardProc - Could not set PRIMARY owner\n");
-            goto winClipboardProc_Done;
-        }
+      if (g_fClipboardPrimary)
+      {
+	      /* PRIMARY */
+        winDebug("winClipboardProc - asserted ownership.\n");
+        iReturn = XSetSelectionOwner (pDisplay, XA_PRIMARY,
+				                              iWindow, CurrentTime);
+        if (iReturn == BadAtom || iReturn == BadWindow /*||
+	          XGetSelectionOwner (pDisplay, XA_PRIMARY) != iWindow*/)
+	      {
+	          ErrorF ("winClipboardProc - Could not set PRIMARY owner\n");
+            goto thread_errorexit;
+	      }
+      }
 
         /* CLIPBOARD */
         iReturn = XSetSelectionOwner(pDisplay, atomClipboard,
                                      iWindow, CurrentTime);
-        if (iReturn == BadAtom || iReturn == BadWindow ||
-            XGetSelectionOwner(pDisplay, atomClipboard) != iWindow) {
-            ErrorF("winClipboardProc - Could not set CLIPBOARD owner\n");
-            goto winClipboardProc_Done;
+      if (iReturn == BadAtom || iReturn == BadWindow /*||
+	        XGetSelectionOwner (pDisplay, atomClipboard) != iWindow*/)
+	      {
+	          ErrorF ("winClipboardProc - Could not set CLIPBOARD owner\n");
+            goto thread_errorexit;
         }
     }
 
@@ -266,12 +272,17 @@ winClipboardProc(void *pvNotUsed)
      *       because there may be events in local data structures
      *       already.
      */
-    winClipboardFlushXEvents(hwnd, iWindow, pDisplay, fUseUnicode);
+    //winClipboardFlushXEvents(hwnd, iWindow, pDisplay, fUseUnicode);
 
     /* Pre-flush Windows messages */
+    winDebug ("Start flushing \n");
     if (!winClipboardFlushWindowsMessageQueue(hwnd))
-        return 0;
+    {
+      ErrorF ("winClipboardFlushWindowsMessageQueue - returned 0\n");
+      goto thread_errorexit;
+    }
 
+    winDebug ("winClipboardProc - Started\n");
     /* Signal that the clipboard client has started */
     g_fClipboardStarted = TRUE;
 
@@ -324,17 +335,19 @@ winClipboardProc(void *pvNotUsed)
         }
 
         /* Branch on which descriptor became active */
-        if (FD_ISSET(iConnectionNumber, &fdsRead)) {
+//      if (FD_ISSET (iConnectionNumber, &fdsRead))
+//	{ Also do it when no read since winClipboardFlushXEvents
+//    is sending the output.
             /* Process X events */
             /* Exit when we see that server is shutting down */
             iReturn = winClipboardFlushXEvents(hwnd,
-                                               iWindow, pDisplay, fUseUnicode);
+                                               iWindow, pDisplay, fUseUnicode, FALSE);
             if (WIN_XEVENTS_SHUTDOWN == iReturn) {
                 ErrorF("winClipboardProc - winClipboardFlushXEvents "
                        "trapped shutdown event, exiting main loop.\n");
                 break;
             }
-        }
+//	}
 
 #ifdef HAS_DEVWINDOWS
         /* Check for Windows event ready */
@@ -353,26 +366,15 @@ winClipboardProc(void *pvNotUsed)
         }
     }
 
- winClipboardProc_Exit:
-    /* disable the clipboard, which means the thread will die */
-    g_fClipboard = FALSE;
-
- winClipboardProc_Done:
-    /* Close our Windows window */
-    if (g_hwndClipboard) {
-        /* Destroy the Window window (hwnd) */
-        winDebug("winClipboardProc - Destroy Windows window\n");
-        PostMessage(g_hwndClipboard, WM_DESTROY, 0, 0);
-        winClipboardFlushWindowsMessageQueue(g_hwndClipboard);
-    }
-
     /* Close our X window */
     if (pDisplay && iWindow) {
         iReturn = XDestroyWindow(pDisplay, iWindow);
         if (iReturn == BadWindow)
             ErrorF("winClipboardProc - XDestroyWindow returned BadWindow.\n");
+#ifdef WINDBG
         else
-            ErrorF("winClipboardProc - XDestroyWindow succeeded.\n");
+            winDebug("winClipboardProc - XDestroyWindow succeeded.\n");
+#endif
     }
 
 #ifdef HAS_DEVWINDOWS
@@ -399,41 +401,28 @@ winClipboardProc(void *pvNotUsed)
     }
 #endif
 
-    /* global clipboard variable reset */
-    g_fClipboardLaunched = FALSE;
-    g_fClipboardStarted = FALSE;
-    g_iClipboardWindow = None;
-    g_pClipboardDisplay = NULL;
-    g_hwndClipboard = NULL;
-
-    /* checking if we need to restart */
-    if (clipboardRestarts >= WIN_CLIPBOARD_RETRIES) {
-        /* terminates clipboard thread but the main server still lives */
-        ErrorF
-            ("winClipboardProc - the clipboard thread has restarted %d times and seems to be unstable, disabling clipboard integration\n",
-             clipboardRestarts);
-        g_fClipboard = FALSE;
-        return NULL;
-    }
+  goto commonexit;
+
+thread_errorexit:
+  if (g_pClipboardDisplay && g_iClipboardWindow)
+  {
+    iReturn = XDestroyWindow (g_pClipboardDisplay, g_iClipboardWindow);
+    if (iReturn == BadWindow)
+	    ErrorF ("winClipboardProc - XDestroyWindow returned BadWindow.\n");
+#ifdef WINDBG
+    else
+	    winDebug ("winClipboardProc - XDestroyWindow succeeded.\n");
+#endif
+  }
+  winDebug ("Clipboard thread died.\n");
 
-    if (g_fClipboard) {
-        sleep(WIN_CLIPBOARD_DELAY);
-        ErrorF("winClipboardProc - trying to restart clipboard thread \n");
-        /* Create the clipboard client thread */
-        if (!winInitClipboard()) {
-            ErrorF("winClipboardProc - winClipboardInit failed.\n");
-            return NULL;
-        }
+commonexit:
+  g_iClipboardWindow = None;
+  g_pClipboardDisplay = NULL;
+  g_fClipboardLaunched = FALSE;
+  g_fClipboardStarted = FALSE;
 
-        winDebug("winClipboardProc - winInitClipboard returned.\n");
-        /* Flag that clipboard client has been launched */
-        g_fClipboardLaunched = TRUE;
-    }
-    else {
-        ErrorF("winClipboardProc - Clipboard disabled  - Exit from server \n");
-        /* clipboard thread has exited, stop server as well */
-        raise(SIGTERM);
-    }
+  pthread_cleanup_pop(0);
 
     return NULL;
 }
@@ -449,8 +438,17 @@ winClipboardErrorHandler(Display * pDisplay, XErrorEvent * pErr)
 
     XGetErrorText(pDisplay, pErr->error_code, pszErrorMsg, sizeof(pszErrorMsg));
     ErrorF("winClipboardErrorHandler - ERROR: \n\t%s\n"
-           "\tSerial: %lu, Request Code: %d, Minor Code: %d\n",
-           pszErrorMsg, pErr->serial, pErr->request_code, pErr->minor_code);
+          "  errorCode %d\n"
+          "  serial %lu\n"
+          "  resourceID 0x%x\n"
+          "  majorCode %d\n"
+          "  minorCode %d\n"
+          , pszErrorMsg
+          , pErr->error_code
+          , pErr->serial
+          , pErr->resourceid
+          , pErr->request_code
+          , pErr->minor_code);
     return 0;
 }
 
@@ -473,3 +471,15 @@ winClipboardIOErrorHandler(Display * pDisplay)
 
     return 0;
 }
+
+/*
+ * winClipboardThreadExit - Thread exit handler
+ */
+
+static void
+winClipboardThreadExit(void *arg)
+{
+  /* clipboard thread has exited, stop server as well */
+  AbortDDX(EXIT_ERR_ABORT);
+  TerminateProcess(GetCurrentProcess(),1);
+}
diff --git a/xorg-server/hw/xwin/winclipboardwndproc.c b/xorg-server/hw/xwin/winclipboardwndproc.c
index e19f678a7..28348ac45 100644
--- a/xorg-server/hw/xwin/winclipboardwndproc.c
+++ b/xorg-server/hw/xwin/winclipboardwndproc.c
@@ -26,7 +26,7 @@
  *the sale, use or other dealings in this Software without prior written
  *authorization from the copyright holder(s) and author(s).
  *
- * Authors:	Harold L Hunt II
+ * Authors:     Harold L Hunt II
  *              Colin Harrison
  */
 
@@ -37,12 +37,16 @@
 #include <sys/time.h>
 #include "winclipboard.h"
 #include "misc.h"
+#include "winmsg.h"
+#include "objbase.h"
+#include "ddraw.h"
+#include "winwindow.h"
 
 /*
  * Constants
  */
 
-#define WIN_POLL_TIMEOUT	1
+#define WIN_POLL_TIMEOUT        1
 
 /*
  * References to external symbols
@@ -52,8 +56,10 @@ extern Bool g_fUseUnicode;
 extern void *g_pClipboardDisplay;
 extern Window g_iClipboardWindow;
 extern Atom g_atomLastOwnedSelection;
-
-/* 
+extern Bool g_fClipboardStarted;
+extern HWND g_hwndClipboard;
+extern Bool g_fClipboardPrimary;
+/*
  * Local function prototypes
  */
 
@@ -76,8 +82,17 @@ winProcessXEventsTimeout(HWND hwnd, int iWindow, Display * pDisplay,
     int iReturn;
     DWORD dwStopTime = GetTickCount() + iTimeoutSec * 1000;
 
-    winDebug("winProcessXEventsTimeout () - pumping X events for %d seconds\n",
-             iTimeoutSec);
+  /* Make sure the output messages are sent before waiting on a response. */
+  iReturn = winClipboardFlushXEvents (hwnd,
+                                      iWindow,
+                                      pDisplay,
+                                      fUseUnicode,
+                                      TRUE);
+  if (WIN_XEVENTS_NOTIFY == iReturn)
+    {
+      /* Bail out if notify processed */
+      return iReturn;
+    }
 
     /* Get our connection number */
     iConnNumber = ConnectionNumber(pDisplay);
@@ -87,9 +102,6 @@ winProcessXEventsTimeout(HWND hwnd, int iWindow, Display * pDisplay,
         fd_set fdsRead;
         long remainingTime;
 
-        /* We need to ensure that all pending events are processed */
-        XSync(pDisplay, FALSE);
-
         /* Setup the file descriptor set */
         FD_ZERO(&fdsRead);
         FD_SET(iConnNumber, &fdsRead);
@@ -112,8 +124,8 @@ winProcessXEventsTimeout(HWND hwnd, int iWindow, Display * pDisplay,
                          NULL,  /* No exception mask */
                          &tv);  /* Timeout */
         if (iReturn < 0) {
-            ErrorF("winProcessXEventsTimeout - Call to select () failed: %d.  "
-                   "Bailing.\n", iReturn);
+            ErrorF("winProcessXEventsTimeout - Call to select () failed: %d (%x).  "
+                   "Bailing.\n", iReturn, WSAGetLastError());
             break;
         }
 
@@ -122,7 +134,7 @@ winProcessXEventsTimeout(HWND hwnd, int iWindow, Display * pDisplay,
             /* Process X events */
             /* Exit when we see that server is shutting down */
             iReturn = winClipboardFlushXEvents(hwnd,
-                                               iWindow, pDisplay, fUseUnicode);
+                                               iWindow, pDisplay, fUseUnicode, TRUE);
 
             winDebug
                 ("winProcessXEventsTimeout () - winClipboardFlushXEvents returned %d\n",
@@ -149,7 +161,6 @@ LRESULT CALLBACK
 winClipboardWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
     static HWND s_hwndNextViewer;
-    static Bool s_fCBCInitialized;
 
     /* Branch on message type */
     switch (message) {
@@ -161,7 +172,7 @@ winClipboardWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
         ChangeClipboardChain(hwnd, s_hwndNextViewer);
 
         s_hwndNextViewer = NULL;
-
+        g_hwndClipboard = NULL;
         PostQuitMessage(0);
     }
         return 0;
@@ -173,16 +184,16 @@ winClipboardWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 
         winDebug("winClipboardWindowProc - WM_CREATE\n");
 
-        first = GetClipboardViewer();   /* Get handle to first viewer in chain. */
-        if (first == hwnd)
-            return 0;           /* Make sure it's not us! */
         /* Add ourselves to the clipboard viewer chain */
-        next = SetClipboardViewer(hwnd);
-        error_code = GetLastError();
-        if (SUCCEEDED(error_code) && (next == first))   /* SetClipboardViewer must have succeeded, and the handle */
-            s_hwndNextViewer = next;    /* it returned must have been the first window in the chain */
-        else
-            s_fCBCInitialized = FALSE;
+        s_hwndNextViewer = SetClipboardViewer (hwnd);
+        #ifdef _DEBUG
+        if (s_hwndNextViewer== hwnd)
+        {
+          ErrorF("WM_CREATE: SetClipboardViewer returned own window. This causes an endless loop, so reset s_hwndNextViewer. ");
+          s_hwndNextViewer=NULL;
+        }
+        #endif
+
     }
         return 0;
 
@@ -195,9 +206,8 @@ winClipboardWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
         if ((HWND) wParam == s_hwndNextViewer) {
             s_hwndNextViewer = (HWND) lParam;
             if (s_hwndNextViewer == hwnd) {
-                s_hwndNextViewer = NULL;
-                winErrorFVerb(1, "winClipboardWindowProc - WM_CHANGECBCHAIN: "
-                              "attempted to set next window to ourselves.");
+              winDebug("WM_CHANGECBCHAIN: trying to set s_hwndNextViewer to own window. Resetting it back to NULL. ");
+              s_hwndNextViewer=NULL;  /* This would cause an endless loop, so break it by ending the loop here. I have seen this happening, why??? */
             }
         }
         else if (s_hwndNextViewer)
@@ -224,30 +234,28 @@ winClipboardWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 
         HWND first, next;
         DWORD error_code = 0;
-
+        if (!g_hwndClipboard)
+          return 0;
         winDebug("winClipboardWindowProc - WM_WM_REINIT: Enter\n");
 
         first = GetClipboardViewer();   /* Get handle to first viewer in chain. */
-        if (first == hwnd)
-            return 0;           /* Make sure it's not us! */
-        winDebug("  WM_WM_REINIT: Replacing us(%x) with %x at head "
-                 "of chain\n", hwnd, s_hwndNextViewer);
-        s_fCBCInitialized = FALSE;
-        ChangeClipboardChain(hwnd, s_hwndNextViewer);
-        s_hwndNextViewer = NULL;
-        s_fCBCInitialized = FALSE;
-        winDebug("  WM_WM_REINIT: Putting us back at head of chain.\n");
-        first = GetClipboardViewer();   /* Get handle to first viewer in chain. */
-        if (first == hwnd)
-            return 0;           /* Make sure it's not us! */
-        next = SetClipboardViewer(hwnd);
-        error_code = GetLastError();
-        if (SUCCEEDED(error_code) && (next == first))   /* SetClipboardViewer must have succeeded, and the handle */
-            s_hwndNextViewer = next;    /* it returned must have been the first window in the chain */
-        else
-            s_fCBCInitialized = FALSE;
+        if (first != hwnd)
+        {
+          winDebug ("  WM_WM_REINIT: Replacing us(%x) with %x at head "
+                    "of chain\n", hwnd, s_hwndNextViewer);
+          if (!wParam) ChangeClipboardChain (hwnd, s_hwndNextViewer);   /* When wParam is set, the window was already removed from the chain */
+          winDebug ("  WM_WM_REINIT: Putting us back at head of chain.\n");
+          s_hwndNextViewer = SetClipboardViewer (hwnd);
+          #ifdef _DEBUG
+          if (s_hwndNextViewer== hwnd)
+          {
+            ErrorF("WM_WM_REINIT: SetClipboardViewer returned own window. This causes an endless loop, so reset s_hwndNextViewer. ");
+            s_hwndNextViewer=NULL;
+          }
+          #endif
+        }
+        winDebug ("winClipboardWindowProc - WM_WM_REINIT: Exit\n");
     }
-        winDebug("winClipboardWindowProc - WM_WM_REINIT: Exit\n");
         return 0;
 
     case WM_DRAWCLIPBOARD:
@@ -259,7 +267,14 @@ winClipboardWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
         Window iWindow = g_iClipboardWindow;
         int iReturn;
 
-        winDebug("winClipboardWindowProc - WM_DRAWCLIPBOARD: Enter\n");
+        winDebug ("winClipboardWindowProc - WM_DRAWCLIPBOARD 0x%x 0x%x 0x%x: Enter\n",hwnd,wParam,lParam);
+
+        if (!g_fClipboardStarted) {
+          winDebug ("winClipboardWindowProc - WM_DRAWCLIPBOARD: Exit with no processing\n");
+          if (s_hwndNextViewer)
+            SendMessage (s_hwndNextViewer, message, wParam, lParam);
+          return 0;
+        }
 
         if (generation != serverGeneration) {
             generation = serverGeneration;
@@ -275,44 +290,15 @@ winClipboardWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
         }
         else {
             /* Attempt to break the nesting by getting out of the chain, twice?, and then fix and bail */
-            s_fCBCInitialized = FALSE;
             ChangeClipboardChain(hwnd, s_hwndNextViewer);
-            winFixClipboardChain();
-            winErrorFVerb(1, "winClipboardWindowProc - WM_DRAWCLIPBOARD - "
+            winFixClipboardChain(1);
+            ErrorF ("winClipboardWindowProc - WM_DRAWCLIPBOARD - "
                           "Nested calls detected.  Re-initing.\n");
             winDebug("winClipboardWindowProc - WM_DRAWCLIPBOARD: Exit\n");
             s_fProcessingDrawClipboard = FALSE;
             return 0;
         }
 
-        /* Bail on first message */
-        if (!s_fCBCInitialized) {
-            s_fCBCInitialized = TRUE;
-            s_fProcessingDrawClipboard = FALSE;
-            winDebug("winClipboardWindowProc - WM_DRAWCLIPBOARD: Exit\n");
-            return 0;
-        }
-
-        /*
-         * NOTE: We cannot bail out when NULL == GetClipboardOwner ()
-         * because some applications deal with the clipboard in a manner
-         * that causes the clipboard owner to be NULL when they are in
-         * fact taking ownership.  One example of this is the Win32
-         * native compile of emacs.
-         */
-
-        /* Bail when we still own the clipboard */
-        if (hwnd == GetClipboardOwner()) {
-
-            winDebug("winClipboardWindowProc - WM_DRAWCLIPBOARD - "
-                     "We own the clipboard, returning.\n");
-            winDebug("winClipboardWindowProc - WM_DRAWCLIPBOARD: Exit\n");
-            s_fProcessingDrawClipboard = FALSE;
-            if (s_hwndNextViewer)
-                SendMessage(s_hwndNextViewer, message, wParam, lParam);
-            return 0;
-        }
-
         /*
          * Do not take ownership of the X11 selections when something
          * other than CF_TEXT or CF_UNICODETEXT has been copied
@@ -331,20 +317,20 @@ winClipboardWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
              */
             XSync(pDisplay, FALSE);
 
-            winDebug("winClipboardWindowProc - XSync done.\n");
-
-            /* Release PRIMARY selection if owned */
-            iReturn = XGetSelectionOwner(pDisplay, XA_PRIMARY);
-            if (iReturn == g_iClipboardWindow) {
-                winDebug("winClipboardWindowProc - WM_DRAWCLIPBOARD - "
-                         "PRIMARY selection is owned by us.\n");
-                XSetSelectionOwner(pDisplay, XA_PRIMARY, None, CurrentTime);
+            if (g_fClipboardPrimary)
+            {
+                /* Release PRIMARY selection if owned */
+              iReturn = XGetSelectionOwner (pDisplay, XA_PRIMARY);
+              if (iReturn == g_iClipboardWindow) {
+                  winDebug ("winClipboardWindowProc - WM_DRAWCLIPBOARD - "
+                            "PRIMARY selection is owned by us.\n");
+                  XSetSelectionOwner (pDisplay, XA_PRIMARY, None, CurrentTime);
+              }
+              else if (BadWindow == iReturn || BadAtom == iReturn)
+                ErrorF ("winClipboardWindowProc - WM_DRAWCLIPBOARD - "
+                        "XGetSelection failed for PRIMARY: %d\n",
+                        iReturn);
             }
-            else if (BadWindow == iReturn || BadAtom == iReturn)
-                winErrorFVerb(1, "winClipboardWindowProc - WM_DRAWCLIPBOARD - "
-                              "XGetSelection failed for PRIMARY: %d\n",
-                              iReturn);
-
             /* Release CLIPBOARD selection if owned */
             iReturn = XGetSelectionOwner(pDisplay, atomClipboard);
             if (iReturn == g_iClipboardWindow) {
@@ -353,7 +339,7 @@ winClipboardWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
                 XSetSelectionOwner(pDisplay, atomClipboard, None, CurrentTime);
             }
             else if (BadWindow == iReturn || BadAtom == iReturn)
-                winErrorFVerb(1, "winClipboardWindowProc - WM_DRAWCLIPBOARD - "
+                ErrorF ("winClipboardWindowProc - WM_DRAWCLIPBOARD - "
                               "XGetSelection failed for CLIPBOARD: %d\n",
                               iReturn);
 
@@ -363,45 +349,48 @@ winClipboardWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
                 SendMessage(s_hwndNextViewer, message, wParam, lParam);
             return 0;
         }
-
-        /* Reassert ownership of PRIMARY */
-        iReturn = XSetSelectionOwner(pDisplay,
-                                     XA_PRIMARY, iWindow, CurrentTime);
-        if (iReturn == BadAtom || iReturn == BadWindow ||
-            XGetSelectionOwner(pDisplay, XA_PRIMARY) != iWindow) {
-            winErrorFVerb(1, "winClipboardWindowProc - WM_DRAWCLIPBOARD - "
-                          "Could not reassert ownership of PRIMARY\n");
-        }
-        else {
-            winDebug("winClipboardWindowProc - WM_DRAWCLIPBOARD - "
-                     "Reasserted ownership of PRIMARY\n");
-        }
-
-        /* Reassert ownership of the CLIPBOARD */
-        iReturn = XSetSelectionOwner(pDisplay,
-                                     atomClipboard, iWindow, CurrentTime);
-
-        if (iReturn == BadAtom || iReturn == BadWindow ||
-            XGetSelectionOwner(pDisplay, atomClipboard) != iWindow) {
-            winErrorFVerb(1, "winClipboardWindowProc - WM_DRAWCLIPBOARD - "
-                          "Could not reassert ownership of CLIPBOARD\n");
-        }
-        else {
-            winDebug("winClipboardWindowProc - WM_DRAWCLIPBOARD - "
-                     "Reasserted ownership of CLIPBOARD\n");
+          /* Only reassert ownership when we did not change the clipboard ourselves */
+        if (hwnd!=(HWND)wParam) {
+          if (g_fClipboardPrimary) {
+                  /* Reassert ownership of PRIMARY */
+            iReturn = XSetSelectionOwner (pDisplay,
+                                          XA_PRIMARY, iWindow, CurrentTime);
+            if (iReturn == BadAtom || iReturn == BadWindow ||
+                XGetSelectionOwner (pDisplay, XA_PRIMARY) != iWindow) {
+                ErrorF ("winClipboardWindowProc - WM_DRAWCLIPBOARD - "
+                        "Could not reassert ownership of PRIMARY\n");
+            }
+            else {
+                winDebug ("winClipboardWindowProc - WM_DRAWCLIPBOARD - "
+                          "Reasserted ownership of PRIMARY\n");
+            }
+          }
+          /* Reassert ownership of the CLIPBOARD */
+          iReturn = XSetSelectionOwner (pDisplay,
+                                        atomClipboard, iWindow, CurrentTime);
+
+          if (iReturn == BadAtom || iReturn == BadWindow ||
+              XGetSelectionOwner (pDisplay, atomClipboard) != iWindow) {
+              ErrorF ("winClipboardWindowProc - WM_DRAWCLIPBOARD - "
+                      "Could not reassert ownership of CLIPBOARD\n");
+          }
+          else {
+              winDebug ("winClipboardWindowProc - WM_DRAWCLIPBOARD - "
+                      "Reasserted ownership of CLIPBOARD\n");
+          }
+
+          /* Flush the pending SetSelectionOwner event now */
+          XFlush (pDisplay);
         }
 
-        /* Flush the pending SetSelectionOwner event now */
-        XFlush(pDisplay);
-
         s_fProcessingDrawClipboard = FALSE;
-    }
         winDebug("winClipboardWindowProc - WM_DRAWCLIPBOARD: Exit\n");
         /* Pass the message on the next window in the clipboard viewer chain */
         if (s_hwndNextViewer)
             SendMessage(s_hwndNextViewer, message, wParam, lParam);
         return 0;
 
+      }
     case WM_DESTROYCLIPBOARD:
         /*
          * NOTE: Intentionally do nothing.
@@ -438,10 +427,10 @@ winClipboardWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
                                     XInternAtom(pDisplay,
                                                 "COMPOUND_TEXT", False),
                                     XInternAtom(pDisplay,
-                                                "CYGX_CUT_BUFFER", False),
+                                                WIN_LOCAL_PROPERTY, False),
                                     iWindow, CurrentTime);
         if (iReturn == BadAtom || iReturn == BadWindow) {
-            winErrorFVerb(1, "winClipboardWindowProc - WM_RENDER*FORMAT - "
+            ErrorF ("winClipboardWindowProc - WM_RENDER*FORMAT - "
                           "XConvertSelection () failed\n");
             break;
         }
@@ -449,23 +438,18 @@ winClipboardWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
         /* Special handling for WM_RENDERALLFORMATS */
         if (message == WM_RENDERALLFORMATS) {
             /* We must open and empty the clipboard */
-
-            /* Close clipboard if we have it open already */
-            if (GetOpenClipboardWindow() == hwnd) {
-                CloseClipboard();
-            }
-
             if (!OpenClipboard(hwnd)) {
-                winErrorFVerb(1, "winClipboardWindowProc - WM_RENDER*FORMATS - "
+                ErrorF ("winClipboardWindowProc - WM_RENDER*FORMATS - "
                               "OpenClipboard () failed: %08x\n",
                               GetLastError());
                 break;
             }
 
             if (!EmptyClipboard()) {
-                winErrorFVerb(1, "winClipboardWindowProc - WM_RENDER*FORMATS - "
+                ErrorF ("winClipboardWindowProc - WM_RENDER*FORMATS - "
                               "EmptyClipboard () failed: %08x\n",
                               GetLastError());
+                CloseClipboard ();
                 break;
             }
         }
@@ -484,6 +468,7 @@ winClipboardWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
          * satisfy the requirement that we write something to it.
          */
         if (WIN_XEVENTS_NOTIFY != iReturn) {
+            ErrorF("winClipboardWindowProc - winProcessXEventsTimeout should have returned WIN_XEVENTS_NOTIFY was %d\n",iReturn);
             /* Paste no data, to satisfy required call to SetClipboardData */
             SetClipboardData(CF_UNICODETEXT, NULL);
             SetClipboardData(CF_TEXT, NULL);
@@ -497,7 +482,7 @@ winClipboardWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
             /* We must close the clipboard */
 
             if (!CloseClipboard()) {
-                winErrorFVerb(1,
+                ErrorF (
                               "winClipboardWindowProc - WM_RENDERALLFORMATS - "
                               "CloseClipboard () failed: %08x\n",
                               GetLastError());
diff --git a/xorg-server/hw/xwin/winclipboardwrappers.c b/xorg-server/hw/xwin/winclipboardwrappers.c
index 008088b6a..09fbfd3aa 100644
--- a/xorg-server/hw/xwin/winclipboardwrappers.c
+++ b/xorg-server/hw/xwin/winclipboardwrappers.c
@@ -64,6 +64,7 @@ extern Bool g_fClipboard;
 extern Window g_iClipboardWindow;
 extern Atom g_atomLastOwnedSelection;
 extern HWND g_hwndClipboard;
+extern Bool		g_fClipboardPrimary;
 
 
 /*
@@ -79,12 +80,14 @@ winProcEstablishConnection(ClientPtr client)
     static int s_iCallCount = 0;
     static unsigned long s_ulServerGeneration = 0;
 
+  #ifdef WINDBG
     if (s_iCallCount == 0)
         winDebug("winProcEstablishConnection - Hello\n");
+  #endif
 
     /* Do nothing if clipboard is not enabled */
     if (!g_fClipboard) {
-        ErrorF("winProcEstablishConnection - Clipboard is not enabled, "
+      winDebug ("winProcEstablishConnection - Clipboard is not enabled, "
                "returning.\n");
 
         /* Unwrap the original function, call it, and return */
@@ -131,7 +134,7 @@ winProcEstablishConnection(ClientPtr client)
 
     /* If the clipboard client has already been started, abort */
     if (g_fClipboardLaunched) {
-        ErrorF("winProcEstablishConnection - Clipboard client already "
+        winDebug ("winProcEstablishConnection - Clipboard client already "
                "launched, returning.\n");
         return iReturn;
     }
@@ -162,7 +165,7 @@ winProcEstablishConnection(ClientPtr client)
             return iReturn;
         }
 
-        ErrorF("winProcEstablishConnection - winInitClipboard returned.\n");
+        winDebug ("winProcEstablishConnection - winInitClipboard returned.\n");
     }
 
     /* Flag that clipboard client has been launched */
@@ -175,14 +178,12 @@ winProcEstablishConnection(ClientPtr client)
  * Wrapper for internal SetSelectionOwner function.
  * Grabs ownership of Windows clipboard when X11 clipboard owner changes.
  */
-
 int
 winProcSetSelectionOwner(ClientPtr client)
 {
     int i;
     DrawablePtr pDrawable;
     WindowPtr pWindow = None;
-    Bool fOwnedToNotOwned = FALSE;
     static Window s_iOwners[CLIP_NUM_SELECTIONS] = { None };
     static unsigned long s_ulServerGeneration = 0;
 
@@ -196,7 +197,7 @@ winProcSetSelectionOwner(ClientPtr client)
     if (s_ulServerGeneration != serverGeneration) {
         /* Save new generation number */
         s_ulServerGeneration = serverGeneration;
-
+                  
         /* Initialize static variables */
         for (i = 0; i < CLIP_NUM_SELECTIONS; ++i)
             s_iOwners[i] = None;
@@ -204,8 +205,8 @@ winProcSetSelectionOwner(ClientPtr client)
 
     /* Abort if clipboard not completely initialized yet */
     if (!g_fClipboardStarted) {
-        /* ErrorF ("winProcSetSelectionOwner - Clipboard not yet started, "
-           "aborting.\n"); */
+        winDebug ("winProcSetSelectionOwner - Clipboard not yet started, "
+                  "aborting.\n");
         goto winProcSetSelectionOwner_Done;
     }
 
@@ -223,11 +224,9 @@ winProcSetSelectionOwner(ClientPtr client)
     /* Now we either have a valid window or None */
 
     /* Save selection owners for monitored selections, ignore other selections */
-    if (XA_PRIMARY == stuff->selection) {
+    if (XA_PRIMARY == stuff->selection && g_fClipboardPrimary) {
         /* Look for owned -> not owned transition */
         if (None == stuff->window && None != s_iOwners[CLIP_OWN_PRIMARY]) {
-            fOwnedToNotOwned = TRUE;
-
             winDebug("winProcSetSelectionOwner - PRIMARY - Going from "
                      "owned to not owned.\n");
 
@@ -241,19 +240,17 @@ winProcSetSelectionOwner(ClientPtr client)
         /* Save new selection owner or None */
         s_iOwners[CLIP_OWN_PRIMARY] = stuff->window;
 
-        winDebug("winProcSetSelectionOwner - PRIMARY - Now owned by: %d\n",
-                 stuff->window);
+        winDebug ("winProcSetSelectionOwner - PRIMARY - Now owned by: 0x%x (clipboard is 0x%x)\n",
+                  stuff->window,g_iClipboardWindow);
     }
     else if (MakeAtom("CLIPBOARD", 9, TRUE) == stuff->selection) {
         /* Look for owned -> not owned transition */
         if (None == stuff->window && None != s_iOwners[CLIP_OWN_CLIPBOARD]) {
-            fOwnedToNotOwned = TRUE;
-
             winDebug("winProcSetSelectionOwner - CLIPBOARD - Going from "
                      "owned to not owned.\n");
 
             /* Adjust last owned selection */
-            if (None != s_iOwners[CLIP_OWN_PRIMARY])
+            if ((None != s_iOwners[CLIP_OWN_PRIMARY]) && g_fClipboardPrimary)
                 g_atomLastOwnedSelection = XA_PRIMARY;
             else
                 g_atomLastOwnedSelection = None;
@@ -262,9 +259,8 @@ winProcSetSelectionOwner(ClientPtr client)
         /* Save new selection owner or None */
         s_iOwners[CLIP_OWN_CLIPBOARD] = stuff->window;
 
-        winDebug("winProcSetSelectionOwner - CLIPBOARD - Now owned by: %d\n",
-                 stuff->window);
-
+        winDebug ("winProcSetSelectionOwner - CLIPBOARD - Now owned by: 0x%x, clipboard is 0x%x\n",
+                  stuff->window,g_iClipboardWindow);
     }
     else
         goto winProcSetSelectionOwner_Done;
@@ -279,40 +275,15 @@ winProcSetSelectionOwner(ClientPtr client)
     if (g_iClipboardWindow == s_iOwners[CLIP_OWN_CLIPBOARD])
         s_iOwners[CLIP_OWN_CLIPBOARD] = None;
 
-    /*
-     * Handle case when selection is being disowned,
-     * WM_DRAWCLIPBOARD did not do the disowning,
-     * both monitored selections are no longer owned,
-     * an owned to not owned transition was detected,
-     * and we currently own the Win32 clipboard.
-     */
-    if (stuff->window == None
-        && s_iOwners[CLIP_OWN_PRIMARY] == None
-        && s_iOwners[CLIP_OWN_CLIPBOARD] == None
-        && fOwnedToNotOwned
-        && g_hwndClipboard != NULL && g_hwndClipboard == GetClipboardOwner()) {
-        winDebug("winProcSetSelectionOwner - We currently own the "
-                 "clipboard and neither the PRIMARY nor the CLIPBOARD "
-                 "selections are owned, releasing ownership of Win32 "
-                 "clipboard.\n");
-
-        /* Release ownership of the Windows clipboard */
-        OpenClipboard(NULL);
-        EmptyClipboard();
-        CloseClipboard();
-
-        goto winProcSetSelectionOwner_Done;
-    }
-
     /* Abort if no window at this point */
     if (None == stuff->window) {
-        winDebug("winProcSetSelectionOwner - No window, returning.\n");
+        winDebug ("winProcSetSelectionOwner - No window, returning.\n");
         goto winProcSetSelectionOwner_Done;
     }
 
     /* Abort if invalid selection */
     if (!ValidAtom(stuff->selection)) {
-        ErrorF("winProcSetSelectionOwner - Found BadAtom, aborting.\n");
+        winDebug ("winProcSetSelectionOwner - Found BadAtom, aborting.\n");
         goto winProcSetSelectionOwner_Done;
     }
 
@@ -321,27 +292,22 @@ winProcSetSelectionOwner(ClientPtr client)
 
     /* Abort if clipboard manager is owning the selection */
     if (pDrawable->id == g_iClipboardWindow) {
-        winDebug("winProcSetSelectionOwner - We changed ownership, "
+        winDebug ("winProcSetSelectionOwner - We changed ownership, "
                  "aborting.\n");
         goto winProcSetSelectionOwner_Done;
     }
 
     /* Abort if root window is taking ownership */
     if (pDrawable->id == 0) {
-        ErrorF("winProcSetSelectionOwner - Root window taking ownership, "
+        winDebug ("winProcSetSelectionOwner - Root window taking ownership, "
                "aborting\n");
         goto winProcSetSelectionOwner_Done;
     }
 
-    /* Close clipboard if we have it open already */
-    if (GetOpenClipboardWindow() == g_hwndClipboard) {
-        CloseClipboard();
-    }
-
     /* Access the Windows clipboard */
     if (!OpenClipboard(g_hwndClipboard)) {
-        ErrorF("winProcSetSelectionOwner - OpenClipboard () failed: %08x\n",
-               (int) GetLastError());
+        ErrorF ("winProcSetSelectionOwner - OpenClipboard () failed: %08x, hwnd: %08x\n",
+                (int) GetLastError (),g_hwndClipboard);
         goto winProcSetSelectionOwner_Done;
     }
 
@@ -349,9 +315,11 @@ winProcSetSelectionOwner(ClientPtr client)
     if (!EmptyClipboard()) {
         ErrorF("winProcSetSelectionOwner - EmptyClipboard () failed: %08x\n",
                (int) GetLastError());
+        CloseClipboard ();
         goto winProcSetSelectionOwner_Done;
     }
 
+    winDebug("winProcSetSelectionOwner - SetClipboardData NULL\n");
     /* Advertise regular text and unicode */
     SetClipboardData(CF_UNICODETEXT, NULL);
     SetClipboardData(CF_TEXT, NULL);
@@ -366,6 +334,6 @@ winProcSetSelectionOwner(ClientPtr client)
         goto winProcSetSelectionOwner_Done;
     }
 
- winProcSetSelectionOwner_Done:
+winProcSetSelectionOwner_Done:
     return (*winProcSetSelectionOwnerOrig) (client);
 }
diff --git a/xorg-server/hw/xwin/winclipboardxevents.c b/xorg-server/hw/xwin/winclipboardxevents.c
index 226c3f055..4aff0659b 100644
--- a/xorg-server/hw/xwin/winclipboardxevents.c
+++ b/xorg-server/hw/xwin/winclipboardxevents.c
@@ -35,6 +35,10 @@
 #endif
 #include "winclipboard.h"
 #include "misc.h"
+#include "winmsg.h"
+#include <unistd.h>
+
+extern Bool		g_fClipboardPrimary;
 
 /*
  * Process any pending X events
@@ -42,7 +46,7 @@
 
 int
 winClipboardFlushXEvents(HWND hwnd,
-                         int iWindow, Display * pDisplay, Bool fUseUnicode)
+                         int iWindow, Display * pDisplay, Bool fUseUnicode, Bool ClipboardOpened)
 {
     static Atom atomLocalProperty;
     static Atom atomCompoundText;
@@ -85,6 +89,8 @@ winClipboardFlushXEvents(HWND hwnd,
         /* Get the next event - will not block because one is ready */
         XNextEvent(pDisplay, &event);
 
+      winDebug ("Received event type %d\n",event.type);
+
         /* Branch on the event type */
         switch (event.type) {
             /*
@@ -92,6 +98,7 @@ winClipboardFlushXEvents(HWND hwnd,
              */
 
         case SelectionRequest:
+#ifdef _DEBUG
         {
             char *pszAtomName = NULL;
 
@@ -103,7 +110,10 @@ winClipboardFlushXEvents(HWND hwnd,
             winDebug("SelectionRequest - Target atom name %s\n", pszAtomName);
             XFree(pszAtomName);
             pszAtomName = NULL;
+	    winDebug ("SelectionRequest - owner %d\n", event.xselectionrequest.owner);
+	    winDebug ("SelectionRequest - requestor %d\n", event.xselectionrequest.requestor);
         }
+#endif
 
             /* Abort if invalid target type */
             if (event.xselectionrequest.target != XA_STRING
@@ -165,24 +175,24 @@ winClipboardFlushXEvents(HWND hwnd,
                 break;
             }
 
-            /* Close clipboard if we have it open already */
-            if (GetOpenClipboardWindow() == hwnd) {
-                CloseClipboard();
-            }
-
-            /* Access the clipboard */
-            if (!OpenClipboard(hwnd)) {
-                ErrorF("winClipboardFlushXEvents - SelectionRequest - "
-                       "OpenClipboard () failed: %08lx\n", GetLastError());
+              /* Access the clipboard */
+            if (!ClipboardOpened)
+            {
+              if (!OpenClipboard (hwnd))
+              {
+                ErrorF ("winClipboardFlushXEvents - SelectionRequest - "
+                        "OpenClipboard () failed: %08lx\n",
+                        GetLastError ());
 
                 /* Abort */
                 fAbort = TRUE;
                 goto winClipboardFlushXEvents_SelectionRequest_Done;
+              }
+	  
+              /* Indicate that clipboard was opened */
+              fCloseClipboard = TRUE;
             }
 
-            /* Indicate that clipboard was opened */
-            fCloseClipboard = TRUE;
-
             /* Check that clipboard format is available */
             if (fUseUnicode && !IsClipboardFormatAvailable(CF_UNICODETEXT)) {
                 static int count;       /* Hack to stop acroread spamming the log */
@@ -232,7 +242,16 @@ winClipboardFlushXEvents(HWND hwnd,
                 hGlobal = GetClipboardData(CF_TEXT);
             }
             if (!hGlobal) {
-                ErrorF("winClipboardFlushXEvents - SelectionRequest - "
+	      if (GetLastError()==ERROR_CLIPBOARD_NOT_OPEN && ClipboardOpened)
+	        {
+		ErrorF("We should not have received a SelectionRequest????\n"
+                        "The owner is the clipboard, but in reality it was"
+                        "an X window\n");
+                /* Set the owner to None */
+		if (g_fClipboardPrimary) XSetSelectionOwner (pDisplay, XA_PRIMARY, None, CurrentTime);
+		XSetSelectionOwner (pDisplay, XInternAtom (pDisplay, "CLIPBOARD", False), None, CurrentTime);
+	        }
+	        ErrorF ("winClipboardFlushXEvents - SelectionRequest - "
                        "GetClipboardData () failed: %08lx\n", GetLastError());
 
                 /* Abort */
@@ -320,9 +339,11 @@ winClipboardFlushXEvents(HWND hwnd,
             /* Release the clipboard data */
             GlobalUnlock(hGlobal);
             pszGlobalData = NULL;
-            fCloseClipboard = FALSE;
-            CloseClipboard();
-
+	  if (fCloseClipboard)
+	  {
+	    fCloseClipboard = FALSE;
+	    CloseClipboard ();
+	  }
             /* Clean up */
             XFree(xtpText.value);
             xtpText.value = NULL;
@@ -401,9 +422,8 @@ winClipboardFlushXEvents(HWND hwnd,
             /*
              * SelectionNotify
              */
-
         case SelectionNotify:
-
+#ifdef _DEBUG
             winDebug("winClipboardFlushXEvents - SelectionNotify\n");
             {
                 char *pszAtomName;
@@ -414,8 +434,11 @@ winClipboardFlushXEvents(HWND hwnd,
                 winDebug
                     ("winClipboardFlushXEvents - SelectionNotify - ATOM: %s\n",
                      pszAtomName);
+	    winDebug ("SelectionNotify - requestor %d\n", event.xselectionrequest.requestor);
                 XFree(pszAtomName);
             }
+#endif
+
 
             /*
              * Request conversion of UTF8 and CompoundText targets.
@@ -498,6 +521,7 @@ winClipboardFlushXEvents(HWND hwnd,
                 break;
             }
 
+#ifdef WINDBG
             {
                 char *pszAtomName = NULL;
 
@@ -508,6 +532,7 @@ winClipboardFlushXEvents(HWND hwnd,
                 XFree(pszAtomName);
                 pszAtomName = NULL;
             }
+#endif
 
             if (fUseUnicode) {
 #ifdef X_HAVE_UTF8_STRING
@@ -529,7 +554,7 @@ winClipboardFlushXEvents(HWND hwnd,
                     for (i = 0; i < iCount; i++) {
                         iReturnDataLen += strlen(ppszTextList[i]);
                     }
-                    pszReturnData = malloc(iReturnDataLen + 1);
+                    pszReturnData = (char *) malloc(iReturnDataLen + 1);
                     pszReturnData[0] = '\0';
                     for (i = 0; i < iCount; i++) {
                         strcat(pszReturnData, ppszTextList[i]);
@@ -538,7 +563,7 @@ winClipboardFlushXEvents(HWND hwnd,
                 else {
                     ErrorF("winClipboardFlushXEvents - SelectionNotify - "
                            "X*TextPropertyToTextList list_return is NULL.\n");
-                    pszReturnData = malloc(1);
+                    pszReturnData = (char *) malloc(1);
                     pszReturnData[0] = '\0';
                 }
             }
@@ -559,7 +584,7 @@ winClipboardFlushXEvents(HWND hwnd,
                     ErrorF("%d\n", iReturn);
                     break;
                 }
-                pszReturnData = malloc(1);
+                pszReturnData = (char *) malloc(1);
                 pszReturnData[0] = '\0';
             }
 
@@ -572,7 +597,7 @@ winClipboardFlushXEvents(HWND hwnd,
             xtpText.nitems = 0;
 
             /* Convert the X clipboard string to DOS format */
-            winClipboardUNIXtoDOS(&pszReturnData, strlen(pszReturnData));
+            winClipboardUNIXtoDOS((unsigned char **)&pszReturnData, strlen(pszReturnData));
 
             if (fUseUnicode) {
                 /* Find out how much space needed to convert MBCS to Unicode */
@@ -683,14 +708,32 @@ winClipboardFlushXEvents(HWND hwnd,
             }
             return WIN_XEVENTS_NOTIFY;
 
-        case SelectionClear:
+	  /*
+	   * SelectionClear
+	   */ 
+	case SelectionClear:
+#ifdef _DEBUG
             winDebug("SelectionClear - doing nothing\n");
+	  {
+	    char		*pszAtomName;
+	    
+	    pszAtomName = XGetAtomName (pDisplay,
+					event.xselection.selection);
+
+	    winDebug ("SelectionClear - ATOM: %s\n",
+		    pszAtomName);
+	    winDebug ("SelectionClear - owner %d\n", event.xselectionrequest.owner);
+	    
+	    XFree (pszAtomName);
+	  }
+#endif
             break;
 
         case PropertyNotify:
             break;
-
+    
         case MappingNotify:
+            XRefreshKeyboardMapping((XMappingEvent *)&event);
             break;
 
         default:
diff --git a/xorg-server/hw/xwin/wincmap.c b/xorg-server/hw/xwin/wincmap.c
index 610437ad4..283372a9f 100644
--- a/xorg-server/hw/xwin/wincmap.c
+++ b/xorg-server/hw/xwin/wincmap.c
@@ -116,16 +116,12 @@ winInstallColormap(ColormapPtr pColormap)
     winScreenPriv(pScreen);
     ColormapPtr oldpmap = pScreenPriv->pcmapInstalled;
 
-#if CYGDEBUG
     winDebug("winInstallColormap\n");
-#endif
 
     /* Did the colormap actually change? */
     if (pColormap != oldpmap) {
-#if CYGDEBUG
         winDebug("winInstallColormap - Colormap has changed, attempt "
                  "to install.\n");
-#endif
 
         /* Was there a previous colormap? */
         if (oldpmap != (ColormapPtr) None) {
@@ -139,10 +135,9 @@ winInstallColormap(ColormapPtr pColormap)
 
         /* Call the engine specific colormap install procedure */
         if (!((*pScreenPriv->pwinInstallColormap) (pColormap))) {
-            winErrorFVerb(2,
-                          "winInstallColormap - Screen specific colormap install "
-                          "procedure failed.  Continuing, but colors may be "
-                          "messed up from now on.\n");
+            ErrorF ("winInstallColormap - Screen specific colormap install "
+                    "procedure failed.  Continuing, but colors may be "
+                    "messed up from now on.\n");
         }
     }
 
@@ -157,9 +152,7 @@ winUninstallColormap(ColormapPtr pmap)
     winScreenPriv(pmap->pScreen);
     ColormapPtr curpmap = pScreenPriv->pcmapInstalled;
 
-#if CYGDEBUG
     winDebug("winUninstallColormap\n");
-#endif
 
     /* Is the colormap currently installed? */
     if (pmap != curpmap) {
@@ -194,7 +187,7 @@ winStoreColors(ColormapPtr pmap, int ndef, xColorItem * pdefs)
     int i;
     unsigned short nRed, nGreen, nBlue;
 
-#if CYGDEBUG
+#ifdef WINDBG
     if (ndef != 1)
         winDebug("winStoreColors - ndef: %d\n", ndef);
 #endif
@@ -216,18 +209,15 @@ winStoreColors(ColormapPtr pmap, int ndef, xColorItem * pdefs)
         pCmapPriv->rgbColors[pdefs[0].pixel + i].rgbGreen = nGreen;
         pCmapPriv->rgbColors[pdefs[0].pixel + i].rgbBlue = nBlue;
 
-#if CYGDEBUG
         winDebug("winStoreColors - nRed %d nGreen %d nBlue %d\n",
                  nRed, nGreen, nBlue);
-#endif
     }
 
     /* Call the engine specific store colors procedure */
     if (!((pScreenPriv->pwinStoreColors) (pmap, ndef, pdefs))) {
-        winErrorFVerb(2,
-                      "winStoreColors - Engine cpecific color storage procedure "
-                      "failed.  Continuing, but colors may be messed up from now "
-                      "on.\n");
+        ErrorF ("winStoreColors - Engine cpecific color storage procedure "
+                "failed.  Continuing, but colors may be messed up from now "
+                "on.\n");
     }
 }
 
@@ -237,9 +227,7 @@ winResolveColor(unsigned short *pred,
                 unsigned short *pgreen,
                 unsigned short *pblue, VisualPtr pVisual)
 {
-#if CYGDEBUG
     winDebug("winResolveColor ()\n");
-#endif
 
     miResolveColor(pred, pgreen, pblue, pVisual);
 }
@@ -253,9 +241,7 @@ winCreateColormap(ColormapPtr pmap)
 
     winScreenPriv(pScreen);
 
-#if CYGDEBUG
     winDebug("winCreateColormap\n");
-#endif
 
     /* Allocate colormap privates */
     if (!winAllocateCmapPrivates(pmap)) {
@@ -301,19 +287,16 @@ winDestroyColormap(ColormapPtr pColormap)
 
     /* Call the engine specific colormap destruction procedure */
     if (!((*pScreenPriv->pwinDestroyColormap) (pColormap))) {
-        winErrorFVerb(2,
-                      "winDestroyColormap - Engine specific colormap destruction "
-                      "procedure failed.  Continuing, but it is possible that memory "
-                      "was leaked, or that colors will be messed up from now on.\n");
+        ErrorF ("winDestroyColormap - Engine specific colormap destruction "
+                "procedure failed.  Continuing, but it is possible that memory "
+                "was leaked, or that colors will be messed up from now on.\n");
     }
 
     /* Free the colormap privates */
     free(pCmapPriv);
     winSetCmapPriv(pColormap, NULL);
 
-#if CYGDEBUG
     winDebug("winDestroyColormap - Returning\n");
-#endif
 }
 
 /*
@@ -338,10 +321,8 @@ winGetPaletteDIB(ScreenPtr pScreen, ColormapPtr pcmap)
         return FALSE;
     }
 
-#if CYGDEBUG
     winDebug("winGetPaletteDIB - Retrieved %d colors from DIB\n",
              uiColorsRetrieved);
-#endif
 
     /* Set the DIB color table to the default screen palette */
     if (SetDIBColorTable(pScreenPriv->hdcShadow,
@@ -359,10 +340,8 @@ winGetPaletteDIB(ScreenPtr pScreen, ColormapPtr pcmap)
         nGreen = rgbColors[i].rgbGreen << 8;
         nBlue = rgbColors[i].rgbBlue << 8;
 
-#if CYGDEBUG
         winDebug("winGetPaletteDIB - Allocating a color: %d; "
                  "%d %d %d\n", pixel, nRed, nGreen, nBlue);
-#endif
 
         /* Allocate a entry in the X colormap */
         if (AllocColor(pcmap, &nRed, &nGreen, &nBlue, &pixel, 0) != Success) {
@@ -421,10 +400,8 @@ winGetPaletteDD(ScreenPtr pScreen, ColormapPtr pcmap)
         return FALSE;
     }
 
-#if CYGDEBUG
     winDebug("winGetPaletteDD - uiSystemPaletteEntries %d\n",
              uiSystemPaletteEntries);
-#endif
 
     /* Allocate palette entries structure */
     ppeColors = malloc(uiSystemPaletteEntries * sizeof(PALETTEENTRY));
@@ -444,10 +421,8 @@ winGetPaletteDD(ScreenPtr pScreen, ColormapPtr pcmap)
         nRed = ppeColors[i].peRed << 8;
         nGreen = ppeColors[i].peGreen << 8;
         nBlue = ppeColors[i].peBlue << 8;
-#if CYGDEBUG
         winDebug("winGetPaletteDD - Allocating a color: %d; "
                  "%d %d %d\n", pixel, nRed, nGreen, nBlue);
-#endif
         if (AllocColor(pcmap, &nRed, &nGreen, &nBlue, &pixel, 0) != Success) {
             ErrorF("winGetPaletteDD - AllocColor () failed, pixel %d\n", i);
             free(ppeColors);
@@ -493,9 +468,7 @@ winCreateDefColormap(ScreenPtr pScreen)
     ColormapPtr pcmap = NULL;
     Pixel wp, bp;
 
-#if CYGDEBUG
     winDebug("winCreateDefColormap\n");
-#endif
 
     /* Use standard fb colormaps for non palettized color modes */
     if (pScreenInfo->dwBPP > 8) {
@@ -514,9 +487,7 @@ winCreateDefColormap(ScreenPtr pScreen)
      * to be changed by clients.
      */
 
-#if CYGDEBUG
     winDebug("winCreateDefColormap - defColormap: %d\n", pScreen->defColormap);
-#endif
 
     /* Allocate an X colormap, owned by client 0 */
     if (CreateColormap(pScreen->defColormap,
@@ -533,9 +504,7 @@ winCreateDefColormap(ScreenPtr pScreen)
         return FALSE;
     }
 
-#if CYGDEBUG
     winDebug("winCreateDefColormap - Created a colormap\n");
-#endif
 
     /* Branch on the visual class */
     if (!(pVisual->class & DynamicClass)) {
@@ -570,33 +539,12 @@ winCreateDefColormap(ScreenPtr pScreen)
         pScreen->whitePixel = wp;
         pScreen->blackPixel = bp;
 
-#if 0
-        /* Have to reserve first 10 and last ten pixels in DirectDraw windowed */
-        if (pScreenInfo->dwEngine != WIN_SERVER_SHADOW_GDI) {
-            int k;
-            Pixel p;
-
-            for (k = 1; k < 10; ++k) {
-                p = k;
-                if (AllocColor(pcmap, &ones, &ones, &ones, &p, 0) != Success)
-                    FatalError("Foo!\n");
-            }
-
-            for (k = 245; k < 255; ++k) {
-                p = k;
-                if (AllocColor(pcmap, &zero, &zero, &zero, &p, 0) != Success)
-                    FatalError("Baz!\n");
-            }
-        }
-#endif
     }
 
     /* Install the created colormap */
     (*pScreen->InstallColormap) (pcmap);
 
-#if CYGDEBUG
     winDebug("winCreateDefColormap - Returning\n");
-#endif
 
     return TRUE;
 }
diff --git a/xorg-server/hw/xwin/winconfig.c b/xorg-server/hw/xwin/winconfig.c
index 9e38113a5..11717a506 100644..100755
--- a/xorg-server/hw/xwin/winconfig.c
+++ b/xorg-server/hw/xwin/winconfig.c
@@ -140,10 +140,10 @@ winReadConfigfile()
         filename = xf86openConfigFile(CONFIGPATH, "XF86Config", PROJECTROOT);
 
     if (filename) {
-        winMsg(from, "Using config file: \"%s\"\n", filename);
+        winDebug ("Using config file: \"%s\"\n", filename);
     }
     else {
-        winMsg(X_ERROR, "Unable to locate/open config file");
+        ErrorF ("Unable to locate/open config file");
         if (xf86ConfigFile)
             ErrorF(": \"%s\"", xf86ConfigFile);
         ErrorF("\n");
@@ -163,7 +163,7 @@ winReadConfigfile()
     free(filename);
     free(dirname);
     if ((g_xf86configptr = xf86readConfigFile()) == NULL) {
-        winMsg(X_ERROR, "Problem parsing the config file\n");
+        ErrorF ("Problem parsing the config file\n");
         return FALSE;
     }
     xf86closeConfigFile();
@@ -175,12 +175,11 @@ winReadConfigfile()
     if (g_xf86configptr->conf_layout_lst == NULL ||
         g_cmdline.screenname != NULL) {
         if (g_cmdline.screenname == NULL) {
-            winMsg(X_WARNING,
-                   "No Layout section. Using the first Screen section.\n");
+            winDebug ("No Layout section. Using the first Screen section.\n");
         }
         if (!configImpliedLayout(&g_winConfigLayout,
                                  g_xf86configptr->conf_screen_lst)) {
-            winMsg(X_ERROR, "Unable to determine the screen layout\n");
+            ErrorF ("Unable to determine the screen layout\n");
             return FALSE;
         }
     }
@@ -196,14 +195,14 @@ winReadConfigfile()
 
             if (!configLayout(&g_winConfigLayout,
                               g_xf86configptr->conf_layout_lst, dfltlayout)) {
-                winMsg(X_ERROR, "Unable to determine the screen layout\n");
+                ErrorF ("Unable to determine the screen layout\n");
                 return FALSE;
             }
         }
         else {
             if (!configLayout(&g_winConfigLayout,
                               g_xf86configptr->conf_layout_lst, NULL)) {
-                winMsg(X_ERROR, "Unable to determine the screen layout\n");
+                ErrorF ("Unable to determine the screen layout\n");
                 return FALSE;
             }
         }
@@ -263,7 +262,7 @@ winConfigKeyboard(DeviceIntPtr pDevice)
                 break;
             }
             g_winInfo.keyboard.rate = (kbd_speed > 0) ? kbd_speed : 1;
-            winMsgVerb(X_PROBED, 1, "Setting autorepeat to delay=%d, rate=%d\n",
+            winDebug("Setting autorepeat to delay=%d, rate=%d\n",
                        g_winInfo.keyboard.delay, g_winInfo.keyboard.rate);
         }
     }
@@ -286,9 +285,9 @@ winConfigKeyboard(DeviceIntPtr pDevice)
                    such as the lack of WM_KEYUP for Caps Lock key.
                    Loading US layout fixes this problem. */
                 if (LoadKeyboardLayout("00000409", KLF_ACTIVATE) != NULL)
-                    winMsg(X_INFO, "Loading US keyboard layout.\n");
+                    winDebug("Loading US keyboard layout.\n");
                 else
-                    winMsg(X_ERROR, "LoadKeyboardLayout failed.\n");
+                    ErrorF ("LoadKeyboardLayout failed.\n");
             }
         }
 
@@ -314,9 +313,8 @@ winConfigKeyboard(DeviceIntPtr pDevice)
             free(regpath);
         }
 
-        winMsg(X_PROBED,
-               "Windows keyboard layout: \"%s\" (%08x) \"%s\", type %d\n",
-               layoutName, layoutNum, layoutFriendlyName, keyboardType);
+        winDebug ("Windows keyboard layout: \"%s\" (%08x) \"%s\", type %d\n",
+                  layoutName, layoutNum, layoutFriendlyName, keyboardType);
 
         for (pLayout = winKBLayouts; pLayout->winlayout != -1; pLayout++) {
             if (pLayout->winlayout != layoutNum)
@@ -325,11 +323,11 @@ winConfigKeyboard(DeviceIntPtr pDevice)
                 continue;
 
             bfound = TRUE;
-            winMsg(X_PROBED,
+            winDebug (
                    "Found matching XKB configuration \"%s\"\n",
                    pLayout->layoutname);
 
-            winMsg(X_PROBED,
+            winDebug(
                    "Model = \"%s\" Layout = \"%s\""
                    " Variant = \"%s\" Options = \"%s\"\n",
                    pLayout->xkbmodel ? pLayout->xkbmodel : "none",
@@ -337,17 +335,16 @@ winConfigKeyboard(DeviceIntPtr pDevice)
                    pLayout->xkbvariant ? pLayout->xkbvariant : "none",
                    pLayout->xkboptions ? pLayout->xkboptions : "none");
 
-            g_winInfo.xkb.model = pLayout->xkbmodel;
-            g_winInfo.xkb.layout = pLayout->xkblayout;
-            g_winInfo.xkb.variant = pLayout->xkbvariant;
-            g_winInfo.xkb.options = pLayout->xkboptions;
+            g_winInfo.xkb.model = (char *)pLayout->xkbmodel;
+            g_winInfo.xkb.layout = (char *)pLayout->xkblayout;
+            g_winInfo.xkb.variant = (char *)pLayout->xkbvariant;
+            g_winInfo.xkb.options = (char *)pLayout->xkboptions;
 
             break;
         }
 
         if (!bfound) {
-            winMsg(X_ERROR,
-                   "Keyboardlayout \"%s\" (%s) is unknown, using X server default layout\n",
+            ErrorF ("Keyboardlayout \"%s\" (%s) is unknown, using X server default layout\n",
                    layoutFriendlyName, layoutName);
         }
     }
@@ -379,8 +376,8 @@ winConfigKeyboard(DeviceIntPtr pDevice)
     if (kbd != NULL) {
 
         if (kbd->inp_identifier)
-            winMsg(kbdfrom, "Using keyboard \"%s\" as primary keyboard\n",
-                   kbd->inp_identifier);
+            winDebug ("Using keyboard \"%s\" as primary keyboard\n",
+                      kbd->inp_identifier);
 
         if ((s = winSetStrOption(kbd->inp_option_lst, "AutoRepeat", NULL))) {
             if ((sscanf(s, "%ld %ld", &g_winInfo.keyboard.delay,
@@ -388,12 +385,12 @@ winConfigKeyboard(DeviceIntPtr pDevice)
                 (g_winInfo.keyboard.delay < 1) ||
                 (g_winInfo.keyboard.rate == 0) ||
                 (1000 / g_winInfo.keyboard.rate) < 1) {
-                winErrorFVerb(2, "\"%s\" is not a valid AutoRepeat value", s);
+                ErrorF ("\"%s\" is not a valid AutoRepeat value", s);
                 free(s);
                 return FALSE;
             }
             free(s);
-            winMsg(X_CONFIG, "AutoRepeat: %ld %ld\n",
+            winDebug ("AutoRepeat: %ld %ld\n", 
                    g_winInfo.keyboard.delay, g_winInfo.keyboard.rate);
         }
 #endif
@@ -411,7 +408,7 @@ winConfigKeyboard(DeviceIntPtr pDevice)
 #endif
         if (s) {
             g_winInfo.xkb.rules = NULL_IF_EMPTY(s);
-            winMsg(from, "XKB: rules: \"%s\"\n", s);
+            winDebug ("XKB: rules: \"%s\"\n", s);
         }
 
         s = NULL;
@@ -427,7 +424,7 @@ winConfigKeyboard(DeviceIntPtr pDevice)
 #endif
         if (s) {
             g_winInfo.xkb.model = NULL_IF_EMPTY(s);
-            winMsg(from, "XKB: model: \"%s\"\n", s);
+            winDebug ("XKB: model: \"%s\"\n", s);
         }
 
         s = NULL;
@@ -443,7 +440,7 @@ winConfigKeyboard(DeviceIntPtr pDevice)
 #endif
         if (s) {
             g_winInfo.xkb.layout = NULL_IF_EMPTY(s);
-            winMsg(from, "XKB: layout: \"%s\"\n", s);
+            winDebug ("XKB: layout: \"%s\"\n", s);
         }
 
         s = NULL;
@@ -459,7 +456,7 @@ winConfigKeyboard(DeviceIntPtr pDevice)
 #endif
         if (s) {
             g_winInfo.xkb.variant = NULL_IF_EMPTY(s);
-            winMsg(from, "XKB: variant: \"%s\"\n", s);
+            winDebug ("XKB: variant: \"%s\"\n", s);
         }
 
         s = NULL;
@@ -472,10 +469,16 @@ winConfigKeyboard(DeviceIntPtr pDevice)
             s = winSetStrOption(kbd->inp_option_lst, "XkbOptions", NULL);
             from = X_CONFIG;
         }
+#else
+        else
+          {
+            if (!g_winInfo.xkb.options)
+              s="grab:break_actions";  /* Currently attach default CTRL+ALT+NKP/ and CTRL+ALT+NKP* mappings to release grab functions */
+          }
 #endif
         if (s) {
             g_winInfo.xkb.options = NULL_IF_EMPTY(s);
-            winMsg(from, "XKB: options: \"%s\"\n", s);
+            winDebug ("XKB: options: \"%s\"\n", s);
         }
 
 #ifdef XWIN_XF86CONFIG
@@ -513,8 +516,8 @@ winConfigMouse(DeviceIntPtr pDevice)
 
     if (mouse != NULL) {
         if (mouse->inp_identifier)
-            winMsg(mousefrom, "Using pointer \"%s\" as primary pointer\n",
-                   mouse->inp_identifier);
+            winDebug ("Using pointer \"%s\" as primary pointer\n",
+                      mouse->inp_identifier);
 
         g_winInfo.pointer.emulate3Buttons =
             winSetBoolOption(mouse->inp_option_lst, "Emulate3Buttons", FALSE);
@@ -527,8 +530,8 @@ winConfigMouse(DeviceIntPtr pDevice)
             g_winInfo.pointer.emulate3Timeout = g_cmdline.emulate3timeout;
     }
     else {
-        winMsg(X_ERROR, "No primary pointer configured\n");
-        winMsg(X_DEFAULT, "Using compiletime defaults for pointer\n");
+      winDebug ("No primary pointer configured\n");
+      winDebug ("Using compiletime defaults for pointer\n");
     }
 
     return TRUE;
@@ -556,7 +559,7 @@ winConfigFiles()
         from = X_CONFIG;
         defaultFontPath = strdup(filesptr->file_fontpath);
     }
-    winMsg(from, "FontPath set to \"%s\"\n", defaultFontPath);
+    winDebug ("FontPath set to \"%s\"\n", defaultFontPath);
 
     return TRUE;
 }
@@ -567,7 +570,7 @@ winConfigFiles(void)
     /* Fontpath */
     if (g_cmdline.fontPath) {
         defaultFontPath = g_cmdline.fontPath;
-        winMsg(X_CMDLINE, "FontPath set to \"%s\"\n", defaultFontPath);
+        winDebug("FontPath set to \"%s\"\n", defaultFontPath);
     }
 
     return TRUE;
@@ -742,8 +745,7 @@ ParseOptionValue(int scrnIndex, pointer options, OptionInfoPtr p)
         switch (p->type) {
         case OPTV_INTEGER:
             if (*s == '\0') {
-                winDrvMsg(scrnIndex, X_WARNING,
-                          "Option \"%s\" requires an integer value\n", p->name);
+	      winDebug ( "Option \"%s\" requires an integer value\n",
                 p->found = FALSE;
             }
             else {
@@ -752,8 +754,7 @@ ParseOptionValue(int scrnIndex, pointer options, OptionInfoPtr p)
                     p->found = TRUE;
                 }
                 else {
-                    winDrvMsg(scrnIndex, X_WARNING,
-                              "Option \"%s\" requires an integer value\n",
+                    winDebug ( "Option \"%s\" requires an integer value\n",
                               p->name);
                     p->found = FALSE;
                 }
@@ -761,8 +762,7 @@ ParseOptionValue(int scrnIndex, pointer options, OptionInfoPtr p)
             break;
         case OPTV_STRING:
             if (*s == '\0') {
-                winDrvMsg(scrnIndex, X_WARNING,
-                          "Option \"%s\" requires a string value\n", p->name);
+                winDebug ( "Option \"%s\" requires a string value\n", p->name);
                 p->found = FALSE;
             }
             else {
@@ -776,8 +776,7 @@ ParseOptionValue(int scrnIndex, pointer options, OptionInfoPtr p)
             break;
         case OPTV_REAL:
             if (*s == '\0') {
-                winDrvMsg(scrnIndex, X_WARNING,
-                          "Option \"%s\" requires a floating point value\n",
+                winDebug ( "Option \"%s\" requires a floating point value\n",
                           p->name);
                 p->found = FALSE;
             }
@@ -787,8 +786,7 @@ ParseOptionValue(int scrnIndex, pointer options, OptionInfoPtr p)
                     p->found = TRUE;
                 }
                 else {
-                    winDrvMsg(scrnIndex, X_WARNING,
-                              "Option \"%s\" requires a floating point value\n",
+                    winDebug ( "Option \"%s\" requires a floating point value\n",
                               p->name);
                     p->found = FALSE;
                 }
@@ -799,8 +797,7 @@ ParseOptionValue(int scrnIndex, pointer options, OptionInfoPtr p)
                 p->found = TRUE;
             }
             else {
-                winDrvMsg(scrnIndex, X_WARNING,
-                          "Option \"%s\" requires a boolean value\n", p->name);
+                winDebug ( "Option \"%s\" requires a boolean value\n", p->name);
                 p->found = FALSE;
             }
             break;
@@ -826,8 +823,7 @@ ParseOptionValue(int scrnIndex, pointer options, OptionInfoPtr p)
             }
         case OPTV_FREQ:
             if (*s == '\0') {
-                winDrvMsg(scrnIndex, X_WARNING,
-                          "Option \"%s\" requires a frequency value\n",
+                winDebug ( "Option \"%s\" requires a frequency value\n",
                           p->name);
                 p->found = FALSE;
             }
@@ -846,8 +842,7 @@ ParseOptionValue(int scrnIndex, pointer options, OptionInfoPtr p)
                              !winNameCompare(end, "M"))
                         units = 1000000;
                     else {
-                        winDrvMsg(scrnIndex, X_WARNING,
-                                  "Option \"%s\" requires a frequency value\n",
+                        winDebug ( "Option \"%s\" requires a frequency value\n",
                                   p->name);
                         p->found = FALSE;
                     }
@@ -855,8 +850,7 @@ ParseOptionValue(int scrnIndex, pointer options, OptionInfoPtr p)
                         freq *= (double) units;
                 }
                 else {
-                    winDrvMsg(scrnIndex, X_WARNING,
-                              "Option \"%s\" requires a frequency value\n",
+                    winDebug ( "Option \"%s\" requires a frequency value\n",
                               p->name);
                     p->found = FALSE;
                 }
@@ -872,11 +866,11 @@ ParseOptionValue(int scrnIndex, pointer options, OptionInfoPtr p)
             break;
         }
         if (p->found) {
-            winDrvMsgVerb(scrnIndex, X_CONFIG, 2, "Option \"%s\"", p->name);
+            winDebug ("Option \"%s\"", p->name);
             if (!(p->type == OPTV_BOOLEAN && *s == 0)) {
-                winErrorFVerb(2, " \"%s\"", s);
+                winDebug (" \"%s\"", s);
             }
-            winErrorFVerb(2, "\n");
+            winDebug ("\n");
         }
     }
     else if (p->type == OPTV_BOOLEAN) {
@@ -909,8 +903,7 @@ ParseOptionValue(int scrnIndex, pointer options, OptionInfoPtr p)
                 p->found = TRUE;
             }
             else {
-                winDrvMsg(scrnIndex, X_WARNING,
-                          "Option \"%s\" requires a boolean value\n", newn);
+	              winDebug ( "Option \"%s\" requires a boolean value\n", newn);
                 p->found = FALSE;
             }
         }
@@ -918,11 +911,11 @@ ParseOptionValue(int scrnIndex, pointer options, OptionInfoPtr p)
             p->found = FALSE;
         }
         if (p->found) {
-            winDrvMsgVerb(scrnIndex, X_CONFIG, 2, "Option \"%s\"", newn);
+            winDebug ("Option \"%s\"", newn);
             if (*s != 0) {
-                winErrorFVerb(2, " \"%s\"", s);
+                winDebug (" \"%s\"", s);
             }
-            winErrorFVerb(2, "\n");
+            winDebug ("\n");
         }
         free(n);
     }
diff --git a/xorg-server/hw/xwin/wincreatewnd.c b/xorg-server/hw/xwin/wincreatewnd.c
index 6732dcb58..597f6bc4e 100644
--- a/xorg-server/hw/xwin/wincreatewnd.c
+++ b/xorg-server/hw/xwin/wincreatewnd.c
@@ -60,10 +60,10 @@ winCreateBoundingWindowFullScreen(ScreenPtr pScreen)
     HWND *phwnd = &pScreenPriv->hwndScreen;
     WNDCLASSEX wc;
     char szTitle[256];
+    char			HostName[256];
+    gethostname(HostName,256);
 
-#if CYGDEBUG
     winDebug("winCreateBoundingWindowFullScreen\n");
-#endif
 
     /* Setup our window class */
     wc.cbSize = sizeof(WNDCLASSEX);
@@ -91,12 +91,13 @@ winCreateBoundingWindowFullScreen(ScreenPtr pScreen)
         snprintf(szTitle,
                  sizeof(szTitle),
                  WINDOW_TITLE_XDMCP,
-                 g_pszQueryHost, display, (int) pScreenInfo->dwScreen);
+                 g_pszQueryHost, HostName, display, (int) pScreenInfo->dwScreen);
     else
+    {
         snprintf(szTitle,
                  sizeof(szTitle),
-                 WINDOW_TITLE, display, (int) pScreenInfo->dwScreen);
-
+                 WINDOW_TITLE, HostName, display, (int) pScreenInfo->dwScreen);
+    }
     /* Create the window */
     *phwnd = CreateWindowExA(0, /* Extended styles */
                              WINDOW_CLASS,      /* Class name */
@@ -153,6 +154,9 @@ winCreateBoundingWindowWindowed(ScreenPtr pScreen)
     DWORD dwWindowStyle;
     BOOL fForceShowWindow = FALSE;
     char szTitle[256];
+    char			HostName[256];
+
+    gethostname(HostName,256);
 
     winDebug("winCreateBoundingWindowWindowed - User w: %d h: %d\n",
              (int) pScreenInfo->dwUserWidth, (int) pScreenInfo->dwUserHeight);
@@ -244,10 +248,8 @@ winCreateBoundingWindowWindowed(ScreenPtr pScreen)
     /* Did the user specify a height and width? */
     if (pScreenInfo->fUserGaveHeightAndWidth) {
         /* User gave a desired height and width, try to accomodate */
-#if CYGDEBUG
         winDebug("winCreateBoundingWindowWindowed - User gave height "
                  "and width\n");
-#endif
 
         /* Adjust the window width and height for borders and title bar */
         if (pScreenInfo->fDecoration
@@ -259,27 +261,21 @@ winCreateBoundingWindowWindowed(ScreenPtr pScreen)
             && !pScreenInfo->fMultiWindow
 #endif
             ) {
-#if CYGDEBUG
             winDebug
                 ("winCreateBoundingWindowWindowed - Window has decoration\n");
-#endif
 
             /* Are we resizable */
             if (pScreenInfo->iResizeMode != notAllowed) {
-#if CYGDEBUG
                 winDebug
                     ("winCreateBoundingWindowWindowed - Window is resizable\n");
-#endif
 
                 iWidth += 2 * GetSystemMetrics(SM_CXSIZEFRAME);
                 iHeight += 2 * GetSystemMetrics(SM_CYSIZEFRAME)
                     + GetSystemMetrics(SM_CYCAPTION);
             }
             else {
-#if CYGDEBUG
                 winDebug
                     ("winCreateBoundingWindowWindowed - Window is not resizable\n");
-#endif
 
                 iWidth += 2 * GetSystemMetrics(SM_CXFIXEDFRAME);
                 iHeight += 2 * GetSystemMetrics(SM_CYFIXEDFRAME)
@@ -289,10 +285,8 @@ winCreateBoundingWindowWindowed(ScreenPtr pScreen)
     }
     else {
         /* By default, we are creating a window that is as large as possible */
-#if CYGDEBUG
         winDebug("winCreateBoundingWindowWindowed - User did not give "
                  "height and width\n");
-#endif
         /* Defaults are wrong if we have multiple monitors */
         if (pScreenInfo->fMultipleMonitors) {
             iWidth = GetSystemMetrics(SM_CXVIRTUALSCREEN);
@@ -317,10 +311,8 @@ winCreateBoundingWindowWindowed(ScreenPtr pScreen)
         if (iHeight >= (rcWorkArea.bottom - rcWorkArea.top))
             iHeight = rcWorkArea.bottom - rcWorkArea.top;
 
-#if CYGDEBUG
         winDebug("winCreateBoundingWindowWindowed - Adjusted width: %d "
                  "height: %d\n", iWidth, iHeight);
-#endif
     }
 
     /* Set display and screen-specific tooltip text */
@@ -328,11 +320,13 @@ winCreateBoundingWindowWindowed(ScreenPtr pScreen)
         snprintf(szTitle,
                  sizeof(szTitle),
                  WINDOW_TITLE_XDMCP,
-                 g_pszQueryHost, display, (int) pScreenInfo->dwScreen);
+                 g_pszQueryHost, HostName, display, (int) pScreenInfo->dwScreen);
     else
+  {
         snprintf(szTitle,
                  sizeof(szTitle),
-                 WINDOW_TITLE, display, (int) pScreenInfo->dwScreen);
+                 WINDOW_TITLE, HostName, display, (int) pScreenInfo->dwScreen);
+  }
 
     /* Create the window */
     *phwnd = CreateWindowExA(0, /* Extended styles */
@@ -351,9 +345,7 @@ winCreateBoundingWindowWindowed(ScreenPtr pScreen)
         return FALSE;
     }
 
-#if CYGDEBUG
     winDebug("winCreateBoundingWindowWindowed - CreateWindowEx () returned\n");
-#endif
 
     if (fForceShowWindow) {
         ErrorF
diff --git a/xorg-server/hw/xwin/wincursor.c b/xorg-server/hw/xwin/wincursor.c
index 2962d06ad..8e8c6fd3d 100644..100755
--- a/xorg-server/hw/xwin/wincursor.c
+++ b/xorg-server/hw/xwin/wincursor.c
@@ -43,10 +43,9 @@
 
 #define BRIGHTNESS(x) (x##Red * 0.299 + x##Green * 0.587 + x##Blue * 0.114)
 
-#if 0
-#define WIN_DEBUG_MSG winDebug
-#else
-#define WIN_DEBUG_MSG(...)
+#ifdef _MSC_VER
+#define min(a,b) (((a) < (b)) ? (a) : (b))
+#define max(a,b) (((a) > (b)) ? (a) : (b))
 #endif
 
 /*
@@ -82,7 +81,7 @@ winPointerWarpCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
         /* Don't ignore subsequent warps */
         s_fInitialWarp = FALSE;
 
-        winErrorFVerb(2,
+        winDebug (
                       "winPointerWarpCursor - Discarding first warp: %d %d\n",
                       x, y);
 
@@ -164,7 +163,7 @@ winLoadCursor(ScreenPtr pScreen, CursorPtr pCursor, int screen)
     BITMAPINFO *pbmi;
     unsigned long *lpBits;
 
-    WIN_DEBUG_MSG("winLoadCursor: Win32: %dx%d X11: %dx%d hotspot: %d,%d\n",
+    winDebug("winLoadCursor: Win32: %dx%d X11: %dx%d hotspot: %d,%d\n", 
                   pScreenPriv->cursor.sm_cx, pScreenPriv->cursor.sm_cy,
                   pCursor->bits->width, pCursor->bits->height,
                   pCursor->bits->xhot, pCursor->bits->yhot);
@@ -178,7 +177,7 @@ winLoadCursor(ScreenPtr pScreen, CursorPtr pCursor, int screen)
     /* Check wether the X11 cursor is bigger than the win32 cursor */
     if (pScreenPriv->cursor.sm_cx < pCursor->bits->width ||
         pScreenPriv->cursor.sm_cy < pCursor->bits->height) {
-        winErrorFVerb(3,
+        ErrorF (
                       "winLoadCursor - Windows requires %dx%d cursor but X requires %dx%d\n",
                       pScreenPriv->cursor.sm_cx, pScreenPriv->cursor.sm_cy,
                       pCursor->bits->width, pCursor->bits->height);
@@ -242,7 +241,7 @@ winLoadCursor(ScreenPtr pScreen, CursorPtr pCursor, int screen)
 
     /* We have a truecolor alpha-blended cursor and can use it! */
     if (pCursor->bits->argb) {
-        WIN_DEBUG_MSG("winLoadCursor: Trying truecolor alphablended cursor\n");
+        winDebug("winLoadCursor: Trying truecolor alphablended cursor\n"); 
         memset(&bi, 0, sizeof(BITMAPV4HEADER));
         bi.bV4Size = sizeof(BITMAPV4HEADER);
         bi.bV4Width = pScreenPriv->cursor.sm_cx;
@@ -274,7 +273,7 @@ winLoadCursor(ScreenPtr pScreen, CursorPtr pCursor, int screen)
 
     if (!lpBits) {
         /* Bicolor, use a palettized DIB */
-        WIN_DEBUG_MSG("winLoadCursor: Trying two color cursor\n");
+        winDebug("winLoadCursor: Trying two color cursor\n"); 
         pbmi = (BITMAPINFO *) &bi;
         memset(pbmi, 0, sizeof(BITMAPINFOHEADER));
         pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
@@ -342,7 +341,7 @@ winLoadCursor(ScreenPtr pScreen, CursorPtr pCursor, int screen)
 
     /* If one of the previous two methods gave us the bitmap we need, make a cursor */
     if (lpBits) {
-        WIN_DEBUG_MSG("winLoadCursor: Creating bitmap cursor: hotspot %d,%d\n",
+        winDebug("winLoadCursor: Creating bitmap cursor: hotspot %d,%d\n",
                       pCursor->bits->xhot, pCursor->bits->yhot);
 
         hAnd = NULL;
@@ -372,13 +371,12 @@ winLoadCursor(ScreenPtr pScreen, CursorPtr pCursor, int screen)
             hCursor = (HCURSOR) CreateIconIndirect(&ii);
 
             if (hCursor == NULL)
-                winW32Error(2, "winLoadCursor - CreateIconIndirect failed:");
+                winW32Error("winLoadCursor - CreateIconIndirect failed:");
             else {
                 if (GetIconInfo(hCursor, &ii)) {
                     if (ii.fIcon) {
-                        WIN_DEBUG_MSG
+                        winDebug
                             ("winLoadCursor: CreateIconIndirect returned  no cursor. Trying again.\n");
-
                         DestroyCursor(hCursor);
 
                         ii.fIcon = FALSE;
@@ -387,7 +385,7 @@ winLoadCursor(ScreenPtr pScreen, CursorPtr pCursor, int screen)
                         hCursor = (HCURSOR) CreateIconIndirect(&ii);
 
                         if (hCursor == NULL)
-                            winW32Error(2,
+                            winW32Error(
                                         "winLoadCursor - CreateIconIndirect failed:");
                     }
                     /* GetIconInfo creates new bitmaps. Destroy them again */
@@ -413,7 +411,7 @@ winLoadCursor(ScreenPtr pScreen, CursorPtr pCursor, int screen)
                                pScreenPriv->cursor.sm_cx,
                                pScreenPriv->cursor.sm_cy, pAnd, pXor);
         if (hCursor == NULL)
-            winW32Error(2, "winLoadCursor - CreateCursor failed:");
+            winW32Error("winLoadCursor - CreateCursor failed:");
     }
     free(pAnd);
     free(pXor);
@@ -468,7 +466,7 @@ winSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor, int x,
     BOOL bInhibit;
 
     winScreenPriv(pScreen);
-    WIN_DEBUG_MSG("winSetCursor: cursor=%p\n", pCursor);
+    winDebug("winSetCursor: cursor=%p\n", pCursor); 
 
     /* Inhibit changing the cursor if the mouse is not in a client area */
     bInhibit = FALSE;
@@ -510,7 +508,7 @@ winSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor, int x,
         }
         pScreenPriv->cursor.handle =
             winLoadCursor(pScreen, pCursor, pScreen->myNum);
-        WIN_DEBUG_MSG("winSetCursor: handle=%p\n", pScreenPriv->cursor.handle);
+        winDebug("winSetCursor: handle=%p\n", pScreenPriv->cursor.handle); 
 
         if (!bInhibit)
             SetCursor(pScreenPriv->cursor.handle);
@@ -601,9 +599,11 @@ winInitCursor(ScreenPtr pScreen)
     pPointPriv = (miPointerScreenPtr)
         dixLookupPrivate(&pScreen->devPrivates, miPointerScreenKey);
 
-    pScreenPriv->cursor.spriteFuncs = pPointPriv->spriteFuncs;
-    pPointPriv->spriteFuncs = &winSpriteFuncsRec;
-
+    if (pPointPriv)
+    {
+        pScreenPriv->cursor.spriteFuncs = pPointPriv->spriteFuncs;
+        pPointPriv->spriteFuncs = &winSpriteFuncsRec;
+    }
     pScreenPriv->cursor.handle = NULL;
     pScreenPriv->cursor.visible = FALSE;
 
diff --git a/xorg-server/hw/xwin/windialogs.c b/xorg-server/hw/xwin/windialogs.c
index a02146e95..7d7abcc25 100644
--- a/xorg-server/hw/xwin/windialogs.c
+++ b/xorg-server/hw/xwin/windialogs.c
@@ -192,8 +192,8 @@ winInitDialog(HWND hwndDlg)
      */
     if (GetSystemMetrics(SM_CMONITORS) > 1) {
         /* Still need to refresh the frame change. */
-        SetWindowPos(hwndDlg, HWND_TOPMOST, 0, 0, 0, 0,
-                     SWP_NOMOVE | SWP_NOSIZE | SWP_FRAMECHANGED);
+    SetWindowPos (hwndDlg, HWND_TOP, 0,0,0,0,
+		  SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_FRAMECHANGED);
     }
     else {
         GetWindowRect(hwndDesk, &rcDesk);
@@ -232,12 +232,8 @@ winInitDialog(HWND hwndDlg)
     PostMessage(hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM) hIconSmall);
 }
 
-/*
- * Display the Exit dialog box
- */
-
-void
-winDisplayExitDialog(winPrivScreenPtr pScreenPriv)
+int
+GetLiveClients (winPrivScreenPtr pScreenPriv)
 {
     int i;
     int liveClients = 0;
@@ -260,6 +256,20 @@ winDisplayExitDialog(winPrivScreenPtr pScreenPriv)
     if (liveClients < 0)
         liveClients = 0;
 
+  pScreenPriv->iConnectedClients = liveClients;
+
+  return liveClients;
+}
+
+/*
+ * Display the Exit dialog box
+ */
+
+void
+winDisplayExitDialog (winPrivScreenPtr pScreenPriv)
+{
+  int liveClients = GetLiveClients(pScreenPriv);
+
     /* Don't show the exit confirmation dialog if SilentExit & no clients,
        or ForceExit, is enabled */
     if ((pref.fSilentExit && liveClients <= 0) || pref.fForceExit) {
@@ -271,8 +281,6 @@ winDisplayExitDialog(winPrivScreenPtr pScreenPriv)
         return;
     }
 
-    pScreenPriv->iConnectedClients = liveClients;
-
     /* Check if dialog already exists */
     if (g_hDlgExit != NULL) {
         /* Dialog box already exists, display it */
@@ -411,9 +419,9 @@ winDisplayDepthChangeDialog(winPrivScreenPtr pScreenPriv)
     /* Show the dialog box */
     ShowWindow(g_hDlgDepthChange, SW_SHOW);
 
-    ErrorF("winDisplayDepthChangeDialog - DialogBox returned: %d\n",
+    winDebug ("winDisplayDepthChangeDialog - DialogBox returned: %d\n",
            (int) g_hDlgDepthChange);
-    ErrorF("winDisplayDepthChangeDialog - GetLastError: %d\n",
+    winDebug ("winDisplayDepthChangeDialog - GetLastError: %d\n",
            (int) GetLastError());
 
     /* Minimize the display window */
@@ -433,51 +441,41 @@ winChangeDepthDlgProc(HWND hwndDialog, UINT message,
     static winScreenInfo *s_pScreenInfo = NULL;
     static ScreenPtr s_pScreen = NULL;
 
-#if CYGDEBUG
     winDebug("winChangeDepthDlgProc\n");
-#endif
 
     /* Branch on message type */
     switch (message) {
     case WM_INITDIALOG:
-#if CYGDEBUG
         winDebug("winChangeDepthDlgProc - WM_INITDIALOG\n");
-#endif
 
         /* Store pointers to private structures for future use */
         s_pScreenPriv = (winPrivScreenPtr) lParam;
         s_pScreenInfo = s_pScreenPriv->pScreenInfo;
         s_pScreen = s_pScreenInfo->pScreen;
 
-#if CYGDEBUG
         winDebug("winChangeDepthDlgProc - WM_INITDIALOG - s_pScreenPriv: %08x, "
                  "s_pScreenInfo: %08x, s_pScreen: %08x\n",
                  s_pScreenPriv, s_pScreenInfo, s_pScreen);
-#endif
 
-#if CYGDEBUG
         winDebug("winChangeDepthDlgProc - WM_INITDIALOG - orig bpp: %d, "
                  "current bpp: %d\n",
                  s_pScreenInfo->dwBPP,
                  GetDeviceCaps(s_pScreenPriv->hdcScreen, BITSPIXEL));
-#endif
 
         winInitDialog(hwndDialog);
 
         return TRUE;
 
     case WM_DISPLAYCHANGE:
-#if CYGDEBUG
         winDebug("winChangeDepthDlgProc - WM_DISPLAYCHANGE - orig bpp: %d, "
                  "new bpp: %d\n",
                  s_pScreenInfo->dwBPP,
                  GetDeviceCaps(s_pScreenPriv->hdcScreen, BITSPIXEL));
-#endif
 
         /* Dismiss the dialog if the display returns to the original depth */
         if (GetDeviceCaps(s_pScreenPriv->hdcScreen, BITSPIXEL) ==
             s_pScreenInfo->dwBPP) {
-            ErrorF("winChangeDelthDlgProc - wParam == s_pScreenInfo->dwBPP\n");
+        	  winDebug ("winChangeDelthDlgProc - wParam == s_pScreenInfo->dwBPP\n");
 
             /* Depth has been restored, dismiss dialog */
             DestroyWindow(g_hDlgDepthChange);
@@ -565,16 +563,12 @@ winAboutDlgProc(HWND hwndDialog, UINT message, WPARAM wParam, LPARAM lParam)
     static winScreenInfo *s_pScreenInfo = NULL;
     static ScreenPtr s_pScreen = NULL;
 
-#if CYGDEBUG
     winDebug("winAboutDlgProc\n");
-#endif
 
     /* Branch on message type */
     switch (message) {
     case WM_INITDIALOG:
-#if CYGDEBUG
         winDebug("winAboutDlgProc - WM_INITDIALOG\n");
-#endif
 
         /* Store pointers to private structures for future use */
         s_pScreenPriv = (winPrivScreenPtr) lParam;
diff --git a/xorg-server/hw/xwin/windisplay.c b/xorg-server/hw/xwin/windisplay.c
new file mode 100644
index 000000000..db7b2f4d8
--- /dev/null
+++ b/xorg-server/hw/xwin/windisplay.c
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) Jon TURNEY 2009
+ *
+ * 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.
+ *
+ */
+
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
+#include "win.h"
+
+#include <X11/Xwindows.h>
+
+/*
+  Generate a display name string referring to the display of this server,
+  using a transport we know is enabled
+*/
+
+void
+winGetDisplayName(char *szDisplay, unsigned int screen)
+{
+  if (TransIsListening("local"))
+    {
+      snprintf(szDisplay, 512, ":%s.%d", display, screen);
+    }
+  else if (TransIsListening("inet"))
+    {
+      snprintf(szDisplay, 512, "127.0.0.1:%s.%d", display, screen);
+    }
+  else if (TransIsListening("inet6"))
+    {
+      snprintf(szDisplay, 512, "[::1]:%s.%d", display, screen);
+    }
+  else
+    {
+      // this can't happen!
+      winDebug ("winGetDisplay: Don't know what to use for DISPLAY\n");
+      snprintf(szDisplay, 512, "localhost:%s.%d", display, screen);
+    }
+
+  winDebug ("winGetDisplay: DISPLAY=%s\n", szDisplay);
+}
diff --git a/xorg-server/hw/xwin/winengine.c b/xorg-server/hw/xwin/winengine.c
index 1f55ada58..e597e2c49 100644
--- a/xorg-server/hw/xwin/winengine.c
+++ b/xorg-server/hw/xwin/winengine.c
@@ -85,13 +85,13 @@ winDetectSupportedEngines(void)
         ddrval = (*g_fpDirectDrawCreate) (NULL, (void **) &lpdd, NULL);
         if (FAILED(ddrval)) {
             /* No DirectDraw support */
-            winErrorFVerb(2,
+            winDebug (
                           "winDetectSupportedEngines - DirectDraw not installed\n");
             return;
         }
         else {
             /* We have DirectDraw */
-            winErrorFVerb(2,
+	          winDebug (
                           "winDetectSupportedEngines - DirectDraw installed, allowing ShadowDD\n");
             g_dwEnginesSupported |= WIN_SERVER_SHADOW_DD;
 
@@ -99,7 +99,7 @@ winDetectSupportedEngines(void)
             /* Allow PrimaryDD engine if NT */
             if (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT) {
                 g_dwEnginesSupported |= WIN_SERVER_PRIMARY_DD;
-                winErrorFVerb(2,
+	              winDebug (
                               "winDetectSupportedEngines - Windows NT, allowing PrimaryDD\n");
             }
 #endif
@@ -111,7 +111,7 @@ winDetectSupportedEngines(void)
                                             (LPVOID *) &lpdd4);
         if (SUCCEEDED(ddrval)) {
             /* We have DirectDraw4 */
-            winErrorFVerb(2,
+	          winDebug (
                           "winDetectSupportedEngines - DirectDraw4 installed, allowing ShadowDDNL\n");
             g_dwEnginesSupported |= WIN_SERVER_SHADOW_DDNL;
         }
@@ -123,7 +123,7 @@ winDetectSupportedEngines(void)
             IDirectDraw_Release(lpdd);
     }
 
-    winErrorFVerb(2,
+    winDebug (
                   "winDetectSupportedEngines - Returning, supported engines %08x\n",
                   (unsigned int) g_dwEnginesSupported);
 }
@@ -162,7 +162,7 @@ winSetEngine(ScreenPtr pScreen)
 
     /* ShadowGDI is the only engine that supports windowed PseudoColor */
     if (dwBPP == 8 && !pScreenInfo->fFullScreen) {
-        winErrorFVerb(2,
+        winDebug (
                       "winSetEngine - Windowed && PseudoColor => ShadowGDI\n");
         pScreenInfo->dwEngine = WIN_SERVER_SHADOW_GDI;
 
@@ -180,7 +180,7 @@ winSetEngine(ScreenPtr pScreen)
         || pScreenInfo->fMultiWindow
 #endif
         ) {
-        winErrorFVerb(2,
+        winDebug (
                       "winSetEngine - Multi Window or Rootless => ShadowGDI\n");
         pScreenInfo->dwEngine = WIN_SERVER_SHADOW_GDI;
 
@@ -189,9 +189,9 @@ winSetEngine(ScreenPtr pScreen)
         return TRUE;
     }
 
-    /* If the user's choice is supported, we'll use that */
-    if (g_dwEnginesSupported & pScreenInfo->dwEnginePreferred) {
-        winErrorFVerb(2, "winSetEngine - Using user's preference: %d\n",
+  /* If there is a user's choice, we'll use that */
+  if (pScreenInfo->dwEnginePreferred) {
+        winDebug ("winSetEngine - Using user's preference: %d\n",
                       (int) pScreenInfo->dwEnginePreferred);
         pScreenInfo->dwEngine = pScreenInfo->dwEnginePreferred;
 
@@ -217,14 +217,14 @@ winSetEngine(ScreenPtr pScreen)
             break;
 #endif
         default:
-            FatalError("winSetEngine - Invalid engine type\n");
+            FatalError ("winSetEngine - Invalid engine type %d\n",pScreenInfo->dwEngine);
         }
         return TRUE;
     }
 
     /* ShadowDDNL has good performance, so why not */
     if (g_dwEnginesSupported & WIN_SERVER_SHADOW_DDNL) {
-        winErrorFVerb(2, "winSetEngine - Using Shadow DirectDraw NonLocking\n");
+        winDebug ("winSetEngine - Using Shadow DirectDraw NonLocking\n");
         pScreenInfo->dwEngine = WIN_SERVER_SHADOW_DDNL;
 
         /* Set engine function pointers */
@@ -234,7 +234,7 @@ winSetEngine(ScreenPtr pScreen)
 
     /* ShadowDD is next in line */
     if (g_dwEnginesSupported & WIN_SERVER_SHADOW_DD) {
-        winErrorFVerb(2, "winSetEngine - Using Shadow DirectDraw\n");
+        winDebug ("winSetEngine - Using Shadow DirectDraw\n");
         pScreenInfo->dwEngine = WIN_SERVER_SHADOW_DD;
 
         /* Set engine function pointers */
@@ -244,7 +244,7 @@ winSetEngine(ScreenPtr pScreen)
 
     /* ShadowGDI is next in line */
     if (g_dwEnginesSupported & WIN_SERVER_SHADOW_GDI) {
-        winErrorFVerb(2, "winSetEngine - Using Shadow GDI DIB\n");
+        winDebug ("winSetEngine - Using Shadow GDI DIB\n");
         pScreenInfo->dwEngine = WIN_SERVER_SHADOW_GDI;
 
         /* Set engine function pointers */
diff --git a/xorg-server/hw/xwin/winerror.c b/xorg-server/hw/xwin/winerror.c
index 1318b0f36..859a66834 100644
--- a/xorg-server/hw/xwin/winerror.c
+++ b/xorg-server/hw/xwin/winerror.c
@@ -35,6 +35,7 @@
 #include <../xfree86/common/xorgVersion.h>
 #include "win.h"
 
+extern Bool		g_fSilentDupError;
 #ifdef DDXOSVERRORF
 void
 OsVendorVErrorF(const char *pszFormat, va_list va_args)
@@ -48,6 +49,24 @@ OsVendorVErrorF(const char *pszFormat, va_list va_args)
     pthread_mutex_lock(&s_pmPrinting);
 #endif
 
+  /*
+     If we want to silence it,
+     detect if we are going to abort due to duplication error
+  */
+  if (g_fSilentDupError)
+    {
+      if ((strcmp(pszFormat,
+		  "InitOutput - Duplicate invocation on display "
+		  "number: %s.  Exiting.\n") == 0)
+	  || (strcmp(pszFormat,
+		     "Server is already active for display %s\n%s %s\n%s\n") == 0)
+	  || (strcmp(pszFormat,
+		     "MakeAllCOTSServerListeners: server already running\n") == 0))
+	{
+	  g_fSilentFatalError = TRUE;
+	}
+    }
+
     /* Print the error message to a log file, could be stderr */
     LogVWrite(0, pszFormat, va_args);
 
@@ -64,11 +83,10 @@ OsVendorVErrorF(const char *pszFormat, va_list va_args)
  *
  * Attempt to do last-ditch, safe, important cleanup here.
  */
+char g_FatalErrorMessage[1024];
 void
 OsVendorFatalError(const char *f, va_list args)
 {
-    char errormsg[1024] = "";
-
     /* Don't give duplicate warning if UseMsg was called */
     if (g_fSilentFatalError)
         return;
@@ -79,9 +97,6 @@ OsVendorFatalError(const char *f, va_list args)
     }
     LogClose(EXIT_ERR_ABORT);
 
-    /* Format the error message */
-    vsnprintf(errormsg, sizeof(errormsg), f, args);
-
     /*
        Sometimes the error message needs a bit of cosmetic cleaning
        up for use in a dialog box...
@@ -89,7 +104,7 @@ OsVendorFatalError(const char *f, va_list args)
     {
         char *s;
 
-        while ((s = strstr(errormsg, "\n\t")) != NULL) {
+        while ((s = strstr(g_FatalErrorMessage, "\n\t")) != NULL) {
             s[0] = ' ';
             s[1] = '\n';
         }
@@ -99,7 +114,7 @@ OsVendorFatalError(const char *f, va_list args)
                    "%s\n\n"
                    "Please open %s for more information.\n",
                    MB_ICONERROR,
-                   errormsg,
+                   g_FatalErrorMessage,
                    (g_pszLogFile ? g_pszLogFile : "the logfile"));
 }
 
diff --git a/xorg-server/hw/xwin/winfont.c b/xorg-server/hw/xwin/winfont.c
index 7bcbce1c7..e7356486d 100644
--- a/xorg-server/hw/xwin/winfont.c
+++ b/xorg-server/hw/xwin/winfont.c
@@ -43,9 +43,7 @@ winRealizeFontNativeGDI(ScreenPtr pScreen, FontPtr pFont)
 
     winScreenPriv(pScreen);
 
-#if CYGDEBUG
-    winTrace("winRealizeFont (%p, %p)\n", pScreen, pFont);
-#endif
+    winDebug("winRealizeFont (%p, %p)\n", pScreen, pFont);
 
     WIN_UNWRAP(RealizeFont);
     if (pScreen->RealizeFont)
@@ -64,9 +62,7 @@ winUnrealizeFontNativeGDI(ScreenPtr pScreen, FontPtr pFont)
 
     winScreenPriv(pScreen);
 
-#if CYGDEBUG
-    winTrace("winUnrealizeFont (%p, %p)\n", pScreen, pFont);
-#endif
+    winDebug("winUnrealizeFont (%p, %p)\n", pScreen, pFont);
 
     WIN_UNWRAP(UnrealizeFont);
     if (pScreen->UnrealizeFont)
@@ -74,9 +70,5 @@ winUnrealizeFontNativeGDI(ScreenPtr pScreen, FontPtr pFont)
     WIN_WRAP(UnrealizeFont, winUnrealizeFontNativeGDI);
 
     return fResult;
-#if CYGDEBUG
-    winDebug("winUnrealizeFont()\n");
-#endif
-    return TRUE;
 }
 #endif
diff --git a/xorg-server/hw/xwin/wingc.c b/xorg-server/hw/xwin/wingc.c
index 814d53113..aba398d0a 100644
--- a/xorg-server/hw/xwin/wingc.c
+++ b/xorg-server/hw/xwin/wingc.c
@@ -37,46 +37,13 @@
  * Local prototypes
  */
 
-#if 0
-static void
- winChangeGCNativeGDI(GCPtr pGC, unsigned long ulChanges);
-#endif
-
 static void
 
 winValidateGCNativeGDI(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable);
 
-#if 0
-static void
- winCopyGCNativeGDI(GCPtr pGCsrc, unsigned long ulMask, GCPtr pGCdst);
-#endif
-
 static void
  winDestroyGCNativeGDI(GCPtr pGC);
 
-#if 0
-static void
- winChangeClipNativeGDI(GCPtr pGC, int nType, pointer pValue, int nRects);
-
-static void
- winDestroyClipNativeGDI(GCPtr pGC);
-
-static void
- winCopyClipNativeGDI(GCPtr pGCdst, GCPtr pGCsrc);
-#endif
-
-#if 0
-/* GC Handling Routines */
-const GCFuncs winGCFuncs = {
-    winValidateGCNativeGDI,
-    winChangeGCNativeGDI,
-    winCopyGCNativeGDI,
-    winDestroyGCNativeGDI,
-    winChangeClipNativeGDI,
-    winDestroyClipNativeGDI,
-    winCopyClipNativeGDI,
-};
-#else
 const GCFuncs winGCFuncs = {
     winValidateGCNativeGDI,
     miChangeGC,
@@ -86,7 +53,6 @@ const GCFuncs winGCFuncs = {
     miDestroyClip,
     miCopyClip,
 };
-#endif
 
 /* Drawing Primitives */
 const GCOps winGCOps = {
@@ -107,13 +73,8 @@ const GCOps winGCOps = {
     miPolyText16,
     miImageText8,
     miImageText16,
-#if 0
-    winImageGlyphBltNativeGDI,
-    winPolyGlyphBltNativeGDI,
-#else
     miImageGlyphBlt,
     miPolyGlyphBlt,
-#endif
     miPushPixels,
 };
 
@@ -126,9 +87,7 @@ winCreateGCNativeGDI(GCPtr pGC)
     winPrivGCPtr pGCPriv = NULL;
     winPrivScreenPtr pScreenPriv = NULL;
 
-#if 0
-    ErrorF("winCreateGCNativeGDI - depth: %d\n", pGC->depth);
-#endif
+  winDebug ("winCreateGCNativeGDI - depth: %d\n", pGC->depth);
 
     pGC->ops = (GCOps *) &winGCOps;
     pGC->funcs = (GCFuncs *) &winGCFuncs;
@@ -153,17 +112,6 @@ winCreateGCNativeGDI(GCPtr pGC)
     return TRUE;
 }
 
-#if 0
-/* See Porting Layer Definition - p. 45 */
-static void
-winChangeGCNativeGDI(GCPtr pGC, unsigned long ulChanges)
-{
-#if 0
-    ErrorF("winChangeGCNativeGDI () - Doing nothing\n");
-#endif
-}
-#endif
-
 static void
 winValidateGCNativeGDI(GCPtr pGC,
                        unsigned long ulChanges, DrawablePtr pDrawable)
@@ -176,15 +124,6 @@ winValidateGCNativeGDI(GCPtr pGC,
     }
 }
 
-#if 0
-/* See Porting Layer Definition - p. 46 */
-static void
-winCopyGCNativeGDI(GCPtr pGCsrc, unsigned long ulMask, GCPtr pGCdst)
-{
-
-}
-#endif
-
 /* See Porting Layer Definition - p. 46 */
 static void
 winDestroyGCNativeGDI(GCPtr pGC)
@@ -210,26 +149,3 @@ winDestroyGCNativeGDI(GCPtr pGC)
     /* Invalidate the GC privates pointer */
     winSetGCPriv(pGC, NULL);
 }
-
-#if 0
-/* See Porting Layer Definition - p. 46 */
-static void
-winChangeClipNativeGDI(GCPtr pGC, int nType, pointer pValue, int nRects)
-{
-
-}
-
-/* See Porting Layer Definition - p. 47 */
-static void
-winDestroyClipNativeGDI(GCPtr pGC)
-{
-
-}
-
-/* See Porting Layer Definition - p. 47 */
-static void
-winCopyClipNativeGDI(GCPtr pGCdst, GCPtr pGCsrc)
-{
-
-}
-#endif
diff --git a/xorg-server/hw/xwin/wingetsp.c b/xorg-server/hw/xwin/wingetsp.c
index 049e2c939..1076b5cc5 100644
--- a/xorg-server/hw/xwin/wingetsp.c
+++ b/xorg-server/hw/xwin/wingetsp.c
@@ -57,9 +57,7 @@ winGetSpansNativeGDI(DrawablePtr pDrawable,
     /* Branch on the drawable type */
     switch (pDrawable->type) {
     case DRAWABLE_PIXMAP:
-#if 0
-        ErrorF("winGetSpans - DRAWABLE_PIXMAP %08x\n", pDrawable);
-#endif
+      winDebug ("winGetSpans - DRAWABLE_PIXMAP %08x\n", pDrawable);
 
         pPixmap = (PixmapPtr) pDrawable;
         pPixmapPriv = winGetPixmapPriv(pPixmap);
@@ -98,12 +96,6 @@ winGetSpansNativeGDI(DrawablePtr pDrawable,
             SelectObject(hdcMem, hbmpOrig);
             DeleteObject(hbmpWindow);
 
-#if 0
-            ErrorF("(%dx%dx%d) (%d,%d) w: %d\n",
-                   pDrawable->width, pDrawable->height, pDrawable->depth,
-                   pPoint->x, pPoint->y, *piWidth);
-#endif
-
             /* Calculate offset of next bit destination */
             pDst += PixmapBytePad(*piWidth, pDrawable->depth);
         }
@@ -117,9 +109,6 @@ winGetSpansNativeGDI(DrawablePtr pDrawable,
         break;
 
     case DRAWABLE_WINDOW:
-#if 0
-        ErrorF("winGetSpans - DRAWABLE_WINDOW\n");
-#endif
 
         /* Open a memory HDC */
         hdcMem = CreateCompatibleDC(NULL);
@@ -150,12 +139,6 @@ winGetSpansNativeGDI(DrawablePtr pDrawable,
 
             DeleteObject(hbmpWindow);
 
-#if 0
-            ErrorF("(%dx%dx%d) (%d,%d) w: %d\n",
-                   pDrawable->width, pDrawable->height, pDrawable->depth,
-                   pPoint->x, pPoint->y, *piWidth);
-#endif
-
             /* Calculate offset of next bit destination */
             pDst += PixmapBytePad(*piWidth, pDrawable->depth);
         }
diff --git a/xorg-server/hw/xwin/winglobals.c b/xorg-server/hw/xwin/winglobals.c
index b34d1a751..58dec7833 100644
--- a/xorg-server/hw/xwin/winglobals.c
+++ b/xorg-server/hw/xwin/winglobals.c
@@ -78,13 +78,13 @@ Bool g_fNoHelpMessageBox = FALSE;
 Bool g_fSoftwareCursor = FALSE;
 Bool g_fSilentDupError = FALSE;
 Bool g_fNativeGl = TRUE;
+Bool g_fswrastwgl = FALSE;
 
 #ifdef XWIN_CLIPBOARD
 /*
  * Wrapped DIX functions
  */
 winDispatchProcPtr winProcEstablishConnectionOrig = NULL;
-winDispatchProcPtr winProcQueryTreeOrig = NULL;
 winDispatchProcPtr winProcSetSelectionOwnerOrig = NULL;
 
 /*
@@ -93,6 +93,7 @@ winDispatchProcPtr winProcSetSelectionOwnerOrig = NULL;
 
 Bool g_fUnicodeClipboard = TRUE;
 Bool g_fClipboard = TRUE;
+Bool g_fClipboardPrimary = TRUE;
 Bool g_fClipboardLaunched = FALSE;
 Bool g_fClipboardStarted = FALSE;
 pthread_t g_ptClipboardProc;
diff --git a/xorg-server/hw/xwin/winglobals.h b/xorg-server/hw/xwin/winglobals.h
index d2e2ba2b4..ae2385255 100644
--- a/xorg-server/hw/xwin/winglobals.h
+++ b/xorg-server/hw/xwin/winglobals.h
@@ -52,6 +52,7 @@ extern Bool g_fXdmcpEnabled;
 extern Bool g_fNoHelpMessageBox;
 extern Bool g_fSilentDupError;
 extern Bool g_fNativeGl;
+extern Bool                     g_fswrastwgl;
 
 extern HWND g_hDlgDepthChange;
 extern HWND g_hDlgExit;
@@ -69,7 +70,6 @@ typedef int (*winDispatchProcPtr) (ClientPtr);
  * Wrapped DIX functions
  */
 extern winDispatchProcPtr winProcEstablishConnectionOrig;
-extern winDispatchProcPtr winProcQueryTreeOrig;
 extern winDispatchProcPtr winProcSetSelectionOwnerOrig;
 #endif
 
diff --git a/xorg-server/hw/xwin/winkeybd.c b/xorg-server/hw/xwin/winkeybd.c
index 27c114c99..1d242a2ba 100644
--- a/xorg-server/hw/xwin/winkeybd.c
+++ b/xorg-server/hw/xwin/winkeybd.c
@@ -153,7 +153,7 @@ winKeybdProc(DeviceIntPtr pDeviceInt, int iState)
         /* FIXME: Maybe we should use winGetKbdLeds () here? */
         defaultKeyboardControl.leds = g_winInfo.keyboard.leds;
 
-        winErrorFVerb(2, "Rules = \"%s\" Model = \"%s\" Layout = \"%s\""
+        winDebug("Rules = \"%s\" Model = \"%s\" Layout = \"%s\""
                       " Variant = \"%s\" Options = \"%s\"\n",
                       g_winInfo.xkb.rules ? g_winInfo.xkb.rules : "none",
                       g_winInfo.xkb.model ? g_winInfo.xkb.model : "none",
@@ -171,8 +171,7 @@ winKeybdProc(DeviceIntPtr pDeviceInt, int iState)
             ctrl->repeat_interval = 1000 / g_winInfo.keyboard.rate;
         }
         else {
-            winErrorFVerb(1,
-                          "winKeybdProc - Error initializing keyboard AutoRepeat\n");
+            winDebug ("winKeybdProc - Error initializing keyboard AutoRepeat\n");
         }
 
         break;
@@ -262,6 +261,21 @@ winRestoreModeKeyStates(void)
         XkbStateFieldFromRec(&inputInfo.keyboard->key->xkbInfo->state);
     winDebug("winRestoreModeKeyStates: state %d\n", internalKeyStates);
 
+    {
+        /* Make sure the message queue is empty, otherwise the GetKeyState will not always
+          return the correct state of the numlock key, capslock key, ... 
+          This is mainly because this function is called from the WM_SETFOCUS handler. 
+          From MSDN GetKeyState: The key status returned from this function changes as a thread
+          reads key messages from its message queue.*/
+        MSG msg;
+
+        /* Process all messages on our queue */
+        while (PeekMessage (&msg, NULL, 0, 0, PM_REMOVE))
+        {
+            DispatchMessage (&msg);
+        }
+    }
+
     /* Check if modifier keys are pressed, and if so, fake a press */
     {
         BOOL ctrl = (GetAsyncKeyState(VK_CONTROL) < 0);
diff --git a/xorg-server/hw/xwin/winkeybd.h b/xorg-server/hw/xwin/winkeybd.h
index 6701f0959..545aef751 100644
--- a/xorg-server/hw/xwin/winkeybd.h
+++ b/xorg-server/hw/xwin/winkeybd.h
@@ -39,8 +39,10 @@
 
 #define		WIN_KEYMAP_COLS		3
 
-/* Rows 160 through 165 correspond to software-generated codes, which
- * may not be associated with the appropriate scan code.
+/* ASCII column, rows 33 through 40 are for Speech Recognition with
+ * num-lock asserted.
+ * Rows 160 through 165 correspond to software-generated codes, which
+ * may not be associated with the appropriate scan code/extended bit
  */
 const int
  g_iKeyMap[] = {
@@ -78,14 +80,14 @@ const int
     /* 30 */ 0, 0, 0,
     /* 31 */ 0, 0, 0,
     /* 32 */ 0, 0, 0,
-    /* 33 */ VK_PRIOR, 0, KEY_PgUp,
-    /* 34 */ VK_NEXT, 0, KEY_PgDown,
-    /* 35 */ VK_END, 0, KEY_End,
-    /* 36 */ VK_HOME, 0, KEY_Home,
-    /* 37 */ VK_LEFT, 0, KEY_Left,
-    /* 38 */ VK_UP, 0, KEY_Up,
-    /* 39 */ VK_RIGHT, 0, KEY_Right,
-    /* 40 */ VK_DOWN, 0, KEY_Down,
+    /* 33 */	VK_PRIOR,	KEY_PgUp,	KEY_PgUp,
+    /* 34 */	VK_NEXT,	KEY_PgDown,	KEY_PgDown,
+    /* 35 */	VK_END,		KEY_End,	KEY_End,
+    /* 36 */	VK_HOME,	KEY_Home,	KEY_Home,
+    /* 37 */	VK_LEFT,	KEY_Left,	KEY_Left,
+    /* 38 */	VK_UP,		KEY_Up,	 	KEY_Up,
+    /* 39 */	VK_RIGHT,	KEY_Right,	KEY_Right,
+    /* 40 */	VK_DOWN,	KEY_Down,	KEY_Down,
     /* 41 */ 0, 0, 0,
     /* 42 */ 0, 0, 0,
     /* 43 */ 0, 0, 0,
@@ -205,12 +207,12 @@ const int
     /* 157 */ 0, 0, 0,
     /* 158 */ 0, 0, 0,
     /* 159 */ 0, 0, 0,
-    /* 160 */ VK_LSHIFT, KEY_ShiftL, 0,
-    /* 161 */ VK_RSHIFT, KEY_ShiftR, 0,
-    /* 162 */ VK_LCONTROL, KEY_LCtrl, 0,
-    /* 163 */ VK_RCONTROL, KEY_RCtrl, 0,
-    /* 164 */ VK_LMENU, KEY_Alt, 0,
-    /* 165 */ VK_RMENU, KEY_AltLang, 0,
+    /* 160 */	VK_LSHIFT,	KEY_ShiftL,	KEY_ShiftL,
+    /* 161 */	VK_RSHIFT,	KEY_ShiftR,	KEY_ShiftR,
+    /* 162 */	VK_LCONTROL,	KEY_LCtrl,	KEY_LCtrl,
+    /* 163 */	VK_RCONTROL,	KEY_RCtrl,	KEY_RCtrl,
+    /* 164 */	VK_LMENU,	KEY_Alt,	KEY_Alt,
+    /* 165 */	VK_RMENU,	KEY_AltLang,	KEY_AltLang,
     /* 166 */ 0, 0, 0,
     /* 167 */ 0, 0, 0,
     /* 168 */ 0, 0, 0,
@@ -268,7 +270,7 @@ const int
     /* 220 */ 0, 0, 0,
     /* 221 */ 0, 0, 0,
     /* 222 */ 0, 0, 0,
-                                        /* 223 */ VK_OEM_8, 0, KEY_RCtrl,
+    /* 223 */ VK_OEM_8, 0, KEY_RCtrl,
                                         /* at least on Canadian Multilingual Standard layout */
     /* 224 */ 0, 0, 0,
     /* 225 */ 0, 0, 0,
@@ -301,7 +303,7 @@ const int
     /* 252 */ 0, 0, 0,
     /* 253 */ 0, 0, 0,
     /* 254 */ 0, 0, 0,
-                                /* 255 */ VK_FN, 0, KEY_Fn
+    /* 255 */ VK_FN, 0, KEY_Fn
                                 /* Most keyboards don't generate a scancode for Fn, but a few do... */
 };
 
diff --git a/xorg-server/hw/xwin/winlayouts.h b/xorg-server/hw/xwin/winlayouts.h
index 8b6b98407..0aae18b00 100644
--- a/xorg-server/hw/xwin/winlayouts.h
+++ b/xorg-server/hw/xwin/winlayouts.h
@@ -64,6 +64,7 @@ WinKBLayoutRec winKBLayouts[] = {
     {0x0000040b, -1, "pc105", "fi", NULL, NULL, "Finnish"},
     {0x0000040c, -1, "pc105", "fr", NULL, NULL, "French (Standard)"},
     {0x0000080c, -1, "pc105", "be", NULL, NULL, "French (Belgian)"},
+    {0x0001080c, -1, "pc105", "be", NULL, NULL, "Belgian (Comma)"},
     {0x00000c0c, -1, "pc105", "ca", "fr-legacy", NULL,
      "French (Canada, Legacy)"},
     {0x0000100c, -1, "pc105", "ch", "fr", NULL, "French (Switzerland)"},
diff --git a/xorg-server/hw/xwin/winmisc.c b/xorg-server/hw/xwin/winmisc.c
index 10f97322f..f810ed073 100644
--- a/xorg-server/hw/xwin/winmisc.c
+++ b/xorg-server/hw/xwin/winmisc.c
@@ -44,7 +44,7 @@ void
 winQueryBestSizeNativeGDI(int class, unsigned short *pWidth,
                           unsigned short *pHeight, ScreenPtr pScreen)
 {
-    ErrorF("winQueryBestSizeNativeGDI\n");
+  winDebug ("winQueryBestSizeNativeGDI\n");
 }
 #endif
 
diff --git a/xorg-server/hw/xwin/winmonitors.c b/xorg-server/hw/xwin/winmonitors.c
index 955fb9214..916b8b0bb 100644
--- a/xorg-server/hw/xwin/winmonitors.c
+++ b/xorg-server/hw/xwin/winmonitors.c
@@ -32,6 +32,8 @@ from The Open Group.
 #endif
 
 #include "win.h"
+#define COMPILE_MULTIMON_STUBS
+#include <multimon.h>
 #include "winmonitors.h"
 
 /*
@@ -68,7 +70,5 @@ QueryMonitor(int i, struct GetMonitorInfoData *data)
     data->requestedMonitor = i;
 
     /* query information */
-    EnumDisplayMonitors(NULL, NULL, getMonitorInfo, (LPARAM) data);
-
-    return TRUE;
+    return !EnumDisplayMonitors(NULL, NULL, getMonitorInfo, (LPARAM) data);
 }
diff --git a/xorg-server/hw/xwin/winmouse.c b/xorg-server/hw/xwin/winmouse.c
index 9d896c90e..63081d62c 100644
--- a/xorg-server/hw/xwin/winmouse.c
+++ b/xorg-server/hw/xwin/winmouse.c
@@ -36,6 +36,13 @@
 #endif
 #include "win.h"
 
+#ifdef XKB
+#ifndef XKB_IN_SERVER
+#define XKB_IN_SERVER
+#endif
+#include <xkbsrv.h>
+#endif
+
 #include "inputstr.h"
 #include "exevents.h"           /* for button/axes labels */
 #include "xserver-properties.h"
@@ -45,18 +52,6 @@
 static CARD8 const *g_winMouseButtonMap = NULL;
 
 /*
- * Local prototypes
- */
-
-static void
- winMouseCtrl(DeviceIntPtr pDevice, PtrCtrl * pCtrl);
-
-static void
-winMouseCtrl(DeviceIntPtr pDevice, PtrCtrl * pCtrl)
-{
-}
-
-/*
  * See Porting Layer Definition - p. 18
  * This is known as a DeviceProc
  */
@@ -65,7 +60,7 @@ int
 winMouseProc(DeviceIntPtr pDeviceInt, int iState)
 {
     int lngMouseButtons, i;
-    int lngWheelEvents = 2;
+    int lngWheelEvents = 4;
     CARD8 *map;
     DevicePtr pDevice = (DevicePtr) pDeviceInt;
     Atom *btn_labels;
@@ -75,7 +70,7 @@ winMouseProc(DeviceIntPtr pDeviceInt, int iState)
     case DEVICE_INIT:
         /* Get number of mouse buttons */
         lngMouseButtons = GetSystemMetrics(SM_CMOUSEBUTTONS);
-        winMsg(X_PROBED, "%d mouse buttons found\n", lngMouseButtons);
+        winDebug("%d mouse buttons found\n", lngMouseButtons);
 
         /* Mapping of windows events to X events:
          * LEFT:1 MIDDLE:2 RIGHT:3
@@ -103,6 +98,8 @@ winMouseProc(DeviceIntPtr pDeviceInt, int iState)
         btn_labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT);
         btn_labels[3] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_UP);
         btn_labels[4] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_DOWN);
+      btn_labels[5] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_LEFT);
+      btn_labels[6] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_RIGHT);
 
         axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_X);
         axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_Y);
@@ -111,7 +108,7 @@ winMouseProc(DeviceIntPtr pDeviceInt, int iState)
                                 map,
                                 lngMouseButtons + lngWheelEvents,
                                 btn_labels,
-                                winMouseCtrl,
+                                (PtrCtrlProcPtr)NoopDDA,
                                 GetMotionHistorySize(), 2, axes_labels);
         free(map);
         free(btn_labels);
@@ -225,10 +222,8 @@ winMouseButtonsSendEvent(int iEventType, int iButton)
     QueuePointerEvents(g_pwinPointer, iEventType, iButton,
                        POINTER_RELATIVE, &mask);
 
-#if CYGDEBUG
-    ErrorF("winMouseButtonsSendEvent: iEventType: %d, iButton: %d\n",
+  winDebug("winMouseButtonsSendEvent: iEventType: %d, iButton: %d\n",
            iEventType, iButton);
-#endif
 }
 
 /*
diff --git a/xorg-server/hw/xwin/winmsg.c b/xorg-server/hw/xwin/winmsg.c
index 56e7a097c..7831a3b36 100644..100755
--- a/xorg-server/hw/xwin/winmsg.c
+++ b/xorg-server/hw/xwin/winmsg.c
@@ -33,72 +33,16 @@
 #endif
 #include "win.h"
 #include "winmsg.h"
-#if CYGDEBUG
+#ifdef WINDBG
 #include "winmessages.h"
 #endif
 #include <stdarg.h>
 
-void
-winVMsg(int, MessageType, int verb, const char *, va_list)
-_X_ATTRIBUTE_PRINTF(4, 0);
-
-void
-winVMsg(int scrnIndex, MessageType type, int verb, const char *format,
-        va_list ap)
-{
-    LogVMessageVerb(type, verb, format, ap);
-}
+#ifdef WINDBG
 
-void
-winDrvMsg(int scrnIndex, MessageType type, const char *format, ...)
-{
-    va_list ap;
 
-    va_start(ap, format);
-    LogVMessageVerb(type, 0, format, ap);
-    va_end(ap);
-}
 
-void
-winMsg(MessageType type, const char *format, ...)
-{
-    va_list ap;
 
-    va_start(ap, format);
-    LogVMessageVerb(type, 1, format, ap);
-    va_end(ap);
-}
-
-void
-winDrvMsgVerb(int scrnIndex, MessageType type, int verb, const char *format,
-              ...)
-{
-    va_list ap;
-
-    va_start(ap, format);
-    LogVMessageVerb(type, verb, format, ap);
-    va_end(ap);
-}
-
-void
-winMsgVerb(MessageType type, int verb, const char *format, ...)
-{
-    va_list ap;
-
-    va_start(ap, format);
-    LogVMessageVerb(type, verb, format, ap);
-    va_end(ap);
-}
-
-void
-winErrorFVerb(int verb, const char *format, ...)
-{
-    va_list ap;
-
-    va_start(ap, format);
-    LogVMessageVerb(X_NONE, verb, format, ap);
-    va_end(ap);
-}
 
 void
 winDebug(const char *format, ...)
@@ -111,23 +55,24 @@ winDebug(const char *format, ...)
 }
 
 void
-winTrace(const char *format, ...)
+winDebug4 (const char *format, ...)
 {
     va_list ap;
 
     va_start(ap, format);
-    LogVMessageVerb(X_NONE, 10, format, ap);
+  LogVMessageVerb(X_NONE, 4, format, ap);
     va_end(ap);
 }
+#endif
 
 void
-winW32Error(int verb, const char *msg)
+winW32Error(const char *msg)
 {
-    winW32ErrorEx(verb, msg, GetLastError());
+    winW32ErrorEx(msg, GetLastError());
 }
 
 void
-winW32ErrorEx(int verb, const char *msg, DWORD errorcode)
+winW32ErrorEx(const char *msg, DWORD errorcode)
 {
     LPVOID buffer;
 
@@ -138,15 +83,16 @@ winW32ErrorEx(int verb, const char *msg, DWORD errorcode)
                        errorcode,
                        MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
                        (LPTSTR) &buffer, 0, NULL)) {
-        winErrorFVerb(verb, "Unknown error in FormatMessage!\n");
+        ErrorF(msg); 
+        ErrorF("Unknown error in FormatMessage!\n"); 
     }
     else {
-        winErrorFVerb(verb, "%s %s", msg, (char *) buffer);
+        ErrorF("%s %s", msg, (char *)buffer); 
         LocalFree(buffer);
     }
 }
 
-#if CYGDEBUG
+#ifdef WINDBG
 void
 winDebugWin32Message(const char *function, HWND hwnd, UINT message,
                      WPARAM wParam, LPARAM lParam)
@@ -175,10 +121,4 @@ winDebugWin32Message(const char *function, HWND hwnd, UINT message,
         }
     }
 }
-#else
-void
-winDebugWin32Message(const char *function, HWND hwnd, UINT message,
-                     WPARAM wParam, LPARAM lParam)
-{
-}
 #endif
diff --git a/xorg-server/hw/xwin/winmsg.h b/xorg-server/hw/xwin/winmsg.h
index b638f2cb3..beb6683ed 100644
--- a/xorg-server/hw/xwin/winmsg.h
+++ b/xorg-server/hw/xwin/winmsg.h
@@ -33,33 +33,21 @@
 /*
  * Function prototypes
  */
+ 
+#include "os.h"
 
-void
-winDrvMsgVerb(int scrnIndex,
-              MessageType type, int verb, const char *format, ...)
-_X_ATTRIBUTE_PRINTF(4, 5);
-void
-winDrvMsg(int scrnIndex, MessageType type, const char *format, ...)
-_X_ATTRIBUTE_PRINTF(3, 4);
-void
-winMsgVerb(MessageType type, int verb, const char *format, ...)
-_X_ATTRIBUTE_PRINTF(3, 4);
-void
-winMsg(MessageType type, const char *format, ...)
-_X_ATTRIBUTE_PRINTF(2, 3);
-void
-winDebug(const char *format, ...)
-_X_ATTRIBUTE_PRINTF(1, 2);
-void
-winTrace(const char *format, ...)
-_X_ATTRIBUTE_PRINTF(1, 2);
+#if !defined(_MSC_VER) || defined(_DEBUG)
+#define WINDBG
+void winDebug (const char *format, ...);
+void winDebug4 (const char *format, ...);
+void winDebugWin32Message(const char* function, HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
+#else
+#define winDebug(...)
+#define winDebug4(...)
+#define winDebugWin32Message(...)
+#endif
 
-void
-winErrorFVerb(int verb, const char *format, ...)
-_X_ATTRIBUTE_PRINTF(2, 3);
-void winW32Error(int verb, const char *message);
-void winW32ErrorEx(int verb, const char *message, DWORD errorcode);
-void winDebugWin32Message(const char *function, HWND hwnd, UINT message,
-                          WPARAM wParam, LPARAM lParam);
+void winW32Error(const char *message);
+void winW32ErrorEx(const char *message, DWORD errorcode);
 
 #endif
diff --git a/xorg-server/hw/xwin/winmultiwindowclass.c b/xorg-server/hw/xwin/winmultiwindowclass.c
index 1af104df9..96f69727f 100644
--- a/xorg-server/hw/xwin/winmultiwindowclass.c
+++ b/xorg-server/hw/xwin/winmultiwindowclass.c
@@ -68,7 +68,7 @@ winMultiWindowGetClassHint(WindowPtr pWin, char **res_name, char **res_class)
     while (prop) {
         if (prop->propertyName == XA_WM_CLASS
             && prop->type == XA_STRING && prop->format == 8 && prop->data) {
-            len_name = strlen((char *) prop->data);
+            len_name = strnlen((char *) prop->data, prop->size);
 
             (*res_name) = malloc(len_name + 1);
 
@@ -78,12 +78,18 @@ winMultiWindowGetClassHint(WindowPtr pWin, char **res_name, char **res_class)
             }
 
             /* Add one to len_name to allow copying of trailing 0 */
-            strncpy((*res_name), prop->data, len_name + 1);
+            memcpy((*res_name), prop->data, len_name );
+            (*res_name)[len_name]='\0';
 
-            if (len_name == prop->size)
-                len_name--;
-
-            len_class = strlen(((char *) prop->data) + 1 + len_name);
+            if (len_name < prop->size-1)
+            {
+              // It could be that the string is not null terminated
+              len_class = strnlen(((char *) prop->data) + 1 + len_name, prop->size-1-len_name);
+            }
+            else
+            {
+              len_class = 0;
+            }
 
             (*res_class) = malloc(len_class + 1);
 
@@ -95,7 +101,8 @@ winMultiWindowGetClassHint(WindowPtr pWin, char **res_name, char **res_class)
                 return 0;
             }
 
-            strcpy((*res_class), ((char *) prop->data) + 1 + len_name);
+            memcpy((*res_class), ((char *) prop->data) + 1 + len_name, len_class);
+            (*res_class)[len_class]='\0';
 
             return 1;
         }
@@ -127,8 +134,9 @@ winMultiWindowGetWMHints(WindowPtr pWin, WinXWMHints * hints)
     memset(hints, 0, sizeof(WinXWMHints));
 
     while (prop) {
-        if (prop->propertyName == XA_WM_HINTS && prop->data) {
-            memcpy(hints, prop->data, sizeof(WinXWMHints));
+        if (prop->propertyName == XA_WM_HINTS && prop->data
+            && prop->format == 32) {
+            memcpy (hints, prop->data, 4*(int)prop->size); /* format/8 = 4 */
             return 1;
         }
         else
@@ -201,8 +209,9 @@ winMultiWindowGetWMNormalHints(WindowPtr pWin, WinXSizeHints * hints)
     memset(hints, 0, sizeof(WinXSizeHints));
 
     while (prop) {
-        if (prop->propertyName == XA_WM_NORMAL_HINTS && prop->data) {
-            memcpy(hints, prop->data, sizeof(WinXSizeHints));
+        if (prop->propertyName == XA_WM_NORMAL_HINTS && prop->data
+            && prop->format == 32) {
+            memcpy (hints, prop->data, 4*(int)prop->size); /* format/8 = 4 */
             return 1;
         }
         else
@@ -234,9 +243,11 @@ winMultiWindowGetTransientFor(WindowPtr pWin, WindowPtr *ppDaddy)
         *ppDaddy = NULL;
 
     while (prop) {
-        if (prop->propertyName == XA_WM_TRANSIENT_FOR) {
+        if (prop->propertyName == XA_WM_TRANSIENT_FOR
+            && prop->format == 32
+            && prop->data) {
             if (ppDaddy)
-                memcpy(ppDaddy, prop->data, sizeof(WindowPtr));
+                memcpy (ppDaddy, prop->data, 4*(int)prop->size); /* format/8 = 4 */
             return 1;
         }
         else
diff --git a/xorg-server/hw/xwin/winmultiwindowclass.h b/xorg-server/hw/xwin/winmultiwindowclass.h
index 0e3465c78..419602154 100644
--- a/xorg-server/hw/xwin/winmultiwindowclass.h
+++ b/xorg-server/hw/xwin/winmultiwindowclass.h
@@ -47,16 +47,6 @@ typedef struct {
     /* this structure may be extended in the future */
 } WinXWMHints;
 
-/* Window manager hints mask bits */
-#define	InputHint	(1L << 0)
-#define	StateHint	(1L << 1)
-#define	IconPixmapHint	(1L << 2)
-#define	IconWindowHint	(1L << 3)
-#define	IconPositionHint	(1L << 4)
-#define	IconMaskHint	(1L << 5)
-#define	WindowGroupHint	(1L << 6)
-#define	UrgencyHint	(1L << 8)
-#define	AllHints 	(InputHint|StateHint|IconPixmapHint|IconWindowHint|IconPositionHint|IconMaskHint|WindowGroupHint)
 
 /*
  * new version containing base_width, base_height, and win_gravity fields;
diff --git a/xorg-server/hw/xwin/winmultiwindowicons.c b/xorg-server/hw/xwin/winmultiwindowicons.c
index 0322d9816..2e0c82604 100644
--- a/xorg-server/hw/xwin/winmultiwindowicons.c
+++ b/xorg-server/hw/xwin/winmultiwindowicons.c
@@ -237,18 +237,20 @@ NetWMToWinIconAlpha(uint32_t * icon)
     HDC hdc = GetDC(NULL);
     uint32_t *DIB_pixels;
     ICONINFO ii;
-    BITMAPV4HEADER bmh = { sizeof(bmh) };
+    BITMAPV5HEADER bmh;
 
     /* Define an ARGB pixel format used for Color+Alpha icons */
-    bmh.bV4Width = width;
-    bmh.bV4Height = -height;    /* Invert the image */
-    bmh.bV4Planes = 1;
-    bmh.bV4BitCount = 32;
-    bmh.bV4V4Compression = BI_BITFIELDS;
-    bmh.bV4AlphaMask = 0xFF000000;
-    bmh.bV4RedMask = 0x00FF0000;
-    bmh.bV4GreenMask = 0x0000FF00;
-    bmh.bV4BlueMask = 0x000000FF;
+    ZeroMemory(&bmh,sizeof(bmh));
+    bmh.bV5Size = sizeof(bmh);
+    bmh.bV5Width = width;
+    bmh.bV5Height = -height; /* Invert the image */
+    bmh.bV5Planes = 1;
+    bmh.bV5BitCount = 32;
+    bmh.bV5Compression = BI_BITFIELDS;
+    bmh.bV5AlphaMask = 0xFF000000;
+    bmh.bV5RedMask =   0x00FF0000;
+    bmh.bV5GreenMask = 0x0000FF00;
+    bmh.bV5BlueMask =  0x000000FF;
 
     ii.fIcon = TRUE;
     ii.xHotspot = 0;            /* ignored */
@@ -347,7 +349,7 @@ NetWMToWinIcon(int bpp, uint32_t * icon)
                               dwlConditionMask);
         versionChecked = TRUE;
 
-        ErrorF("OS has icon alpha channel support: %s\n",
+        winDebug("OS has icon alpha channel support: %s\n",
                hasIconAlphaChannel ? "yes" : "no");
     }
 
diff --git a/xorg-server/hw/xwin/winmultiwindowshape.c b/xorg-server/hw/xwin/winmultiwindowshape.c
index cb0f38950..0a00e79ee 100644
--- a/xorg-server/hw/xwin/winmultiwindowshape.c
+++ b/xorg-server/hw/xwin/winmultiwindowshape.c
@@ -46,9 +46,7 @@ winSetShapeMultiWindow(WindowPtr pWin, int kind)
 
     winScreenPriv(pScreen);
 
-#if CYGMULTIWINDOW_DEBUG
-    ErrorF("winSetShapeMultiWindow - pWin: %08x kind: %i\n", pWin, kind);
-#endif
+  winDebug ("winSetShapeMultiWindow - pWin: %08x kind: %i\n", pWin, kind);
 
     WIN_UNWRAP(SetShape);
     (*pScreen->SetShape) (pWin, kind);
@@ -89,9 +87,7 @@ winReshapeMultiWindow(WindowPtr pWin)
 
     winWindowPriv(pWin);
 
-#if CYGDEBUG
     winDebug("winReshape ()\n");
-#endif
 
     /* Bail if the window is the root window */
     if (pWin->parent == NULL)
@@ -197,3 +193,14 @@ winReshapeMultiWindow(WindowPtr pWin)
 
     return;
 }
+
+void
+winShapeRgnUpdateMultiwindow(HWND hwnd)
+{
+  WindowPtr pWin = GetProp (hwnd, WIN_WINDOW_PROP);
+  if (pWin)
+    {
+      winReshapeMultiWindow(pWin);
+      winUpdateRgnMultiWindow(pWin);
+    }
+}
diff --git a/xorg-server/hw/xwin/winmultiwindowwindow.c b/xorg-server/hw/xwin/winmultiwindowwindow.c
index c0c7db2b7..0612ca6a1 100644
--- a/xorg-server/hw/xwin/winmultiwindowwindow.c
+++ b/xorg-server/hw/xwin/winmultiwindowwindow.c
@@ -83,7 +83,7 @@ winInitMultiWindowClass(void)
         wcx.hIconSm = hIconSmall;
 
 #if CYGMULTIWINDOW_DEBUG
-        ErrorF("winCreateWindowsWindow - Creating class: %s\n", WINDOW_CLASS_X);
+        winDebug ("winCreateWindowsWindow - Creating class: %s\n", WINDOW_CLASS_X);
 #endif
 
         atomXWinClass = RegisterClassEx(&wcx);
@@ -104,7 +104,7 @@ winCreateWindowMultiWindow(WindowPtr pWin)
     winScreenPriv(pScreen);
 
 #if CYGMULTIWINDOW_DEBUG
-    winTrace("winCreateWindowMultiWindow - pWin: %p\n", pWin);
+    winDebug ("winCreateWindowMultiWindow - pWin: %p\n", pWin);
 #endif
 
     WIN_UNWRAP(CreateWindow);
@@ -137,7 +137,7 @@ winDestroyWindowMultiWindow(WindowPtr pWin)
     winScreenPriv(pScreen);
 
 #if CYGMULTIWINDOW_DEBUG
-    ErrorF("winDestroyWindowMultiWindow - pWin: %p\n", pWin);
+    winDebug ("winDestroyWindowMultiWindow - pWin: %p\n", pWin);
 #endif
 
     WIN_UNWRAP(DestroyWindow);
@@ -175,30 +175,29 @@ winPositionWindowMultiWindow(WindowPtr pWin, int x, int y)
     RECT rcNew;
     RECT rcOld;
 
-#if CYGMULTIWINDOW_DEBUG
+#ifdef WINDBG
     RECT rcClient;
     RECT *lpRc;
 #endif
     DWORD dwExStyle;
     DWORD dwStyle;
 
-#if CYGMULTIWINDOW_DEBUG
-    winTrace("winPositionWindowMultiWindow - pWin: %p\n", pWin);
-#endif
+    winDebug ("winPositionWindowMultiWindow - pWin: %p\n", pWin);
 
     WIN_UNWRAP(PositionWindow);
     fResult = (*pScreen->PositionWindow) (pWin, x, y);
     WIN_WRAP(PositionWindow, winPositionWindowMultiWindow);
 
-#if CYGWINDOWING_DEBUG
-    ErrorF("winPositionWindowMultiWindow: (x, y) = (%d, %d)\n", x, y);
-#endif
+    winDebug ("winPositionWindowMultiWindow: (x, y) = (%d, %d)\n", x, y);
 
     /* Bail out if the Windows window handle is bad */
     if (!hWnd) {
-#if CYGWINDOWING_DEBUG
-        ErrorF("\timmediately return since hWnd is NULL\n");
-#endif
+        winDebug ("\timmediately return since hWnd is NULL\n");
+        if (pWin->redirectDraw != RedirectDrawNone)
+        {
+          winDebug("winPositionWindowMultiWindow: Calling compReallocPixmap to make sure the pixmap buffer is valid.\n");
+          compReallocPixmap(pWin, x, y, pWin->drawable.width, pWin->drawable.height, pWin->borderWidth);
+        }
         return fResult;
     }
 
@@ -219,7 +218,7 @@ winPositionWindowMultiWindow(WindowPtr pWin, int x, int y)
 
 #if CYGMULTIWINDOW_DEBUG
     lpRc = &rcNew;
-    ErrorF("winPositionWindowMultiWindow - (%d ms)drawable (%d, %d)-(%d, %d)\n",
+    winDebug ("winPositionWindowMultiWindow - (%d ms)drawable (%d, %d)-(%d, %d)\n",
            GetTickCount(), lpRc->left, lpRc->top, lpRc->right, lpRc->bottom);
 #endif
 
@@ -237,37 +236,41 @@ winPositionWindowMultiWindow(WindowPtr pWin, int x, int y)
     GetClientRect(hWnd, &rcClient);
 
     lpRc = &rcNew;
-    ErrorF("winPositionWindowMultiWindow - (%d ms)rcNew (%d, %d)-(%d, %d)\n",
+    winDebug ("winPositionWindowMultiWindow - (%d ms)rcNew (%d, %d)-(%d, %d)\n",
            GetTickCount(), lpRc->left, lpRc->top, lpRc->right, lpRc->bottom);
 
     lpRc = &rcOld;
-    ErrorF("winPositionWindowMultiWindow - (%d ms)rcOld (%d, %d)-(%d, %d)\n",
+    winDebug ("winPositionWindowMultiWindow - (%d ms)rcOld (%d, %d)-(%d, %d)\n",
            GetTickCount(), lpRc->left, lpRc->top, lpRc->right, lpRc->bottom);
 
     lpRc = &rcClient;
-    ErrorF("(%d ms)rcClient (%d, %d)-(%d, %d)\n",
+    winDebug ("(%d ms)rcClient (%d, %d)-(%d, %d)\n",
            GetTickCount(), lpRc->left, lpRc->top, lpRc->right, lpRc->bottom);
 #endif
 
     /* Check if the old rectangle and new rectangle are the same */
     if (!EqualRect(&rcNew, &rcOld)) {
-#if CYGMULTIWINDOW_DEBUG
-        ErrorF("winPositionWindowMultiWindow - Need to move\n");
-#endif
-
-#if CYGWINDOWING_DEBUG
-        ErrorF("\tMoveWindow to (%ld, %ld) - %ldx%ld\n", rcNew.left, rcNew.top,
+      winDebug ("winPositionWindowMultiWindow - Need to move\n");
+      winDebug ("\tMoveWindow to (%ld, %ld) - %ldx%ld\n", rcNew.left, rcNew.top,
                rcNew.right - rcNew.left, rcNew.bottom - rcNew.top);
-#endif
+
         /* Change the position and dimensions of the Windows window */
-        MoveWindow(hWnd,
-                   rcNew.left, rcNew.top,
-                   rcNew.right - rcNew.left, rcNew.bottom - rcNew.top, TRUE);
+      if (pWinPriv->fWglUsed)
+      {
+        int iWidth=rcNew.right - rcNew.left;
+        int iHeight=rcNew.bottom - rcNew.top;
+        ScreenToClient(GetParent(hWnd), (LPPOINT)&rcNew);
+        MoveWindow (hWnd,
+                    rcNew.left, rcNew.top,
+                    iWidth, iHeight, TRUE);
+      }
+      else
+        MoveWindow (hWnd,
+                    rcNew.left, rcNew.top,
+                    rcNew.right - rcNew.left, rcNew.bottom - rcNew.top, TRUE);
     }
     else {
-#if CYGMULTIWINDOW_DEBUG
-        ErrorF("winPositionWindowMultiWindow - Not need to move\n");
-#endif
+      winDebug ("winPositionWindowMultiWindow - Not need to move\n");
     }
 
     return fResult;
@@ -285,9 +288,7 @@ winChangeWindowAttributesMultiWindow(WindowPtr pWin, unsigned long mask)
 
     winScreenPriv(pScreen);
 
-#if CYGMULTIWINDOW_DEBUG
-    ErrorF("winChangeWindowAttributesMultiWindow - pWin: %08x\n", pWin);
-#endif
+    winDebug ("winChangeWindowAttributesMultiWindow - pWin: %08x\n", pWin);
 
     WIN_UNWRAP(ChangeWindowAttributes);
     fResult = (*pScreen->ChangeWindowAttributes) (pWin, mask);
@@ -315,7 +316,7 @@ winUnmapWindowMultiWindow(WindowPtr pWin)
     winScreenPriv(pScreen);
 
 #if CYGMULTIWINDOW_DEBUG
-    ErrorF("winUnmapWindowMultiWindow - pWin: %08x\n", pWin);
+    winDebug ("winUnmapWindowMultiWindow - pWin: %08x\n", pWin);
 #endif
 
     WIN_UNWRAP(UnrealizeWindow);
@@ -346,7 +347,7 @@ winMapWindowMultiWindow(WindowPtr pWin)
     winScreenPriv(pScreen);
 
 #if CYGMULTIWINDOW_DEBUG
-    ErrorF("winMapWindowMultiWindow - pWin: %08x\n", pWin);
+    winDebug ("winMapWindowMultiWindow - pWin: %08x\n", pWin);
 #endif
 
     WIN_UNWRAP(RealizeWindow);
@@ -398,76 +399,23 @@ winReparentWindowMultiWindow(WindowPtr pWin, WindowPtr pPriorParent)
 void
 winRestackWindowMultiWindow(WindowPtr pWin, WindowPtr pOldNextSib)
 {
-#if 0
-    WindowPtr pPrevWin;
-    UINT uFlags;
-    HWND hInsertAfter;
-    HWND hWnd = NULL;
-#endif
     ScreenPtr pScreen = pWin->drawable.pScreen;
 
     winScreenPriv(pScreen);
 
-#if CYGMULTIWINDOW_DEBUG || CYGWINDOWING_DEBUG
-    winTrace("winRestackMultiWindow - %08x\n", pWin);
-#endif
+    winDebug ("winRestackMultiWindow - %08x\n", pWin);
 
     WIN_UNWRAP(RestackWindow);
     if (pScreen->RestackWindow)
         (*pScreen->RestackWindow) (pWin, pOldNextSib);
     WIN_WRAP(RestackWindow, winRestackWindowMultiWindow);
 
-#if 1
     /*
      * Calling winReorderWindowsMultiWindow here means our window manager
      * (i.e. Windows Explorer) has initiative to determine Z order.
      */
     if (pWin->nextSib != pOldNextSib)
         winReorderWindowsMultiWindow();
-#else
-    /* Bail out if no window privates or window handle is invalid */
-    if (!pWinPriv || !pWinPriv->hWnd)
-        return;
-
-    /* Get a pointer to our previous sibling window */
-    pPrevWin = pWin->prevSib;
-
-    /*
-     * Look for a sibling window with
-     * valid privates and window handle
-     */
-    while (pPrevWin && !winGetWindowPriv(pPrevWin)
-           && !winGetWindowPriv(pPrevWin)->hWnd)
-        pPrevWin = pPrevWin->prevSib;
-
-    /* Check if we found a valid sibling */
-    if (pPrevWin) {
-        /* Valid sibling - get handle to insert window after */
-        hInsertAfter = winGetWindowPriv(pPrevWin)->hWnd;
-        uFlags = SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE;
-
-        hWnd = GetNextWindow(pWinPriv->hWnd, GW_HWNDPREV);
-
-        do {
-            if (GetProp(hWnd, WIN_WINDOW_PROP)) {
-                if (hWnd == winGetWindowPriv(pPrevWin)->hWnd) {
-                    uFlags |= SWP_NOZORDER;
-                }
-                break;
-            }
-            hWnd = GetNextWindow(hWnd, GW_HWNDPREV);
-        }
-        while (hWnd);
-    }
-    else {
-        /* No valid sibling - make this window the top window */
-        hInsertAfter = HWND_TOP;
-        uFlags = SWP_NOMOVE | SWP_NOSIZE;
-    }
-
-    /* Perform the restacking operation in Windows */
-    SetWindowPos(pWinPriv->hWnd, hInsertAfter, 0, 0, 0, 0, uFlags);
-#endif
 }
 
 /*
@@ -502,15 +450,36 @@ winCreateWindowsWindow(WindowPtr pWin)
     iHeight = pWin->drawable.height;
 
     /* If it's an InputOutput window, and so is going to end up being made visible,
-       make sure the window actually ends up somewhere where it will be visible */
+     make sure the window actually ends up somewhere where it will be visible 
+     Dont't do it by making just one of the two iX and iY CW_USEDEFAULT since
+     this will create a window at place CW_USEDEFAULT which is 0x80000000 */
     if (pWin->drawable.class != InputOnly) {
-        if ((iX < GetSystemMetrics(SM_XVIRTUALSCREEN)) ||
-            (iX > GetSystemMetrics(SM_CXVIRTUALSCREEN)))
-            iX = CW_USEDEFAULT;
-
-        if ((iY < GetSystemMetrics(SM_YVIRTUALSCREEN)) ||
-            (iY > GetSystemMetrics(SM_CYVIRTUALSCREEN)))
-            iY = CW_USEDEFAULT;
+      while (1) {
+        if (iX < GetSystemMetrics (SM_XVIRTUALSCREEN)) {
+          iX = GetSystemMetrics (SM_XVIRTUALSCREEN);
+          ErrorF("Resetting iX to %d\n",iX);
+        }
+        else if  (iX > GetSystemMetrics (SM_CXVIRTUALSCREEN))
+        {
+          iX = GetSystemMetrics (SM_CXVIRTUALSCREEN)-iWidth;
+          ErrorF("Resetting iX to %d\n",iX);
+        }
+        else
+          break;
+      }
+
+      while (1) {
+        if (iY < GetSystemMetrics (SM_YVIRTUALSCREEN)) {
+          iY = GetSystemMetrics (SM_YVIRTUALSCREEN);
+          ErrorF("Resetting iY to %d\n",iY);
+        }
+        else if (iY > GetSystemMetrics (SM_CYVIRTUALSCREEN)) {
+          iY = GetSystemMetrics (SM_CYVIRTUALSCREEN)-iHeight;
+          ErrorF("Resetting iY to %d\n",iY);
+        }
+        else
+          break;
+      }
     }
 
     winDebug("winCreateWindowsWindow - %dx%d @ %dx%d\n", iWidth, iHeight, iX,
@@ -577,16 +546,20 @@ winCreateWindowsWindow(WindowPtr pWin)
     }
     pWinPriv->hWnd = hWnd;
 
+    /* If we asked the native WM to place the window, synchronize the X window position.
+       Do this before the next SetWindowPos because this one is generating a WM_STYLECHANGED
+       message which is causing a window move, which is wrong if the Xwindow does not
+       have the correct coordinates yet */
+    if (iX == CW_USEDEFAULT) {
+      winAdjustXWindow(pWin, hWnd);
+    }
     /* Change style back to popup, already placed... */
     SetWindowLongPtr(hWnd, GWL_STYLE,
                      WS_POPUP | WS_CLIPCHILDREN | WS_CLIPSIBLINGS);
     SetWindowPos(hWnd, 0, 0, 0, 0, 0,
                  SWP_FRAMECHANGED | SWP_NOZORDER | SWP_NOMOVE | SWP_NOSIZE |
                  SWP_NOACTIVATE);
-
-    /* Adjust the X window to match the window placement we actually got... */
-    winAdjustXWindow(pWin, hWnd);
-
+  
     /* Make sure it gets the proper system menu for a WS_POPUP, too */
     GetSystemMenu(hWnd, TRUE);
 
@@ -670,7 +643,7 @@ winUpdateWindowsWindow(WindowPtr pWin)
     HWND hWnd = pWinPriv->hWnd;
 
 #if CYGMULTIWINDOW_DEBUG
-    ErrorF("winUpdateWindowsWindow\n");
+    winDebug("winUpdateWindowsWindow\n");
 #endif
 
     /* Check if the Windows window's parents have been destroyed */
@@ -689,13 +662,44 @@ winUpdateWindowsWindow(WindowPtr pWin)
         UpdateWindow(pWinPriv->hWnd);
     }
     else if (hWnd != NULL) {
-        /* Destroy the Windows window if its parents are destroyed */
-        winDestroyWindowsWindow(pWin);
-        assert(pWinPriv->hWnd == NULL);
+        if (pWinPriv->fWglUsed) {
+            /* We do not need to destroy the window but to reparent it and move it to the
+               correct place when it is an opengl window */
+            int offsetx;
+            int offsety;
+            HWND hParentWnd;
+            WindowPtr pParent=pWin->parent;
+
+            while (pParent) {
+                winWindowPriv(pParent);
+                hParentWnd=pWinPriv->hWnd;
+                if (hParentWnd)
+                    break;
+                pParent=pParent->parent;
+            }
+
+            if (pParent) {
+                offsetx=pParent->drawable.x;
+                offsety=pParent->drawable.y;
+            }
+            else {
+                offsetx=0;
+                offsety=0;
+            }
+            winDebug ("-winUpdateWindowsWindow: %x changing parent to %x and moving to %d,%d\n",pWinPriv->hWnd,hParentWnd,pWin->drawable.x-offsetx,pWin->drawable.y-offsety);
+            SetParent(pWinPriv->hWnd,hParentWnd);
+            SetWindowPos(pWinPriv->hWnd,NULL,pWin->drawable.x-offsetx,pWin->drawable.y-offsety,0,0,SWP_NOSIZE|SWP_NOZORDER|SWP_SHOWWINDOW);
+        }
+        else {
+            /* Destroy the Windows window if its parents are destroyed */
+            /* First check if we need to release the DC when it is an opengl window */
+            winDestroyWindowsWindow (pWin);
+            assert (pWinPriv->hWnd == NULL);
+        }
     }
 
 #if CYGMULTIWINDOW_DEBUG
-    ErrorF("-winUpdateWindowsWindow\n");
+    winDebug ("-winUpdateWindowsWindow\n");
 #endif
 }
 
@@ -713,7 +717,7 @@ winGetWindowID(WindowPtr pWin)
     FindClientResourcesByType(c, RT_WINDOW, winFindWindow, &wi);
 
 #if CYGMULTIWINDOW_DEBUG
-    ErrorF("winGetWindowID - Window ID: %d\n", wi.id);
+    winDebug("winGetWindowID - Window ID: %d\n", wi.id);
 #endif
 
     return wi.id;
@@ -748,16 +752,12 @@ winReorderWindowsMultiWindow(void)
     DWORD dwCurrentProcessID = GetCurrentProcessId();
     DWORD dwWindowProcessID = 0;
 
-#if CYGMULTIWINDOW_DEBUG || CYGWINDOWING_DEBUG
-    winTrace("winReorderWindowsMultiWindow\n");
-#endif
+    winDebug("winReorderWindowsMultiWindow\n");
 
     if (fRestacking) {
         /* It is a recusive call so immediately exit */
-#if CYGWINDOWING_DEBUG
-        ErrorF("winReorderWindowsMultiWindow - "
+        winDebug("winReorderWindowsMultiWindow - "
                "exit because fRestacking == TRUE\n");
-#endif
         return;
     }
     fRestacking = TRUE;
@@ -810,9 +810,7 @@ winMinimizeWindow(Window id)
     winPrivScreenPtr pScreenPriv = NULL;
     winScreenInfo *pScreenInfo = NULL;
 
-#if CYGWINDOWING_DEBUG
-    ErrorF("winMinimizeWindow\n");
-#endif
+    winDebug("winMinimizeWindow\n");
 
     dixLookupResourceByType((pointer) &pWin, id, RT_WINDOW, NullClient,
                             DixUnknownAccess);
@@ -827,7 +825,7 @@ winMinimizeWindow(Window id)
     if (pScreenPriv)
         pScreenInfo = pScreenPriv->pScreenInfo;
 
-#ifdef XWIN_MULTIWINDOWEXTWM
+#ifdef XWIN_MULTIWINDOWINTWM
     if (pScreenPriv && pScreenInfo->fInternalWM) {
         pRLWinPriv =
             (win32RootlessWindowPtr) RootlessFrameForWindow(pWin, FALSE);
@@ -855,9 +853,8 @@ winCopyWindowMultiWindow(WindowPtr pWin, DDXPointRec oldpt, RegionPtr oldRegion)
 
     winScreenPriv(pScreen);
 
-#if CYGWINDOWING_DEBUG
-    ErrorF("CopyWindowMultiWindow\n");
-#endif
+    winDebug("CopyWindowMultiWindow\n");
+
     WIN_UNWRAP(CopyWindow);
     (*pScreen->CopyWindow) (pWin, oldpt, oldRegion);
     WIN_WRAP(CopyWindow, winCopyWindowMultiWindow);
@@ -874,9 +871,7 @@ winMoveWindowMultiWindow(WindowPtr pWin, int x, int y,
 
     winScreenPriv(pScreen);
 
-#if CYGWINDOWING_DEBUG
-    ErrorF("MoveWindowMultiWindow to (%d, %d)\n", x, y);
-#endif
+    winDebug("MoveWindowMultiWindow to (%d, %d)\n", x, y);
 
     WIN_UNWRAP(MoveWindow);
     (*pScreen->MoveWindow) (pWin, x, y, pSib, kind);
@@ -894,9 +889,8 @@ winResizeWindowMultiWindow(WindowPtr pWin, int x, int y, unsigned int w,
 
     winScreenPriv(pScreen);
 
-#if CYGWINDOWING_DEBUG
-    ErrorF("ResizeWindowMultiWindow to (%d, %d) - %dx%d\n", x, y, w, h);
-#endif
+    winDebug("ResizeWindowMultiWindow to (%d, %d) - %dx%d\n", x, y, w, h);
+
     WIN_UNWRAP(ResizeWindow);
     (*pScreen->ResizeWindow) (pWin, x, y, w, h, pSib);
     WIN_WRAP(ResizeWindow, winResizeWindowMultiWindow);
@@ -925,14 +919,10 @@ winAdjustXWindow(WindowPtr pWin, HWND hwnd)
 #define WIDTH(rc) (rc.right - rc.left)
 #define HEIGHT(rc) (rc.bottom - rc.top)
 
-#if CYGWINDOWING_DEBUG
-    ErrorF("winAdjustXWindow\n");
-#endif
+    winDebug("winAdjustXWindow\n");
 
     if (IsIconic(hwnd)) {
-#if CYGWINDOWING_DEBUG
-        ErrorF("\timmediately return because the window is iconized\n");
-#endif
+      winDebug("\timmediately return because the window is iconized\n");
         /*
          * If the Windows window is minimized, its WindowRect has
          * meaningless values so we don't adjust X window to it.
@@ -948,34 +938,26 @@ winAdjustXWindow(WindowPtr pWin, HWND hwnd)
     x = pDraw->x + GetSystemMetrics(SM_XVIRTUALSCREEN);
     y = pDraw->y + GetSystemMetrics(SM_YVIRTUALSCREEN);
     SetRect(&rcDraw, x, y, x + pDraw->width, y + pDraw->height);
-#ifdef CYGMULTIWINDOW_DEBUG
     winDebug("\tDrawable extend {%d, %d, %d, %d}, {%d, %d}\n",
              rcDraw.left, rcDraw.top, rcDraw.right, rcDraw.bottom,
              rcDraw.right - rcDraw.left, rcDraw.bottom - rcDraw.top);
-#endif
     dwExStyle = GetWindowLongPtr(hwnd, GWL_EXSTYLE);
     dwStyle = GetWindowLongPtr(hwnd, GWL_STYLE);
-#ifdef CYGMULTIWINDOW_DEBUG
     winDebug("\tWindowStyle: %08x %08x\n", dwStyle, dwExStyle);
-#endif
     AdjustWindowRectEx(&rcDraw, dwStyle, FALSE, dwExStyle);
 
     /* The source of adjust */
     GetWindowRect(hwnd, &rcWin);
-#ifdef CYGMULTIWINDOW_DEBUG
     winDebug("\tWindow extend {%d, %d, %d, %d}, {%d, %d}\n",
              rcWin.left, rcWin.top, rcWin.right, rcWin.bottom,
              rcWin.right - rcWin.left, rcWin.bottom - rcWin.top);
     winDebug("\tDraw extend {%d, %d, %d, %d}, {%d, %d}\n",
              rcDraw.left, rcDraw.top, rcDraw.right, rcDraw.bottom,
              rcDraw.right - rcDraw.left, rcDraw.bottom - rcDraw.top);
-#endif
 
     if (EqualRect(&rcDraw, &rcWin)) {
         /* Bail if no adjust is needed */
-#if CYGWINDOWING_DEBUG
-        ErrorF("\treturn because already adjusted\n");
-#endif
+    winDebug("\treturn because already adjusted\n");
         return 0;
     }
 
@@ -995,10 +977,8 @@ winAdjustXWindow(WindowPtr pWin, HWND hwnd)
     vlist[1] = pDraw->y + dY - wBorderWidth(pWin);
     vlist[2] = pDraw->width + dW;
     vlist[3] = pDraw->height + dH;
-#if CYGWINDOWING_DEBUG
-    ErrorF("\tConfigureWindow to (%ld, %ld) - %ldx%ld\n", vlist[0], vlist[1],
-           vlist[2], vlist[3]);
-#endif
+    winDebug("\tConfigureWindow to (%ld, %ld) - %ldx%ld\n", vlist[0], vlist[1],
+              vlist[2], vlist[3]);
     return ConfigureWindow(pWin, CWX | CWY | CWWidth | CWHeight,
                            vlist, wClient(pWin));
 
diff --git a/xorg-server/hw/xwin/winmultiwindowwm.c b/xorg-server/hw/xwin/winmultiwindowwm.c
index 4f6dec78b..059550c8c 100644
--- a/xorg-server/hw/xwin/winmultiwindowwm.c
+++ b/xorg-server/hw/xwin/winmultiwindowwm.c
@@ -43,12 +43,14 @@
 #include <fcntl.h>
 #include <setjmp.h>
 #define HANDLE void *
+#ifdef _MSC_VER
+typedef int pid_t;
+#endif
 #include <pthread.h>
 #undef HANDLE
 #include <X11/X.h>
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
-#include <X11/Xlocale.h>
 #include <X11/Xproto.h>
 #include <X11/Xutil.h>
 #include <X11/cursorfont.h>
@@ -59,9 +61,15 @@
 #include "winprefs.h"
 #include "window.h"
 #include "pixmapstr.h"
+#include "winmsg.h"
 #include "windowstr.h"
+#include "winmultiwindowclass.h"
+
+#include <shlwapi.h>
+#include "taskbar.h"
 
 #ifdef XWIN_MULTIWINDOWEXTWM
+#define _WINDOWSWM_SERVER_
 #include <X11/extensions/windowswmstr.h>
 #else
 /* We need the native HWND atom for intWM, so for consistency use the
@@ -73,10 +81,6 @@ extern void winDebug(const char *format, ...);
 extern void winReshapeMultiWindow(WindowPtr pWin);
 extern void winUpdateRgnMultiWindow(WindowPtr pWin);
 
-#ifndef CYGDEBUG
-#define CYGDEBUG NO
-#endif
-
 /*
  * Constant defines
  */
@@ -103,7 +107,9 @@ typedef struct _WMMsgQueueRec {
     struct _WMMsgNodeRec *pTail;
     pthread_mutex_t pmMutex;
     pthread_cond_t pcNotEmpty;
+#ifdef _DEBUG
     int nQueueSize;
+#endif
 } WMMsgQueueRec, *WMMsgQueuePtr;
 
 typedef struct _WMInfo {
@@ -112,7 +118,9 @@ typedef struct _WMInfo {
     Atom atmWmProtos;
     Atom atmWmDelete;
     Atom atmPrivMap;
+#ifdef XWIN_MULTIWINDOWINTWM
     Bool fAllowOtherWM;
+#endif
 } WMInfoRec, *WMInfoPtr;
 
 typedef struct _WMProcArgRec {
@@ -166,17 +174,15 @@ static int
 static int
  winMultiWindowXMsgProcIOErrorHandler(Display * pDisplay);
 
+static void
+winMultiWindowThreadExit(void *arg);
+
 static int
  winRedirectErrorHandler(Display * pDisplay, XErrorEvent * pErr);
 
 static void
  winInitMultiWindowWM(WMInfoPtr pWMInfo, WMProcArgPtr pProcArg);
 
-#if 0
-static void
- PreserveWin32Stack(WMInfoPtr pWMInfo, Window iWindow, UINT direction);
-#endif
-
 static Bool
 
 CheckAnotherWindowManager(Display * pDisplay, DWORD dwScreen,
@@ -201,6 +207,10 @@ static pthread_t g_winMultiWindowXMsgProcThread;
 static Bool g_shutdown = FALSE;
 static Bool redirectError = FALSE;
 static Bool g_fAnotherWMRunning = FALSE;
+static HMODULE                  g_hmodShell32Dll = NULL;
+static HMODULE                  g_hmodOle32Dll = NULL;
+static SHGETPROPERTYSTOREFORWINDOWPROC g_pSHGetPropertyStoreForWindow = NULL;
+static PROPVARIANTCLEARPROC     g_pPropVariantClear = NULL;
 
 /*
  * PushMessage - Push a message onto the queue
@@ -224,46 +234,10 @@ PushMessage(WMMsgQueuePtr pQueue, WMMsgNodePtr pNode)
         pQueue->pHead = pNode;
     }
 
-#if 0
-    switch (pNode->msg.msg) {
-    case WM_WM_MOVE:
-        ErrorF("\tWM_WM_MOVE\n");
-        break;
-    case WM_WM_SIZE:
-        ErrorF("\tWM_WM_SIZE\n");
-        break;
-    case WM_WM_RAISE:
-        ErrorF("\tWM_WM_RAISE\n");
-        break;
-    case WM_WM_LOWER:
-        ErrorF("\tWM_WM_LOWER\n");
-        break;
-    case WM_WM_MAP:
-        ErrorF("\tWM_WM_MAP\n");
-        break;
-    case WM_WM_MAP2:
-        ErrorF("\tWM_WM_MAP2\n");
-        break;
-    case WM_WM_MAP3:
-        ErrorF("\tWM_WM_MAP3\n");
-        break;
-    case WM_WM_UNMAP:
-        ErrorF("\tWM_WM_UNMAP\n");
-        break;
-    case WM_WM_KILL:
-        ErrorF("\tWM_WM_KILL\n");
-        break;
-    case WM_WM_ACTIVATE:
-        ErrorF("\tWM_WM_ACTIVATE\n");
-        break;
-    default:
-        ErrorF("\tUnknown Message.\n");
-        break;
-    }
-#endif
-
+#ifdef _DEBUG
     /* Increase the count of elements in the queue by one */
     ++(pQueue->nQueueSize);
+#endif
 
     /* Release the queue mutex */
     pthread_mutex_unlock(&pQueue->pmMutex);
@@ -272,7 +246,7 @@ PushMessage(WMMsgQueuePtr pQueue, WMMsgNodePtr pNode)
     pthread_cond_signal(&pQueue->pcNotEmpty);
 }
 
-#if CYGMULTIWINDOW_DEBUG
+#ifdef WINDBG
 /*
  * QueueSize - Return the size of the queue
  */
@@ -317,12 +291,12 @@ PopMessage(WMMsgQueuePtr pQueue, WMInfoPtr pWMInfo)
         pQueue->pTail = NULL;
     }
 
+  #ifdef _DEBUG
     /* Drop the number of elements in the queue by one */
     --(pQueue->nQueueSize);
 
-#if CYGMULTIWINDOW_DEBUG
-    ErrorF("Queue Size %d %d\n", pQueue->nQueueSize, QueueSize(pQueue));
-#endif
+  winDebug ("Queue Size %d %d\n", pQueue->nQueueSize, QueueSize(pQueue));
+  #endif
 
     /* Release the queue mutex */
     pthread_mutex_unlock(&pQueue->pmMutex);
@@ -368,24 +342,24 @@ InitQueue(WMMsgQueuePtr pQueue)
     pQueue->pTail = NULL;
 
     /* There are no elements initially */
+  #ifdef _DEBUG
     pQueue->nQueueSize = 0;
 
-#if CYGMULTIWINDOW_DEBUG
     winDebug("InitQueue - Queue Size %d %d\n", pQueue->nQueueSize,
              QueueSize(pQueue));
-#endif
+  #endif
 
-    winDebug("InitQueue - Calling pthread_mutex_init\n");
+    winDebug ("InitQueue - Calling pthread_mutex_init\n");
 
     /* Create synchronization objects */
     pthread_mutex_init(&pQueue->pmMutex, NULL);
 
-    winDebug("InitQueue - pthread_mutex_init returned\n");
-    winDebug("InitQueue - Calling pthread_cond_init\n");
+    winDebug ("InitQueue - pthread_mutex_init returned\n");
+    winDebug ("InitQueue - Calling pthread_cond_init\n");
 
     pthread_cond_init(&pQueue->pcNotEmpty, NULL);
 
-    winDebug("InitQueue - pthread_cond_init returned\n");
+    winDebug ("InitQueue - pthread_cond_init returned\n");
 
     return TRUE;
 }
@@ -431,9 +405,7 @@ GetWindowName(Display * pDisplay, Window iWin, char **ppWindowName)
     XTextProperty xtpWindowName;
     char *pszWindowName;
 
-#if CYGMULTIWINDOW_DEBUG
-    ErrorF("GetWindowName\n");
-#endif
+    winDebug ("GetWindowName\n");
 
     /* Intialize ppWindowName to NULL */
     *ppWindowName = NULL;
@@ -441,9 +413,7 @@ GetWindowName(Display * pDisplay, Window iWin, char **ppWindowName)
     /* Try to get window name */
     nResult = XGetWMName(pDisplay, iWin, &xtpWindowName);
     if (!nResult || !xtpWindowName.value || !xtpWindowName.nitems) {
-#if CYGMULTIWINDOW_DEBUG
         ErrorF("GetWindowName - XGetWMName failed.  No name.\n");
-#endif
         return;
     }
 
@@ -680,21 +650,23 @@ winMultiWindowWMProc(void *pArg)
     WMProcArgPtr pProcArg = (WMProcArgPtr) pArg;
     WMInfoPtr pWMInfo = pProcArg->pWMInfo;
 
+    pthread_cleanup_push(&winMultiWindowThreadExit, NULL);
+  
     /* Initialize the Window Manager */
     winInitMultiWindowWM(pWMInfo, pProcArg);
 
-#if CYGMULTIWINDOW_DEBUG
-    ErrorF("winMultiWindowWMProc ()\n");
-#endif
+   winDebug ("winMultiWindowWMProc ()\n");
 
     /* Loop until we explicitly break out */
     for (;;) {
         WMMsgNodePtr pNode;
 
+#ifdef XWIN_MULTIWINDOWINTWM
         if (g_fAnotherWMRunning) {      /* Another Window manager exists. */
             Sleep(1000);
             continue;
         }
+#endif
 
         /* Pop a message off of our queue */
         pNode = PopMessage(&pWMInfo->wmMsgQueue, pWMInfo);
@@ -705,47 +677,26 @@ winMultiWindowWMProc(void *pArg)
             pthread_exit(NULL);
         }
 
-#if CYGMULTIWINDOW_DEBUG
-        ErrorF("winMultiWindowWMProc - %d ms MSG: %d ID: %d\n",
-               GetTickCount(), (int) pNode->msg.msg, (int) pNode->msg.dwID);
-#endif
+        winDebug ("winMultiWindowWMProc - %d ms MSG: %d ID: %d\n",
+                  GetTickCount(), (int) pNode->msg.msg, (int) pNode->msg.dwID);
 
         /* Branch on the message type */
         switch (pNode->msg.msg) {
-#if 0
-        case WM_WM_MOVE:
-            ErrorF("\tWM_WM_MOVE\n");
-            break;
-
-        case WM_WM_SIZE:
-            ErrorF("\tWM_WM_SIZE\n");
-            break;
-#endif
-
         case WM_WM_RAISE:
-#if CYGMULTIWINDOW_DEBUG
-            ErrorF("\tWM_WM_RAISE\n");
-#endif
+            winDebug ("\tWM_WM_RAISE\n");
             /* Raise the window */
             XRaiseWindow(pWMInfo->pDisplay, pNode->msg.iWindow);
-#if 0
-            PreserveWin32Stack(pWMInfo, pNode->msg.iWindow, GW_HWNDPREV);
-#endif
             break;
 
         case WM_WM_LOWER:
-#if CYGMULTIWINDOW_DEBUG
-            ErrorF("\tWM_WM_LOWER\n");
-#endif
+            winDebug ("\tWM_WM_LOWER\n");
 
             /* Lower the window */
             XLowerWindow(pWMInfo->pDisplay, pNode->msg.iWindow);
             break;
 
         case WM_WM_MAP:
-#if CYGMULTIWINDOW_DEBUG
-            ErrorF("\tWM_WM_MAP\n");
-#endif
+            winDebug ("\tWM_WM_MAP\n");
             /* Put a note as to the HWND associated with this Window */
             XChangeProperty(pWMInfo->pDisplay, pNode->msg.iWindow, pWMInfo->atmPrivMap, XA_INTEGER,     //pWMInfo->atmPrivMap,
                             32,
@@ -753,12 +704,16 @@ winMultiWindowWMProc(void *pArg)
                             (unsigned char *) &(pNode->msg.hwndWindow), 1);
             UpdateName(pWMInfo, pNode->msg.iWindow);
             UpdateIcon(pWMInfo, pNode->msg.iWindow);
+            {
+                HWND zstyle = HWND_NOTOPMOST;
+                winApplyHints (pWMInfo->pDisplay, pNode->msg.iWindow, pNode->msg.hwndWindow, &zstyle);
+                winUpdateWindowPosition (pNode->msg.hwndWindow, TRUE, &zstyle);
+            }
             break;
 
         case WM_WM_MAP2:
-#if CYGMULTIWINDOW_DEBUG
-            ErrorF("\tWM_WM_MAP2\n");
-#endif
+            winDebug ("\tWM_WM_MAP2\n");
+
             XChangeProperty(pWMInfo->pDisplay, pNode->msg.iWindow, pWMInfo->atmPrivMap, XA_INTEGER,     //pWMInfo->atmPrivMap,
                             32,
                             PropModeReplace,
@@ -766,9 +721,8 @@ winMultiWindowWMProc(void *pArg)
             break;
 
         case WM_WM_MAP3:
-#if CYGMULTIWINDOW_DEBUG
-            ErrorF("\tWM_WM_MAP3\n");
-#endif
+            winDebug ("\tWM_WM_MAP3\n");
+
             /* Put a note as to the HWND associated with this Window */
             XChangeProperty(pWMInfo->pDisplay, pNode->msg.iWindow, pWMInfo->atmPrivMap, XA_INTEGER,     //pWMInfo->atmPrivMap,
                             32,
@@ -792,18 +746,14 @@ winMultiWindowWMProc(void *pArg)
             break;
 
         case WM_WM_UNMAP:
-#if CYGMULTIWINDOW_DEBUG
-            ErrorF("\tWM_WM_UNMAP\n");
-#endif
+            winDebug ("\tWM_WM_UNMAP\n");
 
             /* Unmap the window */
             XUnmapWindow(pWMInfo->pDisplay, pNode->msg.iWindow);
             break;
 
         case WM_WM_KILL:
-#if CYGMULTIWINDOW_DEBUG
-            ErrorF("\tWM_WM_KILL\n");
-#endif
+            winDebug ("\tWM_WM_KILL\n");
             {
                 int i, n, found = 0;
                 Atom *protocols;
@@ -829,9 +779,7 @@ winMultiWindowWMProc(void *pArg)
             break;
 
         case WM_WM_ACTIVATE:
-#if CYGMULTIWINDOW_DEBUG
-            ErrorF("\tWM_WM_ACTIVATE\n");
-#endif
+            winDebug ("\tWM_WM_ACTIVATE\n");
 
             /* Set the input focus */
             XSetInputFocus(pWMInfo->pDisplay,
@@ -887,9 +835,10 @@ winMultiWindowWMProc(void *pArg)
     /* Free the passed-in argument */
     free(pProcArg);
 
-#if CYGMULTIWINDOW_DEBUG
-    ErrorF("-winMultiWindowWMProc ()\n");
-#endif
+    winDebug("-winMultiWindowWMProc ()\n");
+
+    pthread_cleanup_pop(0);
+
     return NULL;
 }
 
@@ -913,6 +862,8 @@ winMultiWindowXMsgProc(void *pArg)
     int iReturn;
     XIconSize *xis;
 
+    pthread_cleanup_push(&winMultiWindowThreadExit, NULL);
+
     winDebug("winMultiWindowXMsgProc - Hello\n");
 
     /* Check that argument pointer is not invalid */
@@ -921,7 +872,7 @@ winMultiWindowXMsgProc(void *pArg)
         pthread_exit(NULL);
     }
 
-    ErrorF("winMultiWindowXMsgProc - Calling pthread_mutex_lock ()\n");
+    winDebug("winMultiWindowXMsgProc - Calling pthread_mutex_lock ()\n");
 
     /* Grab the server started mutex - pause until we get it */
     iReturn = pthread_mutex_lock(pProcArg->ppmServerStarted);
@@ -931,23 +882,12 @@ winMultiWindowXMsgProc(void *pArg)
         pthread_exit(NULL);
     }
 
-    ErrorF("winMultiWindowXMsgProc - pthread_mutex_lock () returned.\n");
-
-    /* Allow multiple threads to access Xlib */
-    if (XInitThreads() == 0) {
-        ErrorF("winMultiWindowXMsgProc - XInitThreads () failed.  Exiting.\n");
-        pthread_exit(NULL);
-    }
-
-    /* See if X supports the current locale */
-    if (XSupportsLocale() == False) {
-        ErrorF("winMultiWindowXMsgProc - Warning: locale not supported by X\n");
-    }
+    winDebug("winMultiWindowXMsgProc - pthread_mutex_lock () returned.\n");
 
     /* Release the server started mutex */
     pthread_mutex_unlock(pProcArg->ppmServerStarted);
 
-    ErrorF("winMultiWindowXMsgProc - pthread_mutex_unlock () returned.\n");
+    winDebug("winMultiWindowXMsgProc - pthread_mutex_unlock () returned.\n");
 
     /* Install our error handler */
     XSetErrorHandler(winMultiWindowXMsgProcErrorHandler);
@@ -971,11 +911,10 @@ winMultiWindowXMsgProc(void *pArg)
     }
 
     /* Setup the display connection string x */
-    snprintf(pszDisplay,
-             512, "127.0.0.1:%s.%d", display, (int) pProcArg->dwScreen);
+    winGetDisplayName(pszDisplay, (int)pProcArg->dwScreen);
 
     /* Print the display connection string */
-    ErrorF("winMultiWindowXMsgProc - DISPLAY=%s\n", pszDisplay);
+    winDebug("winMultiWindowXMsgProc - DISPLAY=%s\n", pszDisplay);
 
     /* Use our generated cookie for authentication */
     winSetAuthorization();
@@ -988,8 +927,8 @@ winMultiWindowXMsgProc(void *pArg)
         /* Try to open the display */
         pProcArg->pDisplay = XOpenDisplay(pszDisplay);
         if (pProcArg->pDisplay == NULL) {
-            ErrorF("winMultiWindowXMsgProc - Could not open display, try: %d, "
-                   "sleeping: %d\n", iRetries + 1, WIN_CONNECT_DELAY);
+            winDebug("winMultiWindowXMsgProc - Could not open display, try: %d, "
+                     "sleeping: %d\n", iRetries + 1, WIN_CONNECT_DELAY);
             ++iRetries;
             sleep(WIN_CONNECT_DELAY);
             continue;
@@ -1006,15 +945,25 @@ winMultiWindowXMsgProc(void *pArg)
         pthread_exit(NULL);
     }
 
-    ErrorF("winMultiWindowXMsgProc - XOpenDisplay () returned and "
-           "successfully opened the display.\n");
+    winDebug("winMultiWindowXMsgProc - XOpenDisplay () returned and "
+             "successfully opened the display.\n");
 
     /* Check if another window manager is already running */
+#ifdef XWIN_MULTIWINDOWINTWM
     g_fAnotherWMRunning =
         CheckAnotherWindowManager(pProcArg->pDisplay, pProcArg->dwScreen,
                                   pProcArg->pWMInfo->fAllowOtherWM);
+#else
+    g_fAnotherWMRunning =
+        CheckAnotherWindowManager(pProcArg->pDisplay, pProcArg->dwScreen,
+                                  FALSE);
+#endif
 
-    if (g_fAnotherWMRunning && !pProcArg->pWMInfo->fAllowOtherWM) {
+    if (g_fAnotherWMRunning
+#ifdef XWIN_MULTIWINDOWINTWM
+        && !pProcArg->pWMInfo->fAllowOtherWM
+#endif
+      ) {
         ErrorF("winMultiWindowXMsgProc - "
                "another window manager is running.  Exiting.\n");
         pthread_exit(NULL);
@@ -1056,6 +1005,7 @@ winMultiWindowXMsgProc(void *pArg)
         if (g_shutdown)
             break;
 
+#ifdef XWIN_MULTIWINDOWINTWM
         if (pProcArg->pWMInfo->fAllowOtherWM && !XPending(pProcArg->pDisplay)) {
             if (CheckAnotherWindowManager
                 (pProcArg->pDisplay, pProcArg->dwScreen, TRUE)) {
@@ -1075,12 +1025,13 @@ winMultiWindowXMsgProc(void *pArg)
             Sleep(500);
             continue;
         }
+#endif
 
         /* Fetch next event */
         XNextEvent(pProcArg->pDisplay, &event);
 
         /* Branch on event type */
-        if (event.type == CreateNotify) {
+        if (event.type == MapNotify /* CreateNotify */) {
             XWindowAttributes attr;
 
             XSelectInput(pProcArg->pDisplay,
@@ -1090,7 +1041,7 @@ winMultiWindowXMsgProc(void *pArg)
             XGetWindowAttributes(pProcArg->pDisplay,
                                  event.xcreatewindow.window, &attr);
 
-            if (!attr.override_redirect)
+            if (!attr.override_redirect && attr.class != InputOnly)
                 XSetWindowBorderWidth(pProcArg->pDisplay,
                                       event.xcreatewindow.window, 0);
         }
@@ -1138,6 +1089,7 @@ winMultiWindowXMsgProc(void *pArg)
                     event_send.xreparent.parent = parent;
                     event_send.xreparent.x = attr.x;
                     event_send.xreparent.y = attr.y;
+                    event_send.xreparent.override_redirect = False;
 
                     XSendEvent(event.xmap.display,
                                event.xmap.window,
@@ -1210,7 +1162,7 @@ winMultiWindowXMsgProc(void *pArg)
         else if (event.type == ClientMessage
                  && event.xclient.message_type == atmWmChange
                  && event.xclient.data.l[0] == IconicState) {
-            ErrorF("winMultiWindowXMsgProc - WM_CHANGE_STATE - IconicState\n");
+            winDebug("winMultiWindowXMsgProc - WM_CHANGE_STATE - IconicState\n");
 
             memset(&msg, 0, sizeof(msg));
 
@@ -1222,7 +1174,7 @@ winMultiWindowXMsgProc(void *pArg)
     }
 
     XCloseDisplay(pProcArg->pDisplay);
-    pthread_exit(NULL);
+    pthread_cleanup_pop(0);
     return NULL;
 }
 
@@ -1259,7 +1211,9 @@ winInitWM(void **ppWMInfo,
 
     /* Set a return pointer to the Window Manager info structure */
     *ppWMInfo = pWMInfo;
+#ifdef XWIN_MULTIWINDOWINTWM
     pWMInfo->fAllowOtherWM = allowOtherWM;
+#endif
 
     /* Setup the argument structure for the thread function */
     pArg->dwScreen = dwScreen;
@@ -1290,9 +1244,7 @@ winInitWM(void **ppWMInfo,
         return FALSE;
     }
 
-#if CYGDEBUG || YES
     winDebug("winInitWM - Returning.\n");
-#endif
 
     return TRUE;
 }
@@ -1316,7 +1268,7 @@ winInitMultiWindowWM(WMInfoPtr pWMInfo, WMProcArgPtr pProcArg)
         pthread_exit(NULL);
     }
 
-    ErrorF("winInitMultiWindowWM - Calling pthread_mutex_lock ()\n");
+    winDebug("winInitMultiWindowWM - Calling pthread_mutex_lock ()\n");
 
     /* Grab our garbage mutex to satisfy pthread_cond_wait */
     iReturn = pthread_mutex_lock(pProcArg->ppmServerStarted);
@@ -1326,23 +1278,12 @@ winInitMultiWindowWM(WMInfoPtr pWMInfo, WMProcArgPtr pProcArg)
         pthread_exit(NULL);
     }
 
-    ErrorF("winInitMultiWindowWM - pthread_mutex_lock () returned.\n");
-
-    /* Allow multiple threads to access Xlib */
-    if (XInitThreads() == 0) {
-        ErrorF("winInitMultiWindowWM - XInitThreads () failed.  Exiting.\n");
-        pthread_exit(NULL);
-    }
-
-    /* See if X supports the current locale */
-    if (XSupportsLocale() == False) {
-        ErrorF("winInitMultiWindowWM - Warning: Locale not supported by X.\n");
-    }
+    winDebug("winInitMultiWindowWM - pthread_mutex_lock () returned.\n");
 
     /* Release the server started mutex */
     pthread_mutex_unlock(pProcArg->ppmServerStarted);
 
-    ErrorF("winInitMultiWindowWM - pthread_mutex_unlock () returned.\n");
+    winDebug("winInitMultiWindowWM - pthread_mutex_unlock () returned.\n");
 
     /* Install our error handler */
     XSetErrorHandler(winMultiWindowWMErrorHandler);
@@ -1366,11 +1307,10 @@ winInitMultiWindowWM(WMInfoPtr pWMInfo, WMProcArgPtr pProcArg)
     }
 
     /* Setup the display connection string x */
-    snprintf(pszDisplay,
-             512, "127.0.0.1:%s.%d", display, (int) pProcArg->dwScreen);
+    winGetDisplayName(pszDisplay, (int)pProcArg->dwScreen);
 
     /* Print the display connection string */
-    ErrorF("winInitMultiWindowWM - DISPLAY=%s\n", pszDisplay);
+    winDebug("winInitMultiWindowWM - DISPLAY=%s\n", pszDisplay);
 
     /* Use our generated cookie for authentication */
     winSetAuthorization();
@@ -1398,8 +1338,8 @@ winInitMultiWindowWM(WMInfoPtr pWMInfo, WMProcArgPtr pProcArg)
         pthread_exit(NULL);
     }
 
-    ErrorF("winInitMultiWindowWM - XOpenDisplay () returned and "
-           "successfully opened the display.\n");
+    winDebug("winInitMultiWindowWM - XOpenDisplay () returned and "
+             "successfully opened the display.\n");
 
     /* Create some atoms */
     pWMInfo->atmWmProtos = XInternAtom(pWMInfo->pDisplay,
@@ -1430,9 +1370,7 @@ winSendMessageToWM(void *pWMInfo, winWMMessagePtr pMsg)
 {
     WMMsgNodePtr pNode;
 
-#if CYGMULTIWINDOW_DEBUG
-    ErrorF("winSendMessageToWM ()\n");
-#endif
+    winDebug("winSendMessageToWM ()\n");
 
     pNode = (WMMsgNodePtr) malloc(sizeof(WMMsgNodeRec));
     if (pNode != NULL) {
@@ -1458,7 +1396,18 @@ winMultiWindowWMErrorHandler(Display * pDisplay, XErrorEvent * pErr)
     }
 
     XGetErrorText(pDisplay, pErr->error_code, pszErrorMsg, sizeof(pszErrorMsg));
-    ErrorF("winMultiWindowWMErrorHandler - ERROR: %s\n", pszErrorMsg);
+    ErrorF("winMultiWindowWMErrorHandler - ERROR: %s\n"
+           "  errorCode %d\n"
+           "  serial %d\n"
+           "  resourceID 0x%x\n"
+           "  majorCode %d\n"
+           "  minorCode %d\n"
+           , pszErrorMsg
+           , pErr->error_code
+           , pErr->serial
+           , pErr->resourceid
+           , pErr->request_code
+           , pErr->minor_code);
 
     return 0;
 }
@@ -1496,9 +1445,18 @@ winMultiWindowXMsgProcErrorHandler(Display * pDisplay, XErrorEvent * pErr)
     char pszErrorMsg[100];
 
     XGetErrorText(pDisplay, pErr->error_code, pszErrorMsg, sizeof(pszErrorMsg));
-#if CYGMULTIWINDOW_DEBUG
-    ErrorF("winMultiWindowXMsgProcErrorHandler - ERROR: %s\n", pszErrorMsg);
-#endif
+    ErrorF("winMultiWindowXMsgProcErrorHandler - ERROR: %s\n"
+           "  errorCode %d\n"
+           "  serial %d\n"
+           "  resourceID 0x%x\n"
+           "  majorCode %d\n"
+           "  minorCode %d\n"
+           , pszErrorMsg
+           , pErr->error_code
+           , pErr->serial
+           , pErr->resourceid
+           , pErr->request_code
+           , pErr->minor_code);
 
     return 0;
 }
@@ -1524,6 +1482,18 @@ winMultiWindowXMsgProcIOErrorHandler(Display * pDisplay)
 }
 
 /*
+ * winMultiWindowThreadExit - Thread exit handler
+ */
+
+static void
+winMultiWindowThreadExit(void *arg)
+{
+    AbortDDX(EXIT_ERR_ABORT);
+
+    /* multiwindow client thread has exited, stop server as well */
+    TerminateProcess(GetCurrentProcess(),1);
+}
+/*
  * Catch RedirectError to detect other window manager running
  */
 
@@ -1574,7 +1544,7 @@ CheckAnotherWindowManager(Display * pDisplay, DWORD dwScreen,
 void
 winDeinitMultiWindowWM(void)
 {
-    ErrorF("winDeinitMultiWindowWM - Noting shutdown in progress\n");
+    winDebug("winDeinitMultiWindowWM - Noting shutdown in progress\n");
     g_shutdown = TRUE;
 }
 
@@ -1603,7 +1573,9 @@ winApplyHints(Display * pDisplay, Window iWindow, HWND hWnd, HWND * zstyle)
     int format;
     unsigned long hint = 0, maxmin = 0, nitems = 0, left = 0;
     unsigned long style, exStyle;
+    WindowPtr pWin = GetProp (hWnd, WIN_WINDOW_PROP);
     MwmHints *mwm_hint = NULL;
+    WinXSizeHints SizeHints;
 
     if (!hWnd)
         return;
@@ -1726,17 +1698,18 @@ winApplyHints(Display * pDisplay, Window iWindow, HWND hWnd, HWND * zstyle)
      */
     {
         XClassHint class_hint = { 0, 0 };
-        char *window_name = 0;
         char *application_id = 0;
 
         if (XGetClassHint(pDisplay, iWindow, &class_hint)) {
+            char *window_name = 0;
+            char *application_id = 0;
             XFetchName(pDisplay, iWindow, &window_name);
 
             style =
                 winOverrideStyle(class_hint.res_name, class_hint.res_class,
                                  window_name);
 
-#define APPLICATION_ID_FORMAT	"%s.xwin.%s"
+#define APPLICATION_ID_FORMAT	"%s.vcxsrv.%s"
 #define APPLICATION_ID_UNKNOWN "unknown"
             if (class_hint.res_class) {
                 asprintf(&application_id, APPLICATION_ID_FORMAT, XVENDORNAME,
@@ -1782,12 +1755,10 @@ winApplyHints(Display * pDisplay, Window iWindow, HWND hWnd, HWND * zstyle)
             HINT_SIZEBOX;
     else if (style & STYLE_OUTLINE)
         hint =
-            (hint & ~HINT_NOFRAME & ~HINT_SIZEBOX & ~HINT_CAPTION) |
-            HINT_BORDER;
+            (hint & ~HINT_NOFRAME & ~HINT_CAPTION) | HINT_BORDER;
     else if (style & STYLE_NOFRAME)
         hint =
-            (hint & ~HINT_BORDER & ~HINT_CAPTION & ~HINT_SIZEBOX) |
-            HINT_NOFRAME;
+            (hint & ~HINT_BORDER & ~HINT_CAPTION) | HINT_NOFRAME;
 
     /* Now apply styles to window */
     style = GetWindowLongPtr(hWnd, GWL_STYLE);
@@ -1797,7 +1768,7 @@ winApplyHints(Display * pDisplay, Window iWindow, HWND hWnd, HWND * zstyle)
     style &= ~WS_CAPTION & ~WS_SIZEBOX; /* Just in case */
 
     if (!(hint & ~HINT_SKIPTASKBAR))    /* No hints, default */
-        style = style | WS_CAPTION | WS_SIZEBOX;
+        style = style | WS_CAPTION;
     else if (hint & HINT_NOFRAME)       /* No frame, no decorations */
         style = style & ~WS_CAPTION & ~WS_SIZEBOX;
     else
@@ -1817,6 +1788,19 @@ winApplyHints(Display * pDisplay, Window iWindow, HWND hWnd, HWND * zstyle)
     if (hint & HINT_SKIPTASKBAR)
         style = style & ~WS_MINIMIZEBOX;        /* window will become lost if minimized */
 
+    if (!IsWindow (hWnd))
+    {
+        ErrorF("Windows window 0x%x has become invalid, so returning without applying hints\n",hWnd);
+        return;
+    }
+                
+    if (winMultiWindowGetWMNormalHints(pWin, &SizeHints))
+    {
+        if (!(SizeHints.max_width&&SizeHints.max_height&&(SizeHints.min_width == SizeHints.max_width)&&(SizeHints.min_height == SizeHints.max_height) ))
+            style|=WS_SIZEBOX;
+    }
+    else
+        style|=WS_SIZEBOX;
     SetWindowLongPtr(hWnd, GWL_STYLE, style);
 
     exStyle = GetWindowLongPtr(hWnd, GWL_EXSTYLE);
@@ -1857,9 +1841,6 @@ winUpdateWindowPosition(HWND hWnd, HWND * zstyle)
     /* Setup a rectangle with the X window position and size */
     SetRect(&rcNew, iX, iY, iX + iWidth, iY + iHeight);
 
-    winDebug("winUpdateWindowPosition - drawable extent (%d, %d)-(%d, %d)\n",
-             rcNew.left, rcNew.top, rcNew.right, rcNew.bottom);
-
     AdjustWindowRectEx(&rcNew, GetWindowLongPtr(hWnd, GWL_STYLE), FALSE,
                        GetWindowLongPtr(hWnd, GWL_EXSTYLE));
 
@@ -1876,11 +1857,105 @@ winUpdateWindowPosition(HWND hWnd, HWND * zstyle)
         rcNew.bottom += iDy;
     }
 
-    winDebug("winUpdateWindowPosition - Window extent (%d, %d)-(%d, %d)\n",
-             rcNew.left, rcNew.top, rcNew.right, rcNew.bottom);
-
     /* Position the Windows window */
     SetWindowPos(hWnd, *zstyle, rcNew.left, rcNew.top,
                  rcNew.right - rcNew.left, rcNew.bottom - rcNew.top, 0);
 
 }
+
+void
+winTaskbarInit (void)
+{
+  /*
+    Load libraries and get function pointers to SHGetPropertyStoreForWindow
+    and PropVariantClear for winSetAppID()
+  */
+
+  /*
+    SHGetPropertyStoreForWindow is only supported since Windows 7. On previous
+    versions the pointer will be NULL and taskbar grouping is not supported.
+    winSetAppID() will do nothing in this case.
+  */
+  g_hmodShell32Dll = LoadLibrary ("shell32.dll");
+  if (g_hmodShell32Dll == NULL)
+    {
+      ErrorF ("winTaskbarInit - Could not load shell32.dll\n");
+      return;
+    }
+
+  g_pSHGetPropertyStoreForWindow = (SHGETPROPERTYSTOREFORWINDOWPROC) GetProcAddress (g_hmodShell32Dll, "SHGetPropertyStoreForWindow");
+  if (g_pSHGetPropertyStoreForWindow == NULL)
+    {
+      ErrorF ("winTaskbarInit - Could not get SHGetPropertyStoreForWindow address\n");
+      return;
+    }
+
+  /*
+    PropVariantClear is supported since NT4, but we have no propidl.h to
+    provide a prototype for it
+  */
+  g_hmodOle32Dll = LoadLibrary ("ole32.dll");
+  if (g_hmodOle32Dll == NULL)
+    {
+      ErrorF ("winTaskbarInit - Could not load ole32.dll\n");
+      return;
+    }
+
+  g_pPropVariantClear = (PROPVARIANTCLEARPROC) GetProcAddress (g_hmodOle32Dll, "PropVariantClear");
+  if (g_pPropVariantClear == NULL)
+    {
+      ErrorF ("winTaskbarInit - Could not get g_pPropVariantClear address\n");
+      return;
+    }
+}
+
+void
+winTaskbarDestroy (void)
+{
+  if (g_hmodOle32Dll != NULL)
+    {
+      FreeLibrary (g_hmodOle32Dll);
+      g_hmodOle32Dll = NULL;
+      g_pPropVariantClear = NULL;
+    }
+  if (g_hmodShell32Dll != NULL)
+    {
+      FreeLibrary (g_hmodShell32Dll);
+      g_hmodShell32Dll = NULL;
+      g_pSHGetPropertyStoreForWindow = NULL;
+    }
+}
+
+void
+winSetAppID (HWND hWnd, const char* AppID)
+{
+  PROPVARIANT pv;
+  IPropertyStore *pps = NULL;
+  HRESULT hr;
+
+  if (g_pSHGetPropertyStoreForWindow == NULL ||
+      g_pPropVariantClear == NULL)
+    {
+      return;
+    }
+
+  winDebug ("winSetAppID - hwnd 0x%08x appid '%s'\n", hWnd, AppID);
+
+  hr = g_pSHGetPropertyStoreForWindow (hWnd, &IID_IPropertyStore, (void**)&pps);
+  if(SUCCEEDED(hr) && pps)
+    {
+      memset(&pv, 0, sizeof(PROPVARIANT));
+      if(AppID)
+        {
+          pv.vt = VT_LPWSTR;
+          hr = SHStrDupA(AppID, &pv.pwszVal);
+        }
+
+      if(SUCCEEDED(hr))
+        {
+          hr = pps->lpVtbl->SetValue(pps, &PKEY_AppUserModel_ID, &pv);
+          g_pPropVariantClear(&pv);
+        }
+      pps->lpVtbl->Release(pps);
+    }
+}
diff --git a/xorg-server/hw/xwin/winmultiwindowwndproc.c b/xorg-server/hw/xwin/winmultiwindowwndproc.c
index 0e46ea7fe..abd7672cc 100644..100755
--- a/xorg-server/hw/xwin/winmultiwindowwndproc.c
+++ b/xorg-server/hw/xwin/winmultiwindowwndproc.c
@@ -35,6 +35,10 @@
 #ifdef HAVE_XWIN_CONFIG_H
 #include <xwin-config.h>
 #endif
+#define GC tempGC  // This is to avoid name conflicts when including the next headers which also define GC
+#include <X11/Xutil.h>
+#undef GC
+
 #include "win.h"
 #include "dixevents.h"
 #include "winmultiwindowclass.h"
@@ -44,6 +48,14 @@
 
 extern void winUpdateWindowPosition(HWND hWnd, HWND * zstyle);
 
+#ifdef XKB
+#ifndef XKB_IN_SERVER
+#define XKB_IN_SERVER
+#endif
+#include <xkbsrv.h>
+#endif
+
+
 /*
  * Local globals
  */
@@ -316,11 +328,10 @@ winTopLevelWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
     static Bool s_fTracking = FALSE;
     Bool needRestack = FALSE;
     LRESULT ret;
+    static Bool	hasEnteredSizeMove = FALSE;
 
-#if CYGDEBUG
     winDebugWin32Message("winTopLevelWindowProc", hwnd, message, wParam,
                          lParam);
-#endif
 
     /* Check if the Windows window property for our X window pointer is valid */
     if ((pWin = GetProp(hwnd, WIN_WINDOW_PROP)) != NULL) {
@@ -352,32 +363,13 @@ winTopLevelWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 
         fWMMsgInitialized = TRUE;
 
-#if 0
-        /*
-         * Print some debugging information
-         */
-
-        ErrorF("hWnd %08X\n", hwnd);
-        ErrorF("pWin %08X\n", pWin);
-        ErrorF("pDraw %08X\n", pDraw);
-        ErrorF("\ttype %08X\n", pWin->drawable.type);
-        ErrorF("\tclass %08X\n", pWin->drawable.class);
-        ErrorF("\tdepth %08X\n", pWin->drawable.depth);
-        ErrorF("\tbitsPerPixel %08X\n", pWin->drawable.bitsPerPixel);
-        ErrorF("\tid %08X\n", pWin->drawable.id);
-        ErrorF("\tx %08X\n", pWin->drawable.x);
-        ErrorF("\ty %08X\n", pWin->drawable.y);
-        ErrorF("\twidth %08X\n", pWin->drawable.width);
-        ErrorF("\thenght %08X\n", pWin->drawable.height);
-        ErrorF("\tpScreen %08X\n", pWin->drawable.pScreen);
-        ErrorF("\tserialNumber %08X\n", pWin->drawable.serialNumber);
-        ErrorF("g_iWindowPrivateKey %p\n", g_iWindowPrivateKey);
-        ErrorF("pWinPriv %08X\n", pWinPriv);
-        ErrorF("s_pScreenPriv %08X\n", s_pScreenPriv);
-        ErrorF("s_pScreenInfo %08X\n", s_pScreenInfo);
-        ErrorF("hwndScreen %08X\n", hwndScreen);
-#endif
     }
+    #ifdef _DEBUG
+    else if (message!=WM_CREATE)
+    {
+        winDebug("Warning: message 0x%x received when WIN_WINDOW_PROP NULL\n",message);
+    }
+  #endif
 
     /* Branch on message type */
     switch (message) {
@@ -409,10 +401,9 @@ winTopLevelWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
             GetWindowRect(hwnd, &rWindow);
             hRgnWindow = CreateRectRgnIndirect(&rWindow);
             SetWindowRgn(hwnd, hRgnWindow, TRUE);
-            DeleteObject(hRgnWindow);
         }
 
-        SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR) XMING_SIGNATURE);
+        SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)VCXSRV_SIGNATURE);
 
         return 0;
 
@@ -593,6 +584,9 @@ winTopLevelWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
         break;
 
     case WM_MOUSELEAVE:
+       /* We can't do anything without privates */
+        if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
+	          break;
         /* Mouse has left our client area */
 
         /* Flag that we are no longer tracking */
@@ -744,7 +738,7 @@ winTopLevelWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
         if (wParam == VK_F4 && (GetKeyState(VK_MENU) & 0x8000))
             break;
 
-#if CYGWINDOWING_DEBUG
+#ifdef WINDBG
         if (wParam == VK_ESCAPE) {
             /* Place for debug: put any tests and dumps here */
             WINDOWPLACEMENT windPlace;
@@ -754,25 +748,25 @@ winTopLevelWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
             windPlace.length = sizeof(WINDOWPLACEMENT);
             GetWindowPlacement(hwnd, &windPlace);
             pRect = &windPlace.rcNormalPosition;
-            ErrorF("\nCYGWINDOWING Dump:\n"
+            winDebug ("\nCYGWINDOWING Dump:\n"
                    "\tdrawable: (%hd, %hd) - %hdx%hd\n", pDraw->x,
                    pDraw->y, pDraw->width, pDraw->height);
-            ErrorF("\twindPlace: (%ld, %ld) - %ldx%ld\n", pRect->left,
-                   pRect->top, pRect->right - pRect->left,
-                   pRect->bottom - pRect->top);
+            winDebug ("\twindPlace: (%ld, %ld) - %ldx%ld\n", pRect->left,
+                      pRect->top, pRect->right - pRect->left,
+                      pRect->bottom - pRect->top);
             if (GetClientRect(hwnd, &rc)) {
                 pRect = &rc;
-                ErrorF("\tClientRect: (%ld, %ld) - %ldx%ld\n", pRect->left,
-                       pRect->top, pRect->right - pRect->left,
-                       pRect->bottom - pRect->top);
+                winDebug ("\tClientRect: (%ld, %ld) - %ldx%ld\n", pRect->left,
+                          pRect->top, pRect->right - pRect->left,
+                          pRect->bottom - pRect->top);
             }
             if (GetWindowRect(hwnd, &rc)) {
                 pRect = &rc;
-                ErrorF("\tWindowRect: (%ld, %ld) - %ldx%ld\n", pRect->left,
-                       pRect->top, pRect->right - pRect->left,
-                       pRect->bottom - pRect->top);
+                winDebug ("\tWindowRect: (%ld, %ld) - %ldx%ld\n", pRect->left,
+                          pRect->top, pRect->right - pRect->left,
+                          pRect->bottom - pRect->top);
             }
-            ErrorF("\n");
+            winDebug ("\n");
         }
 #endif
 
@@ -807,9 +801,8 @@ winTopLevelWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 
             /* Tell our Window Manager thread to activate the window */
             wmMsg.msg = WM_WM_ACTIVATE;
-            if (fWMMsgInitialized)
-                if (!pWin || !pWin->overrideRedirect)   /* for OOo menus */
-                    winSendMessageToWM(s_pScreenPriv->pWMInfo, &wmMsg);
+            if (fWMMsgInitialized && pWin->realized && !pWin->overrideRedirect /* for OOo menus */)
+	              winSendMessageToWM (s_pScreenPriv->pWMInfo, &wmMsg);
         }
         /* Prevent the mouse wheel from stalling when another window is minimized */
         if (HIWORD(wParam) == 0 && LOWORD(wParam) == WA_ACTIVE &&
@@ -844,7 +837,7 @@ winTopLevelWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 
         /* Branch on if the window was killed in X already */
         if (pWinPriv && !pWinPriv->fXKilled) {
-            ErrorF("winTopLevelWindowProc - WM_DESTROY - WM_WM_KILL\n");
+            winDebug ("winTopLevelWindowProc - WM_DESTROY - WM_WM_KILL\n");
 
             /* Tell our Window Manager thread to kill the window */
             wmMsg.msg = WM_WM_KILL;
@@ -860,7 +853,8 @@ winTopLevelWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 
     case WM_MOVE:
         /* Adjust the X Window to the moved Windows window */
-        winAdjustXWindow(pWin, hwnd);
+        if (!hasEnteredSizeMove) winAdjustXWindow (pWin, hwnd);
+          /* else: Wait for WM_EXITSIZEMOVE */
         return 0;
 
     case WM_SHOWWINDOW:
@@ -908,13 +902,10 @@ winTopLevelWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
         else {                  /* It is an overridden window so make it top of Z stack */
 
             HWND forHwnd = GetForegroundWindow();
-
-#if CYGWINDOWING_DEBUG
-            ErrorF("overridden window is shown\n");
-#endif
+            winDebug ("overridden window is shown\n");
             if (forHwnd != NULL) {
                 if (GetWindowLongPtr(forHwnd, GWLP_USERDATA) & (LONG_PTR)
-                    XMING_SIGNATURE) {
+                    VCXSRV_SIGNATURE) {
                     if (GetWindowLongPtr(forHwnd, GWL_EXSTYLE) & WS_EX_TOPMOST)
                         SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0,
                                      SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
@@ -939,6 +930,26 @@ winTopLevelWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
         /* for applications like xterm */
         return ValidateSizing(hwnd, pWin, wParam, lParam);
 
+    case WM_WINDOWPOSCHANGING:
+      {
+        /*
+          When window is moved or resized, force it to be redrawn, so that
+          any OpenGL content is re-drawn correctly, rather than copying bits
+          (which seem to be wrong, either because we are copying the wrong
+          window in the window heirarchy, or because we don't have the bits
+          drawn by OpenGL at all)
+
+          XXX: really this should check if any child has fWglUsed set, but
+          that might be expensive to check....
+         */
+        if (g_fNativeGl)
+          {
+            LPWINDOWPOS pWinPos = (LPWINDOWPOS)lParam;
+            pWinPos->flags |= SWP_NOCOPYBITS;
+          }
+      }
+      break;
+
     case WM_WINDOWPOSCHANGED:
     {
         LPWINDOWPOS pWinPos = (LPWINDOWPOS) lParam;
@@ -993,9 +1004,19 @@ winTopLevelWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
          */
         break;
 
+    case WM_ENTERSIZEMOVE:
+      hasEnteredSizeMove = TRUE;
+      return 0;
+
+    case WM_EXITSIZEMOVE:
+      /* Adjust the X Window to the moved Windows window */
+      hasEnteredSizeMove = FALSE;
+      winAdjustXWindow (pWin, hwnd);
+      return 0;
+
     case WM_SIZE:
         /* see dix/window.c */
-#if CYGWINDOWING_DEBUG
+#ifdef WINDBG
     {
         char buf[64];
 
@@ -1012,84 +1033,28 @@ winTopLevelWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
         default:
             strcpy(buf, "UNKNOWN_FLAG");
         }
-        ErrorF("winTopLevelWindowProc - WM_SIZE to %dx%d (%s) - %d ms\n",
-               (int) LOWORD(lParam), (int) HIWORD(lParam), buf,
-               (int) (GetTickCount()));
+        winDebug ("winTopLevelWindowProc - WM_SIZE to %dx%d (%s) - %d ms\n",
+                  (int) LOWORD(lParam), (int) HIWORD(lParam), buf,
+                  (int) (GetTickCount()));
     }
 #endif
-        /* Adjust the X Window to the moved Windows window */
-        winAdjustXWindow(pWin, hwnd);
-        return 0;               /* end of WM_SIZE handler */
-
-    case WM_STYLECHANGING:
-        /*
-           When the style changes, adjust the Windows window size so the client area remains the same size,
-           and adjust the Windows window position so that the client area remains in the same place.
-         */
-    {
-        RECT newWinRect;
-        DWORD dwExStyle;
-        DWORD dwStyle;
-        DWORD newStyle = ((STYLESTRUCT *) lParam)->styleNew;
-        WINDOWINFO wi;
-
-        dwExStyle = GetWindowLongPtr(hwnd, GWL_EXSTYLE);
-        dwStyle = GetWindowLongPtr(hwnd, GWL_STYLE);
-
-        winDebug("winTopLevelWindowProc - WM_STYLECHANGING from %08x %08x\n",
-                 dwStyle, dwExStyle);
-
-        if (wParam == GWL_EXSTYLE)
-            dwExStyle = newStyle;
-
-        if (wParam == GWL_STYLE)
-            dwStyle = newStyle;
-
-        winDebug("winTopLevelWindowProc - WM_STYLECHANGING to %08x %08x\n",
-                 dwStyle, dwExStyle);
-
-        /* Get client rect in screen coordinates */
-        wi.cbSize = sizeof(WINDOWINFO);
-        GetWindowInfo(hwnd, &wi);
-
-        winDebug
-            ("winTopLevelWindowProc - WM_STYLECHANGING client area {%d, %d, %d, %d}, {%d x %d}\n",
-             wi.rcClient.left, wi.rcClient.top, wi.rcClient.right,
-             wi.rcClient.bottom, wi.rcClient.right - wi.rcClient.left,
-             wi.rcClient.bottom - wi.rcClient.top);
-
-        newWinRect = wi.rcClient;
-        if (!AdjustWindowRectEx(&newWinRect, dwStyle, FALSE, dwExStyle))
-            winDebug
-                ("winTopLevelWindowProc - WM_STYLECHANGING AdjustWindowRectEx failed\n");
-
-        winDebug
-            ("winTopLevelWindowProc - WM_STYLECHANGING window area should be {%d, %d, %d, %d}, {%d x %d}\n",
-             newWinRect.left, newWinRect.top, newWinRect.right,
-             newWinRect.bottom, newWinRect.right - newWinRect.left,
-             newWinRect.bottom - newWinRect.top);
-
-        /*
-           Style change hasn't happened yet, so we can't adjust the window size yet, as the winAdjustXWindow()
-           which WM_SIZE does will use the current (unchanged) style.  Instead make a note to change it when
-           WM_STYLECHANGED is received...
-         */
-        pWinPriv->hDwp = BeginDeferWindowPos(1);
-        pWinPriv->hDwp =
-            DeferWindowPos(pWinPriv->hDwp, hwnd, NULL, newWinRect.left,
-                           newWinRect.top, newWinRect.right - newWinRect.left,
-                           newWinRect.bottom - newWinRect.top,
-                           SWP_NOACTIVATE | SWP_NOZORDER);
+        if (!hasEnteredSizeMove)
+        {
+            /* Adjust the X Window to the moved Windows window */
+            winAdjustXWindow (pWin, hwnd);
+            if (wParam == SIZE_MINIMIZED) winReorderWindowsMultiWindow();
     }
-        return 0;
+    /* else: wait for WM_EXITSIZEMOVE */
+    return 0; /* end of WM_SIZE handler */
 
     case WM_STYLECHANGED:
+      /* when the style changes, adjust the window size so the client area remains the same */
     {
-        if (pWinPriv->hDwp) {
-            EndDeferWindowPos(pWinPriv->hDwp);
-            pWinPriv->hDwp = NULL;
-        }
-        winDebug("winTopLevelWindowProc - WM_STYLECHANGED done\n");
+      LONG x,y;
+      DrawablePtr pDraw = &pWin->drawable;
+      x =  pDraw->x - wBorderWidth(pWin);
+      y = pDraw->y - wBorderWidth(pWin);
+      winPositionWindowMultiWindow(pWin, x, y);
     }
         return 0;
 
@@ -1097,10 +1062,8 @@ winTopLevelWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 
         /* Check if this window needs to be made active when clicked */
         if (!GetProp(pWinPriv->hWnd, WIN_NEEDMANAGE_PROP)) {
-#if CYGMULTIWINDOW_DEBUG
-            ErrorF("winTopLevelWindowProc - WM_MOUSEACTIVATE - "
-                   "MA_NOACTIVATE\n");
-#endif
+            winDebug ("winTopLevelWindowProc - WM_MOUSEACTIVATE - "
+                      "MA_NOACTIVATE\n");
 
             /* */
             return MA_NOACTIVATE;
diff --git a/xorg-server/hw/xwin/winnativegdi.c b/xorg-server/hw/xwin/winnativegdi.c
index a2a5123a0..3cd565313 100644
--- a/xorg-server/hw/xwin/winnativegdi.c
+++ b/xorg-server/hw/xwin/winnativegdi.c
@@ -109,7 +109,7 @@ winCloseScreenNativeGDI(ScreenPtr pScreen)
     winScreenPriv(pScreen);
     winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
 
-    ErrorF("winCloseScreenNativeGDI - Freeing screen resources\n");
+    winDebug ("winCloseScreenNativeGDI - Freeing screen resources\n");
 
     /* Flag that the screen is closed */
     pScreenPriv->fClosed = TRUE;
@@ -123,7 +123,7 @@ winCloseScreenNativeGDI(ScreenPtr pScreen)
     /* Delete the window property */
     RemoveProp(pScreenPriv->hwndScreen, WIN_SCR_PROP);
 
-    ErrorF("winCloseScreenNativeGDI - Destroying window\n");
+    winDebug ("winCloseScreenNativeGDI - Destroying window\n");
 
     /* Delete tray icon, if we have one */
     if (!pScreenInfo->fNoTrayIcon)
@@ -147,7 +147,7 @@ winCloseScreenNativeGDI(ScreenPtr pScreen)
     /* Free the screen privates for this screen */
     free(pScreenPriv);
 
-    ErrorF("winCloseScreenNativeGDI - Returning\n");
+    winDebug ("winCloseScreenNativeGDI - Returning\n");
 
     return TRUE;
 }
@@ -202,8 +202,8 @@ winInitVisualsNativeGDI(ScreenPtr pScreen)
     }
 
     /* Tell the user how many bits per RGB we are using */
-    ErrorF("winInitVisualsNativeGDI - Using dwBitsPerRGB: %d\n",
-           (int) pScreenPriv->dwBitsPerRGB);
+    winDebug ("winInitVisualsNativeGDI - Using dwBitsPerRGB: %d\n",
+              (int) pScreenPriv->dwBitsPerRGB);
 
     /* Create a single visual according to the Windows screen depth */
     switch (pScreenInfo->dwDepth) {
@@ -223,7 +223,7 @@ winInitVisualsNativeGDI(ScreenPtr pScreen)
         break;
 
     case 8:
-        ErrorF("winInitVisuals - Calling miSetVisualTypesAndMasks\n");
+        winDebug ("winInitVisuals - Calling miSetVisualTypesAndMasks\n");
         if (!miSetVisualTypesAndMasks(pScreenInfo->dwDepth,
                                       StaticColorMask,
                                       pScreenPriv->dwBitsPerRGB,
@@ -241,9 +241,7 @@ winInitVisualsNativeGDI(ScreenPtr pScreen)
         return FALSE;
     }
 
-#if 1
-    ErrorF("winInitVisualsNativeGDI - Returning\n");
-#endif
+    winDebug ("winInitVisualsNativeGDI - Returning\n");
 
     return TRUE;
 }
@@ -359,11 +357,13 @@ winCreateDIBNativeGDI(int iWidth, int iHeight, int iDepth,
     pbmih->biPlanes = 1;
     pbmih->biBitCount = iDepth;
     pbmih->biCompression = BI_RGB;
+  /*
     pbmih->biSizeImage = 0;
     pbmih->biXPelsPerMeter = 0;
     pbmih->biYPelsPerMeter = 0;
     pbmih->biClrUsed = 0;
     pbmih->biClrImportant = 0;
+  */
 
     /* Setup color table for mono DIBs */
     if (iDepth == 1) {
diff --git a/xorg-server/hw/xwin/winpfbdd.c b/xorg-server/hw/xwin/winpfbdd.c
index ee6ea7290..53056e177 100644
--- a/xorg-server/hw/xwin/winpfbdd.c
+++ b/xorg-server/hw/xwin/winpfbdd.c
@@ -73,7 +73,7 @@ winAllocateFBPrimaryDD(ScreenPtr pScreen)
     DDSURFACEDESC *pddsdOffscreen = NULL;
     RECT rcClient;
 
-    ErrorF("winAllocateFBPrimaryDD\n");
+    winDebug ("winAllocateFBPrimaryDD\n");
 
     /* Get client area location in screen coords */
     GetClientRect(pScreenPriv->hwndScreen, &rcClient);
@@ -95,7 +95,7 @@ winAllocateFBPrimaryDD(ScreenPtr pScreen)
         return FALSE;
     }
 
-    ErrorF("winAllocateFBPrimaryDD - Created and initialized DD\n");
+    winDebug ("winAllocateFBPrimaryDD - Created and initialized DD\n");
 
     /* Are we windowed or fullscreen? */
     if (pScreenInfo->fFullScreen) {
@@ -141,7 +141,7 @@ winAllocateFBPrimaryDD(ScreenPtr pScreen)
         FatalError("winAllocateFBPrimaryDD - Could not create primary "
                    "surface %08x\n", (unsigned int) ddrval);
 
-    ErrorF("winAllocateFBPrimaryDD - Created primary\n");
+    winDebug ("winAllocateFBPrimaryDD - Created primary\n");
 
     /* Allocate a DD surface description for our screen privates */
     pddsdPrimary = pScreenPriv->pddsdPrimary = malloc(sizeof(DDSURFACEDESC));
@@ -175,7 +175,7 @@ winAllocateFBPrimaryDD(ScreenPtr pScreen)
         FatalError("winAllocateFBPrimaryDD - Could not create shadow "
                    "surface\n");
 
-    ErrorF("winAllocateFBPrimaryDD - Created offscreen\n");
+    winDebug ("winAllocateFBPrimaryDD - Created offscreen\n");
 
     /* Allocate a DD surface description for our screen privates */
     pddsdOffscreen = pScreenPriv->pddsdOffscreen
@@ -186,7 +186,7 @@ winAllocateFBPrimaryDD(ScreenPtr pScreen)
     ZeroMemory(pddsdOffscreen, sizeof(*pddsdOffscreen));
     pddsdOffscreen->dwSize = sizeof(*pddsdOffscreen);
 
-    ErrorF("winAllocateFBPrimaryDD - Locking primary\n");
+    winDebug ("winAllocateFBPrimaryDD - Locking primary\n");
 
     /* Lock the primary surface */
     ddrval = IDirectDrawSurface2_Lock(pScreenPriv->pddsPrimary,
@@ -197,7 +197,7 @@ winAllocateFBPrimaryDD(ScreenPtr pScreen)
         FatalError("winAllocateFBPrimaryDD - Could not lock "
                    "primary surface\n");
 
-    ErrorF("winAllocateFBPrimaryDD - Locked primary\n");
+    winDebug ("winAllocateFBPrimaryDD - Locked primary\n");
 
     /* We don't know how to deal with anything other than RGB */
     if (!(pddsdPrimary->ddpfPixelFormat.dwFlags & DDPF_RGB))
@@ -215,7 +215,7 @@ winAllocateFBPrimaryDD(ScreenPtr pScreen)
     pScreenPriv->dwGreenMask = pddsdPrimary->ddpfPixelFormat.u3.dwGBitMask;
     pScreenPriv->dwBlueMask = pddsdPrimary->ddpfPixelFormat.u4.dwBBitMask;
 
-    ErrorF("winAllocateFBPrimaryDD - Returning\n");
+    winDebug ("winAllocateFBPrimaryDD - Returning\n");
 
     return TRUE;
 }
@@ -339,11 +339,11 @@ winInitVisualsPrimaryDD(ScreenPtr pScreen)
     else
         pScreenPriv->dwBitsPerRGB = dwBlueBits;
 
-    ErrorF("winInitVisualsPrimaryDD - Masks: %08x %08x %08x bpRGB: %d\n",
-           (unsigned int) pScreenPriv->dwRedMask,
-           (unsigned int) pScreenPriv->dwGreenMask,
-           (unsigned int) pScreenPriv->dwBlueMask,
-           (int) pScreenPriv->dwBitsPerRGB);
+    winDebug ("winInitVisualsPrimaryDD - Masks: %08x %08x %08x bpRGB: %d\n",
+              (unsigned int) pScreenPriv->dwRedMask,
+              (unsigned int) pScreenPriv->dwGreenMask,
+              (unsigned int) pScreenPriv->dwBlueMask,
+              (int) pScreenPriv->dwBitsPerRGB);
 
     /* Create a single visual according to the Windows screen depth */
     switch (pScreenInfo->dwDepth) {
@@ -364,9 +364,7 @@ winInitVisualsPrimaryDD(ScreenPtr pScreen)
         break;
 
     case 8:
-#if CYGDEBUG
         winDebug("winInitVisuals - Calling miSetVisualTypesAndMasks\n");
-#endif                          /* CYGDEBUG */
         if (!miSetVisualTypesAndMasks(pScreenInfo->dwDepth,
                                       PseudoColorMask,
                                       pScreenPriv->dwBitsPerRGB,
@@ -378,10 +376,8 @@ winInitVisualsPrimaryDD(ScreenPtr pScreen)
                    "miSetVisualTypesAndMasks failed\n");
             return FALSE;
         }
-#if CYGDEBUG
         winDebug("winInitVisualsPrimaryDD - Returned from "
                  "miSetVisualTypesAndMasks\n");
-#endif                          /* CYGDEBUG */
         break;
 
     default:
@@ -389,7 +385,7 @@ winInitVisualsPrimaryDD(ScreenPtr pScreen)
         return FALSE;
     }
 
-    ErrorF("winInitVisualsPrimaryDD - Returning\n");
+    winDebug ("winInitVisualsPrimaryDD - Returning\n");
 
     return TRUE;
 }
@@ -518,7 +514,7 @@ winHotKeyAltTabPrimaryDD(ScreenPtr pScreen)
     RECT rcClient, rcSrc;
     HRESULT ddrval = DD_OK;
 
-    ErrorF("\nwinHotKeyAltTabPrimaryDD\n\n");
+    winDebug ("\nwinHotKeyAltTabPrimaryDD\n\n");
 
     /* Alt+Tab was pressed, we will lose focus very soon */
     pScreenPriv->fActive = FALSE;
diff --git a/xorg-server/hw/xwin/winpixmap.c b/xorg-server/hw/xwin/winpixmap.c
index d8a12d58e..43c0c3c14 100644
--- a/xorg-server/hw/xwin/winpixmap.c
+++ b/xorg-server/hw/xwin/winpixmap.c
@@ -68,11 +68,9 @@ winCreatePixmapNativeGDI(ScreenPtr pScreen,
         return NullPixmap;
     }
 
-#if CYGDEBUG
     winDebug("winCreatePixmap () - w %d h %d d %d uh %d bw %d\n",
              iWidth, iHeight, iDepth, usage_hint,
              PixmapBytePad(iWidth, iDepth));
-#endif
 
     /* Setup pixmap values */
     pPixmap->drawable.type = DRAWABLE_PIXMAP;
@@ -112,11 +110,9 @@ winCreatePixmapNativeGDI(ScreenPtr pScreen,
                                                  (BITMAPINFO **) &pPixmapPriv->
                                                  pbmih);
 
-#if CYGDEBUG
     winDebug("winCreatePixmap () - Created a pixmap %08x, %dx%dx%d, for "
              "screen: %08x\n",
              pPixmapPriv->hBitmap, iWidth, iHeight, iDepth, pScreen);
-#endif
 
     return pPixmap;
 }
@@ -132,9 +128,7 @@ winDestroyPixmapNativeGDI(PixmapPtr pPixmap)
 {
     winPrivPixmapPtr pPixmapPriv = NULL;
 
-#if CYGDEBUG
     winDebug("winDestroyPixmapNativeGDI ()\n");
-#endif
 
     /* Bail early if there is not a pixmap to destroy */
     if (pPixmap == NULL) {
@@ -145,10 +139,8 @@ winDestroyPixmapNativeGDI(PixmapPtr pPixmap)
     /* Get a handle to the pixmap privates */
     pPixmapPriv = winGetPixmapPriv(pPixmap);
 
-#if CYGDEBUG
     winDebug("winDestroyPixmapNativeGDI - pPixmapPriv->hBitmap: %08x\n",
              pPixmapPriv->hBitmap);
-#endif
 
     /* Decrement reference count, return if nonzero */
     --pPixmap->refcnt;
@@ -184,40 +176,3 @@ winModifyPixmapHeaderNativeGDI(PixmapPtr pPixmap,
     return TRUE;
 }
 
-#if 0
-/* 
- * Not used yet.
- * See cfb/cfbpixmap.c
- */
-
-static void
-winXRotatePixmapNativeGDI(PixmapPtr pPix, int rw)
-{
-    ErrorF("winXRotatePixmap()\n");
-    /* fill in this function, look at CFB */
-}
-
-/*
- * Not used yet.
- * See cfb/cfbpixmap.c
- */
-static void
-winYRotatePixmapNativeGDI(PixmapPtr pPix, int rh)
-{
-    ErrorF("winYRotatePixmap()\n");
-    /* fill in this function, look at CFB */
-}
-
-/* 
- * Not used yet.
- * See cfb/cfbpixmap.c
- */
-
-static void
-winCopyRotatePixmapNativeGDI(PixmapPtr psrcPix, PixmapPtr *ppdstPix,
-                             int xrot, int yrot)
-{
-    ErrorF("winCopyRotatePixmap()\n");
-    /* fill in this function, look at CFB */
-}
-#endif
diff --git a/xorg-server/hw/xwin/winpolyline.c b/xorg-server/hw/xwin/winpolyline.c
index 8b7e10645..ce7c8de28 100644
--- a/xorg-server/hw/xwin/winpolyline.c
+++ b/xorg-server/hw/xwin/winpolyline.c
@@ -41,7 +41,7 @@ winPolyLineNativeGDI(DrawablePtr pDrawable,
     switch (pGC->lineStyle) {
     case LineSolid:
         if (pGC->lineWidth == 0)
-            return miZeroLine(pDrawable, pGC, mode, npt, ppt);
+            miZeroLine (pDrawable, pGC, mode, npt, ppt);
         else
             miWideLine(pDrawable, pGC, mode, npt, ppt);
         break;
diff --git a/xorg-server/hw/xwin/winprefs.c b/xorg-server/hw/xwin/winprefs.c
index 6cbd7ad80..a4d241060 100644
--- a/xorg-server/hw/xwin/winprefs.c
+++ b/xorg-server/hw/xwin/winprefs.c
@@ -51,6 +51,8 @@
 
 extern const char *winGetBaseDir(void);
 
+extern const char *g_pszLogFile;
+
 /* From winprefslex.l, the real parser */
 extern int parse_file(FILE * fp);
 
@@ -353,8 +355,8 @@ HandleCustomWM_COMMAND(unsigned long hwndIn, int command)
 
                     memset(&start, 0, sizeof(start));
                     start.cb = sizeof(start);
-                    start.dwFlags = STARTF_USESHOWWINDOW;
-                    start.wShowWindow = SW_HIDE;
+                    //start.dwFlags = STARTF_USESHOWWINDOW;
+                    //start.wShowWindow = SW_HIDE;
 
                     memset(&child, 0, sizeof(child));
 
@@ -366,7 +368,7 @@ HandleCustomWM_COMMAND(unsigned long hwndIn, int command)
                     }
                     else
                         MessageBox(NULL, m->menuItem[j].param,
-                                   "Mingrc Exec Command Error!",
+                                   "VcXsrv Exec Command Error!",
                                    MB_OK | MB_ICONEXCLAMATION);
                 }
                     return TRUE;
@@ -726,16 +728,13 @@ LoadPreferences(void)
     }
 
     /* Setup a DISPLAY environment variable, need to allocate on heap */
-    /* because putenv doesn't copy the argument... */
-    snprintf(szDisplay, 512, "DISPLAY=127.0.0.1:%s.0", display);
-    szEnvDisplay = (char *) (malloc(strlen(szDisplay) + 1));
-    if (szEnvDisplay) {
-        strcpy(szEnvDisplay, szDisplay);
-        putenv(szEnvDisplay);
-    }
+    /* because putenv doesn't copy the argument... Always use screen 0 */
+    winGetDisplayName(szDisplay, 0);
+    szEnvDisplay = (char *)(malloc(strlen(szDisplay)+9/*strlen("DISPLAY=")+1*/));
+    snprintf(szEnvDisplay, 512, "DISPLAY=%s", szDisplay);
+    putenv (szEnvDisplay);
 
     /* Replace any "%display%" in menu commands with display string */
-    snprintf(szDisplay, 512, "127.0.0.1:%s.0", display);
     for (i = 0; i < pref.menuItems; i++) {
         for (j = 0; j < pref.menu[i].menuItems; j++) {
             if (pref.menu[i].menuItem[j].cmd == CMD_EXEC) {
@@ -747,6 +746,11 @@ LoadPreferences(void)
                         dstParam += strlen(szDisplay);
                         srcParam += 9;
                     }
+                    else if (!strncmp(srcParam, "%logfile%", 9)) {
+                        memcpy (dstParam, g_pszLogFile, strlen(g_pszLogFile));
+                        dstParam += strlen(g_pszLogFile);
+                        srcParam += 9;
+                    }
                     else {
                         *dstParam = *srcParam;
                         dstParam++;
diff --git a/xorg-server/hw/xwin/winprefslex.l b/xorg-server/hw/xwin/winprefslex.l
index 15f707766..66d12ede7 100644
--- a/xorg-server/hw/xwin/winprefslex.l
+++ b/xorg-server/hw/xwin/winprefslex.l
@@ -39,8 +39,6 @@
 
 extern int yyparse(void);
 
-extern void ErrorF (const char* /*f*/, ...);
-
 /* Copy the parsed string, must be free()d in yacc parser */
 static char *makestr(char *str)
 {
diff --git a/xorg-server/hw/xwin/winprefsyacc.y b/xorg-server/hw/xwin/winprefsyacc.y
index 3b376b3e7..ff051f233 100644
--- a/xorg-server/hw/xwin/winprefsyacc.y
+++ b/xorg-server/hw/xwin/winprefsyacc.y
@@ -40,6 +40,7 @@
 #define _STDLIB_H 1 /* bison checks this to know if stdlib has been included */
 #include <string.h>
 #include "winprefs.h"
+#include "winmsg.h"
 
 /* The following give better error messages in bison at the cost of a few KB */
 #define YYERROR_VERBOSE 1
@@ -84,6 +85,9 @@ static int yyerror (char *s);
 extern char *yytext;
 extern int yylex(void);
 
+#define YYMALLOC malloc
+#define YYFREE   free
+
 %}
 
 %union {
@@ -243,7 +247,7 @@ forceexit:	FORCEEXIT NEWLINE { pref.fForceExit = TRUE; }
 silentexit:	SILENTEXIT NEWLINE { pref.fSilentExit = TRUE; }
 	;
 
-debug: 	DEBUGOUTPUT STRING NEWLINE { ErrorF("LoadPreferences: %s\n", $2); free($2); }
+debug: 	DEBUGOUTPUT STRING NEWLINE { winDebug("LoadPreferences: %s\n", $2); free($2); }
 	;
 
 
@@ -354,7 +358,7 @@ static void
 OpenIcons (void)
 {
   if (pref.icon != NULL) {
-    ErrorF("LoadPreferences: Redefining icon mappings\n");
+    winDebug("LoadPreferences: Redefining icon mappings\n");
     free(pref.icon);
     pref.icon = NULL;
   }
@@ -390,7 +394,7 @@ static void
 OpenStyles (void)
 {
   if (pref.style != NULL) {
-    ErrorF("LoadPreferences: Redefining window style\n");
+    winDebug("LoadPreferences: Redefining window style\n");
     free(pref.style);
     pref.style = NULL;
   }
@@ -423,7 +427,7 @@ static void
 OpenSysMenu (void)
 {
   if (pref.sysMenu != NULL) {
-    ErrorF("LoadPreferences: Redefining system menu\n");
+    winDebug("LoadPreferences: Redefining system menu\n");
     free(pref.sysMenu);
     pref.sysMenu = NULL;
   }
diff --git a/xorg-server/hw/xwin/winprocarg.c b/xorg-server/hw/xwin/winprocarg.c
index 858be4a56..292d45fb1 100644
--- a/xorg-server/hw/xwin/winprocarg.c
+++ b/xorg-server/hw/xwin/winprocarg.c
@@ -44,6 +44,7 @@ from The Open Group.
 #ifdef XWIN_CLIPBOARD
 extern Bool g_fUnicodeClipboard;
 extern Bool g_fClipboard;
+extern Bool g_fClipboardPrimary;
 #endif
 
 /*
@@ -84,9 +85,9 @@ winInitializeScreenDefaults(void)
     dwWidth = GetSystemMetrics(SM_CXSCREEN);
     dwHeight = GetSystemMetrics(SM_CYSCREEN);
 
-    winErrorFVerb(2,
-                  "winInitializeScreenDefaults - primary monitor w %d h %d\n",
-                  (int) dwWidth, (int) dwHeight);
+    winDebug (
+              "winInitializeScreenDefaults - primary monitor w %d h %d\n",
+              (int) dwWidth, (int) dwHeight);
 
     /* Set a default DPI, if no '-dpi' option was used */
     if (monitorResolution == 0) {
@@ -96,17 +97,17 @@ winInitializeScreenDefaults(void)
             int dpiX = GetDeviceCaps(hdc, LOGPIXELSX);
             int dpiY = GetDeviceCaps(hdc, LOGPIXELSY);
 
-            winErrorFVerb(2,
-                          "winInitializeScreenDefaults - native DPI x %d y %d\n",
-                          dpiX, dpiY);
+            winDebug(
+                     "winInitializeScreenDefaults - native DPI x %d y %d\n",
+                     dpiX, dpiY);
 
             monitorResolution = dpiY;
             ReleaseDC(NULL, hdc);
         }
         else {
-            winErrorFVerb(1,
-                          "winInitializeScreenDefaults - Failed to retrieve native DPI, falling back to default of %d DPI\n",
-                          WIN_DEFAULT_DPI);
+            winDebug(
+                     "winInitializeScreenDefaults - Failed to retrieve native DPI, falling back to default of %d DPI\n",
+                     WIN_DEFAULT_DPI);
             monitorResolution = WIN_DEFAULT_DPI;
         }
     }
@@ -131,6 +132,8 @@ winInitializeScreenDefaults(void)
     defaultScreenInfo.fDecoration = TRUE;
 #ifdef XWIN_MULTIWINDOWEXTWM
     defaultScreenInfo.fMWExtWM = FALSE;
+#endif
+#ifdef XWIN_MULTIWINDOWINTWM
     defaultScreenInfo.fInternalWM = FALSE;
 #endif
     defaultScreenInfo.fRootless = FALSE;
@@ -157,7 +160,7 @@ winInitializeScreenDefaults(void)
 static void
 winInitializeScreen(int i)
 {
-    winErrorFVerb(3, "winInitializeScreen - %d\n", i);
+    winDebug ("winInitializeScreen - %d\n",i);
 
     /* Initialize default screen values, if needed */
     winInitializeScreenDefaults();
@@ -174,7 +177,7 @@ winInitializeScreens(int maxscreens)
 {
     int i;
 
-    winErrorFVerb(3, "winInitializeScreens - %i\n", maxscreens);
+    winDebug ("winInitializeScreens - %i\n", maxscreens);
 
     if (maxscreens > g_iNumScreens) {
         /* Reallocate the memory for DDX-specific screen info */
@@ -248,23 +251,22 @@ ddxProcessArgument(int argc, char *argv[], int i)
              * OsVendorInit () gets called, otherwise we will overwrite
              * settings changed by parameters such as -fullscreen, etc.
              */
-            winErrorFVerb(2, "ddxProcessArgument - Initializing default "
-                          "screens\n");
+            winDebug ("ddxProcessArgument - Initializing default "
+                      "screens\n");
             winInitializeScreenDefaults();
         }
     }
 
-#if CYGDEBUG
     winDebug("ddxProcessArgument - arg: %s\n", argv[i]);
-#endif
 
     /*
      * Look for the '-help' and similar options
      */
     if (IS_OPTION("-help") || IS_OPTION("-h") || IS_OPTION("--help")) {
         /* Reset logfile. We don't need that helpmessage in the logfile */
-        g_pszLogFile = NULL;
+#ifdef _DEBUG
         g_fNoHelpMessageBox = TRUE;
+#endif
         UseMsg();
         exit(0);
         return 1;
@@ -272,7 +274,6 @@ ddxProcessArgument(int argc, char *argv[], int i)
 
     if (IS_OPTION("-version") || IS_OPTION("--version")) {
         /* Reset logfile. We don't need that versioninfo in the logfile */
-        g_pszLogFile = NULL;
         winLogVersionInfo();
         exit(0);
         return 1;
@@ -287,9 +288,7 @@ ddxProcessArgument(int argc, char *argv[], int i)
         int iWidth, iHeight, iX, iY;
         int iMonitor;
 
-#if CYGDEBUG
         winDebug("ddxProcessArgument - screen - argc: %d i: %d\n", argc, i);
-#endif
 
         /* Display the usage message if the argument is malformed */
         if (i + 1 >= argc) {
@@ -324,9 +323,9 @@ ddxProcessArgument(int argc, char *argv[], int i)
                     ("ddxProcessArgument - screen - Querying monitors failed\n");
             }
             else if (data.bMonitorSpecifiedExists == TRUE) {
-                winErrorFVerb(2,
-                              "ddxProcessArgument - screen - Found Valid ``@Monitor'' = %d arg\n",
-                              iMonitor);
+                winDebug(
+                         "ddxProcessArgument - screen - Found Valid ``@Monitor'' = %d arg\n",
+                         iMonitor);
                 iArgsProcessed = 3;
                 g_ScreenInfo[nScreenNum].fUserGaveHeightAndWidth = FALSE;
                 g_ScreenInfo[nScreenNum].fUserGavePosition = TRUE;
@@ -354,8 +353,8 @@ ddxProcessArgument(int argc, char *argv[], int i)
         else if (i + 2 < argc
                  && 2 == sscanf(argv[i + 2], "%dx%d",
                                 (int *) &iWidth, (int *) &iHeight)) {
-            winErrorFVerb(2,
-                          "ddxProcessArgument - screen - Found ``WxD'' arg\n");
+            winDebug (
+                      "ddxProcessArgument - screen - Found ``WxD'' arg\n");
             iArgsProcessed = 3;
             g_ScreenInfo[nScreenNum].fUserGaveHeightAndWidth = TRUE;
             g_ScreenInfo[nScreenNum].dwWidth = iWidth;
@@ -365,8 +364,8 @@ ddxProcessArgument(int argc, char *argv[], int i)
             /* Look for WxD+X+Y */
             if (2 == sscanf(argv[i + 2], "%*dx%*d+%d+%d",
                             (int *) &iX, (int *) &iY)) {
-                winErrorFVerb(2,
-                              "ddxProcessArgument - screen - Found ``X+Y'' arg\n");
+                winDebug (
+                          "ddxProcessArgument - screen - Found ``X+Y'' arg\n");
                 g_ScreenInfo[nScreenNum].fUserGavePosition = TRUE;
                 g_ScreenInfo[nScreenNum].dwInitialX = iX;
                 g_ScreenInfo[nScreenNum].dwInitialY = iY;
@@ -410,9 +409,9 @@ ddxProcessArgument(int argc, char *argv[], int i)
                         ("ddxProcessArgument - screen - Querying monitors failed\n");
                 }
                 else if (data.bMonitorSpecifiedExists == TRUE) {
-                    winErrorFVerb(2,
-                                  "ddxProcessArgument - screen - Found Valid ``@Monitor'' = %d arg\n",
-                                  iMonitor);
+                    winDebug (
+                              "ddxProcessArgument - screen - Found Valid ``@Monitor'' = %d arg\n",
+                              iMonitor);
                     g_ScreenInfo[nScreenNum].fUserGavePosition = TRUE;
                     g_ScreenInfo[nScreenNum].iMonitor = iMonitor;
                     g_ScreenInfo[nScreenNum].hMonitor = data.monitorHandle;
@@ -433,7 +432,7 @@ ddxProcessArgument(int argc, char *argv[], int i)
         }
         else if (i + 3 < argc && 1 == sscanf(argv[i + 2], "%d", (int *) &iWidth)
                  && 1 == sscanf(argv[i + 3], "%d", (int *) &iHeight)) {
-            winErrorFVerb(2,
+            winDebug (
                           "ddxProcessArgument - screen - Found ``W D'' arg\n");
             iArgsProcessed = 4;
             g_ScreenInfo[nScreenNum].fUserGaveHeightAndWidth = TRUE;
@@ -443,7 +442,7 @@ ddxProcessArgument(int argc, char *argv[], int i)
             g_ScreenInfo[nScreenNum].dwUserHeight = iHeight;
             if (i + 5 < argc && 1 == sscanf(argv[i + 4], "%d", (int *) &iX)
                 && 1 == sscanf(argv[i + 5], "%d", (int *) &iY)) {
-                winErrorFVerb(2,
+                winDebug (
                               "ddxProcessArgument - screen - Found ``X Y'' arg\n");
                 iArgsProcessed = 6;
                 g_ScreenInfo[nScreenNum].fUserGavePosition = TRUE;
@@ -452,11 +451,11 @@ ddxProcessArgument(int argc, char *argv[], int i)
             }
         }
         else {
-            winErrorFVerb(2,
+            ErrorF (
                           "ddxProcessArgument - screen - Did not find size arg. "
-                          "dwWidth: %d dwHeight: %d\n",
-                          (int) g_ScreenInfo[nScreenNum].dwWidth,
-                          (int) g_ScreenInfo[nScreenNum].dwHeight);
+                    "dwWidth: %d dwHeight: %d\n",
+                    (int) g_ScreenInfo[nScreenNum].dwWidth,
+                    (int) g_ScreenInfo[nScreenNum].dwHeight);
             iArgsProcessed = 2;
             g_ScreenInfo[nScreenNum].fUserGaveHeightAndWidth = FALSE;
         }
@@ -533,6 +532,8 @@ ddxProcessArgument(int argc, char *argv[], int i)
             screenInfoPtr->fMultipleMonitors = FALSE;
 #endif
         screenInfoPtr->fFullScreen = TRUE;
+        // resizing is not allowed in full screen so change the default to not allowed
+        screenInfoPtr->iResizeMode=notAllowed;
 
         /* Indicate that we have processed this argument */
         return 1;
@@ -574,6 +575,8 @@ ddxProcessArgument(int argc, char *argv[], int i)
         /* Indicate that we have processed this argument */
         return 1;
     }
+#endif
+#ifdef XWIN_MULTIWINDOWINTWM
     /*
      * Look for the '-internalwm' argument
      */
@@ -716,6 +719,30 @@ ddxProcessArgument(int argc, char *argv[], int i)
         /* Indicate that we have processed this argument */
         return 1;
     }
+    
+  /*
+   * Look for the '-clipboard' argument
+   */
+  if (IS_OPTION ("-clipboardprimary"))
+    {
+      /* Now the default, we still accept the arg for backwards compatibility */
+      g_fClipboardPrimary = TRUE;
+
+      /* Indicate that we have processed this argument */
+      return 1;
+    }
+
+  /*
+   * Look for the '-noclipboard' argument
+   */
+  if (IS_OPTION ("-noclipboardprimary"))
+    {
+      g_fClipboardPrimary = FALSE;
+
+      /* Indicate that we have processed this argument */
+      return 1;
+    }
+    
 #endif
 
     /*
@@ -1069,10 +1096,27 @@ ddxProcessArgument(int argc, char *argv[], int i)
         return 1;
     }
 
-    if (IS_OPTION("-nowgl")) {
+    else if (IS_OPTION("-nowgl")) {
         g_fNativeGl = FALSE;
         return 1;
     }
+    else if (IS_OPTION("-swrastwgl"))
+    {
+        g_fswrastwgl = TRUE;
+        return 1;
+    }
+    else if (IS_OPTION("-parentprocessid"))
+    {
+        DWORD dwProcessId;
+        CHECK_ARGS (1);
+        dwProcessId = atoi(argv[++i]);
+        if (!AllowSetForegroundWindow(dwProcessId))
+        {
+            winMessageBoxF ("Error calling AllowSetForegroundWindow.", MB_ICONINFORMATION);
+            return 0;
+        }
+        return 2;
+    }
 
     return 0;
 }
@@ -1140,7 +1184,7 @@ winLogCommandLine(int argc, char *argv[])
         iCurrLen += strlen(argv[i]);
     }
 
-    ErrorF("XWin was started with the following command line:\n\n"
+    winDebug ("XWin was started with the following command line:\n\n"
            "%s\n\n", g_pszCommandLine);
 }
 
@@ -1157,9 +1201,9 @@ winLogVersionInfo(void)
         return;
     s_fBeenHere = TRUE;
 
-    ErrorF("Welcome to the XWin X Server\n");
+    ErrorF("Welcome to the VcXsrv X Server\n");
     ErrorF("Vendor: %s\n", XVENDORNAME);
-    ErrorF("Release: %d.%d.%d.%d\n", XORG_VERSION_MAJOR,
+    ErrorF("Release: %d.%d.%d.%d\n\n", XORG_VERSION_MAJOR,
            XORG_VERSION_MINOR, XORG_VERSION_PATCH, XORG_VERSION_SNAP);
     if (strlen(BUILDERSTRING))
         ErrorF("%s\n", BUILDERSTRING);
diff --git a/xorg-server/hw/xwin/winresource.h b/xorg-server/hw/xwin/winresource.h
index a14d402e1..bb419188a 100644
--- a/xorg-server/hw/xwin/winresource.h
+++ b/xorg-server/hw/xwin/winresource.h
@@ -49,4 +49,6 @@
 #define ID_ABOUT_CHANGELOG	302
 #define ID_ABOUT_WEBSITE	303
 
+#define IDC_HOSTLIST            100
+
 #endif
diff --git a/xorg-server/hw/xwin/winscrinit.c b/xorg-server/hw/xwin/winscrinit.c
index e776bdba6..c6fddaf9b 100644..100755
--- a/xorg-server/hw/xwin/winscrinit.c
+++ b/xorg-server/hw/xwin/winscrinit.c
@@ -88,10 +88,8 @@ winScreenInit(ScreenPtr pScreen, int argc, char **argv)
     HDC hdc;
     DWORD dwInitialBPP;
 
-#if CYGDEBUG || YES
     winDebug("winScreenInit - dwWidth: %ld dwHeight: %ld\n",
              pScreenInfo->dwWidth, pScreenInfo->dwHeight);
-#endif
 
     /* Allocate privates for this screen */
     if (!winAllocatePrivates(pScreen)) {
@@ -122,27 +120,27 @@ winScreenInit(ScreenPtr pScreen, int argc, char **argv)
 
     /* Horribly misnamed function: Allow engine to adjust BPP for screen */
     dwInitialBPP = pScreenInfo->dwBPP;
-
-    if (!(*pScreenPriv->pwinAdjustVideoMode) (pScreen)) {
+  
+    if (pScreenPriv->pwinAdjustVideoMode && !(*pScreenPriv->pwinAdjustVideoMode) (pScreen)) {
         ErrorF("winScreenInit - winAdjustVideoMode () failed\n");
         return FALSE;
     }
 
     if (dwInitialBPP == WIN_DEFAULT_BPP) {
         /* No -depth parameter was passed, let the user know the depth being used */
-        ErrorF
+        winDebug
             ("winScreenInit - Using Windows display depth of %d bits per pixel\n",
              (int) pScreenInfo->dwBPP);
     }
     else if (dwInitialBPP != pScreenInfo->dwBPP) {
         /* Warn user if engine forced a depth different to -depth parameter */
-        ErrorF
+        winDebug
             ("winScreenInit - Command line depth of %d bpp overidden by engine, using %d bpp\n",
              (int) dwInitialBPP, (int) pScreenInfo->dwBPP);
     }
     else {
-        ErrorF("winScreenInit - Using command line depth of %d bpp\n",
-               (int) pScreenInfo->dwBPP);
+        winDebug("winScreenInit - Using command line depth of %d bpp\n",
+                 (int) pScreenInfo->dwBPP);
     }
 
     /* Check for supported display depth */
@@ -175,7 +173,7 @@ winScreenInit(ScreenPtr pScreen, int argc, char **argv)
     }
 
     /* Create display window */
-    if (!(*pScreenPriv->pwinCreateBoundingWindow) (pScreen)) {
+    if (pScreenPriv->pwinCreateBoundingWindow && !(*pScreenPriv->pwinCreateBoundingWindow) (pScreen)) {
         ErrorF("winScreenInit - pwinCreateBoundingWindow () " "failed\n");
         return FALSE;
     }
@@ -202,7 +200,7 @@ winScreenInit(ScreenPtr pScreen, int argc, char **argv)
     miClearVisualTypes();
 
     /* Call the engine dependent screen initialization procedure */
-    if (!((*pScreenPriv->pwinFinishScreenInit) (pScreen->myNum, pScreen, argc, argv))) {
+    if (pScreenPriv->pwinFinishScreenInit && !((*pScreenPriv->pwinFinishScreenInit) (pScreen->myNum, pScreen, argc, argv))) {
         ErrorF("winScreenInit - winFinishScreenInit () failed\n");
 
         /* call the engine dependent screen close procedure to clean up from a failure */
@@ -213,8 +211,10 @@ winScreenInit(ScreenPtr pScreen, int argc, char **argv)
 
     if (!g_fSoftwareCursor)
         winInitCursor(pScreen);
+#ifdef WINDBG
     else
-        winErrorFVerb(2, "winScreenInit - Using software cursor\n");
+        winDebug("winScreenInit - Using software cursor\n");  
+#endif
 
     /*
        Note the screen origin in a normalized coordinate space where (0,0) is at the top left
@@ -223,12 +223,9 @@ winScreenInit(ScreenPtr pScreen, int argc, char **argv)
     pScreen->x = pScreenInfo->dwInitialX - GetSystemMetrics(SM_XVIRTUALSCREEN);
     pScreen->y = pScreenInfo->dwInitialY - GetSystemMetrics(SM_YVIRTUALSCREEN);
 
-    ErrorF("Screen %d added at virtual desktop coordinate (%d,%d).\n",
+    winDebug("Screen %d added at virtual desktop coordinate (%d,%d).\n",
            pScreen->myNum, pScreen->x, pScreen->y);
-
-#if CYGDEBUG || YES
     winDebug("winScreenInit - returning\n");
-#endif
 
     return TRUE;
 }
@@ -282,10 +279,10 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
             + winCountBits(pScreenPriv->dwGreenMask)
             + winCountBits(pScreenPriv->dwBlueMask);
 
-    winErrorFVerb(2, "winFinishScreenInitFB - Masks: %08x %08x %08x\n",
-                  (unsigned int) pScreenPriv->dwRedMask,
-                  (unsigned int) pScreenPriv->dwGreenMask,
-                  (unsigned int) pScreenPriv->dwBlueMask);
+    winDebug ("winFinishScreenInitFB - Masks: %08x %08x %08x\n",
+              (unsigned int) pScreenPriv->dwRedMask,
+              (unsigned int) pScreenPriv->dwGreenMask,
+              (unsigned int) pScreenPriv->dwBlueMask);
 
     /* Init visuals */
     if (!(*pScreenPriv->pwinInitVisuals) (pScreen)) {
@@ -371,16 +368,12 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
 #endif
 
     /* Setup the cursor routines */
-#if CYGDEBUG
     winDebug("winFinishScreenInitFB - Calling miDCInitialize ()\n");
-#endif
     miDCInitialize(pScreen, &g_winPointerCursorFuncs);
 
     /* KDrive does winCreateDefColormap right after miDCInitialize */
     /* Create a default colormap */
-#if CYGDEBUG
     winDebug("winFinishScreenInitFB - Calling winCreateDefColormap ()\n");
-#endif
     if (!winCreateDefColormap(pScreen)) {
         ErrorF("winFinishScreenInitFB - Could not create colormap\n");
         return FALSE;
@@ -394,9 +387,7 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
         && !pScreenInfo->fMWExtWM
 #endif
         ) {
-#if CYGDEBUG
         winDebug("winFinishScreenInitFB - Calling shadowSetup ()\n");
-#endif
         if (!shadowSetup(pScreen)) {
             ErrorF("winFinishScreenInitFB - shadowSetup () failed\n");
             return FALSE;
@@ -537,13 +528,11 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
 #ifdef XWIN_MULTIWINDOW
         || pScreenInfo->fMultiWindow
 #endif
-#ifdef XWIN_MULTIWINDOWEXTWM
+#ifdef XWIN_MULTIWINDOWINTWM
         || pScreenInfo->fInternalWM
 #endif
         ) {
-#if CYGDEBUG || YES
         winDebug("winFinishScreenInitFB - Calling winInitWM.\n");
-#endif
 
         /* Initialize multi window mode */
         if (!winInitWM(&pScreenPriv->pWMInfo,
@@ -551,7 +540,7 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
                        &pScreenPriv->ptXMsgProc,
                        &pScreenPriv->pmServerStarted,
                        pScreenInfo->dwScreen, (HWND) &pScreenPriv->hwndScreen,
-#ifdef XWIN_MULTIWINDOWEXTWM
+#ifdef XWIN_MULTIWINDOWINTWM
                        pScreenInfo->fInternalWM ||
 #endif
                        FALSE)) {
@@ -567,9 +556,7 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
     /* Tell the server that we have a valid depth */
     pScreenPriv->fBadDepth = FALSE;
 
-#if CYGDEBUG || YES
     winDebug("winFinishScreenInitFB - returning\n");
-#endif
 
     return TRUE;
 }
@@ -679,7 +666,7 @@ winFinishScreenInitNativeGDI(int i,
     /* Bitmap */
     pScreen->BitmapToRegion = winPixmapToRegionNativeGDI;
 
-    ErrorF("winFinishScreenInitNativeGDI - calling miDCInitialize\n");
+    winDebug ("winFinishScreenInitNativeGDI - calling miDCInitialize\n");
 
     /* Set the default white and black pixel positions */
     pScreen->whitePixel = pScreen->blackPixel = (Pixel) 0;
@@ -697,8 +684,8 @@ winFinishScreenInitNativeGDI(int i,
         return FALSE;
     }
 
-    ErrorF("winFinishScreenInitNativeGDI - miCreateDefColormap () "
-           "returned\n");
+    winDebug ("winFinishScreenInitNativeGDI - miCreateDefColormap () "
+              "returned\n");
 
     /* mi doesn't use a CloseScreen procedure, so no need to wrap */
     pScreen->CloseScreen = pScreenPriv->pwinCloseScreen;
@@ -706,8 +693,8 @@ winFinishScreenInitNativeGDI(int i,
     /* Tell the server that we are enabled */
     pScreenPriv->fEnabled = TRUE;
 
-    ErrorF("winFinishScreenInitNativeGDI - Successful addition of "
-           "screen %08x\n", (unsigned int) pScreen);
+    winDebug ("winFinishScreenInitNativeGDI - Successful addition of "
+              "screen %08x\n", (unsigned int) pScreen);
 
     return TRUE;
 }
diff --git a/xorg-server/hw/xwin/winsetsp.c b/xorg-server/hw/xwin/winsetsp.c
index f102f9ff5..001e50e11 100644..100755
--- a/xorg-server/hw/xwin/winsetsp.c
+++ b/xorg-server/hw/xwin/winsetsp.c
@@ -34,6 +34,11 @@
 #endif
 #include "win.h"
 
+typedef struct mybitmap
+{
+  BITMAPINFOHEADER bmiHeader;
+  RGBQUAD          bmiColors[256];  /* Maximum palette used in case of 8-bit per pixel */
+} mybitmap_t;
 /* See Porting Layer Definition - p. 55 */
 void
 winSetSpansNativeGDI(DrawablePtr pDrawable,
@@ -46,7 +51,7 @@ winSetSpansNativeGDI(DrawablePtr pDrawable,
     PixmapPtr pPixmap = NULL;
     winPrivPixmapPtr pPixmapPriv = NULL;
     HBITMAP hbmpOrig = NULL;
-    BITMAPINFO bmi;
+    mybitmap_t		bmi;
     HRGN hrgn = NULL, combined = NULL;
     int nbox;
     BoxPtr pbox;
@@ -86,7 +91,7 @@ winSetSpansNativeGDI(DrawablePtr pDrawable,
                        "failed on pPixmapPriv->hBitmap\n");
 
         while (iSpans--) {
-            ZeroMemory(&bmi, sizeof(BITMAPINFO));
+            ZeroMemory (&bmi, sizeof (mybitmap_t));
             bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
             bmi.bmiHeader.biWidth = *piWidths;
             bmi.bmiHeader.biHeight = 1;
@@ -129,7 +134,7 @@ winSetSpansNativeGDI(DrawablePtr pDrawable,
         combined = NULL;
 
         while (iSpans--) {
-            ZeroMemory(&bmi, sizeof(BITMAPINFO));
+            ZeroMemory (&bmi, sizeof (mybitmap_t));
             bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
             bmi.bmiHeader.biWidth = *piWidths;
             bmi.bmiHeader.biHeight = 1;
diff --git a/xorg-server/hw/xwin/winshaddd.c b/xorg-server/hw/xwin/winshaddd.c
index 2e7060838..5a117aace 100644
--- a/xorg-server/hw/xwin/winshaddd.c
+++ b/xorg-server/hw/xwin/winshaddd.c
@@ -113,9 +113,7 @@ winCreatePrimarySurfaceShadowDD(ScreenPtr pScreen)
         return FALSE;
     }
 
-#if CYGDEBUG
     winDebug("winCreatePrimarySurfaceShadowDD - Created primary surface\n");
-#endif
 
     /*
      * Attach a clipper to the primary surface that will clip our blits to our
@@ -129,10 +127,8 @@ winCreatePrimarySurfaceShadowDD(ScreenPtr pScreen)
         return FALSE;
     }
 
-#if CYGDEBUG
     winDebug("winCreatePrimarySurfaceShadowDD - Attached clipper to "
              "primary surface\n");
-#endif
 
     /* Everything was correct */
     return TRUE;
@@ -148,7 +144,7 @@ winReleasePrimarySurfaceShadowDD(ScreenPtr pScreen)
 {
     winScreenPriv(pScreen);
 
-    ErrorF("winReleasePrimarySurfaceShadowDD - Hello\n");
+    winDebug ("winReleasePrimarySurfaceShadowDD - Hello\n");
 
     /* Release the primary surface and clipper, if they exist */
     if (pScreenPriv->pddsPrimary) {
@@ -158,14 +154,14 @@ winReleasePrimarySurfaceShadowDD(ScreenPtr pScreen)
          */
         IDirectDrawSurface2_SetClipper(pScreenPriv->pddsPrimary, NULL);
 
-        ErrorF("winReleasePrimarySurfaceShadowDD - Detached clipper\n");
+        winDebug ("winReleasePrimarySurfaceShadowDD - Detached clipper\n");
 
         /* Release the primary surface */
         IDirectDrawSurface2_Release(pScreenPriv->pddsPrimary);
         pScreenPriv->pddsPrimary = NULL;
     }
 
-    ErrorF("winReleasePrimarySurfaceShadowDD - Released primary surface\n");
+    winDebug ("winReleasePrimarySurfaceShadowDD - Released primary surface\n");
 
     return TRUE;
 }
@@ -187,9 +183,7 @@ winAllocateFBShadowDD(ScreenPtr pScreen)
     DDSURFACEDESC ddsd;
     DDSURFACEDESC *pddsdShadow = NULL;
 
-#if CYGDEBUG
     winDebug("winAllocateFBShadowDD\n");
-#endif
 
     /* Create a clipper */
     ddrval = (*g_fpDirectDrawCreateClipper) (0,
@@ -200,9 +194,7 @@ winAllocateFBShadowDD(ScreenPtr pScreen)
         return FALSE;
     }
 
-#if CYGDEBUG
     winDebug("winAllocateFBShadowDD - Created a clipper\n");
-#endif
 
     /* Attach the clipper to our display window */
     ddrval = IDirectDrawClipper_SetHWnd(pScreenPriv->pddcPrimary,
@@ -213,9 +205,7 @@ winAllocateFBShadowDD(ScreenPtr pScreen)
         return FALSE;
     }
 
-#if CYGDEBUG
     winDebug("winAllocateFBShadowDD - Attached clipper to window\n");
-#endif
 
     /* Create a DirectDraw object, store the address at lpdd */
     ddrval = (*g_fpDirectDrawCreate) (NULL, &pScreenPriv->pdd, NULL);
@@ -225,9 +215,7 @@ winAllocateFBShadowDD(ScreenPtr pScreen)
         return FALSE;
     }
 
-#if CYGDEBUG
     winDebug("winAllocateFBShadowDD () - Created and initialized DD\n");
-#endif
 
     /* Get a DirectDraw2 interface pointer */
     ddrval = IDirectDraw_QueryInterface(pScreenPriv->pdd,
@@ -300,7 +288,7 @@ winAllocateFBShadowDD(ScreenPtr pScreen)
                 || pScreenInfo->dwHeight != GetSystemMetrics(SM_CYSCREEN)
                 || pScreenInfo->dwBPP != GetDeviceCaps(hdc, BITSPIXEL)
                 || pScreenInfo->dwRefreshRate != 0)) {
-            ErrorF("winAllocateFBShadowDD - Changing video mode\n");
+            winDebug ("winAllocateFBShadowDD - Changing video mode\n");
 
             /* Change the video mode to the mode requested, and use the driver default refresh rate on failure */
             ddrval = IDirectDraw2_SetDisplayMode(pScreenPriv->pdd2,
@@ -329,7 +317,7 @@ winAllocateFBShadowDD(ScreenPtr pScreen)
             }
         }
         else {
-            ErrorF("winAllocateFBShadowDD - Not changing video mode\n");
+            winDebug ("winAllocateFBShadowDD - Not changing video mode\n");
         }
 
         /* Release our DC */
@@ -379,9 +367,7 @@ winAllocateFBShadowDD(ScreenPtr pScreen)
         return FALSE;
     }
 
-#if CYGDEBUG
     winDebug("winAllocateFBShadowDD - Created shadow\n");
-#endif
 
     /* Allocate a DD surface description for our screen privates */
     pddsdShadow = pScreenPriv->pddsdShadow = malloc(sizeof(DDSURFACEDESC));
@@ -393,9 +379,7 @@ winAllocateFBShadowDD(ScreenPtr pScreen)
     ZeroMemory(pddsdShadow, sizeof(*pddsdShadow));
     pddsdShadow->dwSize = sizeof(*pddsdShadow);
 
-#if CYGDEBUG
     winDebug("winAllocateFBShadowDD - Locking shadow\n");
-#endif
 
     /* Lock the shadow surface */
     ddrval = IDirectDrawSurface2_Lock(pScreenPriv->pddsShadow,
@@ -406,9 +390,7 @@ winAllocateFBShadowDD(ScreenPtr pScreen)
         return FALSE;
     }
 
-#if CYGDEBUG
     winDebug("winAllocateFBShadowDD - Locked shadow\n");
-#endif
 
     /* We don't know how to deal with anything other than RGB */
     if (!(pddsdShadow->ddpfPixelFormat.dwFlags & DDPF_RGB)) {
@@ -428,9 +410,7 @@ winAllocateFBShadowDD(ScreenPtr pScreen)
     pScreenPriv->dwGreenMask = pddsdShadow->ddpfPixelFormat.u3.dwGBitMask;
     pScreenPriv->dwBlueMask = pddsdShadow->ddpfPixelFormat.u4.dwBBitMask;
 
-#if CYGDEBUG
     winDebug("winAllocateFBShadowDD - Returning\n");
-#endif
 
     return TRUE;
 }
@@ -594,6 +574,7 @@ winShadowUpdateDD(ScreenPtr pScreen, shadowBufPtr pBuf)
 
     /* Has our memory pointer changed? */
     if (pScreenInfo->pfb != pScreenPriv->pddsdShadow->lpSurface) {
+      extern const char *g_pszLogFile;
         ErrorF("winShadowUpdateDD - Memory location of the shadow "
                "surface has changed, trying to update the root window "
                "pixmap header to point to the new address.  If you get "
@@ -630,9 +611,7 @@ winCloseScreenShadowDD(ScreenPtr pScreen)
     winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
     Bool fReturn;
 
-#if CYGDEBUG
     winDebug("winCloseScreenShadowDD - Freeing screen resources\n");
-#endif
 
     /* Flag that the screen is closed */
     pScreenPriv->fClosed = TRUE;
@@ -669,7 +648,7 @@ winCloseScreenShadowDD(ScreenPtr pScreen)
 
 #if defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW)
     /* Destroy the thread startup mutex */
-    pthread_mutex_destroy(&pScreenPriv->pmServerStarted);
+    if (pScreenPriv->pmServerStarted) pthread_mutex_destroy (&pScreenPriv->pmServerStarted);
 #endif
 
     /* Kill our screeninfo's pointer to the screen */
@@ -711,13 +690,13 @@ winInitVisualsShadowDD(ScreenPtr pScreen)
     else
         pScreenPriv->dwBitsPerRGB = dwBlueBits;
 
-    ErrorF("winInitVisualsShadowDD - Masks %08x %08x %08x BPRGB %d d %d "
-           "bpp %d\n",
-           (unsigned int) pScreenPriv->dwRedMask,
-           (unsigned int) pScreenPriv->dwGreenMask,
-           (unsigned int) pScreenPriv->dwBlueMask,
-           (int) pScreenPriv->dwBitsPerRGB,
-           (int) pScreenInfo->dwDepth, (int) pScreenInfo->dwBPP);
+    winDebug ("winInitVisualsShadowDD - Masks %08x %08x %08x BPRGB %d d %d "
+              "bpp %d\n",
+              (unsigned int) pScreenPriv->dwRedMask,
+              (unsigned int) pScreenPriv->dwGreenMask,
+              (unsigned int) pScreenPriv->dwBlueMask,
+              (int) pScreenPriv->dwBitsPerRGB,
+              (int) pScreenInfo->dwDepth, (int) pScreenInfo->dwBPP);
 
     /* Create a single visual according to the Windows screen depth */
     switch (pScreenInfo->dwDepth) {
@@ -771,9 +750,7 @@ winInitVisualsShadowDD(ScreenPtr pScreen)
         return FALSE;
     }
 
-#if CYGDEBUG
     winDebug("winInitVisualsShadowDD - Returning\n");
-#endif
 
     return TRUE;
 }
@@ -1144,10 +1121,8 @@ winDestroyColormapShadowDD(ColormapPtr pColormap)
      * we need to handle the default colormap in a special way.
      */
     if (pColormap->flags & IsDefault) {
-#if CYGDEBUG
         winDebug("winDestroyColormapShadowDD - Destroying default "
                  "colormap\n");
-#endif
 
         /*
          * FIXME: Walk the list of all screens, popping the default
diff --git a/xorg-server/hw/xwin/winshadddnl.c b/xorg-server/hw/xwin/winshadddnl.c
index 01097f295..af13aba52 100644
--- a/xorg-server/hw/xwin/winshadddnl.c
+++ b/xorg-server/hw/xwin/winshadddnl.c
@@ -87,6 +87,65 @@ static Bool
 static Bool
  winReleasePrimarySurfaceShadowDDNL(ScreenPtr pScreen);
 
+static HRESULT myIDirectDrawSurface4_Blt( ScreenPtr pScreen, RECT *pRect, RECT *prcSrc)
+{
+  HRESULT ddrval = DD_OK;
+  unsigned i;
+  winScreenPriv(pScreen);
+
+
+  for (i = 0; i < 3; ++i)
+  {
+    if (pScreenPriv->pddsPrimary4)
+      ddrval = IDirectDrawSurface4_Blt(pScreenPriv->pddsPrimary4, pRect, pScreenPriv->pddsShadow4, prcSrc, DDBLT_WAIT, NULL);
+    else
+      ddrval = DDERR_SURFACELOST; // Surface has been closed
+     /* Try to regain the primary surface and blit again if we've lost it */
+    if (ddrval == DDERR_SURFACELOST)
+    {
+      /* Surface was lost */
+      ErrorF ("IDirectDrawSurface4_Blt reported that the primary "
+              "surface was lost, trying to restore, retry: %d\n", i + 1);
+    
+      /* Try to restore the surface, once */
+      
+      if (i==1)
+      {
+        ErrorF("Recreating DDraw surface because restoring of surface didn't work.\n");
+        winAllocateFBShadowDDNL(pScreen);
+      }
+      else
+      {
+        ddrval = IDirectDraw4_RestoreAllSurfaces (pScreenPriv->pdd4);
+        ErrorF ("IDirectDraw4_RestoreAllSurfaces returned: ");
+        if (ddrval == DD_OK)
+          ErrorF ("DD_OK\n");
+        else if (ddrval == DDERR_WRONGMODE)
+          ErrorF ("DDERR_WRONGMODE\n");
+        else if (ddrval == DDERR_INCOMPATIBLEPRIMARY)
+          ErrorF ("DDERR_INCOMPATIBLEPRIMARY\n");
+        else if (ddrval == DDERR_UNSUPPORTED)
+          ErrorF ("DDERR_UNSUPPORTED\n");
+        else if (ddrval == DDERR_INVALIDPARAMS)
+          ErrorF ("DDERR_INVALIDPARAMS\n");
+        else if (ddrval == DDERR_INVALIDOBJECT)
+          ErrorF ("DDERR_INVALIDOBJECT\n");
+        else
+          ErrorF ("unknown error: %08x\n", ddrval);
+      }
+      /* Loop around to try the blit one more time */
+      continue;
+    }
+    else if (FAILED (ddrval))
+    {
+      ErrorF ("IDirectDrawSurface4_Blt failed, but surface not "
+              "lost: %08x %d\n", ddrval, ddrval);
+    }
+    break;
+  }
+  return ddrval;
+}
+
 /*
  * Create the primary surface and attach the clipper.
  * Used for both the initial surface creation and during
@@ -127,9 +186,7 @@ winCreatePrimarySurfaceShadowDDNL(ScreenPtr pScreen)
         return FALSE;
     }
 
-#if 1
     winDebug("winCreatePrimarySurfaceShadowDDNL - Created primary surface\n");
-#endif
 
     /* Attach our clipper to our primary surface handle */
     ddrval = IDirectDrawSurface4_SetClipper(pScreenPriv->pddsPrimary4,
@@ -140,34 +197,22 @@ winCreatePrimarySurfaceShadowDDNL(ScreenPtr pScreen)
         return FALSE;
     }
 
-#if 1
     winDebug("winCreatePrimarySurfaceShadowDDNL - Attached clipper to primary "
              "surface\n");
-#endif
 
     /* Everything was correct */
     return TRUE;
 }
 
-/*
- * Detach the clipper and release the primary surface.
- * Called from WM_DISPLAYCHANGE.
- */
-
-static Bool
-winReleasePrimarySurfaceShadowDDNL(ScreenPtr pScreen)
+static void ClosePrimarySurfaceShadowDDNL (winPrivScreenPtr pScreenPriv)
 {
-    winScreenPriv(pScreen);
-
-    winDebug("winReleasePrimarySurfaceShadowDDNL - Hello\n");
-
     /* Release the primary surface and clipper, if they exist */
     if (pScreenPriv->pddsPrimary4) {
         /*
          * Detach the clipper from the primary surface.
          * NOTE: We do this explicity for clarity.  The Clipper is not released.
          */
-        IDirectDrawSurface4_SetClipper(pScreenPriv->pddsPrimary4, NULL);
+        IDirectDrawSurface4_SetClipper (pScreenPriv->pddsPrimary4, NULL);
 
         winDebug("winReleasePrimarySurfaceShadowDDNL - Detached clipper\n");
 
@@ -176,6 +221,47 @@ winReleasePrimarySurfaceShadowDDNL(ScreenPtr pScreen)
         pScreenPriv->pddsPrimary4 = NULL;
     }
 
+}
+
+static void ReleaseDDNL(winPrivScreenPtr pScreenPriv)
+{
+  /* Release the clipper object */
+  if (pScreenPriv->pddcPrimary)
+    {
+      IDirectDrawClipper_Release (pScreenPriv->pddcPrimary);
+      pScreenPriv->pddcPrimary = NULL;
+    }
+
+  /* Free the DirectDraw4 object, if there is one */
+  if (pScreenPriv->pdd4)
+    {
+      IDirectDraw4_RestoreDisplayMode (pScreenPriv->pdd4);
+      IDirectDraw4_Release (pScreenPriv->pdd4);
+      pScreenPriv->pdd4 = NULL;
+    }
+
+  /* Free the DirectDraw object, if there is one */
+  if (pScreenPriv->pdd)
+    {
+      IDirectDraw_Release (pScreenPriv->pdd);
+      pScreenPriv->pdd = NULL;
+    }
+}
+
+/*
+ * Detach the clipper and release the primary surface.
+ * Called from WM_DISPLAYCHANGE.
+ */
+
+static Bool
+winReleasePrimarySurfaceShadowDDNL (ScreenPtr pScreen)
+{
+  winScreenPriv(pScreen);
+
+  winDebug ("winReleasePrimarySurfaceShadowDDNL - Hello\n");
+
+  ClosePrimarySurfaceShadowDDNL(pScreenPriv);
+
     winDebug("winReleasePrimarySurfaceShadowDDNL - Released primary surface\n");
 
     return TRUE;
@@ -199,28 +285,41 @@ winAllocateFBShadowDDNL(ScreenPtr pScreen)
     char *lpSurface = NULL;
     DDPIXELFORMAT ddpfPrimary;
 
-#if CYGDEBUG
     winDebug("winAllocateFBShadowDDNL - w %d h %d d %d\n",
              pScreenInfo->dwWidth, pScreenInfo->dwHeight, pScreenInfo->dwDepth);
-#endif
 
     /* Set the padded screen width */
     pScreenInfo->dwPaddedWidth = PixmapBytePad(pScreenInfo->dwWidth,
                                                pScreenInfo->dwBPP);
 
-    /* Allocate memory for our shadow surface */
-    lpSurface = malloc(pScreenInfo->dwPaddedWidth * pScreenInfo->dwHeight);
-    if (lpSurface == NULL) {
-        ErrorF("winAllocateFBShadowDDNL - Could not allocate bits\n");
-        return FALSE;
-    }
-
-    /*
-     * Initialize the framebuffer memory so we don't get a 
-     * strange display at startup
-     */
-    ZeroMemory(lpSurface, pScreenInfo->dwPaddedWidth * pScreenInfo->dwHeight);
+    if ( pScreenInfo->pfb)
+    {
+        ErrorF("winAllocateFBShadowDDNL calling for the second time, reallocating\n");
+        lpSurface=pScreenInfo->pfb;
 
+        if (pScreenPriv->pddsShadow4)
+        {
+            IDirectDrawSurface4_Release (pScreenPriv->pddsShadow4);
+            pScreenPriv->pddsShadow4 = NULL;
+        }
+        ClosePrimarySurfaceShadowDDNL(pScreenPriv);
+        ReleaseDDNL(pScreenPriv);
+    }
+    else
+    {
+        /* Allocate memory for our shadow surface */
+        lpSurface = malloc (pScreenInfo->dwPaddedWidth * pScreenInfo->dwHeight);
+        if (lpSurface == NULL) {
+            ErrorF ("winAllocateFBShadowDDNL - Could not allocate bits\n");
+            return FALSE;
+        }
+  
+        /*
+         * Initialize the framebuffer memory so we don't get a 
+         * strange display at startup
+         */
+        ZeroMemory (lpSurface, pScreenInfo->dwPaddedWidth * pScreenInfo->dwHeight);
+    }
     /* Create a clipper */
     ddrval = (*g_fpDirectDrawCreateClipper) (0,
                                              &pScreenPriv->pddcPrimary, NULL);
@@ -230,9 +329,7 @@ winAllocateFBShadowDDNL(ScreenPtr pScreen)
         return FALSE;
     }
 
-#if CYGDEBUG
     winDebug("winAllocateFBShadowDDNL - Created a clipper\n");
-#endif
 
     /* Attach the clipper to our display window */
     ddrval = IDirectDrawClipper_SetHWnd(pScreenPriv->pddcPrimary,
@@ -243,9 +340,7 @@ winAllocateFBShadowDDNL(ScreenPtr pScreen)
         return FALSE;
     }
 
-#if CYGDEBUG
     winDebug("winAllocateFBShadowDDNL - Attached clipper to window\n");
-#endif
 
     /* Create a DirectDraw object, store the address at lpdd */
     ddrval = (*g_fpDirectDrawCreate) (NULL,
@@ -257,9 +352,7 @@ winAllocateFBShadowDDNL(ScreenPtr pScreen)
         return FALSE;
     }
 
-#if CYGDEBUG
     winDebug("winAllocateFBShadowDDNL - Created and initialized DD\n");
-#endif
 
     /* Get a DirectDraw4 interface pointer */
     ddrval = IDirectDraw_QueryInterface(pScreenPriv->pdd,
@@ -398,13 +491,11 @@ winAllocateFBShadowDDNL(ScreenPtr pScreen)
         return FALSE;
     }
 
-#if CYGDEBUG
     winDebug("winAllocateFBShadowDDNL - Primary masks: %08x %08x %08x "
              "dwRGBBitCount: %d\n",
              ddpfPrimary.u2.dwRBitMask,
              ddpfPrimary.u3.dwGBitMask,
              ddpfPrimary.u4.dwBBitMask, ddpfPrimary.u1.dwRGBBitCount);
-#endif
 
     /* Describe the shadow surface to be created */
     /*
@@ -439,19 +530,15 @@ winAllocateFBShadowDDNL(ScreenPtr pScreen)
         return FALSE;
     }
 
-#if CYGDEBUG || YES
     winDebug("winAllocateFBShadowDDNL - Created shadow pitch: %d\n",
              (int) ddsdShadow.u1.lPitch);
-#endif
 
     /* Grab the pitch from the surface desc */
     pScreenInfo->dwStride = (ddsdShadow.u1.lPitch * 8)
         / pScreenInfo->dwBPP;
 
-#if CYGDEBUG || YES
     winDebug("winAllocateFBShadowDDNL - Created shadow stride: %d\n",
              (int) pScreenInfo->dwStride);
-#endif
 
     /* Save the pointer to our surface memory */
     pScreenInfo->pfb = lpSurface;
@@ -461,9 +548,7 @@ winAllocateFBShadowDDNL(ScreenPtr pScreen)
     pScreenPriv->dwGreenMask = ddsdShadow.u4.ddpfPixelFormat.u3.dwGBitMask;
     pScreenPriv->dwBlueMask = ddsdShadow.u4.ddpfPixelFormat.u4.dwBBitMask;
 
-#if CYGDEBUG
     winDebug("winAllocateFBShadowDDNL - Returning\n");
-#endif
 
     return TRUE;
 }
@@ -485,24 +570,7 @@ winFreeFBShadowDDNL(ScreenPtr pScreen)
     /* Detach the clipper from the primary surface and release the primary surface, if there is one */
     winReleasePrimarySurfaceShadowDDNL(pScreen);
 
-    /* Release the clipper object */
-    if (pScreenPriv->pddcPrimary) {
-        IDirectDrawClipper_Release(pScreenPriv->pddcPrimary);
-        pScreenPriv->pddcPrimary = NULL;
-    }
-
-    /* Free the DirectDraw4 object, if there is one */
-    if (pScreenPriv->pdd4) {
-        IDirectDraw4_RestoreDisplayMode(pScreenPriv->pdd4);
-        IDirectDraw4_Release(pScreenPriv->pdd4);
-        pScreenPriv->pdd4 = NULL;
-    }
-
-    /* Free the DirectDraw object, if there is one */
-    if (pScreenPriv->pdd) {
-        IDirectDraw_Release(pScreenPriv->pdd);
-        pScreenPriv->pdd = NULL;
-    }
+    ReleaseDDNL(pScreenPriv);
 
     /* Invalidate the ScreenInfo's fb pointer */
     pScreenInfo->pfb = NULL;
@@ -518,7 +586,6 @@ winShadowUpdateDDNL(ScreenPtr pScreen, shadowBufPtr pBuf)
     winScreenPriv(pScreen);
     winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
     RegionPtr damage = shadowDamage(pBuf);
-    HRESULT ddrval = DD_OK;
     RECT rcDest, rcSrc;
     POINT ptOrigin;
     DWORD dwBox = RegionNumRects(damage);
@@ -565,27 +632,10 @@ winShadowUpdateDDNL(ScreenPtr pScreen, shadowBufPtr pBuf)
             rcDest.bottom = ptOrigin.y + rcSrc.bottom;
 
             /* Blit the damaged areas */
-            ddrval = IDirectDrawSurface4_Blt(pScreenPriv->pddsPrimary4,
-                                             &rcDest,
-                                             pScreenPriv->pddsShadow4,
-                                             &rcSrc, DDBLT_WAIT, NULL);
-            if (FAILED(ddrval)) {
-                static int s_iFailCount = 0;
-
-                if (s_iFailCount < FAIL_MSG_MAX_BLT) {
-                    ErrorF("winShadowUpdateDDNL - IDirectDrawSurface4_Blt () "
-                           "failed: %08x\n", (unsigned int) ddrval);
-
-                    ++s_iFailCount;
-
-                    if (s_iFailCount == FAIL_MSG_MAX_BLT) {
-                        ErrorF("winShadowUpdateDDNL - IDirectDrawSurface4_Blt "
-                               "failure message maximum (%d) reached.  No "
-                               "more failure messages will be printed.\n",
-                               FAIL_MSG_MAX_BLT);
-                    }
-                }
-            }
+            if (pScreenPriv->pddsPrimary4)
+                myIDirectDrawSurface4_Blt (pScreen,
+                                           &rcDest,
+                                           &rcSrc);
 
             /* Get a pointer to the next box */
             ++pBox;
@@ -604,11 +654,9 @@ winShadowUpdateDDNL(ScreenPtr pScreen, shadowBufPtr pBuf)
         DeleteObject(hrgnCombined);
         hrgnCombined = NULL;
 
-#if CYGDEBUG
         winDebug("winShadowUpdateDDNL - be x1 %d y1 %d x2 %d y2 %d\n",
                  pBoxExtents->x1, pBoxExtents->y1,
                  pBoxExtents->x2, pBoxExtents->y2);
-#endif
 
         /* Calculating a bounding box for the source is easy */
         rcSrc.left = pBoxExtents->x1;
@@ -623,10 +671,7 @@ winShadowUpdateDDNL(ScreenPtr pScreen, shadowBufPtr pBuf)
         rcDest.bottom = ptOrigin.y + rcSrc.bottom;
 
         /* Our Blt should be clipped to the invalidated region */
-        ddrval = IDirectDrawSurface4_Blt(pScreenPriv->pddsPrimary4,
-                                         &rcDest,
-                                         pScreenPriv->pddsShadow4,
-                                         &rcSrc, DDBLT_WAIT, NULL);
+        myIDirectDrawSurface4_Blt (pScreen, &rcDest, &rcSrc);
 
         /* Reset the clip region */
         SelectClipRgn(pScreenPriv->hdcScreen, NULL);
@@ -655,11 +700,9 @@ winCloseScreenShadowDDNL(ScreenPtr pScreen)
 {
     winScreenPriv(pScreen);
     winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
-    Bool fReturn;
+    Bool fReturn=FALSE;
 
-#if CYGDEBUG
     winDebug("winCloseScreenShadowDDNL - Freeing screen resources\n");
-#endif
 
     /* Flag that the screen is closed */
     pScreenPriv->fClosed = TRUE;
@@ -696,7 +739,7 @@ winCloseScreenShadowDDNL(ScreenPtr pScreen)
 
 #if defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW)
     /* Destroy the thread startup mutex */
-    pthread_mutex_destroy(&pScreenPriv->pmServerStarted);
+    if (pScreenPriv->pmServerStarted) pthread_mutex_destroy (&pScreenPriv->pmServerStarted);
 #endif
 
     /* Kill our screeninfo's pointer to the screen */
@@ -798,9 +841,7 @@ winInitVisualsShadowDDNL(ScreenPtr pScreen)
         return FALSE;
     }
 
-#if CYGDEBUG
     winDebug("winInitVisualsShadowDDNL - Returning\n");
-#endif
 
     return TRUE;
 }
@@ -892,58 +933,14 @@ winBltExposedRegionsShadowDDNL(ScreenPtr pScreen)
     rcSrc.right = pScreenInfo->dwWidth;
     rcSrc.bottom = pScreenInfo->dwHeight;
 
-    /* Try to regain the primary surface and blit again if we've lost it */
-    for (i = 0; i <= WIN_REGAIN_SURFACE_RETRIES; ++i) {
-        /* Our Blt should be clipped to the invalidated region */
-        ddrval = IDirectDrawSurface4_Blt(pScreenPriv->pddsPrimary4,
-                                         &rcDest,
-                                         pScreenPriv->pddsShadow4,
-                                         &rcSrc, DDBLT_WAIT, NULL);
-        if (ddrval == DDERR_SURFACELOST) {
-            /* Surface was lost */
-            winErrorFVerb(1, "winBltExposedRegionsShadowDDNL - "
-                          "IDirectDrawSurface4_Blt reported that the primary "
-                          "surface was lost, trying to restore, retry: %d\n",
-                          i + 1);
-
-            /* Try to restore the surface, once */
-
-            ddrval = IDirectDrawSurface4_Restore(pScreenPriv->pddsPrimary4);
-            winDebug("winBltExposedRegionsShadowDDNL - "
-                     "IDirectDrawSurface4_Restore returned: ");
-            if (ddrval == DD_OK)
-                winDebug("DD_OK\n");
-            else if (ddrval == DDERR_WRONGMODE)
-                winDebug("DDERR_WRONGMODE\n");
-            else if (ddrval == DDERR_INCOMPATIBLEPRIMARY)
-                winDebug("DDERR_INCOMPATIBLEPRIMARY\n");
-            else if (ddrval == DDERR_UNSUPPORTED)
-                winDebug("DDERR_UNSUPPORTED\n");
-            else if (ddrval == DDERR_INVALIDPARAMS)
-                winDebug("DDERR_INVALIDPARAMS\n");
-            else if (ddrval == DDERR_INVALIDOBJECT)
-                winDebug("DDERR_INVALIDOBJECT\n");
-            else
-                winDebug("unknown error: %08x\n", (unsigned int) ddrval);
-
-            /* Loop around to try the blit one more time */
-            continue;
-        }
-        else if (FAILED(ddrval)) {
-            fReturn = FALSE;
-            winErrorFVerb(1, "winBltExposedRegionsShadowDDNL - "
-                          "IDirectDrawSurface4_Blt failed, but surface not "
-                          "lost: %08x %d\n",
-                          (unsigned int) ddrval, (int) ddrval);
-            goto winBltExposedRegionsShadowDDNL_Exit;
-        }
-        else {
-            /* Success, stop looping */
-            break;
-        }
+    /* Our Blt should be clipped to the invalidated region */
+    ddrval = myIDirectDrawSurface4_Blt (pScreen, &rcDest, &rcSrc);
+    if (FAILED (ddrval))
+    {
+        fReturn = FALSE;
     }
 
- winBltExposedRegionsShadowDDNL_Exit:
+winBltExposedRegionsShadowDDNL_Exit:
     /* EndPaint frees the DC */
     if (hdcUpdate != NULL)
         EndPaint(pScreenPriv->hwndScreen, &ps);
@@ -982,7 +979,6 @@ winRedrawScreenShadowDDNL(ScreenPtr pScreen)
 {
     winScreenPriv(pScreen);
     winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
-    HRESULT ddrval = DD_OK;
     RECT rcSrc, rcDest;
     POINT ptOrigin;
 
@@ -1003,15 +999,7 @@ winRedrawScreenShadowDDNL(ScreenPtr pScreen)
     rcSrc.bottom = pScreenInfo->dwHeight;
 
     /* Redraw the whole window, to take account for the new colors */
-    ddrval = IDirectDrawSurface4_Blt(pScreenPriv->pddsPrimary4,
-                                     &rcDest,
-                                     pScreenPriv->pddsShadow4,
-                                     &rcSrc, DDBLT_WAIT, NULL);
-    if (FAILED(ddrval)) {
-        ErrorF("winRedrawScreenShadowDDNL - IDirectDrawSurface4_Blt () "
-               "failed: %08x\n", (unsigned int) ddrval);
-    }
-
+    myIDirectDrawSurface4_Blt (pScreen, &rcDest, &rcSrc);
     return TRUE;
 }
 
@@ -1139,10 +1127,8 @@ winDestroyColormapShadowDDNL(ColormapPtr pColormap)
      * we need to handle the default colormap in a special way.
      */
     if (pColormap->flags & IsDefault) {
-#if CYGDEBUG
         winDebug
             ("winDestroyColormapShadowDDNL - Destroying default colormap\n");
-#endif
 
         /*
          * FIXME: Walk the list of all screens, popping the default
diff --git a/xorg-server/hw/xwin/winshadgdi.c b/xorg-server/hw/xwin/winshadgdi.c
index ebc233924..9e981cea7 100644
--- a/xorg-server/hw/xwin/winshadgdi.c
+++ b/xorg-server/hw/xwin/winshadgdi.c
@@ -92,8 +92,7 @@ winQueryScreenDIBFormat(ScreenPtr pScreen, BITMAPINFOHEADER * pbmih)
 {
     winScreenPriv(pScreen);
     HBITMAP hbmp;
-
-#if CYGDEBUG
+#ifdef WINDBG
     LPDWORD pdw = NULL;
 #endif
 
@@ -116,7 +115,7 @@ winQueryScreenDIBFormat(ScreenPtr pScreen, BITMAPINFOHEADER * pbmih)
         return FALSE;
     }
 
-#if CYGDEBUG
+#ifdef WINDBG
     /* Get a pointer to bitfields */
     pdw = (DWORD *) ((CARD8 *) pbmih + sizeof(BITMAPINFOHEADER));
 
@@ -169,8 +168,8 @@ winQueryRGBBitsAndMasks(ScreenPtr pScreen)
     /* Color masks for 24 bpp are standardized */
     if (GetDeviceCaps(pScreenPriv->hdcScreen, PLANES)
         * GetDeviceCaps(pScreenPriv->hdcScreen, BITSPIXEL) == 24) {
-        ErrorF("winQueryRGBBitsAndMasks - GetDeviceCaps (BITSPIXEL) "
-               "returned 24 for the screen.  Using default 24bpp masks.\n");
+        winDebug ("winQueryRGBBitsAndMasks - GetDeviceCaps (BITSPIXEL) "
+                  "returned 24 for the screen.  Using default 24bpp masks.\n");
 
         /* 8 bits per primary color */
         pScreenPriv->dwBitsPerRGB = 8;
@@ -196,7 +195,7 @@ winQueryRGBBitsAndMasks(ScreenPtr pScreen)
         /* Get a pointer to bitfields */
         pdw = (DWORD *) ((CARD8 *) pbmih + sizeof(BITMAPINFOHEADER));
 
-#if CYGDEBUG
+#ifdef WINDBG
         winDebug("%s - Masks: %08x %08x %08x\n", __FUNCTION__,
                  pdw[0], pdw[1], pdw[2]);
         winDebug("%s - Bitmap: %dx%d %d bpp %d planes\n", __FUNCTION__,
@@ -328,10 +327,10 @@ winAllocateFBShadowGDI(ScreenPtr pScreen)
     pScreenPriv->pbmih->biWidth = pScreenInfo->dwWidth;
     pScreenPriv->pbmih->biHeight = -pScreenInfo->dwHeight;
 
-    ErrorF("winAllocateFBShadowGDI - Creating DIB with width: %d height: %d "
-           "depth: %d\n",
-           (int) pScreenPriv->pbmih->biWidth,
-           (int) -pScreenPriv->pbmih->biHeight, pScreenPriv->pbmih->biBitCount);
+    winDebug ("winAllocateFBShadowGDI - Creating DIB with width: %d height: %d "
+              "depth: %d\n",
+              (int) pScreenPriv->pbmih->biWidth,
+              (int) -pScreenPriv->pbmih->biHeight, pScreenPriv->pbmih->biBitCount);
 
     /* Create a DI shadow bitmap with a bit pointer */
     pScreenPriv->hbmpShadow = CreateDIBSection(pScreenPriv->hdcScreen,
@@ -340,32 +339,26 @@ winAllocateFBShadowGDI(ScreenPtr pScreen)
                                                (VOID **) &pScreenInfo->pfb,
                                                NULL, 0);
     if (pScreenPriv->hbmpShadow == NULL || pScreenInfo->pfb == NULL) {
-        winW32Error(2, "winAllocateFBShadowGDI - CreateDIBSection failed:");
+        winW32Error ("winAllocateFBShadowGDI - CreateDIBSection failed:");
         return FALSE;
     }
     else {
-#if CYGDEBUG
         winDebug("winAllocateFBShadowGDI - Shadow buffer allocated\n");
-#endif
     }
 
     /* Get information about the bitmap that was allocated */
     GetObject(pScreenPriv->hbmpShadow, sizeof(dibsection), &dibsection);
 
-#if CYGDEBUG || YES
     /* Print information about bitmap allocated */
     winDebug("winAllocateFBShadowGDI - Dibsection width: %d height: %d "
              "depth: %d size image: %d\n",
              (int) dibsection.dsBmih.biWidth, (int) dibsection.dsBmih.biHeight,
              dibsection.dsBmih.biBitCount, (int) dibsection.dsBmih.biSizeImage);
-#endif
 
     /* Select the shadow bitmap into the shadow DC */
     SelectObject(pScreenPriv->hdcShadow, pScreenPriv->hbmpShadow);
 
-#if CYGDEBUG
     winDebug("winAllocateFBShadowGDI - Attempting a shadow blit\n");
-#endif
 
     /* Do a test blit from the shadow to the screen, I think */
     fReturn = BitBlt(pScreenPriv->hdcScreen,
@@ -373,20 +366,14 @@ winAllocateFBShadowGDI(ScreenPtr pScreen)
                      pScreenInfo->dwWidth, pScreenInfo->dwHeight,
                      pScreenPriv->hdcShadow, 0, 0, SRCCOPY);
     if (fReturn) {
-#if CYGDEBUG
         winDebug("winAllocateFBShadowGDI - Shadow blit success\n");
-#endif
     }
     else {
-        winW32Error(2, "winAllocateFBShadowGDI - Shadow blit failure\n");
-#if 0
-        return FALSE;
-#else
+        winW32Error ("winAllocateFBShadowGDI - Shadow blit failure\n");
         /* ago: ignore this error. The blit fails with wine, but does not 
          * cause any problems later. */
 
         fReturn = TRUE;
-#endif
     }
 
     /* Look for height weirdness */
@@ -399,10 +386,8 @@ winAllocateFBShadowGDI(ScreenPtr pScreen)
                               / dibsection.dsBmih.biHeight)
                              * 8) / pScreenInfo->dwBPP;
 
-#if CYGDEBUG || YES
     winDebug("winAllocateFBShadowGDI - Created shadow stride: %d\n",
              (int) pScreenInfo->dwStride);
-#endif
 
 #ifdef XWIN_MULTIWINDOW
     /* Redraw all windows */
@@ -462,15 +447,16 @@ winShadowUpdateGDI(ScreenPtr pScreen, shadowBufPtr pBuf)
 
     if (dwBox != 1) {
         ++s_dwNonUnitRegions;
-        ErrorF("winShadowUpdatGDI - dwBox: %d\n", dwBox);
+        winDebug ("winShadowUpdatGDI - dwBox: %d\n", dwBox);
     }
 
     if ((s_dwTotalUpdates % 100) == 0)
-        ErrorF("winShadowUpdateGDI - %d%% non-unity regions, avg boxes: %d "
-               "nu: %d tu: %d\n",
-               (s_dwNonUnitRegions * 100) / s_dwTotalUpdates,
-               s_dwTotalBoxes / s_dwTotalUpdates,
-               s_dwNonUnitRegions, s_dwTotalUpdates);
+        winDebug ("winShadowUpdateGDI - %d%% non-unity regions, avg boxes: %d "
+                  "nu: %d tu: %d\n",
+                  (s_dwNonUnitRegions * 100) / s_dwTotalUpdates,
+                  s_dwTotalBoxes / s_dwTotalUpdates,
+                  s_dwNonUnitRegions, s_dwTotalUpdates);
+  }
 #endif                          /* XWIN_UPDATESTATS */
 
     /*
@@ -580,9 +566,7 @@ winCloseScreenShadowGDI(ScreenPtr pScreen)
     winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
     Bool fReturn;
 
-#if CYGDEBUG
     winDebug("winCloseScreenShadowGDI - Freeing screen resources\n");
-#endif
 
     /* Flag that the screen is closed */
     pScreenPriv->fClosed = TRUE;
@@ -622,7 +606,7 @@ winCloseScreenShadowGDI(ScreenPtr pScreen)
 
 #if defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW)
     /* Destroy the thread startup mutex */
-    pthread_mutex_destroy(&pScreenPriv->pmServerStarted);
+    if (pScreenPriv->pmServerStarted) pthread_mutex_destroy (&pScreenPriv->pmServerStarted);
 #endif
 
     /* Invalidate our screeninfo's pointer to the screen */
@@ -649,13 +633,13 @@ winInitVisualsShadowGDI(ScreenPtr pScreen)
     winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
 
     /* Display debugging information */
-    ErrorF("winInitVisualsShadowGDI - Masks %08x %08x %08x BPRGB %d d %d "
-           "bpp %d\n",
-           (unsigned int) pScreenPriv->dwRedMask,
-           (unsigned int) pScreenPriv->dwGreenMask,
-           (unsigned int) pScreenPriv->dwBlueMask,
-           (int) pScreenPriv->dwBitsPerRGB,
-           (int) pScreenInfo->dwDepth, (int) pScreenInfo->dwBPP);
+    winDebug ("winInitVisualsShadowGDI - Masks %08x %08x %08x BPRGB %d d %d "
+              "bpp %d\n",
+              (unsigned int) pScreenPriv->dwRedMask,
+              (unsigned int) pScreenPriv->dwGreenMask,
+              (unsigned int) pScreenPriv->dwBlueMask,
+              (int) pScreenPriv->dwBitsPerRGB,
+              (int) pScreenInfo->dwDepth, (int) pScreenInfo->dwBPP);
 
     /* Create a single visual according to the Windows screen depth */
     switch (pScreenInfo->dwDepth) {
@@ -707,9 +691,7 @@ winInitVisualsShadowGDI(ScreenPtr pScreen)
         return FALSE;
     }
 
-#if CYGDEBUG
     winDebug("winInitVisualsShadowGDI - Returning\n");
-#endif
 
     return TRUE;
 }
@@ -868,16 +850,12 @@ winRealizeInstalledPaletteShadowGDI(ScreenPtr pScreen)
     winScreenPriv(pScreen);
     winPrivCmapPtr pCmapPriv = NULL;
 
-#if CYGDEBUG
     winDebug("winRealizeInstalledPaletteShadowGDI\n");
-#endif
 
     /* Don't do anything if there is not a colormap */
     if (pScreenPriv->pcmapInstalled == NULL) {
-#if CYGDEBUG
         winDebug("winRealizeInstalledPaletteShadowGDI - No colormap "
                  "installed\n");
-#endif
         return TRUE;
     }
 
@@ -1082,10 +1060,8 @@ winDestroyColormapShadowGDI(ColormapPtr pColormap)
      * we need to handle the default colormap in a special way.
      */
     if (pColormap->flags & IsDefault) {
-#if CYGDEBUG
         winDebug("winDestroyColormapShadowGDI - Destroying default "
                  "colormap\n");
-#endif
 
         /*
          * FIXME: Walk the list of all screens, popping the default
diff --git a/xorg-server/hw/xwin/wintrayicon.c b/xorg-server/hw/xwin/wintrayicon.c
index f168b884a..bcea0cc81 100644
--- a/xorg-server/hw/xwin/wintrayicon.c
+++ b/xorg-server/hw/xwin/wintrayicon.c
@@ -36,34 +36,57 @@
 #include <shellapi.h>
 #include "winprefs.h"
 
+static NOTIFYICONDATA nid;
 /*
  * Initialize the tray icon
  */
 
 void
-winInitNotifyIcon(winPrivScreenPtr pScreenPriv)
+winInitNotifyIcon(winPrivScreenPtr pScreenPriv, Bool Modify)
 {
     winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
-    NOTIFYICONDATA nid = { 0 };
+    char HostName[256];
 
-    nid.cbSize = sizeof(NOTIFYICONDATA);
-    nid.hWnd = pScreenPriv->hwndScreen;
-    nid.uID = pScreenInfo->dwScreen;
-    nid.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP;
-    nid.uCallbackMessage = WM_TRAYICON;
-    nid.hIcon = winTaskbarIcon();
+    if (!Modify)
+    {
+        nid.cbSize = sizeof(NOTIFYICONDATA);
+        nid.hWnd = pScreenPriv->hwndScreen;
+        nid.uID = pScreenInfo->dwScreen;
+        nid.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP;
+        nid.uCallbackMessage = WM_TRAYICON;
+        nid.hIcon = winTaskbarIcon();
+
+        /* Save handle to the icon so it can be freed later */
+        pScreenPriv->hiconNotifyIcon = nid.hIcon;
+    }
 
-    /* Save handle to the icon so it can be freed later */
-    pScreenPriv->hiconNotifyIcon = nid.hIcon;
+    gethostname(HostName,256);
 
     /* Set display and screen-specific tooltip text */
-    snprintf(nid.szTip,
-             sizeof(nid.szTip),
-             PROJECT_NAME " Server:%s.%d",
-             display, (int) pScreenInfo->dwScreen);
+    if (g_pszQueryHost)
+    {
+        snprintf(nid.szTip,
+                 sizeof(nid.szTip),
+                 "%s - %s:%s.%d - %d clients",
+	               g_pszQueryHost,
+	               HostName,
+                 display, 
+                 (int) pScreenInfo->dwScreen,
+                 pScreenPriv->iConnectedClients);
+    }
+    else
+    {
+        snprintf (nid.szTip,
+                  sizeof (nid.szTip),
+                  "%s:%s.%d - %d clients",
+                  HostName,
+                  display, 
+                  (int) pScreenInfo->dwScreen,
+                  pScreenPriv->iConnectedClients);
+    }
 
     /* Add the tray icon */
-    if (!Shell_NotifyIcon(NIM_ADD, &nid))
+    if (!Shell_NotifyIcon ((Modify) ? NIM_MODIFY : NIM_ADD, &nid))
         ErrorF("winInitNotifyIcon - Shell_NotifyIcon Failed\n");
 }
 
@@ -75,27 +98,16 @@ void
 winDeleteNotifyIcon(winPrivScreenPtr pScreenPriv)
 {
     winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
-    NOTIFYICONDATA nid = { 0 };
-
-#if 0
-    ErrorF("winDeleteNotifyIcon\n");
-#endif
 
-    nid.cbSize = sizeof(NOTIFYICONDATA);
-    nid.hWnd = pScreenPriv->hwndScreen;
-    nid.uID = pScreenInfo->dwScreen;
+    if (!pScreenPriv->hiconNotifyIcon)
+        return;
 
     /* Delete the tray icon */
-    if (!Shell_NotifyIcon(NIM_DELETE, &nid)) {
-        ErrorF("winDeleteNotifyIcon - Shell_NotifyIcon failed\n");
-        return;
-    }
+    Shell_NotifyIcon (NIM_DELETE, &nid);
 
     /* Free the icon that was loaded */
-    if (pScreenPriv->hiconNotifyIcon != NULL
-        && DestroyIcon(pScreenPriv->hiconNotifyIcon) == 0) {
-        ErrorF("winDeleteNotifyIcon - DestroyIcon failed\n");
-    }
+    DestroyIcon (pScreenPriv->hiconNotifyIcon);
+
     pScreenPriv->hiconNotifyIcon = NULL;
 }
 
@@ -112,6 +124,17 @@ winHandleIconMessage(HWND hwnd, UINT message,
 #endif
 
     switch (lParam) {
+    case WM_MOUSEMOVE:
+    {
+      static int PrevNrClients;
+      int NrClients=GetLiveClients(pScreenPriv);
+      if (NrClients!=PrevNrClients)
+      {
+        PrevNrClients=NrClients;
+        winInitNotifyIcon (pScreenPriv, TRUE);
+      }
+    }
+    break;
     case WM_LBUTTONUP:
         /* Restack and bring all windows to top */
         SetForegroundWindow (pScreenPriv->hwndScreen);
diff --git a/xorg-server/hw/xwin/winwin32rootless.c b/xorg-server/hw/xwin/winwin32rootless.c
index 210fea3fa..b0de5697d 100644..100755
--- a/xorg-server/hw/xwin/winwin32rootless.c
+++ b/xorg-server/hw/xwin/winwin32rootless.c
@@ -83,8 +83,7 @@ winMWExtWMQueryDIBFormat(win32RootlessWindowPtr pRLWinPriv,
                          BITMAPINFOHEADER * pbmih)
 {
     HBITMAP hbmp;
-
-#if CYGMULTIWINDOW_DEBUG
+#ifdef _DEBUG
     LPDWORD pdw = NULL;
 #endif
 
@@ -107,7 +106,7 @@ winMWExtWMQueryDIBFormat(win32RootlessWindowPtr pRLWinPriv,
         return FALSE;
     }
 
-#if CYGMULTIWINDOW_DEBUG
+#ifdef _DEBUG
     /* Get a pointer to bitfields */
     pdw = (DWORD *) ((CARD8 *) pbmih + sizeof(BITMAPINFOHEADER));
 
@@ -209,10 +208,8 @@ winMWExtWMCreateFrame(RootlessWindowPtr pFrame, ScreenPtr pScreen,
     char *res_name, *res_class, *res_role;
     static int s_iWindowID = 0;
 
-#if CYGMULTIWINDOW_DEBUG
     winDebug("winMWExtWMCreateFrame %d %d - %d %d\n",
              newX, newY, pFrame->width, pFrame->height);
-#endif
 
     pRLWinPriv =
         (win32RootlessWindowPtr) malloc(sizeof(win32RootlessWindowRec));
@@ -262,9 +259,7 @@ winMWExtWMCreateFrame(RootlessWindowPtr pFrame, ScreenPtr pScreen,
     pszWindowID[sizeof(pszWindowID) - 1] = 0;
     strcat(pszClass, pszWindowID);
 
-#if CYGMULTIWINDOW_DEBUG
     winDebug("winMWExtWMCreateFrame - Creating class: %s\n", pszClass);
-#endif
 
     /* Setup our window class */
     wc.cbSize = sizeof(wc);
@@ -300,9 +295,7 @@ winMWExtWMCreateFrame(RootlessWindowPtr pFrame, ScreenPtr pScreen,
         fResult = FALSE;
     }
 
-#if CYGMULTIWINDOW_DEBUG
     winDebug("winMWExtWMCreateFrame - ShowWindow\n");
-#endif
 
     //ShowWindow (pRLWinPriv->hWnd, SW_SHOWNOACTIVATE);
     g_fNoConfigureWindow = FALSE;
@@ -311,28 +304,8 @@ winMWExtWMCreateFrame(RootlessWindowPtr pFrame, ScreenPtr pScreen,
         winMWExtWMReshapeFrame(pFrame->wid, pShape);
     }
 
-#if CYGMULTIWINDOW_DEBUG
     winDebug("winMWExtWMCreateFrame - (%08x) %08x\n",
              (int) pFrame->wid, (int) pRLWinPriv->hWnd);
-#if 0
-    {
-        WindowPtr pWin2 = NULL;
-        win32RootlessWindowPtr pRLWinPriv2 = NULL;
-
-        /* Check if the Windows window property for our X window pointer is valid */
-        if ((pWin2 =
-             (WindowPtr) GetProp(pRLWinPriv->hWnd, WIN_WINDOW_PROP)) != NULL) {
-            pRLWinPriv2 =
-                (win32RootlessWindowPtr) RootlessFrameForWindow(pWin2, FALSE);
-        }
-        winDebug("winMWExtWMCreateFrame2 (%08x) %08x\n",
-                 pRLWinPriv2, pRLWinPriv2->hWnd);
-        if (pRLWinPriv != pRLWinPriv2 || pRLWinPriv->hWnd != pRLWinPriv2->hWnd) {
-            winDebug("Error param missmatch\n");
-        }
-    }
-#endif
-#endif
 
     winMWExtWMSetNativeProperty(pFrame);
 
@@ -349,29 +322,8 @@ winMWExtWMDestroyFrame(RootlessFrameID wid)
     int iReturn;
     char pszClass[CLASS_NAME_LENGTH];
 
-#if CYGMULTIWINDOW_DEBUG
     winDebug("winMWExtWMDestroyFrame (%08x) %08x\n",
              (int) pRLWinPriv, (int) pRLWinPriv->hWnd);
-#if 0
-    {
-        WindowPtr pWin2 = NULL;
-        win32RootlessWindowPtr pRLWinPriv2 = NULL;
-
-        /* Check if the Windows window property for our X window pointer is valid */
-        if ((pWin2 =
-             (WindowPtr) GetProp(pRLWinPriv->hWnd, WIN_WINDOW_PROP)) != NULL) {
-            pRLWinPriv2 =
-                (win32RootlessWindowPtr) RootlessFrameForWindow(pWin2, FALSE);
-        }
-        winDebug("winMWExtWMDestroyFrame2 (%08x) %08x\n",
-                 pRLWinPriv2, pRLWinPriv2->hWnd);
-        if (pRLWinPriv != pRLWinPriv2 || pRLWinPriv->hWnd != pRLWinPriv2->hWnd) {
-            winDebug("Error param missmatch\n");
-            *(int *) 0 = 1;     //raise exseption
-        }
-    }
-#endif
-#endif
 
     /* Store the info we need to destroy after this window is gone */
     hInstance = (HINSTANCE) GetClassLongPtr(pRLWinPriv->hWnd, GCLP_HMODULE);
@@ -387,22 +339,16 @@ winMWExtWMDestroyFrame(RootlessFrameID wid)
 
     /* Only if we were able to get the name */
     if (iReturn) {
-#if CYGMULTIWINDOW_DEBUG
         winDebug("winMWExtWMDestroyFrame - Unregistering %s: ", pszClass);
-#endif
         iReturn = UnregisterClass(pszClass, hInstance);
+      
+        winDebug ("winMWExtWMDestroyFramew - Deleting Icon\n");
     }
 
-#if CYGMULTIWINDOW_DEBUG
-    winDebug("winMWExtWMDestroyFramew - Deleting Icon\n");
-#endif
-
-    winDestroyIcon(hIcon);
-    winDestroyIcon(hIconSm);
+    winDestroyIcon(hiconClass);
+    winDestroyIcon(hiconSmClass);
 
-#if CYGMULTIWINDOW_DEBUG
     winDebug("winMWExtWMDestroyFrame - done\n");
-#endif
 }
 
 void
@@ -415,10 +361,8 @@ winMWExtWMMoveFrame(RootlessFrameID wid, ScreenPtr pScreen, int iNewX,
     DWORD dwStyle;
     int iX, iY, iWidth, iHeight;
 
-#if CYGMULTIWINDOW_DEBUG
     winDebug("winMWExtWMMoveFrame (%08x) (%d %d)\n", (int) pRLWinPriv, iNewX,
              iNewY);
-#endif
 
     /* Get the Windows window style and extended style */
     dwExStyle = GetWindowLongPtr(pRLWinPriv->hWnd, GWL_EXSTYLE);
@@ -435,29 +379,23 @@ winMWExtWMMoveFrame(RootlessFrameID wid, ScreenPtr pScreen, int iNewX,
     /* Store the origin, height, and width in a rectangle structure */
     SetRect(&rcNew, iX, iY, iX + iWidth, iY + iHeight);
 
-#ifdef CYGMULTIWINDOW_DEBUG
     winDebug("\tWindow {%d, %d, %d, %d}, {%d, %d}\n",
              rcNew.left, rcNew.top, rcNew.right, rcNew.bottom,
              rcNew.right - rcNew.left, rcNew.bottom - rcNew.top);
-#endif
     /*
      * Calculate the required size of the Windows window rectangle,
      * given the size of the Windows window client area.
      */
     AdjustWindowRectEx(&rcNew, dwStyle, FALSE, dwExStyle);
 
-#ifdef CYGMULTIWINDOW_DEBUG
     winDebug("\tAdjusted {%d, %d, %d, %d}, {%d, %d}\n",
              rcNew.left, rcNew.top, rcNew.right, rcNew.bottom,
              rcNew.right - rcNew.left, rcNew.bottom - rcNew.top);
-#endif
     g_fNoConfigureWindow = TRUE;
     SetWindowPos(pRLWinPriv->hWnd, NULL, rcNew.left, rcNew.top, 0, 0,
                  SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOZORDER);
     g_fNoConfigureWindow = FALSE;
-#if CYGMULTIWINDOW_DEBUG
     winDebug("winMWExtWMMoveFrame (%08x) done\n", (int) pRLWinPriv);
-#endif
 }
 
 void
@@ -473,10 +411,8 @@ winMWExtWMResizeFrame(RootlessFrameID wid, ScreenPtr pScreen,
     DWORD dwStyle;
     int iX, iY;
 
-#if CYGMULTIWINDOW_DEBUG
     winDebug("winMWExtWMResizeFrame (%08x) (%d %d)-(%d %d)\n",
              (int) pRLWinPriv, iNewX, iNewY, uiNewWidth, uiNewHeight);
-#endif
 
     pRLWinPriv->fResized = TRUE;
 
@@ -525,9 +461,8 @@ winMWExtWMRestackFrame(RootlessFrameID wid, RootlessFrameID nextWid)
     Bool fFirst = TRUE;
     Bool fNeedRestack = TRUE;
 
-#if CYGMULTIWINDOW_DEBUG
     winDebug("winMWExtWMRestackFrame (%08x)\n", (int) pRLWinPriv);
-#endif
+
 
     if (pScreenPriv && pScreenPriv->fRestacking)
         return;
@@ -542,18 +477,16 @@ winMWExtWMRestackFrame(RootlessFrameID wid, RootlessFrameID nextWid)
         ShowWindow(pRLWinPriv->hWnd, SW_SHOWNOACTIVATE);
 
     if (pRLNextWinPriv == NULL) {
-#if CYGMULTIWINDOW_DEBUG
         winDebug("Win %08x is top\n", pRLWinPriv);
-#endif
         pScreenPriv->widTop = wid;
         SetWindowPos(pRLWinPriv->hWnd, HWND_TOP,
                      0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
     }
-    else if (winIsInternalWMRunning(pScreenInfo)) {
-        /* using mulwinidow wm */
-#if CYGMULTIWINDOW_DEBUG
+#ifdef XWIN_MULTIWINDOWINTWM
+  else if (winIsInternalWMRunning(pScreenInfo)) {
+      /* using mulwinidow wm */
         winDebug("Win %08x is not top\n", pRLWinPriv);
-#endif
+
         for (hWnd = GetNextWindow(pRLWinPriv->hWnd, GW_HWNDPREV);
              fNeedRestack && hWnd != NULL;
              hWnd = GetNextWindow(hWnd, GW_HWNDPREV)) {
@@ -564,18 +497,14 @@ winMWExtWMRestackFrame(RootlessFrameID wid, RootlessFrameID nextWid)
                 if (hWnd == pRLNextWinPriv->hWnd) {
                     /* Enable interleave X window and Windows window */
                     if (!fFirst) {
-#if CYGMULTIWINDOW_DEBUG
                         winDebug("raise: Insert after Win %08x\n",
                                  pRLNextWinPriv);
-#endif
                         SetWindowPos(pRLWinPriv->hWnd, pRLNextWinPriv->hWnd,
                                      0, 0, 0, 0,
                                      SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
                     }
                     else {
-#if CYGMULTIWINDOW_DEBUG
                         winDebug("No change\n");
-#endif
                     }
                     fNeedRestack = FALSE;
                     break;
@@ -593,9 +522,8 @@ winMWExtWMRestackFrame(RootlessFrameID wid, RootlessFrameID nextWid)
             if ((dwWindowProcessID == dwCurrentProcessID)
                 && GetProp(hWnd, WIN_WINDOW_PROP)) {
                 if (hWnd == pRLNextWinPriv->hWnd) {
-#if CYGMULTIWINDOW_DEBUG
                     winDebug("lower: Insert after Win %08x\n", pRLNextWinPriv);
-#endif
+
                     SetWindowPos(pRLWinPriv->hWnd, pRLNextWinPriv->hWnd,
                                  0, 0, 0, 0,
                                  SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
@@ -605,15 +533,14 @@ winMWExtWMRestackFrame(RootlessFrameID wid, RootlessFrameID nextWid)
             }
         }
     }
+#endif
     else {
         /* using general wm like twm, wmaker etc.
            Interleave X window and Windows window will cause problem. */
         SetWindowPos(pRLWinPriv->hWnd, pRLNextWinPriv->hWnd,
                      0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
     }
-#if CYGMULTIWINDOW_DEBUG
     winDebug("winMWExtWMRestackFrame - done (%08x)\n", (int) pRLWinPriv);
-#endif
 
     pRLWinPriv->fRestackingNow = FALSE;
 }
@@ -625,9 +552,7 @@ winMWExtWMReshapeFrame(RootlessFrameID wid, RegionPtr pShape)
     HRGN hRgn, hRgnWindow, hRgnClient;
     RECT rcWindow, rcClient;
 
-#if CYGMULTIWINDOW_DEBUG
     winDebug("winMWExtWMReshapeFrame (%08x)\n", (int) pRLWinPriv);
-#endif
 
     hRgn = winMWExtWMCreateRgnFromRegion(pShape);
 
@@ -654,9 +579,7 @@ winMWExtWMUnmapFrame(RootlessFrameID wid)
 {
     win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) wid;
 
-#if CYGMULTIWINDOW_DEBUG
     winDebug("winMWExtWMUnmapFrame (%08x)\n", (int) pRLWinPriv);
-#endif
 
     g_fNoConfigureWindow = TRUE;
     //ShowWindow (pRLWinPriv->hWnd, SW_MINIMIZE);
@@ -679,10 +602,8 @@ winMWExtWMStartDrawing(RootlessFrameID wid, char **pixelData, int *bytesPerRow)
     HDC hdcNew;
     HBITMAP hbmpNew;
 
-#if CYGMULTIWINDOW_DEBUG
     winDebug("winMWExtWMStartDrawing (%08x) %08x\n", (int) pRLWinPriv,
              pRLWinPriv->fDestroyed);
-#endif
 
     if (!pRLWinPriv->fDestroyed) {
         pScreen = pRLWinPriv->pFrame->win->drawable.pScreen;
@@ -691,12 +612,11 @@ winMWExtWMStartDrawing(RootlessFrameID wid, char **pixelData, int *bytesPerRow)
         if (pScreenPriv)
             pScreenInfo = pScreenPriv->pScreenInfo;
 
-#if CYGMULTIWINDOW_DEBUG
         winDebug("\tpScreenPriv %08X\n", (int) pScreenPriv);
         winDebug("\tpScreenInfo %08X\n", (int) pScreenInfo);
         winDebug("\t(%d, %d)\n", (int) pRLWinPriv->pFrame->width,
                  (int) pRLWinPriv->pFrame->height);
-#endif
+
         if (pRLWinPriv->hdcScreen == NULL) {
             InitWin32RootlessEngine(pRLWinPriv);
         }
@@ -731,15 +651,12 @@ winMWExtWMStartDrawing(RootlessFrameID wid, char **pixelData, int *bytesPerRow)
                 //return FALSE;
             }
             else {
-#if CYGMULTIWINDOW_DEBUG
                 winDebug("winMWExtWMStartDrawing - Shadow buffer allocated\n");
-#endif
             }
 
             /* Get information about the bitmap that was allocated */
             GetObject(hbmpNew, sizeof(dibsection), &dibsection);
 
-#if CYGMULTIWINDOW_DEBUG
             /* Print information about bitmap allocated */
             winDebug("winMWExtWMStartDrawing - Dibsection width: %d height: %d "
                      "depth: %d size image: %d\n",
@@ -747,14 +664,11 @@ winMWExtWMStartDrawing(RootlessFrameID wid, char **pixelData, int *bytesPerRow)
                      (unsigned int) dibsection.dsBmih.biHeight,
                      (unsigned int) dibsection.dsBmih.biBitCount,
                      (unsigned int) dibsection.dsBmih.biSizeImage);
-#endif
 
             /* Select the shadow bitmap into the shadow DC */
             SelectObject(hdcNew, hbmpNew);
 
-#if CYGMULTIWINDOW_DEBUG
             winDebug("winMWExtWMStartDrawing - Attempting a shadow blit\n");
-#endif
 
             /* Blit from the old shadow to the new shadow */
             fReturn = BitBlt(hdcNew,
@@ -763,9 +677,7 @@ winMWExtWMStartDrawing(RootlessFrameID wid, char **pixelData, int *bytesPerRow)
                              pRLWinPriv->pFrame->height, pRLWinPriv->hdcShadow,
                              0, 0, SRCCOPY);
             if (fReturn) {
-#if CYGMULTIWINDOW_DEBUG
                 winDebug("winMWExtWMStartDrawing - Shadow blit success\n");
-#endif
             }
             else {
                 ErrorF("winMWExtWMStartDrawing - Shadow blit failure\n");
@@ -784,10 +696,8 @@ winMWExtWMStartDrawing(RootlessFrameID wid, char **pixelData, int *bytesPerRow)
 
             pRLWinPriv->dwWidthBytes = dibsection.dsBm.bmWidthBytes;
 
-#if CYGMULTIWINDOW_DEBUG
             winDebug("winMWExtWMStartDrawing - bytesPerRow: %d\n",
                      (unsigned int) dibsection.dsBm.bmWidthBytes);
-#endif
 
             /* Free the old shadow bitmap */
             DeleteObject(pRLWinPriv->hdcShadow);
@@ -797,22 +707,18 @@ winMWExtWMStartDrawing(RootlessFrameID wid, char **pixelData, int *bytesPerRow)
             pRLWinPriv->hbmpShadow = hbmpNew;
 
             pRLWinPriv->fResized = FALSE;
-#if CYGMULTIWINDOW_DEBUG && FALSE
             winDebug("winMWExtWMStartDrawing - 0x%08x %d\n",
                      (unsigned int) pRLWinPriv->pfb,
                      (unsigned int) dibsection.dsBm.bmWidthBytes);
-#endif
         }
     }
     else {
         ErrorF("winMWExtWMStartDrawing - Already window was destroyed \n");
     }
-#if CYGMULTIWINDOW_DEBUG
     winDebug("winMWExtWMStartDrawing - done (0x%08x) 0x%08x %d\n",
              (int) pRLWinPriv,
              (unsigned int) pRLWinPriv->pfb,
              (unsigned int) pRLWinPriv->dwWidthBytes);
-#endif
     *pixelData = pRLWinPriv->pfb;
     *bytesPerRow = pRLWinPriv->dwWidthBytes;
 }
@@ -820,31 +726,6 @@ winMWExtWMStartDrawing(RootlessFrameID wid, char **pixelData, int *bytesPerRow)
 void
 winMWExtWMStopDrawing(RootlessFrameID wid, Bool fFlush)
 {
-#if 0
-    win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) wid;
-    BLENDFUNCTION bfBlend;
-    SIZE szWin;
-    POINT ptSrc;
-
-#if CYGMULTIWINDOW_DEBUG || TRUE
-    winDebug("winMWExtWMStopDrawing (%08x)\n", pRLWinPriv);
-#endif
-    szWin.cx = pRLWinPriv->dwWidth;
-    szWin.cy = pRLWinPriv->dwHeight;
-    ptSrc.x = 0;
-    ptSrc.y = 0;
-    bfBlend.BlendOp = AC_SRC_OVER;
-    bfBlend.BlendFlags = 0;
-    bfBlend.SourceConstantAlpha = 255;
-    bfBlend.AlphaFormat = AC_SRC_ALPHA;
-
-    if (!UpdateLayeredWindow(pRLWinPriv->hWnd,
-                             NULL, NULL, &szWin,
-                             pRLWinPriv->hdcShadow, &ptSrc,
-                             0, &bfBlend, ULW_ALPHA)) {
-        ErrorF("winMWExtWMStopDrawing - UpdateLayeredWindow failed\n");
-    }
-#endif
 }
 
 void
@@ -852,44 +733,6 @@ winMWExtWMUpdateRegion(RootlessFrameID wid, RegionPtr pDamage)
 {
     win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) wid;
 
-#if 0
-    BLENDFUNCTION bfBlend;
-    SIZE szWin;
-    POINT ptSrc;
-#endif
-#if CYGMULTIWINDOW_DEBUG && 0
-    winDebug("winMWExtWMUpdateRegion (%08x)\n", pRLWinPriv);
-#endif
-#if 0
-    szWin.cx = pRLWinPriv->dwWidth;
-    szWin.cy = pRLWinPriv->dwHeight;
-    ptSrc.x = 0;
-    ptSrc.y = 0;
-    bfBlend.BlendOp = AC_SRC_OVER;
-    bfBlend.BlendFlags = 0;
-    bfBlend.SourceConstantAlpha = 255;
-    bfBlend.AlphaFormat = AC_SRC_ALPHA;
-
-    if (!UpdateLayeredWindow(pRLWinPriv->hWnd,
-                             NULL, NULL, &szWin,
-                             pRLWinPriv->hdcShadow, &ptSrc,
-                             0, &bfBlend, ULW_ALPHA)) {
-        LPVOID lpMsgBuf;
-
-        /* Display a fancy error message */
-        FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
-                      FORMAT_MESSAGE_FROM_SYSTEM |
-                      FORMAT_MESSAGE_IGNORE_INSERTS,
-                      NULL,
-                      GetLastError(),
-                      MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-                      (LPTSTR) &lpMsgBuf, 0, NULL);
-
-        ErrorF("winMWExtWMUpdateRegion - UpdateLayeredWindow failed: %s\n",
-               (LPSTR) lpMsgBuf);
-        LocalFree(lpMsgBuf);
-    }
-#endif
     if (!g_fNoConfigureWindow)
         UpdateWindow(pRLWinPriv->hWnd);
 }
@@ -901,10 +744,8 @@ winMWExtWMDamageRects(RootlessFrameID wid, int nCount, const BoxRec * pRects,
     win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) wid;
     const BoxRec *pEnd;
 
-#if CYGMULTIWINDOW_DEBUG && 0
     winDebug("winMWExtWMDamageRects (%08x, %d, %08x, %d, %d)\n",
              pRLWinPriv, nCount, pRects, shift_x, shift_y);
-#endif
 
     for (pEnd = pRects + nCount; pRects < pEnd; pRects++) {
         RECT rcDmg;
@@ -923,10 +764,8 @@ winMWExtWMRootlessSwitchWindow(RootlessWindowPtr pFrame, WindowPtr oldWin)
 {
     win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) pFrame->wid;
 
-#if CYGMULTIWINDOW_DEBUG
     winDebug("winMWExtWMRootlessSwitchWindow (%08x) %08x\n",
              (int) pRLWinPriv, (int) pRLWinPriv->hWnd);
-#endif
     pRLWinPriv->pFrame = pFrame;
     pRLWinPriv->fResized = TRUE;
 
@@ -938,26 +777,6 @@ winMWExtWMRootlessSwitchWindow(RootlessWindowPtr pFrame, WindowPtr oldWin)
 
     DeleteProperty(serverClient, oldWin, AtmWindowsWmNativeHwnd());
     winMWExtWMSetNativeProperty(pFrame);
-#if CYGMULTIWINDOW_DEBUG
-#if 0
-    {
-        WindowPtr pWin2 = NULL;
-        win32RootlessWindowPtr pRLWinPriv2 = NULL;
-
-        /* Check if the Windows window property for our X window pointer is valid */
-        if ((pWin2 =
-             (WindowPtr) GetProp(pRLWinPriv->hWnd, WIN_WINDOW_PROP)) != NULL) {
-            pRLWinPriv2 =
-                (win32RootlessWindowPtr) RootlessFrameForWindow(pWin2, FALSE);
-        }
-        winDebug("winMWExtWMSwitchFrame2 (%08x) %08x\n",
-                 pRLWinPriv2, pRLWinPriv2->hWnd);
-        if (pRLWinPriv != pRLWinPriv2 || pRLWinPriv->hWnd != pRLWinPriv2->hWnd) {
-            winDebug("Error param missmatch\n");
-        }
-    }
-#endif
-#endif
 }
 
 void
@@ -965,9 +784,7 @@ winMWExtWMCopyBytes(unsigned int width, unsigned int height,
                     const void *src, unsigned int srcRowBytes,
                     void *dst, unsigned int dstRowBytes)
 {
-#if CYGMULTIWINDOW_DEBUG
     winDebug("winMWExtWMCopyBytes - Not implemented\n");
-#endif
 }
 
 void
@@ -978,19 +795,15 @@ winMWExtWMCopyWindow(RootlessFrameID wid, int nDstRects,
     const BoxRec *pEnd;
     RECT rcDmg;
 
-#if CYGMULTIWINDOW_DEBUG
     winDebug("winMWExtWMCopyWindow (%08x, %d, %08x, %d, %d)\n",
              (int) pRLWinPriv, nDstRects, (int) pDstRects, nDx, nDy);
-#endif
 
     for (pEnd = pDstRects + nDstRects; pDstRects < pEnd; pDstRects++) {
-#if CYGMULTIWINDOW_DEBUG
         winDebug("BitBlt (%d, %d, %d, %d) (%d, %d)\n",
                  pDstRects->x1, pDstRects->y1,
                  pDstRects->x2 - pDstRects->x1,
                  pDstRects->y2 - pDstRects->y1,
                  pDstRects->x1 + nDx, pDstRects->y1 + nDy);
-#endif
 
         if (!BitBlt(pRLWinPriv->hdcShadow,
                     pDstRects->x1, pDstRects->y1,
@@ -1008,9 +821,7 @@ winMWExtWMCopyWindow(RootlessFrameID wid, int nDstRects,
 
         InvalidateRect(pRLWinPriv->hWnd, &rcDmg, FALSE);
     }
-#if CYGMULTIWINDOW_DEBUG
     winDebug("winMWExtWMCopyWindow - done\n");
-#endif
 }
 
 /*
diff --git a/xorg-server/hw/xwin/winwin32rootlesswindow.c b/xorg-server/hw/xwin/winwin32rootlesswindow.c
index f2d68cb46..e76da2dd9 100644
--- a/xorg-server/hw/xwin/winwin32rootlesswindow.c
+++ b/xorg-server/hw/xwin/winwin32rootlesswindow.c
@@ -195,22 +195,17 @@ winMWExtWMUpdateWindowDecoration(win32RootlessWindowPtr pRLWinPriv,
     /* Get current window placement */
     GetWindowPlacement(pRLWinPriv->hWnd, &wndPlace);
 
+#ifdef XWIN_MULTIWINDOWINTWM
     if (winIsInternalWMRunning(pScreenInfo)) {
         if (!pRLWinPriv->pFrame->win->overrideRedirect)
             fDecorate = TRUE;
     }
-#if 0
-    if (wndPlace.showCmd == SW_HIDE)
-        return;                 //showCmd = SWP_HIDEWINDOW;
-    else
-        showCmd = SWP_SHOWWINDOW;
-#else
+#endif
     if (wndPlace.showCmd == SW_HIDE)
         return;
 
     if (IsWindowVisible(pRLWinPriv->hWnd))
         showCmd = SWP_SHOWWINDOW;
-#endif
 
     showCmd |= SWP_NOMOVE | SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOZORDER;
 
@@ -346,6 +341,7 @@ winMWExtWMUpdateWindowDecoration(win32RootlessWindowPtr pRLWinPriv,
     }
 }
 
+#ifdef XWIN_MULTIWINDOWINTWM
 /*
  * winIsInternalWMRunning (winScreenInfoPtr pScreenInfo)
  */
@@ -354,7 +350,7 @@ winIsInternalWMRunning(winScreenInfoPtr pScreenInfo)
 {
     return pScreenInfo->fInternalWM && !pScreenInfo->fAnotherWMRunning;
 }
-
+#endif
 /*
  * winMWExtWMRestackWindows
  */
diff --git a/xorg-server/hw/xwin/winwin32rootlesswndproc.c b/xorg-server/hw/xwin/winwin32rootlesswndproc.c
index 13df18677..13a9cd645 100644
--- a/xorg-server/hw/xwin/winwin32rootlesswndproc.c
+++ b/xorg-server/hw/xwin/winwin32rootlesswndproc.c
@@ -413,7 +413,6 @@ winMWExtWMWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
         wmMsg.iHeight = pRLWinPriv->pFrame->height;
 
         fWMMsgInitialized = TRUE;
-#if CYGDEBUG
         winDebugWin32Message("winMWExtWMWindowProc", hwnd, message, wParam,
                              lParam);
 
@@ -423,7 +422,6 @@ winMWExtWMWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
         winDebug("\thwndScreen %08X\n", hwndScreen);
         winDebug("winMWExtWMWindowProc (%08x) %08x %08x %08x\n",
                  pRLWinPriv, message, wParam, lParam);
-#endif
     }
     /* Branch on message type */
     switch (message) {
@@ -438,20 +436,21 @@ winMWExtWMWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
         return 0;
 
     case WM_CLOSE:
-#if CYGMULTIWINDOW_DEBUG
         winDebug("winMWExtWMWindowProc - WM_CLOSE %d\n", pRLWinPriv->fClose);
-#endif
+
         /* Tell window-manager to close window */
         if (pRLWinPriv->fClose) {
             DestroyWindow(hwnd);
         }
         else {
             if (winIsInternalWMRunning(pScreenInfo)) {
+#ifdef XWIN_MULTIWINDOWINTWM
                 /* Tell our Window Manager thread to kill the window */
                 wmMsg.msg = WM_WM_KILL;
                 if (fWMMsgInitialized)
                     winSendMessageToWM(pScreenPriv->pWMInfo, &wmMsg);
             }
+#endif
             winWindowsWMSendEvent(WindowsWMControllerNotify,
                                   WindowsWMControllerNotifyMask,
                                   1,
@@ -668,22 +667,23 @@ winMWExtWMWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
         return 0;
 
     case WM_MOUSEACTIVATE:
-#if CYGMULTIWINDOW_DEBUG
         winDebug("winMWExtWMWindowProc - WM_MOUSEACTIVATE\n");
-#endif
-#if 1
+
+#ifdef XWIN_MULTIWINDOWINTWM
         /* Check if this window needs to be made active when clicked */
         if (winIsInternalWMRunning(pScreenInfo) && pWin->overrideRedirect) {
-#if CYGMULTIWINDOW_DEBUG
             winDebug("winMWExtWMWindowProc - WM_MOUSEACTIVATE - "
                      "MA_NOACTIVATE\n");
-#endif
 
             /* */
             return MA_NOACTIVATE;
         }
 #endif
-        if (!winIsInternalWMRunning(pScreenInfo) && !IsMouseActive(pWin))
+        if (
+#ifdef XWIN_MULTIWINDOWINTWM
+            !winIsInternalWMRunning(pScreenInfo) &&
+#endif
+            !IsMouseActive (pWin))
             return MA_NOACTIVATE;
 
         break;
@@ -749,9 +749,7 @@ winMWExtWMWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
         return 0;
 
     case WM_ERASEBKGND:
-#if CYGDEBUG
         winDebug("winMWExtWMWindowProc - WM_ERASEBKGND\n");
-#endif
         /*
          * Pretend that we did erase the background but we don't care,
          * since we repaint the entire region anyhow
@@ -792,11 +790,10 @@ winMWExtWMWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
         break;
 
     case WM_ACTIVATE:
-#if CYGMULTIWINDOW_DEBUG
         winDebug("winMWExtWMWindowProc - WM_ACTIVATE\n");
-#endif
         if (LOWORD(wParam) != WA_INACTIVE) {
             if (winIsInternalWMRunning(pScreenInfo)) {
+#ifdef XWIN_MULTIWINDOWINTWM
 #if 0
                 /* Raise the window to the top in Z order */
                 wmMsg.msg = WM_WM_RAISE;
@@ -809,6 +806,7 @@ winMWExtWMWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
                     if (!pWin || !pWin->overrideRedirect)       /* for OOo menus */
                         winSendMessageToWM(pScreenPriv->pWMInfo, &wmMsg);
             }
+#endif
             winWindowsWMSendEvent(WindowsWMControllerNotify,
                                   WindowsWMControllerNotifyMask,
                                   1,
@@ -822,26 +820,24 @@ winMWExtWMWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
         pWinPos = (LPWINDOWPOS) lParam;
         if (!(pWinPos->flags & SWP_NOZORDER)) {
             if (pRLWinPriv->fRestackingNow || pScreenPriv->fRestacking) {
-#if CYGMULTIWINDOW_DEBUG
                 winDebug("Win %08x is now restacking.\n",
                          (unsigned int) pRLWinPriv);
-#endif
                 break;
             }
 
-            if (winIsInternalWMRunning(pScreenInfo) || IsRaiseOnClick(pWin)) {
-#if CYGMULTIWINDOW_DEBUG
+            if (
+#ifdef XWIN_MULTIWINDOWINTWM
+                winIsInternalWMRunning(pScreenInfo) ||
+#endif
+                IsRaiseOnClick (pWin))
                 winDebug("Win %08x has WINDOWSWM_RAISE_ON_CLICK.\n",
                          (unsigned int) pRLWinPriv);
-#endif
                 break;
             }
 
-#if CYGMULTIWINDOW_DEBUG
             winDebug("Win %08x forbid to change z order (%08x).\n",
                      (unsigned int) pRLWinPriv,
                      (unsigned int) pWinPos->hwndInsertAfter);
-#endif
             pWinPos->flags |= SWP_NOZORDER;
         }
         break;
@@ -876,14 +872,13 @@ winMWExtWMWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
         }
 #endif
 
-#if CYGMULTIWINDOW_DEBUG
         winDebug("\t(%d, %d)\n", (short) LOWORD(lParam),
                  (short) HIWORD(lParam));
-#endif
         if (!pRLWinPriv->fMovingOrSizing) {
+#ifdef XWIN_MULTIWINDOWINTWM
             if (winIsInternalWMRunning(pScreenInfo))
                 winAdjustXWindow(pWin, hwnd);
-
+#endif
             winMWExtWMMoveXWindow(pWin, (LOWORD(lParam) - wBorderWidth(pWin)
                                          - GetSystemMetrics(SM_XVIRTUALSCREEN)),
                                   (HIWORD(lParam) - wBorderWidth(pWin)
@@ -892,23 +887,22 @@ winMWExtWMWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
         return 0;
 
     case WM_SHOWWINDOW:
-#if CYGMULTIWINDOW_DEBUG || TRUE
         winDebug("winMWExtWMWindowProc - WM_SHOWWINDOW - %d ms\n",
                  (unsigned int) GetTickCount());
-#endif
+
         /* Bail out if the window is being hidden */
         if (!wParam)
             return 0;
 
+#ifdef XWIN_MULTIWINDOWINTWM
         if (!pScreenInfo->fInternalWM)  //XXXX
             return 0;
 
         winMWExtWMUpdateWindowDecoration(pRLWinPriv, pScreenInfo);
 
         if (winIsInternalWMRunning(pScreenInfo)) {
-#if CYGMULTIWINDOW_DEBUG || TRUE
             winDebug("\tMapWindow\n");
-#endif
+
             /* Tell X to map the window */
             MapWindow(pWin, wClient(pWin));
 
@@ -925,6 +919,9 @@ winMWExtWMWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
             if (fWMMsgInitialized)
                 winSendMessageToWM(pScreenPriv->pWMInfo, &wmMsg);
         }
+#else
+      return 0;
+#endif
         break;
 
     case WM_SIZING:
@@ -935,7 +932,7 @@ winMWExtWMWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
     case WM_WINDOWPOSCHANGED:
     {
         pWinPos = (LPWINDOWPOS) lParam;
-#if CYGMULTIWINDOW_DEBUG
+#ifdef _DEBUG
         winDebug("winMWExtWMWindowProc - WM_WINDOWPOSCHANGED\n");
         winDebug("\tflags: %s%s%s%s%s%s%s%s%s%s%s%s\n",
                  (pWinPos->flags & SWP_DRAWFRAME) ? "SWP_DRAWFRAME " : "",
@@ -960,20 +957,19 @@ winMWExtWMWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
         if (pWinPos->flags & SWP_HIDEWINDOW)
             break;
 
+#ifdef XWIN_MULTIWINDOWINTWM
         /* Reorder if window z order was changed */
         if ((pScreenPriv != NULL)
             && !(pWinPos->flags & SWP_NOZORDER)
             && !(pWinPos->flags & SWP_SHOWWINDOW)
             && winIsInternalWMRunning(pScreenInfo)) {
-#if CYGMULTIWINDOW_DEBUG
             winDebug("\twindow z order was changed\n");
-#endif
+
             if (pWinPos->hwndInsertAfter == HWND_TOP
                 || pWinPos->hwndInsertAfter == HWND_TOPMOST
                 || pWinPos->hwndInsertAfter == HWND_NOTOPMOST) {
-#if CYGMULTIWINDOW_DEBUG
                 winDebug("\traise to top\n");
-#endif
+
                 /* Raise the window to the top in Z order */
                 wmMsg.msg = WM_WM_RAISE;
                 if (fWMMsgInitialized)
@@ -1003,9 +999,8 @@ winMWExtWMWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
                 /* If this is top of X windows in Windows stack,
                    raise it in X stack. */
                 if (hWndAbove == NULL) {
-#if CYGMULTIWINDOW_DEBUG
                     winDebug("\traise to top\n");
-#endif
+
                     /* Raise the window to the top in Z order */
                     wmMsg.msg = WM_WM_RAISE;
                     if (fWMMsgInitialized)
@@ -1014,18 +1009,19 @@ winMWExtWMWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
             }
 #endif
         }
+#endif
 
         if (!(pWinPos->flags & SWP_NOSIZE)) {
             if (IsIconic(hwnd)) {
-#if CYGMULTIWINDOW_DEBUG
                 winDebug("\tIconic -> MINIMIZED\n");
-#endif
+#ifdef XWIN_MULTIWINDOWINTWM
                 if (winIsInternalWMRunning(pScreenInfo)) {
                     /* Raise the window to the top in Z order */
                     wmMsg.msg = WM_WM_LOWER;
                     if (fWMMsgInitialized)
                         winSendMessageToWM(pScreenPriv->pWMInfo, &wmMsg);
                 }
+#endif
                 winWindowsWMSendEvent(WindowsWMControllerNotify,
                                       WindowsWMControllerNotifyMask,
                                       1,
@@ -1033,9 +1029,8 @@ winMWExtWMWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
                                       pWin->drawable.id, 0, 0, 0, 0);
             }
             else if (IsZoomed(hwnd)) {
-#if CYGMULTIWINDOW_DEBUG
                 winDebug("\tZoomed -> MAXIMIZED\n");
-#endif
+
                 winWindowsWMSendEvent(WindowsWMControllerNotify,
                                       WindowsWMControllerNotifyMask,
                                       1,
@@ -1043,9 +1038,8 @@ winMWExtWMWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
                                       pWin->drawable.id, 0, 0, 0, 0);
             }
             else {
-#if CYGMULTIWINDOW_DEBUG
                 winDebug("\tnone -> RESTORED\n");
-#endif
+
                 winWindowsWMSendEvent(WindowsWMControllerNotify,
                                       WindowsWMControllerNotifyMask,
                                       1,
@@ -1062,12 +1056,12 @@ winMWExtWMWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 
                 if (!(pWinPos->flags & SWP_NOMOVE)
                     && !(pWinPos->flags & SWP_NOSIZE)) {
-#if CYGMULTIWINDOW_DEBUG
                     winDebug("\tmove & resize\n");
-#endif
+
+#ifdef XWIN_MULTIWINDOWINTWM
                     if (winIsInternalWMRunning(pScreenInfo))
                         winAdjustXWindow(pWin, hwnd);
-
+#endif
                     winMWExtWMMoveResizeXWindow(pWin,
                                                 rcClient.left -
                                                 wBorderWidth(pWin)
@@ -1085,12 +1079,11 @@ winMWExtWMWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
                                                 wBorderWidth(pWin) * 2);
                 }
                 else if (!(pWinPos->flags & SWP_NOMOVE)) {
-#if CYGMULTIWINDOW_DEBUG
                     winDebug("\tmove\n");
-#endif
+#ifdef XWIN_MULTIWINDOWINTWM
                     if (winIsInternalWMRunning(pScreenInfo))
                         winAdjustXWindow(pWin, hwnd);
-
+#endif
                     winMWExtWMMoveResizeXWindow(pWin,
                                                 rcClient.left -
                                                 wBorderWidth(pWin)
@@ -1108,12 +1101,12 @@ winMWExtWMWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
                                                 wBorderWidth(pWin) * 2);
                 }
                 else if (!(pWinPos->flags & SWP_NOMOVE)) {
-#if CYGMULTIWINDOW_DEBUG
                     winDebug("\tmove\n");
-#endif
+
+#ifdef XWIN_MULTIWINDOWINTWM
                     if (winIsInternalWMRunning(pScreenInfo))
                         winAdjustXWindow(pWin, hwnd);
-
+#endif
                     winMWExtWMMoveXWindow(pWin,
                                           rcClient.left - wBorderWidth(pWin)
                                           - GetSystemMetrics(SM_XVIRTUALSCREEN),
@@ -1122,12 +1115,11 @@ winMWExtWMWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
                                           GetSystemMetrics(SM_YVIRTUALSCREEN));
                 }
                 else if (!(pWinPos->flags & SWP_NOSIZE)) {
-#if CYGMULTIWINDOW_DEBUG
                     winDebug("\tresize\n");
-#endif
+#ifdef XWIN_MULTIWINDOWINTWM
                     if (winIsInternalWMRunning(pScreenInfo))
                         winAdjustXWindow(pWin, hwnd);
-
+#endif
                     winMWExtWMResizeXWindow(pWin,
                                             rcClient.right - rcClient.left
                                             - wBorderWidth(pWin) * 2,
@@ -1137,37 +1129,34 @@ winMWExtWMWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
             }
         }
     }
-#if CYGMULTIWINDOW_DEBUG
         winDebug("winMWExtWMWindowProc - WM_WINDOWPOSCHANGED - done.\n");
-#endif
+
         return 0;
 
     case WM_SIZE:
         /* see dix/window.c */
         /* FIXME: Maximize/Restore? */
-#if CYGMULTIWINDOW_DEBUG
         winDebug("winMWExtWMWindowProc - WM_SIZE - %d ms\n",
                  (unsigned int) GetTickCount());
-#endif
-#if CYGMULTIWINDOW_DEBUG
+
         winDebug("\t(%d, %d) %d\n", (short) LOWORD(lParam),
                  (short) HIWORD(lParam), g_fNoConfigureWindow);
-#endif
         if (g_fNoConfigureWindow)
             break;
 
         /* Branch on type of resizing occurring */
         switch (wParam) {
         case SIZE_MINIMIZED:
-#if CYGMULTIWINDOW_DEBUG
             winDebug("\tSIZE_MINIMIZED\n");
-#endif
+
+#ifdef XWIN_MULTIWINDOWINTWM
             if (winIsInternalWMRunning(pScreenInfo)) {
                 /* Raise the window to the top in Z order */
                 wmMsg.msg = WM_WM_LOWER;
                 if (fWMMsgInitialized)
                     winSendMessageToWM(pScreenPriv->pWMInfo, &wmMsg);
             }
+#endif
             winWindowsWMSendEvent(WindowsWMControllerNotify,
                                   WindowsWMControllerNotifyMask,
                                   1,
@@ -1177,9 +1166,8 @@ winMWExtWMWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
             break;
 
         case SIZE_RESTORED:
-#if CYGMULTIWINDOW_DEBUG
             winDebug("\tSIZE_RESTORED\n");
-#endif
+
             winWindowsWMSendEvent(WindowsWMControllerNotify,
                                   WindowsWMControllerNotifyMask,
                                   1,
@@ -1203,9 +1191,10 @@ winMWExtWMWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 
         /* Perform the resize and notify the X client */
         if (!pRLWinPriv->fMovingOrSizing) {
+#ifdef XWIN_MULTIWINDOWINTWM
             if (winIsInternalWMRunning(pScreenInfo))
                 winAdjustXWindow(pWin, hwnd);
-
+#endif
             winMWExtWMResizeXWindow(pWin, (short) LOWORD(lParam)
                                     - wBorderWidth(pWin) * 2,
                                     (short) HIWORD(lParam)
@@ -1220,9 +1209,11 @@ winMWExtWMWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 #endif
         if (wParam) {
             if (winIsInternalWMRunning(pScreenInfo)) {
+#ifdef XWIN_MULTIWINDOWINTWM
             }
             else {
             }
+#endif
             winWindowsWMSendEvent(WindowsWMActivationNotify,
                                   WindowsWMActivationNotifyMask,
                                   1,
@@ -1247,26 +1238,26 @@ winMWExtWMWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
         break;
 
     case WM_ENTERSIZEMOVE:
-#if CYGMULTIWINDOW_DEBUG
         winDebug("winMWExtWMWindowProc - WM_ENTERSIZEMOVE - %d ms\n",
                  (unsigned int) GetTickCount());
-#endif
+
         pRLWinPriv->fMovingOrSizing = TRUE;
         break;
 
     case WM_EXITSIZEMOVE:
-#if CYGMULTIWINDOW_DEBUG
         winDebug("winMWExtWMWindowProc - WM_EXITSIZEMOVE - %d ms\n",
                  (unsigned int) GetTickCount());
-#endif
+
         pRLWinPriv->fMovingOrSizing = FALSE;
 
         GetClientRect(hwnd, &rcClient);
 
         MapWindowPoints(hwnd, HWND_DESKTOP, (LPPOINT) &rcClient, 2);
 
+#ifdef XWIN_MULTIWINDOWINTWM
         if (winIsInternalWMRunning(pScreenInfo))
             winAdjustXWindow(pWin, hwnd);
+#endif
 
         winMWExtWMMoveResizeXWindow(pWin, rcClient.left - wBorderWidth(pWin)
                                     - GetSystemMetrics(SM_XVIRTUALSCREEN),
@@ -1279,11 +1270,11 @@ winMWExtWMWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
         break;
 
     case WM_MANAGE:
-        ErrorF("winMWExtWMWindowProc - WM_MANAGE\n");
+        winDebug ("winMWExtWMWindowProc - WM_MANAGE\n");
         break;
 
     case WM_UNMANAGE:
-        ErrorF("winMWExtWMWindowProc - WM_UNMANAGE\n");
+        winDebug ("winMWExtWMWindowProc - WM_UNMANAGE\n");
         break;
 
     default:
diff --git a/xorg-server/hw/xwin/winwindow.c b/xorg-server/hw/xwin/winwindow.c
index ab6d8dec2..1a5bbae4e 100644
--- a/xorg-server/hw/xwin/winwindow.c
+++ b/xorg-server/hw/xwin/winwindow.c
@@ -61,9 +61,7 @@ winCreateWindowNativeGDI(WindowPtr pWin)
 
     winScreenPriv(pScreen);
 
-#if CYGDEBUG
-    winTrace("winCreateWindowNativeGDI (%p)\n", pWin);
-#endif
+    winDebug ("winCreateWindowNativeGDI (%p)\n", pWin);
 
     WIN_UNWRAP(CreateWindow);
     fResult = (*pScreen->CreateWindow) (pWin);
@@ -83,9 +81,7 @@ winDestroyWindowNativeGDI(WindowPtr pWin)
 
     winScreenPriv(pScreen);
 
-#if CYGDEBUG
-    winTrace("winDestroyWindowNativeGDI (%p)\n", pWin);
-#endif
+    winDebug ("winDestroyWindowNativeGDI (%p)\n", pWin);
 
     WIN_UNWRAP(DestroyWindow);
     fResult = (*pScreen->DestroyWindow) (pWin);
@@ -105,9 +101,7 @@ winPositionWindowNativeGDI(WindowPtr pWin, int x, int y)
 
     winScreenPriv(pScreen);
 
-#if CYGDEBUG
-    winTrace("winPositionWindowNativeGDI (%p)\n", pWin);
-#endif
+    winDebug ("winPositionWindowNativeGDI (%p)\n", pWin);
 
     WIN_UNWRAP(PositionWindow);
     fResult = (*pScreen->PositionWindow) (pWin, x, y);
@@ -134,10 +128,6 @@ winCopyWindowNativeGDI(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
 
     winScreenPriv(pScreen);
 
-#if 0
-    ErrorF("winCopyWindow\n");
-#endif
-
     /* Get a pointer to the root window */
     pwinRoot = pWin->drawable.pScreen->root;
 
@@ -175,18 +165,8 @@ winCopyWindowNativeGDI(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
     pBoxDst = RegionRects(prgnDst);
     ppt = pptSrc;
 
-#if 0
-    ErrorF("winCopyWindow - x1\tx2\ty1\ty2\tx\ty\n");
-#endif
-
     /* BitBlt each source to the destination point */
     for (i = nbox; --i >= 0; pBoxDst++, ppt++) {
-#if 0
-        ErrorF("winCopyWindow - %d\t%d\t%d\t%d\t%d\t%d\n",
-               pBoxDst->x1, pBoxDst->x2, pBoxDst->y1, pBoxDst->y2,
-               ppt->x, ppt->y);
-#endif
-
         BitBlt(pScreenPriv->hdcScreen,
                pBoxDst->x1, pBoxDst->y1,
                pBoxDst->x2 - pBoxDst->x1, pBoxDst->y2 - pBoxDst->y1,
@@ -209,9 +189,7 @@ winChangeWindowAttributesNativeGDI(WindowPtr pWin, unsigned long mask)
 
     winScreenPriv(pScreen);
 
-#if CYGDEBUG
-    winTrace("winChangeWindowAttributesNativeGDI (%p)\n", pWin);
-#endif
+  winDebug ("winChangeWindowAttributesNativeGDI (%p)\n", pWin);
 
     WIN_UNWRAP(ChangeWindowAttributes);
     fResult = (*pScreen->ChangeWindowAttributes) (pWin, mask);
@@ -236,9 +214,7 @@ winUnmapWindowNativeGDI(WindowPtr pWin)
 
     winScreenPriv(pScreen);
 
-#if CYGDEBUG
-    winTrace("winUnmapWindowNativeGDI (%p)\n", pWin);
-#endif
+  winDebug ("winUnmapWindowNativeGDI (%p)\n", pWin);
 
     WIN_UNWRAP(UnrealizeWindow);
     fResult = (*pScreen->UnrealizeWindow) (pWin);
@@ -259,9 +235,7 @@ winMapWindowNativeGDI(WindowPtr pWin)
 
     winScreenPriv(pScreen);
 
-#if CYGDEBUG
-    winTrace("winMapWindowNativeGDI (%p)\n", pWin);
-#endif
+  winDebug ("winMapWindowNativeGDI (%p)\n", pWin);
 
     WIN_UNWRAP(RealizeWindow);
     fResult = (*pScreen->RealizeWindow) (pWin);
@@ -284,9 +258,7 @@ winCreateWindowRootless(WindowPtr pWin)
     winWindowPriv(pWin);
     winScreenPriv(pScreen);
 
-#if CYGDEBUG
-    winTrace("winCreateWindowRootless (%p)\n", pWin);
-#endif
+  winDebug ("winCreateWindowRootless (%p)\n", pWin);
 
     WIN_UNWRAP(CreateWindow);
     fResult = (*pScreen->CreateWindow) (pWin);
@@ -309,9 +281,7 @@ winDestroyWindowRootless(WindowPtr pWin)
     winWindowPriv(pWin);
     winScreenPriv(pScreen);
 
-#if CYGDEBUG
-    winTrace("winDestroyWindowRootless (%p)\n", pWin);
-#endif
+  winDebug ("winDestroyWindowRootless (%p)\n", pWin);
 
     WIN_UNWRAP(DestroyWindow);
     fResult = (*pScreen->DestroyWindow) (pWin);
@@ -338,9 +308,7 @@ winPositionWindowRootless(WindowPtr pWin, int x, int y)
 
     winScreenPriv(pScreen);
 
-#if CYGDEBUG
-    winTrace("winPositionWindowRootless (%p)\n", pWin);
-#endif
+    winDebug ("winPositionWindowRootless (%p)\n", pWin);
 
     WIN_UNWRAP(PositionWindow);
     fResult = (*pScreen->PositionWindow) (pWin, x, y);
@@ -362,9 +330,7 @@ winChangeWindowAttributesRootless(WindowPtr pWin, unsigned long mask)
 
     winScreenPriv(pScreen);
 
-#if CYGDEBUG
-    winTrace("winChangeWindowAttributesRootless (%p)\n", pWin);
-#endif
+  winDebug ("winChangeWindowAttributesRootless (%p)\n", pWin);
 
     WIN_UNWRAP(ChangeWindowAttributes);
     fResult = (*pScreen->ChangeWindowAttributes) (pWin, mask);
@@ -388,9 +354,7 @@ winUnmapWindowRootless(WindowPtr pWin)
     winWindowPriv(pWin);
     winScreenPriv(pScreen);
 
-#if CYGDEBUG
-    winTrace("winUnmapWindowRootless (%p)\n", pWin);
-#endif
+  winDebug ("winUnmapWindowRootless (%p)\n", pWin);
 
     WIN_UNWRAP(UnrealizeWindow);
     fResult = (*pScreen->UnrealizeWindow) (pWin);
@@ -418,9 +382,7 @@ winMapWindowRootless(WindowPtr pWin)
 
     winScreenPriv(pScreen);
 
-#if CYGDEBUG
-    winTrace("winMapWindowRootless (%p)\n", pWin);
-#endif
+  winDebug ("winMapWindowRootless (%p)\n", pWin);
 
     WIN_UNWRAP(RealizeWindow);
     fResult = (*pScreen->RealizeWindow) (pWin);
@@ -440,9 +402,7 @@ winSetShapeRootless(WindowPtr pWin, int kind)
 
     winScreenPriv(pScreen);
 
-#if CYGDEBUG
-    winTrace("winSetShapeRootless (%p, %i)\n", pWin, kind);
-#endif
+  winDebug ("winSetShapeRootless (%p, %i)\n", pWin, kind);
 
     WIN_UNWRAP(SetShape);
     (*pScreen->SetShape) (pWin, kind);
@@ -470,9 +430,7 @@ winAddRgn(WindowPtr pWin, pointer data)
 
     /* If pWin is not Root */
     if (pWin->parent != NULL) {
-#if CYGDEBUG
         winDebug("winAddRgn ()\n");
-#endif
         if (pWin->mapped) {
             iBorder = wBorderWidth(pWin);
 
@@ -485,9 +443,9 @@ winAddRgn(WindowPtr pWin, pointer data)
             hRgnWin = CreateRectRgn(0, 0, iWidth, iHeight);
 
             if (hRgnWin == NULL) {
-                ErrorF("winAddRgn - CreateRectRgn () failed\n");
-                ErrorF("  Rect %d %d %d %d\n",
-                       iX, iY, iX + iWidth, iY + iHeight);
+                 winDebug ("winAddRgn - CreateRectRgn () failed\n");
+                 winDebug ("  Rect %d %d %d %d\n",
+                           iX, iY, iX + iWidth, iY + iHeight);
             }
 
             if (pWinPriv->hRgn) {
@@ -543,9 +501,7 @@ winReshapeRootless(WindowPtr pWin)
 
     winWindowPriv(pWin);
 
-#if CYGDEBUG
     winDebug("winReshapeRootless ()\n");
-#endif
 
     /* Bail if the window is the root window */
     if (pWin->parent == NULL)
diff --git a/xorg-server/hw/xwin/winwindow.h b/xorg-server/hw/xwin/winwindow.h
index 25826ecc7..bc4ed5abe 100644
--- a/xorg-server/hw/xwin/winwindow.h
+++ b/xorg-server/hw/xwin/winwindow.h
@@ -41,29 +41,23 @@
 
 /* Constant strings */
 #ifndef PROJECT_NAME
-#define PROJECT_NAME		"Cygwin/X"
+#define PROJECT_NAME		"VcXsrv"
 #endif
-#define EXECUTABLE_NAME         "XWin"
-#define WINDOW_CLASS		"cygwin/x"
-#define WINDOW_TITLE		PROJECT_NAME ":%s.%d"
-#define WINDOW_TITLE_XDMCP	"%s:%s.%d"
-#define WIN_SCR_PROP		"cyg_screen_prop rl"
-#define WINDOW_CLASS_X		"cygwin/x X rl"
+#define EXECUTABLE_NAME         "VcXsrv"
+#define WINDOW_CLASS		"VcXsrv/x"
+#define WINDOW_TITLE		PROJECT_NAME " Server - Display %s:%s.%d"
+#define WINDOW_TITLE_XDMCP	PROJECT_NAME " Server - %s - Display %s:%s.%d"
+#define WIN_SCR_PROP		"vcxsrv_screen_prop rl"
+#define WINDOW_CLASS_X		"vcxsrv/x X rl"
 #define WINDOW_TITLE_X		PROJECT_NAME " X"
-#define WIN_WINDOW_PROP		"cyg_window_prop_rl"
+#define WIN_WINDOW_PROP		"vcxsrv_window_prop_rl"
 #ifdef HAS_DEVWINDOWS
 #define WIN_MSG_QUEUE_FNAME	"/dev/windows"
 #endif
-#define WIN_WID_PROP		"cyg_wid_prop_rl"
-#define WIN_NEEDMANAGE_PROP	"cyg_override_redirect_prop_rl"
-#ifndef CYGMULTIWINDOW_DEBUG
-#define CYGMULTIWINDOW_DEBUG    NO
-#endif
-#ifndef CYGWINDOWING_DEBUG
-#define CYGWINDOWING_DEBUG	NO
-#endif
+#define WIN_WID_PROP		"vcxsrv_wid_prop_rl"
+#define WIN_NEEDMANAGE_PROP	"vcxsrv_override_redirect_prop_rl"
 
-#define XMING_SIGNATURE		0x12345678L
+#define VCXSRV_SIGNATURE		0xdeaddeadL
 
 typedef struct _winPrivScreenRec *winPrivScreenPtr;
 
@@ -75,6 +69,7 @@ typedef struct {
     DWORD dwDummy;
     HRGN hRgn;
     HWND hWnd;
+    BOOL OpenGlWindow;
     winPrivScreenPtr pScreenPriv;
     Bool fXKilled;
     HDWP hDwp;
@@ -113,6 +108,8 @@ typedef struct _winWMMessageRec {
 #define		WM_WM_HINTS_EVENT	(WM_USER + 14)
 #define		WM_MANAGE		(WM_USER + 100)
 #define		WM_UNMANAGE		(WM_USER + 102)
+#define		WM_WM_REINIT		(WM_USER + 200)
+
 
 #define		MwmHintsDecorations	(1L << 1)
 
@@ -150,6 +147,15 @@ void
  winMinimizeWindow(Window id);
 
 void
+winTaskbarInit (void);
+
+void
+winTaskbarDestroy (void);
+
+void
+winSetAppID (HWND hWnd, const char* AppID);
+
+void
  winPropertyStoreInit(void);
 
 void
diff --git a/xorg-server/hw/xwin/winwindowswm.c b/xorg-server/hw/xwin/winwindowswm.c
index fbd41aaa8..92fa5e3ff 100644
--- a/xorg-server/hw/xwin/winwindowswm.c
+++ b/xorg-server/hw/xwin/winwindowswm.c
@@ -246,26 +246,20 @@ winWindowsWMSendEvent(int type, unsigned int mask, int which, int arg,
     WMEventPtr *pHead, pEvent;
     ClientPtr client;
     xWindowsWMNotifyEvent se;
-
-#if CYGMULTIWINDOW_DEBUG
-    ErrorF("winWindowsWMSendEvent %d %d %d %d,  %d %d - %d %d\n",
-           type, mask, which, arg, x, y, w, h);
-#endif
+    winDebug ("winWindowsWMSendEvent %d %d %d %d,  %d %d - %d %d\n",
+              type, mask, which, arg, x, y, w, h);
     dixLookupResourceByType((pointer) &pHead, eventResource, eventResourceType,
                             NullClient, DixUnknownAccess);
     if (!pHead)
         return;
     for (pEvent = *pHead; pEvent; pEvent = pEvent->next) {
         client = pEvent->client;
-#if CYGMULTIWINDOW_DEBUG
-        ErrorF("winWindowsWMSendEvent - x%08x\n", (int) client);
-#endif
+        winDebug ("winWindowsWMSendEvent - x%08x\n", (int) client);
         if ((pEvent->mask & mask) == 0) {
             continue;
         }
-#if CYGMULTIWINDOW_DEBUG
-        ErrorF("winWindowsWMSendEvent - send\n");
-#endif
+        winDebug ("winWindowsWMSendEvent - send\n");
+
         se.type = type + WMEventBase;
         se.kind = which;
         se.window = window;
@@ -324,10 +318,8 @@ ProcWindowsWMFrameGetRect(ClientPtr client)
 
     REQUEST(xWindowsWMFrameGetRectReq);
 
-#if CYGMULTIWINDOW_DEBUG
-    ErrorF("ProcWindowsWMFrameGetRect %d %d\n",
-           (sizeof(xWindowsWMFrameGetRectReq) >> 2), (int) client->req_len);
-#endif
+  winDebug ("ProcWindowsWMFrameGetRect %d %d\n",
+            (sizeof(xWindowsWMFrameGetRectReq) >> 2), (int) client->req_len);
 
     REQUEST_SIZE_MATCH(xWindowsWMFrameGetRectReq);
     rep.type = X_Reply;
@@ -345,10 +337,8 @@ ProcWindowsWMFrameGetRect(ClientPtr client)
     SetRect(&rcNew, stuff->ix, stuff->iy,
             stuff->ix + stuff->iw, stuff->iy + stuff->ih);
 
-#if CYGMULTIWINDOW_DEBUG
-    ErrorF("ProcWindowsWMFrameGetRect - %d %d %d %d\n",
-           stuff->ix, stuff->iy, stuff->ix + stuff->iw, stuff->iy + stuff->ih);
-#endif
+    winDebug ("ProcWindowsWMFrameGetRect - %d %d %d %d\n",
+              stuff->ix, stuff->iy, stuff->ix + stuff->iw, stuff->iy + stuff->ih);
 
     /*
      * Calculate the required size of the Windows window rectangle,
@@ -360,10 +350,8 @@ ProcWindowsWMFrameGetRect(ClientPtr client)
     rep.y = rcNew.top;
     rep.w = rcNew.right - rcNew.left;
     rep.h = rcNew.bottom - rcNew.top;
-#if CYGMULTIWINDOW_DEBUG
-    ErrorF("ProcWindowsWMFrameGetRect - %d %d %d %d\n",
+    winDebug ("ProcWindowsWMFrameGetRect - %d %d %d %d\n",
            rep.x, rep.y, rep.w, rep.h);
-#endif
 
     WriteToClient(client, sizeof(xWindowsWMFrameGetRectReply), &rep);
     return Success;
@@ -381,27 +369,23 @@ ProcWindowsWMFrameDraw(ClientPtr client)
 
     REQUEST_SIZE_MATCH(xWindowsWMFrameDrawReq);
 
-#if CYGMULTIWINDOW_DEBUG
-    ErrorF("ProcWindowsWMFrameDraw\n");
-#endif
+    winDebug ("ProcWindowsWMFrameDraw\n");
+
     rc = dixLookupWindow(&pWin, stuff->window, client, DixReadAccess);
     if (rc != Success)
         return rc;
-#if CYGMULTIWINDOW_DEBUG
-    ErrorF("ProcWindowsWMFrameDraw - Window found\n");
-#endif
+
+    winDebug ("ProcWindowsWMFrameDraw - Window found\n");
 
     pRLWinPriv = (win32RootlessWindowPtr) RootlessFrameForWindow(pWin, TRUE);
     if (pRLWinPriv == 0)
         return BadWindow;
 
-#if CYGMULTIWINDOW_DEBUG
-    ErrorF("ProcWindowsWMFrameDraw - HWND 0x%08x 0x%08x 0x%08x\n",
-           (int) pRLWinPriv->hWnd, (int) stuff->frame_style,
-           (int) stuff->frame_style_ex);
-    ErrorF("ProcWindowsWMFrameDraw - %d %d %d %d\n",
-           stuff->ix, stuff->iy, stuff->iw, stuff->ih);
-#endif
+    winDebug ("ProcWindowsWMFrameDraw - HWND 0x%08x 0x%08x 0x%08x\n",
+              (int) pRLWinPriv->hWnd, (int) stuff->frame_style,
+              (int) stuff->frame_style_ex);
+    winDebug ("ProcWindowsWMFrameDraw - %d %d %d %d\n",
+              stuff->ix, stuff->iy, stuff->iw, stuff->ih);
 
     /* Store the origin, height, and width in a rectangle structure */
     SetRect(&rcNew, stuff->ix, stuff->iy,
@@ -448,9 +432,7 @@ ProcWindowsWMFrameDraw(ClientPtr client)
         winMWExtWMReshapeFrame(pRLWinPriv, &newShape);
         RegionUninit(&newShape);
     }
-#if CYGMULTIWINDOW_DEBUG
-    ErrorF("ProcWindowsWMFrameDraw - done\n");
-#endif
+    winDebug ("ProcWindowsWMFrameDraw - done\n");
 
     return Success;
 }
@@ -466,18 +448,14 @@ ProcWindowsWMFrameSetTitle(ClientPtr client)
     win32RootlessWindowPtr pRLWinPriv;
     int rc;
 
-#if CYGMULTIWINDOW_DEBUG
-    ErrorF("ProcWindowsWMFrameSetTitle\n");
-#endif
+    winDebug ("ProcWindowsWMFrameSetTitle\n");
 
     REQUEST_AT_LEAST_SIZE(xWindowsWMFrameSetTitleReq);
 
     rc = dixLookupWindow(&pWin, stuff->window, client, DixReadAccess);
     if (rc != Success)
         return rc;
-#if CYGMULTIWINDOW_DEBUG
-    ErrorF("ProcWindowsWMFrameSetTitle - Window found\n");
-#endif
+    winDebug ("ProcWindowsWMFrameSetTitle - Window found\n");
 
     title_length = stuff->title_length;
     title_max = (stuff->length << 2) - sizeof(xWindowsWMFrameSetTitleReq);
@@ -485,9 +463,7 @@ ProcWindowsWMFrameSetTitle(ClientPtr client)
     if (title_max < title_length)
         return BadValue;
 
-#if CYGMULTIWINDOW_DEBUG
-    ErrorF("ProcWindowsWMFrameSetTitle - length is valid\n");
-#endif
+    winDebug ("ProcWindowsWMFrameSetTitle - length is valid\n");
 
     title_bytes = malloc(title_length + 1);
     strncpy(title_bytes, (char *) &stuff[1], title_length);
@@ -505,9 +481,7 @@ ProcWindowsWMFrameSetTitle(ClientPtr client)
 
     free(title_bytes);
 
-#if CYGMULTIWINDOW_DEBUG
-    ErrorF("ProcWindowsWMFrameSetTitle - done\n");
-#endif
+    winDebug ("ProcWindowsWMFrameSetTitle - done\n");
 
     return Success;
 }
diff --git a/xorg-server/hw/xwin/winwndproc.c b/xorg-server/hw/xwin/winwndproc.c
index 7ba028042..bd93fbbd3 100644
--- a/xorg-server/hw/xwin/winwndproc.c
+++ b/xorg-server/hw/xwin/winwndproc.c
@@ -43,10 +43,16 @@
 #include "winmonitors.h"
 #include "inputstr.h"
 
+#ifndef XKB_IN_SERVER
+#define XKB_IN_SERVER
+#endif
+#include <xkbsrv.h>
+
 /*
  * Global variables
  */
 
+extern Bool		g_fClipboardStarted;
 Bool g_fCursor = TRUE;
 Bool g_fButton[3] = { FALSE, FALSE, FALSE };
 
@@ -69,9 +75,7 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
     int iScanCode;
     int i;
 
-#if CYGDEBUG
     winDebugWin32Message("winWindowProc", hwnd, message, wParam, lParam);
-#endif
 
     /* Watch for server regeneration */
     if (g_ulServerGeneration != s_ulServerGeneration) {
@@ -82,9 +86,7 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
     /* Only retrieve new privates pointers if window handle is null or changed */
     if ((s_pScreenPriv == NULL || hwnd != s_hwndLastPrivates)
         && (s_pScreenPriv = GetProp(hwnd, WIN_SCR_PROP)) != NULL) {
-#if CYGDEBUG
         winDebug("winWindowProc - Setting privates handle\n");
-#endif
         s_pScreenInfo = s_pScreenPriv->pScreenInfo;
         s_pScreen = s_pScreenInfo->pScreen;
         s_hwndLastPrivates = hwnd;
@@ -103,9 +105,7 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
                                     s_pScreenPriv);
 
     case WM_CREATE:
-#if CYGDEBUG
         winDebug("winWindowProc - WM_CREATE\n");
-#endif
 
         /*
          * Add a property to our display window that references
@@ -137,7 +137,7 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 
             s_pScreenPriv->hwndScreen = hwnd;
 
-            winInitNotifyIcon(s_pScreenPriv);
+            winInitNotifyIcon(s_pScreenPriv,FALSE);
         }
         return 0;
 
@@ -170,9 +170,9 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
             break;
         }
 
-        ErrorF("winWindowProc - WM_DISPLAYCHANGE - new width: %d "
-               "new height: %d new bpp: %d\n",
-               LOWORD(lParam), HIWORD(lParam), wParam);
+        winDebug ("winWindowProc - WM_DISPLAYCHANGE - new width: %d "
+                  "new height: %d new bpp: %d\n",
+                  LOWORD(lParam), HIWORD(lParam), wParam);
 
         /* 0 bpp has no defined meaning, ignore this message */
         if (wParam == 0)
@@ -196,7 +196,7 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 #endif
                 )) {
                 /* Cannot display the visual until the depth is restored */
-                ErrorF("winWindowProc - Disruptive change in depth\n");
+                winDebug ("winWindowProc - Disruptive change in depth\n");
 
                 /* Display depth change dialog */
                 winDisplayDepthChangeDialog(s_pScreenPriv);
@@ -246,7 +246,7 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
                                                                     fMultiWindow
 #endif
                 )) {
-                DWORD dwWidth, dwHeight;
+                DWORD dwWidth = 0, dwHeight = 0;
 
                 if (s_pScreenInfo->fMultipleMonitors) {
                     /* resize to new virtual desktop size */
@@ -310,25 +310,31 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
                 winDebug
                     ("winWindowProc - WM_DISPLAYCHANGE - Releasing and recreating primary surface\n");
 
-                /* Release the old primary surface */
-                (*s_pScreenPriv->pwinReleasePrimarySurface) (s_pScreen);
+                /* Reallocate the framebuffer used by the drawing engine */
+                (*s_pScreenPriv->pwinFreeFB)(s_pScreen);
+                if (!(*s_pScreenPriv->pwinAllocateFB)(s_pScreen))
+                {
+                    ErrorF ("winWindowProc - WM_DISPLAYCHANGE - Could not reallocate framebuffer\n");
+                }
+                /* Update the screen pixmap to point to the new framebuffer */
+                winUpdateFBPointer(s_pScreen, s_pScreenPriv->pScreenInfo->pfb);
+                // Restore the ability to update screen, now with new dimensions
+                SetRootClip(s_pScreen, TRUE);
 
-                /* Create the new primary surface */
-                (*s_pScreenPriv->pwinCreatePrimarySurface) (s_pScreen);
+                // and arrange for it to be repainted
+                miPaintWindow(s_pScreen->root, &s_pScreen->root->borderClip,  PW_BACKGROUND);
             }
         }
 
         break;
-
+      
     case WM_SIZE:
     {
         SCROLLINFO si;
         RECT rcWindow;
         int iWidth, iHeight;
 
-#if CYGDEBUG
         winDebug("winWindowProc - WM_SIZE\n");
-#endif
 
         /* Break if we do not allow resizing */
         if ((s_pScreenInfo->iResizeMode == notAllowed)
@@ -347,8 +353,8 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
         if (wParam == SIZE_MINIMIZED)
             return 0;
 
-        ErrorF("winWindowProc - WM_SIZE - new client area w: %d h: %d\n",
-               LOWORD(lParam), HIWORD(lParam));
+        winDebug ("winWindowProc - WM_SIZE - new client area w: %d h: %d\n",
+                  LOWORD(lParam), HIWORD(lParam));
 
         if (s_pScreenInfo->iResizeMode == resizeWithRandr) {
             /* Actual resizing is done on WM_EXITSIZEMOVE */
@@ -427,20 +433,22 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
         s_pScreenInfo->dwYOffset = -si.nPos;
     }
         return 0;
-
-    case WM_SYSCOMMAND:
-        if (s_pScreenInfo->iResizeMode == resizeWithRandr &&
-            ((wParam & 0xfff0) == SC_MAXIMIZE ||
-             (wParam & 0xfff0) == SC_RESTORE))
-            PostMessage(hwnd, WM_EXITSIZEMOVE, 0, 0);
+      
+      case WM_SYSCOMMAND:
+          if ((wParam & 0xfff0) == SC_MAXIMIZE ||
+              (wParam & 0xfff0) == SC_RESTORE)
+          {
+              winDebug("Posting WM_EXITSIZEMOVE message since windows does not send it when the maximised/restored button is clicked.\n");
+              PostMessage(hwnd, WM_EXITSIZEMOVE, 0, 0);
+          }
         break;
 
     case WM_ENTERSIZEMOVE:
-        ErrorF("winWindowProc - WM_ENTERSIZEMOVE\n");
+        winDebug("winWindowProc - WM_ENTERSIZEMOVE\n");
         break;
 
     case WM_EXITSIZEMOVE:
-        ErrorF("winWindowProc - WM_EXITSIZEMOVE\n");
+        winDebug("winWindowProc - WM_EXITSIZEMOVE\n");
 
         if (s_pScreenInfo->iResizeMode == resizeWithRandr) {
             /* Set screen size to match new client area, if it is different to current */
@@ -469,9 +477,7 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
         SCROLLINFO si;
         int iVertPos;
 
-#if CYGDEBUG
         winDebug("winWindowProc - WM_VSCROLL\n");
-#endif
 
         /* Get vertical scroll bar info */
         si.cbSize = sizeof(si);
@@ -548,9 +554,7 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
         SCROLLINFO si;
         int iHorzPos;
 
-#if CYGDEBUG
         winDebug("winWindowProc - WM_HSCROLL\n");
-#endif
 
         /* Get horizontal scroll bar info */
         si.cbSize = sizeof(si);
@@ -627,10 +631,8 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
         int iCaptionHeight;
         int iBorderHeight, iBorderWidth;
 
-#if CYGDEBUG
         winDebug("winWindowProc - WM_GETMINMAXINFO - pScreenInfo: %08x\n",
                  s_pScreenInfo);
-#endif
 
         /* Can't do anything without screen info */
         if (s_pScreenInfo == NULL
@@ -671,9 +673,7 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
         return 0;
 
     case WM_ERASEBKGND:
-#if CYGDEBUG
         winDebug("winWindowProc - WM_ERASEBKGND\n");
-#endif
         /*
          * Pretend that we did erase the background but we don't care,
          * the application uses the full window estate. This avoids some
@@ -682,9 +682,6 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
         return TRUE;
 
     case WM_PAINT:
-#if CYGDEBUG
-        winDebug("winWindowProc - WM_PAINT\n");
-#endif
         /* Only paint if we have privates and the server is enabled */
         if (s_pScreenPriv == NULL
             || !s_pScreenPriv->fEnabled
@@ -704,9 +701,7 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 
     case WM_PALETTECHANGED:
     {
-#if CYGDEBUG
         winDebug("winWindowProc - WM_PALETTECHANGED\n");
-#endif
         /*
          * Don't process if we don't have privates or a colormap,
          * or if we have an invalid depth.
@@ -957,11 +952,11 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
             wShift = (GetKeyState(VK_SHIFT) & 0x8000) ? MK_SHIFT : 0;
             wCtrl = (GetKeyState(VK_CONTROL) & 0x8000) ? MK_CONTROL : 0;
             lPos = MAKELPARAM(point.x, point.y);
-            if (g_fButton[0] & !wL)
+            if (g_fButton[0] && !wL)
                 PostMessage(hwnd, WM_LBUTTONUP, wCtrl | wM | wR | wShift, lPos);
-            if (g_fButton[1] & !wM)
+            if (g_fButton[1] && !wM)
                 PostMessage(hwnd, WM_MBUTTONUP, wCtrl | wL | wR | wShift, lPos);
-            if (g_fButton[2] & !wR)
+            if (g_fButton[2] && !wR)
                 PostMessage(hwnd, WM_RBUTTONUP, wCtrl | wL | wM | wShift, lPos);
         }
         }
@@ -975,9 +970,7 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
     case WM_MOUSEWHEEL:
         if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
             break;
-#if CYGDEBUG
         winDebug("winWindowProc - WM_MOUSEWHEEL\n");
-#endif
         winMouseWheel(s_pScreen, GET_WHEEL_DELTA_WPARAM(wParam));
         break;
 
@@ -1028,21 +1021,13 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
              * user enters Alt + F4 and is surprised when the application
              * quits.
              */
-            ErrorF("winWindowProc - WM_*KEYDOWN - Closekey hit, quitting\n");
+            winDebug ("winWindowProc - WM_*KEYDOWN - Closekey hit, quitting\n");
 
             /* Display Exit dialog */
             winDisplayExitDialog(s_pScreenPriv);
             return 0;
         }
 
-        /*
-         * Don't do anything for the Windows keys, as focus will soon
-         * be returned to Windows.  We may be able to trap the Windows keys,
-         * but we should determine if that is desirable before doing so.
-         */
-        if ((wParam == VK_LWIN || wParam == VK_RWIN) && !g_fKeyboardHookLL)
-            break;
-
         /* Discard fake Ctrl_L events that precede AltGR on non-US keyboards */
         if (winIsFakeCtrl_L(message, wParam, lParam))
             return 0;
@@ -1082,14 +1067,6 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
         if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
             break;
 
-        /*
-         * Don't do anything for the Windows keys, as focus will soon
-         * be returned to Windows.  We may be able to trap the Windows keys,
-         * but we should determine if that is desirable before doing so.
-         */
-        if ((wParam == VK_LWIN || wParam == VK_RWIN) && !g_fKeyboardHookLL)
-            break;
-
         /* Ignore the fake Ctrl_L that follows an AltGr release */
         if (winIsFakeCtrl_L(message, wParam, lParam))
             return 0;
@@ -1117,7 +1094,7 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 
         /* TODO: Override display of window when we have a bad depth */
         if (LOWORD(wParam) != WA_INACTIVE && s_pScreenPriv->fBadDepth) {
-            ErrorF("winWindowProc - WM_ACTIVATE - Bad depth, trying "
+            winDebug ("winWindowProc - WM_ACTIVATE - Bad depth, trying "
                    "to override window activation\n");
 
             /* Minimize the window */
@@ -1137,9 +1114,7 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
             return 0;
         }
 
-#if CYGDEBUG
         winDebug("winWindowProc - WM_ACTIVATE\n");
-#endif
 
         /*
          * Focus is being changed to another window.
@@ -1162,9 +1137,7 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
         if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
             break;
 
-#if CYGDEBUG || TRUE
         winDebug("winWindowProc - WM_ACTIVATEAPP\n");
-#endif
 
         /* Activate or deactivate */
         s_pScreenPriv->fActive = wParam;
@@ -1178,13 +1151,13 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 
 #ifdef XWIN_CLIPBOARD
         /* Make sure the clipboard chain is ok. */
-        winFixClipboardChain();
+        winFixClipboardChain(0);
 #endif
 
         /* Call engine specific screen activation/deactivation function */
         (*s_pScreenPriv->pwinActivateApp) (s_pScreen);
 
-#ifdef XWIN_MULTIWINDOWEXTWM
+#ifdef XWIN_MULTIWINDOWINTWM
         if (s_pScreenPriv->fActive) {
             /* Restack all window unless using built-in wm. */
             if (s_pScreenInfo->fInternalWM && s_pScreenInfo->fAnotherWMRunning)
@@ -1230,6 +1203,7 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
         if (s_pScreenInfo->fMultiWindow)
             winDeinitMultiWindowWM();
 #endif
+        g_fClipboardStarted=FALSE; /* This is to avoid dead-locls caused by the clipboard thread still doing some stuff */
         GiveUp(0);
         return 0;
 
@@ -1248,29 +1222,33 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 
 #ifdef XWIN_MULTIWINDOWEXTWM
     case WM_MANAGE:
-        ErrorF("winWindowProc - WM_MANAGE\n");
+        winDebug("winWindowProc - WM_MANAGE\n");
         s_pScreenInfo->fAnotherWMRunning = FALSE;
 
+#ifdef XWIN_MULTIWINDOWINTWM
         if (s_pScreenInfo->fInternalWM) {
             EnumThreadWindows(g_dwCurrentThreadID, winMWExtWMDecorateWindow, 0);
             //RootlessRepositionWindows (s_pScreen);
         }
+#endif
         break;
 
     case WM_UNMANAGE:
-        ErrorF("winWindowProc - WM_UNMANAGE\n");
+        winDebug("winWindowProc - WM_UNMANAGE\n");
         s_pScreenInfo->fAnotherWMRunning = TRUE;
 
+#ifdef XWIN_MULTIWINDOWINTWM
         if (s_pScreenInfo->fInternalWM) {
             EnumThreadWindows(g_dwCurrentThreadID, winMWExtWMDecorateWindow, 0);
             winMWExtWMRestackWindows(s_pScreen);
         }
+#endif
         break;
 #endif
 
     default:
         if (message == s_uTaskbarRestart) {
-            winInitNotifyIcon(s_pScreenPriv);
+            winInitNotifyIcon(s_pScreenPriv,FALSE);
         }
         break;
     }
diff --git a/xorg-server/hw/xwin/xdmcphostselect.c b/xorg-server/hw/xwin/xdmcphostselect.c
new file mode 100644
index 000000000..9c3ca797b
--- /dev/null
+++ b/xorg-server/hw/xwin/xdmcphostselect.c
@@ -0,0 +1,180 @@
+#ifdef HAVE_XWIN_CONFIG_H

+#include <xwin-config.h>

+#endif

+#include "win.h"

+

+void XdmcpHostSelected(int HostIndex);

+

+static HWND g_hDlgHosts;

+static char HostToConnect[128];

+

+static void SelectHost(int Index)

+{

+  int i;

+  char HostName[128];

+  int HostIndex=SendDlgItemMessage(g_hDlgHosts, IDC_HOSTLIST, LB_GETITEMDATA, (WPARAM)Index, 0);

+

+  HostToConnect[0]=0;

+  SendDlgItemMessage(g_hDlgHosts, IDC_HOSTLIST, LB_GETTEXT, (WPARAM)Index, (LPARAM)HostToConnect);

+  g_pszQueryHost=HostToConnect;

+

+  gethostname(HostName,128);

+

+  XdmcpHostSelected(HostIndex);

+

+  for (i = 0; i < g_iNumScreens; ++i)

+    {

+      /* Change the window title to reflect the host we are connecting to */

+      if (g_ScreenInfo[i].pScreen)

+      {

+        char szTitle[256];

+

+        winScreenPriv(g_ScreenInfo[i].pScreen);

+        winScreenInfo	*pScreenInfo = pScreenPriv->pScreenInfo;

+        snprintf (szTitle, sizeof (szTitle), WINDOW_TITLE_XDMCP, HostToConnect, HostName, display, (int) pScreenInfo->dwScreen);

+        SetWindowText(pScreenPriv->hwndScreen,szTitle);

+      }

+    }

+

+  DestroyWindow (g_hDlgHosts);

+  g_hDlgHosts = NULL;

+}

+

+/*

+ * Process messages for the about dialog.

+ */

+

+static wBOOL CALLBACK DisplayXdmcpHostsDlgProc (HWND hwndDialog, UINT message, WPARAM wParam, LPARAM lParam)

+{

+  /* Branch on message type */

+  switch (message)

+  {

+    case WM_INITDIALOG:

+    {

+      HWND hwndDesk=GetForegroundWindow();

+      RECT rc, rcDlg, rcDesk;

+      

+      GetWindowRect (hwndDesk, &rcDesk);

+      GetWindowRect (hwndDialog, &rcDlg);

+      CopyRect (&rc, &rcDesk);

+

+      OffsetRect (&rcDlg, -rcDlg.left, -rcDlg.top);

+      OffsetRect (&rc, -rc.left, -rc.top);

+      OffsetRect (&rc, -rcDlg.right, -rcDlg.bottom);

+

+      SetWindowPos (hwndDialog,

+      HWND_TOPMOST,

+      rcDesk.left + (rc.right / 2),

+      rcDesk.top + (rc.bottom / 2),

+      0, 0,

+      SWP_NOSIZE | SWP_FRAMECHANGED);

+      return TRUE;

+    }

+    break;

+

+    case WM_COMMAND:

+      switch (LOWORD (wParam))

+      {

+        case IDOK:

+        {

+          int Index;

+          winDebug ("DisplayXdmcpHostsDlgProc - WM_COMMAND - IDOK or IDCANCEL\n");

+

+            /* Retreive the host to connect to */

+          Index=SendDlgItemMessage(g_hDlgHosts, IDC_HOSTLIST, LB_GETCURSEL, 0, 0);

+          if (Index==LB_ERR)

+          {

+            MessageBox(hwndDialog,"Please select a host to connect to!","Error",MB_OK);

+          }

+          else

+          {

+            SelectHost(Index);

+          }

+

+          return TRUE;

+        }

+        break;

+        case IDCANCEL:

+          winDebug ("DisplayXdmcpHostsDlgProc - WM_COMMAND - IDCANCEL\n");

+

+          DestroyWindow (g_hDlgHosts);

+          AbortDDX(EXIT_ERR_ABORT);

+          TerminateProcess(GetCurrentProcess(),1);  /* Exit the application */

+

+          return TRUE;

+        break;

+        case IDC_HOSTLIST:

+          if (HIWORD(wParam)==LBN_DBLCLK)

+          {

+            int Index=SendDlgItemMessage(g_hDlgHosts, IDC_HOSTLIST, LB_GETCURSEL, 0, 0);

+            SelectHost(Index);

+            return TRUE;

+          }

+        break;

+      }

+      break;

+

+    case WM_CLOSE:

+      ErrorF ("DisplayXdmcpHostsDlgProc - WM_CLOSE\n");

+

+      DestroyWindow (g_hDlgHosts);

+      g_hDlgHosts = NULL;

+      AbortDDX(EXIT_ERR_ABORT);

+      TerminateProcess(GetCurrentProcess(),1);  /* Exit the application */

+

+      return TRUE;

+  }

+

+  return FALSE;

+}

+

+int XdmcpHostAddName(const char *HostName, int HostIndex)

+{

+  int Index=SendDlgItemMessage(g_hDlgHosts, IDC_HOSTLIST, LB_FINDSTRINGEXACT, -1, (LPARAM)HostName);

+  if (LB_ERR==Index)

+  {

+    Index=SendDlgItemMessage(g_hDlgHosts, IDC_HOSTLIST, LB_ADDSTRING, 0, (LPARAM)HostName); 

+    SendDlgItemMessage(g_hDlgHosts, IDC_HOSTLIST, LB_SETITEMDATA, (WPARAM)Index, (LPARAM)HostIndex); 

+    return -1;

+  }

+  else

+    return SendDlgItemMessage(g_hDlgHosts, IDC_HOSTLIST, LB_GETITEMDATA, (WPARAM)Index, 0);

+}

+/*

+ * Display the host selection dialog box

+ */

+

+void DisplayXdmcpHostsDialog(void)

+{

+  /* Check if dialog already exists */

+  if (g_hDlgHosts != NULL)

+  {

+    /* Dialog box already exists, display it */

+    ShowWindow (g_hDlgHosts, SW_SHOWDEFAULT);

+

+    /* User has lost the dialog.  Show them where it is. */

+    SetForegroundWindow (g_hDlgHosts);

+

+    return;

+  }

+

+  /* Show an arrow cursor as long as the selection dialog is shown */

+  {

+    winScreenPriv(screenInfo.screens[0]);

+    pScreenPriv->cursor.handle=LoadCursor(NULL,IDC_ARROW);

+  }

+

+  /*

+   * Display the about box

+   */

+  g_hDlgHosts = CreateDialogParam (g_hInstance, "XDMCP_HOSTS", NULL, DisplayXdmcpHostsDlgProc, 0);

+ 

+  /* Show the dialog box */

+  ShowWindow (g_hDlgHosts, SW_SHOW);

+

+  /* Needed to get keyboard controls (tab, arrows, enter, esc) to work */

+  SetForegroundWindow (g_hDlgHosts);

+  

+  /* Set focus to the OK button */

+  PostMessage (g_hDlgAbout, WM_NEXTDLGCTL, (WPARAM)GetDlgItem (g_hDlgHosts, IDOK), TRUE);

+}

diff --git a/xorg-server/hw/xwin/xlaunch/COPYING b/xorg-server/hw/xwin/xlaunch/COPYING
new file mode 100644
index 000000000..c7fa84400
--- /dev/null
+++ b/xorg-server/hw/xwin/xlaunch/COPYING
@@ -0,0 +1,25 @@
+
+ Copyright (c) 2005 Alexander Gottwald
+
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
+
+ Except as contained in this notice, the name(s) of the above copyright
+ holders shall not be used in advertising or otherwise to promote the sale,
+ use or other dealings in this Software without prior written authorization.
+
diff --git a/xorg-server/hw/xwin/xlaunch/config.cc b/xorg-server/hw/xwin/xlaunch/config.cc
new file mode 100644
index 000000000..fc268e2e8
--- /dev/null
+++ b/xorg-server/hw/xwin/xlaunch/config.cc
@@ -0,0 +1,200 @@
+/*

+ * Copyright (c) 2005 Alexander Gottwald

+ *

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

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

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

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

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

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

+ *

+ * The above copyright notice and this permission notice shall be included in

+ * all copies or substantial portions of the Software.

+ *

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

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

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

+ * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

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

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

+ * DEALINGS IN THE SOFTWARE.

+ *

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

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

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

+ */

+#include <libxml/parser.h>

+#include <libxml/tree.h>

+#include "config.h"

+#include "window/util.h"

+#include <stdexcept>

+

+xmlDocPtr CreateDocument()

+{

+  xmlDocPtr doc = xmlNewDoc(BAD_CAST "1.0");

+  xmlNodePtr root_node = xmlNewNode(NULL, BAD_CAST "XLaunch");

+  xmlDocSetRootElement(doc, root_node);

+  

+  return doc;

+    

+}

+

+void setAttribute(xmlNodePtr elem, const char *name, const char *value)

+{

+  xmlNewProp(elem, BAD_CAST name, BAD_CAST value);

+}

+

+void CConfig::Save(const char *filename)

+{

+    xmlDocPtr doc = CreateDocument();

+    xmlNodePtr root = xmlDocGetRootElement(doc);

+

+    switch (window)

+    {

+	case MultiWindow:

+	    setAttribute(root, "WindowMode", "MultiWindow");

+	    break;

+	case Fullscreen:

+	    setAttribute(root, "WindowMode", "Fullscreen");

+	    break;

+	default:

+	case Windowed:

+	    setAttribute(root, "WindowMode", "Windowed");

+	    break;

+	case Nodecoration:

+	    setAttribute(root, "WindowMode", "Nodecoration");

+	    break;

+    }

+    switch (client)

+    {

+	default:

+	case NoClient:

+	    setAttribute(root, "ClientMode", "NoClient");

+	    break;

+	case StartProgram:

+	    setAttribute(root, "ClientMode", "StartProgram");

+	    break;

+	case XDMCP:

+	    setAttribute(root, "ClientMode", "XDMCP");

+	    break;

+    }

+    setAttribute(root, "LocalClient", local?"True":"False");

+    setAttribute(root, "Display", display.c_str());

+    setAttribute(root, "LocalProgram", localprogram.c_str());

+    setAttribute(root, "RemoteProgram", remoteprogram.c_str());

+    setAttribute(root, "RemotePassword", remotepassword.c_str());

+    setAttribute(root, "PrivateKey", privatekey.c_str());

+    setAttribute(root, "RemoteHost", host.c_str());

+    setAttribute(root, "RemoteUser", user.c_str());

+    setAttribute(root, "XDMCPHost", xdmcp_host.c_str());

+    setAttribute(root, "XDMCPBroadcast", broadcast?"True":"False");

+    setAttribute(root, "XDMCPIndirect", indirect?"True":"False");

+    setAttribute(root, "Clipboard", clipboard?"True":"False");

+    setAttribute(root, "ClipboardPrimary", clipboardprimary?"True":"False");

+    setAttribute(root, "ExtraParams", extra_params.c_str());

+    setAttribute(root, "Wgl", wgl?"True":"False");

+    setAttribute(root, "DisableAC", disableac?"True":"False");

+    setAttribute(root, "XDMCPTerminate", xdmcpterminate?"True":"False");

+

+    xmlSaveFormatFileEnc(filename, doc, "UTF-8", 1);

+

+    /*free the document */

+    xmlFreeDoc(doc);

+

+    /*

+     *Free the global variables that may

+     *have been allocated by the parser.

+     */

+    xmlCleanupParser();

+}

+

+BOOL getAttribute(xmlNodePtr elem, const char *name, std::string &ret)

+{

+  char *pVal=(char*)xmlGetProp(elem,BAD_CAST name);

+  if (!pVal)

+    return false;

+  ret=pVal;

+  return true;

+}

+

+BOOL getAttributeBool(xmlNodePtr elem, const char *name, bool &ret)

+{

+  const char *pVal=(char*)xmlGetProp(elem, BAD_CAST name);

+  if (!pVal)

+    return false;

+

+  std::string str(pVal);

+

+  if (str == "True")

+    ret = true;

+  else

+    ret = false;

+  return true;

+}

+

+

+void CConfig::Load(const char *filename)

+{

+  xmlDocPtr doc = xmlReadFile(filename, NULL, 0);

+

+  xmlNodePtr root;

+

+  if (doc == NULL)

+  {

+    return;

+  }

+

+  root = xmlDocGetRootElement(doc);

+

+  std::string windowMode;

+  std::string clientMode;

+

+    if (getAttribute(root, "WindowMode", windowMode))

+    {

+	if (windowMode == "MultiWindow")

+	    window = MultiWindow;

+	else if (windowMode == "Fullscreen")

+	    window = Fullscreen;

+	else if (windowMode == "Windowed")

+	    window = Windowed;

+	else if (windowMode == "Nodecoration")

+	    window = Nodecoration;

+    }

+    if (getAttribute(root, "ClientMode", clientMode))

+    {

+	if (clientMode == "NoClient")

+	    client = NoClient;

+	else if (clientMode == "StartProgram")

+	    client = StartProgram;

+	else if (clientMode == "XDMCP")

+	    client = XDMCP;

+    }

+    

+    getAttributeBool(root, "LocalClient", local);

+    getAttribute(root, "Display", display);

+    getAttribute(root, "LocalProgram", localprogram);

+    getAttribute(root, "RemoteProgram", remoteprogram);

+    getAttribute(root, "RemotePassword", remotepassword);

+    getAttribute(root, "PrivateKey", privatekey);

+    getAttribute(root, "RemoteHost", host);

+    getAttribute(root, "RemoteUser", user);

+    getAttribute(root, "XDMCPHost", xdmcp_host);

+    getAttributeBool(root, "XDMCPBroadcast", broadcast);

+    getAttributeBool(root, "XDMCPIndirect", indirect);

+    getAttributeBool(root, "Clipboard", clipboard);

+    getAttributeBool(root, "ClipboardPrimary", clipboardprimary);

+    getAttribute(root, "ExtraParams", extra_params);

+    getAttributeBool(root, "Wgl", wgl);

+    getAttributeBool(root, "DisableAC", disableac);

+    getAttributeBool(root, "XDMCPTerminate", xdmcpterminate);

+

+    /*free the document */

+    xmlFreeDoc(doc);

+

+    /*

+     *Free the global variables that may

+     *have been allocated by the parser.

+     */

+    xmlCleanupParser();

+}

+

diff --git a/xorg-server/hw/xwin/xlaunch/config.h b/xorg-server/hw/xwin/xlaunch/config.h
new file mode 100644
index 000000000..d4ae5e35d
--- /dev/null
+++ b/xorg-server/hw/xwin/xlaunch/config.h
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2005 Alexander Gottwald
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above copyright
+ * holders shall not be used in advertising or otherwise to promote the sale,
+ * use or other dealings in this Software without prior written authorization.
+ *
+ * Authors:	Alexander Gottwald, Colin Harrison
+ */
+#ifndef __CONFIG_H__
+#define __CONFIG_H__
+#define UNICODE
+#define _UNICODE
+
+#define PROG_NUMBER 10
+#define HOST_NUMBER 10
+#define MAX_MESSAGE 256
+#define MAX_CAPTION 128
+
+#include <windows.h>
+#include <string>
+#include <vector>
+struct CConfig
+{
+    enum {MultiWindow, Fullscreen, Windowed, Nodecoration} window;
+    enum {NoClient, StartProgram, XDMCP} client;
+    bool local;
+    std::string display;
+    std::string localprogram;
+    std::string remoteprogram;
+    bool compress;
+    std::string host;
+    std::string user;
+    std::string remotepassword;
+    std::string privatekey;
+    bool broadcast;
+    bool indirect;
+    std::string xdmcp_host;
+    bool clipboard;
+    bool clipboardprimary;
+    bool wgl;
+    bool disableac;
+    bool xdmcpterminate;
+    std::string extra_params;
+    CConfig() : window(MultiWindow), client(NoClient), display("-1"), 
+                local(false),
+                remotepassword(""),
+                privatekey(""),
+                localprogram("xcalc"),
+                remoteprogram("xterm"),
+                compress(false),
+                host(""),
+                user(""),
+                broadcast(false),
+                indirect(false),
+                xdmcp_host(""),
+                clipboard(true),
+                clipboardprimary(true),
+                extra_params(),
+                disableac(false),
+                wgl(true),
+                xdmcpterminate(false)
+    {
+    };
+    void Load(const char * filename);
+    void Save(const char * filename);
+};
+
+#endif
diff --git a/xorg-server/hw/xwin/xlaunch/main.cc b/xorg-server/hw/xwin/xlaunch/main.cc
new file mode 100644
index 000000000..8e13b4436
--- /dev/null
+++ b/xorg-server/hw/xwin/xlaunch/main.cc
@@ -0,0 +1,980 @@
+/*
+ * Copyright (c) 2005 Alexander Gottwald
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above copyright
+ * holders shall not be used in advertising or otherwise to promote the sale,
+ * use or other dealings in this Software without prior written authorization.
+ */
+#define SAVEPOSIX _POSIX_
+#undef _POSIX_
+#include <io.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <stdio.h>
+#define _POSIX_ SAVEPOSIX
+
+#include "window/util.h"
+#include "window/wizard.h"
+#include "resources/resources.h"
+#include "config.h"
+#include <prsht.h>
+#include <commctrl.h>
+
+#include <stdexcept>
+
+#include <X11/Xlib.h>
+
+#include <sstream>
+
+static bool ContainPrintableChars(const char *Buf, unsigned Nbr)
+{
+  for (int i=0; i<Nbr; i++)
+  {
+    if (Buf[i]>0x20)
+      return true;
+  }
+  return false;
+}
+
+/*
+ * Process messages for the prompt dialog.
+ */
+
+static INT_PTR CALLBACK DisplayPromptDlgProc (HWND hwndDialog, UINT message, WPARAM wParam, LPARAM lParam)
+{
+  static LPARAM Param;
+  static UINT PasswordChar;
+  switch (message)
+  {
+    case WM_INITDIALOG:
+    {
+      HWND hwndDesk=GetForegroundWindow();
+      RECT rc, rcDlg, rcDesk;
+
+      PasswordChar=SendDlgItemMessage(hwndDialog, IDC_INPUT, EM_GETPASSWORDCHAR, 0, 0);
+
+      GetWindowRect (hwndDesk, &rcDesk);
+      GetWindowRect (hwndDialog, &rcDlg);
+      CopyRect (&rc, &rcDesk);
+
+      OffsetRect (&rcDlg, -rcDlg.left, -rcDlg.top);
+      OffsetRect (&rc, -rc.left, -rc.top);
+      OffsetRect (&rc, -rcDlg.right, -rcDlg.bottom);
+
+      SetWindowPos (hwndDialog,
+      HWND_TOPMOST,
+      rcDesk.left + (rc.right / 2),
+      rcDesk.top + (rc.bottom / 2),
+      0, 0,
+      SWP_NOSIZE | SWP_FRAMECHANGED);
+
+      Param=lParam;
+      SendDlgItemMessage(hwndDialog, IDC_PROMPT_DESC, WM_SETTEXT, 0, lParam);
+      return TRUE;
+    }
+    break;
+
+    case WM_COMMAND:
+      switch (LOWORD (wParam))
+      {
+        case IDOK:
+          SendDlgItemMessage(hwndDialog, IDC_INPUT, WM_GETTEXT, 128, Param);
+          EndDialog(hwndDialog, Param);
+          return TRUE;
+        case IDCANCEL:
+          EndDialog(hwndDialog, NULL);
+          return TRUE;
+        case IDC_PASSWORD:
+        {
+          HWND hDlg=GetDlgItem(hwndDialog, IDC_INPUT);
+          if (HIWORD(wParam)==BN_CLICKED)
+          {
+            if (BST_CHECKED==SendDlgItemMessage(hwndDialog, IDC_PASSWORD, BM_GETCHECK, 0, 0))
+              SendMessage(hDlg, EM_SETPASSWORDCHAR, 0, 0);
+            else
+              SendMessage(hDlg, EM_SETPASSWORDCHAR, (WPARAM)PasswordChar, 0);
+          }
+          InvalidateRect(hDlg, NULL, TRUE);
+        }
+        return TRUE;
+      }
+      break;
+
+    case WM_CLOSE:
+      EndDialog (hwndDialog, NULL);
+      return TRUE;
+  }
+
+  return FALSE;
+}
+
+static bool CheckOutput(HANDLE hChildStdoutRd, int hStdOut, int hStdIn)
+{
+  DWORD NbrAvail=0;
+  PeekNamedPipe(hChildStdoutRd, NULL, NULL, NULL, &NbrAvail, NULL);
+  if (NbrAvail)
+  {
+    char Buf[128];
+    size_t Nbr = _read(hStdOut, Buf, sizeof(Buf)-1);
+    if (ContainPrintableChars(Buf,Nbr))
+    {
+      Buf[Nbr]=0;
+      INT_PTR Ret = DialogBoxParam (GetModuleHandle(NULL), "IDD_PROMPT", NULL, DisplayPromptDlgProc, (LPARAM)Buf);
+
+      if (Ret)
+      {
+        char *Data=(char*)Ret;
+        // Write it to the client
+        _write(hStdIn, Data, strlen(Data));
+        _write(hStdIn, "\x0d\x0a", 2);
+      }
+
+      return true;
+    }
+
+  }
+  return false;
+}
+
+
+/// @brief Send WM_ENDSESSION to all program windows.
+/// This will shutdown the started xserver
+BOOL CALLBACK KillWindowsProc(HWND hwnd, LPARAM lParam)
+{
+    SendMessage(hwnd, WM_ENDSESSION, 0, 0);
+    return TRUE;
+}
+
+/// @brief Actual wizard implementation.
+/// This is based on generic CWizard but handles the special dialogs
+class CMyWizard : public CWizard
+{
+    public:
+    private:
+        CConfig config; /// Storage for config options.
+    public:
+        /// @brief Constructor.
+        /// Set wizard pages.
+        CMyWizard() : CWizard()
+        {
+            AddPage(IDD_DISPLAY, IDS_DISPLAY_TITLE, IDS_DISPLAY_SUBTITLE);
+            AddPage(IDD_CLIENTS, IDS_CLIENTS_TITLE, IDS_CLIENTS_SUBTITLE);
+            AddPage(IDD_PROGRAM, IDS_PROGRAM_TITLE, IDS_PROGRAM_SUBTITLE);
+            AddPage(IDD_XDMCP, IDS_XDMCP_TITLE, IDS_XDMCP_SUBTITLE);
+            //AddPage(IDD_FONTPATH, IDS_FONTPATH_TITLE, IDS_FONTPATH_SUBTITLE);
+            AddPage(IDD_EXTRA, IDS_EXTRA_TITLE, IDS_EXTRA_SUBTITLE);
+            AddPage(IDD_FINISH, IDS_FINISH_TITLE, IDS_FINISH_SUBTITLE);
+        }
+
+        virtual void LoadConfig(const char *filename)
+        {
+            try {
+                config.Load(filename);
+            } catch (std::runtime_error &e)
+            {
+                char Message[255];
+                sprintf(Message,"Failure: %s\n", e.what());
+                MessageBox(NULL,Message,"Exception",MB_OK);
+            }
+        }
+
+        /// @brief Handle the PSN_WIZNEXT message.
+        /// @param hwndDlg Handle to active page dialog.
+        /// @param index Index of current page.
+        /// @return TRUE if the message was handled. FALSE otherwise.
+        virtual BOOL WizardNext(HWND hwndDlg, unsigned index)
+        {
+#ifdef _DEBUG
+            printf("%s %d\n", __FUNCTION__, index);
+#endif
+            switch (PageID(index))
+            {
+                case IDD_DISPLAY:
+                    // Check for select window mode
+                    if (IsDlgButtonChecked(hwndDlg, IDC_MULTIWINDOW))
+                        config.window = CConfig::MultiWindow;
+                    else if (IsDlgButtonChecked(hwndDlg, IDC_FULLSCREEN))
+                        config.window = CConfig::Fullscreen;
+                    else if (IsDlgButtonChecked(hwndDlg, IDC_WINDOWED))
+                        config.window = CConfig::Windowed;
+                    else if (IsDlgButtonChecked(hwndDlg, IDC_NODECORATION))
+                        config.window = CConfig::Nodecoration;
+                    else
+                    {
+                        SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
+                        return TRUE;
+                    }
+                    // Get selected display number
+                    {
+                        char buffer[512];
+                        GetDlgItemText(hwndDlg, IDC_DISPLAY, buffer, 512);
+                        buffer[511] = 0;
+                        config.display = buffer;
+                    }
+                    // Check for valid input
+                    if (config.display.empty())
+                    {
+                        MessageBox(hwndDlg,"Please fill in a display number.","Error",MB_OK);
+                        SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
+                    }
+                    else
+                        SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_CLIENTS);
+                    return TRUE;
+                case IDD_CLIENTS:
+                    // Check for select client startup method
+                    if (IsDlgButtonChecked(hwndDlg, IDC_CLIENT))
+                    {
+                        config.client = CConfig::StartProgram;
+                        SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_PROGRAM);
+                    } else if (IsDlgButtonChecked(hwndDlg, IDC_XDMCP))
+                    {
+                        config.client = CConfig::XDMCP;
+                        SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_XDMCP);
+                    } else if (IsDlgButtonChecked(hwndDlg, IDC_CLIENT_NONE))
+                    {
+                        config.client = CConfig::NoClient;
+                        SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_EXTRA);
+                    } else
+                        SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
+                    return TRUE;
+                case IDD_PROGRAM:
+                    // Check wether local or remote client should be started
+                    if (IsDlgButtonChecked(hwndDlg, IDC_CLIENT_LOCAL))
+                        config.local = true;
+                    else if (IsDlgButtonChecked(hwndDlg, IDC_CLIENT_REMOTE))
+                        config.local = false;
+                    else
+                    {
+                        SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
+                        return TRUE;
+                    }
+                    // Read program, user and host name
+                    {
+                        char buffer[512];
+                        GetDlgItemText(hwndDlg, IDC_CLIENT_USER, buffer, 512);
+                        buffer[511] = 0;
+                        config.user = buffer;
+                        GetDlgItemText(hwndDlg, IDC_CLIENT_HOST, buffer, 512);
+                        buffer[511] = 0;
+                        config.host = buffer;
+                        GetDlgItemText(hwndDlg, IDC_CLIENT_PROGRAM, buffer, 512);
+                        buffer[511] = 0;
+                        config.localprogram = buffer;
+                        GetDlgItemText(hwndDlg, IDC_CLIENT_REMOTEPROGRAM, buffer, 512);
+                        buffer[511] = 0;
+                        config.remoteprogram = buffer;
+                        GetDlgItemText(hwndDlg, IDC_CLIENT_PASSWORD, buffer, 512);
+                        buffer[511] = 0;
+                        config.remotepassword = buffer;
+                        GetDlgItemText(hwndDlg, IDC_CLIENT_PRIVATEKEY, buffer, 512);
+                        buffer[511] = 0;
+                        config.privatekey = buffer;
+                    }
+                    // Check for valid input
+                    if (!config.local && (config.host.empty() || config.localprogram.empty() || config.remoteprogram.empty()))
+                        SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
+                    else
+                        SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_EXTRA);
+                    return TRUE;
+                case IDD_XDMCP:
+                    // Check for broadcast
+                    if (IsDlgButtonChecked(hwndDlg, IDC_XDMCP_BROADCAST))
+                        config.broadcast = true;
+                    else if (IsDlgButtonChecked(hwndDlg, IDC_XDMCP_QUERY))
+                        config.broadcast = false;
+                    else
+                    {
+                        SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
+                        return TRUE;
+                    }
+                    // Check for indirect mode
+                    if (IsDlgButtonChecked(hwndDlg, IDC_XDMCP_INDIRECT))
+                        config.indirect = true;
+                    else
+                        config.indirect = false;
+                    // Read hostname
+                    {
+                        char buffer[512];
+                        GetDlgItemText(hwndDlg, IDC_XDMCP_HOST, buffer, 512);
+                        buffer[511] = 0;
+                        config.xdmcp_host = buffer;
+                    }
+                    // Check for valid input
+                    if (!config.broadcast && config.xdmcp_host.empty())
+                        SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
+                    else
+                        SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_EXTRA);
+                    if (IsDlgButtonChecked(hwndDlg, IDC_XDMCP_TERMINATE))
+                        config.xdmcpterminate = true;
+                    else
+                        config.xdmcpterminate = false;
+                    return TRUE;
+                case IDD_EXTRA:
+                    // check for clipboard
+                    if (IsDlgButtonChecked(hwndDlg, IDC_CLIPBOARD))
+                        config.clipboard = true;
+                    else
+                        config.clipboard = false;
+                    // check for clipboard primary selection
+                    if (IsDlgButtonChecked(hwndDlg, IDC_CLIPBOARDPRIMARY))
+                        config.clipboardprimary = true;
+                    else
+                        config.clipboardprimary = false;
+                    // check for wgl
+                    if (IsDlgButtonChecked(hwndDlg, IDC_WGL))
+                        config.wgl = true;
+                    else
+                        config.wgl = false;
+                    // check for access control
+                    if (IsDlgButtonChecked(hwndDlg, IDC_DISABLEAC))
+                        config.disableac = true;
+                    else
+                        config.disableac = false;
+                    // read parameters
+                    {
+                        char buffer[512];
+                        GetDlgItemText(hwndDlg, IDC_EXTRA_PARAMS, buffer, 512);
+                        buffer[511] = 0;
+                        config.extra_params = buffer;
+                    }
+                    SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_FINISH);
+                    return TRUE;
+                default:
+                    break;
+            }
+            return FALSE;
+        }
+        /// @brief Handle PSN_WIZFINISH message.
+        /// @param hwndDlg Handle to active page dialog.
+        /// @param index Index of current page.
+        /// @return TRUE if the message was handled. FALSE otherwise.
+        virtual BOOL WizardFinish(HWND hwndDlg, unsigned index)
+        {
+#ifdef _DEBUG
+            printf("finish %d\n", index);
+#endif
+            return FALSE;
+        }
+        /// @brief Handle PSN_WIZBACK message.
+        /// Basicly handles switching to proper page (skipping XDMCP or program page
+        /// if required).
+        /// @param hwndDlg Handle to active page dialog.
+        /// @param index Index of current page.
+        /// @return TRUE if the message was handled. FALSE otherwise.
+        virtual BOOL WizardBack(HWND hwndDlg, unsigned index)
+        {
+            switch (PageID(index))
+            {
+                case IDD_PROGRAM:
+                case IDD_XDMCP:
+                    SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_CLIENTS);
+                    return TRUE;
+                case IDD_FONTPATH:
+                case IDD_EXTRA: // temporary. fontpath is disabled
+                    switch (config.client)
+                    {
+                        case CConfig::NoClient:
+                            SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_CLIENTS);
+                            return TRUE;
+                        case CConfig::StartProgram:
+                            SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_PROGRAM);
+                            return TRUE;
+                        case CConfig::XDMCP:
+                            SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_XDMCP);
+                            return TRUE;
+                    }
+                    break;
+            }
+            return FALSE;
+        }
+        /// @brief Handle PSN_SETACTIVE message.
+        /// @param hwndDlg Handle to active page dialog.
+        /// @param index Index of current page.
+        /// @return TRUE if the message was handled. FALSE otherwise.
+        virtual BOOL WizardActivate(HWND hwndDlg, unsigned index)
+        {
+#ifdef _DEBUG
+            printf("%s %d\n", __FUNCTION__, index);
+#endif
+            switch (PageID(index))
+            {
+                case IDD_CLIENTS:
+                    // Enable or disable XDMCP radiobutton and text
+                    if (config.window != CConfig::MultiWindow)
+                    {
+                      EnableWindow(GetDlgItem(hwndDlg, IDC_XDMCP), true);
+                      EnableWindow(GetDlgItem(hwndDlg, IDC_XDMCP_DESC), true);
+                    }
+                    else
+                    {
+                      if (IsDlgButtonChecked(hwndDlg, IDC_XDMCP))
+                        CheckRadioButton(hwndDlg, IDC_CLIENT_NONE, IDC_CLIENT, IDC_CLIENT_NONE);
+                      EnableWindow(GetDlgItem(hwndDlg, IDC_XDMCP), false);
+                      EnableWindow(GetDlgItem(hwndDlg, IDC_XDMCP_DESC), false);
+                    }
+                    break;
+            }
+            return FALSE;
+        }
+    protected:
+        /// @brief Enable or disable the control for remote clients.
+        /// @param hwndDlg Handle to active page dialog.
+        /// @param state State of control group.
+        void EnableRemoteProgramGroup(HWND hwndDlg, BOOL state)
+        {
+            EnableWindow(GetDlgItem(hwndDlg, IDC_CLIENT_PASSWORD), state);
+            EnableWindow(GetDlgItem(hwndDlg, IDC_CLIENT_HOST), state);
+            EnableWindow(GetDlgItem(hwndDlg, IDC_CLIENT_USER), state);
+            EnableWindow(GetDlgItem(hwndDlg, IDC_CLIENT_PASSWORD_DESC), state);
+            EnableWindow(GetDlgItem(hwndDlg, IDC_CLIENT_HOST_DESC), state);
+            EnableWindow(GetDlgItem(hwndDlg, IDC_CLIENT_USER_DESC), state);
+            EnableWindow(GetDlgItem(hwndDlg, IDC_CLIENT_REMOTEPROGRAM), state);
+            EnableWindow(GetDlgItem(hwndDlg, IDC_CLIENT_REMOTEPROGRAM_DESC), state);
+            EnableWindow(GetDlgItem(hwndDlg, IDC_CLIENT_PRIVATEKEY), state);
+            EnableWindow(GetDlgItem(hwndDlg, IDC_CLIENT_PRIVATEKEY_DESC), state);
+            EnableWindow(GetDlgItem(hwndDlg, IDC_CLIENT_PROGRAM), !state);
+            EnableWindow(GetDlgItem(hwndDlg, IDC_CLIENT_PROGRAM_DESC), !state);
+        }
+        /// @brief Enable or disable the control for XDMCP connection.
+        /// @param hwndDlg Handle to active page dialog.
+        /// @param state State of control group.
+        void EnableXDMCPQueryGroup(HWND hwndDlg, BOOL state)
+        {
+            EnableWindow(GetDlgItem(hwndDlg, IDC_XDMCP_HOST), state);
+            EnableWindow(GetDlgItem(hwndDlg, IDC_XDMCP_INDIRECT), state);
+        }
+        /// @brief Fill program box with default values.
+        /// @param hwndDlg Handle to active page dialog.
+        void FillProgramBox(HWND hwndDlg)
+        {
+            HWND cbwnd = GetDlgItem(hwndDlg, IDC_CLIENT_PROGRAM);
+            if (cbwnd == NULL)
+                return;
+            SendMessage(cbwnd, CB_RESETCONTENT, 0, 0);
+            SendMessage(cbwnd, CB_ADDSTRING, 0, (LPARAM) "xcalc");
+            SendMessage(cbwnd, CB_ADDSTRING, 0, (LPARAM) "xclock");
+            SendMessage(cbwnd, CB_ADDSTRING, 0, (LPARAM) "xwininfo");
+            SendMessage(cbwnd, CB_SETCURSEL, 0, 0);
+        }
+        void ShowSaveDialog(HWND parent)
+        {
+            char szTitle[512];
+            char szFilter[512];
+            char szFileTitle[512];
+            char szFile[MAX_PATH];
+            HINSTANCE hInst = GetModuleHandle(NULL);
+
+            LoadString(hInst, IDS_SAVE_TITLE, szTitle, sizeof(szTitle));
+            LoadString(hInst, IDS_SAVE_FILETITLE, szFileTitle, sizeof(szFileTitle));
+            LoadString(hInst, IDS_SAVE_FILTER, szFilter, sizeof(szFilter));
+            for (unsigned i=0; szFilter[i]; i++)
+                if (szFilter[i] == '%')
+                    szFilter[i] = '\0';
+
+            strcpy(szFile, "config.xlaunch");
+
+            OPENFILENAME ofn;
+            memset(&ofn, 0, sizeof(OPENFILENAME));
+            ofn.lStructSize = sizeof(OPENFILENAME);
+            ofn.hwndOwner = parent;
+            ofn.lpstrFilter = szFilter;
+            ofn.lpstrFile= szFile;
+            ofn.nMaxFile = sizeof(szFile)/ sizeof(*szFile);
+            ofn.lpstrFileTitle = szFileTitle;
+            ofn.nMaxFileTitle = sizeof(szFileTitle);
+            ofn.lpstrInitialDir = (LPSTR)NULL;
+            ofn.Flags = OFN_SHOWHELP | OFN_OVERWRITEPROMPT;
+            ofn.lpstrTitle = szTitle;
+
+            if (GetSaveFileName(&ofn))
+            {
+                try {
+                          config.Save(ofn.lpstrFile);
+                } catch (std::runtime_error &e)
+                {
+                char Message[255];
+                sprintf(Message,"Failure: %s\n", e.what());
+                MessageBox(NULL,Message,"Exception",MB_OK);
+                }
+            }
+        }
+    public:
+
+        /// @brief Handle messages fo the dialog pages.
+        /// @param hwndDlg Handle of active dialog.
+        /// @param uMsg Message code.
+        /// @param wParam Message parameter.
+        /// @param lParam Message parameter.
+        /// @param psp Handle to sheet paramters.
+        virtual INT_PTR PageDispatch(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam, PROPSHEETPAGE *psp)
+        {
+            HWND hwnd;
+            switch (uMsg)
+            {
+                case WM_INITDIALOG:
+                    switch (PageID(PageIndex(psp)))
+                    {
+                        case IDD_DISPLAY:
+                            // Init display dialog. Enable correct check buttons
+                            switch (config.window)
+                            {
+                                default:
+                                case CConfig::MultiWindow:
+                                    CheckRadioButton(hwndDlg, IDC_MULTIWINDOW, IDC_NODECORATION, IDC_MULTIWINDOW);
+                                    break;
+                                case  CConfig::Fullscreen:
+                                    CheckRadioButton(hwndDlg, IDC_MULTIWINDOW, IDC_NODECORATION, IDC_FULLSCREEN);
+                                    break;
+                                case  CConfig::Windowed:
+                                    CheckRadioButton(hwndDlg, IDC_MULTIWINDOW, IDC_NODECORATION, IDC_WINDOWED);
+                                    break;
+                                case  CConfig::Nodecoration:
+                                    CheckRadioButton(hwndDlg, IDC_MULTIWINDOW, IDC_NODECORATION, IDC_NODECORATION);
+                                    break;
+                            }
+                            // Set display number
+                            SetDlgItemText(hwndDlg, IDC_DISPLAY, config.display.c_str());
+                            break;
+                        case IDD_CLIENTS:
+                            // Init client dialog. Enable correct check buttons
+                            switch (config.client)
+                            {
+                                default:
+                                case CConfig::NoClient:
+                                    CheckRadioButton(hwndDlg, IDC_CLIENT_NONE, IDC_CLIENT, IDC_CLIENT_NONE);
+                                    break;
+                                case CConfig::StartProgram:
+                                    CheckRadioButton(hwndDlg, IDC_CLIENT_NONE, IDC_CLIENT, IDC_CLIENT);
+                                    break;
+                                case CConfig::XDMCP:
+                                    CheckRadioButton(hwndDlg, IDC_CLIENT_NONE, IDC_CLIENT, IDC_XDMCP);
+                                    break;
+                            }
+                            break;
+                        case IDD_PROGRAM:
+                            // Init program dialog. Check local and remote buttons
+                            CheckRadioButton(hwndDlg, IDC_CLIENT_LOCAL, IDC_CLIENT_REMOTE, config.local?IDC_CLIENT_LOCAL:IDC_CLIENT_REMOTE);
+                            EnableRemoteProgramGroup(hwndDlg, config.local?FALSE:TRUE);
+                            // Fill combo boxes
+                            FillProgramBox(hwndDlg);
+                            // Set edit fields
+                            SetDlgItemText(hwndDlg, IDC_CLIENT_PROGRAM, config.localprogram.c_str());
+                            SetDlgItemText(hwndDlg, IDC_CLIENT_REMOTEPROGRAM, config.remoteprogram.c_str());
+                            SetDlgItemText(hwndDlg, IDC_CLIENT_USER, config.user.c_str());
+                            SetDlgItemText(hwndDlg, IDC_CLIENT_HOST, config.host.c_str());
+                            SetDlgItemText(hwndDlg, IDC_CLIENT_PASSWORD, config.remotepassword.c_str());
+                            SetDlgItemText(hwndDlg, IDC_CLIENT_PRIVATEKEY, config.privatekey.c_str());
+                            break;
+                        case IDD_XDMCP:
+                            // Init XDMCP dialog. Check broadcast and indirect button
+                            CheckRadioButton(hwndDlg, IDC_XDMCP_QUERY, IDC_XDMCP_BROADCAST, config.broadcast?IDC_XDMCP_BROADCAST:IDC_XDMCP_QUERY);
+                            CheckDlgButton(hwndDlg, IDC_XDMCP_INDIRECT, config.indirect?BST_CHECKED:BST_UNCHECKED);
+                            EnableXDMCPQueryGroup(hwndDlg, config.broadcast?FALSE:TRUE);
+                            // Set hostname
+                            SetDlgItemText(hwndDlg, IDC_XDMCP_HOST, config.xdmcp_host.c_str());
+                            CheckDlgButton(hwndDlg, IDC_XDMCP_TERMINATE, config.xdmcpterminate?BST_CHECKED:BST_UNCHECKED);
+                            break;
+                        case IDD_EXTRA:
+                            CheckDlgButton(hwndDlg, IDC_CLIPBOARD, config.clipboard?BST_CHECKED:BST_UNCHECKED);
+                            CheckDlgButton(hwndDlg, IDC_CLIPBOARDPRIMARY, config.clipboardprimary?BST_CHECKED:BST_UNCHECKED);
+                            CheckDlgButton(hwndDlg, IDC_WGL, config.wgl?BST_CHECKED:BST_UNCHECKED);
+                            CheckDlgButton(hwndDlg, IDC_DISABLEAC, config.disableac?BST_CHECKED:BST_UNCHECKED);
+                            SetDlgItemText(hwndDlg, IDC_EXTRA_PARAMS, config.extra_params.c_str());
+                            break;
+
+                    }
+                case WM_COMMAND:
+                    // Handle control messages
+                    switch (LOWORD(wParam))
+                    {
+                        // Handle clicks on images. Check proper radiobutton
+                        case IDC_MULTIWINDOW_IMG:
+                        case IDC_FULLSCREEN_IMG:
+                        case IDC_WINDOWED_IMG:
+                        case IDC_NODECORATION_IMG:
+                            CheckRadioButton(hwndDlg, IDC_MULTIWINDOW, IDC_NODECORATION, LOWORD(wParam)-4);
+                            SetFocus(GetDlgItem(hwndDlg, LOWORD(wParam)-4));
+                            break;
+                        // Disable unavailable controls
+                        case IDC_CLIENT_REMOTE:
+                        case IDC_CLIENT_LOCAL:
+                            EnableRemoteProgramGroup(hwndDlg, LOWORD(wParam) == IDC_CLIENT_REMOTE);
+                            break;
+                        case IDC_XDMCP_QUERY:
+                        case IDC_XDMCP_BROADCAST:
+                            EnableXDMCPQueryGroup(hwndDlg, LOWORD(wParam) == IDC_XDMCP_QUERY);
+                            break;
+                        case IDC_FINISH_SAVE:
+                            ShowSaveDialog(hwndDlg);
+                            break;
+                    }
+            }
+            // pass messages to parent
+            return CWizard::PageDispatch(hwndDlg, uMsg, wParam, lParam, psp);
+        }
+
+        /// @brief Try to connect to server.
+        /// Repeat until successful, server died or maximum number of retries
+        /// reached.
+        Display *WaitForServer(HANDLE serverProcess)
+        {
+            int     ncycles  = 120;         /* # of cycles to wait */
+            int     cycles;                 /* Wait cycle count */
+            Display *xd;
+
+            for (cycles = 0; cycles < ncycles; cycles++) {
+                if ((xd = XOpenDisplay(NULL))) {
+                    return xd;
+                }
+                else {
+                    if (WaitForSingleObject(serverProcess, 1000) == WAIT_TIMEOUT)
+                        continue;
+                }
+            }
+            return NULL;
+        }
+
+        /// @brief Do the actual start of VCXsrv and clients
+        void StartUp()
+        {
+            std::string buffer;
+            std::string client;
+
+            // Construct display strings
+            int DisplayNbr=atoi(config.display.c_str());
+            std::string display_id = ":" + config.display;
+            std::string display = "DISPLAY=127.0.0.1" + display_id + ".0";
+
+            // Build Xsrv commandline
+            buffer = "vcxsrv ";
+            if (DisplayNbr!=-1)
+              buffer += display_id + " ";
+            switch (config.window)
+            {
+                case CConfig::MultiWindow:
+                    buffer += "-multiwindow ";
+                    break;
+                case CConfig::Fullscreen:
+                    buffer += "-fullscreen ";
+                    break;
+                case CConfig::Nodecoration:
+                    buffer += "-nodecoration ";
+                    break;
+                default:
+                    break;
+            }
+            // Add XDMCP parameter
+            if (config.client == CConfig::XDMCP)
+            {
+                if (config.broadcast)
+                    buffer += "-broadcast ";
+                else
+                {
+                    if (config.indirect)
+                        buffer += "-indirect ";
+                    else
+                        buffer += "-query ";
+                    buffer += config.xdmcp_host;
+                    buffer += " ";
+                }
+                if (config.xdmcpterminate)
+                    buffer += "-terminate ";
+            }
+            if (config.clipboard)
+                buffer += "-clipboard ";
+            if (!config.clipboardprimary)
+                buffer += "-noclipboardprimary ";
+            if (config.wgl)
+                buffer += "-wgl ";
+            if (config.disableac)
+                buffer += "-ac ";
+            if (!config.extra_params.empty())
+            {
+                buffer += config.extra_params;
+                buffer += " ";
+            }
+
+            int *pDisplayfd;
+            if (DisplayNbr==-1)
+            {
+              // Pass the handle of some shared memory to vcxsrv to getting back the display nbr
+              SECURITY_ATTRIBUTES sa;
+              sa.nLength=sizeof(sa);
+              sa.lpSecurityDescriptor=NULL;
+              sa.bInheritHandle=TRUE;
+              HANDLE hDisplayFdMem=CreateFileMapping(INVALID_HANDLE_VALUE, &sa, PAGE_READWRITE, 0, sizeof(int), NULL);
+              pDisplayfd=(int*)MapViewOfFile(hDisplayFdMem, FILE_MAP_READ|FILE_MAP_WRITE, 0, 0, 0);
+              *pDisplayfd=-1;  // Not yet initialised
+              buffer+="-displayfd ";
+              std::stringstream ss;
+              ss<<(int)hDisplayFdMem;
+              buffer+=ss.str();
+            }
+            // Construct client commandline
+            if (config.client == CConfig::StartProgram)
+            {
+                if (!config.local)
+                {
+                    char cmdline[512];
+                    std::string host = config.host;
+                    std::string remotepassword;
+                    if (!config.user.empty())
+                        host = config.user + "@" + config.host;
+                    if (!config.remotepassword.empty())
+                      remotepassword=std::string(" -pw ")+config.remotepassword;
+                    if (!config.privatekey.empty())
+                      remotepassword+=std::string(" -i \"")+config.privatekey+"\"";
+                    _snprintf(cmdline,512,"plink -ssh -X%s %s %s",
+                                remotepassword.c_str(), host.c_str(),config.remoteprogram.c_str());
+                    client += cmdline;
+                }
+                else
+                {
+                    client += config.localprogram.c_str();
+                }
+            }
+
+            // Prepare program startup
+            STARTUPINFO si, sic;
+            PROCESS_INFORMATION pi, pic;
+            DWORD hcount = 0;
+            Display *dpy = NULL;
+
+            ZeroMemory( &si, sizeof(si) );
+            si.cb = sizeof(si);
+            ZeroMemory( &pi, sizeof(pi) );
+            ZeroMemory( &sic, sizeof(sic) );
+            sic.cb = sizeof(sic);
+            ZeroMemory( &pic, sizeof(pic) );
+
+            // Start VCXsrv process.
+#ifdef _DEBUG
+            printf("%s\n", buffer.c_str());
+#endif
+            char CurDir[MAX_PATH];
+            GetModuleFileName(NULL,CurDir,MAX_PATH);
+            *strrchr(CurDir,'\\')=0;
+
+            if( !CreateProcess( NULL, (CHAR*)buffer.c_str(), NULL, NULL,
+                        TRUE, 0, NULL, CurDir, &si, &pi ))
+                throw win32_error("CreateProcess failed");
+
+            if (!client.empty())
+            {
+                if (DisplayNbr==-1)
+                {
+                  // Wait maximum 10 seconds
+                  int Count=1000;
+                  while (-1==*pDisplayfd)
+                  {
+                    if (Count-- < 0)
+                      throw std::runtime_error("Connection to server failed");
+                    Sleep(10);
+                  }
+                  std::stringstream ss;
+                  ss<<*pDisplayfd;
+                  display_id = ":" + ss.str();
+                  display = "DISPLAY=127.0.0.1" + display_id + ".0";
+                }
+                // Set DISPLAY variable
+                _putenv(display.c_str());
+
+                // Wait for server to startup
+                dpy = WaitForServer(pi.hProcess);
+                if (dpy == NULL)
+                {
+                    TerminateProcess(pi.hProcess, (DWORD)-1);
+                    throw std::runtime_error("Connection to server failed");
+                }
+
+#ifdef _DEBUG
+                printf("%s\n", client.c_str());
+#endif
+
+                // Start the child process.
+
+                #if 1
+                // Create a console, otherwise some commands will not execute with plink
+                HWINSTA h=GetProcessWindowStation();
+                HWND hConsoleWnd=NULL;
+                if (h)
+                {
+                  AllocConsole();
+                  hConsoleWnd=GetConsoleWindow();
+                  ShowWindow(hConsoleWnd, SW_HIDE );  // make it hidden, the disadvantage of this method is that the console window flashes
+                  // but we must be able to show it when the client puts some output
+                }
+
+                HANDLE hChildStdinRd;
+                HANDLE hChildStdinWr;
+                HANDLE hChildStdoutRd;
+                HANDLE hChildStdoutWr;
+                SECURITY_ATTRIBUTES saAttr;
+                BOOL fSuccess;
+
+                saAttr.nLength = sizeof(SECURITY_ATTRIBUTES);
+                saAttr.bInheritHandle = TRUE;
+                saAttr.lpSecurityDescriptor = NULL;
+
+                if (!CreatePipe(&hChildStdinRd, &hChildStdinWr, &saAttr, 0))
+                  throw win32_error("CreatePipe failed", GetLastError());
+
+                // Ensure the write handle to the pipe for STDIN is not inherited. 

+                if ( ! SetHandleInformation(hChildStdinWr, HANDLE_FLAG_INHERIT, 0) )

+                  throw win32_error("SetHandleInformation failed", GetLastError());
+
+                if (!CreatePipe(&hChildStdoutRd, &hChildStdoutWr, &saAttr, 0))
+                  throw win32_error("CreatePipe failed", GetLastError());
+
+                // Ensure the read handle to the pipe for STDOUT is not inherited. 

+                if ( ! SetHandleInformation(hChildStdoutRd, HANDLE_FLAG_INHERIT, 0) )

+                  throw win32_error("SetHandleInformation failed", GetLastError());
+
+                sic.dwFlags = STARTF_USESTDHANDLES;
+                sic.hStdInput = hChildStdinRd;
+                sic.hStdOutput = hChildStdoutWr;
+                sic.hStdError = hChildStdoutWr;
+
+                if (!CreateProcess(NULL,(CHAR*)client.c_str(),NULL,NULL,TRUE,0,NULL, CurDir, &sic, &pic))
+                {
+                  DWORD err = GetLastError();
+                  TerminateProcess(pi.hProcess, (DWORD)-1);
+                  throw win32_error("CreateProcess failed", err);
+                }
+                CloseHandle(hChildStdinRd);
+                CloseHandle(hChildStdoutWr);
+                CloseHandle(pic.hThread);
+
+                int hStdIn = _open_osfhandle((long)hChildStdinWr, _O_WRONLY|_O_BINARY);
+                int hStdOut = _open_osfhandle((long)hChildStdoutRd, _O_RDONLY|_O_BINARY);
+                HANDLE hConsoleInput=GetStdHandle(STD_INPUT_HANDLE);
+                HANDLE hConsoleOutput=GetStdHandle(STD_OUTPUT_HANDLE);
+                SetConsoleMode(hConsoleInput, 0);  // Needed to disable local echo, and return only upon carriage return of read function
+                while (1)
+                {
+                  if (!WaitForSingleObject(pic.hProcess, 20 ))
+                  {
+                      // Child does not exist anymore, but it could be that there is still error output in the pipes
+                      // So wait some time, that then check the output again
+                    Sleep(500);
+                    CheckOutput(hChildStdoutRd, hStdOut, hStdIn);
+                    break;
+                  }
+                  if (!WaitForSingleObject(pi.hProcess, 0))
+                  {
+                    TerminateProcess(pic.hProcess, (DWORD)-1);
+                    break;
+                  }
+                  CheckOutput(hChildStdoutRd, hStdOut, hStdIn);
+                }
+                #else
+                // Hide a console window
+                // FIXME: This may make it impossible to enter the password
+                sic.dwFlags = STARTF_USESHOWWINDOW;
+                sic.wShowWindow = SW_HIDE;
+
+                if( !CreateProcess( NULL, (CHAR*)client.c_str(), NULL, NULL,
+                            FALSE, 0, NULL, CurDir, &sic, &pic ))
+                {
+                  DWORD err = GetLastError();
+                  while (hcount--)
+                      TerminateProcess(handles[hcount], (DWORD)-1);
+                  throw win32_error("CreateProcess failed", err);
+                }
+                CloseHandle( pic.hThread );
+                #endif
+            }
+
+            // Wait until child process exits.
+            DWORD ret = WaitForSingleObject(pic.hProcess, INFINITE );
+
+#ifdef _DEBUG
+            printf("killing process!\n");
+#endif
+            // Check if Xsrv is still running, but only when we started a local program
+            if (config.local)
+            {
+              DWORD exitcode;
+              GetExitCodeProcess(pi.hProcess, &exitcode);
+              unsigned counter = 0;
+              while (exitcode == STILL_ACTIVE)
+              {
+                if (++counter > 10)
+                    TerminateProcess(pi.hProcess, (DWORD)-1);
+                else
+                    // Shutdown Xsrv (the soft way!)
+                    EnumThreadWindows(pi.dwThreadId, KillWindowsProc, 0);
+                Sleep(500);
+                GetExitCodeProcess(pi.hProcess, &exitcode);
+              }
+            }
+
+            // Close process and thread handles.
+            CloseHandle( pi.hProcess );
+            CloseHandle( pi.hThread );
+            CloseHandle( pic.hProcess );
+        }
+};
+
+int main(int argc, char **argv)
+{
+    try {
+        InitCommonControls();
+        CMyWizard dialog;
+
+        bool skip_wizard = false;
+
+        for (int i = 1; i < argc; i++)
+        {
+            if (argv[i] == NULL)
+                continue;
+
+            std::string arg(argv[i]);
+            if (arg == "-load" && i + 1 < argc)
+            {
+                i++;
+                dialog.LoadConfig(argv[i]);
+                continue;
+            }
+            if (arg == "-run" && i + 1 < argc)
+            {
+                i++;
+                dialog.LoadConfig(argv[i]);
+                skip_wizard = true;
+                continue;
+            }
+        }
+
+        int ret = 0;
+        if (skip_wizard || (ret =dialog.ShowModal()) != 0)
+            dialog.StartUp();
+#ifdef _DEBUG
+        printf("return %d\n", ret);
+#endif
+        return 0;
+    } catch (std::runtime_error &e)
+    {
+                char Message[255];
+                sprintf(Message,"Failure: %s\n", e.what());
+                MessageBox(NULL,Message,"Exception",MB_OK);
+        return -1;
+    }
+}
diff --git a/xorg-server/hw/xwin/xlaunch/makefile b/xorg-server/hw/xwin/xlaunch/makefile
new file mode 100644
index 000000000..98656e57e
--- /dev/null
+++ b/xorg-server/hw/xwin/xlaunch/makefile
@@ -0,0 +1,28 @@
+INCLUDELIBFILES = window\$(OBJDIR)\window.lib \

+                  $(MHMAKECONF)\libX11\$(OBJDIR)\libX11.lib \

+                  $(MHMAKECONF)\libxcb\src\$(OBJDIR)\libxcb.lib \

+                  $(MHMAKECONF)\libXau\$(OBJDIR)\libXau.lib

+

+CSRCS=config.cc main.cc

+

+INCLUDES += $(MHMAKECONF)\libxml2\include

+

+WINAPP = xlaunch

+

+RESOURCES = resources.rc

+

+$(OBJDIR)\%.res : resources\%.rc $(wildcard resources\*.rc) 

+	$(RC) $(RCFLAGS) $(RCDEFINES:%=-d "%") $(RCINCLUDES:%=-i %) -Fo$(relpath $@) $<

+

+LIBDIRS=$(dir $(INCLUDELIBFILES))

+

+load_makefile $(LIBDIRS:%$(OBJDIR)\=%makefile MAKESERVER=0 DEBUG=$(DEBUG);)

+

+LINKLIBS += $(MHMAKECONF)\libxml2\lib\libxml2.lib

+

+ifeq ($(DEBUG),1)

+LINKLIBS += $(MHMAKECONF)\pthreads\pthreadVC2d.lib

+else

+LINKLIBS += $(MHMAKECONF)\pthreads\pthreadVC2.lib

+endif

+

diff --git a/xorg-server/hw/xwin/xlaunch/resources/dialog.rc b/xorg-server/hw/xwin/xlaunch/resources/dialog.rc
new file mode 100644
index 000000000..3435329b2
--- /dev/null
+++ b/xorg-server/hw/xwin/xlaunch/resources/dialog.rc
@@ -0,0 +1,153 @@
+/*
+ * Copyright (c) 2005 Alexander Gottwald
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above copyright
+ * holders shall not be used in advertising or otherwise to promote the sale,
+ * use or other dealings in this Software without prior written authorization.
+ */
+#include <windows.h>
+#include "resources.h"
+
+#ifndef STR_CAPTION_DISPLAY
+#include "strings.rc"
+#endif
+
+IDD_DISPLAY DIALOGEX 0, 0, 317, 143
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_CENTERMOUSE
+CAPTION STR_CAPTION_DISPLAY
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    AUTORADIOBUTTON STR_MULTIWINDOW,IDC_MULTIWINDOW,7,25,70,24,BS_MULTILINE|BS_TOP
+    AUTORADIOBUTTON STR_FULLSCREEN,IDC_FULLSCREEN,157,25,70,24,BS_MULTILINE|BS_TOP
+    AUTORADIOBUTTON STR_WINDOWED,IDC_WINDOWED,7,75,70,24,BS_MULTILINE|BS_TOP
+    AUTORADIOBUTTON STR_NODECORATION,IDC_NODECORATION,157,75,70,24,BS_MULTILINE|BS_TOP
+
+    CONTROL         "IMG_MULTIWINDOW",IDC_MULTIWINDOW_IMG,"Static",SS_BITMAP | SS_NOTIFY,80,10,0,0
+    CONTROL         "IMG_FULLSCREEN",IDC_FULLSCREEN_IMG,"Static",SS_BITMAP | SS_NOTIFY,230,10,0,0
+    CONTROL         "IMG_WINDOWED",IDC_WINDOWED_IMG,"Static",SS_BITMAP | SS_NOTIFY,80,60,0,0
+    CONTROL         "IMG_NODECORATION",IDC_NODECORATION_IMG,"Static",SS_BITMAP | SS_NOTIFY,230,60,0,0
+
+    LTEXT           STR_DISPLAY_DESC,IDC_DISPLAY_DESC,7,120,64,12
+    LTEXT           STR_DISPLAY_EXTRA_DESC,IDC_DISPLAY_EXTRA_DESC,7,132,200,12
+    EDITTEXT        IDC_DISPLAY,80,118,67,12
+END
+
+IDD_CLIENTS DIALOGEX 0, 0, 317, 143
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_CENTERMOUSE
+CAPTION STR_CAPTION_CLIENTS
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    AUTORADIOBUTTON STR_CLIENT_NONE,IDC_CLIENT_NONE,7,14,300,10
+    AUTORADIOBUTTON STR_CLIENT,IDC_CLIENT,7,56,300,10
+    AUTORADIOBUTTON STR_XDMCP,IDC_XDMCP,7,98,300,10
+
+    LTEXT           STR_CLIENT_NONE_DESC,IDC_CLIENT_NONE_DESC,19,28,280,27
+    LTEXT           STR_CLIENT_DESC,IDC_CLIENT_DESC,19,70,280,27
+    LTEXT           STR_XDMCP_DESC,IDC_XDMCP_DESC,19,112,280,27
+END
+
+IDD_PROGRAM DIALOGEX 0, 0, 317, 143
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_CENTERMOUSE
+CAPTION STR_CAPTION_PROGRAM
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    AUTORADIOBUTTON STR_CLIENT_LOCAL,IDC_CLIENT_LOCAL,7,14,300,10
+    AUTORADIOBUTTON STR_CLIENT_REMOTE,IDC_CLIENT_REMOTE,7,50,300,10
+
+    LTEXT           STR_CLIENT_PROGRAM_DESC,IDC_CLIENT_PROGRAM_DESC,19,28,64,10
+    COMBOBOX        IDC_CLIENT_PROGRAM,110,26,64,54,CBS_DROPDOWN | WS_VSCROLL
+
+    
+    LTEXT           STR_CLIENT_REMOTEPROGRAM_DESC,IDC_CLIENT_REMOTEPROGRAM_DESC,19,64,70,10
+    EDITTEXT        IDC_CLIENT_REMOTEPROGRAM,110,62,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+
+    LTEXT           STR_CLIENT_PASSWORD_DESC,IDC_CLIENT_PASSWORD_DESC,19,78,70,10
+    EDITTEXT        IDC_CLIENT_PASSWORD,110,76,64,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    
+
+    LTEXT           STR_CLIENT_HOST_DESC,IDC_CLIENT_HOST_DESC,19,92,70,10
+    EDITTEXT        IDC_CLIENT_HOST,110,90,64,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+    
+    LTEXT           STR_CLIENT_USER_DESC,IDC_CLIENT_USER_DESC,19,106,70,10
+    EDITTEXT        IDC_CLIENT_USER,110,104,64,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+
+    LTEXT           STR_CLIENT_PRIVATEKEY_DESC,IDC_CLIENT_PRIVATEKEY_DESC,19,120,90,10
+    EDITTEXT        IDC_CLIENT_PRIVATEKEY,110,118,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+END
+
+IDD_XDMCP DIALOGEX 0, 0, 317, 143
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_CENTERMOUSE
+CAPTION STR_CAPTION_XDMCP
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    AUTORADIOBUTTON STR_XDMCP_QUERY, IDC_XDMCP_QUERY,7,14,64,10
+    EDITTEXT        IDC_XDMCP_HOST,78,12,64,12
+    AUTOCHECKBOX    STR_XDMCP_INDIRECT,IDC_XDMCP_INDIRECT,19,28,280,10
+    AUTORADIOBUTTON STR_XDMCP_BROADCAST, IDC_XDMCP_BROADCAST,7,42,300,10
+    LTEXT           STR_XDMCP_QUERY_DESC,IDC_XDMCP_QUERY_DESC,7,66,300,42
+    AUTOCHECKBOX    STR_XDMCP_TERMINATE,IDC_XDMCP_TERMINATE,7,94,300,10
+END
+
+IDD_EXTRA DIALOGEX 0, 0, 317, 143
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_CENTERMOUSE
+CAPTION STR_CAPTION_EXTRA
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    AUTOCHECKBOX    STR_CLIPBOARD,IDC_CLIPBOARD,7,10,300,10
+    LTEXT           STR_CLIPBOARD_DESC,IDC_CLIPBOARD_DESC,19,20,280,27
+
+    AUTOCHECKBOX    STR_CLIPBOARDPRIMARY,IDC_CLIPBOARDPRIMARY,19,30,300,10
+    LTEXT           STR_CLIPBOARDPRIMARY_DESC,IDC_CLIPBOARDPRIMARY_DESC,31,40,280,27
+
+    AUTOCHECKBOX    STR_WGL,IDC_WGL,7,52,300,10
+    LTEXT           STR_WGL_DESC,IDC_WGL_DESC,19,62,280,27
+
+    AUTOCHECKBOX    STR_DISABLEAC,IDC_DISABLEAC,7,82,300,10
+    LTEXT           STR_DISABLEAC_DESC,IDC_DISABLEAC_DESC,19,92,280,27
+
+    LTEXT           STR_EXTRA_PARAMS_DESC,IDC_EXTRA_PARAMS_DESC,7,105,280,10
+    EDITTEXT        IDC_EXTRA_PARAMS,7,115,300,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
+END
+
+IDD_FINISH DIALOGEX 0, 0, 317, 143
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_CENTERMOUSE
+CAPTION STR_CAPTION_FINISH
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    LTEXT           STR_FINISH_DESC,IDC_FINISH_DESC,7,14,300,28
+    LTEXT           STR_FINISH_SAVE_DESC,IDC_FINISH_SAVE_DESC,7,56,300,12
+    PUSHBUTTON      STR_FINISH_SAVE,IDC_FINISH_SAVE,7,68,75,14 
+END
+
+/* Prompting dialog  */
+IDD_PROMPT DIALOGEX 32, 32, 260, 115
+STYLE DS_SETFONT | DS_CENTERMOUSE | WS_POPUP | WS_VISIBLE | WS_CAPTION
+EXSTYLE WS_EX_NOPARENTNOTIFY
+CAPTION "Input requested?"
+FONT 8, "MS Shell Dlg 2", 0, 0, 0x1
+BEGIN
+    LTEXT           "",IDC_PROMPT_DESC,7,7,245,50, WS_BORDER
+    EDITTEXT        IDC_INPUT,7,67,245,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL | ES_PASSWORD
+    AUTOCHECKBOX    "Show Characters", IDC_PASSWORD, 7,77,245,12, WS_TABSTOP
+    DEFPUSHBUTTON   "OK",IDOK,61,95,50,15, WS_TABSTOP
+    PUSHBUTTON      "Cancel",IDCANCEL,147,95,50,14, WS_TABSTOP
+END
+
diff --git a/xorg-server/hw/xwin/xlaunch/resources/fullscreen.bmp b/xorg-server/hw/xwin/xlaunch/resources/fullscreen.bmp
new file mode 100644
index 000000000..0d051f0b4
--- /dev/null
+++ b/xorg-server/hw/xwin/xlaunch/resources/fullscreen.bmp
diff --git a/xorg-server/hw/xwin/xlaunch/resources/images.rc b/xorg-server/hw/xwin/xlaunch/resources/images.rc
new file mode 100644
index 000000000..2eac53c93
--- /dev/null
+++ b/xorg-server/hw/xwin/xlaunch/resources/images.rc
@@ -0,0 +1,29 @@
+/*

+ * Copyright (c) 2005 Alexander Gottwald

+ *

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

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

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

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

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

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

+ *

+ * The above copyright notice and this permission notice shall be included in

+ * all copies or substantial portions of the Software.

+ *

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

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

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

+ * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

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

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

+ * DEALINGS IN THE SOFTWARE.

+ *

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

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

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

+ */

+IMG_MULTIWINDOW BITMAP "resources\\multiwindow.bmp"

+IMG_WINDOWED BITMAP "resources\\windowed.bmp"

+IMG_FULLSCREEN BITMAP "resources\\fullscreen.bmp"

+IMG_NODECORATION BITMAP "resources\\nodecoration.bmp"

diff --git a/xorg-server/hw/xwin/xlaunch/resources/multiwindow.bmp b/xorg-server/hw/xwin/xlaunch/resources/multiwindow.bmp
new file mode 100644
index 000000000..0755c87b4
--- /dev/null
+++ b/xorg-server/hw/xwin/xlaunch/resources/multiwindow.bmp
diff --git a/xorg-server/hw/xwin/xlaunch/resources/nodecoration.bmp b/xorg-server/hw/xwin/xlaunch/resources/nodecoration.bmp
new file mode 100644
index 000000000..e9e1ce690
--- /dev/null
+++ b/xorg-server/hw/xwin/xlaunch/resources/nodecoration.bmp
diff --git a/xorg-server/hw/xwin/xlaunch/resources/resources.h b/xorg-server/hw/xwin/xlaunch/resources/resources.h
new file mode 100644
index 000000000..256ebb9fa
--- /dev/null
+++ b/xorg-server/hw/xwin/xlaunch/resources/resources.h
@@ -0,0 +1,118 @@
+/*

+ * Copyright (c) 2005 Alexander Gottwald

+ *

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

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

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

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

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

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

+ *

+ * The above copyright notice and this permission notice shall be included in

+ * all copies or substantial portions of the Software.

+ *

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

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

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

+ * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

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

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

+ * DEALINGS IN THE SOFTWARE.

+ *

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

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

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

+ */

+

+#define IDC_STATIC                     -1

+

+#define IDD_WELCOME                   100

+#define IDD_FINISH                    101

+#define IDD_DISPLAY                   102

+#define IDD_CLIENTS                   103

+#define IDD_PROGRAM                   104

+#define IDD_XDMCP                     105

+#define IDD_FONTPATH                  106

+#define IDD_EXTRA                     107

+

+#define IDI_XLAUNCH                   108

+

+#define IDC_MULTIWINDOW               200

+#define IDC_WINDOWED                  201

+#define IDC_FULLSCREEN                202

+#define IDC_NODECORATION              203

+#define IDC_MULTIWINDOW_IMG           204

+#define IDC_WINDOWED_IMG              205

+#define IDC_FULLSCREEN_IMG            206

+#define IDC_NODECORATION_IMG          207

+#define IDC_DISPLAY                   208

+#define IDC_DISPLAY_DESC              209

+#define IDC_DISPLAY_EXTRA_DESC        210

+

+#define IDC_CLIENT_NONE               211

+#define IDC_XDMCP                     212

+#define IDC_CLIENT                    213

+#define IDC_CLIENT_LOCAL              214

+#define IDC_CLIENT_REMOTE             215

+#define IDC_CLIENT_HOST               216

+#define IDC_CLIENT_USER               217

+#define IDC_CLIENT_PASSWORD           218

+#define IDC_CLIENT_CONFIGURE          219

+#define IDC_CLIENT_PROGRAM            220

+#define IDC_XDMCP_QUERY               221

+#define IDC_XDMCP_BROADCAST           222

+#define IDC_XDMCP_INDIRECT            223

+#define IDC_XDMCP_HOST                224

+#define IDC_CLIENT_NONE_DESC          225

+#define IDC_XDMCP_DESC                226

+#define IDC_CLIENT_DESC               227

+#define IDC_XDMCP_QUERY_DESC          228

+#define IDC_CLIENT_PROGRAM_DESC       229

+#define IDC_CLIENT_HOST_DESC          230

+#define IDC_CLIENT_USER_DESC          231

+#define IDC_CLIENT_PASSWORD_DESC      232

+#define IDC_CLIENT_REMOTEPROGRAM      233

+#define IDC_CLIENT_REMOTEPROGRAM_DESC 234

+#define IDC_CLIENT_PRIVATEKEY         235

+#define IDC_CLIENT_PRIVATEKEY_DESC    236

+

+#define IDC_FONTPATH_DESC             240

+

+#define IDC_FINISH_DESC               250

+#define IDC_FINISH_SAVE               251

+#define IDC_FINISH_SAVE_DESC          252

+

+#define IDC_CLIPBOARD                 260

+#define IDC_CLIPBOARD_DESC            261

+#define IDC_EXTRA_PARAMS              262

+#define IDC_EXTRA_PARAMS_DESC         263

+#define IDC_WGL                       264

+#define IDC_WGL_DESC                  265

+#define IDC_CLIPBOARDPRIMARY          266

+#define IDC_CLIPBOARDPRIMARY_DESC     267

+#define IDC_DISABLEAC                 268

+#define IDC_DISABLEAC_DESC            269

+#define IDC_XDMCP_TERMINATE           270

+

+#define IDC_PROMPT_DESC               280

+#define IDC_INPUT                     281

+#define IDC_PASSWORD                  282

+

+#define IDS_DISPLAY_TITLE             300

+#define IDS_DISPLAY_SUBTITLE          301

+#define IDS_CLIENTS_TITLE             302

+#define IDS_CLIENTS_SUBTITLE          303

+#define IDS_PROGRAM_TITLE             304

+#define IDS_PROGRAM_SUBTITLE          305

+#define IDS_XDMCP_TITLE               306

+#define IDS_XDMCP_SUBTITLE            307

+#define IDS_FONTPATH_TITLE            308

+#define IDS_FONTPATH_SUBTITLE         309

+#define IDS_FINISH_TITLE              310

+#define IDS_FINISH_SUBTITLE           311

+#define IDS_EXTRA_TITLE               312

+#define IDS_EXTRA_SUBTITLE            313

+#define IDS_SAVE_TITLE                320

+#define IDS_SAVE_FILETITLE            321

+#define IDS_SAVE_FILTER               322

+                

diff --git a/xorg-server/hw/xwin/xlaunch/resources/resources.rc b/xorg-server/hw/xwin/xlaunch/resources/resources.rc
new file mode 100644
index 000000000..e3df4610a
--- /dev/null
+++ b/xorg-server/hw/xwin/xlaunch/resources/resources.rc
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2005 Alexander Gottwald
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above copyright
+ * holders shall not be used in advertising or otherwise to promote the sale,
+ * use or other dealings in this Software without prior written authorization.
+ */
+#include <windows.h>
+
+#include "resources.h"
+#include "images.rc"
+#include "dialog.rc"
+
+IDI_XLAUNCH		ICON	"..\\..\\X.ico"
diff --git a/xorg-server/hw/xwin/xlaunch/resources/strings.rc b/xorg-server/hw/xwin/xlaunch/resources/strings.rc
new file mode 100644
index 000000000..f34f46208
--- /dev/null
+++ b/xorg-server/hw/xwin/xlaunch/resources/strings.rc
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) 2005 Alexander Gottwald
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above copyright
+ * holders shall not be used in advertising or otherwise to promote the sale,
+ * use or other dealings in this Software without prior written authorization.
+ */
+
+#define STR_CAPTION_DISPLAY         "Display settings"
+#define STR_MULTIWINDOW             "Multiple windows"
+#define STR_FULLSCREEN              "Fullscreen"
+#define STR_WINDOWED                "One large window"
+#define STR_NODECORATION            "One window without titlebar"
+#define STR_DISPLAY_DESC            "Display number"
+#define STR_DISPLAY_EXTRA_DESC      "(Specify -1 to let vcxsrv automatically choose one)"
+
+#define STR_CAPTION_CLIENTS         "Client startup"
+#define STR_CLIENT_NONE             "Start no client"
+#define STR_CLIENT_NONE_DESC		"This will just start the xserver. You will be able to start local clients later."
+#define STR_CLIENT					"Start a program"
+#define STR_CLIENT_DESC				"This will start a local or remote program which will connect to the xserver. You will be able to start local clients later too. Remote programs are started using SSH."
+#define STR_XDMCP					"Open session via XDMCP"
+#define STR_XDMCP_DESC				"This will start a remote XDMCP session. Starting local clients later is limited. This option is not available with the ""Multiple windows"" mode."
+
+#define STR_CAPTION_PROGRAM         "Start program"
+#define STR_CLIENT_PROGRAM_DESC     "Local program"
+#define STR_CLIENT_LOCAL            "Start program on this computer"
+#define STR_CLIENT_REMOTE           "Start program on remote computer"
+#define STR_CLIENT_PASSWORD_DESC    "Password"
+#define STR_CLIENT_HOST_DESC        "Connect to computer"
+#define STR_CLIENT_USER_DESC        "Login as user"
+
+#define STR_CLIENT_REMOTEPROGRAM_DESC  "Remote program"
+#define STR_CLIENT_PRIVATEKEY_DESC     "Private key (putty format)"
+
+
+#define STR_CAPTION_XDMCP           "XDMCP settings"
+#define STR_XDMCP_QUERY             "Connect to host"
+#define STR_XDMCP_INDIRECT          "Use indirect connect"
+#define STR_XDMCP_BROADCAST         "Search for hosts (broadcast)"
+#define STR_XDMCP_QUERY_DESC        "Some XDMCP servers must be configured to allow remote connections. Please check the documentation about configuring XDMCP servers."
+
+
+#define STR_CAPTION_FONTPATH        "Fontpath settings"
+
+#define STR_CAPTION_EXTRA          "Extra settings"
+#define STR_CLIPBOARD               "Clipboard"
+#define STR_CLIPBOARD_DESC          "Start the integrated clipboard manager"
+#define STR_CLIPBOARDPRIMARY        "Primary Selection"
+#define STR_CLIPBOARDPRIMARY_DESC   "Also map the PRIMARY selection to the windows clipboard."
+#define STR_WGL                     "Native opengl"
+#define STR_WGL_DESC                "Use the native windows opengl library (wgl). Make sure to export the LIBGL_ALWAYS_INDIRECT environment variable."
+#define STR_EXTRA_PARAMS_DESC       "Additional parameters for VcXsrv"
+
+#define STR_DISABLEAC               "Disable access control"
+#define STR_DISABLEAC_DESC          "Use this when you want vcxsrv to accept connections from all clients."
+
+#define STR_XDMCP_TERMINATE          "Terminate on server reset."
+
+#define STR_CAPTION_FINISH          "Finish configuration"
+#define STR_FINISH_DESC	            "Configuration is complete. Click Finish to start VcXsrv."
+#define STR_FINISH_SAVE_DESC        "You may also save the configuration for later use."
+#define STR_FINISH_SAVE	            "Save configuration"
+
+#define STR_DISPLAY_TITLE           "Select display settings"
+#define STR_DISPLAY_SUBTITLE        "Choose how VcXsrv display programs"
+#define STR_CLIENTS_TITLE           "Select how to start clients"
+#define STR_CLIENTS_SUBTITLE        ""
+#define STR_PROGRAM_TITLE           "Specify the program to start"
+#define STR_PROGRAM_SUBTITLE        ""
+#define STR_XDMCP_TITLE             "Configure a remote XDMCP connection"
+#define STR_XDMCP_SUBTITLE          ""
+#define STR_FONTPATH_TITLE          "Define font locations"
+#define STR_FONTPATH_SUBTITLE       ""
+#define STR_FINISH_TITLE            "Configuration complete"
+#define STR_FINISH_SUBTITLE         ""
+#define STR_EXTRA_TITLE             "Extra settings"
+#define STR_EXTRA_SUBTITLE          ""
+
+#define STR_SAVE_TITLE              "Save configuration"
+#define STR_SAVE_FILETITLE          "Filename"
+#define STR_SAVE_FILTER             "Xlaunch Files (*.xlaunch)%*.xlaunch%%"
+
+STRINGTABLE
+BEGIN
+    IDS_DISPLAY_TITLE       STR_DISPLAY_TITLE       
+    IDS_DISPLAY_SUBTITLE    STR_DISPLAY_SUBTITLE    
+    IDS_CLIENTS_TITLE       STR_CLIENTS_TITLE       
+    IDS_CLIENTS_SUBTITLE    STR_CLIENTS_SUBTITLE    
+    IDS_PROGRAM_TITLE       STR_PROGRAM_TITLE       
+    IDS_PROGRAM_SUBTITLE    STR_PROGRAM_SUBTITLE    
+    IDS_XDMCP_TITLE         STR_XDMCP_TITLE         
+    IDS_XDMCP_SUBTITLE      STR_XDMCP_SUBTITLE      
+    IDS_FONTPATH_TITLE      STR_FONTPATH_TITLE      
+    IDS_FONTPATH_SUBTITLE   STR_FONTPATH_SUBTITLE   
+    IDS_FINISH_TITLE        STR_FINISH_TITLE      
+    IDS_FINISH_SUBTITLE     STR_FINISH_SUBTITLE   
+    IDS_EXTRA_TITLE         STR_EXTRA_TITLE      
+    IDS_EXTRA_SUBTITLE      STR_EXTRA_SUBTITLE   
+    IDS_SAVE_TITLE          STR_SAVE_TITLE
+    IDS_SAVE_FILETITLE      STR_SAVE_FILETITLE
+    IDS_SAVE_FILTER         STR_SAVE_FILTER
+END
diff --git a/xorg-server/hw/xwin/xlaunch/resources/windowed.bmp b/xorg-server/hw/xwin/xlaunch/resources/windowed.bmp
new file mode 100644
index 000000000..9eff2bff9
--- /dev/null
+++ b/xorg-server/hw/xwin/xlaunch/resources/windowed.bmp
diff --git a/xorg-server/hw/xwin/xlaunch/window/dialog.cc b/xorg-server/hw/xwin/xlaunch/window/dialog.cc
new file mode 100644
index 000000000..76e5c35ac
--- /dev/null
+++ b/xorg-server/hw/xwin/xlaunch/window/dialog.cc
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2005 Alexander Gottwald
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above copyright
+ * holders shall not be used in advertising or otherwise to promote the sale,
+ * use or other dealings in this Software without prior written authorization.
+ */
+#include <stdio.h>
+#include "dialog.h"
+#include "util.h"
+
+CBaseDialog::CBaseDialog() : CWindow(""), result(0)
+{
+}
+
+CDialog::CDialog(const char *res) : CBaseDialog(), resourcename(res) 
+{
+}
+
+HWND CDialog::CreateWindowHandle()
+{
+    HWND ret = CreateDialog(
+            GetModuleHandle(NULL),
+            resourcename.c_str(),
+            NULL,
+            DialogProc);
+    if (ret == NULL)
+        throw win32_error("CreateDialog failed");
+    return ret;
+}
+
+INT_PTR CALLBACK CBaseDialog::DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+    MessageDebug::debug(hwndDlg, uMsg, wParam, lParam, __FUNCTION__);
+	CBaseDialog* dialog = (CDialog*)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);
+	if (dialog != NULL)
+	    return dialog->DlgDispatch(hwndDlg, uMsg, wParam, lParam);
+    return FALSE;
+}
+
+INT_PTR CBaseDialog::DlgDispatch(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+    switch (uMsg)
+    {
+        case WM_COMMAND:
+            switch (LOWORD(wParam))
+            {
+                case IDOK:
+                case IDCANCEL:
+                    result = wParam;
+                    EndDialog(hwndDlg, wParam);
+                    DestroyWindow(hwndDlg);
+                    return TRUE;
+            }
+            break;
+    }
+    return FALSE;
+}
+
+INT_PTR CDialog::DlgDispatch(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+    return CBaseDialog::DlgDispatch(hwndDlg, uMsg, wParam, lParam);
+}
+
+int CBaseDialog::Execute()
+{
+    return CWindow::ShowModal();
+}
diff --git a/xorg-server/hw/xwin/xlaunch/window/dialog.h b/xorg-server/hw/xwin/xlaunch/window/dialog.h
new file mode 100644
index 000000000..073394bb2
--- /dev/null
+++ b/xorg-server/hw/xwin/xlaunch/window/dialog.h
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2005 Alexander Gottwald
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above copyright
+ * holders shall not be used in advertising or otherwise to promote the sale,
+ * use or other dealings in this Software without prior written authorization.
+ */
+#ifndef __DIALOG_H__
+#define __DIALOG_H__
+
+#include "window.h"
+class CBaseDialog : public CWindow
+{
+    private:
+        int result;
+    protected:
+        static INT_PTR CALLBACK DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+        virtual INT_PTR DlgDispatch(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+    public:
+        CBaseDialog();
+        int Execute();
+};
+
+class CDialog : public CBaseDialog
+{
+    private:
+        std::string resourcename;
+    protected:
+        virtual INT_PTR DlgDispatch(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+        virtual HWND CreateWindowHandle();
+    public:
+        CDialog(const char *res);
+};
+
+
+#endif
diff --git a/xorg-server/hw/xwin/xlaunch/window/makefile b/xorg-server/hw/xwin/xlaunch/window/makefile
new file mode 100644
index 000000000..18a33e728
--- /dev/null
+++ b/xorg-server/hw/xwin/xlaunch/window/makefile
@@ -0,0 +1,4 @@
+CSRCS=dialog.cc util.cc window.cc wizard.cc

+

+LIBRARY = window

+

diff --git a/xorg-server/hw/xwin/xlaunch/window/util.cc b/xorg-server/hw/xwin/xlaunch/window/util.cc
new file mode 100644
index 000000000..6f768348e
--- /dev/null
+++ b/xorg-server/hw/xwin/xlaunch/window/util.cc
@@ -0,0 +1,1114 @@
+/*
+ * Copyright (c) 2005 Alexander Gottwald
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above copyright
+ * holders shall not be used in advertising or otherwise to promote the sale,
+ * use or other dealings in this Software without prior written authorization.
+ */
+#include "util.h"
+
+const char * MessageDebug::notify_names[NOTIFY_NAMES_LEN];
+
+std::string win32_error::message(DWORD errorcode)
+{
+    LPVOID lpMsgBuf;
+    if (!FormatMessage( 
+                FORMAT_MESSAGE_ALLOCATE_BUFFER | 
+                FORMAT_MESSAGE_FROM_SYSTEM | 
+                FORMAT_MESSAGE_IGNORE_INSERTS,
+                NULL,
+                errorcode,
+                MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
+                (LPTSTR) &lpMsgBuf,
+                0,
+                NULL ))
+    {
+        return "Unknown error in FormatMessage";
+    }
+
+    std::string ret((LPCTSTR)lpMsgBuf);
+    LocalFree( lpMsgBuf );
+    return ret;
+}
+
+void MessageDebug::debug(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, const char *prefix)
+{
+#ifdef _DEBUG
+    static const char *psn_notify[] = {
+        "PSN_SETACTIVE",
+        "PSN_KILLACTIVE",
+        "PSN_APPLY",
+        "PSN_RESET",
+        NULL,
+        "PSN_HELP",
+        "PSN_WIZBACK",
+        "PSN_WIZNEXT",
+        "PSN_WIZFINISH",
+        "PSN_QUERYCANCEL" };
+    if (uMsg == WM_NOTIFY)
+    {
+        LPNMHDR pnmh = (LPNMHDR)lParam;
+        int psn_index = -(int)pnmh->code - 200;
+        if (psn_index >= 0 && psn_index < 10 && psn_notify[psn_index])
+            printf("%s: %08x %04x WM_NOTIFY (%s)\n", prefix, hwnd, wParam, psn_notify[psn_index]);
+        else if (pnmh->code < NOTIFY_NAMES_LEN && notify_names[pnmh->code])
+            printf("%s: %08x %04x WM_NOTIFY (%s)\n", prefix, hwnd, wParam, notify_names[pnmh->code]);
+        else
+            printf("%s: %08x %04x WM_NOTIFY (%u)\n", prefix, hwnd, wParam, pnmh->code);
+    }   
+    else if (uMsg >= MESSAGE_NAMES_LEN)
+        if (uMsg >= WM_USER)
+            printf("%s: %08x %04x %08x WM_USER + %d\n", prefix, hwnd, wParam, lParam, uMsg - WM_USER); 
+        else
+            printf("%s: %08x %04x %08x %d\n", prefix, hwnd, wParam, lParam, uMsg);
+    else if (uMsg >= 0 && uMsg < MESSAGE_NAMES_LEN && message_names[uMsg])
+        printf("%s: %08x %04x %08x %s\n", prefix, hwnd, wParam, lParam, message_names[uMsg]);
+#endif
+}
+
+
+const char * MessageDebug::message_names[MESSAGE_NAMES_LEN] = {
+	"WM_NULL",
+	"WM_CREATE",
+	"WM_DESTROY",
+	"WM_MOVE",
+	"4",
+	"WM_SIZE",
+	"WM_ACTIVATE",
+	"WM_SETFOCUS",
+	"WM_KILLFOCUS",
+	"9",
+	"WM_ENABLE",
+	"WM_SETREDRAW",
+	"WM_SETTEXT",
+	"WM_GETTEXT",
+	"WM_GETTEXTLENGTH",
+	"WM_PAINT",
+	"WM_CLOSE",
+	"WM_QUERYENDSESSION",
+	"WM_QUIT",
+	"WM_QUERYOPEN",
+	"WM_ERASEBKGND",
+	"WM_SYSCOLORCHANGE",
+	"WM_ENDSESSION",
+	"23",
+	"WM_SHOWWINDOW",
+	"25",
+	"WM_WININICHANGE",
+	"WM_DEVMODECHANGE",
+	"WM_ACTIVATEAPP",
+	"WM_FONTCHANGE",
+	"WM_TIMECHANGE",
+	"WM_CANCELMODE",
+	NULL /* WM_SETCURSOR */,
+	"WM_MOUSEACTIVATE",
+	"WM_CHILDACTIVATE",
+	"WM_QUEUESYNC",
+	"WM_GETMINMAXINFO",
+	"37",
+	"WM_PAINTICON",
+	"WM_ICONERASEBKGND",
+	"WM_NEXTDLGCTL",
+	"41",
+	"WM_SPOOLERSTATUS",
+	"WM_DRAWITEM",
+	"WM_MEASUREITEM",
+	"WM_DELETEITEM",
+	"WM_VKEYTOITEM",
+	"WM_CHARTOITEM",
+	"WM_SETFONT",
+	"WM_GETFONT",
+	"WM_SETHOTKEY",
+	"WM_GETHOTKEY",
+	"52",
+	"53",
+	"54",
+	"WM_QUERYDRAGICON",
+	"56",
+	"WM_COMPAREITEM",
+	"58",
+	"59",
+	"60",
+	"61",
+	"62",
+	"63",
+	"64",
+	"WM_COMPACTING",
+	"66",
+	"67",
+	"WM_COMMNOTIFY",
+	"69",
+	"WM_WINDOWPOSCHANGING",
+	"WM_WINDOWPOSCHANGED",
+	"WM_POWER",
+	"73",
+	"WM_COPYDATA",
+	"WM_CANCELJOURNAL",
+	"76",
+	"77",
+	"WM_NOTIFY",
+	"79",
+	"WM_INPUTLANGCHANGEREQUEST",
+	"WM_INPUTLANGCHANGE",
+	"WM_TCARD",
+	"WM_HELP",
+	"WM_USERCHANGED",
+	"WM_NOTIFYFORMAT",
+	"86",
+	"87",
+	"88",
+	"89",
+	"90",
+	"91",
+	"92",
+	"93",
+	"94",
+	"95",
+	"96",
+	"97",
+	"98",
+	"99",
+	"100",
+	"101",
+	"102",
+	"103",
+	"104",
+	"105",
+	"106",
+	"107",
+	"108",
+	"109",
+	"110",
+	"111",
+	"112",
+	"113",
+	"114",
+	"115",
+	"116",
+	"117",
+	"118",
+	"119",
+	"120",
+	"121",
+	"122",
+	"WM_CONTEXTMENU",
+	"WM_STYLECHANGING",
+	"WM_STYLECHANGED",
+	"WM_DISPLAYCHANGE",
+	"WM_GETICON",
+	"WM_SETICON",
+	"WM_NCCREATE",
+	"WM_NCDESTROY",
+	"WM_NCCALCSIZE",
+	NULL /* WM_NCHITTEST */,
+	"WM_NCPAINT",
+	"WM_NCACTIVATE",
+	"WM_GETDLGCODE",
+	"WM_SYNCPAINT",
+	"137",
+	"138",
+	"139",
+	"140",
+	"141",
+	"142",
+	"143",
+	"144",
+	"145",
+	"146",
+	"147",
+	"148",
+	"149",
+	"150",
+	"151",
+	"152",
+	"153",
+	"154",
+	"155",
+	"156",
+	"157",
+	"158",
+	"159",
+	NULL /* WM_NCMOUSEMOVE */,
+	"WM_NCLBUTTONDOWN",
+	"WM_NCLBUTTONUP",
+	"WM_NCLBUTTONDBLCLK",
+	"WM_NCRBUTTONDOWN",
+	"WM_NCRBUTTONUP",
+	"WM_NCRBUTTONDBLCLK",
+	"WM_NCMBUTTONDOWN",
+	"WM_NCMBUTTONUP",
+	"WM_NCMBUTTONDBLCLK",
+	"170",
+	"171",
+	"172",
+	"173",
+	"174",
+	"175",
+	"176",
+	"177",
+	"178",
+	"179",
+	"180",
+	"181",
+	"182",
+	"183",
+	"184",
+	"185",
+	"186",
+	"187",
+	"188",
+	"189",
+	"190",
+	"191",
+	"192",
+	"193",
+	"194",
+	"195",
+	"196",
+	"197",
+	"198",
+	"199",
+	"200",
+	"201",
+	"202",
+	"203",
+	"204",
+	"205",
+	"206",
+	"207",
+	"208",
+	"209",
+	"210",
+	"211",
+	"212",
+	"213",
+	"214",
+	"215",
+	"216",
+	"217",
+	"218",
+	"219",
+	"220",
+	"221",
+	"222",
+	"223",
+	"224",
+	"225",
+	"226",
+	"227",
+	"228",
+	"229",
+	"230",
+	"231",
+	"232",
+	"233",
+	"234",
+	"235",
+	"236",
+	"237",
+	"238",
+	"239",
+	"240",
+	"241",
+	"242",
+	"243",
+	"244",
+	"245",
+	"246",
+	"247",
+	"248",
+	"249",
+	"250",
+	"251",
+	"252",
+	"253",
+	"254",
+	"255",
+	"WM_KEYDOWN",
+	"WM_KEYUP",
+	"WM_CHAR",
+	"WM_DEADCHAR",
+	"WM_SYSKEYDOWN",
+	"WM_SYSKEYUP",
+	"WM_SYSCHAR",
+	"WM_SYSDEADCHAR",
+	"WM_CONVERTREQUESTEX",
+	"265",
+	"266",
+	"267",
+	"268",
+	"WM_IME_STARTCOMPOSITION",
+	"WM_IME_ENDCOMPOSITION",
+	"WM_IME_KEYLAST",
+	"WM_INITDIALOG",
+	"WM_COMMAND",
+	"WM_SYSCOMMAND",
+	NULL /* WM_TIMER */,
+	"WM_HSCROLL",
+	"WM_VSCROLL",
+	"WM_INITMENU",
+	"WM_INITMENUPOPUP",
+	"280",
+	"281",
+	"282",
+	"283",
+	"284",
+	"285",
+	"286",
+	"WM_MENUSELECT",
+	"WM_MENUCHAR",
+	"WM_ENTERIDLE",
+	"290",
+	"291",
+	"292",
+	"293",
+	"294",
+	"295",
+	"296",
+	"297",
+	"298",
+	"299",
+	"300",
+	"301",
+	"302",
+	"303",
+	"304",
+	"305",
+	"WM_CTLCOLORMSGBOX",
+	"WM_CTLCOLOREDIT",
+	"WM_CTLCOLORLISTBOX",
+	"WM_CTLCOLORBTN",
+	"WM_CTLCOLORDLG",
+	"WM_CTLCOLORSCROLLBAR",
+	"WM_CTLCOLORSTATIC",
+	"313",
+	"314",
+	"315",
+	"316",
+	"317",
+	"318",
+	"319",
+	"320",
+	"321",
+	"322",
+	"323",
+	"324",
+	"325",
+	"326",
+	"327",
+	"328",
+	"329",
+	"330",
+	"331",
+	"332",
+	"333",
+	"334",
+	"335",
+	"336",
+	"337",
+	"338",
+	"339",
+	"340",
+	"341",
+	"342",
+	"343",
+	"344",
+	"345",
+	"346",
+	"347",
+	"348",
+	"349",
+	"350",
+	"351",
+	"352",
+	"353",
+	"354",
+	"355",
+	"356",
+	"357",
+	"358",
+	"359",
+	"360",
+	"361",
+	"362",
+	"363",
+	"364",
+	"365",
+	"366",
+	"367",
+	"368",
+	"369",
+	"370",
+	"371",
+	"372",
+	"373",
+	"374",
+	"375",
+	"376",
+	"377",
+	"378",
+	"379",
+	"380",
+	"381",
+	"382",
+	"383",
+	"384",
+	"385",
+	"386",
+	"387",
+	"388",
+	"389",
+	"390",
+	"391",
+	"392",
+	"393",
+	"394",
+	"395",
+	"396",
+	"397",
+	"398",
+	"399",
+	"400",
+	"401",
+	"402",
+	"403",
+	"404",
+	"405",
+	"406",
+	"407",
+	"408",
+	"409",
+	"410",
+	"411",
+	"412",
+	"413",
+	"414",
+	"415",
+	"416",
+	"417",
+	"418",
+	"419",
+	"420",
+	"421",
+	"422",
+	"423",
+	"424",
+	"425",
+	"426",
+	"427",
+	"428",
+	"429",
+	"430",
+	"431",
+	"432",
+	"433",
+	"434",
+	"435",
+	"436",
+	"437",
+	"438",
+	"439",
+	"440",
+	"441",
+	"442",
+	"443",
+	"444",
+	"445",
+	"446",
+	"447",
+	"448",
+	"449",
+	"450",
+	"451",
+	"452",
+	"453",
+	"454",
+	"455",
+	"456",
+	"457",
+	"458",
+	"459",
+	"460",
+	"461",
+	"462",
+	"463",
+	"464",
+	"465",
+	"466",
+	"467",
+	"468",
+	"469",
+	"470",
+	"471",
+	"472",
+	"473",
+	"474",
+	"475",
+	"476",
+	"477",
+	"478",
+	"479",
+	"480",
+	"481",
+	"482",
+	"483",
+	"484",
+	"485",
+	"486",
+	"487",
+	"488",
+	"489",
+	"490",
+	"491",
+	"492",
+	"493",
+	"494",
+	"495",
+	"496",
+	"497",
+	"498",
+	"499",
+	"500",
+	"501",
+	"502",
+	"503",
+	"504",
+	"505",
+	"506",
+	"507",
+	"508",
+	"509",
+	"510",
+	"511",
+	NULL /* WM_MOUSEMOVE */,
+	"WM_LBUTTONDOWN",
+	"WM_LBUTTONUP",
+	"WM_LBUTTONDBLCLK",
+	"WM_RBUTTONDOWN",
+	"WM_RBUTTONUP",
+	"WM_RBUTTONDBLCLK",
+	"WM_MBUTTONDOWN",
+	"WM_MBUTTONUP",
+	"WM_MBUTTONDBLCLK",
+	"WM_MOUSEWHEEL",
+	"WM_XBUTTONDOWN",
+	"WM_XBUTTONUP",
+	"WM_XBUTTONDBLCLK",
+	"526",
+	"527",
+	"WM_PARENTNOTIFY",
+	"WM_ENTERMENULOOP",
+	"WM_EXITMENULOOP",
+	"WM_NEXTMENU",
+	"WM_SIZING",
+	"WM_CAPTURECHANGED",
+	"WM_MOVING",
+	"535",
+	"WM_POWERBROADCAST",
+	"WM_DEVICECHANGE",
+	"538",
+	"539",
+	"540",
+	"541",
+	"542",
+	"543",
+	"WM_MDICREATE",
+	"WM_MDIDESTROY",
+	"WM_MDIACTIVATE",
+	"WM_MDIRESTORE",
+	"WM_MDINEXT",
+	"WM_MDIMAXIMIZE",
+	"WM_MDITILE",
+	"WM_MDICASCADE",
+	"WM_MDIICONARRANGE",
+	"WM_MDIGETACTIVE",
+	"554",
+	"555",
+	"556",
+	"557",
+	"558",
+	"559",
+	"WM_MDISETMENU",
+	"WM_ENTERSIZEMOVE",
+	"WM_EXITSIZEMOVE",
+	"WM_DROPFILES",
+	"WM_MDIREFRESHMENU",
+	"565",
+	"566",
+	"567",
+	"568",
+	"569",
+	"570",
+	"571",
+	"572",
+	"573",
+	"574",
+	"575",
+	"576",
+	"577",
+	"578",
+	"579",
+	"580",
+	"581",
+	"582",
+	"583",
+	"584",
+	"585",
+	"586",
+	"587",
+	"588",
+	"589",
+	"590",
+	"591",
+	"592",
+	"593",
+	"594",
+	"595",
+	"596",
+	"597",
+	"598",
+	"599",
+	"600",
+	"601",
+	"602",
+	"603",
+	"604",
+	"605",
+	"606",
+	"607",
+	"608",
+	"609",
+	"610",
+	"611",
+	"612",
+	"613",
+	"614",
+	"615",
+	"616",
+	"617",
+	"618",
+	"619",
+	"620",
+	"621",
+	"622",
+	"623",
+	"624",
+	"625",
+	"626",
+	"627",
+	"628",
+	"629",
+	"630",
+	"631",
+	"632",
+	"633",
+	"634",
+	"635",
+	"636",
+	"637",
+	"638",
+	"639",
+	"640",
+	"WM_IME_SETCONTEXT",
+	"WM_IME_NOTIFY",
+	"WM_IME_CONTROL",
+	"WM_IME_COMPOSITIONFULL",
+	"WM_IME_SELECT",
+	"WM_IME_CHAR",
+	"647",
+	"648",
+	"649",
+	"650",
+	"651",
+	"652",
+	"653",
+	"654",
+	"655",
+	"WM_IME_KEYDOWN",
+	"WM_IME_KEYUP",
+	"658",
+	"659",
+	"660",
+	"661",
+	"662",
+	"663",
+	"664",
+	"665",
+	"666",
+	"667",
+	"668",
+	"669",
+	"670",
+	"671",
+	"672",
+	"WM_MOUSEHOVER",
+	"674",
+	"WM_MOUSELEAVE",
+	"676",
+	"677",
+	"678",
+	"679",
+	"680",
+	"681",
+	"682",
+	"683",
+	"684",
+	"685",
+	"686",
+	"687",
+	"688",
+	"689",
+	"690",
+	"691",
+	"692",
+	"693",
+	"694",
+	"695",
+	"696",
+	"697",
+	"698",
+	"699",
+	"700",
+	"701",
+	"702",
+	"703",
+	"704",
+	"705",
+	"706",
+	"707",
+	"708",
+	"709",
+	"710",
+	"711",
+	"712",
+	"713",
+	"714",
+	"715",
+	"716",
+	"717",
+	"718",
+	"719",
+	"720",
+	"721",
+	"722",
+	"723",
+	"724",
+	"725",
+	"726",
+	"727",
+	"728",
+	"729",
+	"730",
+	"731",
+	"732",
+	"733",
+	"734",
+	"735",
+	"736",
+	"737",
+	"738",
+	"739",
+	"740",
+	"741",
+	"742",
+	"743",
+	"744",
+	"745",
+	"746",
+	"747",
+	"748",
+	"749",
+	"750",
+	"751",
+	"752",
+	"753",
+	"754",
+	"755",
+	"756",
+	"757",
+	"758",
+	"759",
+	"760",
+	"761",
+	"762",
+	"763",
+	"764",
+	"765",
+	"766",
+	"767",
+	"WM_CUT",
+	"WM_COPY",
+	"WM_PASTE",
+	"WM_CLEAR",
+	"WM_UNDO",
+	"WM_RENDERFORMAT",
+	"WM_RENDERALLFORMATS",
+	"WM_DESTROYCLIPBOARD",
+	"WM_DRAWCLIPBOARD",
+	"WM_PAINTCLIPBOARD",
+	"WM_VSCROLLCLIPBOARD",
+	"WM_SIZECLIPBOARD",
+	"WM_ASKCBFORMATNAME",
+	"WM_CHANGECBCHAIN",
+	"WM_HSCROLLCLIPBOARD",
+	"WM_QUERYNEWPALETTE",
+	"WM_PALETTEISCHANGING",
+	"WM_PALETTECHANGED",
+	"WM_HOTKEY",
+	"787",
+	"788",
+	"789",
+	"790",
+	"WM_PRINT",
+	"WM_PRINTCLIENT",
+	"793",
+	"794",
+	"795",
+	"796",
+	"797",
+	"798",
+	"799",
+	"800",
+	"801",
+	"802",
+	"803",
+	"804",
+	"805",
+	"806",
+	"807",
+	"808",
+	"809",
+	"810",
+	"811",
+	"812",
+	"813",
+	"814",
+	"815",
+	"816",
+	"817",
+	"818",
+	"819",
+	"820",
+	"821",
+	"822",
+	"823",
+	"824",
+	"825",
+	"826",
+	"827",
+	"828",
+	"829",
+	"830",
+	"831",
+	"832",
+	"833",
+	"834",
+	"835",
+	"836",
+	"837",
+	"838",
+	"839",
+	"840",
+	"841",
+	"842",
+	"843",
+	"844",
+	"845",
+	"846",
+	"847",
+	"848",
+	"849",
+	"850",
+	"851",
+	"852",
+	"853",
+	"854",
+	"855",
+	"856",
+	"857",
+	"858",
+	"859",
+	"860",
+	"861",
+	"862",
+	"863",
+	"864",
+	"865",
+	"866",
+	"867",
+	"868",
+	"869",
+	"870",
+	"871",
+	"872",
+	"873",
+	"874",
+	"875",
+	"876",
+	"877",
+	"878",
+	"879",
+	"880",
+	"881",
+	"882",
+	"883",
+	"884",
+	"885",
+	"886",
+	"887",
+	"888",
+	"889",
+	"890",
+	"891",
+	"892",
+	"893",
+	"894",
+	"895",
+	"896",
+	"897",
+	"898",
+	"899",
+	"900",
+	"901",
+	"902",
+	"903",
+	"904",
+	"905",
+	"906",
+	"907",
+	"908",
+	"909",
+	"910",
+	"911",
+	"912",
+	"913",
+	"914",
+	"915",
+	"916",
+	"917",
+	"918",
+	"919",
+	"920",
+	"921",
+	"922",
+	"923",
+	"924",
+	"925",
+	"926",
+	"927",
+	"928",
+	"929",
+	"930",
+	"931",
+	"932",
+	"933",
+	"934",
+	"935",
+	"936",
+	"937",
+	"938",
+	"939",
+	"940",
+	"941",
+	"942",
+	"943",
+	"944",
+	"945",
+	"946",
+	"947",
+	"948",
+	"949",
+	"950",
+	"951",
+	"952",
+	"953",
+	"954",
+	"955",
+	"956",
+	"957",
+	"958",
+	"959",
+	"960",
+	"961",
+	"962",
+	"963",
+	"964",
+	"965",
+	"966",
+	"967",
+	"968",
+	"969",
+	"970",
+	"971",
+	"972",
+	"973",
+	"974",
+	"975",
+	"976",
+	"977",
+	"978",
+	"979",
+	"980",
+	"981",
+	"982",
+	"983",
+	"984",
+	"985",
+	"986",
+	"987",
+	"988",
+	"989",
+	"990",
+	"991",
+	"992",
+	"993",
+	"994",
+	"995",
+	"996",
+	"997",
+	"998",
+	"999",
+	"1000",
+	"1001",
+	"1002",
+	"1003",
+	"1004",
+	"1005",
+	"1006",
+	"1007",
+	"1008",
+	"1009",
+	"1010",
+	"1011",
+	"1012",
+	"1013",
+	"1014",
+	"1015",
+	"1016",
+	"1017",
+	"1018",
+	"1019",
+	"1020",
+	"1021",
+	"1022",
+	"1023"
+};
+
diff --git a/xorg-server/hw/xwin/xlaunch/window/util.h b/xorg-server/hw/xwin/xlaunch/window/util.h
new file mode 100644
index 000000000..a1196b115
--- /dev/null
+++ b/xorg-server/hw/xwin/xlaunch/window/util.h
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2005 Alexander Gottwald
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above copyright
+ * holders shall not be used in advertising or otherwise to promote the sale,
+ * use or other dealings in this Software without prior written authorization.
+ */
+#ifndef __UTIL_H__
+#define __UTIL_H__
+
+#include <windows.h>
+#include <stdexcept>
+#include <string>  
+
+class win32_error : public std::runtime_error
+{
+    public:
+        static std::string message(DWORD code);
+        DWORD errorcode;
+        win32_error(const std::string &msg,DWORD code = GetLastError()) : std::runtime_error(msg + ":" + message(code)), errorcode(code) {};
+};
+
+#define MESSAGE_NAMES_LEN 1024
+#define NOTIFY_NAMES_LEN 1
+class MessageDebug
+{
+    protected:
+        static const char * message_names[MESSAGE_NAMES_LEN];
+        static const char * notify_names[NOTIFY_NAMES_LEN];
+    public:
+        static void debug(HWND handle, UINT uMsg, WPARAM wParam, LPARAM lParam, const char *prefix);
+};
+
+
+#endif
diff --git a/xorg-server/hw/xwin/xlaunch/window/window.cc b/xorg-server/hw/xwin/xlaunch/window/window.cc
new file mode 100644
index 000000000..cca3a485a
--- /dev/null
+++ b/xorg-server/hw/xwin/xlaunch/window/window.cc
@@ -0,0 +1,284 @@
+/*
+ * Copyright (c) 2005 Alexander Gottwald
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above copyright
+ * holders shall not be used in advertising or otherwise to promote the sale,
+ * use or other dealings in this Software without prior written authorization.
+ */
+
+#include "window.h"
+#include "util.h"
+#include <stdio.h>
+#include <stdexcept>
+
+CWindow::CWindowClass CWindow::windowClass("CWINDOWCLASS", DefWindowProc);
+
+CWindow::CWindowClass::CWindowClass(const char *_name, WNDPROC _wndproc) : 
+    wndproc(_wndproc), atom(0), classname(_name)
+{
+    Register();
+}
+
+CWindow::CWindowClass::~CWindowClass()
+{
+    UnregisterClass(classname.c_str(), GetModuleHandle(NULL));
+}
+
+void CWindow::CWindowClass::Register()
+{
+    WNDCLASSEX wndclass;
+    memset(&wndclass, 0, sizeof(wndclass));
+    wndclass.cbSize = sizeof(wndclass);
+    wndclass.style = 0;
+    wndclass.lpfnWndProc = wndproc;
+    wndclass.cbClsExtra = 0;
+    wndclass.cbWndExtra = 0;
+    wndclass.hInstance = GetModuleHandle(NULL); 
+    wndclass.hIcon = LoadIcon(NULL, IDI_APPLICATION);
+    wndclass.hCursor = LoadCursor(NULL, IDC_ARROW);
+    wndclass.hbrBackground = (HBRUSH)(1 + COLOR_BTNFACE);
+    wndclass.lpszMenuName = NULL;
+    wndclass.lpszClassName = classname.c_str();
+    wndclass.hIconSm = NULL;
+    atom = RegisterClassEx(&wndclass);
+    if (atom == 0)
+        throw win32_error("RegisterClassEx failed");
+}
+
+CWindow::CWindow(const char *_title) : title(_title), hwnd(NULL), parent(NULL), bounds(), owndproc(NULL), showing(FALSE)
+{
+    style = WS_CHILD;
+    exstyle = 0;
+}
+
+HWND CWindow::CreateWindowHandle()
+{
+    HWND ret = CreateWindowEx(
+            exstyle,
+            GetClassName(),
+            title.c_str(),
+            style,
+            bounds.left,
+            bounds.top,
+            bounds.width,
+            bounds.height,
+            parent,
+            NULL,
+            GetModuleHandle(NULL),
+            0
+            );
+    if (ret == NULL)
+        throw win32_error("CreateWindowEx failed");
+    return ret;
+}
+
+void CWindow::Create()
+{
+    if (hwnd != NULL)
+        return;
+    hwnd = CreateWindowHandle();
+    if (hwnd == NULL)
+        throw win32_error("Could not create window");
+
+    // Reset the error code
+    DWORD err = 0;
+    SetLastError(err);
+    
+    // Attach the object reference to the window handle
+    SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)this);
+    err = GetLastError();
+    if (err != 0)
+        throw win32_error("SetWindowLongPtr failed",err);
+    
+    // Set the window proc
+    owndproc = (WNDPROC)SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG_PTR)WindowProc);
+    err = GetLastError();
+    if (err != 0)
+        throw win32_error("SetWindowLongPtr failed",err);
+}
+
+const char *CWindow::GetClassName()
+{
+    return windowClass.GetClassName();
+}
+
+LRESULT CALLBACK CWindow::WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+    MessageDebug::debug(hwnd, uMsg, wParam, lParam, __FUNCTION__);
+    CWindow* window = (CWindow*)GetWindowLongPtr(hwnd, GWLP_USERDATA);
+    if (window != NULL)
+        return window->Dispatch(hwnd, uMsg, wParam, lParam);
+    return DefWindowProc(hwnd, uMsg, wParam, lParam);
+}
+
+LRESULT CWindow::Dispatch(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+    switch (uMsg)
+    {
+        case WM_SIZE:
+            bounds.width = LOWORD(lParam);
+            bounds.height = LOWORD(lParam);
+            break;
+        case WM_MOVE:
+            bounds.left = LOWORD(lParam);
+            bounds.top = LOWORD(lParam);
+            break;
+        case WM_DESTROY:
+            showing = FALSE;
+            break;
+    }
+    if (owndproc)
+        return CallWindowProc(owndproc, hwnd, uMsg, wParam, lParam);
+    else
+        return DefWindowProc(hwnd, uMsg, wParam, lParam);
+}
+
+void CWindow::Show()
+{
+    if (hwnd == NULL)
+        Create();
+    ShowWindow(hwnd, SW_SHOWNORMAL);
+}
+
+int CWindow::ShowModal()
+{
+    MSG msg;
+    BOOL bRet;
+    showing = TRUE;
+    Show();
+
+    while( showing && (bRet = GetMessage( &msg, NULL, 0, 0 )) != 0)
+    { 
+        if (bRet == -1)
+        {
+            // handle the error and possibly exit
+        }
+        else
+        {
+            TranslateMessage(&msg); 
+            DispatchMessage(&msg); 
+        }
+    }
+    return 0; 
+}
+
+void CWindow::SetLeft(int left)
+{
+    bounds.left = left;
+    if (hwnd)
+        if (!SetWindowPos(hwnd, NULL, 
+                bounds.left, bounds.top,
+                0, 0, 
+                SWP_NOZORDER |  SWP_NOSIZE))
+            throw win32_error("SetWindowPos failed");
+}
+
+void CWindow::SetTop(int top)
+{
+    bounds.top = top;
+    if (hwnd)
+        if (!SetWindowPos(hwnd, NULL, 
+                bounds.left, bounds.top,
+                0, 0, 
+                SWP_NOZORDER |  SWP_NOSIZE))
+            throw win32_error("SetWindowPos failed");
+}
+
+void CWindow::SetWidth(int width)
+{
+    bounds.width = width;
+    if (hwnd)
+        if (!SetWindowPos(hwnd, NULL,
+                0, 0, 
+                bounds.width, bounds.height, 
+                SWP_NOZORDER |  SWP_NOMOVE))
+            throw win32_error("SetWindowPos failed");
+}
+void CWindow::SetHeight(int height)
+{
+    bounds.height = height;
+    if (hwnd)
+        if (!SetWindowPos(hwnd, NULL,
+                0, 0, 
+                bounds.width, bounds.height,
+                SWP_NOZORDER |  SWP_NOMOVE))
+            throw win32_error("SetWindowPos failed");
+}
+
+void CWindow::SetBounds(int left, int top, int width, int height)
+{
+    bounds = CBoundary(left, top, width, height);
+    if (hwnd)
+        if (!SetWindowPos(hwnd, NULL, 
+                bounds.left, bounds.top, 
+                bounds.width, bounds.height, 
+                SWP_NOZORDER))
+            throw win32_error("SetWindowPos failed");
+}
+
+void CWindow::SetBounds(const RECT &rect)
+{
+    bounds = rect;
+    if (hwnd)
+        if (!SetWindowPos(hwnd, NULL, 
+                bounds.left, bounds.top, 
+                bounds.width, bounds.height, 
+                SWP_NOZORDER))
+            throw win32_error("SetWindowPos failed");
+}
+
+HWND CWindow::GetHandle()
+{
+    if (hwnd == NULL)
+        Create();
+    return hwnd;
+}
+
+void CWindow::SetParent(CWindow *window)
+{
+    parent = window->GetHandle();
+    if (hwnd != NULL)
+        if (::SetParent(hwnd, parent) == NULL)
+            throw win32_error("SetParent failed");
+        
+}
+
+void CWindow::SetStyle(DWORD style)
+{
+    this->style = style;
+    SetLastError(0);
+    if (hwnd)
+        SetWindowLong(hwnd, GWL_STYLE, style);
+    int err = GetLastError();
+    if (err != 0)
+        throw win32_error("SetWindowLong failed", err);
+}
+
+void CWindow::SetExStyle(DWORD exstyle)
+{
+    this->exstyle = exstyle;
+    SetLastError(0);
+    if (hwnd)
+        SetWindowLong(hwnd, GWL_EXSTYLE, exstyle);
+    int err = GetLastError();
+    if (err != 0)
+        throw win32_error("SetWindowWLong failed", err);
+}
diff --git a/xorg-server/hw/xwin/xlaunch/window/window.h b/xorg-server/hw/xwin/xlaunch/window/window.h
new file mode 100644
index 000000000..baf401405
--- /dev/null
+++ b/xorg-server/hw/xwin/xlaunch/window/window.h
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2005 Alexander Gottwald
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above copyright
+ * holders shall not be used in advertising or otherwise to promote the sale,
+ * use or other dealings in this Software without prior written authorization.
+ */
+#ifndef __WINDOW_H__
+#define __WINDOW_H__
+
+#include <windows.h>
+#include <string>
+
+class CDialog;
+class CWindow
+{
+    friend class CDialog;
+    public:
+        struct CBoundary
+        {
+            int left;
+            int top;
+            int width;
+            int height;
+            CBoundary() : 
+                left(0), top(0), width(0), height(0) {};
+            CBoundary(int x, int y, int w, int h) : 
+                left(x), top(y), width(w), height(h) {};
+            CBoundary(const RECT &r) : 
+                left(r.left), top(r.top), width(r.right-r.left), height(r.bottom-r.top) {};
+        };
+        class CWindowClass
+        {
+            private:
+                WNDPROC wndproc;
+                ATOM atom;
+                std::string classname;
+            protected:
+                void Register();
+            public:
+                CWindowClass(const char *name, WNDPROC wndproc);
+                ~CWindowClass();
+                const char *GetClassName() { return classname.c_str(); };
+        };
+    private:
+        static CWindowClass windowClass;
+
+        std::string title;
+        DWORD exstyle;
+        DWORD style;
+        CBoundary bounds;
+        HWND hwnd; 
+        HWND parent;
+        WNDPROC owndproc;
+
+        BOOL showing;
+
+    protected:
+
+        virtual const char *GetClassName();
+	virtual HWND CreateWindowHandle();
+        static LRESULT CALLBACK WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
+    public:
+        CWindow(const char *title);
+	virtual void Create();
+
+        virtual int ShowModal();
+
+        void Show();
+        void Hide();
+
+        void SetWidth(int width);
+        void SetHeight(int height);
+        void SetLeft(int left);
+        void SetTop(int top);
+        int GetWidth() { return bounds.width; };
+        int GetHeight() { return bounds.height; };
+        int GetLeft() { return bounds.left; };
+        int GetTop() { return bounds.top; };
+
+        void SetBounds(int left, int top, int width, int height);
+        void SetBounds(const RECT &rect);
+
+        void SetStyle(DWORD style);
+        DWORD GetStyle() { return style; };
+        
+        void SetExStyle(DWORD exstyle);
+        DWORD GetExStyle() { return exstyle; };
+
+        HWND GetHandle();
+        void SetParent(CWindow *window);
+
+        virtual LRESULT Dispatch(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
+};
+
+#endif
diff --git a/xorg-server/hw/xwin/xlaunch/window/wizard.cc b/xorg-server/hw/xwin/xlaunch/window/wizard.cc
new file mode 100644
index 000000000..9d6c71193
--- /dev/null
+++ b/xorg-server/hw/xwin/xlaunch/window/wizard.cc
@@ -0,0 +1,244 @@
+/*

+ * Copyright (c) 2005 Alexander Gottwald

+ *

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

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

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

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

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

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

+ *

+ * The above copyright notice and this permission notice shall be included in

+ * all copies or substantial portions of the Software.

+ *

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

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

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

+ * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

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

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

+ * DEALINGS IN THE SOFTWARE.

+ *

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

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

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

+ */

+#include "wizard.h"

+#include "util.h"

+

+CWizard::CWizard() : pages() 

+{

+};

+

+void CWizard::AddPage(const PROPSHEETPAGE &page)

+{

+    pages.push_back(page);

+}

+

+void CWizard::AddPage(const char *page, HINSTANCE instance)

+{

+    PROPSHEETPAGE psp;

+    if (instance == NULL)

+        instance = GetModuleHandle(NULL);

+    

+    memset(&psp, 0, sizeof(psp));

+    psp.dwSize = sizeof(PROPSHEETPAGE);

+    psp.dwFlags = PSP_DEFAULT;

+    psp.hInstance = instance;

+    psp.pszTemplate = page;

+    psp.pfnDlgProc = WizardDialogProc;

+    psp.lParam = (LPARAM)this;

+

+    AddPage(psp);

+}

+

+void CWizard::AddPage(DWORD id, DWORD title, DWORD subtitle, HINSTANCE instance)

+{

+    PROPSHEETPAGE psp;

+    if (instance == NULL)

+        instance = GetModuleHandle(NULL);

+    

+    memset(&psp, 0, sizeof(psp));

+    psp.dwSize = sizeof(PROPSHEETPAGE);

+    psp.dwFlags = PSP_DEFAULT;

+#if _WIN32_IE >= 0x0500

+    if (title != 0)

+    {

+        psp.dwFlags |= PSP_USEHEADERTITLE;

+        psp.pszHeaderTitle = MAKEINTRESOURCE(title);

+    }

+    if (subtitle != 0)

+    {

+        psp.dwFlags |= PSP_USEHEADERSUBTITLE;

+        psp.pszHeaderSubTitle = MAKEINTRESOURCE(subtitle);

+    }

+#endif

+		

+    psp.hInstance = instance;

+    psp.pszTemplate = MAKEINTRESOURCE(id);

+    psp.pfnDlgProc = WizardDialogProc;

+    psp.lParam = (LPARAM)this;

+

+    AddPage(psp);

+}

+

+HWND CWizard::CreateWindowHandle()

+{

+    PROPSHEETHEADER psh;

+    HWND ret;

+    

+    PrepareSheetHeader(psh, FALSE);

+    ret = (HWND)PropertySheet(&psh);

+    free(psh.phpage);

+    if (ret == NULL)

+        throw win32_error("PropertySheet failed");

+    return ret;

+}

+

+int CWizard::ShowModal()

+{

+    PROPSHEETHEADER psh;

+    int ret;

+    

+    PrepareSheetHeader(psh, TRUE);

+    ret = PropertySheet(&psh);

+    free(psh.phpage);

+    return ret;

+}

+

+void CWizard::PrepareSheetHeader(PROPSHEETHEADER &psh, BOOL modal)

+{

+    HPROPSHEETPAGE *phpage = (HPROPSHEETPAGE*)malloc(pages.size() * sizeof(HPROPSHEETPAGE));

+    DWORD modeflag;

+

+    if (modal)

+        modeflag = 0;

+    else

+        modeflag = PSH_MODELESS;

+    

+    for (unsigned i = 0; i < pages.size(); i++)

+    {

+        phpage[i] = CreatePropertySheetPage(&pages[i]);

+        if (phpage[i] == NULL)

+        {

+            DWORD err = GetLastError();

+            free(phpage);

+            throw win32_error("CreatePropertySheetPage failed", err);

+        }

+    }

+

+    memset(&psh, 0, sizeof(psh));

+    psh.dwSize = sizeof(PROPSHEETHEADER);

+#if _WIN32_IE >= 0x0500

+    psh.dwFlags = PSH_WIZARD97 | modeflag;

+#else

+    psh.dwFlags = PSH_WIZARD | modeflag;

+#endif

+    psh.hwndParent = NULL;

+    psh.hInstance = GetModuleHandle(NULL);

+    psh.pszIcon = NULL;

+    psh.pszCaption = (LPSTR) "Cell Properties";

+    psh.nPages = pages.size(); 

+    psh.nStartPage = 0;

+    psh.phpage = phpage;

+    psh.pfnCallback = NULL;

+}

+

+DWORD CWizard::PageID(unsigned index)

+{

+    if (index < pages.size() && IS_INTRESOURCE(pages[index].pszTemplate))

+	return (DWORD)pages[index].pszTemplate;

+    return (DWORD)-1;

+}

+

+unsigned CWizard::PageIndex(PROPSHEETPAGE *psp)

+{

+    for (unsigned i = 0; i < pages.size(); i++)

+    {

+	if (IS_INTRESOURCE(psp->pszTemplate) || IS_INTRESOURCE(pages[i].pszTemplate ))

+	{

+	    if (psp->pszTemplate == pages[i].pszTemplate)

+		return i;

+	}	    

+	else if (psp->pszTemplate && pages[i].pszTemplate)

+	{

+	    if (strcmp(psp->pszTemplate, pages[i].pszTemplate) == 0)

+		return i;

+	}

+    }

+    return (unsigned)-1;

+}

+

+INT_PTR CWizard::DlgDispatch(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)

+{

+    return CBaseDialog::DlgDispatch(hwndDlg, uMsg, wParam, lParam);

+}

+

+INT_PTR CWizard::PageDispatch(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam, PROPSHEETPAGE *psp)

+{

+    LPNMHDR pnmh = (LPNMHDR)lParam;

+    DWORD flags; 

+    unsigned pageindex;

+    switch (uMsg)

+    {

+	case WM_NOTIFY:

+	    switch (pnmh->code)

+	    {

+		case PSN_SETACTIVE:

+#ifdef _DEBUG

+                    printf("PSN_SETACTIVE %d\n", PageIndex(psp));

+#endif

+		    pageindex = PageIndex(psp);

+		    if (pageindex != (unsigned)-1)

+		    {

+			flags = 0;

+			if (pageindex > 0)

+			    flags |= PSWIZB_BACK;

+			if ((unsigned)pageindex + 1 == pages.size())

+			    flags |= PSWIZB_FINISH;

+			if ((unsigned)pageindex + 1 < pages.size())

+                            flags |= PSWIZB_NEXT;

+                        PropSheet_SetWizButtons(GetParent(hwndDlg), flags);

+		    }

+		    WizardActivate(hwndDlg, pageindex);

+		    break;

+		case PSN_WIZNEXT:

+                    if (WizardNext(hwndDlg, PageIndex(psp)))

+                        return TRUE;

+		    break;

+		case PSN_WIZBACK:

+                    if (WizardBack(hwndDlg, PageIndex(psp)))

+                        return TRUE;

+		    break;

+                case PSN_WIZFINISH:

+                    if (WizardFinish(hwndDlg, PageIndex(psp)))

+                        return TRUE;

+                    DestroyWindow(GetParent(hwndDlg));

+		case PSN_RESET:

+                    if (WizardReset(hwndDlg, PageIndex(psp)))

+                        return TRUE;

+                    DestroyWindow(GetParent(hwndDlg));

+		    break;

+	    }

+    }

+    return DlgDispatch(hwndDlg, uMsg, wParam, lParam);

+}

+

+

+INT_PTR CALLBACK CWizard::WizardDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)

+{

+    MessageDebug::debug(hwndDlg, uMsg, wParam, lParam, __FUNCTION__);

+    PROPSHEETPAGE *psp = (PROPSHEETPAGE*)lParam;

+    switch (uMsg)

+    {

+	case WM_INITDIALOG:

+	    SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)psp);

+	    break;

+    }

+    psp = (PROPSHEETPAGE*)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);

+    CWizard* wizard = psp?(CWizard*)psp->lParam:NULL;

+    if (wizard != NULL)

+        return wizard->PageDispatch(hwndDlg, uMsg, wParam, lParam, psp);

+    return FALSE;

+}

+

diff --git a/xorg-server/hw/xwin/xlaunch/window/wizard.h b/xorg-server/hw/xwin/xlaunch/window/wizard.h
new file mode 100644
index 000000000..c576cc093
--- /dev/null
+++ b/xorg-server/hw/xwin/xlaunch/window/wizard.h
@@ -0,0 +1,58 @@
+/*

+ * Copyright (c) 2005 Alexander Gottwald

+ *

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

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

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

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

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

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

+ *

+ * The above copyright notice and this permission notice shall be included in

+ * all copies or substantial portions of the Software.

+ *

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

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

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

+ * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

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

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

+ * DEALINGS IN THE SOFTWARE.

+ *

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

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

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

+ */

+#ifndef __WIZARD_H__

+#define __WIZARD_H__

+

+#include "dialog.h"

+#include <vector>

+

+#include <prsht.h>

+

+class CWizard : public CBaseDialog

+{

+    private:

+        std::vector<PROPSHEETPAGE> pages;

+        void PrepareSheetHeader(PROPSHEETHEADER &psh, BOOL modal);

+    protected:

+        virtual HWND CreateWindowHandle();

+        static INT_PTR CALLBACK WizardDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);

+        virtual INT_PTR DlgDispatch(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);

+        virtual INT_PTR PageDispatch(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam, PROPSHEETPAGE *psp);

+        virtual unsigned PageIndex(PROPSHEETPAGE *psp);

+	virtual DWORD PageID(unsigned index);

+        virtual BOOL WizardNext(HWND hwndDlg, unsigned index) { return FALSE; }

+        virtual BOOL WizardBack(HWND hwndDlg, unsigned index) { return FALSE; } 

+        virtual BOOL WizardFinish(HWND hwndDlg, unsigned index) { return FALSE; }

+        virtual BOOL WizardReset(HWND hwndDlg, unsigned index) { return FALSE; }

+        virtual BOOL WizardActivate(HWND hwndDlg, unsigned index) { return FALSE; }

+    public:

+        CWizard();

+        void AddPage(const PROPSHEETPAGE &page);

+        void AddPage(const char *page, HINSTANCE instance = NULL);

+        void AddPage(DWORD id, DWORD title, DWORD subtitle, HINSTANCE instance = NULL);

+        virtual int ShowModal();

+};

+#endif

diff --git a/xorg-server/include/callback.h b/xorg-server/include/callback.h
index ed6b678a8..a2ea1faf7 100644
--- a/xorg-server/include/callback.h
+++ b/xorg-server/include/callback.h
@@ -52,6 +52,10 @@ SOFTWARE.
 #include <X11/Xproto.h>
 #include <X11/Xfuncproto.h>
 
+#ifdef _MSC_VER
+#define inline __inline
+#endif
+
 /*
  *  callback manager stuff
  */
diff --git a/xorg-server/include/closestr.h b/xorg-server/include/closestr.h
index c6aa1295f..9715b7cfb 100644
--- a/xorg-server/include/closestr.h
+++ b/xorg-server/include/closestr.h
@@ -52,6 +52,7 @@ typedef struct _OFclosure {
     XID fontid;
     char *fontname;
     int fnamelen;
+    Bool	from_dispatch;
     FontPtr non_cachable_font;
 } OFclosureRec;
 
@@ -77,6 +78,7 @@ typedef struct _LFWIclosure {
     LFWIstateRec saved;
     int savedNumFonts;
     Bool haveSaved;
+    Bool	        from_dispatch;
     char *savedName;
 } LFWIclosureRec;
 
@@ -90,6 +92,7 @@ typedef struct _LFclosure {
     LFWIstateRec current;
     LFWIstateRec saved;
     Bool haveSaved;
+    Bool	from_dispatch;    
     char *savedName;
     int savedNameLen;
 } LFclosureRec;
@@ -108,6 +111,7 @@ typedef struct _PTclosure {
     CARD8 reqType;
     XID did;
     int err;
+    Bool	        from_dispatch;
 } PTclosureRec;
 
 /* ImageText */
@@ -122,5 +126,6 @@ typedef struct _ITclosure {
     int yorg;
     CARD8 reqType;
     XID did;
+    Bool	        from_dispatch;
 } ITclosureRec;
 #endif                          /* CLOSESTR_H */
diff --git a/xorg-server/include/dixstruct.h b/xorg-server/include/dixstruct.h
index 678481920..ffdfaa4b2 100644
--- a/xorg-server/include/dixstruct.h
+++ b/xorg-server/include/dixstruct.h
@@ -101,7 +101,7 @@ typedef struct _Client {
     int priority;
     ReplySwapPtr pSwapReplyFunc;
     XID errorValue;
-    int sequence;
+    unsigned short sequence;    //MH
     int ignoreCount;            /* count for Attend/IgnoreClient */
     int numSaved;
     SaveSetElt *saveSet;
diff --git a/xorg-server/include/gc.h b/xorg-server/include/gc.h
index 6e5b92da2..a78d922f2 100644
--- a/xorg-server/include/gc.h
+++ b/xorg-server/include/gc.h
@@ -87,8 +87,8 @@ extern _X_EXPORT void ValidateGC(DrawablePtr /*pDraw */ ,
                                  GCPtr /*pGC */ );
 
 typedef union {
-    CARD32 val;
     pointer ptr;
+    CARD32 val;
 } ChangeGCVal, *ChangeGCValPtr;
 
 extern int ChangeGCXIDs(ClientPtr /*client */ ,
diff --git a/xorg-server/include/list.h b/xorg-server/include/list.h
index 2d48a8646..61b10bd2a 100644
--- a/xorg-server/include/list.h
+++ b/xorg-server/include/list.h
@@ -305,7 +305,7 @@ xorg_list_is_empty(struct xorg_list *head)
  *
  */
 #define xorg_list_for_each_entry(pos, head, member)				\
-    for (pos = __container_of((head)->next, pos, member);		\
+    for (pos = NULL, pos = __container_of((head)->next, pos, member);		\
 	 &pos->member != (head);					\
 	 pos = __container_of(pos->member.next, pos, member))
 
@@ -317,7 +317,7 @@ xorg_list_is_empty(struct xorg_list *head)
  * See xorg_list_for_each_entry for more details.
  */
 #define xorg_list_for_each_entry_safe(pos, tmp, head, member)		\
-    for (pos = __container_of((head)->next, pos, member),		\
+    for (pos = NULL, pos = __container_of((head)->next, pos, member),		\
 	 tmp = __container_of(pos->member.next, pos, member);		\
 	 &pos->member != (head);					\
 	 pos = tmp, tmp = __container_of(pos->member.next, tmp, member))
diff --git a/xorg-server/include/misc.h b/xorg-server/include/misc.h
index 348717676..9ed54b1a8 100644
--- a/xorg-server/include/misc.h
+++ b/xorg-server/include/misc.h
@@ -79,6 +79,16 @@ OF THIS SOFTWARE.
 
 #include <stddef.h>
 #include <stdint.h>
+#include <unistd.h>
+
+#ifdef _MSC_VER
+#define inline __inline
+#include <math.h>
+static double __inline trunc(double d)
+{
+  return (d>0) ? floor(d) : ceil(d) ;
+}
+#endif
 
 #ifndef MAXSCREENS
 #define MAXSCREENS	16
@@ -86,7 +96,7 @@ OF THIS SOFTWARE.
 #ifndef MAXGPUSCREENS
 #define MAXGPUSCREENS	16
 #endif
-#define MAXCLIENTS	256
+#define MAXCLIENTS	1024
 #define MAXEXTENSIONS   128
 #define MAXFORMATS	8
 #define MAXDEVICES	40      /* input devices */
@@ -173,9 +183,9 @@ lswaps(uint16_t x)
 
 #include <math.h>
 #undef MAXSHORT
-#define MAXSHORT SHRT_MAX
+#define MAXSHORT 32767
 #undef MINSHORT
-#define MINSHORT SHRT_MIN
+#define MINSHORT -32768
 #undef MAXINT
 #define MAXINT INT_MAX
 #undef MININT
@@ -203,7 +213,7 @@ lswaps(uint16_t x)
  * @param bits The minimum number of bits needed.
  * @return The number of bytes needed to hold bits.
  */
-static inline int
+static __inline int
 bits_to_bytes(const int bits)
 {
     return ((bits + 7) >> 3);
@@ -215,7 +225,7 @@ bits_to_bytes(const int bits)
  * @param bytes The minimum number of bytes needed.
  * @return The number of 4-byte units needed to hold bytes.
  */
-static inline int
+static __inline int
 bytes_to_int32(const int bytes)
 {
     return (((bytes) + 3) >> 2);
@@ -226,7 +236,7 @@ bytes_to_int32(const int bytes)
  * @param bytes The minimum number of bytes needed.
  * @return The closest multiple of 4 that is equal or higher than bytes.
  */
-static inline int
+static __inline int
 pad_to_int32(const int bytes)
 {
     return (((bytes) + 3) & ~3);
@@ -392,7 +402,7 @@ extern _X_EXPORT unsigned long serverGeneration;
           do { if (cond) {                                                \
               ErrorFSigSafe("BUG: triggered 'if (" #cond ")'\n");          \
               ErrorFSigSafe("BUG: %s:%u in %s()\n",                        \
-                           __FILE__, __LINE__, __func__);                 \
+                           __FILE__, __LINE__, __FUNCTION__);                 \
               if (with_msg) ErrorFSigSafe(__VA_ARGS__);                    \
               xorg_backtrace();                                           \
           } } while(0)
diff --git a/xorg-server/include/os.h b/xorg-server/include/os.h
index c7108a5d3..68f405714 100644
--- a/xorg-server/include/os.h
+++ b/xorg-server/include/os.h
@@ -115,6 +115,8 @@ extern _X_EXPORT int WriteToClient(ClientPtr /*who */ , int /*count */ ,
 
 extern _X_EXPORT void ResetOsBuffers(void);
 
+extern _X_EXPORT int TransIsListening(char *protocol);
+
 extern _X_EXPORT void InitConnectionLimits(void);
 
 extern _X_EXPORT void NotifyParentProcess(void);
@@ -453,7 +455,7 @@ extern _X_EXPORT void
 AccessUsingXdmcp(void);
 
 extern _X_EXPORT void
-DefineSelf(int /*fd */ );
+DefineSelf(int /*fd */ , const int /*protocol*/);
 
 #if XDMCP
 extern _X_EXPORT void
@@ -661,10 +663,20 @@ _X_ATTRIBUTE_PRINTF(1, 2)
 #define DebugF(...)             /* */
 #endif
 
+#ifdef _MSC_VER
+#ifdef INSERVER
+#define SERVEXTERN _declspec(dllimport)
+#else
+#define SERVEXTERN _declspec(dllexport)
+#endif
+#else
+#define SERVEXTERN _X_EXPORT
+#endif
+
 extern _X_EXPORT void
 VErrorF(const char *f, va_list args)
 _X_ATTRIBUTE_PRINTF(1, 0);
-extern _X_EXPORT void
+extern SERVEXTERN void
 ErrorF(const char *f, ...)
 _X_ATTRIBUTE_PRINTF(1, 2);
 extern _X_EXPORT void
@@ -679,4 +691,8 @@ LogPrintMarkers(void);
 extern _X_EXPORT void
 xorg_backtrace(void);
 
+#ifdef _MSC_VER
+#define snprintf _snprintf
+#endif
+
 #endif                          /* OS_H */
diff --git a/xorg-server/include/pixmapstr.h b/xorg-server/include/pixmapstr.h
index 2a1ef9b85..d933a5916 100644
--- a/xorg-server/include/pixmapstr.h
+++ b/xorg-server/include/pixmapstr.h
@@ -76,10 +76,8 @@ typedef struct _Pixmap {
     int refcnt;
     int devKind;                /* This is the pitch of the pixmap, typically width*bpp/8. */
     DevUnion devPrivate;        /* When !NULL, devPrivate.ptr points to the raw pixel data. */
-#ifdef COMPOSITE
     short screen_x;
     short screen_y;
-#endif
     unsigned usage_hint;        /* see CREATE_PIXMAP_USAGE_* */
 
     PixmapPtr master_pixmap;    /* pointer to master copy of pixmap for pixmap sharing */
diff --git a/xorg-server/include/resource.h b/xorg-server/include/resource.h
index 4a8dc3169..3719242bf 100644
--- a/xorg-server/include/resource.h
+++ b/xorg-server/include/resource.h
@@ -69,7 +69,7 @@ typedef uint32_t RESTYPE;
 #define RC_LASTPREDEF	RC_NEVERRETAIN
 #define RC_ANY		(~(RESTYPE)0)
 
-/* types for Resource routines */
+/* types for Resource routines. When you change one of them, please also update the predefTypes array in resource.c*/
 
 #define RT_WINDOW	((RESTYPE)1|RC_DRAWABLE)
 #define RT_PIXMAP	((RESTYPE)2|RC_DRAWABLE)
@@ -99,6 +99,9 @@ typedef uint32_t RESTYPE;
 #if MAXCLIENTS == 512
 #define RESOURCE_CLIENT_BITS	9
 #endif
+#if MAXCLIENTS == 1024
+#define RESOURCE_CLIENT_BITS	10
+#endif
 /* client field offset */
 #define CLIENTOFFSET	    (RESOURCE_AND_CLIENT_COUNT - RESOURCE_CLIENT_BITS)
 /* resource field */
diff --git a/xorg-server/include/scrnintstr.h b/xorg-server/include/scrnintstr.h
index df7407391..6afda0322 100644
--- a/xorg-server/include/scrnintstr.h
+++ b/xorg-server/include/scrnintstr.h
@@ -66,7 +66,7 @@ typedef struct _Visual {
     VisualID vid;
     short class;
     short bitsPerRGBValue;
-    short ColormapEntries;
+    long ColormapEntries;
     short nplanes;              /* = log2 (ColormapEntries). This does not
                                  * imply that the screen has this many planes.
                                  * it may have more or fewer */
@@ -332,6 +332,10 @@ typedef void (*MarkUnrealizedWindowProcPtr) (WindowPtr /*pChild */ ,
                                              WindowPtr /*pWin */ ,
                                              Bool /*fromConfigure */ );
 
+#ifdef CreateWindow
+#undef CreateWindow
+#endif
+
 typedef Bool (*DeviceCursorInitializeProcPtr) (DeviceIntPtr /* pDev */ ,
                                                ScreenPtr /* pScreen */ );
 
diff --git a/xorg-server/include/servermd.h b/xorg-server/include/servermd.h
index d6a9a3ad5..be3963f4e 100644
--- a/xorg-server/include/servermd.h
+++ b/xorg-server/include/servermd.h
@@ -286,6 +286,12 @@ SOFTWARE.
 #define GLYPHPADBYTES		4
 #endif                          /* linux/s390 */
 
+#ifdef WIN32
+#define IMAGE_BYTE_ORDER	LSBFirst
+#define BITMAP_BIT_ORDER	LSBFirst
+#define GLYPHPADBYTES		4
+#endif
+
 /* size of buffer to use with GetImage, measured in bytes. There's obviously
  * a trade-off between the amount of heap used and the number of times the
  * ddx routine has to be called.
diff --git a/xorg-server/include/site.h b/xorg-server/include/site.h
index 25caabbb3..52a5e8388 100644
--- a/xorg-server/include/site.h
+++ b/xorg-server/include/site.h
@@ -51,7 +51,7 @@ SOFTWARE.
  * server executable.
  */
 #ifndef VENDOR_STRING
-#define VENDOR_STRING "The X.Org Foundation"
+#define VENDOR_STRING "HC-Consult"
 #endif
 
 /*
@@ -60,7 +60,7 @@ SOFTWARE.
  * by the vendor.
  */
 #ifndef VENDOR_RELEASE
-#define VENDOR_RELEASE	6600
+#define VENDOR_RELEASE	XORG_VERSION_CURRENT
 #endif
 
 /*
diff --git a/xorg-server/include/version-config.h b/xorg-server/include/version-config.h
new file mode 100644
index 000000000..b8d482ce8
--- /dev/null
+++ b/xorg-server/include/version-config.h
@@ -0,0 +1,16 @@
+/* version-config.h.in: not generated */
+
+#ifndef VERSION_CONFIG_H
+#define VERSION_CONFIG_H
+
+/* Vendor man version */
+#undef VENDOR_MAN_VERSION
+
+/* Vendor name */
+#define VENDOR_NAME  "HC-Consult"
+
+/* Vendor release */
+#define VENDOR_RELEASE  XORG_VERSION_CURRENT
+
+#endif /* VERSION_CONFIG_H */
+
diff --git a/xorg-server/include/windowstr.h b/xorg-server/include/windowstr.h
index a1e608f09..15a83f056 100644
--- a/xorg-server/include/windowstr.h
+++ b/xorg-server/include/windowstr.h
@@ -140,7 +140,7 @@ typedef struct _Window {
     RegionRec borderSize;
     DDXPointRec origin;         /* position relative to parent */
     unsigned short borderWidth;
-    unsigned short deliverableEvents;   /* all masks from all clients */
+    unsigned long deliverableEvents;   /* all masks from all clients */
     Mask eventMask;             /* mask from the creating client */
     PixUnion background;
     PixUnion border;
diff --git a/xorg-server/include/xkb-config.h b/xorg-server/include/xkb-config.h
new file mode 100644
index 000000000..9f7dac59e
--- /dev/null
+++ b/xorg-server/include/xkb-config.h
@@ -0,0 +1,36 @@
+/* include/xkb-config.h.  Generated from xkb-config.h.in by configure.  */
+/* xkb-config.h.in: not at all generated.                      -*- c -*-
+ * 
+ */
+
+#ifndef _XKB_CONFIG_H_
+#define _XKB_CONFIG_H_
+
+/* Default set of XKB rules. */
+#define XKB_DFLT_RULES "xorg"
+
+/* Default XKB model. */
+#define XKB_DFLT_MODEL "pc104"
+
+/* Default XKB layout. */
+#define XKB_DFLT_LAYOUT "us"
+
+/* Default XKB variant. */
+#define XKB_DFLT_VARIANT ""
+
+/* Default XKB options. */
+#define XKB_DFLT_OPTIONS ""
+
+/* Path to XKB definitions. */
+#define XKB_BASE_DIRECTORY "xkbdata"
+
+/* Path to xkbcomp. */
+#define XKB_BIN_DIRECTORY "."
+
+/* XKB output dir for compiled keymaps. */
+#define XKM_OUTPUT_DIR "xkbdata/compiled/"
+
+/* Do not have `strcasecmp'. */
+/* #undef NEED_STRCASECMP */
+
+#endif /* _XKB_CONFIG_H_ */
diff --git a/xorg-server/include/xkbstr.h b/xorg-server/include/xkbstr.h
index 935330c7c..b85bf9220 100644
--- a/xorg-server/include/xkbstr.h
+++ b/xorg-server/include/xkbstr.h
@@ -46,10 +46,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 typedef struct _XkbStateRec {
     unsigned char group;        /* base + latched + locked */
+    unsigned char locked_group;
     /* FIXME: Why are base + latched short and not char?? */
     unsigned short base_group;  /* physically ... down? */
     unsigned short latched_group;
-    unsigned char locked_group;
 
     unsigned char mods;         /* base + latched + locked */
     unsigned char base_mods;    /* physically down */
diff --git a/xorg-server/include/xwin-config.h b/xorg-server/include/xwin-config.h
new file mode 100644
index 000000000..a509162ee
--- /dev/null
+++ b/xorg-server/include/xwin-config.h
@@ -0,0 +1,33 @@
+/*
+ * xwin-config.h.in
+ *
+ * This file has all defines used in the xwin ddx
+ *
+ */
+#include <dix-config.h>
+
+/* Winsock networking */
+#define HAS_WINSOCK
+
+/* Cygwin has /dev/windows for signaling new win32 messages */
+/* #undef HAS_DEVWINDOWS */
+
+/* Switch on debug messages */ 
+/* #undef CYGDEBUG */
+/* #undef CYGWINDOWING_DEBUG */
+/* #undef CYGMULTIWINDOW_DEBUG */
+
+/* Define to 1 if unsigned long is 64 bits. */
+/* #undef _XSERVER64 */
+
+/* Short vendor name */
+#define XVENDORNAMESHORT "VcXsrv"
+
+/* Vendor web address for support */
+#define __VENDORDWEBSUPPORT__ "http://www.hc-consult.be/"
+
+/* Location of system.XWinrc */
+#define SYSCONFDIR "."
+
+/* Default log location */
+#define DEFAULT_LOGDIR "."
diff --git a/xorg-server/installer/genruntimeinclude.py b/xorg-server/installer/genruntimeinclude.py
new file mode 100644
index 000000000..bad6c8324
--- /dev/null
+++ b/xorg-server/installer/genruntimeinclude.py
@@ -0,0 +1,82 @@
+PublicToken="1fc8b3b9a1e18e3b"

+

+Template=r"""!define MSVC_PUBLICTOKEN   "<PUBLICTOKEN>"

+!define MSVC_VERSION       "<VERSION>"

+!define MSVCR90_DLL        "<WINSXSDIR>\x86_Microsoft.VC90.CRT_${MSVC_PUBLICTOKEN}_9.0.${MSVC_VERSION}_<SUFFIX>\msvcr90.dll"

+!define MSVCM90_DLL        "<WINSXSDIR>\x86_Microsoft.VC90.CRT_${MSVC_PUBLICTOKEN}_9.0.${MSVC_VERSION}_<SUFFIX>\msvcm90.dll"

+!define MSVCP90_DLL        "<WINSXSDIR>\x86_Microsoft.VC90.CRT_${MSVC_PUBLICTOKEN}_9.0.${MSVC_VERSION}_<SUFFIX>\msvcp90.dll"

+!define MSVC_CAT           "<WINSXSDIR>\manifests\x86_Microsoft.VC90.CRT_${MSVC_PUBLICTOKEN}_9.0.${MSVC_VERSION}_<SUFFIX>.cat"

+!define MSVC_MANIFEST_PART "x86_Microsoft.VC90.CRT_${MSVC_PUBLICTOKEN}_9.0.${MSVC_VERSION}_<SUFFIX>.manifest"

+!define MSVC_MANIFEST      "<WINSXSDIR>\manifests\${MSVC_MANIFEST_PART}"

+

+!define MSVC_VERSION_D       "<DVERSION>"

+!define MSVCR90_DLL_D        "<WINSXSDIR>\x86_Microsoft.VC90.DebugCRT_${MSVC_PUBLICTOKEN}_9.0.${MSVC_VERSION_D}_<DSUFFIX>\msvcr90d.dll"

+!define MSVCM90_DLL_D        "<WINSXSDIR>\x86_Microsoft.VC90.DebugCRT_${MSVC_PUBLICTOKEN}_9.0.${MSVC_VERSION_D}_<DSUFFIX>\msvcm90d.dll"

+!define MSVCP90_DLL_D        "<WINSXSDIR>\x86_Microsoft.VC90.DebugCRT_${MSVC_PUBLICTOKEN}_9.0.${MSVC_VERSION_D}_<DSUFFIX>\msvcp90d.dll"

+!define MSVC_CAT_D           "<WINSXSDIR>\manifests\x86_Microsoft.VC90.DebugCRT_${MSVC_PUBLICTOKEN}_9.0.${MSVC_VERSION_D}_<DSUFFIX>.cat"

+!define MSVC_MANIFEST_PART_D "x86_Microsoft.VC90.DebugCRT_${MSVC_PUBLICTOKEN}_9.0.${MSVC_VERSION_D}_<DSUFFIX>.manifest"

+!define MSVC_MANIFEST_D      "<WINSXSDIR>\manifests\${MSVC_MANIFEST_PART_D}"

+"""

+

+import glob,re,sys,os

+

+Files=glob.glob(r"c:\windows\winsxs\x86_Microsoft.VC90.CRT_%s_9.0.*"%PublicToken)

+DebugFiles=glob.glob(r"c:\windows\winsxs\x86_Microsoft.VC90.DebugCRT_%s_9.0.*"%PublicToken)

+

+SearchRe=re.compile(r"c:\\windows\\winsxs\\x86_Microsoft\.VC90\.CRT_%s_9\.0\.([0-9]+)\.([0-9]+)_(.*)"%PublicToken,re.I)

+DebugSearchRe=re.compile(r"c:\\windows\\winsxs\\x86_Microsoft\.VC90\.DebugCRT_%s_9\.0\.([0-9]+)\.([0-9]+)_(.*)"%PublicToken,re.I)

+

+# Release Dlls

+MajorVersion=0

+MinorVersion=0

+LatestFile=None

+#Now Select the one with the latest version

+for File in Files:

+  # Extract version

+  Search=SearchRe.search(File)

+  Major=int(Search.group(1))

+  Minor=int(Search.group(2))

+  if Major>MajorVersion:

+    MajorVersion=Major

+    MinorVersion=Minor

+    LatestFile=File

+    Suffix=Search.group(3)

+  elif Major==MajorVersion and Minor>MinorVersion:

+    MinorVersion=Minor

+    LatestFile=File

+    Suffix=Search.group(3)

+

+

+Template=re.sub("<VERSION>","%d.%d"%(MajorVersion,MinorVersion),Template)

+Template=re.sub("<SUFFIX>",Suffix,Template)

+

+# Debug dlls

+MajorVersion=0

+MinorVersion=0

+LatestFile=None

+#Now Select the one with the latest version

+for File in DebugFiles:

+  # Extract version

+  Search=DebugSearchRe.search(File)

+  Major=int(Search.group(1))

+  Minor=int(Search.group(2))

+  if Major>MajorVersion:

+    MajorVersion=Major

+    MinorVersion=Minor

+    LatestFile=File

+    Suffix=Search.group(3)

+  elif Major==MajorVersion and Minor>MinorVersion:

+    MinorVersion=Minor

+    LatestFile=File

+    Suffix=Search.group(3)

+

+

+Template=re.sub("<DVERSION>","%d.%d"%(MajorVersion,MinorVersion),Template)

+Template=re.sub("<DSUFFIX>",Suffix,Template)

+

+# Adjust common stuff

+Template=re.sub("<PUBLICTOKEN>",PublicToken,Template)

+WinSxsDir=os.path.join(os.getenv("systemroot"),"WinSxS")

+Template=re.sub("<WINSXSDIR>",WinSxsDir,Template)

+

+open("runtime","w").write(Template)

diff --git a/xorg-server/installer/packageall.bat b/xorg-server/installer/packageall.bat
new file mode 100755
index 000000000..2195223fe
--- /dev/null
+++ b/xorg-server/installer/packageall.bat
@@ -0,0 +1,19 @@
+@echo off

+if exist vcxsrv*.installer.exe del vcxsrv*.installer.exe

+

+copy %systemroot%\system32\msvcr100.dll

+copy %systemroot%\system32\msvcp100.dll

+copy %systemroot%\system32\msvcr100d.dll

+copy %systemroot%\system32\msvcp100d.dll

+

+if exist "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" (

+  "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" vcxsrv.nsi

+  "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" vcxsrv-debug.nsi

+) else (

+  "C:\Program Files\NSIS\makensis.exe" vcxsrv.nsi

+  "C:\Program Files\NSIS\makensis.exe" vcxsrv-debug.nsi

+)

+del msvcr100.dll

+del msvcr100d.dll

+del msvcp100.dll

+del msvcp100d.dll

diff --git a/xorg-server/installer/vcxsrv-debug.nsi b/xorg-server/installer/vcxsrv-debug.nsi
new file mode 100644
index 000000000..4164c162e
--- /dev/null
+++ b/xorg-server/installer/vcxsrv-debug.nsi
@@ -0,0 +1,86 @@
+/*  This file is part of vcxsrv.

+ *

+ *  Copyright (C) 2009 Marc Haesen

+ *

+ *  vcxsrv is free software: you can redistribute it and/or modify

+ *  it under the terms of the GNU General Public License as published by

+ *  the Free Software Foundation, either version 3 of the License, or

+ *  (at your option) any later version.

+ *

+ *  vcxsrv is distributed in the hope that it will be useful,

+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of

+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ *  GNU General Public License for more details.

+ *

+ *  You should have received a copy of the GNU General Public License

+ *  along with vcxsrv.  If not, see <http://www.gnu.org/licenses/>.

+*/

+;--------------------------------

+

+; The name of the installer

+Name "VcXsrv"

+

+; The file to write

+OutFile "vcxsrv-debug.1.13.1.0.installer.exe"

+

+; The default installation directory

+InstallDir $PROGRAMFILES\VcXsrv

+

+; Registry key to check for directory (so if you install again, it will 

+; overwrite the old one automatically)

+InstallDirRegKey HKLM "Software\VcXsrv" "Install_Dir"

+

+; Request application privileges for Windows Vista

+RequestExecutionLevel admin

+

+;--------------------------------

+InstType "Full"

+

+; Pages

+

+Page components

+Page directory

+Page instfiles

+

+UninstPage uninstConfirm

+UninstPage instfiles

+

+SetPluginUnload alwaysoff

+; ShowInstDetails show

+XPStyle on

+

+!define FUSION_REFCOUNT_UNINSTALL_SUBKEY_GUID {8cedc215-ac4b-488b-93c0-a50a49cb2fb8}

+

+;--------------------------------

+; The stuff to install

+Section "VcXsrv debug exe and dlls"

+

+  SectionIn RO

+  SectionIn 1

+

+  ; Set output path to the installation directory.

+  SetOutPath $INSTDIR

+

+  ; Put files there

+  File "..\obj\servdebug\vcxsrv.exe"

+  File "..\..\xkbcomp\obj\debug\xkbcomp.exe"

+  File "..\..\apps\xhost\obj\debug\xhost.exe"

+  File "..\..\apps\xauth\obj\debug\xauth.exe"

+  File "..\..\apps\xcalc\obj\debug\xcalc.exe"

+  File "..\..\apps\xclock\obj\debug\xclock.exe"

+  File "..\..\apps\xwininfo\obj\debug\xwininfo.exe"

+  File "..\hw\xwin\xlaunch\obj\debug\xlaunch.exe"

+  File "..\..\tools\plink\obj\debug\plink.exe"

+  File "..\..\mesalib\windows\VC8\mesa\Debug\swrast_dri.dll"

+  File "..\hw\xwin\swrastwgl_dri\obj\debug\swrastwgl_dri.dll"

+  File "..\..\dxtn\obj\debug\dxtn.dll"

+  File "..\..\zlib\obj\debug\zlib1.dll"

+  File "..\..\libxcb\src\obj\debug\libxcb.dll"

+  File "..\..\libXau\obj\debug\libXau.dll"

+  File "..\..\libX11\obj\debug\libX11.dll"

+  File "..\..\libXext\src\obj\debug\libXext.dll"

+  File "..\..\libXmu\src\obj\debug\libXmu.dll"

+  File "msvcr100d.dll"

+  File "msvcp100d.dll"

+

+SectionEnd

diff --git a/xorg-server/installer/vcxsrv.nsi b/xorg-server/installer/vcxsrv.nsi
new file mode 100644
index 000000000..c226b4691
--- /dev/null
+++ b/xorg-server/installer/vcxsrv.nsi
@@ -0,0 +1,245 @@
+/*  This file is part of vcxsrv.

+ *

+ *  Copyright (C) 2009 Marc Haesen

+ *

+ *  vcxsrv is free software: you can redistribute it and/or modify

+ *  it under the terms of the GNU General Public License as published by

+ *  the Free Software Foundation, either version 3 of the License, or

+ *  (at your option) any later version.

+ *

+ *  vcxsrv is distributed in the hope that it will be useful,

+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of

+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ *  GNU General Public License for more details.

+ *

+ *  You should have received a copy of the GNU General Public License

+ *  along with vcxsrv.  If not, see <http://www.gnu.org/licenses/>.

+*/

+;--------------------------------

+

+; The name of the installer

+Name "VcXsrv"

+

+; The file to write

+OutFile "vcxsrv.1.13.1.0.installer.exe"

+

+; The default installation directory

+InstallDir $PROGRAMFILES\VcXsrv

+

+; Registry key to check for directory (so if you install again, it will 

+; overwrite the old one automatically)

+InstallDirRegKey HKLM "Software\VcXsrv" "Install_Dir"

+

+; Request application privileges for Windows Vista

+RequestExecutionLevel admin

+

+;--------------------------------

+InstType "Full"

+InstType "Minimal"

+

+; Pages

+

+Page components

+Page directory

+Page instfiles

+

+UninstPage uninstConfirm

+UninstPage instfiles

+

+SetPluginUnload alwaysoff

+; ShowInstDetails show

+XPStyle on

+

+!define FUSION_REFCOUNT_UNINSTALL_SUBKEY_GUID {8cedc215-ac4b-488b-93c0-a50a49cb2fb8}

+

+;--------------------------------

+; The stuff to install

+Section "VcXsrv (required)"

+

+  SectionIn RO

+  SectionIn 1 2 3

+

+  ; Set output path to the installation directory.

+  SetOutPath $INSTDIR

+

+  ; Remove old opengl32.dll file if it extits

+  IfFileExists "$INSTDIR\opengl32.dll" 0 +2

+    Delete "$INSTDIR\opengl32.dll"

+

+  ; Put files there

+  File "..\obj\servrelease\vcxsrv.exe"

+  File "..\dix\protocol.txt"

+  File "..\system.XWinrc"

+  File "..\..\xkbcomp\obj\release\xkbcomp.exe"

+  File "..\..\apps\xhost\obj\release\xhost.exe"

+  File "..\..\apps\xauth\obj\release\xauth.exe"

+  File "..\..\apps\xcalc\obj\release\xcalc.exe"

+  File "..\..\apps\xcalc\app-defaults\xcalc"

+  File "..\..\apps\xcalc\app-defaults\xcalc-color"

+  File "..\..\apps\xclock\obj\release\xclock.exe"

+  File "..\..\apps\xclock\app-defaults\xclock"

+  File "..\..\apps\xclock\app-defaults\xclock-color"

+  File "..\..\apps\xwininfo\obj\release\xwininfo.exe"

+  File "..\XKeysymDB"

+  File "..\..\libX11\src\XErrorDB"

+  File "..\..\libX11\src\xcms\Xcms.txt"

+  File "..\XtErrorDB"

+  File "..\.Xdefaults"

+  File "..\hw\xwin\xlaunch\obj\release\xlaunch.exe"

+  File "..\..\tools\plink\obj\release\plink.exe"

+  File "..\..\mesalib\windows\VC8\mesa\Release\swrast_dri.dll"

+  File "..\hw\xwin\swrastwgl_dri\obj\release\swrastwgl_dri.dll"

+  File "..\..\dxtn\obj\release\dxtn.dll"

+  File "..\..\libxml2\bin\libxml2.dll"

+  File "..\..\zlib\obj\release\zlib1.dll"

+  File "..\..\libxcb\src\obj\release\libxcb.dll"

+  File "..\..\libXau\obj\release\libXau.dll"

+  File "..\..\libX11\obj\release\libX11.dll"

+  File "..\..\libXext\src\obj\release\libXext.dll"

+  File "..\..\libXmu\src\obj\release\libXmu.dll"

+  File "..\..\libxml2\bin\iconv.dll"

+  File "msvcr100.dll"

+  File "msvcp100.dll"

+  SetOutPath $INSTDIR\xkbdata

+  File /r "..\xkbdata\*.*"

+  SetOutPath $INSTDIR\locale

+  File /r "..\locale\*.*"

+  SetOutPath $INSTDIR\bitmaps

+  File /r "..\bitmaps\*.*"

+

+  ; Write the installation path into the registry

+  WriteRegStr HKLM SOFTWARE\VcXsrv "Install_Dir" "$INSTDIR"

+

+  ; Write the uninstall keys for Windows

+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "DisplayName" "VcXsrv"

+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "UninstallString" '"$INSTDIR\uninstall.exe"'

+  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "NoModify" 1

+  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv" "NoRepair" 1

+  WriteUninstaller "uninstall.exe"

+

+  ; Register the xlaunch file extension

+  WriteRegStr HKCR ".xlaunch" "" "XLaunchFile"

+  WriteRegStr HKCR "XLaunchFile" "" "XLaunch Configuration"

+  WriteRegStr HKCR "XLaunchFile\DefaultIcon" "" "$INSTDIR\xlaunch.exe,0"

+  WriteRegStr HKCR "XLaunchFile\shell" "" 'open'

+  WriteRegStr HKCR "XLaunchFile\shell\open\command" "" '"$INSTDIR\XLaunch.exe" -run "%1"'

+  WriteRegStr HKCR "XLaunchFile\shell\open\ddeexec\Application" "" "XLaunch"

+  WriteRegStr HKCR "XLaunchFile\shell\open\ddeexec\Topic" "" "System"

+  WriteRegStr HKCR "XLaunchFile\shell\edit\command" "" '"$INSTDIR\XLaunch.exe" -load "%1"'

+  WriteRegStr HKCR "XLaunchFile\shell\edit\ddeexec\Application" "" "XLaunch"

+  WriteRegStr HKCR "XLaunchFile\shell\edit\ddeexec\Topic" "" "System"

+  WriteRegStr HKCR "XLaunchFile\shell\Validate\command" "" '"$INSTDIR\XLaunch.exe" -validate "%1"'

+  WriteRegStr HKCR "XLaunchFile\shell\Validate\ddeexec\Application" "" "XLaunch"

+  WriteRegStr HKCR "XLaunchFile\shell\Validate\ddeexec\Topic" "" "System"

+

+  WriteRegStr HKCR "Applications\xlaunch.exe\shell" "" 'open'

+  WriteRegStr HKCR "Applications\xlaunch.exe\shell\open\command" "" '"$INSTDIR\XLaunch.exe" -run "%1"'

+  WriteRegStr HKCR "Applications\xlaunch.exe\shell\open\ddeexec\Application" "" "XLaunch"

+  WriteRegStr HKCR "Applications\xlaunch.exe\shell\open\ddeexec\Topic" "" "System"

+  WriteRegStr HKCR "Applications\xlaunch.exe\shell\edit\command" "" '"$INSTDIR\XLaunch.exe" -load "%1"'

+  WriteRegStr HKCR "Applications\xlaunch.exe\shell\edit\ddeexec\Application" "" "XLaunch"

+  WriteRegStr HKCR "Applications\xlaunch.exe\shell\edit\ddeexec\Topic" "" "System"

+  WriteRegStr HKCR "Applications\xlaunch.exe\shell\Validate\command" "" '"$INSTDIR\XLaunch.exe" -validate "%1"'

+  WriteRegStr HKCR "Applications\xlaunch.exe\shell\Validate\ddeexec\Application" "" "XLaunch"

+  WriteRegStr HKCR "Applications\xlaunch.exe\shell\Validate\ddeexec\Topic" "" "System"

+

+SectionEnd

+

+; Optional section (can be disabled by the user)

+Section "Fonts"

+  SectionIn 1 3

+

+  SetOutPath $INSTDIR\fonts

+  CreateDirectory "$SMPROGRAMS\VcXsrv"

+  File /r "..\fonts\*.*"

+

+SectionEnd

+

+; Optional section (can be disabled by the user)

+Section "Start Menu Shortcuts"

+  SectionIn 1 3

+

+  SetOutPath $INSTDIR

+  CreateDirectory "$SMPROGRAMS\VcXsrv"

+  CreateShortCut "$SMPROGRAMS\VcXsrv\Uninstall VcXsrv.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0

+  CreateShortCut "$SMPROGRAMS\VcXsrv\VcXsrv.lnk" "$INSTDIR\vcxsrv.exe" " :0 -ac -terminate -lesspointer -multiwindow -clipboard -wgl" "$INSTDIR\vcxsrv.exe" 0

+  CreateShortCut "$SMPROGRAMS\VcXsrv\XLaunch.lnk" "$INSTDIR\xlaunch.exe" "" "$INSTDIR\xlaunch.exe" 0

+

+SectionEnd

+

+; Optional section (can be disabled by the user)

+Section "Desktop Shortcuts"

+  SectionIn 1 3

+

+  SetOutPath $INSTDIR

+  CreateShortCut "$DESKTOP\VcXsrv.lnk" "$INSTDIR\vcxsrv.exe" " :0 -ac -terminate -lesspointer -multiwindow -clipboard -wgl" "$INSTDIR\vcxsrv.exe" 0

+  CreateShortCut "$DESKTOP\XLaunch.lnk" "$INSTDIR\xlaunch.exe" "" "$INSTDIR\xlaunch.exe" 0

+

+SectionEnd

+

+;--------------------------------

+

+; Uninstaller

+

+Section "Uninstall"

+  

+  ; Remove registry keys

+  DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\VcXsrv"

+  DeleteRegKey HKLM SOFTWARE\VcXsrv

+

+  ; Register the xlaunch file extension

+  DeleteRegKey HKCR ".xlaunch"

+  DeleteRegKey HKCR "XLaunchFile"

+  DeleteRegKey HKCR "Applications\xlaunch.exe"

+

+  ; Remove files and uninstaller

+  Delete "$INSTDIR\vcxsrv.exe"

+  Delete "$INSTDIR\uninstall.exe"

+  Delete "$INSTDIR\protocol.txt"

+  Delete "$INSTDIR\system.XWinrc"

+  Delete "$INSTDIR\xkbcomp.exe"

+  Delete "$INSTDIR\xcalc.exe"

+  Delete "$INSTDIR\xcalc"

+  Delete "$INSTDIR\xcalc-color"

+  Delete "$INSTDIR\xclock.exe"

+  Delete "$INSTDIR\xclock"

+  Delete "$INSTDIR\xclock-color"

+  Delete "$INSTDIR\xwininfo.exe"

+  Delete "$INSTDIR\XKeysymDB"

+  Delete "$INSTDIR\XErrorDB"

+  Delete "$INSTDIR\Xcms.txt"

+  Delete "$INSTDIR\XtErrorDB"

+  Delete "$INSTDIR\.Xdefaults"

+  Delete "$INSTDIR\xlaunch.exe"

+  Delete "$INSTDIR\plink.exe"

+  Delete "$INSTDIR\swrast_dri.dll"

+  Delete "$INSTDIR\dxtn.dll"

+  Delete "$INSTDIR\swrastwgl_dri.dll"

+  Delete "$INSTDIR\libxcb.dll"

+  Delete "$INSTDIR\libXau.dll"

+  Delete "$INSTDIR\libX11.dll"

+  Delete "$INSTDIR\libXext.dll"

+  Delete "$INSTDIR\libXmu.dll"

+  Delete "$INSTDIR\libxml2.dll"

+  Delete "$INSTDIR\zlib1.dll"

+  Delete "$INSTDIR\iconv.dll"

+  Delete "$INSTDIR\msvcr100.dll"

+  Delete "$INSTDIR\msvcp100.dll"

+  Delete "$INSTDIR\msvcr100d.dll"

+  Delete "$INSTDIR\msvcp100d.dll"

+

+  RMDir /r "$INSTDIR\fonts"

+  RMDir /r "$INSTDIR\xkbdata"

+  RMDir /r "$INSTDIR\locale"

+

+  ; Remove shortcuts, if any

+  Delete "$SMPROGRAMS\VcXsrv\*.*"

+  Delete "$DESKTOP\VcXsrv.lnk"

+  Delete "$DESKTOP\XLaunch.lnk"

+

+  ; Remove directories used

+  RMDir "$SMPROGRAMS\VcXsrv"

+  RMDir "$INSTDIR"

+

+SectionEnd

+

diff --git a/xorg-server/makefile b/xorg-server/makefile
new file mode 100644
index 000000000..d5f9c5b6f
--- /dev/null
+++ b/xorg-server/makefile
@@ -0,0 +1,109 @@
+ifneq ($(MAKESERVER),1)
+$(error Please specify MAKESERVER=1 on the command line or as environment variable)
+endif
+
+INCLUDELIBFILES =  \
+ composite\$(OBJDIR)\libcomposite.lib \
+ config\$(OBJDIR)\libconfig.lib \
+ damageext\$(OBJDIR)\libdamageext.lib \
+ dbe\$(OBJDIR)\libdbe.lib \
+ dix\$(OBJDIR)\libdix.lib \
+ fb\$(OBJDIR)\libfb.lib \
+ glx\$(OBJDIR)\libglx.lib \
+ hw\xwin\$(OBJDIR)\libXWin.lib \
+ hw\xwin\glx\$(OBJDIR)\libwinglx.lib \
+ mi\$(OBJDIR)\libmi.lib \
+ miext\damage\$(OBJDIR)\libdamage.lib \
+ miext\shadow\$(OBJDIR)\libshadow.lib \
+ miext\sync\$(OBJDIR)\libsync.lib \
+ miext\rootless\$(OBJDIR)\librootless.lib \
+ os\$(OBJDIR)\libos.lib \
+ randr\$(OBJDIR)\librandr.lib \
+ record\$(OBJDIR)\librecord.lib \
+ Xext\$(OBJDIR)\libxext.lib \
+ xfixes\$(OBJDIR)\libxfixes.lib \
+ Xi\$(OBJDIR)\libXi.lib \
+ xkb\$(OBJDIR)\libxkb.lib \
+ render\$(OBJDIR)\librender.lib \
+
+INCLUDENOSERVLIBFILES =  \
+ $(MHMAKECONF)\libX11\$(NOSERVOBJDIR)\libX11.lib \
+ $(MHMAKECONF)\libxcb\src\$(NOSERVOBJDIR)\libxcb.lib \
+ $(MHMAKECONF)\pixman\pixman\$(NOSERVOBJDIR)\libpixman-1.lib \
+ $(MHMAKECONF)\libXdmcp\$(NOSERVOBJDIR)\libXdmcp.lib \
+ $(MHMAKECONF)\libXau\$(NOSERVOBJDIR)\libXau.lib \
+ $(MHMAKECONF)\libXfont\src\util\$(NOSERVOBJDIR)\libutil.lib \
+ $(MHMAKECONF)\libXfont\src\fc\$(NOSERVOBJDIR)\libfc.lib \
+ $(MHMAKECONF)\libXfont\src\fontfile\$(NOSERVOBJDIR)\libfontfile.lib \
+ $(MHMAKECONF)\libXfont\src\builtins\$(NOSERVOBJDIR)\libbuiltins.lib \
+ $(MHMAKECONF)\libXfont\src\bitmap\$(NOSERVOBJDIR)\libbitmap.lib \
+ $(MHMAKECONF)\libXfont\src\freetype\$(NOSERVOBJDIR)\libft.lib \
+ $(MHMAKECONF)\libXfont\src\stubs\$(NOSERVOBJDIR)\libstubs.lib \
+ $(MHMAKECONF)\libfontenc\src\$(NOSERVOBJDIR)\libfontenc.lib \
+ $(MHMAKECONF)\libXinerama\src\$(NOSERVOBJDIR)\libXinerama.lib \
+ $(MHMAKECONF)\zlib\$(NOSERVOBJDIR)\zlib1.lib
+
+LIBDIRS=$(dir $(INCLUDELIBFILES))
+NOSERVLIBDIRS=$(dir $(INCLUDENOSERVLIBFILES))
+
+load_makefile $(LIBDIRS:%$(OBJDIR)\=%makefile MAKESERVER=$(MAKESERVER) DEBUG=$(DEBUG);)
+load_makefile $(NOSERVLIBDIRS:%$(NOSERVOBJDIR)\=%makefile MAKESERVER=0 DEBUG=$(DEBUG);)
+
+OBJS = dix\$(OBJDIR)\main.obj
+
+ifeq ($(DEBUG),1)
+TTYAPP=vcxsrv
+APP:=$(TTYAPP)
+
+LINKLIBS += $(MHMAKECONF)\openssl\out32_d\libeay32.lib \
+            $(MHMAKECONF)\freetype\lib\freetype2410MT_D.lib \
+            $(MHMAKECONF)\pthreads\pthreadVC2d.lib
+
+else
+WINAPP=vcxsrv
+APP:=$(WINAPP)
+
+LINKLIBS += $(MHMAKECONF)\openssl\out32\libeay32.lib \
+            $(MHMAKECONF)\freetype\lib\freetype2410MT.lib \
+            $(MHMAKECONF)\pthreads\pthreadVC2.lib
+
+endif
+
+RCINCLUDES += include hw\xwin $(MHMAKECONF)\include $(MHMAKECONF)
+
+XWin.rc: hw\xwin\XWin.rc
+	copy $< $@
+
+RESOURCES = XWin.rc
+
+$(OBJDIR)\$(APP).exe: $(LINKLIBS)
+
+load_makefile fonts.src\makefile MAKESERVER=0 DEBUG=0
+load_makefile xkeyboard-config\makefile MAKESERVER=0 DEBUG=0
+
+EXTRASTOBUILD =  \
+ hw\xwin\xlaunch\$(NOSERVOBJDIR)\xlaunch.exe \
+ ..\xkbcomp\$(NOSERVOBJDIR)\xkbcomp.exe \
+ ..\apps\xcalc\$(NOSERVOBJDIR)\xcalc.exe \
+ ..\apps\xclock\$(NOSERVOBJDIR)\xclock.exe \
+ ..\apps\xwininfo\$(NOSERVOBJDIR)\xwininfo.exe \
+ ..\apps\xhost\$(NOSERVOBJDIR)\xhost.exe \
+ ..\apps\xauth\$(NOSERVOBJDIR)\xauth.exe \
+ ..\tools\plink\$(NOSERVOBJDIR)\plink.exe \
+ hw\xwin\swrastwgl_dri\$(NOSERVOBJDIR)\swrastwgl_dri.dll \
+ ..\dxtn\$(NOSERVOBJDIR)\dxtn.dll
+
+EXTRASTOBUILDDIRS=$(dir $(EXTRASTOBUILD))
+
+load_makefile $(EXTRASTOBUILDDIRS:%$(NOSERVOBJDIR)\=%makefile MAKESERVER=0 DEBUG=$(DEBUG);)
+all: $(EXTRASTOBUILD)
+
+load_makefile ..\mesalib\windows\VC8\mesa\makefile MAKESERVER=0 DEBUG=$(DEBUG)
+ifeq ($(DEBUG),1)
+all: ..\mesalib\windows\VC8\mesa\Debug\swrast_dri.dll
+else
+all: ..\mesalib\windows\VC8\mesa\Release\swrast_dri.dll
+endif
+
+all: fonts.src\all xkeyboard-config\all
+
diff --git a/xorg-server/mi/makefile b/xorg-server/mi/makefile
new file mode 100644
index 000000000..7067c62e8
--- /dev/null
+++ b/xorg-server/mi/makefile
@@ -0,0 +1,39 @@
+CSRCS=miarc.c		\
+	mibitblt.c	\
+	micmap.c	\
+	micopy.c	\
+	micursor.c	\
+	midash.c	\
+	midispcur.c	\
+	mieq.c		\
+	miexpose.c	\
+	mifillarc.c	\
+	mifillrct.c	\
+	mifpolycon.c	\
+	migc.c		\
+	miglblt.c	\
+	mioverlay.c	\
+	mipointer.c	\
+	mipoly.c	\
+	mipolycon.c	\
+	mipolygen.c	\
+	mipolypnt.c	\
+	mipolyrect.c	\
+	mipolyseg.c	\
+	mipolytext.c	\
+	mipolyutil.c	\
+	mipushpxl.c	\
+	miscrinit.c	\
+	mispans.c	\
+	misprite.c	\
+	mivaltree.c	\
+	miwideline.c	\
+	miwindow.c	\
+	mizerarc.c	\
+	mizerclip.c	\
+	mizerline.c	\
+	miinitext.c
+  
+LIBRARY=libmi
+
+
diff --git a/xorg-server/mi/miarc.c b/xorg-server/mi/miarc.c
index 0f6448bc1..a73bce9e6 100644
--- a/xorg-server/mi/miarc.c
+++ b/xorg-server/mi/miarc.c
@@ -63,6 +63,10 @@ SOFTWARE.
 #include "mifillarc.h"
 #include <X11/Xfuncproto.h>
 
+#ifdef _MSC_VER
+#define hypot _hypot
+#endif
+
 static double miDsin(double a);
 static double miDcos(double a);
 static double miDasin(double v);
diff --git a/xorg-server/mi/micmap.c b/xorg-server/mi/micmap.c
index 3ef0c8c70..90ca85d67 100644
--- a/xorg-server/mi/micmap.c
+++ b/xorg-server/mi/micmap.c
@@ -118,17 +118,26 @@ miInitializeColormap(ColormapPtr pmap)
         unsigned limr, limg, limb;
 
         limr = pVisual->redMask >> pVisual->offsetRed;
-        limg = pVisual->greenMask >> pVisual->offsetGreen;
-        limb = pVisual->blueMask >> pVisual->offsetBlue;
-        for (i = 0; i <= maxent; i++) {
+        for(i = 0; i <= min(limr,maxent); i++) {
             /* rescale to [0..65535] then rgb bits */
             pmap->red[i].co.local.red =
                 ((((i * 65535) / limr) >> shift) * 65535) / lim;
+        }
+        for(; i <= maxent; i++) pmap->red[i].co.local.red = 65535;
+        limg = pVisual->greenMask >> pVisual->offsetGreen;
+        for(i = 0; i <= min(limg,maxent); i++) {
+            /* rescale to [0..65535] then rgb bits */
             pmap->green[i].co.local.green =
                 ((((i * 65535) / limg) >> shift) * 65535) / lim;
+        }
+        for(; i <= maxent; i++) pmap->green[i].co.local.green = 65535;
+        limb = pVisual->blueMask >> pVisual->offsetBlue;
+        for(i = 0; i <= min(limb,maxent); i++) {
+            /* rescale to [0..65535] then rgb bits */
             pmap->blue[i].co.local.blue =
                 ((((i * 65535) / limb) >> shift) * 65535) / lim;
         }
+        for(; i <= maxent; i++) pmap->blue[i].co.local.blue = 65535;
     }
     else if (pVisual->class == StaticColor) {
         unsigned limr, limg, limb;
diff --git a/xorg-server/mi/micoord.h b/xorg-server/mi/micoord.h
index 481e418c5..c6fa41d53 100644
--- a/xorg-server/mi/micoord.h
+++ b/xorg-server/mi/micoord.h
@@ -55,14 +55,14 @@
 #endif
 
 #if IMAGE_BYTE_ORDER == MSBFirst
-#define intToCoord(i,x,y)   (((x) = GetHighWord(i)), ((y) = (int) ((short) (i))))
+#define intToCoord(i,x,y)   (((x) = GetHighWord(i)), ((y) = (int) ((short) ((i)&0xffff))))
 #define coordToInt(x,y)	(((x) << 16) | ((y) & 0xffff))
 #define intToX(i)	(GetHighWord(i))
-#define intToY(i)	((int) ((short) i))
+#define intToY(i)	((int) ((short) ((i)&0xffff)))
 #else
-#define intToCoord(i,x,y)   (((x) = (int) ((short) (i))), ((y) = GetHighWord(i)))
+#define intToCoord(i,x,y)   (((x) = (int) ((short) ((i)&0xffff))), ((y) = GetHighWord(i)))
 #define coordToInt(x,y)	(((y) << 16) | ((x) & 0xffff))
-#define intToX(i)	((int) ((short) (i)))
+#define intToX(i)	((int) ((short) ((i)&0xffff)))
 #define intToY(i)	(GetHighWord(i))
 #endif
 
diff --git a/xorg-server/mi/miexpose.c b/xorg-server/mi/miexpose.c
index 8b7c93fb8..791687245 100644
--- a/xorg-server/mi/miexpose.c
+++ b/xorg-server/mi/miexpose.c
@@ -349,11 +349,11 @@ miSendGraphicsExpose(ClientPtr client, RegionPtr pRgn, XID drawable,
         free(pEvent);
     }
     else {
-        xEvent event = {
-            .u.noExposure.drawable = drawable,
-            .u.noExposure.majorEvent = major,
-            .u.noExposure.minorEvent = minor
-        };
+        xEvent event; memset(&event, 0, sizeof(xEvent));
+        event.u.noExposure.drawable = drawable;
+        event.u.noExposure.majorEvent = major;
+        event.u.noExposure.minorEvent = minor;
+        
         event.u.u.type = NoExpose;
         WriteEventsToClient(client, 1, &event);
     }
diff --git a/xorg-server/mi/miinitext.c b/xorg-server/mi/miinitext.c
index 81c663abe..38d19bc2f 100644
--- a/xorg-server/mi/miinitext.c
+++ b/xorg-server/mi/miinitext.c
@@ -237,7 +237,7 @@ EnableDisableExtensionError(const char *name, Bool enable)
 }
 
 /* List of built-in (statically linked) extensions */
-static ExtensionModule staticExtensions[] = {
+static const ExtensionModule staticExtensions[] = {
     {GEExtensionInit, "Generic Event Extension", &noGEExtension},
     {ShapeExtensionInit, "SHAPE", NULL},
 #ifdef MITSHM
diff --git a/xorg-server/mi/mioverlay.c b/xorg-server/mi/mioverlay.c
index 2bfd5e401..14cd14ccb 100644
--- a/xorg-server/mi/mioverlay.c
+++ b/xorg-server/mi/mioverlay.c
@@ -3,6 +3,10 @@
 #include <dix-config.h>
 #endif
 
+#ifdef CreateWindow
+#undef CreateWindow
+#endif
+
 #include <X11/X.h>
 #include "scrnintstr.h"
 #include <X11/extensions/shapeproto.h>
diff --git a/xorg-server/mi/misprite.c b/xorg-server/mi/misprite.c
index 97bbf8ef5..3ef25e75f 100644
--- a/xorg-server/mi/misprite.c
+++ b/xorg-server/mi/misprite.c
@@ -474,7 +474,7 @@ miSpriteSourceValidate(DrawablePtr pDrawable, int x, int y, int width,
         for (pDev = inputInfo.devices; pDev; pDev = pDev->next) {
             if (DevHasCursor(pDev)) {
                 pCursorInfo = MISPRITE(pDev);
-                if (pCursorInfo->isUp && pCursorInfo->pScreen == pScreen &&
+                if (pCursorInfo && pCursorInfo->isUp && pCursorInfo->pScreen == pScreen &&
                     ORG_OVERLAP(&pCursorInfo->saved, pDrawable->x, pDrawable->y,
                                 x, y, width, height)) {
                     SPRITE_DEBUG(("SourceValidate remove\n"));
@@ -507,7 +507,7 @@ miSpriteCopyWindow(WindowPtr pWindow, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
             /*
              * Damage will take care of destination check
              */
-            if (pCursorInfo->isUp && pCursorInfo->pScreen == pScreen &&
+            if (pCursorInfo && pCursorInfo->isUp && pCursorInfo->pScreen == pScreen &&
                 RegionContainsRect(prgnSrc, &pCursorInfo->saved) != rgnOUT) {
                 SPRITE_DEBUG(("CopyWindow remove\n"));
                 miSpriteRemoveCursor(pDev, pScreen);
@@ -582,9 +582,12 @@ miSpriteInstallColormap(ColormapPtr pMap)
         for (pDev = inputInfo.devices; pDev; pDev = pDev->next) {
             if (DevHasCursor(pDev)) {
                 pCursorInfo = MISPRITE(pDev);
-                pCursorInfo->checkPixels = TRUE;
-                if (pCursorInfo->isUp && pCursorInfo->pScreen == pScreen)
-                    miSpriteRemoveCursor(pDev, pScreen);
+                if (pCursorInfo)
+                {
+                  pCursorInfo->checkPixels = TRUE;
+                  if (pCursorInfo->isUp && pCursorInfo->pScreen == pScreen)
+                      miSpriteRemoveCursor(pDev, pScreen);
+                }
             }
         }
 
diff --git a/xorg-server/mi/mivaltree.c b/xorg-server/mi/mivaltree.c
index c1cc43122..88f9a4084 100644
--- a/xorg-server/mi/mivaltree.c
+++ b/xorg-server/mi/mivaltree.c
@@ -286,6 +286,9 @@ miComputeClips(WindowPtr pParent,
           eventMask | wOtherEventMasks(pParent)) & VisibilityChangeMask))
         SendVisibilityNotify(pParent);
 
+    if (pParent->valdata==UnmapValData)
+      return; // return if no valid valdata
+
     dx = pParent->drawable.x - pParent->valdata->before.oldAbsCorner.x;
     dy = pParent->drawable.y - pParent->valdata->before.oldAbsCorner.y;
 
@@ -718,9 +721,11 @@ miValidateTree(WindowPtr pParent,       /* Parent to validate */
         RegionUninit(&childUnion);
     }
 
-    RegionNull(&pParent->valdata->after.exposed);
-    RegionNull(&pParent->valdata->after.borderExposed);
-
+    if (pParent->valdata && pParent->valdata!=UnmapValData)
+    {
+      RegionNull(&pParent->valdata->after.exposed);
+      RegionNull(&pParent->valdata->after.borderExposed);
+    }
     /*
      * each case below is responsible for updating the
      * clipList and serial number for the parent window
@@ -735,8 +740,9 @@ miValidateTree(WindowPtr pParent,       /* Parent to validate */
          * exposures and obscures as per miComputeClips and reset the parent's
          * clipList.
          */
-        RegionSubtract(&pParent->valdata->after.exposed,
-                       &totalClip, &pParent->clipList);
+         if (pParent->valdata && pParent->valdata!=UnmapValData)
+             RegionSubtract(&pParent->valdata->after.exposed,
+                            &totalClip, &pParent->clipList);
         /* fall through */
     case VTMap:
         RegionCopy(&pParent->clipList, &totalClip);
diff --git a/xorg-server/mi/miwideline.c b/xorg-server/mi/miwideline.c
index ca18f156e..242f3f8b0 100644
--- a/xorg-server/mi/miwideline.c
+++ b/xorg-server/mi/miwideline.c
@@ -45,6 +45,10 @@ from The Open Group.
 #include <math.h>
 #undef _XOPEN_SOURCE
 #endif
+#ifdef _MSC_VER
+#define hypot _hypot
+#endif
+
 #include <X11/X.h>
 #include "windowstr.h"
 #include "gcstruct.h"
diff --git a/xorg-server/mi/miwindow.c b/xorg-server/mi/miwindow.c
index 8dd99dbf0..e341b79de 100644
--- a/xorg-server/mi/miwindow.c
+++ b/xorg-server/mi/miwindow.c
@@ -216,7 +216,7 @@ miHandleValidateExposures(WindowPtr pWin)
     pChild = pWin;
     WindowExposures = pChild->drawable.pScreen->WindowExposures;
     while (1) {
-        if ((val = pChild->valdata)) {
+        if ( (val = pChild->valdata) && val!=UnmapValData) {
             if (RegionNotEmpty(&val->after.borderExposed))
                 miPaintWindow(pChild, &val->after.borderExposed, PW_BORDER);
             RegionUninit(&val->after.borderExposed);
diff --git a/xorg-server/miext/damage/damage.c b/xorg-server/miext/damage/damage.c
index a98c20ec0..70e1807cd 100644
--- a/xorg-server/miext/damage/damage.c
+++ b/xorg-server/miext/damage/damage.c
@@ -1231,9 +1231,9 @@ damagePolyFillRect(DrawablePtr pDrawable,
         int nRectsTmp = nRects;
 
         box.x1 = pRectsTmp->x;
-        box.x2 = box.x1 + pRectsTmp->width;
+        box.x2 = box.x1 + (short)pRectsTmp->width;
         box.y1 = pRectsTmp->y;
-        box.y2 = box.y1 + pRectsTmp->height;
+        box.y2 = box.y1 + (short)pRectsTmp->height;
 
         while (--nRectsTmp) {
             pRectsTmp++;
@@ -1969,7 +1969,7 @@ DamageRegionRendered(DrawablePtr pDrawable, DamagePtr pDamage,
 
 /* This call is very odd, i'm leaving it intact for API sake, but please don't use it. */
 void
-DamageDamageRegion(DrawablePtr pDrawable, RegionPtr pRegion)
+DamageDamageRegion(DrawablePtr pDrawable, const RegionPtr pRegion)
 {
     damageRegionAppend(pDrawable, pRegion, FALSE, -1);
 
diff --git a/xorg-server/miext/damage/makefile b/xorg-server/miext/damage/makefile
new file mode 100644
index 000000000..e58f4a883
--- /dev/null
+++ b/xorg-server/miext/damage/makefile
@@ -0,0 +1,7 @@
+LIBRARY = libdamage
+
+#INCLUDES = -I$(srcdir)/../cw -I$(top_srcdir)/hw/xfree86/os-support
+
+CSRCS =damage.c
+
+
diff --git a/xorg-server/miext/rootless/makefile b/xorg-server/miext/rootless/makefile
new file mode 100644
index 000000000..d49e810a2
--- /dev/null
+++ b/xorg-server/miext/rootless/makefile
@@ -0,0 +1,10 @@
+LIBRARY=librootless
+
+librootless_la_SOURCES = \
+	rootlessCommon.c \
+	rootlessGC.c \
+	rootlessScreen.c \
+	rootlessValTree.c \
+	rootlessWindow.c
+
+CSRCS = $(filter %.c,$(librootless_la_SOURCES))
diff --git a/xorg-server/miext/rootless/rootlessGC.c b/xorg-server/miext/rootless/rootlessGC.c
index 932899591..526709350 100644
--- a/xorg-server/miext/rootless/rootlessGC.c
+++ b/xorg-server/miext/rootless/rootlessGC.c
@@ -49,6 +49,9 @@
 
 #include "rootlessCommon.h"
 
+#ifdef _MSC_VER
+#define inline __inline
+#endif
 // GC functions
 static void RootlessValidateGC(GCPtr pGC, unsigned long changes,
                                DrawablePtr pDrawable);
diff --git a/xorg-server/miext/rootless/rootlessWindow.c b/xorg-server/miext/rootless/rootlessWindow.c
index cfcb6e558..cf1611c1e 100644
--- a/xorg-server/miext/rootless/rootlessWindow.c
+++ b/xorg-server/miext/rootless/rootlessWindow.c
@@ -51,6 +51,12 @@ extern Bool no_configure_window;
 #include "rootlessCommon.h"
 #include "rootlessWindow.h"
 
+#ifdef _MSC_VER
+#define inline __inline
+#include "xplugin.h"
+extern int darwinMainScreenX, darwinMainScreenY;
+#endif
+
 #define SCREEN_TO_GLOBAL_X \
     (pScreen->x + rootlessGlobalOffsetX)
 #define SCREEN_TO_GLOBAL_Y \
@@ -684,7 +690,7 @@ RootlessResizeCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg,
     if (gResizeDeathCount == 1) {
         /* Simple case, we only have a single source pixmap. */
 
-        fbCopyRegion(&gResizeDeathPix[0]->drawable,
+        miCopyRegion(&gResizeDeathPix[0]->drawable,
                      &pScreen->GetWindowPixmap(pWin)->drawable, 0,
                      &rgnDst, dx, dy, fbCopyWindowProc, 0, 0);
     }
@@ -700,7 +706,7 @@ RootlessResizeCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg,
             RegionNull(&clipped);
             RegionIntersect(&rgnDst, &clip, &clipped);
 
-            fbCopyRegion(&gResizeDeathPix[i]->drawable,
+            miCopyRegion(&gResizeDeathPix[i]->drawable,
                          &pScreen->GetWindowPixmap(pWin)->drawable, 0,
                          &clipped, dx, dy, fbCopyWindowProc, 0, 0);
 
@@ -778,7 +784,7 @@ RootlessCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
     else {
         RootlessStartDrawing(pWin);
 
-        fbCopyRegion((DrawablePtr) pWin, (DrawablePtr) pWin,
+        miCopyRegion((DrawablePtr) pWin, (DrawablePtr) pWin,
                      0, &rgnDst, dx, dy, fbCopyWindowProc, 0, 0);
 
         /* prgnSrc has been translated to dst position */
@@ -995,6 +1001,7 @@ StartFrameResize(WindowPtr pWin, Bool gravity,
     }
     else if (gravity) {
         /* The general case. Just copy everything. */
+        BoxRec tmpBoxRec={oldX, oldY, oldX2, oldY2};
 
         RootlessStartDrawing(pWin);
 
@@ -1003,8 +1010,7 @@ StartFrameResize(WindowPtr pWin, Bool gravity,
         memcpy(gResizeDeathBits, winRec->pixelData,
                winRec->bytesPerRow * winRec->height);
 
-        gResizeDeathBounds[0] = (BoxRec) {
-        oldX, oldY, oldX2, oldY2};
+        gResizeDeathBounds[0] = tmpBoxRec;
         gResizeDeathPix[0]
             = GetScratchPixmapHeader(pScreen, winRec->width,
                                      winRec->height,
@@ -1041,8 +1047,8 @@ StartFrameResize(WindowPtr pWin, Bool gravity,
        window bits. */
 
     if (need_window_source) {
-        gResizeDeathBounds[0] = (BoxRec) {
-        oldX, oldY, oldX2, oldY2};
+        BoxRec tmpBoxRec={oldX, oldY, oldX2, oldY2};
+        gResizeDeathBounds[0] = tmpBoxRec;
         gResizeDeathPix[0]
             = GetScratchPixmapHeader(pScreen, oldW, oldH,
                                      winRec->win->drawable.depth,
diff --git a/xorg-server/miext/rootless/xplugin.h b/xorg-server/miext/rootless/xplugin.h
new file mode 100644
index 000000000..7fdf6006e
--- /dev/null
+++ b/xorg-server/miext/rootless/xplugin.h
@@ -0,0 +1,592 @@
+/* Xplugin.h -- windowing API for rootless X11 server
+   $Id$
+
+   Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
+
+   Permission is hereby granted, free of charge, to any person
+   obtaining a copy of this software and associated documentation files
+   (the "Software"), to deal in the Software without restriction,
+   including without limitation the rights to use, copy, modify, merge,
+   publish, distribute, sublicense, and/or sell copies of the Software,
+   and to permit persons to whom the Software is furnished to do so,
+   subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be
+   included in all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+   NONINFRINGEMENT.  IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT
+   HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+   DEALINGS IN THE SOFTWARE.
+
+   Except as contained in this notice, the name(s) of the above
+   copyright holders shall not be used in advertising or otherwise to
+   promote the sale, use or other dealings in this Software without
+   prior written authorization.
+
+   Note that these interfaces are provided solely for the use of the
+   X11 server. Any other uses are unsupported and strongly discouraged. */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/Xplugin.h,v 1.2 2003/05/02 00:08:49 torrey Exp $ */
+
+#ifndef XPLUGIN_H
+#define XPLUGIN_H 1
+
+#include <stdint.h>
+
+/* By default we use the X server definition of BoxRec to define xp_box,
+   so that the compiler can silently convert between the two. But if
+   XP_NO_X_HEADERS is defined, we'll define it ourselves. */
+
+#ifndef XP_NO_X_HEADERS
+# include "miscstruct.h"
+  typedef BoxRec xp_box;
+#else
+  struct xp_box_struct {
+      short x1, y1, x2, y2;
+  };
+  typedef struct xp_box_struct xp_box;
+#endif
+
+typedef unsigned int xp_resource_id;
+typedef xp_resource_id xp_window_id;
+typedef xp_resource_id xp_surface_id;
+typedef unsigned int xp_client_id;
+typedef unsigned int xp_request_type;
+typedef int xp_error;
+typedef int xp_bool;
+
+
+/* Error codes that the functions declared here may return. They all
+   numerically match their X equivalents, i.e. the XP_ can be dropped
+   if <X11/X.h> has been included. */
+
+enum xp_error_enum {
+    XP_Success			= 0,
+    XP_BadRequest		= 1,
+    XP_BadValue			= 2,
+    XP_BadWindow		= 3,
+    XP_BadMatch			= 8,
+    XP_BadAccess		= 10,
+    XP_BadImplementation	= 17,
+};    
+
+
+/* Event types generated by the plugin. */
+
+enum xp_event_type_enum {
+    /* The global display configuration changed somehow. */
+    XP_EVENT_DISPLAY_CHANGED	= 1 << 0,
+
+    /* A window changed state. Argument is xp_window_state_event */
+    XP_EVENT_WINDOW_STATE_CHANGED = 1 << 1,
+
+    /* An async request encountered an error. Argument is of type
+       xp_async_error_event */
+    XP_EVENT_ASYNC_ERROR	= 1 << 2,
+
+    /* Sent when a surface is destroyed as a side effect of destroying
+       a window. Arg is of type xp_surface_id. */
+    XP_EVENT_SURFACE_DESTROYED	= 1 << 3,
+
+    /* Sent when any GL contexts pointing at the given surface need to
+       call xp_update_gl_context () to refresh their state (because the
+       window moved or was resized. Arg is of type xp_surface_id. */
+    XP_EVENT_SURFACE_CHANGED	= 1 << 4,
+
+    /* Sent when a window has been moved. Arg is of type xp_window_id. */
+    XP_EVENT_WINDOW_MOVED	= 1 << 5,
+};
+
+/* Function type used to receive events. */
+
+typedef void (xp_event_fun) (unsigned int type, const void *arg,
+			     unsigned int arg_size, void *user_data);
+
+
+/* Operation types. Used when reporting errors asynchronously. */
+
+enum xp_request_type_enum {
+    XP_REQUEST_NIL = 0,
+    XP_REQUEST_DESTROY_WINDOW = 1,
+    XP_REQUEST_CONFIGURE_WINDOW = 2,
+    XP_REQUEST_FLUSH_WINDOW = 3,
+    XP_REQUEST_COPY_WINDOW = 4,
+    XP_REQUEST_UNLOCK_WINDOW = 5,
+    XP_REQUEST_DISABLE_UPDATE = 6,
+    XP_REQUEST_REENABLE_UPDATE = 7,
+    XP_REQUEST_HIDE_CURSOR = 8,
+    XP_REQUEST_SHOW_CURSOR = 9,
+    XP_REQUEST_FRAME_DRAW = 10,
+};
+
+/* Structure used to report an error asynchronously. Passed as the "arg"
+   of an XP_EVENT_ASYNC_ERROR event. */
+
+struct xp_async_error_event_struct {
+    xp_request_type request_type;
+    xp_resource_id id;
+    xp_error error;
+};
+
+typedef struct xp_async_error_event_struct xp_async_error_event;
+
+
+/* Possible window states. */
+
+enum xp_window_state_enum {
+    /* The window is not in the global list of possibly-visible windows. */
+    XP_WINDOW_STATE_OFFSCREEN	= 1 << 0,
+
+    /* Parts of the window may be obscured by other windows. */
+    XP_WINDOW_STATE_OBSCURED	= 1 << 1,
+};
+
+/* Structure passed as argument of an XP_EVENT_WINDOW_STATE_CHANGED event. */
+
+struct xp_window_state_event_struct {
+    xp_window_id id;
+    unsigned int state;
+};
+
+typedef struct xp_window_state_event_struct xp_window_state_event;
+
+
+/* Function type used to supply a colormap for indexed drawables. */
+
+typedef xp_error (xp_colormap_fun) (void *data, int first_color,
+				    int n_colors, uint32_t *colors);
+
+
+/* Window attributes structure. Used when creating and configuring windows.
+   Also used when configuring surfaces attached to windows. Functions that
+   take one of these structures also take a bit mask defining which
+   fields are set to meaningful values. */
+
+enum xp_window_changes_enum {
+    XP_ORIGIN			= 1 << 0,
+    XP_SIZE			= 1 << 1,
+    XP_BOUNDS			= XP_ORIGIN | XP_SIZE,
+    XP_SHAPE			= 1 << 2,
+    XP_STACKING			= 1 << 3,
+    XP_DEPTH			= 1 << 4,
+    XP_COLORMAP			= 1 << 5,
+    XP_WINDOW_LEVEL		= 1 << 6,
+};
+
+struct xp_window_changes_struct {
+    /* XP_ORIGIN */
+    int x, y;
+
+    /* XP_SIZE */
+    unsigned int width, height;
+    int bit_gravity;			/* how to resize the backing store */
+
+    /* XP_SHAPE */
+    int shape_nrects;			/* -1 = remove shape */
+    xp_box *shape_rects;
+    int shape_tx, shape_ty;		/* translation for shape */
+
+    /* XP_STACKING */
+    int stack_mode;
+    xp_window_id sibling;		/* may be zero; in ABOVE/BELOW modes
+					   it may specify a relative window */
+    /* XP_DEPTH, window-only */
+    unsigned int depth;
+
+    /* XP_COLORMAP, window-only */
+    xp_colormap_fun *colormap;
+    void *colormap_data;
+
+    /* XP_WINDOW_LEVEL, window-only */
+    int window_level;
+};
+
+typedef struct xp_window_changes_struct xp_window_changes;
+
+/* Values for bit_gravity field */
+
+enum xp_bit_gravity_enum {
+    XP_GRAVITY_NONE		= 0,	/* no gravity, fill everything */
+    XP_GRAVITY_NORTH_WEST	= 1,	/* anchor to top-left corner */
+    XP_GRAVITY_NORTH_EAST	= 2,	/* anchor to top-right corner */
+    XP_GRAVITY_SOUTH_EAST	= 3,	/* anchor to bottom-right corner */
+    XP_GRAVITY_SOUTH_WEST	= 4,	/* anchor to bottom-left corner */
+};
+
+/* Values for stack_mode field */
+
+enum xp_window_stack_mode_enum {
+    XP_UNMAPPED			= 0,	/* remove the window */
+    XP_MAPPED_ABOVE		= 1,	/* display the window on top */
+    XP_MAPPED_BELOW		= 2,	/* display the window at bottom */
+};
+
+/* Data formats for depth field and composite functions */
+
+enum xp_depth_enum {
+    XP_DEPTH_NIL = 0,			/* null source when compositing */
+    XP_DEPTH_ARGB8888,
+    XP_DEPTH_RGB555,
+    XP_DEPTH_A8,			/* for masks when compositing */
+    XP_DEPTH_INDEX8,
+};
+
+/* Options that may be passed to the xp_init () function. */
+
+enum xp_init_options_enum {
+    /* Don't mark that this process can be in the foreground. */
+    XP_IN_BACKGROUND		= 1 << 0,
+
+    /* Deliver background pointer events to this process. */
+    XP_BACKGROUND_EVENTS	= 1 << 1,
+};
+
+
+
+/* Miscellaneous functions */
+
+/* Initialize the plugin library. Only the copy/fill/composite functions
+   may be called without having previously called xp_init () */
+
+extern xp_error xp_init (unsigned int options);
+
+/* Sets the current set of requested notifications to MASK. When any of
+   these arrive, CALLBACK will be invoked with CALLBACK-DATA. Note that
+   calling this function cancels any previously requested notifications
+   that aren't set in MASK. */
+
+extern xp_error xp_select_events (unsigned int mask,
+				  xp_event_fun *callback,
+				  void *callback_data);
+
+/* Waits for all initiated operations to complete. */
+
+extern xp_error xp_synchronize (void);
+
+/* Causes any display update initiated through the plugin libary to be
+   queued until update is reenabled. Note that calls to these functions
+   nest. */
+  
+extern xp_error xp_disable_update (void);
+extern xp_error xp_reenable_update (void);
+
+
+
+/* Cursor functions. */
+
+/* Installs the specified cursor. ARGB-DATA should point to 32-bit
+   premultiplied big-endian ARGB data. The HOT-X,HOT-Y parameters
+   specify the offset to the cursor's hot spot from its top-left
+   corner. */
+
+extern xp_error xp_set_cursor (unsigned int width, unsigned int height,
+			       unsigned int hot_x, unsigned int hot_y,
+			       const uint32_t *argb_data,
+			       unsigned int rowbytes);
+
+/* Hide and show the cursor if it's owned by the current process. Calls
+   to these functions nest. */
+
+extern xp_error xp_hide_cursor (void);
+extern xp_error xp_show_cursor (void);
+
+
+
+/* Window functions. */
+
+/* Create a new window as defined by MASK and VALUES. MASK must contain
+   XP_BOUNDS or an error is raised. The id of the newly created window
+   is stored in *RET-ID if this function returns XP_Success. */
+
+extern xp_error xp_create_window (unsigned int mask,
+				  const xp_window_changes *values,
+				  xp_window_id *ret_id);
+
+/* Destroys the window identified by ID. */
+
+extern xp_error xp_destroy_window (xp_window_id id);
+
+/* Reconfigures the given window according to MASK and VALUES. */
+
+extern xp_error xp_configure_window (xp_window_id id, unsigned int mask,
+				     const xp_window_changes *values);
+
+
+/* Returns true if NATIVE-ID is a window created by the plugin library.
+   If so and RET-ID is non-null, stores the id of the window in *RET-ID. */
+
+extern xp_bool xp_lookup_native_window (unsigned int native_id,
+					xp_window_id *ret_id);
+
+/* If ID names a window created by the plugin library, stores it's native
+   window id in *RET-NATIVE-ID. */
+
+extern xp_error xp_get_native_window (xp_window_id id,
+				      unsigned int *ret_native_id);
+
+
+/* Locks the rectangle IN-RECT (or, if null, the entire window) of the
+   given window's backing store. Any other non-null parameters are filled
+   in as follows:
+
+   DEPTH = format of returned data. Currently either XP_DEPTH_ARGB8888
+   or XP_DEPTH_RGB565 (possibly with 8 bit planar alpha). Data is
+   always stored in native byte order.
+
+   BITS[0] = pointer to top-left pixel of locked color data
+   BITS[1] = pointer to top-left of locked alpha data, or null if window
+   has no alpha. If the alpha data is meshed, then BITS[1] = BITS[0].
+
+   ROWBYTES[0,1] = size in bytes of each row of color,alpha data
+
+   OUT-RECT = rectangle specifying the current position and size of the
+   locked region relative to the window origin.
+
+   Note that an error is raised when trying to lock an already locked
+   window. While the window is locked, the only operations that may
+   be performed on it are to modify, access or flush its marked region. */
+
+extern xp_error xp_lock_window (xp_window_id id,
+				const xp_box *in_rect,
+				unsigned int *depth,
+				void *bits[2],
+				unsigned int rowbytes[2],
+				xp_box *out_rect);
+
+/* Mark that the region specified by SHAPE-NRECTS, SHAPE-RECTS,
+   SHAPE-TX, and SHAPE-TY in the specified window has been updated, and
+   will need to subsequently be redisplayed. */
+
+extern xp_error xp_mark_window (xp_window_id id, int shape_nrects,
+				const xp_box *shape_rects,
+				int shape_tx, int shape_ty);
+
+/* Unlocks the specified window. If FLUSH is true, then any marked
+   regions are immediately redisplayed. Note that it's an error to
+   unlock an already unlocked window. */
+
+extern xp_error xp_unlock_window (xp_window_id id, xp_bool flush);
+
+/* If anything is marked in the given window for redisplay, do it now. */
+
+extern xp_error xp_flush_window (xp_window_id id);
+
+/* Moves the contents of the region DX,DY pixels away from that specified
+   by DST_RECTS and DST_NRECTS in the window with SRC-ID to the
+   destination region in the window DST-ID. Note that currently source
+   and destination windows must be the same. */
+
+extern xp_error xp_copy_window (xp_window_id src_id, xp_window_id dst_id,
+				int dst_nrects, const xp_box *dst_rects,
+				int dx, int dy);
+
+/* Returns true if the given window has any regions marked for
+   redisplay. */
+
+extern xp_bool xp_is_window_marked (xp_window_id id);
+
+/* If successful returns a superset of the region marked for update in
+   the given window. Use xp_free_region () to release the returned data. */
+
+extern xp_error xp_get_marked_shape (xp_window_id id,
+				     int *ret_nrects, xp_box **ret_rects);
+
+extern void xp_free_shape (int nrects, xp_box *rects);
+
+/* Searches for the first window below ABOVE-ID containing the point X,Y,
+   and returns it's window id in *RET-ID. If no window is found, *RET-ID
+   is set to zero. If ABOVE-ID is zero, finds the topmost window
+   containing the given point. */
+
+extern xp_error xp_find_window (int x, int y, xp_window_id above_id,
+				xp_window_id *ret_id);
+
+/* Returns the current origin and size of the window ID in *BOUNDS-RET if
+   successful. */
+extern xp_error xp_get_window_bounds (xp_window_id id, xp_box *bounds_ret);
+
+
+
+/* Window surface functions. */
+
+/* Create a new VRAM surface on the specified window. If successful,
+   returns the identifier of the new surface in *RET-SID. */
+
+extern xp_error xp_create_surface (xp_window_id id, xp_surface_id *ret_sid);
+
+/* Destroys the specified surface. */
+
+extern xp_error xp_destroy_surface (xp_surface_id sid);
+
+/* Reconfigures the specified surface as defined by MASK and VALUES.
+   Note that specifying XP_DEPTH is an error. */
+
+extern xp_error xp_configure_surface (xp_surface_id sid, unsigned int mask,
+				      const xp_window_changes *values);
+
+/* If successful, places the client identifier of the current process
+   in *RET-CLIENT. */
+
+extern xp_error xp_get_client_id (xp_client_id *ret_client);
+
+/* Given a valid window,surface combination created by the current
+   process, attempts to allow the specified external client access
+   to that surface. If successful, returns two integers in RET-KEY
+   which the client can use to import the surface into their process. */
+
+extern xp_error xp_export_surface (xp_window_id wid, xp_surface_id sid,
+				   xp_client_id client,
+				   unsigned int ret_key[2]);
+
+/* Given a two integer key returned from xp_export_surface (), tries
+   to import the surface into the current process. If successful the
+   local surface identifier is stored in *SID-RET. */
+
+extern xp_error xp_import_surface (const unsigned int key[2],
+				   xp_surface_id *sid_ret);
+
+/* If successful, stores the number of surfaces attached to the
+   specified window in *RET. */
+
+extern xp_error xp_get_window_surface_count (xp_window_id id,
+					     unsigned int *ret);
+
+/* Attaches the CGLContextObj CGL-CTX to the specified surface. */
+
+extern xp_error xp_attach_gl_context (void *cgl_ctx, xp_surface_id sid);
+
+/* Updates the CGLContextObj CGL-CTX to reflect any recent changes to
+   the surface it's attached to. */
+
+extern xp_error xp_update_gl_context (void *cgl_ctx);
+
+
+
+/* Window frame functions. */
+
+/* Possible arguments to xp_frame_get_rect (). */
+
+enum xp_frame_rect_enum {
+    XP_FRAME_RECT_TITLEBAR		= 1,
+    XP_FRAME_RECT_TRACKING		= 2,
+    XP_FRAME_RECT_GROWBOX		= 3,
+};
+
+/* Classes of window frame. */
+
+enum xp_frame_class_enum {
+    XP_FRAME_CLASS_DOCUMENT		= 1 << 0,
+    XP_FRAME_CLASS_DIALOG		= 1 << 1,
+    XP_FRAME_CLASS_MODAL_DIALOG		= 1 << 2,
+    XP_FRAME_CLASS_SYSTEM_MODAL_DIALOG	= 1 << 3,
+    XP_FRAME_CLASS_UTILITY		= 1 << 4,
+    XP_FRAME_CLASS_TOOLBAR		= 1 << 5,
+    XP_FRAME_CLASS_MENU			= 1 << 6,
+    XP_FRAME_CLASS_SPLASH		= 1 << 7,
+    XP_FRAME_CLASS_BORDERLESS		= 1 << 8,
+};
+
+/* Attributes of window frames. */
+
+enum xp_frame_attr_enum {
+    XP_FRAME_ACTIVE			= 0x0001,
+    XP_FRAME_URGENT			= 0x0002,
+    XP_FRAME_TITLE			= 0x0004,
+    XP_FRAME_PRELIGHT			= 0x0008,
+    XP_FRAME_SHADED			= 0x0010,
+    XP_FRAME_CLOSE_BOX			= 0x0100,
+    XP_FRAME_COLLAPSE			= 0x0200,
+    XP_FRAME_ZOOM			= 0x0400,
+    XP_FRAME_ANY_BUTTON			= 0x0700,
+    XP_FRAME_CLOSE_BOX_CLICKED		= 0x0800,
+    XP_FRAME_COLLAPSE_BOX_CLICKED	= 0x1000,
+    XP_FRAME_ZOOM_BOX_CLICKED		= 0x2000,
+    XP_FRAME_ANY_CLICKED		= 0x3800,
+    XP_FRAME_GROW_BOX			= 0x4000,
+};
+
+#define XP_FRAME_ATTR_IS_SET(a,b)	(((a) & (b)) == (b))
+#define XP_FRAME_ATTR_IS_CLICKED(a,m)	((a) & ((m) << 3))
+#define XP_FRAME_ATTR_SET_CLICKED(a,m)	((a) |= ((m) << 3))
+#define XP_FRAME_ATTR_UNSET_CLICKED(a,m) ((a) &= ~((m) << 3))
+
+#define XP_FRAME_POINTER_ATTRS		(XP_FRAME_PRELIGHT		\
+					 | XP_FRAME_ANY_BUTTON		\
+					 | XP_FRAME_ANY_CLICKED)
+
+extern xp_error xp_frame_get_rect (int type, int class, const xp_box *outer,
+				   const xp_box *inner, xp_box *ret);
+extern xp_error xp_frame_hit_test (int class, int x, int y,
+				   const xp_box *outer,
+				   const xp_box *inner, int *ret);
+extern xp_error xp_frame_draw (xp_window_id wid, int class, unsigned int attr,
+			       const xp_box *outer, const xp_box *inner,
+			       unsigned int title_len,
+			       const unsigned char *title_bytes);
+
+
+
+/* Memory manipulation functions. */
+
+enum xp_composite_op_enum {
+    XP_COMPOSITE_SRC = 0,
+    XP_COMPOSITE_OVER,
+};
+
+#define XP_COMPOSITE_FUNCTION(op, src_depth, mask_depth, dest_depth) \
+    (((op) << 24) | ((src_depth) << 16) \
+     | ((mask_depth) << 8) | ((dest_depth) << 0))
+
+#define XP_COMPOSITE_FUNCTION_OP(f)         (((f) >> 24) & 255)
+#define XP_COMPOSITE_FUNCTION_SRC_DEPTH(f)  (((f) >> 16) & 255)
+#define XP_COMPOSITE_FUNCTION_MASK_DEPTH(f) (((f) >>  8) & 255)
+#define XP_COMPOSITE_FUNCTION_DEST_DEPTH(f) (((f) >>  0) & 255)
+
+/* Composite WIDTH by HEIGHT pixels from source and mask to destination
+   using a specified function (if source and destination overlap,
+   undefined behavior results).
+
+   For SRC and DEST, the first element of the array is the color data. If
+   the second element is non-null it implies that there is alpha data
+   (which may be meshed or planar). Data without alpha is assumed to be
+   opaque.
+
+   Passing a null SRC-ROWBYTES pointer implies that the data SRC points
+   to is a single element.
+
+   Operations that are not supported will return XP_BadImplementation. */
+
+extern xp_error xp_composite_pixels (unsigned int width, unsigned int height,
+				     unsigned int function,
+				     void *src[2], unsigned int src_rowbytes[2],
+				     void *mask, unsigned int mask_rowbytes,
+				     void *dest[2], unsigned int dest_rowbytes[2]);
+
+/* Fill HEIGHT rows of data starting at DST. Each row will have WIDTH
+   bytes filled with the 32-bit pattern VALUE. Each row is DST-ROWBYTES
+   wide in total. */
+
+extern void xp_fill_bytes (unsigned int width,
+			   unsigned int height, uint32_t value,
+			   void *dst, unsigned int dst_rowbytes);
+
+/* Copy HEIGHT rows of bytes from SRC to DST. Each row will have WIDTH
+   bytes copied. SRC and DST may overlap, and the right thing will happen. */
+
+extern void xp_copy_bytes (unsigned int width, unsigned int height,
+			   const void *src, unsigned int src_rowbytes,
+			   void *dst, unsigned int dst_rowbytes);
+
+/* Suggestions for the minimum number of bytes or pixels for which it
+   makes sense to use some of the xp_ functions */
+
+extern unsigned int xp_fill_bytes_threshold, xp_copy_bytes_threshold,
+    xp_composite_area_threshold, xp_scroll_area_threshold;
+
+
+#endif /* XPLUGIN_H */
+
diff --git a/xorg-server/miext/shadow/makefile b/xorg-server/miext/shadow/makefile
new file mode 100644
index 000000000..0a84b506c
--- /dev/null
+++ b/xorg-server/miext/shadow/makefile
@@ -0,0 +1,25 @@
+LIBRARY = libshadow
+
+#INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support
+
+CSRCS =	shadow.c		\
+	shalloc.c		\
+	shpacked.c		\
+	shplanar8.c		\
+	shplanar.c		\
+	shrot16pack_180.c	\
+	shrot16pack_270.c	\
+	shrot16pack_270YX.c	\
+	shrot16pack_90.c	\
+	shrot16pack_90YX.c	\
+	shrot16pack.c		\
+	shrot32pack_180.c	\
+	shrot32pack_270.c	\
+	shrot32pack_90.c	\
+	shrot32pack.c		\
+	shrot8pack_180.c	\
+	shrot8pack_270.c	\
+	shrot8pack_90.c		\
+	shrot8pack.c		\
+	shrotate.c
+
diff --git a/xorg-server/miext/sync/makefile b/xorg-server/miext/sync/makefile
new file mode 100644
index 000000000..007233627
--- /dev/null
+++ b/xorg-server/miext/sync/makefile
@@ -0,0 +1,4 @@
+LIBRARY = libsync

+

+CSRCS =	\

+	misync.c

diff --git a/xorg-server/os/WaitFor.c b/xorg-server/os/WaitFor.c
index 393890f19..95762ef18 100644
--- a/xorg-server/os/WaitFor.c
+++ b/xorg-server/os/WaitFor.c
@@ -204,6 +204,12 @@ WaitForSomething(int *pClientsReady)
                     wt = &waittime;
                 }
             }
+            if (!wt)
+            {
+                wt = &waittime;
+                waittime.tv_sec = 0;
+                waittime.tv_usec = 100;
+            }
             XFD_COPYSET(&AllSockets, &LastSelectMask);
         }
 
diff --git a/xorg-server/os/access.c b/xorg-server/os/access.c
index 88a44d9e5..d3e7da599 100644
--- a/xorg-server/os/access.c
+++ b/xorg-server/os/access.c
@@ -220,6 +220,10 @@ static int AccessEnabled = DEFAULT_ACCESS_CONTROL;
 static int LocalHostEnabled = FALSE;
 static int LocalHostRequested = FALSE;
 static int UsingXdmcp = FALSE;
+static u_long *pInterfaces = NULL;
+static int ActiveInterfaces = 0;
+
+void match_interface(u_long u_lQuery);
 
 /* FamilyServerInterpreted implementation */
 static Bool siAddrMatch(int family, pointer addr, int len, HOST * host,
@@ -227,6 +231,84 @@ static Bool siAddrMatch(int family, pointer addr, int len, HOST * host,
 static int siCheckAddr(const char *addrString, int length);
 static void siTypesInitialize(void);
 
+#if NTDDI_VERSION < NTDDI_VISTA
+const char *inet_ntop(int af, const void *src, char *dst, socklen_t cnt)
+{
+    if (af == AF_INET)
+    {
+	struct sockaddr_in in;
+	memset(&in, 0, sizeof(in));
+	in.sin_family = AF_INET;
+	memcpy(&in.sin_addr, src, sizeof(struct in_addr));
+	if (getnameinfo((struct sockaddr *)&in, sizeof(struct sockaddr_in), dst, cnt, NULL, 0, NI_NUMERICHOST) != 0)
+	{
+	    errno = WSAGetLastError();
+	    return NULL;
+	}
+	else return dst;
+    }
+    else if (af == AF_INET6)
+    {
+	struct sockaddr_in6 in;
+	memset(&in, 0, sizeof(in));
+	in.sin6_family = AF_INET6;
+	memcpy(&in.sin6_addr, src, sizeof(struct in_addr6));
+	if (getnameinfo((struct sockaddr *)&in, sizeof(struct sockaddr_in6), dst, cnt, NULL, 0, NI_NUMERICHOST) != 0)
+	{
+	    errno = WSAGetLastError();
+	    return NULL;
+	}
+	else return dst;
+    }
+    errno = WSAEAFNOSUPPORT;
+    return NULL;
+}
+
+int inet_pton(int af, const char *src, void *dst)
+{
+    struct sockaddr_storage ss;
+    int sslen = sizeof(ss);
+    if (af == AF_INET)
+    {
+	struct in_addr out;
+	char buffer[INET_ADDRSTRLEN + 1];
+	strncpy (buffer, src, INET_ADDRSTRLEN);
+	buffer [INET_ADDRSTRLEN] = '\0';
+	if (WSAStringToAddressA(buffer, AF_INET, NULL, (struct sockaddr*)&ss, &sslen) == SOCKET_ERROR)
+	{
+	    errno = WSAGetLastError();
+	    return 0;
+	}
+	else
+	{
+	    out = ((struct sockaddr_in *)&ss)->sin_addr;
+	    memcpy (dst, &out, sizeof(struct in_addr));
+	    return 1;
+	}
+    }
+    else if (af == AF_INET6)
+    {
+	struct in6_addr out6;
+	char buffer6[INET6_ADDRSTRLEN + 1];
+	strncpy (buffer6, src, INET6_ADDRSTRLEN);
+	buffer6 [INET6_ADDRSTRLEN] = '\0';
+	if (WSAStringToAddressA(buffer6, AF_INET6, NULL, (struct sockaddr*)&ss, &sslen) == SOCKET_ERROR)
+	{
+	    errno = WSAGetLastError();
+	    return 0;
+	}
+	else
+	{
+	    out6 = ((struct sockaddr_in6 *)&ss)->sin6_addr;
+	    memcpy (dst, &out6, sizeof(struct in6_addr));
+	    return 1;
+	}
+    }
+    errno = WSAEAFNOSUPPORT;
+    return -1;
+}
+#endif
+
 /*
  * called when authorization is not enabled to add the
  * local host to the access list
@@ -303,7 +385,7 @@ ifioctl(int fd, int cmd, char *arg)
 #endif
 
 /*
- * DefineSelf (fd):
+ * DefineSelf (fd, protocol):
  *
  * Define this host for access control.  Find all the hosts the OS knows about 
  * for this fd and add them to the selfhosts list.
@@ -311,12 +393,11 @@ ifioctl(int fd, int cmd, char *arg)
 
 #if !defined(SIOCGIFCONF)
 void
-DefineSelf(int fd)
+DefineSelf(int fd, const int protocol)
 {
 #if !defined(TCPCONN) && !defined(STREAMSCONN) && !defined(UNIXCONN)
     return;
 #else
-    register int n;
     int len;
     caddr_t addr;
     int family;
@@ -328,6 +409,10 @@ DefineSelf(int fd)
     struct {
         char nodename[512];
     } name;
+    HOST ha;
+    struct addrinfo *addresses;
+    struct addrinfo *a;
+    struct addrinfo hints;
 #endif
 
     register struct hostent *hp;
@@ -347,7 +432,6 @@ DefineSelf(int fd)
 #ifdef XTHREADS_NEEDS_BYNAMEPARAMS
     _Xgethostbynameparams hparams;
 #endif
-
     /* Why not use gethostname()?  Well, at least on my system, I've had to
      * make an ugly kernel patch to get a name longer than 8 characters, and
      * uname() lets me access to the whole string (it smashes release, you
@@ -359,16 +443,93 @@ DefineSelf(int fd)
     gethostname(name.nodename, sizeof(name.nodename));
 #endif
 
+    /* Colin's experiments with using getaddrinfo() instead of the IPv6-useless gethostbyname() */
+    memset( &hints, 0, sizeof(hints) );
+    if (protocol == 4) hints.ai_family = AF_INET;
+    else if (protocol == 6) hints.ai_family = AF_INET6;
+
+    if (getaddrinfo(name.nodename, NULL, &hints, &addresses) != 0) goto CarryOnTheOldWay;
+
+    if (protocol == 6) ErrorF ("DefineSelf - %s has IPv%d addresses...\n",
+                               name.nodename, protocol);
+
+    for (a = addresses; a != NULL; a = a->ai_next) {
+        char ad[INET6_ADDRSTRLEN];
+        ha.family = a->ai_family;
+        if (a->ai_family == AF_INET6) {
+            ha.addr = (unsigned char *)
+              &((struct sockaddr_in6 *) a->ai_addr)->sin6_addr;
+            ha.len = 
+              sizeof (((struct sockaddr_in6 *) a->ai_addr)->sin6_addr);
+        } else {
+            ha.addr = (unsigned char *)
+              &((struct sockaddr_in *) a->ai_addr)->sin_addr;
+            ha.len = 
+              sizeof (((struct sockaddr_in *) a->ai_addr)->sin_addr);
+        }
+        inet_ntop(ha.family, ha.addr, ad, sizeof(ad));
+
+        if (ha.family == AF_INET6) {
+            ErrorF(" %s", ad);
+            saddr.sa.sa_family = AF_INET6;
+            inet6addr = (struct sockaddr_in6 *) (&(saddr.sa));
+            memcpy (&(inet6addr->sin6_addr), ha.addr, ha.len);
+            len = sizeof(saddr.in6);
+            family = ConvertAddr (&(saddr.sa), &len, (pointer *)&addr);
+            if ( family != -1 && family != FamilyLocal ) {
+                for (host = selfhosts;
+                     host && !addrEqual (family, addr, len, host);
+                     host = host->next) ;
+                if (!host) {
+                    /* add this host to the host list.	*/
+                    MakeHost(host,len)
+                    if (host) {
+                        host->family = family;
+                        host->len = len;
+                        memcpy (host->addr, addr, len);
+                        host->next = selfhosts;
+                        selfhosts = host;
+                    }
+                    if (family == FamilyInternet6 &&
+                        !(IN6_IS_ADDR_LOOPBACK((struct in6_addr *)addr))) {
+                        XdmcpRegisterConnection (family, (char *)addr, len);
+                    }
+                }
+            }
+        }
+    }
+    if (protocol == 6) ErrorF ("\n");
+    freeaddrinfo(addresses);
+    /* End of Colin's experiments */
+
+CarryOnTheOldWay:
+
     hp = _XGethostbyname(name.nodename, hparams);
     if (hp != NULL) {
+        int i = 0, j = 0;
+        IN_ADDR Inter;
         saddr.sa.sa_family = hp->h_addrtype;
         switch (hp->h_addrtype) {
         case AF_INET:
+            if (protocol == 6) return; /* We should not be here: gethostbyname() is useless with inet6! */
             inetaddr = (struct sockaddr_in *) (&(saddr.sa));
-            memcpy(&(inetaddr->sin_addr), hp->h_addr, hp->h_length);
-            len = sizeof(saddr.sa);
+            if (!pInterfaces) match_interface(0);
+            if (ActiveInterfaces && pInterfaces && *pInterfaces)
+            {
+                ErrorF ("DefineSelf - %s has %d usable IPv%d interface%s...\n address%s",
+                        name.nodename, ActiveInterfaces, protocol,
+                        ActiveInterfaces==1 ? "" : "s",
+                        ActiveInterfaces==1 ? "" : "es");
+                for (i = 0; hp->h_addr_list[i]; i++)
+                {
+                    Inter.S_un.S_addr = *(u_long *)hp->h_addr_list[i];
+                    ErrorF(" %s", inet_ntoa(Inter));
+                    if (*pInterfaces  == *(u_long *)hp->h_addr_list[i]) j = i;
+                }
+                ErrorF ("\n");
+            }
             break;
-#if defined(IPv6) && defined(AF_INET6)
+#if 0 /* We never used to get here and AF_INET6 is now processed by getaddrinfo() */
         case AF_INET6:
             inet6addr = (struct sockaddr_in6 *) (&(saddr.sa));
             memcpy(&(inet6addr->sin6_addr), hp->h_addr, hp->h_length);
@@ -378,48 +539,56 @@ DefineSelf(int fd)
         default:
             goto DefineLocalHost;
         }
-        family = ConvertAddr(&(saddr.sa), &len, (pointer *) &addr);
-        if (family != -1 && family != FamilyLocal) {
-            for (host = selfhosts;
-                 host && !addrEqual(family, addr, len, host);
-                 host = host->next);
-            if (!host) {
-                /* add this host to the host list.      */
-                MakeHost(host, len)
+
+        for (i = -1; i < 0 || hp->h_addr_list[i]; i++)
+        {
+            if (i < 0) memcpy ( &(inetaddr->sin_addr), hp->h_addr_list[j], hp->h_length);
+            else if (i == j) continue;
+            else memcpy ( &(inetaddr->sin_addr), hp->h_addr_list[i], hp->h_length);
+            len = sizeof(saddr.sa);
+            family = ConvertAddr(&(saddr.sa), &len, (pointer *) &addr);
+            if ( family != -1 && family != FamilyLocal ) {
+                for (host = selfhosts;
+                     host && !addrEqual (family, addr, len, host);
+                host = host->next) ;
+                if (!host) {
+                    /* add this host to the host list.	*/
+                    MakeHost(host,len)
                     if (host) {
-                    host->family = family;
-                    host->len = len;
-                    memcpy(host->addr, addr, len);
-                    host->next = selfhosts;
-                    selfhosts = host;
-                }
-#ifdef XDMCP
-                /*
-                 *  If this is an Internet Address, but not the localhost
-                 *  address (127.0.0.1), nor the bogus address (0.0.0.0),
-                 *  register it.
-                 */
-                if (family == FamilyInternet &&
-                    !(len == 4 &&
-                      ((addr[0] == 127) ||
-                       (addr[0] == 0 && addr[1] == 0 &&
-                        addr[2] == 0 && addr[3] == 0)))
-                    ) {
-                    XdmcpRegisterConnection(family, (char *) addr, len);
-                    broad_addr = *inetaddr;
-                    ((struct sockaddr_in *) &broad_addr)->sin_addr.s_addr =
+                        host->family = family;
+                        host->len = len;
+                        memcpy ( host->addr, addr, len);
+                        host->next = selfhosts;
+                        selfhosts = host;
+                    }
+                    #ifdef XDMCP
+                    /*
+                     *  If this is an Internet Address, but not the localhost
+                     *  address (127.0.0.1), nor the bogus address (0.0.0.0),
+                     *  register it.
+                     */
+                    if (family == FamilyInternet &&
+                        !(len == 4 &&
+                          ((addr[0] == 127) ||
+                           (addr[0] == 0 && addr[1] == 0 &&
+                            addr[2] == 0 && addr[3] == 0)))
+                        ) {
+                        XdmcpRegisterConnection (family, (char *)addr, len);
+                        broad_addr = *inetaddr;
+                        ((struct sockaddr_in *) &broad_addr)->sin_addr.s_addr =
                         htonl(INADDR_BROADCAST);
-                    XdmcpRegisterBroadcastAddress((struct sockaddr_in *)
+                        XdmcpRegisterBroadcastAddress ((struct sockaddr_in *)
                                                   &broad_addr);
+                    }
+                    #if defined(IPv6) && defined(AF_INET6)
+                    else if (family == FamilyInternet6 &&
+                      !(IN6_IS_ADDR_LOOPBACK((struct in6_addr *)addr))) {
+                        XdmcpRegisterConnection (family, (char *)addr, len);
+                    }
+                    #endif
+                    
+                    #endif /* XDMCP */
                 }
-#if defined(IPv6) && defined(AF_INET6)
-                else if (family == FamilyInternet6 &&
-                         !(IN6_IS_ADDR_LOOPBACK((struct in6_addr *) addr))) {
-                    XdmcpRegisterConnection(family, (char *) addr, len);
-                }
-#endif
-
-#endif                          /* XDMCP */
             }
         }
     }
@@ -427,6 +596,7 @@ DefineSelf(int fd)
      * now add a host of family FamilyLocalHost...
      */
  DefineLocalHost:
+    free(pInterfaces);
     for (host = selfhosts;
          host && !addrEqual(FamilyLocalHost, "", 0, host); host = host->next);
     if (!host) {
@@ -846,18 +1016,19 @@ ResetHosts(char *display)
         FreeHost(host);
     }
 
-#if defined WIN32 && defined __MINGW32__
-#define ETC_HOST_PREFIX "X"
-#else
 #define ETC_HOST_PREFIX "/etc/X"
-#endif
 #define ETC_HOST_SUFFIX ".hosts"
     fnamelen = strlen(ETC_HOST_PREFIX) + strlen(ETC_HOST_SUFFIX) +
         strlen(display) + 1;
     if (fnamelen > sizeof(fname))
         FatalError("Display name `%s' is too long\n", display);
+#ifdef __MINGW32__
+    snprintf(fname, sizeof(fname), "%s%s" ETC_HOST_SUFFIX, getenv("XHOSTPREFIX"),
+             display);
+#else
     snprintf(fname, sizeof(fname), ETC_HOST_PREFIX "%s" ETC_HOST_SUFFIX,
              display);
+#endif
 
     if ((fd = fopen(fname, "r")) != 0) {
         while (fgets(ohostname, sizeof(ohostname), fd)) {
@@ -921,9 +1092,13 @@ ResetHosts(char *display)
                     (family == FamilyWild)) {
                     struct addrinfo *addresses;
                     struct addrinfo *a;
+                    struct addrinfo hints;
                     int f;
 
-                    if (getaddrinfo(hostname, NULL, NULL, &addresses) == 0) {
+                    memset( &hints, 0, sizeof(hints) );
+                    if (family == FamilyInternet) hints.ai_family = AF_INET;
+                    else if (family == FamilyInternet6) hints.ai_family = AF_INET6;
+                    if (getaddrinfo(hostname, NULL, &hints, &addresses) == 0) {
                         for (a = addresses; a != NULL; a = a->ai_next) {
                             len = a->ai_addrlen;
                             f = ConvertAddr(a->ai_addr, &len,
@@ -1237,7 +1412,9 @@ NewHost(int family, const void *addr, int len, int addingLocalHosts)
 {
     register HOST *host;
 
+    if (family == FamilyLocal) return TRUE; /* No FamilyLocal in Vcxsrv */
     for (host = validhosts; host; host = host->next) {
+
         if (addrEqual(family, addr, len, host))
             return TRUE;
     }
@@ -1674,6 +1851,7 @@ siHostnameAddrMatch(int family, pointer addr, int len,
         char hostname[SI_HOSTNAME_MAXLEN];
         struct addrinfo *addresses;
         struct addrinfo *a;
+        struct addrinfo hints;
         int f, hostaddrlen;
         pointer hostaddr;
 
@@ -1682,7 +1860,10 @@ siHostnameAddrMatch(int family, pointer addr, int len,
 
         strlcpy(hostname, siAddr, siAddrLen + 1);
 
-        if (getaddrinfo(hostname, NULL, NULL, &addresses) == 0) {
+        memset( &hints, 0, sizeof(hints) );
+        if (family == FamilyInternet) hints.ai_family = AF_INET;
+        else if (family == FamilyInternet6) hints.ai_family = AF_INET6;
+        if (getaddrinfo(hostname, NULL, &hints, &addresses) == 0) {
             for (a = addresses; a != NULL; a = a->ai_next) {
                 hostaddrlen = a->ai_addrlen;
                 f = ConvertAddr(a->ai_addr, &hostaddrlen, &hostaddr);
@@ -1715,7 +1896,7 @@ siHostnameAddrMatch(int family, pointer addr, int len,
         if ((hp = _XGethostbyname(hostname, hparams)) != NULL) {
 #ifdef h_addr                   /* new 4.3bsd version of gethostent */
             /* iterate over the addresses */
-            for (addrlist = hp->h_addr_list; *addrlist; addrlist++)
+            for (addrlist = (const char **)hp->h_addr_list; *addrlist; addrlist++)
 #else
             addrlist = &hp->h_addr;
 #endif
@@ -2012,3 +2193,55 @@ siTypesInitialize(void)
               &siLocalGroupPriv);
 #endif
 }
+
+void match_interface(u_long u_lQuery)
+{
+    WSADATA w;
+    SOCKET sd;
+    INTERFACE_INFO InterfaceList[25];
+    PSOCKADDR_IN pAddress, pNetmask;
+    u_long nBytesReturned, tempAddress;
+    u_long u_lAddress, u_lNetmask, u_lFlags;
+    int nNumInterfaces, i, j = 0;
+
+    if (WSAStartup(MAKEWORD(2,2), &w) != 0)
+        return;
+
+    sd = WSASocket(AF_INET, SOCK_DGRAM, 0, 0, 0, 0);
+    if (sd == INVALID_SOCKET)
+    {
+        WSACleanup();
+        return;
+    }
+
+    if (WSAIoctl(sd, SIO_GET_INTERFACE_LIST, 0, 0, &InterfaceList, sizeof(InterfaceList), &nBytesReturned, 0, 0) == SOCKET_ERROR)
+    {
+        closesocket(sd);
+        WSACleanup();
+        return;
+    }
+
+    nNumInterfaces = (int)(nBytesReturned/sizeof(INTERFACE_INFO));
+    pInterfaces = malloc(25*sizeof(u_long));
+    for (i = 0; i < nNumInterfaces; ++i)
+    {
+        pAddress = &InterfaceList[i].iiAddress.AddressIn;
+        u_lAddress = pAddress->sin_addr.S_un.S_addr;
+
+        pNetmask = &InterfaceList[i].iiNetmask.AddressIn;
+        u_lNetmask = pNetmask->sin_addr.S_un.S_addr;
+
+        u_lFlags = InterfaceList[i].iiFlags;
+        if ((u_lFlags & IFF_UP) && !(u_lFlags & IFF_LOOPBACK))
+        {
+            if ((u_lAddress & u_lNetmask) == (u_lQuery & u_lNetmask)) j = i;
+            *(pInterfaces + ActiveInterfaces) = u_lAddress;
+            ActiveInterfaces++;
+        }
+    }
+    tempAddress = *pInterfaces;
+    *pInterfaces = *(pInterfaces + j);
+    *(pInterfaces + j) = tempAddress;
+    closesocket(sd);
+    WSACleanup();
+}
diff --git a/xorg-server/os/auth.c b/xorg-server/os/auth.c
index ac20de47d..b95786bee 100644
--- a/xorg-server/os/auth.c
+++ b/xorg-server/os/auth.c
@@ -303,11 +303,23 @@ GenerateAuthorization(unsigned name_length,
 void
 GenerateRandomData(int len, char *buf)
 {
+#ifdef _MSC_VER
+    static HANDLE hAdvApi32;
+    static BOOLEAN (_stdcall * RtlGenRandom)(void *,unsigned long);
+
+    if (!hAdvApi32)
+    {
+      hAdvApi32=LoadLibrary("advapi32.dll");
+      RtlGenRandom=(BOOLEAN (_stdcall *)(void*,unsigned long))GetProcAddress(hAdvApi32,"SystemFunction036");
+    }
+    RtlGenRandom(buf, len);
+#else
     int fd;
 
     fd = open("/dev/urandom", O_RDONLY);
     read(fd, buf, len);
     close(fd);
+#endif
 }
 
 #endif                          /* XCSECURITY */
diff --git a/xorg-server/os/connection.c b/xorg-server/os/connection.c
index 6cd8bcf43..d073c2f91 100644
--- a/xorg-server/os/connection.c
+++ b/xorg-server/os/connection.c
@@ -66,6 +66,9 @@ SOFTWARE.
 
 #ifdef WIN32
 #include <X11/Xwinsock.h>
+#ifdef _DEBUG
+#define DEBUG
+#endif
 #endif
 #include <X11/X.h>
 #include <X11/Xproto.h>
@@ -108,6 +111,10 @@ SOFTWARE.
 #include "dixstruct.h"
 #include "xace.h"
 
+#ifdef _MSC_VER
+typedef int pid_t;
+#endif
+
 #define Pid_t pid_t
 
 #ifdef HAVE_GETPEERUCRED
@@ -139,12 +146,15 @@ int MaxClients = 0;
 Bool NewOutputPending;          /* not yet attempted to write some new output */
 Bool AnyClientsWriteBlocked;    /* true if some client blocked on write */
 
+#if !defined(_MSC_VER)
 static Bool RunFromSmartParent; /* send SIGUSR1 to parent process */
+static Pid_t ParentProcess;
+#endif
 Bool RunFromSigStopParent;      /* send SIGSTOP to our own process; Upstart (or
                                    equivalent) will send SIGCONT back. */
 static char dynamic_display[7]; /* display name */
+static int dynamic_display_id;
 Bool PartialNetwork;            /* continue even if unable to bind all addrs */
-static Pid_t ParentProcess;
 
 static Bool debug_conns = FALSE;
 
@@ -166,9 +176,9 @@ int *ConnectionTranslation = NULL;
  */
 
 #undef MAXSOCKS
-#define MAXSOCKS 500
+#define MAXSOCKS FD_SETSIZE
 #undef MAXSELECT
-#define MAXSELECT 500
+#define MAXSELECT FD_SETSIZE
 
 struct _ct_node {
     struct _ct_node *next;
@@ -269,6 +279,23 @@ lookup_trans_conn(int fd)
     return NULL;
 }
 
+int
+TransIsListening(char *protocol)
+{
+  /* look for this transport in the list of listeners */
+  int i;
+  for (i = 0; i < ListenTransCount; i++)
+    {
+      if (!strcmp(protocol, ListenTransConns[i]->transptr->TransName))
+        {
+          return 1;
+        }
+    }
+
+  return 0;
+}
+
+
 /* Set MaxClients and lastfdesc, and allocate ConnectionTranslation */
 
 void
@@ -363,6 +390,11 @@ NotifyParentProcess(void)
     }
     if (RunFromSigStopParent)
         raise(SIGSTOP);
+#else
+/* On windows the displayfd points to shared memory, so write the id to it */
+    int *pDisplayfd=(int*)MapViewOfFile((HANDLE)displayfd, FILE_MAP_READ|FILE_MAP_WRITE, 0, 0, 0);
+    if (pDisplayfd)
+      *pDisplayfd=dynamic_display_id;
 #endif
 }
 
@@ -415,7 +447,7 @@ CreateWellKnownSockets(void)
     else { /* -displayfd */
         Bool found = 0;
         for (i = 0; i < 65535 - X_TCP_PORT; i++) {
-            if (TryCreateSocket(i, &partial) && !partial) {
+            if (TryCreateSocket(i, &partial) && ListenTransCount >= 1 && (PartialNetwork || !partial)) {
                 found = 1;
                 break;
             }
@@ -424,20 +456,25 @@ CreateWellKnownSockets(void)
         }
         if (!found)
             FatalError("Failed to find a socket to listen on");
+        dynamic_display_id=i;
         snprintf(dynamic_display, sizeof(dynamic_display), "%d", i);
         display = dynamic_display;
     }
 
     ListenTransFds = malloc(ListenTransCount * sizeof (int));
 
-    for (i = 0; i < ListenTransCount; i++) {
-        int fd = _XSERVTransGetConnectionNumber(ListenTransConns[i]);
+    for (i = ListenTransCount; i > 0; i--) {
+        int fd = _XSERVTransGetConnectionNumber (ListenTransConns[i-1]);
 
-        ListenTransFds[i] = fd;
+        ListenTransFds[i-1] = fd;
         FD_SET(fd, &WellKnownConnections);
 
-        if (!_XSERVTransIsLocal(ListenTransConns[i]))
-            DefineSelf (fd);
+        if (!_XSERVTransIsLocal (ListenTransConns[i-1])) {
+            int protocol = 0;
+            if (!strcmp("inet", ListenTransConns[i-1]->transptr->TransName)) protocol = 4;
+            else if (!strcmp("inet6", ListenTransConns[i-1]->transptr->TransName)) protocol = 6;
+            DefineSelf (fd, protocol);
+        }
     }
 
     if (!XFD_ANYSET(&WellKnownConnections))
@@ -978,15 +1015,17 @@ CheckConnections(void)
 {
 #ifndef WIN32
     fd_mask mask;
+    int curoff;
 #endif
     fd_set tmask;
-    int curclient, curoff;
+    int curclient;
     int i;
     struct timeval notime;
     int r;
 
 #ifdef WIN32
-    fd_set savedAllClients;
+    fd_set savedAllSockets;
+    unsigned j;
 #endif
 
     notime.tv_sec = 0;
@@ -1010,17 +1049,21 @@ CheckConnections(void)
         }
     }
 #else
-    XFD_COPYSET(&AllClients, &savedAllClients);
-    for (i = 0; i < XFD_SETCOUNT(&savedAllClients); i++) {
-        curclient = XFD_FD(&savedAllClients, i);
-        FD_ZERO(&tmask);
-        FD_SET(curclient, &tmask);
-        do {
-            r = Select(curclient + 1, &tmask, NULL, NULL, &notime);
-        } while (r < 0 && (errno == EINTR || errno == EAGAIN));
-        if (r < 0)
-            if (GetConnectionTranslation(curclient) > 0)
-                CloseDownClient(clients[GetConnectionTranslation(curclient)]);
+    /* First test AllSockets and then AllClients are valid sockets */
+    XFD_COPYSET(&AllSockets, &savedAllSockets);
+    for (j=0; j<2; j++) {
+        for (i = 0; i < XFD_SETCOUNT(&savedAllSockets); i++) {
+            curclient = XFD_FD(&savedAllSockets, i);
+            FD_ZERO(&tmask);
+            FD_SET(curclient, &tmask);
+            do {
+                r = Select (curclient + 1, &tmask, NULL, NULL, &notime);
+            } while (r == SOCKET_ERROR && (WSAGetLastError() == WSAEINTR || WSAGetLastError() == WSAEWOULDBLOCK));
+            if (r < 0)
+                if (GetConnectionTranslation(curclient) > 0)
+            CloseDownClient(clients[GetConnectionTranslation(curclient)]);
+        }
+      XFD_COPYSET(&AllClients, &savedAllSockets);
     }
 #endif
 }
@@ -1038,8 +1081,12 @@ CloseDownConnection(ClientPtr client)
     if (FlushCallback)
         CallCallbacks(&FlushCallback, NULL);
 
+#ifdef DEBUG
+    ErrorF("CloseDownConnection: client index = %d, socket fd = %d\n",
+           client->index, oc->fd);
+#endif
     if (oc->output)
-	FlushClient(client, oc, (char *) NULL, 0);
+        FlushClient(client, oc, (char *) NULL, 0);
 #ifdef XDMCP
     XdmcpCloseDisplay(oc->fd);
 #endif
diff --git a/xorg-server/os/io.c b/xorg-server/os/io.c
index 2f091c417..8bb54ff74 100644
--- a/xorg-server/os/io.c
+++ b/xorg-server/os/io.c
@@ -925,6 +925,7 @@ FlushClient(ClientPtr who, OsCommPtr oc, const void *__extraBuf, int extraCount)
             /* If we've arrived here, then the client is stuffed to the gills
                and not ready to accept more.  Make a note of it and buffer
                the rest. */
+            errno=0;
             FD_SET(connection, &ClientsWriteBlocked);
             AnyClientsWriteBlocked = TRUE;
 
diff --git a/xorg-server/os/log.c b/xorg-server/os/log.c
index 4820e9a77..23f181d8d 100644
--- a/xorg-server/os/log.c
+++ b/xorg-server/os/log.c
@@ -92,8 +92,14 @@ OR PERFORMANCE OF THIS SOFTWARE.
 
 #ifdef WIN32
 #include <process.h>
+#ifndef _MSC_VER
 #define getpid(x) _getpid(x)
 #endif
+#endif
+
+#ifdef _MSC_VER
+#define S_ISREG(m)  (((m)&_S_IFMT) == _S_IFREG)
+#endif
 
 #ifdef XF86BIGFONT
 #include "xf86bigfontsrv.h"
@@ -380,8 +386,8 @@ LogSWrite(int verb, const char *buf, size_t len, Bool end_line)
 #endif
         }
         else if (!inSignalContext && logFile) {
-            if (newline)
-                fprintf(logFile, "[%10.3f] ", GetTimeInMillis() / 1000.0);
+//            if (newline)
+//                fprintf(logFile, "[%10.3f] ", GetTimeInMillis() / 1000.0);
             newline = end_line;
             fwrite(buf, len, 1, logFile);
             if (logFlush) {
@@ -410,7 +416,7 @@ LogSWrite(int verb, const char *buf, size_t len, Bool end_line)
 void
 LogVWrite(int verb, const char *f, va_list args)
 {
-    return LogVMessageVerb(X_NONE, verb, f, args);
+    LogVMessageVerb(X_NONE, verb, f, args);
 }
 
 void
@@ -747,7 +753,7 @@ VAuditF(const char *f, va_list args)
         if (auditTimer != NULL)
             TimerForce(auditTimer);
         ErrorF("%s%s", prefix != NULL ? prefix : "", buf);
-        strlcpy(oldbuf, buf, sizeof(oldbuf));
+        strncpy(oldbuf, buf, sizeof(oldbuf));
         oldlen = len;
         nrepeat = 0;
         auditTimer = TimerSet(auditTimer, 0, AUDIT_TIMEOUT, AuditFlush, NULL);
@@ -755,6 +761,8 @@ VAuditF(const char *f, va_list args)
     free(prefix);
 }
 
+extern char g_FatalErrorMessage[1024];
+
 void
 FatalError(const char *f, ...)
 {
@@ -769,8 +777,10 @@ FatalError(const char *f, ...)
 
     va_start(args, f);
 
+#ifndef _MSC_VER
     /* Make a copy for OsVendorFatalError */
     va_copy(args2, args);
+#endif
 
 #ifdef __APPLE__
     {
@@ -782,9 +792,15 @@ FatalError(const char *f, ...)
         va_end(apple_args);
     }
 #endif
+#ifdef WIN32
+    vsnprintf(g_FatalErrorMessage, 1024, f, args);
+#endif
     VErrorF(f, args);
     va_end(args);
     ErrorF("\n");
+#ifdef _MSC_VER
+    va_start(args2, f);
+#endif
     if (!beenhere)
         OsVendorFatalError(f, args2);
     va_end(args2);
diff --git a/xorg-server/os/makefile b/xorg-server/os/makefile
new file mode 100644
index 000000000..b7fdc12b1
--- /dev/null
+++ b/xorg-server/os/makefile
@@ -0,0 +1,55 @@
+LIBRARY=libos

+

+ifeq ($(DEBUG),1)

+DEFINES += XSERVER_DTRACE

+endif

+SECURE_RPC=1

+XDMCP=1

+NEED_STRLCAT=1

+NEED_STRNDUP=1

+

+SECURERPC_SRCS = rpcauth.c

+XDMCP_SRCS = xdmcp.c

+STRLCAT_SRCS = strlcat.c strlcpy.c

+XORG_SRCS = log.c

+STRNDUP_SRCS = strndup.c

+

+libos_la_SOURCES = 	\

+	WaitFor.c	\

+	access.c	\

+	auth.c		\

+	backtrace.c	\

+	client.c	\

+	connection.c	\

+	io.c		\

+	mitauth.c	\

+	oscolor.c	\

+	osdep.h		\

+	osinit.c	\

+	utils.c		\

+	strcasecmp.c	\

+	strcasestr.c	\

+	xdmauth.c	\

+	xsha1.c		\

+	xstrans.c	\

+	xprintf.c	\

+	$(XORG_SRCS)

+

+if SECURE_RPC

+libos_la_SOURCES += $(SECURERPC_SRCS)

+endif

+if XDMCP

+libos_la_SOURCES += $(XDMCP_SRCS)

+endif

+

+if NEED_STRLCAT

+libos_la_SOURCES += $(STRLCAT_SRCS)

+endif

+

+if NEED_STRNDUP

+libos_la_SOURCES += $(STRNDUP_SRCS)

+endif

+

+CSRCS = $(filter %.c,$(libos_la_SOURCES))

+

+

diff --git a/xorg-server/os/osinit.c b/xorg-server/os/osinit.c
index 6c66f9c12..6c66f9c12 100644..100755
--- a/xorg-server/os/osinit.c
+++ b/xorg-server/os/osinit.c
diff --git a/xorg-server/os/strndup.c b/xorg-server/os/strndup.c
index b604b9bac..e0eddf13d 100644
--- a/xorg-server/os/strndup.c
+++ b/xorg-server/os/strndup.c
@@ -27,6 +27,10 @@
  * SUCH DAMAGE.
  */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/xorg-server/os/utils.c b/xorg-server/os/utils.c
index e396ba4b5..518400cfd 100644..100755
--- a/xorg-server/os/utils.c
+++ b/xorg-server/os/utils.c
@@ -73,6 +73,9 @@ __stdcall unsigned long GetTickCount(void);
 #include <sys/resource.h>
 # define SMART_SCHEDULE_POSSIBLE
 #endif
+#ifdef _MSC_VER
+# define SMART_SCHEDULE_POSSIBLE
+#endif
 #include "misc.h"
 #include <X11/X.h>
 #define XSERV_t
@@ -206,6 +209,11 @@ char *SeatId = NULL;
 
 sig_atomic_t inSignalContext = FALSE;
 
+#ifdef _MSC_VER
+static HANDLE s_hSmartScheduleTimer = NULL;
+static HANDLE s_hSmartScheduleTimerQueue = NULL;
+#endif
+
 #if defined(SVR4) || defined(__linux__) || defined(CSRG_BASED)
 #define HAS_SAVED_IDS_AND_SETEUID
 #endif
@@ -240,6 +248,10 @@ OsSignal(int sig, OsSigHandlerPtr handler)
 #define LOCK_PREFIX "/.X"
 #define LOCK_SUFFIX "-lock"
 
+#ifdef _MSC_VER
+#define LockFile szLockFile
+#endif
+
 #if !defined(WIN32) || defined(__CYGWIN__)
 #define LOCK_SERVER
 #endif
@@ -266,6 +278,14 @@ static Bool nolock = FALSE;
 void
 LockServer(void)
 {
+#if defined(WIN32) && !defined(__CYGWIN__)
+  char MutexName[100];
+  sprintf(MutexName, "Global\\VcXsrv_Mutex_%d\n", atoi(display));
+  if (!CreateMutex(NULL,TRUE,MutexName) || GetLastError()== ERROR_ALREADY_EXISTS)
+  {
+    FatalError("Server is already active for display %d\n", atoi(display));
+  }
+#else
     char tmp[PATH_MAX], pid_str[12];
     int lfd, i, haslock, l_pid, t;
     const char *tmppath = LOCK_DIR;
@@ -383,6 +403,7 @@ LockServer(void)
     if (!haslock)
         FatalError("Could not create server lock file: %s\n", LockFile);
     StillLocking = FALSE;
+#endif
 }
 
 /*
@@ -488,7 +509,10 @@ AdjustWaitForDelay(pointer waitTime, unsigned long newdelay)
 void
 UseMsg(void)
 {
-    ErrorF("use: X [:<display>] [option]\n");
+    ErrorF("Usage...\nVcxsrv [:<display>] [option]\n\n");
+    ErrorF(":display-number\n\tVcxsrv runs as the given display-number, which defaults to 0.\n");
+    ErrorF("\tTo run multiple instances, use unique display-numbers.\n\n");
+
     ErrorF("-a #                   default pointer acceleration (factor)\n");
     ErrorF("-ac                    disable access control restrictions\n");
     ErrorF("-audit int             set audit trail level\n");
@@ -496,12 +520,14 @@ UseMsg(void)
     ErrorF("-br                    create root window with black background\n");
     ErrorF("+bs                    enable any backing store support\n");
     ErrorF("-bs                    disable any backing store support\n");
-    ErrorF("-c                     turns off key-click\n");
-    ErrorF("c #                    key-click volume (0-100)\n");
     ErrorF("-cc int                default color visual class\n");
     ErrorF("-nocursor              disable the cursor\n");
     ErrorF("-core                  generate core dump on fatal error\n");
+#ifdef _MSC_VER
+    ErrorF("-dpi [auto|int]        screen resolution set to native or this dpi\n");
+#else
     ErrorF("-dpi int               screen resolution in dots per inch\n");
+#endif
 #ifdef DPMSExtension
     ErrorF("-dpms                  disables VESA DPMS monitor control\n");
 #endif
@@ -529,25 +555,19 @@ UseMsg(void)
     ErrorF("-noreset               don't reset after last client exists\n");
     ErrorF("-background [none]     create root window with no background\n");
     ErrorF("-reset                 reset after last client exists\n");
-    ErrorF("-p #                   screen-saver pattern duration (minutes)\n");
     ErrorF("-pn                    accept failure to listen on all ports\n");
     ErrorF("-nopn                  reject failure to listen on all ports\n");
     ErrorF("-r                     turns off auto-repeat\n");
     ErrorF("r                      turns on auto-repeat \n");
     ErrorF("-render [default|mono|gray|color] set render color alloc policy\n");
-    ErrorF("-retro                 start with classic stipple and cursor\n");
-    ErrorF("-s #                   screen-saver timeout (minutes)\n");
+    ErrorF("-retro                 start with classic stipple\n");
     ErrorF("-seat string           seat to run on\n");
     ErrorF("-t #                   default pointer threshold (pixels/t)\n");
     ErrorF("-terminate             terminate at server reset\n");
     ErrorF("-to #                  connection time out\n");
     ErrorF("-tst                   disable testing extensions\n");
-    ErrorF("ttyxx                  server started from init on /dev/ttyxx\n");
-    ErrorF("v                      video blanking for screen-saver\n");
-    ErrorF("-v                     screen-saver without video blanking\n");
     ErrorF("-wm                    WhenMapped default backing-store\n");
     ErrorF("-wr                    create root window with white background\n");
-    ErrorF("-maxbigreqsize         set maximal bigrequest size \n");
 #ifdef PANORAMIX
     ErrorF("+xinerama              Enable XINERAMA extension\n");
     ErrorF("-xinerama              Disable XINERAMA extension\n");
@@ -555,7 +575,6 @@ UseMsg(void)
     ErrorF
         ("-dumbSched             Disable smart scheduling, enable old behavior\n");
     ErrorF("-schedInterval int     Set scheduler interval in msec\n");
-    ErrorF("-sigstop               Enable SIGSTOP based startup\n");
     ErrorF("+extension name        Enable extension\n");
     ErrorF("-extension name        Disable extension\n");
 #ifdef XDMCP
@@ -647,15 +666,6 @@ ProcessCommandLine(int argc, char *argv[])
             enableBackingStore = TRUE;
         else if (strcmp(argv[i], "-bs") == 0)
             disableBackingStore = TRUE;
-        else if (strcmp(argv[i], "c") == 0) {
-            if (++i < argc)
-                defaultKeyboardControl.click = atoi(argv[i]);
-            else
-                UseMsg();
-        }
-        else if (strcmp(argv[i], "-c") == 0) {
-            defaultKeyboardControl.click = 0;
-        }
         else if (strcmp(argv[i], "-cc") == 0) {
             if (++i < argc)
                 defaultColorVisualClass = atoi(argv[i]);
@@ -677,7 +687,24 @@ ProcessCommandLine(int argc, char *argv[])
         }
         else if (strcmp(argv[i], "-dpi") == 0) {
             if (++i < argc)
+#ifdef _MSC_VER
+            {
+                if (strcmp(argv[i], "auto") == 0)
+                {
+                    HDC hdc = GetDC(NULL);
+                    if (hdc)
+                    {
+                        int dpiY = GetDeviceCaps(hdc, LOGPIXELSY);
+                        monitorResolution = dpiY;
+                        ReleaseDC(NULL, hdc);
+                    }
+                }
+                else if (isdigit(*argv[i])) /* Naively prevent a crash if not numeric */
+              monitorResolution = atoi(argv[i]);
+            }
+#else
                 monitorResolution = atoi(argv[i]);
+#endif
             else
                 UseMsg();
         }
@@ -844,10 +871,6 @@ ProcessCommandLine(int argc, char *argv[])
         else if (strcmp(argv[i], "-tst") == 0) {
             noTestExtensions = TRUE;
         }
-        else if (strcmp(argv[i], "v") == 0)
-            defaultScreenSaverBlanking = PreferBlanking;
-        else if (strcmp(argv[i], "-v") == 0)
-            defaultScreenSaverBlanking = DontPreferBlanking;
         else if (strcmp(argv[i], "-wm") == 0)
             defaultBackingStore = WhenMapped;
         else if (strcmp(argv[i], "-wr") == 0)
@@ -931,9 +954,6 @@ ProcessCommandLine(int argc, char *argv[])
             else
                 UseMsg();
         }
-        else if (strcmp(argv[i], "-sigstop") == 0) {
-            RunFromSigStopParent = TRUE;
-        }
         else if (strcmp(argv[i], "+extension") == 0) {
             if (++i < argc) {
                 if (!EnableDisableExtension(argv[i], TRUE))
@@ -1131,6 +1151,12 @@ void
 SmartScheduleStopTimer(void)
 {
 #ifdef SMART_SCHEDULE_POSSIBLE
+#ifdef _MSC_VER
+    if (SmartScheduleDisable)
+        return;
+    DeleteTimerQueueTimer(s_hSmartScheduleTimerQueue, s_hSmartScheduleTimer, NULL);
+    s_hSmartScheduleTimer=NULL;
+#else
     struct itimerval timer;
 
     if (SmartScheduleDisable)
@@ -1141,12 +1167,37 @@ SmartScheduleStopTimer(void)
     timer.it_value.tv_usec = 0;
     (void) setitimer(ITIMER_REAL, &timer, 0);
 #endif
+#endif
 }
 
+#ifdef _MSC_VER
+static VOID CALLBACK SmartScheduleTimer( PVOID lpParameter, BOOLEAN TimerOrWaitFired)
+#else
+static void SmartScheduleTimer (int sig)
+#endif
+{
+    SmartScheduleTime += SmartScheduleInterval;
+}
+
+
 void
 SmartScheduleStartTimer(void)
 {
 #ifdef SMART_SCHEDULE_POSSIBLE
+#ifdef _MSC_VER
+    if (SmartScheduleDisable)
+        return;
+
+    if (!CreateTimerQueueTimer( &s_hSmartScheduleTimer, s_hSmartScheduleTimerQueue, SmartScheduleTimer, NULL
+                              , SmartScheduleInterval, SmartScheduleInterval, WT_EXECUTEONLYONCE|WT_EXECUTEINPERSISTENTTHREAD))
+    {
+        DWORD Error=GetLastError();
+        ErrorF("Error starting timer, smart scheduling disabled: 0x%x (%d)\n",Error,Error);
+        CloseHandle(s_hSmartScheduleTimer);
+        SmartScheduleDisable = TRUE;
+        return;
+    }
+#else
     struct itimerval timer;
 
     if (SmartScheduleDisable)
@@ -1157,18 +1208,24 @@ SmartScheduleStartTimer(void)
     timer.it_value.tv_usec = SmartScheduleInterval * 1000;
     setitimer(ITIMER_REAL, &timer, 0);
 #endif
-}
-
-static void
-SmartScheduleTimer(int sig)
-{
-    SmartScheduleTime += SmartScheduleInterval;
+#endif
 }
 
 void
 SmartScheduleInit(void)
 {
 #ifdef SMART_SCHEDULE_POSSIBLE
+#ifdef _MSC_VER
+    if (SmartScheduleDisable)
+        return;
+    s_hSmartScheduleTimerQueue = CreateTimerQueue();
+    if (!s_hSmartScheduleTimerQueue)
+    {
+        DWORD Error=GetLastError();
+        ErrorF("Error creating timer, smart scheduling disabled: 0x%x (%d)\n",Error,Error);
+        SmartScheduleDisable = TRUE;
+    }
+#else
     struct sigaction act;
 
     if (SmartScheduleDisable)
@@ -1185,6 +1242,7 @@ SmartScheduleInit(void)
         SmartScheduleDisable = TRUE;
     }
 #endif
+#endif
 }
 
 #ifdef SIG_BLOCK
@@ -1709,7 +1767,7 @@ System(const char *cmdline)
 #endif
 
 #define MAX_ARG_LENGTH          128
-#define MAX_ENV_LENGTH          256
+#define MAX_ENV_LENGTH          2048
 #define MAX_ENV_PATH_LENGTH     2048    /* Limit for *PATH and TERMCAP */
 
 #if USE_ISPRINT
diff --git a/xorg-server/os/xdmcp.c b/xorg-server/os/xdmcp.c
index 0538ac53e..66c846d44 100644
--- a/xorg-server/os/xdmcp.c
+++ b/xorg-server/os/xdmcp.c
@@ -62,6 +62,8 @@
 
 static const char *defaultDisplayClass = COMPILEDDISPLAYCLASS;
 
+extern void match_interface(u_long u_lQuery);
+
 static int xdmcpSocket, sessionSocket;
 static xdmcp_states state;
 
@@ -197,6 +199,11 @@ static void XdmcpWakeupHandler(pointer /*data */ ,
                                int /*i */ ,
                                pointer /*LastSelectMask */ );
 
+#define XSERV_t
+#define TRANS_SERVER
+#define TRANS_REOPEN
+#include <X11/Xtrans/Xtrans.h>
+
 /*
  * Register the Manufacturer display ID
  */
@@ -581,6 +588,32 @@ XdmcpInit(void)
                                        (pointer) 0);
         timeOutRtx = 0;
         DisplayNumber = (CARD16) atoi(display);
+        if (ConnectionTypes.length>1 && xdm_from==NULL)
+        {
+          unsigned i=0;
+          char ErrorMessage[1024];
+          sprintf(ErrorMessage,"Multiple ip-addresses detected:\n");
+          for (i=0; i<ConnectionTypes.length; i++)
+          {
+             int AddrLen=ConnectionAddresses.data[i].length;
+             if (AddrLen==4)
+               sprintf(ErrorMessage+strlen(ErrorMessage),"  %d.%d.%d.%d\n",
+                                                         ConnectionAddresses.data[i].data[0],
+                                                         ConnectionAddresses.data[i].data[1],
+                                                         ConnectionAddresses.data[i].data[2],
+                                                         ConnectionAddresses.data[i].data[3]);
+             else
+             {
+               int j;
+               sprintf(ErrorMessage+strlen(ErrorMessage),"  ");
+               for (j=0; j<AddrLen; j++)
+                 sprintf(ErrorMessage+strlen(ErrorMessage),"%02x",ConnectionAddresses.data[i].data[j]);
+               sprintf(ErrorMessage+strlen(ErrorMessage),"\n");
+             }
+          }
+          sprintf(ErrorMessage+strlen(ErrorMessage),"Please specify the ip-address you want to use with -from\n");
+          FatalError(ErrorMessage);
+        }
         get_xdmcp_sock();
         send_packet();
     }
@@ -651,8 +684,8 @@ XdmcpBlockHandler(pointer data, /* unused */
     if (timeOutTime == 0)
         return;
     millisToGo = timeOutTime - GetTimeInMillis();
-    if ((int) millisToGo < 0)
-        millisToGo = 0;
+    if ((int) millisToGo <= 0)
+        millisToGo = 1;
     AdjustWaitForDelay(wt, millisToGo);
 }
 
@@ -689,16 +722,6 @@ XdmcpWakeupHandler(pointer data,        /* unused */
             else if (state == XDM_RUN_SESSION)
                 keepaliveDormancy = defaultKeepaliveDormancy;
         }
-        if (XFD_ANYSET(&AllClients) && state == XDM_RUN_SESSION)
-            timeOutTime = GetTimeInMillis() + keepaliveDormancy * 1000;
-    }
-    else if (timeOutTime && (int) (GetTimeInMillis() - timeOutTime) >= 0) {
-        if (state == XDM_RUN_SESSION) {
-            state = XDM_KEEPALIVE;
-            send_packet();
-        }
-        else
-            timeout();
     }
 }
 
@@ -724,12 +747,71 @@ XdmcpSelectHost(const struct sockaddr *host_sockaddr,
  * selects the first host to respond with willing message.
  */
 
+#ifdef _MSC_VER
+void DisplayXdmcpHostsDialog(void);
+int XdmcpHostAddName(const char *HostName, int HostIndex);
+
+struct hostinfo
+{
+  struct sockaddr *from;
+  int              fromlen;
+  ARRAY8           AuthenticationName;
+};
+static int g_NrHosts;
+static struct hostinfo *g_Hosts;
+
+void XdmcpHostSelected(int HostIdx)
+{
+  int i;
+
+    /* Connect to the selected host */
+  XdmcpSelectHost(g_Hosts[HostIdx].from, g_Hosts[HostIdx].fromlen, &g_Hosts[HostIdx].AuthenticationName);
+
+  for (i=0; i<g_NrHosts; i++)
+  {
+    free(g_Hosts[i].from);
+    free(g_Hosts[i].AuthenticationName.data);
+  }
+  free(g_Hosts);
+  g_Hosts=NULL;
+  g_NrHosts=0;
+}
+#endif
+
  /*ARGSUSED*/ static void
 XdmcpAddHost(const struct sockaddr *from,
              int fromlen,
              ARRAY8Ptr AuthenticationName, ARRAY8Ptr hostname, ARRAY8Ptr status)
 {
-    XdmcpSelectHost(from, fromlen, AuthenticationName);
+#ifdef _MSC_VER
+  char szHostName[100];
+  int HostIdx;
+  
+  memcpy(szHostName,hostname->data,hostname->length);
+  szHostName[hostname->length]=0;
+
+  DisplayXdmcpHostsDialog();  /* Display the dialog if not already displayed */
+  
+  HostIdx=XdmcpHostAddName(szHostName, g_NrHosts);
+  if (HostIdx==-1)
+  {
+    HostIdx=g_NrHosts;
+    g_NrHosts++;
+    g_Hosts=realloc(g_Hosts,g_NrHosts*sizeof(*g_Hosts));
+    g_Hosts[HostIdx].AuthenticationName.data=NULL;
+    g_Hosts[HostIdx].from=NULL;
+  }
+
+  g_Hosts[HostIdx].fromlen=fromlen;
+  g_Hosts[HostIdx].from=realloc(g_Hosts[HostIdx].from,g_Hosts[HostIdx].fromlen);
+  memcpy(g_Hosts[HostIdx].from,from,fromlen);
+
+  g_Hosts[HostIdx].AuthenticationName.length=AuthenticationName->length;
+  g_Hosts[HostIdx].AuthenticationName.data=realloc(g_Hosts[HostIdx].AuthenticationName.data,AuthenticationName->length);
+  memcpy(g_Hosts[HostIdx].AuthenticationName.data,AuthenticationName->data,AuthenticationName->length);
+#else
+  XdmcpSelectHost(from, fromlen, AuthenticationName);
+#endif
 }
 
 /*
@@ -1001,12 +1083,20 @@ get_xdmcp_sock(void)
                         sizeof(soopts)) < 0)
         XdmcpWarning("UDP set broadcast socket-option failed");
 #endif                          /* SO_BROADCAST */
-    if (xdmcpSocket >= 0 && xdm_from != NULL) {
+    if (xdm_from)
+    {
+      if (xdmcpSocket >= 0 && SOCKADDR_FAMILY(FromAddress)==AF_INET) {
         if (bind(xdmcpSocket, (struct sockaddr *) &FromAddress,
                  FromAddressLen) < 0) {
-            FatalError("Xserver: failed to bind to -from address: %s\n",
-                       xdm_from);
+            FatalError("Xserver: failed to bind to -from address: %s error %d\n", xdm_from, WSAGetLastError());
+        }
+      }
+      else if (xdmcpSocket6 >= 0 && SOCKADDR_FAMILY(FromAddress)==AF_INET6) {
+        if (bind(xdmcpSocket6, (struct sockaddr *)&FromAddress, 
+                 FromAddressLen) < 0) {
+            FatalError("Xserver: failed to bind to -from address: %s error %d\n", xdm_from, WSAGetLastError());
         }
+      } 
     }
 #endif                          /* STREAMSCONN */
 }
@@ -1070,18 +1160,18 @@ send_query_msg(void)
         for (mcl = mcastlist; mcl != NULL; mcl = mcl->next) {
             for (ai = mcl->ai; ai != NULL; ai = ai->ai_next) {
                 if (ai->ai_family == AF_INET) {
-                    unsigned char hopflag = (unsigned char) mcl->hops;
+                    int hopflag = mcl->hops;
 
                     socketfd = xdmcpSocket;
                     setsockopt(socketfd, IPPROTO_IP, IP_MULTICAST_TTL,
-                               &hopflag, sizeof(hopflag));
+                               (char*)&hopflag, sizeof(hopflag));
                 }
                 else if (ai->ai_family == AF_INET6) {
                     int hopflag6 = mcl->hops;
 
                     socketfd = xdmcpSocket6;
                     setsockopt(socketfd, IPPROTO_IPV6, IPV6_MULTICAST_HOPS,
-                               &hopflag6, sizeof(hopflag6));
+                               (char*)&hopflag6, sizeof(hopflag6));
                 }
                 else {
                     continue;
@@ -1435,6 +1525,10 @@ get_addr_by_name(const char *argtype,
     char *pport = portstr;
     int gaierr;
 
+#if defined(WIN32) && defined(TCPCONN)
+    _XSERVTransWSAStartup();
+#endif
+
     memset(&hints, 0, sizeof(hints));
     hints.ai_socktype = socktype;
 
@@ -1478,9 +1572,6 @@ get_addr_by_name(const char *argtype,
 #ifdef XTHREADS_NEEDS_BYNAMEPARAMS
     _Xgethostbynameparams hparams;
 #endif
-#if defined(WIN32) && defined(TCPCONN)
-    _XSERVTransWSAStartup();
-#endif
     if (!(hep = _XGethostbyname(namestr, hparams))) {
         FatalError("Xserver: %s unknown host: %s\n", argtype, namestr);
     }
@@ -1501,7 +1592,11 @@ static void
 get_manager_by_name(int argc, char **argv, int i)
 {
 
+    PSOCKADDR_IN queryAddr = NULL;
+    u_long u_lqueryAddr = 0;
+
     if ((i + 1) == argc) {
+
         FatalError("Xserver: missing %s host name in command line\n", argv[i]);
     }
 
@@ -1511,6 +1606,9 @@ get_manager_by_name(int argc, char **argv, int i)
                      , &mgrAddr, &mgrAddrFirst
 #endif
         );
+    queryAddr = (PSOCKADDR_IN)&ManagerAddress;
+    u_lqueryAddr = queryAddr->sin_addr.S_un.S_addr;
+    match_interface(u_lqueryAddr);
 }
 
 static void
diff --git a/xorg-server/os/xprintf.c b/xorg-server/os/xprintf.c
index 80caa5790..58aad894b 100644
--- a/xorg-server/os/xprintf.c
+++ b/xorg-server/os/xprintf.c
@@ -78,9 +78,11 @@
 #ifdef __va_copy
 #define va_copy __va_copy
 #else
+#ifndef _MSC_VER
 #error "no working va_copy was found"
 #endif
 #endif
+#endif
 
 /**
  * Varargs sprintf that allocates a string buffer the right size for
@@ -99,11 +101,16 @@ Xvasprintf(char **ret, const char *_X_RESTRICT_KYWD format, va_list va)
     return vasprintf(ret, format, va);
 #else
     int size;
+
+#ifdef _MSC_VER
+    size = vsnprintf(NULL, 0, format, va);
+#else
     va_list va2;
 
     va_copy(va2, va);
     size = vsnprintf(NULL, 0, format, va2);
     va_end(va2);
+#endif
 
     *ret = malloc(size + 1);
     if (*ret == NULL)
diff --git a/xorg-server/os/xstrans.c b/xorg-server/os/xstrans.c
index 6348a6511..cdc8f8eec 100644
--- a/xorg-server/os/xstrans.c
+++ b/xorg-server/os/xstrans.c
@@ -5,11 +5,19 @@
 #include <X11/Xfuncproto.h>
 
 /* ErrorF is used by xtrans */
-extern _X_EXPORT void
+/*extern _X_EXPORT void
 ErrorF(const char *f, ...)
-_X_ATTRIBUTE_PRINTF(1, 2);
+_X_ATTRIBUTE_PRINTF(1, 2);*/
 
 #define TRANS_REOPEN
 #define TRANS_SERVER
 #define XSERV_t
+#ifndef TCPCONN
+#define TCPCONN
+#endif
+#ifdef WIN32
+#undef SO_REUSEADDR
+#define SO_BINDRETRYCOUNT 0  // do not try to bind again when it fails, this will speed up searching for a free listening port
+#endif
+
 #include <X11/Xtrans/transport.c>
diff --git a/xorg-server/randr/makefile b/xorg-server/randr/makefile
new file mode 100644
index 000000000..9f32cf77d
--- /dev/null
+++ b/xorg-server/randr/makefile
@@ -0,0 +1,28 @@
+LIBRARY=librandr

+XINERAMA=1

+

+XINERAMA_SRCS = rrxinerama.c

+

+librandr_la_SOURCES =	\

+	randr.c		\

+	randrstr.h	\

+	rrcrtc.c	\

+	rrdispatch.c	\

+	rrinfo.c	\

+	rrmode.c	\

+	rroutput.c	\

+	rrpointer.c	\

+	rrproperty.c	\

+	rrprovider.c    \

+	rrproviderproperty.c    \

+	rrscreen.c	\

+	rrsdispatch.c	\

+	rrtransform.h	\

+	rrtransform.c

+

+if XINERAMA

+librandr_la_SOURCES += ${XINERAMA_SRCS}

+endif

+

+CSRCS = $(filter %.c,$(librandr_la_SOURCES))

+

diff --git a/xorg-server/randr/rrcrtc.c b/xorg-server/randr/rrcrtc.c
index e82d050e3..859d19efe 100644
--- a/xorg-server/randr/rrcrtc.c
+++ b/xorg-server/randr/rrcrtc.c
@@ -236,21 +236,22 @@ RRDeliverCrtcEvent(ClientPtr client, WindowPtr pWin, RRCrtcPtr crtc)
     ScreenPtr pScreen = pWin->drawable.pScreen;
 
     rrScrPriv(pScreen);
+    xRRCrtcChangeNotifyEvent ce;
     RRModePtr mode = crtc->mode;
 
-    xRRCrtcChangeNotifyEvent ce = {
-        .type = RRNotify + RREventBase,
-        .subCode = RRNotify_CrtcChange,
-        .timestamp = pScrPriv->lastSetTime.milliseconds,
-        .window = pWin->drawable.id,
-        .crtc = crtc->id,
-        .mode = mode ? mode->mode.id : None,
-        .rotation = crtc->rotation,
-        .x = mode ? crtc->x : 0,
-        .y = mode ? crtc->y : 0,
-        .width = mode ? mode->mode.width : 0,
-        .height = mode ? mode->mode.height : 0
-    };
+
+    ce.type = RRNotify + RREventBase;
+    ce.subCode = RRNotify_CrtcChange;
+    ce.timestamp = pScrPriv->lastSetTime.milliseconds;
+    ce.window = pWin->drawable.id;
+    ce.crtc = crtc->id;
+    ce.mode = mode ? mode->mode.id : None;
+    ce.rotation = crtc->rotation;
+    ce.x = mode ? crtc->x : 0;
+    ce.y = mode ? crtc->y : 0;
+    ce.width = mode ? mode->mode.width : 0;
+    ce.height = mode ? mode->mode.height : 0;
+
     WriteEventsToClient(client, 1, (xEvent *) &ce);
 }
 
@@ -892,13 +893,13 @@ ProcRRGetCrtcInfo(ClientPtr client)
 
     mode = crtc->mode;
 
-    rep = (xRRGetCrtcInfoReply) {
-        .type = X_Reply,
-        .status = RRSetConfigSuccess,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .timestamp = pScrPriv->lastSetTime.milliseconds
-    };
+
+    rep.type = X_Reply;
+    rep.status = RRSetConfigSuccess;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.timestamp = pScrPriv->lastSetTime.milliseconds;
+
     if (pScrPriv->rrGetPanning &&
         pScrPriv->rrGetPanning(pScreen, crtc, &panned_area, NULL, NULL) &&
         (panned_area.x2 > panned_area.x1) && (panned_area.y2 > panned_area.y1))
@@ -1165,13 +1166,12 @@ ProcRRSetCrtcConfig(ClientPtr client)
  sendReply:
     free(outputs);
 
-    rep = (xRRSetCrtcConfigReply) {
-        .type = X_Reply,
-        .status = status,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .newTimestamp = pScrPriv->lastSetTime.milliseconds
-    };
+
+    rep.type = X_Reply;
+    rep.status = status;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.newTimestamp = pScrPriv->lastSetTime.milliseconds;
 
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
@@ -1207,13 +1207,12 @@ ProcRRGetPanning(ClientPtr client)
     if (!pScrPriv)
         return RRErrorBase + BadRRCrtc;
 
-    rep = (xRRGetPanningReply) {
-        .type = X_Reply,
-        .status = RRSetConfigSuccess,
-        .sequenceNumber = client->sequence,
-        .length = 1,
-        .timestamp = pScrPriv->lastSetTime.milliseconds
-    };
+    memset(&rep, 0, sizeof(rep));
+    rep.type = X_Reply;
+    rep.status = RRSetConfigSuccess;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 1;
+    rep.timestamp = pScrPriv->lastSetTime.milliseconds;
 
     if (pScrPriv->rrGetPanning &&
         pScrPriv->rrGetPanning(pScreen, crtc, &total, &tracking, border)) {
@@ -1307,13 +1306,12 @@ ProcRRSetPanning(ClientPtr client)
     status = RRSetConfigSuccess;
 
  sendReply:
-    rep = (xRRSetPanningReply) {
-        .type = X_Reply,
-        .status = status,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .newTimestamp = pScrPriv->lastSetTime.milliseconds
-    };
+
+    rep.type = X_Reply;
+    rep.status = status;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.newTimestamp = pScrPriv->lastSetTime.milliseconds;
 
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
@@ -1338,12 +1336,12 @@ ProcRRGetCrtcGammaSize(ClientPtr client)
     if (!RRCrtcGammaGet(crtc))
         return RRErrorBase + BadRRCrtc;
 
-    reply = (xRRGetCrtcGammaSizeReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .size = crtc->gammaSize
-    };
+
+    reply.type = X_Reply;
+    reply.sequenceNumber = client->sequence;
+    reply.length = 0;
+    reply.size = crtc->gammaSize;
+
     if (client->swapped) {
         swaps(&reply.sequenceNumber);
         swapl(&reply.length);
@@ -1377,12 +1375,12 @@ ProcRRGetCrtcGamma(ClientPtr client)
             return BadAlloc;
     }
 
-    reply = (xRRGetCrtcGammaReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = bytes_to_int32(len),
-        .size = crtc->gammaSize
-    };
+
+    reply.type = X_Reply;
+    reply.sequenceNumber = client->sequence;
+    reply.length = bytes_to_int32(len);
+    reply.size = crtc->gammaSize;
+
     if (client->swapped) {
         swaps(&reply.sequenceNumber);
         swapl(&reply.length);
diff --git a/xorg-server/randr/rrdispatch.c b/xorg-server/randr/rrdispatch.c
index 7fbc9f01c..f9b26c137 100644
--- a/xorg-server/randr/rrdispatch.c
+++ b/xorg-server/randr/rrdispatch.c
@@ -35,17 +35,17 @@ RRClientKnowsRates(ClientPtr pClient)
 static int
 ProcRRQueryVersion(ClientPtr client)
 {
-    xRRQueryVersionReply rep = {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0
-    };
+    xRRQueryVersionReply rep;
     REQUEST(xRRQueryVersionReq);
     rrClientPriv(client);
 
     REQUEST_SIZE_MATCH(xRRQueryVersionReq);
     pRRClient->major_version = stuff->majorVersion;
     pRRClient->minor_version = stuff->minorVersion;
+    memset(&rep, 0, sizeof(rep));
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
 
     if (version_compare(stuff->majorVersion, stuff->minorVersion,
                         SERVER_RANDR_MAJOR_VERSION,
diff --git a/xorg-server/randr/rrmode.c b/xorg-server/randr/rrmode.c
index f5d3f9e54..c0fa709a0 100644
--- a/xorg-server/randr/rrmode.c
+++ b/xorg-server/randr/rrmode.c
@@ -312,12 +312,11 @@ ProcRRCreateMode(ClientPtr client)
     if (!mode)
         return error;
 
-    rep = (xRRCreateModeReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .mode = mode->mode.id
-	};
+    memset(&rep, 0, sizeof(rep));
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.mode = mode->mode.id;
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swapl(&rep.length);
diff --git a/xorg-server/randr/rroutput.c b/xorg-server/randr/rroutput.c
index 88781ba0f..1eb071b4e 100644
--- a/xorg-server/randr/rroutput.c
+++ b/xorg-server/randr/rroutput.c
@@ -305,22 +305,23 @@ RRDeliverOutputEvent(ClientPtr client, WindowPtr pWin, RROutputPtr output)
     ScreenPtr pScreen = pWin->drawable.pScreen;
 
     rrScrPriv(pScreen);
+    xRROutputChangeNotifyEvent oe;
     RRCrtcPtr crtc = output->crtc;
     RRModePtr mode = crtc ? crtc->mode : NULL;
 
-    xRROutputChangeNotifyEvent oe = {
-        .type = RRNotify + RREventBase,
-        .subCode = RRNotify_OutputChange,
-        .timestamp = pScrPriv->lastSetTime.milliseconds,
-        .configTimestamp = pScrPriv->lastConfigTime.milliseconds,
-        .window = pWin->drawable.id,
-        .output = output->id,
-        .crtc = crtc ? crtc->id : None,
-        .mode = mode ? mode->mode.id : None,
-        .rotation = crtc ? crtc->rotation : RR_Rotate_0,
-        .connection = output->connection,
-        .subpixelOrder = output->subpixelOrder
-    };
+
+    oe.type = RRNotify + RREventBase;
+    oe.subCode = RRNotify_OutputChange;
+    oe.timestamp = pScrPriv->lastSetTime.milliseconds;
+    oe.configTimestamp = pScrPriv->lastConfigTime.milliseconds;
+    oe.window = pWin->drawable.id;
+    oe.output = output->id;
+    oe.crtc = crtc ? crtc->id : None;
+    oe.mode = mode ? mode->mode.id : None;
+    oe.rotation = crtc ? crtc->rotation : RR_Rotate_0;
+    oe.connection = output->connection;
+    oe.subpixelOrder = output->subpixelOrder;
+
     WriteEventsToClient(client, 1, (xEvent *) &oe);
 }
 
@@ -419,23 +420,23 @@ ProcRRGetOutputInfo(ClientPtr client)
     pScreen = output->pScreen;
     pScrPriv = rrGetScrPriv(pScreen);
 
-    rep = (xRRGetOutputInfoReply) {
-        .type = X_Reply,
-        .status = RRSetConfigSuccess,
-        .sequenceNumber = client->sequence,
-        .length = bytes_to_int32(OutputInfoExtra),
-        .timestamp = pScrPriv->lastSetTime.milliseconds,
-        .crtc = output->crtc ? output->crtc->id : None,
-        .mmWidth = output->mmWidth,
-        .mmHeight = output->mmHeight,
-        .connection = output->connection,
-        .subpixelOrder = output->subpixelOrder,
-        .nCrtcs = output->numCrtcs,
-        .nModes = output->numModes + output->numUserModes,
-        .nPreferred = output->numPreferred,
-        .nClones = output->numClones,
-        .nameLength = output->nameLength
-    };
+
+    rep.type = X_Reply;
+    rep.status = RRSetConfigSuccess;
+    rep.sequenceNumber = client->sequence;
+    rep.length = bytes_to_int32(OutputInfoExtra);
+    rep.timestamp = pScrPriv->lastSetTime.milliseconds;
+    rep.crtc = output->crtc ? output->crtc->id : None;
+    rep.mmWidth = output->mmWidth;
+    rep.mmHeight = output->mmHeight;
+    rep.connection = output->connection;
+    rep.subpixelOrder = output->subpixelOrder;
+    rep.nCrtcs = output->numCrtcs;
+    rep.nModes = output->numModes + output->numUserModes;
+    rep.nPreferred = output->numPreferred;
+    rep.nClones = output->numClones;
+    rep.nameLength = output->nameLength;
+
     extraLen = ((output->numCrtcs +
                  output->numModes + output->numUserModes +
                  output->numClones + bytes_to_int32(rep.nameLength)) << 2);
@@ -568,11 +569,10 @@ ProcRRGetOutputPrimary(ClientPtr client)
     if (pScrPriv)
         primary = pScrPriv->primaryOutput;
 
-    rep = (xRRGetOutputPrimaryReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .output = primary ? primary->id : None
-    };
+    memset(&rep, 0, sizeof(rep));
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.output = primary ? primary->id : None;
 
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
diff --git a/xorg-server/randr/rrproperty.c b/xorg-server/randr/rrproperty.c
index 67b546728..dcc640e29 100644
--- a/xorg-server/randr/rrproperty.c
+++ b/xorg-server/randr/rrproperty.c
@@ -65,14 +65,13 @@ RRDestroyOutputProperty(RRPropertyPtr prop)
 static void
 RRDeleteProperty(RROutputRec * output, RRPropertyRec * prop)
 {
-    xRROutputPropertyNotifyEvent event = {
-        .type = RREventBase + RRNotify,
-        .subCode = RRNotify_OutputProperty,
-        .output = output->id,
-        .state = PropertyDelete,
-        .atom = prop->propertyName,
-        .timestamp = currentTime.milliseconds
-    };
+    xRROutputPropertyNotifyEvent event;
+    event.type = RREventBase + RRNotify;
+    event.subCode = RRNotify_OutputProperty;
+    event.output = output->id;
+    event.state = PropertyDelete;
+    event.atom = prop->propertyName;
+    event.timestamp = currentTime.milliseconds;
 
     RRDeliverPropertyEvent(output->pScreen, (xEvent *) &event);
 
@@ -238,14 +237,13 @@ RRChangeOutputProperty(RROutputPtr output, Atom property, Atom type,
         output->pendingProperties = TRUE;
 
     if (sendevent) {
-        xRROutputPropertyNotifyEvent event = {
-            .type = RREventBase + RRNotify,
-            .subCode = RRNotify_OutputProperty,
-            .output = output->id,
-            .state = PropertyNewValue,
-            .atom = prop->propertyName,
-            .timestamp = currentTime.milliseconds
-        };
+        xRROutputPropertyNotifyEvent event;
+        event.type = RREventBase + RRNotify;
+        event.subCode = RRNotify_OutputProperty;
+        event.output = output->id;
+        event.state = PropertyNewValue;
+        event.atom = prop->propertyName;
+        event.timestamp = currentTime.milliseconds;
         RRDeliverPropertyEvent(output->pScreen, (xEvent *) &event);
     }
     return Success;
@@ -403,12 +401,12 @@ ProcRRListOutputProperties(ClientPtr client)
         if (!(pAtoms = (Atom *) malloc(numProps * sizeof(Atom))))
             return BadAlloc;
 
-    rep = (xRRListOutputPropertiesReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = bytes_to_int32(numProps * sizeof(Atom)),
-        .nAtoms = numProps
-    };
+
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = bytes_to_int32(numProps * sizeof(Atom));
+    rep.nAtoms = numProps;
+
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swapl(&rep.length);
@@ -452,14 +450,13 @@ ProcRRQueryOutputProperty(ClientPtr client)
             return BadAlloc;
     }
 
-    rep = (xRRQueryOutputPropertyReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = prop->num_valid,
-        .pending = prop->is_pending,
-        .range = prop->range,
-        .immutable = prop->immutable
-    };
+
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = prop->num_valid;
+    rep.pending = prop->is_pending;
+    rep.range = prop->range;
+    rep.immutable = prop->immutable;
 
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
@@ -611,10 +608,10 @@ ProcRRGetOutputProperty(ClientPtr client)
         if (prop->propertyName == stuff->property)
             break;
 
-    reply = (xRRGetOutputPropertyReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence
-    };
+
+    reply.type = X_Reply;
+    reply.sequenceNumber = client->sequence;
+
     if (!prop) {
         reply.nItems = 0;
         reply.length = 0;
@@ -691,14 +688,14 @@ ProcRRGetOutputProperty(ClientPtr client)
     reply.propertyType = prop_value->type;
 
     if (stuff->delete && (reply.bytesAfter == 0)) {
-        xRROutputPropertyNotifyEvent event = {
-            .type = RREventBase + RRNotify,
-            .subCode = RRNotify_OutputProperty,
-            .output = output->id,
-            .state = PropertyDelete,
-            .atom = prop->propertyName,
-            .timestamp = currentTime.milliseconds
-        };
+        xRROutputPropertyNotifyEvent event;
+        event.type = RREventBase + RRNotify;
+        event.subCode = RRNotify_OutputProperty;
+        event.output = output->id;
+        event.state = PropertyDelete;
+        event.atom = prop->propertyName;
+        event.timestamp = currentTime.milliseconds;
+
         RRDeliverPropertyEvent(output->pScreen, (xEvent *) &event);
     }
 
diff --git a/xorg-server/randr/rrprovider.c b/xorg-server/randr/rrprovider.c
index c4ed515d6..14d2d3db3 100644
--- a/xorg-server/randr/rrprovider.c
+++ b/xorg-server/randr/rrprovider.c
@@ -89,23 +89,23 @@ ProcRRGetProviders (ClientPtr client)
 
     if (!pScrPriv)
     {
-        rep = (xRRGetProvidersReply) {
-            .type = X_Reply,
-            .sequenceNumber = client->sequence,
-            .length = 0,
-            .timestamp = currentTime.milliseconds,
-            .nProviders = 0
-        };
+ 
+        rep.type = X_Reply;
+        rep.sequenceNumber = client->sequence;
+        rep.length = 0;
+        rep.timestamp = currentTime.milliseconds;
+        rep.nProviders = 0;
+
         extra = NULL;
         extraLen = 0;
     } else {
-        rep = (xRRGetProvidersReply) {
-            .type = X_Reply,
-            .sequenceNumber = client->sequence,
-            .timestamp = pScrPriv->lastSetTime.milliseconds,
-            .nProviders = total_providers,
-            .length = total_providers
-        };
+
+        rep.type = X_Reply;
+        rep.sequenceNumber = client->sequence;
+        rep.timestamp = pScrPriv->lastSetTime.milliseconds;
+        rep.nProviders = total_providers;
+        rep.length = total_providers;
+
         extraLen = rep.length << 2;
         if (extraLen) {
             extra = malloc(extraLen);
@@ -166,18 +166,18 @@ ProcRRGetProviderInfo (ClientPtr client)
     pScreen = provider->pScreen;
     pScrPriv = rrGetScrPriv(pScreen);
 
-    rep = (xRRGetProviderInfoReply) {
-        .type = X_Reply,
-        .status = RRSetConfigSuccess,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .capabilities = provider->capabilities,
-        .nameLength = provider->nameLength,
-        .timestamp = pScrPriv->lastSetTime.milliseconds,
-        .nCrtcs = pScrPriv->numCrtcs,
-        .nOutputs = pScrPriv->numOutputs,
-        .nAssociatedProviders = 0
-    };
+
+    rep.type = X_Reply;
+    rep.status = RRSetConfigSuccess;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.capabilities = provider->capabilities;
+    rep.nameLength = provider->nameLength;
+    rep.timestamp = pScrPriv->lastSetTime.milliseconds;
+    rep.nCrtcs = pScrPriv->numCrtcs;
+    rep.nOutputs = pScrPriv->numOutputs;
+    rep.nAssociatedProviders = 0;
+
 
     /* count associated providers */
     if (provider->offload_sink)
diff --git a/xorg-server/randr/rrproviderproperty.c b/xorg-server/randr/rrproviderproperty.c
index ab601da9a..be54f259e 100644
--- a/xorg-server/randr/rrproviderproperty.c
+++ b/xorg-server/randr/rrproviderproperty.c
@@ -65,14 +65,14 @@ RRDestroyProviderProperty(RRPropertyPtr prop)
 static void
 RRDeleteProperty(RRProviderRec * provider, RRPropertyRec * prop)
 {
-    xRRProviderPropertyNotifyEvent event = {
-        .type = RREventBase + RRNotify,
-        .subCode = RRNotify_ProviderProperty,
-        .provider = provider->id,
-        .state = PropertyDelete,
-        .atom = prop->propertyName,
-        .timestamp = currentTime.milliseconds
-    };
+    xRRProviderPropertyNotifyEvent event;
+    event.type = RREventBase + RRNotify;
+    event.subCode = RRNotify_ProviderProperty;
+    event.provider = provider->id;
+    event.state = PropertyDelete;
+    event.atom = prop->propertyName;
+    event.timestamp = currentTime.milliseconds;
+
 
     RRDeliverPropertyEvent(provider->pScreen, (xEvent *) &event);
 
@@ -238,14 +238,14 @@ RRChangeProviderProperty(RRProviderPtr provider, Atom property, Atom type,
         provider->pendingProperties = TRUE;
 
     if (sendevent) {
-        xRRProviderPropertyNotifyEvent event = {
-            .type = RREventBase + RRNotify,
-            .subCode = RRNotify_ProviderProperty,
-            .provider = provider->id,
-            .state = PropertyNewValue,
-            .atom = prop->propertyName,
-            .timestamp = currentTime.milliseconds
-        };
+        xRRProviderPropertyNotifyEvent event;
+        event.type = RREventBase + RRNotify;
+        event.subCode = RRNotify_ProviderProperty;
+        event.provider = provider->id;
+        event.state = PropertyNewValue;
+        event.atom = prop->propertyName;
+        event.timestamp = currentTime.milliseconds;
+
         RRDeliverPropertyEvent(provider->pScreen, (xEvent *) &event);
     }
     return Success;
@@ -403,12 +403,12 @@ ProcRRListProviderProperties(ClientPtr client)
         if (!(pAtoms = (Atom *) malloc(numProps * sizeof(Atom))))
             return BadAlloc;
 
-    rep = (xRRListProviderPropertiesReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = bytes_to_int32(numProps * sizeof(Atom)),
-        .nAtoms = numProps
-    };
+
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = bytes_to_int32(numProps * sizeof(Atom));
+    rep.nAtoms = numProps;
+
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swapl(&rep.length);
@@ -449,14 +449,14 @@ ProcRRQueryProviderProperty(ClientPtr client)
         if (!extra)
             return BadAlloc;
     }
-    rep = (xRRQueryProviderPropertyReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = prop->num_valid,
-        .pending = prop->is_pending,
-        .range = prop->range,
-        .immutable = prop->immutable
-    };
+
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = prop->num_valid;
+    rep.pending = prop->is_pending;
+    rep.range = prop->range;
+    rep.immutable = prop->immutable;
+
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swapl(&rep.length);
@@ -581,12 +581,12 @@ ProcRRGetProviderProperty(ClientPtr client)
     RRPropertyValuePtr prop_value;
     unsigned long n, len, ind;
     RRProviderPtr provider;
-    xRRGetProviderPropertyReply reply = {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence
-    };
+    xRRGetProviderPropertyReply reply;
     char *extra = NULL;
 
+    reply.type = X_Reply;
+    reply.sequenceNumber = client->sequence;
+
     REQUEST_SIZE_MATCH(xRRGetProviderPropertyReq);
     if (stuff->delete)
         UpdateCurrentTime();
@@ -686,14 +686,14 @@ ProcRRGetProviderProperty(ClientPtr client)
     reply.propertyType = prop_value->type;
 
     if (stuff->delete && (reply.bytesAfter == 0)) {
-        xRRProviderPropertyNotifyEvent event = {
-            .type = RREventBase + RRNotify,
-            .subCode = RRNotify_ProviderProperty,
-            .provider = provider->id,
-            .state = PropertyDelete,
-            .atom = prop->propertyName,
-            .timestamp = currentTime.milliseconds
-        };
+        xRRProviderPropertyNotifyEvent event;
+        event.type = RREventBase + RRNotify;
+        event.subCode = RRNotify_ProviderProperty;
+        event.provider = provider->id;
+        event.state = PropertyDelete;
+        event.atom = prop->propertyName;
+        event.timestamp = currentTime.milliseconds;
+
         RRDeliverPropertyEvent(provider->pScreen, (xEvent *) &event);
     }
 
diff --git a/xorg-server/randr/rrscreen.c b/xorg-server/randr/rrscreen.c
index 39340ccee..c11882b53 100644
--- a/xorg-server/randr/rrscreen.c
+++ b/xorg-server/randr/rrscreen.c
@@ -68,19 +68,18 @@ void
 RRSendConfigNotify(ScreenPtr pScreen)
 {
     WindowPtr pWin = pScreen->root;
-    xEvent event = {
-        .u.configureNotify.window = pWin->drawable.id,
-        .u.configureNotify.aboveSibling = None,
-        .u.configureNotify.x = 0,
-        .u.configureNotify.y = 0,
+    xEvent event;
+    event.u.configureNotify.window = pWin->drawable.id;
+    event.u.configureNotify.aboveSibling = None;
+    event.u.configureNotify.x = 0;
+    event.u.configureNotify.y = 0;
 
     /* XXX xinerama stuff ? */
 
-        .u.configureNotify.width = pWin->drawable.width,
-        .u.configureNotify.height = pWin->drawable.height,
-        .u.configureNotify.borderWidth = wBorderWidth(pWin),
-        .u.configureNotify.override = pWin->overrideRedirect
-    };
+    event.u.configureNotify.width = pWin->drawable.width;
+    event.u.configureNotify.height = pWin->drawable.height;
+    event.u.configureNotify.borderWidth = wBorderWidth(pWin);
+    event.u.configureNotify.override = pWin->overrideRedirect;
     event.u.u.type = ConfigureNotify;
     DeliverEvents(pWin, &event, 1, NullWindow);
 }
@@ -89,20 +88,21 @@ void
 RRDeliverScreenEvent(ClientPtr client, WindowPtr pWin, ScreenPtr pScreen)
 {
     rrScrPriv(pScreen);
+    xRRScreenChangeNotifyEvent se;
     RRCrtcPtr crtc = pScrPriv->numCrtcs ? pScrPriv->crtcs[0] : NULL;
     WindowPtr pRoot = pScreen->root;
 
-    xRRScreenChangeNotifyEvent se = {
-        .type = RRScreenChangeNotify + RREventBase,
-        .rotation = (CARD8) (crtc ? crtc->rotation : RR_Rotate_0),
-        .timestamp = pScrPriv->lastSetTime.milliseconds,
-        .configTimestamp = pScrPriv->lastConfigTime.milliseconds,
-        .root = pRoot->drawable.id,
-        .window = pWin->drawable.id,
-        .subpixelOrder = PictureGetSubpixelOrder(pScreen),
 
-        .sizeID = RR10CurrentSizeID(pScreen)
-    };
+    se.type = RRScreenChangeNotify + RREventBase;
+    se.rotation = (CARD8) (crtc ? crtc->rotation : RR_Rotate_0);
+    se.timestamp = pScrPriv->lastSetTime.milliseconds;
+    se.configTimestamp = pScrPriv->lastConfigTime.milliseconds;
+    se.root = pRoot->drawable.id;
+    se.window = pWin->drawable.id;
+    se.subpixelOrder = PictureGetSubpixelOrder(pScreen);
+
+    se.sizeID = RR10CurrentSizeID(pScreen);
+
 
     if (se.rotation & (RR_Rotate_90 | RR_Rotate_270)) {
         se.widthInPixels = pScreen->height;
@@ -201,12 +201,11 @@ ProcRRGetScreenSizeRange(ClientPtr client)
     pScreen = pWin->drawable.pScreen;
     pScrPriv = rrGetScrPriv(pScreen);
 
-    rep = (xRRGetScreenSizeRangeReply) {
-        .type = X_Reply,
-        .pad = 0,
-        .sequenceNumber = client->sequence,
-        .length = 0
-    };
+
+    rep.type = X_Reply;
+    rep.pad = 0;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
 
     if (pScrPriv) {
         if (!RRGetInfo(pScreen, FALSE))
@@ -396,17 +395,17 @@ rrGetMultiScreenResources(ClientPtr client, Bool query, ScreenPtr pScreen)
     ErrorF("reporting %d %d %d %d\n", total_crtcs, total_outputs, total_modes, total_name_len);
 
     pScrPriv = rrGetScrPriv(pScreen);
-    rep = (xRRGetScreenResourcesReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .timestamp = pScrPriv->lastSetTime.milliseconds,
-        .configTimestamp = pScrPriv->lastConfigTime.milliseconds,
-        .nCrtcs = total_crtcs,
-        .nOutputs = total_outputs,
-        .nModes = total_modes,
-        .nbytesNames = total_name_len
-    };
+
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.timestamp = pScrPriv->lastSetTime.milliseconds;
+    rep.configTimestamp = pScrPriv->lastConfigTime.milliseconds;
+    rep.nCrtcs = total_crtcs;
+    rep.nOutputs = total_outputs;
+    rep.nModes = total_modes;
+    rep.nbytesNames = total_name_len;
+
 
     rep.length = (total_crtcs + total_outputs + total_modes * bytes_to_int32(SIZEOF(xRRModeInfo)) +
                   bytes_to_int32(rep.nbytesNames));
@@ -482,6 +481,7 @@ rrGetScreenResources(ClientPtr client, Bool query)
 
     pScreen = pWin->drawable.pScreen;
     pScrPriv = rrGetScrPriv(pScreen);
+    rep.pad = 0;
 
     if (query && pScrPriv)
         if (!RRGetInfo(pScreen, query))
@@ -491,17 +491,17 @@ rrGetScreenResources(ClientPtr client, Bool query)
         return rrGetMultiScreenResources(client, query, pScreen);
 
     if (!pScrPriv) {
-        rep = (xRRGetScreenResourcesReply) {
-            .type = X_Reply,
-            .sequenceNumber = client->sequence,
-            .length = 0,
-            .timestamp = currentTime.milliseconds,
-            .configTimestamp = currentTime.milliseconds,
-            .nCrtcs = 0,
-            .nOutputs = 0,
-            .nModes = 0,
-            .nbytesNames = 0
-        };
+
+        rep.type = X_Reply;
+        rep.sequenceNumber = client->sequence;
+        rep.length = 0;
+        rep.timestamp = currentTime.milliseconds;
+        rep.configTimestamp = currentTime.milliseconds;
+        rep.nCrtcs = 0;
+        rep.nOutputs = 0;
+        rep.nModes = 0;
+        rep.nbytesNames = 0;
+
         extra = NULL;
         extraLen = 0;
     }
@@ -513,17 +513,16 @@ rrGetScreenResources(ClientPtr client, Bool query)
         if (!modes)
             return BadAlloc;
 
-        rep = (xRRGetScreenResourcesReply) {
-            .type = X_Reply,
-            .sequenceNumber = client->sequence,
-            .length = 0,
-            .timestamp = pScrPriv->lastSetTime.milliseconds,
-            .configTimestamp = pScrPriv->lastConfigTime.milliseconds,
-            .nCrtcs = pScrPriv->numCrtcs,
-            .nOutputs = pScrPriv->numOutputs,
-            .nModes = num_modes,
-            .nbytesNames = 0
-        };
+
+        rep.type = X_Reply;
+        rep.sequenceNumber = client->sequence;
+        rep.length = 0;
+        rep.timestamp = pScrPriv->lastSetTime.milliseconds;
+        rep.configTimestamp = pScrPriv->lastConfigTime.milliseconds;
+        rep.nCrtcs = pScrPriv->numCrtcs;
+        rep.nOutputs = pScrPriv->numOutputs;
+        rep.nModes = num_modes;
+        rep.nbytesNames = 0;
 
 
         for (i = 0; i < num_modes; i++)
@@ -749,6 +748,7 @@ ProcRRGetScreenInfo(ClientPtr client)
 
     pScreen = pWin->drawable.pScreen;
     pScrPriv = rrGetScrPriv(pScreen);
+    rep.pad = 0;
 
     if (pScrPriv)
         if (!RRGetInfo(pScreen, TRUE))
@@ -757,20 +757,20 @@ ProcRRGetScreenInfo(ClientPtr client)
     output = RRFirstOutput(pScreen);
 
     if (!pScrPriv || !output) {
-        rep = (xRRGetScreenInfoReply) {
-            .type = X_Reply,
-            .setOfRotations = RR_Rotate_0,
-            .sequenceNumber = client->sequence,
-            .length = 0,
-            .root = pWin->drawable.pScreen->root->drawable.id,
-            .timestamp = currentTime.milliseconds,
-            .configTimestamp = currentTime.milliseconds,
-            .nSizes = 0,
-            .sizeID = 0,
-            .rotation = RR_Rotate_0,
-            .rate = 0,
-            .nrateEnts = 0
-        };
+
+        rep.type = X_Reply;
+        rep.setOfRotations = RR_Rotate_0;
+        rep.sequenceNumber = client->sequence;
+        rep.length = 0;
+        rep.root = pWin->drawable.pScreen->root->drawable.id;
+        rep.timestamp = currentTime.milliseconds;
+        rep.configTimestamp = currentTime.milliseconds;
+        rep.nSizes = 0;
+        rep.sizeID = 0;
+        rep.rotation = RR_Rotate_0;
+        rep.rate = 0;
+        rep.nrateEnts = 0;
+        
         extra = 0;
         extraLen = 0;
     }
@@ -787,20 +787,19 @@ ProcRRGetScreenInfo(ClientPtr client)
         if (!pData)
             return BadAlloc;
 
-        rep = (xRRGetScreenInfoReply) {
-            .type = X_Reply,
-            .setOfRotations = output->crtc->rotations,
-            .sequenceNumber = client->sequence,
-            .length = 0,
-            .root = pWin->drawable.pScreen->root->drawable.id,
-            .timestamp = pScrPriv->lastSetTime.milliseconds,
-            .configTimestamp = pScrPriv->lastConfigTime.milliseconds,
-            .rotation = output->crtc->rotation,
-            .nSizes = pData->nsize,
-            .nrateEnts = pData->nrefresh + pData->nsize,
-            .sizeID = pData->size,
-            .rate = pData->refresh
-        };
+
+        rep.type = X_Reply;
+        rep.setOfRotations = output->crtc->rotations;
+        rep.sequenceNumber = client->sequence;
+        rep.length = 0;
+        rep.root = pWin->drawable.pScreen->root->drawable.id;
+        rep.timestamp = pScrPriv->lastSetTime.milliseconds;
+        rep.configTimestamp = pScrPriv->lastConfigTime.milliseconds;
+        rep.rotation = output->crtc->rotation;
+        rep.nSizes = pData->nsize;
+        rep.nrateEnts = pData->nrefresh + pData->nsize;
+        rep.sizeID = pData->size;
+        rep.rate = pData->refresh;
 
         extraLen = rep.nSizes * sizeof(xScreenSizes);
         if (has_rate)
@@ -1086,17 +1085,16 @@ ProcRRSetScreenConfig(ClientPtr client)
 
     free(pData);
 
-    rep = (xRRSetScreenConfigReply) {
-        .type = X_Reply,
-        .status = status,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-
-        .newTimestamp = pScrPriv->lastSetTime.milliseconds,
-        .newConfigTimestamp = pScrPriv->lastConfigTime.milliseconds,
-        .root = pDraw->pScreen->root->drawable.id,
-        /* .subpixelOrder = ?? */
-    };
+
+    rep.type = X_Reply;
+    rep.status = status;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+
+    rep.newTimestamp = pScrPriv->lastSetTime.milliseconds;
+    rep.newConfigTimestamp = pScrPriv->lastConfigTime.milliseconds;
+    rep.root = pDraw->pScreen->root->drawable.id;
+
 
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
diff --git a/xorg-server/randr/rrxinerama.c b/xorg-server/randr/rrxinerama.c
index 76d728c70..86a19757b 100644
--- a/xorg-server/randr/rrxinerama.c
+++ b/xorg-server/randr/rrxinerama.c
@@ -89,15 +89,14 @@ static int SProcRRXineramaDispatch(ClientPtr client);
 int
 ProcRRXineramaQueryVersion(ClientPtr client)
 {
-    xPanoramiXQueryVersionReply rep = {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .majorVersion = SERVER_RRXINERAMA_MAJOR_VERSION,
-        .minorVersion = SERVER_RRXINERAMA_MINOR_VERSION
-    };
+    xPanoramiXQueryVersionReply rep;
 
     REQUEST_SIZE_MATCH(xPanoramiXQueryVersionReq);
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.majorVersion = SERVER_RRXINERAMA_MAJOR_VERSION;
+    rep.minorVersion = SERVER_RRXINERAMA_MINOR_VERSION;
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swapl(&rep.length);
@@ -131,13 +130,13 @@ ProcRRXineramaGetState(ClientPtr client)
         active = TRUE;
     }
 
-    rep = (xPanoramiXGetStateReply) {
-        .type = X_Reply,
-        .state = active,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .window = stuff->window
-    };
+
+    rep.type = X_Reply;
+    rep.state = active;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.window = stuff->window;
+
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swapl(&rep.length);
@@ -197,13 +196,13 @@ ProcRRXineramaGetScreenCount(ClientPtr client)
     if (rc != Success)
         return rc;
 
-    rep = (xPanoramiXGetScreenCountReply)  {
-        .type = X_Reply,
-        .ScreenCount = RRXineramaScreenCount(pWin->drawable.pScreen),
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .window = stuff->window
-    };
+
+    rep.type = X_Reply;
+    rep.ScreenCount = RRXineramaScreenCount(pWin->drawable.pScreen);
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.window = stuff->window;
+
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swapl(&rep.length);
@@ -230,15 +229,15 @@ ProcRRXineramaGetScreenSize(ClientPtr client)
     pScreen = pWin->drawable.pScreen;
     pRoot = pScreen->root;
 
-    rep = (xPanoramiXGetScreenSizeReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .width = pRoot->drawable.width,
-        .height = pRoot->drawable.height,
-        .window = stuff->window,
-        .screen = stuff->screen
-    };
+
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.width = pRoot->drawable.width;
+    rep.height = pRoot->drawable.height;
+    rep.window = stuff->window;
+    rep.screen = stuff->screen;
+
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swapl(&rep.length);
@@ -258,12 +257,12 @@ ProcRRXineramaIsActive(ClientPtr client)
 
     REQUEST_SIZE_MATCH(xXineramaIsActiveReq);
 
-    rep = (xXineramaIsActiveReply) {
-        .type = X_Reply,
-        .length = 0,
-        .sequenceNumber = client->sequence,
-        .state = RRXineramaScreenActive(screenInfo.screens[RR_XINERAMA_SCREEN])
-    };
+    memset(&rep, 0, sizeof(xXineramaIsActiveReply));
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+    rep.state = RRXineramaScreenActive(screenInfo.screens[RR_XINERAMA_SCREEN]);
+
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swapl(&rep.length);
@@ -327,12 +326,12 @@ ProcRRXineramaQueryScreens(ClientPtr client)
         n = RRXineramaScreenCount(pScreen);
     }
 
-    rep = (xXineramaQueryScreensReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = bytes_to_int32(n * sz_XineramaScreenInfo),
-        .number = n
-    };
+
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = bytes_to_int32(n * sz_XineramaScreenInfo);
+    rep.number = n;
+
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swapl(&rep.length);
diff --git a/xorg-server/record/makefile b/xorg-server/record/makefile
new file mode 100644
index 000000000..1cef2de18
--- /dev/null
+++ b/xorg-server/record/makefile
@@ -0,0 +1,4 @@
+CSRCS = record.c set.c
+
+LIBRARY=librecord
+
diff --git a/xorg-server/record/record.c b/xorg-server/record/record.c
index f3a26a732..f728cc684 100644
--- a/xorg-server/record/record.c
+++ b/xorg-server/record/record.c
@@ -1815,15 +1815,14 @@ static int
 ProcRecordQueryVersion(ClientPtr client)
 {
     /* REQUEST(xRecordQueryVersionReq); */
-    xRecordQueryVersionReply rep = {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .majorVersion = SERVER_RECORD_MAJOR_VERSION,
-        .minorVersion = SERVER_RECORD_MINOR_VERSION
-    };
+    xRecordQueryVersionReply rep;
 
     REQUEST_SIZE_MATCH(xRecordQueryVersionReq);
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.majorVersion = SERVER_RECORD_MAJOR_VERSION;
+    rep.minorVersion = SERVER_RECORD_MINOR_VERSION;
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swaps(&rep.majorVersion);
@@ -2231,14 +2230,14 @@ ProcRecordGetContext(ClientPtr client)
 
     /* write the reply header */
 
-    rep = (xRecordGetContextReply) {
-        .type = X_Reply,
-        .enabled = pContext->pRecordingClient != NULL,
-        .sequenceNumber = client->sequence,
-        .length = length,
-        .elementHeader = pContext->elemHeaders,
-        .nClients = nClients
-    };
+
+    rep.type = X_Reply;
+    rep.enabled = pContext->pRecordingClient != NULL;
+    rep.sequenceNumber = client->sequence;
+    rep.length = length;
+    rep.elementHeader = pContext->elemHeaders;
+    rep.nClients = nClients;
+
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swapl(&rep.length);
diff --git a/xorg-server/render/makefile b/xorg-server/render/makefile
new file mode 100644
index 000000000..86d66a6d3
--- /dev/null
+++ b/xorg-server/render/makefile
@@ -0,0 +1,15 @@
+

+LIBRARY=librender

+

+CSRCS =	\

+	animcur.c	\

+	filter.c	\

+	glyph.c		\

+	matrix.c	\

+	miindex.c	\

+	mipict.c	\

+	mirect.c	\

+	mitrap.c	\

+	mitri.c		\

+	picture.c	\

+	render.c

diff --git a/xorg-server/render/mipict.c b/xorg-server/render/mipict.c
index 2e64b20ff..421df5aa8 100644
--- a/xorg-server/render/mipict.c
+++ b/xorg-server/render/mipict.c
@@ -246,7 +246,7 @@ miChangePictureFilter(PicturePtr pPicture,
 
 #define BOUND(v)	(INT16) ((v) < MINSHORT ? MINSHORT : (v) > MAXSHORT ? MAXSHORT : (v))
 
-static inline pixman_bool_t
+static __inline pixman_bool_t
 miClipPictureReg(pixman_region16_t * pRegion,
                  pixman_region16_t * pClip, int dx, int dy)
 {
diff --git a/xorg-server/render/render.c b/xorg-server/render/render.c
index 51f75ae7e..b159021e2 100644
--- a/xorg-server/render/render.c
+++ b/xorg-server/render/render.c
@@ -268,11 +268,7 @@ static int
 ProcRenderQueryVersion(ClientPtr client)
 {
     RenderClientPtr pRenderClient = GetRenderClient(client);
-    xRenderQueryVersionReply rep = {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0
-    };
+    xRenderQueryVersionReply rep;
 
     REQUEST(xRenderQueryVersionReq);
 
@@ -280,6 +276,10 @@ ProcRenderQueryVersion(ClientPtr client)
     pRenderClient->minor_version = stuff->minorVersion;
 
     REQUEST_SIZE_MATCH(xRenderQueryVersionReq);
+    memset(&rep, 0, sizeof(xRenderQueryVersionReply));
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
 
     if ((stuff->majorVersion * 1000 + stuff->minorVersion) <
         (SERVER_RENDER_MAJOR_VERSION * 1000 + SERVER_RENDER_MINOR_VERSION)) {
diff --git a/xorg-server/startmulti.bat b/xorg-server/startmulti.bat
new file mode 100644
index 000000000..6b989d2aa
--- /dev/null
+++ b/xorg-server/startmulti.bat
@@ -0,0 +1 @@
+vcxsrv :1 -ac -terminate -lesspointer -multiwindow -xkblayout be -xkbmodel pc105 -clipboard -logverbose 4

diff --git a/xorg-server/startxdmcp.bat b/xorg-server/startxdmcp.bat
new file mode 100644
index 000000000..b2af85f53
--- /dev/null
+++ b/xorg-server/startxdmcp.bat
@@ -0,0 +1,2 @@
+vcxsrv :1 -query 192.168.37.20 -clipboard -ac -xkblayout be -xkbmodel pc105 -logverbose 4 -once

+

diff --git a/xorg-server/system.XWinrc b/xorg-server/system.XWinrc
new file mode 100644
index 000000000..1d4c2b208
--- /dev/null
+++ b/xorg-server/system.XWinrc
@@ -0,0 +1,127 @@
+# XWin Server Resource File - EXAMPLE
+# Earle F. Philhower, III
+
+# Place in ~/.XWinrc or in /etc/X11/system.XWinrc
+
+# Keywords are case insensitive, comments legal pretty much anywhere
+# you can have an end-of-line
+
+# Comments begin with "#" or "//" and go to the end-of-line
+
+# Paths to icons are **WINDOWS** based (i.e. c:\windows\icons)
+
+# Menus are defined as...
+# MENU <name> {
+#	<Menu Text>	EXEC	<command>
+#                               ^^ This command will have any "%display%"
+#                                  string replaced with the proper display
+#                                  variable (i.e. 127.0.0.1:<display>.0)
+#                                  (This should only rarely be needed as
+#                                  the DISPLAY environment variable is also
+#                                  set correctly)
+#  or	<Menu Text>	MENU	<name-of-some-prior-defined-menu>
+#  or	<Menu Text>	ALWAYSONTOP
+#                         ^^ Sets the window to display above all others
+#  or   <Menu Text>	RELOAD
+#                         ^^ Causes ~/.XWinrc or the system.XWinrc file
+#                            to be reloaded and icons and menus regenerated
+#  or	SEPARATOR
+#       ...
+# }
+
+# Set the taskmar menu with
+# ROOTMENU <name-of-some-prior-defined-menu>
+
+# If you want a menu to be applied to all popup window's system menu
+# DEFAULTSYSMENU <name-of-some-prior-defined-menu> <atstart|atend>
+
+# To choose a specific menu for a specific WM_CLASS or WM_NAME use ...
+# SYSMENU {
+#	<class-or-name-of-window> <name-of-prior-defined-menu> <atstart|atend>
+#	...
+# }
+
+# When specifying an ICONFILE in the following commands several different
+# formats are allowed:
+# 1. Name of a regular Windows .ico format file
+#    (ex:  "cygwin.ico", "apple.ico")
+# 2. Name and index into a Windows .DLL
+#    (ex: "c:\windows\system32\shell32.dll,4" gives the default folder icon
+#         "c:\windows\system32\shell32.dll,5" gives the floppy drive icon)
+# 3. Index into XWin.EXE internal ICON resource
+#    (ex: ",101" is the 1st icon inside XWin.exe)
+
+# To define where ICO files live (** Windows path**)
+# ICONDIRECTORY	<windows-path i.e. c:\cygwin\usr\icons>
+# NOTE: If you specify a fully qualified path to an ICON below
+#             (i.e. "c:\xxx" or "d:\xxxx")
+#       this ICONDIRECTORY will not be prepended
+
+# To change the taskbar icon use...
+# TRAYICON       <name-of-windows-ico-file-in-icondirectory>
+
+# To define a replacement for the standard X icon for apps w/o specified icons
+# DEFAULTICON	<name-of-windows-ico-file-in-icondirectory>
+
+# To define substitute icons on a per-window basis use...
+# ICONS {
+#	<class-or-name-of-window> <icon-file-name.ico>
+#	...
+# }
+# In the case where multiple matches occur, the first listed in the ICONS
+# section will be chosen.
+
+# To disable exit confirmation dialog add the line containing SilentExit
+
+# DEBUG <string> prints out the string to the XWin.log file
+
+// Below are just some silly menus to demonstrate writing your
+// own configuration file.
+
+// Make some menus...
+menu apps {
+	xcalc   	exec	"xcalc"
+	xclock  	exec	"xclock"
+	xwininfo	exec	"xwininfo -pause"
+}
+
+menu root {
+// Comments fit here, too...
+	"Reload system.XWinrc"	RELOAD
+	"Applications"        	menu	apps
+	Separator
+	"Show log"	exec	"notepad %logfile%"
+	Separator
+}
+
+menu aot {
+	Separator
+	"Always on Top"	alwaysontop
+}
+
+menu xtermspecial {
+	"Emacs"		exec	"emacs"
+	"Always on Top"	alwaysontop
+	Separator
+}
+
+RootMenu root
+
+DefaultSysMenu aot atend
+
+SysMenu {
+	"xterm"	xtermspecial atstart
+}
+
+# IconDirectory	"c:\winnt\"
+
+# DefaultIcon	"reinstall.ico"
+
+# Icons {
+# 	"xterm"	"uninstall.ico"
+# }
+
+# SilentExit
+
+# DEBUG "Done parsing the configuration file..."
+
diff --git a/xorg-server/vcxsrv.sln b/xorg-server/vcxsrv.sln
new file mode 100644
index 000000000..a581eb181
--- /dev/null
+++ b/xorg-server/vcxsrv.sln
@@ -0,0 +1,26 @@
+

+Microsoft Visual Studio Solution File, Format Version 11.00

+# Visual Studio 2010

+Project("{911E67C6-3D85-4FCE-B560-20A9C3E3FF48}") = "vcxsrv", "vcxsrv.exe", "{0A7F2844-C7BA-43E2-B7AE-48070F7AA1A7}"

+	ProjectSection(DebuggerProjectSystem) = preProject

+		PortSupplier = 00000000-0000-0000-0000-000000000000

+		Executable = D:\vcxsrv x server\trunk\xorg-server\vcxsrv.exe

+		RemoteMachine = OAB1MAHAENEW

+		StartingDirectory = D:\vcxsrv x server\trunk\xorg-server

+		Environment = Default

+		LaunchingEngine = 00000000-0000-0000-0000-000000000000

+		LaunchSQLEngine = No

+		AttachLaunchAction = No

+	EndProjectSection

+EndProject

+Global

+	GlobalSection(SolutionConfigurationPlatforms) = preSolution

+		Debug|Default = Debug|Default

+	EndGlobalSection

+	GlobalSection(ProjectConfigurationPlatforms) = postSolution

+		{0A7F2844-C7BA-43E2-B7AE-48070F7AA1A7}.Debug|Default.ActiveCfg = Debug

+	EndGlobalSection

+	GlobalSection(SolutionProperties) = preSolution

+		HideSolutionNode = FALSE

+	EndGlobalSection

+EndGlobal

diff --git a/xorg-server/xfixes/cursor.c b/xorg-server/xfixes/cursor.c
index 568e717fa..87da4701a 100644..100755
--- a/xorg-server/xfixes/cursor.c
+++ b/xorg-server/xfixes/cursor.c
@@ -44,6 +44,8 @@
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#else
+#define XFIXES
 #endif
 
 #include "xfixesint.h"
@@ -162,14 +164,13 @@ CursorDisplayCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)
         CursorCurrent[pDev->id] = pCursor;
         for (e = cursorEvents; e; e = e->next) {
             if ((e->eventMask & XFixesDisplayCursorNotifyMask)) {
-                xXFixesCursorNotifyEvent ev = {
-                    .type = XFixesEventBase + XFixesCursorNotify,
-                    .subtype = XFixesDisplayCursorNotify,
-                    .window = e->pWindow->drawable.id,
-                    .cursorSerial = pCursor ? pCursor->serialNumber : 0,
-                    .timestamp = currentTime.milliseconds,
-                    .name = pCursor ? pCursor->name : None
-                };
+                xXFixesCursorNotifyEvent ev;
+                ev.type = XFixesEventBase + XFixesCursorNotify;
+                ev.subtype = XFixesDisplayCursorNotify;
+                ev.window = e->pWindow->drawable.id;
+                ev.cursorSerial = pCursor ? pCursor->serialNumber : 0;
+                ev.timestamp = currentTime.milliseconds;
+                ev.name = pCursor ? pCursor->name : None;
                 WriteEventsToClient(e->pClient, 1, (xEvent *) &ev);
             }
         }
@@ -462,13 +463,13 @@ ProcXFixesGetCursorName(ClientPtr client)
         str = "";
     len = strlen(str);
 
-    reply = (xXFixesGetCursorNameReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = bytes_to_int32(len),
-        .atom = pCursor->name,
-        .nbytes = len
-    };
+
+    reply.type = X_Reply;
+    reply.sequenceNumber = client->sequence;
+    reply.length = bytes_to_int32(len);
+    reply.atom = pCursor->name;
+    reply.nbytes = len;
+
     if (client->swapped) {
         swaps(&reply.sequenceNumber);
         swapl(&reply.length);
diff --git a/xorg-server/xfixes/makefile b/xorg-server/xfixes/makefile
new file mode 100644
index 000000000..73df36c4e
--- /dev/null
+++ b/xorg-server/xfixes/makefile
@@ -0,0 +1,9 @@
+CSRCS = cursor.c	\
+	region.c	\
+	saveset.c	\
+	select.c	\
+	xfixes.c
+  
+LIBRARY=libxfixes
+
+
diff --git a/xorg-server/xfixes/select.c b/xorg-server/xfixes/select.c
index ee8ed6f68..17fb0b583 100644
--- a/xorg-server/xfixes/select.c
+++ b/xorg-server/xfixes/select.c
@@ -77,16 +77,15 @@ XFixesSelectionCallback(CallbackListPtr *callbacks, pointer data, pointer args)
     }
     for (e = selectionEvents; e; e = e->next) {
         if (e->selection == selection->selection && (e->eventMask & eventMask)) {
-            xXFixesSelectionNotifyEvent ev = {
-                .type = XFixesEventBase + XFixesSelectionNotify,
-                .subtype = subtype,
-                .window = e->pWindow->drawable.id,
-                .owner = (subtype == XFixesSetSelectionOwnerNotify) ?
-                            selection->window : 0,
-                .selection = e->selection,
-                .timestamp = currentTime.milliseconds,
-                .selectionTimestamp = selection->lastTimeChanged.milliseconds
-            };
+            xXFixesSelectionNotifyEvent ev;
+            ev.type = XFixesEventBase + XFixesSelectionNotify;
+            ev.subtype = subtype;
+            ev.window = e->pWindow->drawable.id;
+            ev.owner = (subtype == XFixesSetSelectionOwnerNotify) ?
+                            selection->window : 0;
+            ev.selection = e->selection;
+            ev.timestamp = currentTime.milliseconds;
+            ev.selectionTimestamp = selection->lastTimeChanged.milliseconds;
             WriteEventsToClient(e->pClient, 1, (xEvent *) &ev);
         }
     }
diff --git a/xorg-server/xfixes/xfixes.c b/xorg-server/xfixes/xfixes.c
index 48af9ea6e..c377d233c 100644
--- a/xorg-server/xfixes/xfixes.c
+++ b/xorg-server/xfixes/xfixes.c
@@ -62,15 +62,15 @@ static int
 ProcXFixesQueryVersion(ClientPtr client)
 {
     XFixesClientPtr pXFixesClient = GetXFixesClient(client);
-    xXFixesQueryVersionReply rep = {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0
-    };
+    xXFixesQueryVersionReply rep;
 
     REQUEST(xXFixesQueryVersionReq);
 
     REQUEST_SIZE_MATCH(xXFixesQueryVersionReq);
+    memset(&rep, 0, sizeof(xXFixesQueryVersionReply));
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
 
     if (version_compare(stuff->majorVersion, stuff->minorVersion,
                         SERVER_XFIXES_MAJOR_VERSION,
diff --git a/xorg-server/xkb/XKBMisc.c b/xorg-server/xkb/XKBMisc.c
index 6abd1d11a..6280637d6 100644
--- a/xorg-server/xkb/XKBMisc.c
+++ b/xorg-server/xkb/XKBMisc.c
@@ -330,7 +330,7 @@ _XkbFindMatchingInterp(XkbDescPtr xkb,
 static void
 _XkbAddKeyChange(KeyCode *pFirst, unsigned char *pNum, KeyCode newKey)
 {
-    KeyCode last;
+    int last;
 
     last = (*pFirst) + (*pNum);
     if (newKey < *pFirst) {
diff --git a/xorg-server/xkb/ddxPrivate.c b/xorg-server/xkb/ddxPrivate.c
index fcde3a18c..c4d21cb9c 100644
--- a/xorg-server/xkb/ddxPrivate.c
+++ b/xorg-server/xkb/ddxPrivate.c
@@ -3,12 +3,44 @@
 #include <dix-config.h>
 #endif
 
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include <stdio.h>
 #include <X11/X.h>
 #include "windowstr.h"
+#define XKBSRV_NEED_FILE_FUNCS
 #include <xkbsrv.h>
 
+#include "dixgrabs.h"
+#include "os.h"
+#include "xf86.h"
+
 int
 XkbDDXPrivate(DeviceIntPtr dev, KeyCode key, XkbAction *act)
 {
+    XkbAnyAction *xf86act = &(act->any);
+    char msgbuf[XkbAnyActionDataSize+1];
+
+    if (xf86act->type == XkbSA_XFree86Private) {
+        memcpy(msgbuf, xf86act->data, XkbAnyActionDataSize);
+        msgbuf[XkbAnyActionDataSize]= '\0';
+        if (strcasecmp(msgbuf, "prgrbs")==0) {
+            DeviceIntPtr tmp;
+            ErrorF("Printing all currently active device grabs:\n");
+            for (tmp = inputInfo.devices; tmp; tmp = tmp->next)
+                if (tmp->deviceGrab.grab)
+                    PrintDeviceGrabInfo(tmp);
+            ErrorF("End list of active device grabs\n");
+        }
+        else if (strcasecmp(msgbuf, "ungrab")==0)
+            UngrabAllDevices(FALSE);
+        else if (strcasecmp(msgbuf, "clsgrb")==0)
+            UngrabAllDevices(TRUE);
+        else if (strcasecmp(msgbuf, "prwins")==0)
+            PrintWindowTree();
+    }
+
     return 0;
 }
diff --git a/xorg-server/xkb/makefile b/xorg-server/xkb/makefile
new file mode 100755
index 000000000..71a327c8e
--- /dev/null
+++ b/xorg-server/xkb/makefile
@@ -0,0 +1,41 @@
+DEFINES += HAVE_XKB_CONFIG_H
+
+DDX_SRCS = \
+        ddxBeep.c \
+        ddxCtrls.c \
+        ddxLEDs.c \
+        ddxLoad.c
+
+DIX_SRCS = \
+        xkb.c \
+        xkbUtils.c \
+        xkbEvents.c \
+        xkbAccessX.c \
+        xkbSwap.c \
+        xkbLEDs.c \
+        xkbInit.c \
+        xkbActions.c \
+        xkbPrKeyEv.c
+
+# this should be replaced by a common library or something, ideally -d
+XKBFILE_SRCS = \
+        maprules.c \
+        xkmread.c \
+        xkbtext.c \
+        xkbfmisc.c \
+        xkbout.c
+
+X11_SRCS = \
+        XKBMisc.c \
+        XKBAlloc.c \
+        XKBGAlloc.c \
+        XKBMAlloc.c
+
+# ends up unused...
+# XI_SRCS = xkbPrOtherEv.c
+
+CSRCS = $(DDX_SRCS) $(DIX_SRCS) $(XI_SRCS) $(XKBFILE_SRCS) \
+                    $(X11_SRCS) ddxVT.c ddxPrivate.c ddxKillSrv.c
+
+LIBRARY=libxkb
+
diff --git a/xorg-server/xkb/xkb.c b/xorg-server/xkb/xkb.c
index 7e51e4080..ab84a9075 100644..100755
--- a/xorg-server/xkb/xkb.c
+++ b/xorg-server/xkb/xkb.c
@@ -182,14 +182,13 @@ ProcXkbUseExtension(ClientPtr client)
              stuff->wantedMinor, SERVER_XKB_MAJOR_VERSION,
              SERVER_XKB_MINOR_VERSION);
     }
-    rep = (xkbUseExtensionReply) {
-        .type = X_Reply,
-        .supported = supported,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .serverMajor = SERVER_XKB_MAJOR_VERSION,
-        .serverMinor = SERVER_XKB_MINOR_VERSION
-    };
+    memset(&rep, 0, sizeof(xkbUseExtensionReply));
+    rep.type = X_Reply;
+    rep.supported = supported;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.serverMajor = SERVER_XKB_MAJOR_VERSION;
+    rep.serverMinor = SERVER_XKB_MINOR_VERSION;
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swaps(&rep.serverMajor);
@@ -579,22 +578,21 @@ ProcXkbGetState(ClientPtr client)
     CHK_KBD_DEVICE(dev, stuff->deviceSpec, client, DixGetAttrAccess);
 
     xkb = &dev->key->xkbInfo->state;
-    rep = (xkbGetStateReply) {
-        .type = X_Reply,
-        .deviceID = dev->id,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .mods = XkbStateFieldFromRec(xkb) & 0xff,
-        .baseMods = xkb->base_mods,
-        .latchedMods = xkb->latched_mods,
-        .lockedMods = xkb->locked_mods,
-        .group = xkb->group,
-        .lockedGroup = xkb->locked_group,
-        .baseGroup = xkb->base_group,
-        .latchedGroup = xkb->latched_group,
-        .compatState = xkb->compat_state,
-        .ptrBtnState = xkb->ptr_buttons
-    };
+    memset(&rep, 0, sizeof(xkbGetStateReply));
+    rep.type = X_Reply;
+    rep.deviceID = dev->id;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.mods = XkbStateFieldFromRec(xkb) & 0xff;
+    rep.baseMods = xkb->base_mods;
+    rep.latchedMods = xkb->latched_mods;
+    rep.lockedMods = xkb->locked_mods;
+    rep.group = xkb->group;
+    rep.lockedGroup = xkb->locked_group;
+    rep.baseGroup = xkb->base_group;
+    rep.latchedGroup = xkb->latched_group;
+    rep.compatState = xkb->compat_state;
+    rep.ptrBtnState = xkb->ptr_buttons;
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swaps(&rep.ptrBtnState);
@@ -691,38 +689,38 @@ ProcXkbGetControls(ClientPtr client)
     CHK_KBD_DEVICE(dev, stuff->deviceSpec, client, DixGetAttrAccess);
 
     xkb = dev->key->xkbInfo->desc->ctrls;
-    rep = (xkbGetControlsReply) {
-        .type = X_Reply,
-        .deviceID = ((DeviceIntPtr) dev)->id,
-        .sequenceNumber = client->sequence,
-        .length = bytes_to_int32(SIZEOF(xkbGetControlsReply) -
-                                 SIZEOF(xGenericReply)),
-        .mkDfltBtn = xkb->mk_dflt_btn,
-        .numGroups = xkb->num_groups,
-        .groupsWrap = xkb->groups_wrap,
-        .internalMods = xkb->internal.mask,
-        .ignoreLockMods = xkb->ignore_lock.mask,
-        .internalRealMods = xkb->internal.real_mods,
-        .ignoreLockRealMods = xkb->ignore_lock.real_mods,
-        .internalVMods = xkb->internal.vmods,
-        .ignoreLockVMods = xkb->ignore_lock.vmods,
-        .repeatDelay = xkb->repeat_delay,
-        .repeatInterval = xkb->repeat_interval,
-        .slowKeysDelay = xkb->slow_keys_delay,
-        .debounceDelay = xkb->debounce_delay,
-        .mkDelay = xkb->mk_delay,
-        .mkInterval = xkb->mk_interval,
-        .mkTimeToMax = xkb->mk_time_to_max,
-        .mkMaxSpeed = xkb->mk_max_speed,
-        .mkCurve = xkb->mk_curve,
-        .axOptions = xkb->ax_options,
-        .axTimeout = xkb->ax_timeout,
-        .axtOptsMask = xkb->axt_opts_mask,
-        .axtOptsValues = xkb->axt_opts_values,
-        .axtCtrlsMask = xkb->axt_ctrls_mask,
-        .axtCtrlsValues = xkb->axt_ctrls_values,
-        .enabledCtrls = xkb->enabled_ctrls,
-    };
+    
+    rep.type = X_Reply;
+    rep.deviceID = ((DeviceIntPtr) dev)->id;
+    rep.sequenceNumber = client->sequence;
+    rep.length = bytes_to_int32(SIZEOF(xkbGetControlsReply) -
+                                SIZEOF(xGenericReply));
+    rep.mkDfltBtn = xkb->mk_dflt_btn;
+    rep.numGroups = xkb->num_groups;
+    rep.groupsWrap = xkb->groups_wrap;
+    rep.internalMods = xkb->internal.mask;
+    rep.ignoreLockMods = xkb->ignore_lock.mask;
+    rep.internalRealMods = xkb->internal.real_mods;
+    rep.ignoreLockRealMods = xkb->ignore_lock.real_mods;
+    rep.internalVMods = xkb->internal.vmods;
+    rep.ignoreLockVMods = xkb->ignore_lock.vmods;
+    rep.repeatDelay = xkb->repeat_delay;
+    rep.repeatInterval = xkb->repeat_interval;
+    rep.slowKeysDelay = xkb->slow_keys_delay;
+    rep.debounceDelay = xkb->debounce_delay;
+    rep.mkDelay = xkb->mk_delay;
+    rep.mkInterval = xkb->mk_interval;
+    rep.mkTimeToMax = xkb->mk_time_to_max;
+    rep.mkMaxSpeed = xkb->mk_max_speed;
+    rep.mkCurve = xkb->mk_curve;
+    rep.axOptions = xkb->ax_options;
+    rep.axTimeout = xkb->ax_timeout;
+    rep.axtOptsMask = xkb->axt_opts_mask;
+    rep.axtOptsValues = xkb->axt_opts_values;
+    rep.axtCtrlsMask = xkb->axt_ctrls_mask;
+    rep.axtCtrlsValues = xkb->axt_ctrls_values;
+    rep.enabledCtrls = xkb->enabled_ctrls;
+    
     memcpy(rep.perKeyRepeat, xkb->per_key_repeat, XkbPerKeyBitArraySize);
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
@@ -1464,16 +1462,14 @@ ProcXkbGetMap(ClientPtr client)
     CHK_MASK_LEGAL(0x03, stuff->partial, XkbAllMapComponentsMask);
 
     xkb = dev->key->xkbInfo->desc;
-    rep = (xkbGetMapReply) {
-        .type = X_Reply,
-        .deviceID = dev->id,
-        .sequenceNumber = client->sequence,
-        .length = (SIZEOF(xkbGetMapReply) - SIZEOF(xGenericReply)) >> 2,
-        .present = stuff->partial | stuff->full,
-        .minKeyCode = xkb->min_key_code,
-        .maxKeyCode = xkb->max_key_code
-    };
-
+    memset(&rep, 0, sizeof(xkbGetMapReply));
+    rep.type = X_Reply;
+    rep.deviceID = dev->id;
+    rep.sequenceNumber = client->sequence;
+    rep.length = (SIZEOF(xkbGetMapReply) - SIZEOF(xGenericReply)) >> 2;
+    rep.present = stuff->partial | stuff->full;
+    rep.minKeyCode = xkb->min_key_code;
+    rep.maxKeyCode = xkb->max_key_code;
     if (stuff->full & XkbKeyTypesMask) {
         rep.firstType = 0;
         rep.nTypes = xkb->map->num_types;
@@ -2778,14 +2774,14 @@ ProcXkbGetCompatMap(ClientPtr client)
     xkb = dev->key->xkbInfo->desc;
     compat = xkb->compat;
 
-    rep = (xkbGetCompatMapReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .deviceID = dev->id,
-        .firstSI = stuff->firstSI,
-        .nSI = stuff->nSI
-    };
+
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.deviceID = dev->id;
+    rep.firstSI = stuff->firstSI;
+    rep.nSI = stuff->nSI;
+
     if (stuff->getAllSI) {
         rep.firstSI = 0;
         rep.nSI = compat->num_si;
@@ -3042,13 +3038,12 @@ ProcXkbGetIndicatorState(ClientPtr client)
     if (!sli)
         return BadAlloc;
 
-    rep = (xkbGetIndicatorStateReply) {
-        .type = X_Reply,
-        .deviceID = dev->id,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .state = sli->effectiveState
-    };
+
+    rep.type = X_Reply;
+    rep.deviceID = dev->id;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.state = sli->effectiveState;
 
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
@@ -3155,13 +3150,13 @@ ProcXkbGetIndicatorMap(ClientPtr client)
     xkb = dev->key->xkbInfo->desc;
     leds = xkb->indicators;
 
-    rep = (xkbGetIndicatorMapReply) {
-        .type = X_Reply,
-        .deviceID = dev->id,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .which = stuff->which
-    };
+
+    rep.type = X_Reply;
+    rep.deviceID = dev->id;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.which = stuff->which;
+    
     XkbComputeGetIndicatorMapReplySize(leds, &rep);
     return XkbSendIndicatorMap(client, leds, &rep);
 }
@@ -3312,13 +3307,13 @@ ProcXkbGetNamedIndicator(ClientPtr client)
         }
     }
 
-    rep = (xkbGetNamedIndicatorReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .deviceID = dev->id,
-        .indicator = stuff->indicator
-    };
+
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.deviceID = dev->id;
+    rep.indicator = stuff->indicator;
+    
     if (map != NULL) {
         rep.found = TRUE;
         rep.on = ((sli->effectiveState & (1 << i)) != 0);
@@ -3894,18 +3889,18 @@ ProcXkbGetNames(ClientPtr client)
     CHK_MASK_LEGAL(0x01, stuff->which, XkbAllNamesMask);
 
     xkb = dev->key->xkbInfo->desc;
-    rep = (xkbGetNamesReply) {
-        .type = X_Reply,
-        .deviceID = dev->id,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .which = stuff->which,
-        .nTypes = xkb->map->num_types,
-        .firstKey = xkb->min_key_code,
-        .nKeys = XkbNumKeys(xkb),
-        .nKeyAliases = xkb->names ? xkb->names->num_key_aliases : 0,
-        .nRadioGroups = xkb->names ? xkb->names->num_rg : 0
-    };
+    memset(&rep, 0, sizeof(xkbGetNamesReply));
+    rep.type = X_Reply;
+    rep.deviceID = dev->id;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.which = stuff->which;
+    rep.nTypes = xkb->map->num_types;
+    rep.firstKey = xkb->min_key_code;
+    rep.nKeys = XkbNumKeys(xkb);
+    rep.nKeyAliases = xkb->names ? xkb->names->num_key_aliases : 0;
+    rep.nRadioGroups = xkb->names ? xkb->names->num_rg : 0;
+    
     XkbComputeGetNamesReplySize(xkb, &rep);
     return XkbSendNames(client, xkb, &rep);
 }
@@ -4943,12 +4938,12 @@ ProcXkbGetGeometry(ClientPtr client)
     CHK_ATOM_OR_NONE(stuff->name);
 
     geom = XkbLookupNamedGeometry(dev, stuff->name, &shouldFree);
-    rep = (xkbGetGeometryReply) {
-        .type = X_Reply,
-        .deviceID = dev->id,
-        .sequenceNumber = client->sequence,
-        .length = 0
-    };
+
+    rep.type = X_Reply;
+    rep.deviceID = dev->id;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+
     status = XkbComputeGetGeometryReplySize(geom, &rep, stuff->name);
     if (status != Success)
         return status;
@@ -5531,15 +5526,15 @@ ProcXkbPerClientFlags(ClientPtr client)
         }
     }
 
-    rep = (xkbPerClientFlagsReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .supported = XkbPCF_AllFlagsMask,
-        .value = client->xkbClientFlags & XkbPCF_AllFlagsMask,
-        .autoCtrls = interest ? interest->autoCtrls : 0,
-        .autoCtrlValues =  interest ? interest->autoCtrlValues : 0,
-    };
+    memset(&rep, 0, sizeof(xkbPerClientFlagsReply));
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.supported = XkbPCF_AllFlagsMask;
+    rep.value = client->xkbClientFlags & XkbPCF_AllFlagsMask;
+    rep.autoCtrls = interest ? interest->autoCtrls : 0;
+    rep.autoCtrlValues =  interest ? interest->autoCtrlValues : 0;
+
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swapl(&rep.supported);
@@ -5646,19 +5641,19 @@ ProcXkbListComponents(ClientPtr client)
     }
     if ((XkbPaddedSize(len) / 4) != stuff->length)
         return BadLength;
-    rep = (xkbListComponentsReply) {
-        .type = X_Reply,
-        .deviceID = dev->id,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .nKeymaps = 0,
-        .nKeycodes = 0,
-        .nTypes = 0,
-        .nCompatMaps = 0,
-        .nSymbols = 0,
-        .nGeometries = 0,
-        .extra = 0
-    };
+    memset(&rep, 0, sizeof(xkbListComponentsReply));
+    rep.type = X_Reply;
+    rep.deviceID = dev->id;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.nKeymaps = 0;
+    rep.nKeycodes = 0;
+    rep.nTypes = 0;
+    rep.nCompatMaps = 0;
+    rep.nSymbols = 0;
+    rep.nGeometries = 0;
+    rep.extra = 0;
+
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swapl(&rep.length);
@@ -5706,6 +5701,8 @@ ProcXkbGetKbdByName(ClientPtr client)
     if (!(client->xkbClientFlags & _XkbClientInitialized))
         return BadAccess;
 
+    memset(&mrep,0,sizeof(mrep));  //MH
+    
     CHK_KBD_DEVICE(dev, stuff->deviceSpec, client, access_mode);
     master = GetMaster(dev, MASTER_KEYBOARD);
 
@@ -6252,25 +6249,24 @@ ProcXkbGetDeviceInfo(ClientPtr client)
         wanted &= ~XkbXI_IndicatorsMask;
 
     nameLen = XkbSizeCountedString(dev->name);
-    rep = (xkbGetDeviceInfoReply) {
-        .type = X_Reply,
-        .deviceID = dev->id,
-        .sequenceNumber = client->sequence,
-        .length = nameLen / 4,
-        .present = wanted,
-        .supported = XkbXI_AllDeviceFeaturesMask,
-        .unsupported = 0,
-        .nDeviceLedFBs = 0,
-        .firstBtnWanted = 0,
-        .nBtnsWanted = 0,
-        .firstBtnRtrn = 0,
-        .nBtnsRtrn = 0,
-        .totalBtns = dev->button ? dev->button->numButtons : 0,
-        .hasOwnState = (dev->key && dev->key->xkbInfo),
-        .dfltKbdFB = dev->kbdfeed ? dev->kbdfeed->ctrl.id : XkbXINone,
-        .dfltLedFB = dev->leds ? dev->leds->ctrl.id : XkbXINone,
-        .devType = dev->xinput_type
-    };
+    memset((char *) &rep, 0, SIZEOF(xkbGetDeviceInfoReply));
+    rep.type = X_Reply;
+    rep.deviceID = dev->id;
+    rep.sequenceNumber = client->sequence;
+    rep.length = nameLen / 4;
+    rep.present = wanted;
+    rep.supported = XkbXI_AllDeviceFeaturesMask;
+    rep.unsupported = 0;
+    rep.nDeviceLedFBs = 0;
+    rep.firstBtnWanted = 0;
+    rep.nBtnsWanted = 0;
+    rep.firstBtnRtrn = 0;
+    rep.nBtnsRtrn = 0;
+    rep.totalBtns = dev->button ? dev->button->numButtons : 0;
+    rep.hasOwnState = (dev->key && dev->key->xkbInfo);
+    rep.dfltKbdFB = dev->kbdfeed ? dev->kbdfeed->ctrl.id : XkbXINone;
+    rep.dfltLedFB = dev->leds ? dev->leds->ctrl.id : XkbXINone;
+    rep.devType = dev->xinput_type;
 
     ledClass = stuff->ledClass;
     ledID = stuff->ledID;
@@ -6736,15 +6732,15 @@ ProcXkbSetDebuggingFlags(ClientPtr client)
     xkbDebugFlags = newFlags;
     xkbDebugCtrls = newCtrls;
 
-    rep = (xkbSetDebuggingFlagsReply) {
-        .type = X_Reply,
-        .sequenceNumber = client->sequence,
-        .length = 0,
-        .currentFlags = newFlags,
-        .currentCtrls = newCtrls,
-        .supportedFlags = ~0,
-        .supportedCtrls = ~0
-    };
+
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 0;
+    rep.currentFlags = newFlags;
+    rep.currentCtrls = newCtrls;
+    rep.supportedFlags = ~0;
+    rep.supportedCtrls = ~0;
+
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swapl(&rep.currentFlags);
diff --git a/xorg-server/xkb/xkbActions.c b/xorg-server/xkb/xkbActions.c
index 1adb38921..c1edeea55 100644
--- a/xorg-server/xkb/xkbActions.c
+++ b/xorg-server/xkb/xkbActions.c
@@ -1425,6 +1425,7 @@ XkbFakePointerMotion(DeviceIntPtr dev, unsigned flags, int x, int y)
 {
     ValuatorMask mask;
     int gpe_flags = 0;
+    int                 Point[]={x, y};
 
     /* ignore attached SDs */
     if (!IsMaster(dev) && !IsFloating(dev))
@@ -1435,8 +1436,8 @@ XkbFakePointerMotion(DeviceIntPtr dev, unsigned flags, int x, int y)
     else
         gpe_flags = POINTER_RELATIVE;
 
-    valuator_mask_set_range(&mask, 0, 2, (int[]) {
-                            x, y});
+    valuator_mask_set_range(&mask, 0, 2,
+                            Point);
 
     InjectPointerKeyEvents(dev, MotionNotify, 0, gpe_flags, &mask);
 }
diff --git a/xorg-server/xkb/xkbEvents.c b/xorg-server/xkb/xkbEvents.c
index 87a4485eb..66a6e1509 100644
--- a/xorg-server/xkb/xkbEvents.c
+++ b/xorg-server/xkb/xkbEvents.c
@@ -99,7 +99,8 @@ XkbSendLegacyMapNotify(DeviceIntPtr kbd, CARD16 xkb_event, CARD16 changed,
             continue;
 
         if (keymap_changed) {
-            xEvent core_mn = { .u.u.type = MappingNotify };
+            xEvent core_mn;
+            core_mn.u.u.type = MappingNotify;
             core_mn.u.mappingNotify.request = MappingKeyboard;
 
             /* Clip the keycode range to what the client knows about, so it
@@ -117,11 +118,10 @@ XkbSendLegacyMapNotify(DeviceIntPtr kbd, CARD16 xkb_event, CARD16 changed,
             WriteEventsToClient(clients[i], 1, &core_mn);
         }
         if (modmap_changed) {
-            xEvent core_mn = {
-                .u.mappingNotify.request = MappingModifier,
-                .u.mappingNotify.firstKeyCode = 0,
-                .u.mappingNotify.count = 0
-            };
+            xEvent core_mn;
+            core_mn.u.mappingNotify.request = MappingModifier;
+            core_mn.u.mappingNotify.firstKeyCode = 0;
+            core_mn.u.mappingNotify.count = 0;
             core_mn.u.u.type = MappingNotify;
             WriteEventsToClient(clients[i], 1, &core_mn);
         }
@@ -131,26 +131,24 @@ XkbSendLegacyMapNotify(DeviceIntPtr kbd, CARD16 xkb_event, CARD16 changed,
      * here? Clients might be upset, but that seems better than the
      * alternative of stale keymaps. -ds */
     if (keymap_changed) {
-        deviceMappingNotify xi_mn = {
-            .type = DeviceMappingNotify,
-            .deviceid = kbd->id,
-            .request = MappingKeyboard,
-            .firstKeyCode = first_key,
-            .count = num_keys,
-            .time = time
-        };
+        deviceMappingNotify xi_mn;
+        xi_mn.type = DeviceMappingNotify;
+        xi_mn.deviceid = kbd->id;
+        xi_mn.request = MappingKeyboard;
+        xi_mn.firstKeyCode = first_key;
+        xi_mn.count = num_keys;
+        xi_mn.time = time;
         SendEventToAllWindows(kbd, DeviceMappingNotifyMask, (xEvent *) &xi_mn,
                               1);
     }
     if (modmap_changed) {
-        deviceMappingNotify xi_mn = {
-            .type = DeviceMappingNotify,
-            .deviceid = kbd->id,
-            .request = MappingModifier,
-            .firstKeyCode = 0,
-            .count = 0,
-            .time = time
-        };
+        deviceMappingNotify xi_mn;
+        xi_mn.type = DeviceMappingNotify;
+        xi_mn.deviceid = kbd->id;
+        xi_mn.request = MappingModifier;
+        xi_mn.firstKeyCode = 0;
+        xi_mn.count = 0;
+        xi_mn.time = time;
         SendEventToAllWindows(kbd, DeviceMappingNotifyMask, (xEvent *) &xi_mn,
                               1);
     }
diff --git a/xorg-server/xkb/xkbInit.c b/xorg-server/xkb/xkbInit.c
index 4e8e267da..861c2815d 100644
--- a/xorg-server/xkb/xkbInit.c
+++ b/xorg-server/xkb/xkbInit.c
@@ -670,7 +670,7 @@ extern int XkbDfltRepeatInterval;
 extern unsigned short XkbDfltAccessXTimeout;
 extern unsigned int XkbDfltAccessXTimeoutMask;
 extern unsigned int XkbDfltAccessXFeedback;
-extern unsigned char XkbDfltAccessXOptions;
+extern unsigned short	XkbDfltAccessXOptions;
 
 int
 XkbProcessArguments(int argc, char *argv[], int i)
@@ -731,7 +731,7 @@ XkbProcessArguments(int argc, char *argv[], int i)
                     j++;
                 }
                 if (((i + 1) < argc) && (isdigit(argv[i + 1][0]))) {
-                    XkbDfltAccessXOptions = (unsigned char)
+                    XkbDfltAccessXOptions=(unsigned short)
                         strtol(argv[++i], NULL, 16);
                     j++;
                 }
diff --git a/xorg-server/xkeyboard-config/compat/makefile b/xorg-server/xkeyboard-config/compat/makefile
new file mode 100644
index 000000000..d8dc5d8c4
--- /dev/null
+++ b/xorg-server/xkeyboard-config/compat/makefile
@@ -0,0 +1,20 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+THISDIR=compat
+
+DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\$(THISDIR)
+
+dist_xkbdata_compat_DATA = \
+accessx basic caps complete \
+iso9995 \
+japan ledcaps \
+lednum ledscroll level5 \
+misc mousekeys \
+olpc pc pc98 xfree86 \
+xtest README
+
+DATA_FILES=$(dist_xkbdata_compat_DATA:%=$(DESTDIR)\%)
+
+include ..\xkbrules.mak
diff --git a/xorg-server/xkeyboard-config/geometry/digital_vndr/makefile b/xorg-server/xkeyboard-config/geometry/digital_vndr/makefile
new file mode 100644
index 000000000..12d4c37fc
--- /dev/null
+++ b/xorg-server/xkeyboard-config/geometry/digital_vndr/makefile
@@ -0,0 +1,12 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\geometry\digital_vndr
+
+dist_geom_DATA = \
+lk  pc  unix
+
+DATA_FILES=$(dist_geom_DATA:%=$(DESTDIR)\%)
+
+include ..\..\xkbrules.mak
diff --git a/xorg-server/xkeyboard-config/geometry/makefile b/xorg-server/xkeyboard-config/geometry/makefile
new file mode 100644
index 000000000..896e186f4
--- /dev/null
+++ b/xorg-server/xkeyboard-config/geometry/makefile
@@ -0,0 +1,25 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+THISDIR=geometry
+
+DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\$(THISDIR)
+
+dist_xkbdata_geometry_DATA = \
+amiga ataritt chicony \
+dell everex fujitsu \
+hhk hp keytronic kinesis \
+macintosh microsoft nec nokia \
+northgate pc sanwa sony thinkpad \
+sun typematrix winbook README
+
+DATA_FILES=$(dist_xkbdata_geometry_DATA:%=$(DESTDIR)\%)
+
+SUBDIRS = digital_vndr  sgi_vndr
+
+load_makefile $(SUBDIRS:%=%\makefile MAKESERVER=0 DEBUG=$(DEBUG);)
+
+extrastuff: $(SUBDIRS:%=%\all)
+
+include ..\xkbrules.mak
diff --git a/xorg-server/xkeyboard-config/geometry/sgi_vndr/makefile b/xorg-server/xkeyboard-config/geometry/sgi_vndr/makefile
new file mode 100644
index 000000000..285067802
--- /dev/null
+++ b/xorg-server/xkeyboard-config/geometry/sgi_vndr/makefile
@@ -0,0 +1,13 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\geometry\sgi_vndr
+
+
+dist_geom_DATA = \
+indigo  indy  O2
+
+DATA_FILES=$(dist_geom_DATA:%=$(DESTDIR)\%)
+
+include ..\..\xkbrules.mak
diff --git a/xorg-server/xkeyboard-config/keycodes/digital_vndr/makefile b/xorg-server/xkeyboard-config/keycodes/digital_vndr/makefile
new file mode 100644
index 000000000..9cf1180e5
--- /dev/null
+++ b/xorg-server/xkeyboard-config/keycodes/digital_vndr/makefile
@@ -0,0 +1,12 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\keycodes\digital_vndr
+
+dist_keycodes_DATA = \
+lk pc
+
+DATA_FILES=$(dist_keycodes_DATA:%=$(DESTDIR)\%)
+
+include ..\..\xkbrules.mak
diff --git a/xorg-server/xkeyboard-config/keycodes/makefile b/xorg-server/xkeyboard-config/keycodes/makefile
new file mode 100644
index 000000000..f22e67a93
--- /dev/null
+++ b/xorg-server/xkeyboard-config/keycodes/makefile
@@ -0,0 +1,33 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+THISDIR=keycodes
+
+DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\$(THISDIR)
+
+SUBDIRS = digital_vndr sgi_vndr
+
+dist_xkbdata_keycodes_DATA = \
+aliases \
+amiga \
+ataritt \
+empty \
+evdev \
+fujitsu \
+hp \
+ibm \
+macintosh \
+sony \
+sun \
+xfree86 \
+xfree98 \
+README
+
+DATA_FILES=$(dist_xkbdata_keycodes_DATA:%=$(DESTDIR)\%)
+
+load_makefile $(SUBDIRS:%=%\makefile MAKESERVER=0 DEBUG=$(DEBUG);)
+
+extrastuff: $(SUBDIRS:%=%\all)
+
+include ..\xkbrules.mak
diff --git a/xorg-server/xkeyboard-config/keycodes/sgi_vndr/makefile b/xorg-server/xkeyboard-config/keycodes/sgi_vndr/makefile
new file mode 100644
index 000000000..e6c1defda
--- /dev/null
+++ b/xorg-server/xkeyboard-config/keycodes/sgi_vndr/makefile
@@ -0,0 +1,12 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\keycodes\sgi_vndr
+
+dist_keycodes_DATA = \
+indigo indy iris
+
+DATA_FILES=$(dist_keycodes_DATA:%=$(DESTDIR)\%)
+
+include ..\..\xkbrules.mak
diff --git a/xorg-server/xkeyboard-config/makefile b/xorg-server/xkeyboard-config/makefile
new file mode 100644
index 000000000..47ce6dd7b
--- /dev/null
+++ b/xorg-server/xkeyboard-config/makefile
@@ -0,0 +1,9 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+SUBDIRS = compat geometry keycodes rules symbols types
+
+load_makefile $(SUBDIRS:%=%\makefile MAKESERVER=0 DEBUG=$(DEBUG);)
+
+all: $(SUBDIRS:%=%\all)
diff --git a/xorg-server/xkeyboard-config/rules/bin/ml1_s.bat b/xorg-server/xkeyboard-config/rules/bin/ml1_s.bat
new file mode 100755
index 000000000..b09459a5d
--- /dev/null
+++ b/xorg-server/xkeyboard-config/rules/bin/ml1_s.bat
@@ -0,0 +1,9 @@
+@echo off
+
+set OUTFILE=base.ml1_s.part
+
+if exist %OUTFILE% del %OUTFILE%
+
+gawk "{   if (index($2, """(""") == 0) {    printf """  *		%%s			=	pc+%%s%%%%(v[1])\n""", $1, $2;   } else {    printf """  *		%%s			=	pc+%%s\n""", $1, $2;   }}" < layoutsMapping.lst >> %OUTFILE%
+
+gawk "{   printf """  *		%%s(%%s)			=	pc+%%s(%%s)\n""", $1, $2, $3, $4; }" < variantsMapping.lst >> %OUTFILE%
diff --git a/xorg-server/xkeyboard-config/rules/bin/ml1v1_s.bat b/xorg-server/xkeyboard-config/rules/bin/ml1v1_s.bat
new file mode 100755
index 000000000..4d492e02b
--- /dev/null
+++ b/xorg-server/xkeyboard-config/rules/bin/ml1v1_s.bat
@@ -0,0 +1,7 @@
+@echo off
+
+set OUTFILE=base.ml1v1_s.part
+
+if exist %OUTFILE% del %OUTFILE%
+
+gawk "{   printf """  *		%%s		%%s		=	pc+%%s(%%s)\n""", $1, $2, $3, $4; }" < variantsMapping.lst >> %OUTFILE%
diff --git a/xorg-server/xkeyboard-config/rules/bin/ml1v_s.bat b/xorg-server/xkeyboard-config/rules/bin/ml1v_s.bat
new file mode 100755
index 000000000..cec1334c0
--- /dev/null
+++ b/xorg-server/xkeyboard-config/rules/bin/ml1v_s.bat
@@ -0,0 +1,7 @@
+@echo off
+
+set OUTFILE=base.ml1v_s.part
+
+if exist %OUTFILE% del %OUTFILE%
+
+gawk "{   printf """  *		%%s		%%s		=	pc+%%s(%%s)\n""", $1, $2, $3, $4; }" < variantsMapping.lst >> %OUTFILE%
diff --git a/xorg-server/xkeyboard-config/rules/bin/ml_s.bat b/xorg-server/xkeyboard-config/rules/bin/ml_s.bat
new file mode 100755
index 000000000..b7f0d9c46
--- /dev/null
+++ b/xorg-server/xkeyboard-config/rules/bin/ml_s.bat
@@ -0,0 +1,9 @@
+@echo off
+
+set OUTFILE=base.ml_s.part
+
+if exist %OUTFILE% del %OUTFILE%
+
+gawk "{   printf """  *		%%s			=	pc+%%s\n""", $1, $2; }" < layoutsMapping.lst >> %OUTFILE%
+
+gawk "{   printf """  *		%%s(%%s)			=	pc+%%s(%%s)\n""", $1, $2, $3, $4; }" < variantsMapping.lst >> %OUTFILE%
diff --git a/xorg-server/xkeyboard-config/rules/bin/mln_s.bat b/xorg-server/xkeyboard-config/rules/bin/mln_s.bat
new file mode 100755
index 000000000..15e0629be
--- /dev/null
+++ b/xorg-server/xkeyboard-config/rules/bin/mln_s.bat
@@ -0,0 +1,10 @@
+@echo off
+set variant=%1
+
+set OUTFILE=base.ml%variant%_s.part
+
+if exist %OUTFILE% del %OUTFILE%
+
+echo "{  if (index($2, """(""") == 0) {    printf """  *		%%s		=	+%%s%%%%(v[%variant%]):%variant%\n""", $1, $2;  } else {    printf """  *		%%s		=	+%%s:%variant%\n""", $1, $2;  }}" < layoutsMapping.lst >> %OUTFILE%
+
+gawk "{  printf """  *		%%s(%%s)	=	+%%s(%%s):%variant%\n""", $1, $2, $3, $4;}" < variantsMapping.lst >> %OUTFILE%
diff --git a/xorg-server/xkeyboard-config/rules/bin/mlnvn_s.bat b/xorg-server/xkeyboard-config/rules/bin/mlnvn_s.bat
new file mode 100755
index 000000000..78119bcc7
--- /dev/null
+++ b/xorg-server/xkeyboard-config/rules/bin/mlnvn_s.bat
@@ -0,0 +1,8 @@
+@echo off
+set variant=%1
+
+set OUTFILE=base.ml%variant%v%variant%_s.part
+
+if exist %OUTFILE% del %OUTFILE%
+
+gawk "{  printf """  *		%%s		%%s	=	+%%s(%%s):%variant%\n""", $1, $2, $3, $4;}" < variantsMapping.lst >> %OUTFILE%
diff --git a/xorg-server/xkeyboard-config/rules/bin/mlv_s.bat b/xorg-server/xkeyboard-config/rules/bin/mlv_s.bat
new file mode 100755
index 000000000..573cb930f
--- /dev/null
+++ b/xorg-server/xkeyboard-config/rules/bin/mlv_s.bat
@@ -0,0 +1,7 @@
+@echo off
+
+set OUTFILE=base.mlv_s.part
+
+if exist %OUTFILE% del %OUTFILE%
+
+gawk "{   printf """  *		%%s		%%s		=	pc+%%s(%%s)\n""", $1, $2, $3, $4; }" < variantsMapping.lst >> %OUTFILE%
diff --git a/xorg-server/xkeyboard-config/rules/compat/.gitignore b/xorg-server/xkeyboard-config/rules/compat/.gitignore
index bd274090a..077356fbb 100644
--- a/xorg-server/xkeyboard-config/rules/compat/.gitignore
+++ b/xorg-server/xkeyboard-config/rules/compat/.gitignore
@@ -1,6 +1,16 @@
+base.ml1_s.part
+base.ml1v1_s.part
 base.ml2_s.part
 base.ml2v2_s.part
 base.ml3_s.part
 base.ml3v3_s.part
 base.ml4_s.part
 base.ml4v4_s.part
+base.ml_s.part
+base.mlv_s.part
+ml1_s.bat
+ml1v1_s.bat
+ml_s.bat
+mln_s.bat
+mlnvn_s.bat
+mlv_s.bat
\ No newline at end of file
diff --git a/xorg-server/xkeyboard-config/rules/compat/makefile b/xorg-server/xkeyboard-config/rules/compat/makefile
new file mode 100644
index 000000000..e14430c74
--- /dev/null
+++ b/xorg-server/xkeyboard-config/rules/compat/makefile
@@ -0,0 +1,56 @@
+transform_files=layoutsMapping.lst variantsMapping.lst
+
+scripts_dir=..\bin
+
+SCRIPTS= \
+base.ml2_s.part \
+base.ml3_s.part \
+base.ml4_s.part \
+base.ml2v2_s.part \
+base.ml3v3_s.part \
+base.ml4v4_s.part \
+base.ml_s.part \
+base.ml1_s.part \
+base.mlv_s.part \
+base.ml1v1_s.part
+
+# Here we make a distinction when compiling from cygwin or from cmd
+ifdef SHLVL
+SH=sh
+SHEXT=.sh
+else
+SH=cmd /c
+SHEXT=.bat
+endif
+
+base.ml2_s.part: $(scripts_dir)\mln_s$(SHEXT) $(transform_files)
+	$(SH) $< 2 .
+
+base.ml3_s.part: $(scripts_dir)\mln_s$(SHEXT) $(transform_files)
+	$(SH) $< 3 .
+
+base.ml4_s.part: $(scripts_dir)\mln_s$(SHEXT) $(transform_files)
+	$(SH) $< 4 .
+
+base.ml2v2_s.part: $(scripts_dir)\mlnvn_s$(SHEXT) $(transform_files)
+	$(SH) $< 2 .
+
+base.ml3v3_s.part: $(scripts_dir)\mlnvn_s$(SHEXT) $(transform_files)
+	$(SH) $< 3 .
+
+base.ml4v4_s.part: $(scripts_dir)\mlnvn_s$(SHEXT) $(transform_files)
+	$(SH) $< 4 .
+
+base.ml_s.part: $(scripts_dir)\ml_s$(SHEXT) $(transform_files)
+	$(SH) $< .
+
+base.ml1_s.part: $(scripts_dir)\ml1_s$(SHEXT) $(transform_files)
+	$(SH) $< .
+
+base.mlv_s.part: $(scripts_dir)\mlv_s$(SHEXT) $(transform_files)
+	$(SH) $< .
+
+base.ml1v1_s.part: $(scripts_dir)\ml1v1_s$(SHEXT) $(transform_files)
+	$(SH) $< .
+
+all: $(SCRIPTS)
diff --git a/xorg-server/xkeyboard-config/rules/makefile b/xorg-server/xkeyboard-config/rules/makefile
new file mode 100644
index 000000000..4e2786734
--- /dev/null
+++ b/xorg-server/xkeyboard-config/rules/makefile
@@ -0,0 +1,197 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+load_makefile compat\makefile MAKESERVER=0 DEBUG=$(DEBUG)
+
+DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\rules
+
+USE_COMPAT_RULES = 1
+
+if USE_COMPAT_RULES
+
+base_parts = base.hdr.part base.lists.part \
+compat/base.lists.part \
+HDR base.m_k.part \
+HDR base.l1_k.part \
+HDR base.l_k.part \
+HDR base.o_k.part \
+HDR base.ml_g.part \
+HDR base.m_g.part \
+HDR compat/base.mlv_s.part   base.mlv_s.part \
+HDR compat/base.ml_s.part    base.ml_s.part  \
+HDR compat/base.ml1_s.part   base.ml1_s.part \
+HDR compat/base.ml1v1_s.part \
+HDR compat/base.ml2_s.part    base.ml2_s.part  \
+HDR compat/base.ml3_s.part    base.ml3_s.part  \
+HDR compat/base.ml4_s.part    base.ml4_s.part  \
+HDR compat/base.ml2v2_s.part  \
+HDR compat/base.ml3v3_s.part  \
+HDR compat/base.ml4v4_s.part  \
+HDR base.m_s.part \
+HDR compat/base.lv_c.part   \
+HDR compat/base.l1v1_c.part \
+HDR compat/base.l2v2_c.part \
+HDR compat/base.l3v3_c.part \
+HDR compat/base.l4v4_c.part \
+HDR base.ml_c.part \
+HDR base.ml1_c.part \
+HDR base.m_t.part \
+HDR base.lo_s.part \
+HDR base.l1o_s.part \
+HDR base.l2o_s.part \
+HDR base.l3o_s.part \
+HDR base.l4o_s.part \
+HDR compat/base.o_s.part     base.o_s.part \
+HDR base.o_c.part \
+HDR base.o_t.part
+
+evdev_parts = base.hdr.part base.lists.part \
+compat/base.lists.part \
+HDR evdev.m_k.part \
+HDR base.l1_k.part \
+HDR base.l_k.part \
+HDR base.o_k.part \
+HDR base.ml_g.part \
+HDR base.m_g.part \
+HDR compat/base.mlv_s.part   base.mlv_s.part \
+HDR compat/base.ml_s.part    base.ml_s.part  \
+HDR compat/base.ml1_s.part   base.ml1_s.part \
+HDR compat/base.ml1v1_s.part \
+HDR compat/base.ml2_s.part    base.ml2_s.part  \
+HDR compat/base.ml3_s.part    base.ml3_s.part  \
+HDR compat/base.ml4_s.part    base.ml4_s.part  \
+HDR compat/base.ml2v2_s.part  \
+HDR compat/base.ml3v3_s.part  \
+HDR compat/base.ml4v4_s.part  \
+HDR evdev.m_s.part \
+HDR compat/base.lv_c.part   \
+HDR compat/base.l1v1_c.part \
+HDR compat/base.l2v2_c.part \
+HDR compat/base.l3v3_c.part \
+HDR compat/base.l4v4_c.part \
+HDR base.ml_c.part \
+HDR base.ml1_c.part \
+HDR base.m_t.part \
+HDR base.lo_s.part \
+HDR base.l1o_s.part \
+HDR base.l2o_s.part \
+HDR base.l3o_s.part \
+HDR base.l4o_s.part \
+HDR compat/base.o_s.part     base.o_s.part \
+HDR base.o_c.part \
+HDR base.o_t.part
+
+else
+
+base_parts = base.hdr.part base.lists.part \
+HDR base.m_k.part \
+HDR base.l1_k.part \
+HDR base.l_k.part \
+HDR \
+HDR base.ml_g.part \
+HDR base.m_g.part \
+HDR base.mlv_s.part \
+HDR base.ml_s.part  \
+HDR base.ml1_s.part \
+HDR \
+HDR base.ml2_s.part  \
+HDR base.ml3_s.part  \
+HDR base.ml4_s.part  \
+HDR \
+HDR \
+HDR \
+HDR base.m_s.part \
+HDR \
+HDR \
+HDR \
+HDR \
+HDR \
+HDR base.ml_c.part \
+HDR base.ml1_c.part \
+HDR base.m_t.part \
+HDR \
+HDR base.l1o_s.part \
+HDR base.l2o_s.part \
+HDR base.l3o_s.part \
+HDR base.l4o_s.part \
+HDR base.o_s.part \
+HDR base.o_c.part \
+HDR base.o_t.part
+
+evdev_parts = base.hdr.part base.lists.part \
+HDR evdev.m_k.part \
+HDR base.l1_k.part \
+HDR base.l_k.part  \
+HDR \
+HDR base.ml_g.part \
+HDR base.m_g.part \
+HDR base.mlv_s.part \
+HDR base.ml_s.part  \
+HDR base.ml1_s.part \
+HDR \
+HDR base.ml2_s.part  \
+HDR base.ml3_s.part  \
+HDR base.ml4_s.part  \
+HDR \
+HDR \
+HDR \
+HDR evdev.m_s.part \
+HDR \
+HDR \
+HDR \
+HDR \
+HDR \
+HDR base.ml_c.part \
+HDR base.ml1_c.part \
+HDR base.m_t.part \
+HDR \
+HDR base.l1o_s.part \
+HDR base.l2o_s.part \
+HDR base.l3o_s.part \
+HDR base.l4o_s.part \
+HDR base.o_s.part \
+HDR base.o_c.part \
+HDR base.o_t.part
+
+endif
+rules_files = base evdev xfree98
+
+lst_files = base.lst evdev.lst
+
+$(DESTDIR)\%.lst: $(DESTDIR)\%.xml
+	perl xml2lst.pl < $< > $@
+
+$(DESTDIR)\base: compat\all $(base_parts)
+	merge $@ $(base_parts)
+
+$(DESTDIR)\evdev: compat\all $(evdev_parts)
+	merge $@ $(evdev_parts) 
+
+dist_files = xkb.dtd README
+
+rules_DATA = $(rules_files) $(lst_files) $(dist_files)
+
+COMPATFILES=xorg xorg.xml xorg.lst
+$(DESTDIR)\xorg: $(DESTDIR)\base
+	copy $< $@
+$(DESTDIR)\xorg%: $(DESTDIR)\base%
+	copy $< $@
+
+rules_DATA := $(rules_DATA) $(COMPATFILES)
+
+xml_in_files = base.xml.in evdev.xml.in base.extras.xml.in evdev.extras.xml.in
+xml_DATA = $(xml_in_files:.xml.in=.xml) 
+
+$(DESTDIR)\%.xml: %.xml.in
+	copy $< $@
+
+$(DESTDIR)\evdev.xml: base.xml.in
+	copy $< $@
+
+$(DESTDIR)\evdev.extras.xml: base.extras.xml.in
+	copy $< $@
+
+DATA_FILES=$(rules_DATA:%=$(DESTDIR)\%) $(xml_DATA:%=$(DESTDIR)\%)
+
+include ..\xkbrules.mak
diff --git a/xorg-server/xkeyboard-config/rules/merge.py b/xorg-server/xkeyboard-config/rules/merge.py
new file mode 100644
index 000000000..442a866f2
--- /dev/null
+++ b/xorg-server/xkeyboard-config/rules/merge.py
@@ -0,0 +1,13 @@
+import sys
+
+pOUT=open(sys.argv[1],"wb")
+pHDR=open("HDR","r")
+for item in sys.argv[2:]:
+  if item == 'HDR':
+    pOUT.write("\n")
+    pOUT.write(pHDR.readline())
+  else:
+    pOUT.write(open(item,"rb").read())
+
+pOUT.close()
+
diff --git a/xorg-server/xkeyboard-config/symbols/cd b/xorg-server/xkeyboard-config/symbols/cd.in
index 5e51535cc..5e51535cc 100644
--- a/xorg-server/xkeyboard-config/symbols/cd
+++ b/xorg-server/xkeyboard-config/symbols/cd.in
diff --git a/xorg-server/xkeyboard-config/symbols/digital_vndr/makefile b/xorg-server/xkeyboard-config/symbols/digital_vndr/makefile
new file mode 100644
index 000000000..cdfa2ef28
--- /dev/null
+++ b/xorg-server/xkeyboard-config/symbols/digital_vndr/makefile
@@ -0,0 +1,13 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\symbols\digital_vndr
+
+dist_symbols_DATA = \
+lk pc us \
+vt
+
+DATA_FILES=$(dist_symbols_DATA:%=$(DESTDIR)\%)
+
+include ..\..\xkbrules.mak
diff --git a/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/makefile b/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/makefile
new file mode 100644
index 000000000..841c123d8
--- /dev/null
+++ b/xorg-server/xkeyboard-config/symbols/fujitsu_vndr/makefile
@@ -0,0 +1,12 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\symbols\fujitsu_vndr
+
+dist_symbols_DATA = \
+jp us
+
+DATA_FILES=$(dist_symbols_DATA:%=$(DESTDIR)\%)
+
+include ..\..\xkbrules.mak
diff --git a/xorg-server/xkeyboard-config/symbols/hp_vndr/makefile b/xorg-server/xkeyboard-config/symbols/hp_vndr/makefile
new file mode 100644
index 000000000..3e6a64f47
--- /dev/null
+++ b/xorg-server/xkeyboard-config/symbols/hp_vndr/makefile
@@ -0,0 +1,12 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\symbols\hp_vndr
+
+dist_symbols_DATA = \
+us
+
+DATA_FILES=$(dist_symbols_DATA:%=$(DESTDIR)\%)
+
+include ..\..\xkbrules.mak
diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/makefile b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/makefile
new file mode 100644
index 000000000..0c54d7bdd
--- /dev/null
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/makefile
@@ -0,0 +1,16 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\symbols\macintosh_vndr
+
+dist_symbols_DATA = \
+apple ch de dk \
+fi fr \
+gb is it jp \
+latam nl no pt \
+se us
+
+DATA_FILES=$(dist_symbols_DATA:%=$(DESTDIR)\%)
+
+include ..\..\xkbrules.mak
diff --git a/xorg-server/xkeyboard-config/symbols/makefile b/xorg-server/xkeyboard-config/symbols/makefile
new file mode 100644
index 000000000..a775efa48
--- /dev/null
+++ b/xorg-server/xkeyboard-config/symbols/makefile
@@ -0,0 +1,56 @@
+SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr nokia_vndr sharp_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr
+
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+THISDIR=symbols
+
+DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\$(THISDIR)
+
+dist_symbols_DATA = \
+ad af al \
+am apl ara \
+at az \
+ba bd be \
+bg br brai \
+bt bw by \
+ca cd ch \
+cm cn cz \
+de dk \
+ee es et epo \
+fi fo fr \
+gb ge gh gn \
+gr hr hu \
+ie il in iq \
+ir is it jp \
+ke kg kh \
+kr kz \
+la latam latin \
+lk lt lv \
+ma mao md me \
+mk ml mm \
+mn mt mv \
+ng nl no np \
+pc ph pk pl pt \
+ro rs ru \
+se si sk sn \
+sy th \
+terminate \
+tj tm tr tw tz \
+ua us uz vn \
+za \
+altwin capslock compose ctrl empty eurosign rupeesign group inet \
+keypad kpdl level3 level5 nbsp olpc shift srvr_ctrl typo
+
+DATA_FILES=$(dist_symbols_DATA:%=$(DESTDIR)\%)
+
+load_makefile $(SUBDIRS:%=%\makefile MAKESERVER=0 DEBUG=$(DEBUG);)
+
+extrastuff: $(SUBDIRS:%=%\all)
+
+include ..\xkbrules.mak
+
+$(DESTDIR)\cd: cd.in
+	copy $< $@
+
diff --git a/xorg-server/xkeyboard-config/symbols/nec_vndr/makefile b/xorg-server/xkeyboard-config/symbols/nec_vndr/makefile
new file mode 100644
index 000000000..6ab523a2b
--- /dev/null
+++ b/xorg-server/xkeyboard-config/symbols/nec_vndr/makefile
@@ -0,0 +1,12 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\symbols\nec_vndr
+
+dist_symbols_DATA = \
+jp
+
+DATA_FILES=$(dist_symbols_DATA:%=$(DESTDIR)\%)
+
+include ..\..\xkbrules.mak
diff --git a/xorg-server/xkeyboard-config/symbols/nokia_vndr/makefile b/xorg-server/xkeyboard-config/symbols/nokia_vndr/makefile
new file mode 100644
index 000000000..f3719bbac
--- /dev/null
+++ b/xorg-server/xkeyboard-config/symbols/nokia_vndr/makefile
@@ -0,0 +1,14 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\symbols\nokia_vndr
+
+dist_symbols_DATA = \
+rx-44 \
+rx-51 \
+su-8w
+
+DATA_FILES=$(dist_symbols_DATA:%=$(DESTDIR)\%)
+
+include ..\..\xkbrules.mak
diff --git a/xorg-server/xkeyboard-config/symbols/sgi_vndr/makefile b/xorg-server/xkeyboard-config/symbols/sgi_vndr/makefile
new file mode 100644
index 000000000..79a27fead
--- /dev/null
+++ b/xorg-server/xkeyboard-config/symbols/sgi_vndr/makefile
@@ -0,0 +1,12 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\symbols\sgi_vndr
+
+dist_symbols_DATA = \
+jp
+
+DATA_FILES=$(dist_symbols_DATA:%=$(DESTDIR)\%)
+
+include ..\..\xkbrules.mak
diff --git a/xorg-server/xkeyboard-config/symbols/sharp_vndr/makefile b/xorg-server/xkeyboard-config/symbols/sharp_vndr/makefile
new file mode 100644
index 000000000..2174000bd
--- /dev/null
+++ b/xorg-server/xkeyboard-config/symbols/sharp_vndr/makefile
@@ -0,0 +1,16 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\symbols\sharp_vndr
+
+dist_symbols_DATA = \
+sl-c3x00 \
+ws003sh \
+ws007sh \
+ws011sh \
+ws020sh
+
+DATA_FILES=$(dist_symbols_DATA:%=$(DESTDIR)\%)
+
+include ..\..\xkbrules.mak
diff --git a/xorg-server/xkeyboard-config/symbols/sony_vndr/makefile b/xorg-server/xkeyboard-config/symbols/sony_vndr/makefile
new file mode 100644
index 000000000..c2c1fa757
--- /dev/null
+++ b/xorg-server/xkeyboard-config/symbols/sony_vndr/makefile
@@ -0,0 +1,12 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\symbols\sony_vndr
+
+dist_symbols_DATA = \
+us
+
+DATA_FILES=$(dist_symbols_DATA:%=$(DESTDIR)\%)
+
+include ..\..\xkbrules.mak
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/makefile b/xorg-server/xkeyboard-config/symbols/sun_vndr/makefile
new file mode 100644
index 000000000..a1329d15f
--- /dev/null
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/makefile
@@ -0,0 +1,18 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\symbols\sun_vndr
+
+dist_symbols_DATA = \
+ ara be br ca ch \
+ cz de dk ee es \
+ fi fr gb gr it \
+ jp kr lt lv nl \
+ no pl pt ro ru \
+ se sk solaris tr \
+ tw ua us
+
+DATA_FILES=$(dist_symbols_DATA:%=$(DESTDIR)\%)
+
+include ..\..\xkbrules.mak
diff --git a/xorg-server/xkeyboard-config/symbols/xfree68_vndr/makefile b/xorg-server/xkeyboard-config/symbols/xfree68_vndr/makefile
new file mode 100644
index 000000000..c9c1b3ede
--- /dev/null
+++ b/xorg-server/xkeyboard-config/symbols/xfree68_vndr/makefile
@@ -0,0 +1,12 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\symbols\xfree68_vndr
+
+dist_symbols_DATA = \
+amiga ataritt
+
+DATA_FILES=$(dist_symbols_DATA:%=$(DESTDIR)\%)
+
+include ..\..\xkbrules.mak
diff --git a/xorg-server/xkeyboard-config/types/default b/xorg-server/xkeyboard-config/types/default.in
index 140208ccc..140208ccc 100644
--- a/xorg-server/xkeyboard-config/types/default
+++ b/xorg-server/xkeyboard-config/types/default.in
diff --git a/xorg-server/xkeyboard-config/types/makefile b/xorg-server/xkeyboard-config/types/makefile
new file mode 100644
index 000000000..ef03746ed
--- /dev/null
+++ b/xorg-server/xkeyboard-config/types/makefile
@@ -0,0 +1,17 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+THISDIR=types
+
+DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\$(THISDIR)
+
+dist_xkbdata_types_DATA = \
+basic cancel caps \
+complete default extra \
+iso9995 level5 mousekeys nokia numpad \
+pc README
+
+DATA_FILES=$(dist_xkbdata_types_DATA:%=$(DESTDIR)\%)
+
+include ..\xkbrules.mak
diff --git a/xorg-server/xkeyboard-config/xkbrules.mak b/xorg-server/xkeyboard-config/xkbrules.mak
new file mode 100644
index 000000000..c117b30c5
--- /dev/null
+++ b/xorg-server/xkeyboard-config/xkbrules.mak
@@ -0,0 +1,26 @@
+DIRFILE=$(THISDIR:%=$(DESTDIR)\..\%.dir)
+
+.PHONY: destdir
+destdir: $(DESTDIR)
+
+all: destdir $(DATA_FILES) $(DIRFILE)
+
+$(DESTDIR)\default: default.in
+	copy $< $@
+
+$(DESTDIR)\%: %
+	copy $< $@
+
+ifneq ($(DIRFILE),)
+.PHONY: extrastuff
+
+#bdftopcf is dependent on libX11.dll, so we need to add the directory of the libX11 dll to the path env variable
+PATH:=$(relpath $(MHMAKECONF)\libxcb\src\$(OBJDIR))\;$(relpath $(MHMAKECONF)\libX11\$(OBJDIR))\;$(relpath $(MHMAKECONF)\libXau\$(OBJDIR))\;$(PATH)
+export PATH
+
+load_makefile ..\..\..\xkbcomp\makefile MAKESERVER=0 DEBUG=0
+
+$(DIRFILE): extrastuff $(DATA_FILES) ..\..\..\xkbcomp\obj\release\xkbcomp.exe
+	-del -e $@
+	cd $(DESTDIR) & ..\..\..\xkbcomp\obj\release\xkbcomp.exe -lfhlpR -o $(relpath $@) *
+endif
diff --git a/xorg-server/xkeysymdb b/xorg-server/xkeysymdb
new file mode 100644
index 000000000..45d892971
--- /dev/null
+++ b/xorg-server/xkeysymdb
@@ -0,0 +1,380 @@
+! Copyright 1993 Massachusetts Institute of Technology
+!
+! Permission to use, copy, modify, distribute, and sell this software and
+! its documentation for any purpose is hereby granted without fee, provided
+! that the above copyright notice appear in all copies and that both that
+! copyright notice and this permission notice appear in supporting
+! documentation, and that the name of M.I.T. not be used in advertising or
+! publicity pertaining to distribution of the software without specific,
+! written prior permission.  M.I.T. makes no representations about the
+! suitability of this software for any purpose.  It is provided "as is"
+! without express or implied warranty.
+!
+
+hpmute_acute		:100000A8
+hpmute_grave		:100000A9
+hpmute_asciicircum	:100000AA
+hpmute_diaeresis	:100000AB
+hpmute_asciitilde	:100000AC
+hplira			:100000AF
+hpguilder		:100000BE
+hpYdiaeresis		:100000EE
+hpIO			:100000EE
+hplongminus		:100000F6
+hpblock			:100000FC
+apLineDel		:1000FF00
+apCharDel		:1000FF01
+apCopy			:1000FF02
+apCut			:1000FF03
+apPaste			:1000FF04
+apMove			:1000FF05
+apGrow			:1000FF06
+apCmd			:1000FF07
+apShell			:1000FF08
+apLeftBar		:1000FF09
+apRightBar		:1000FF0A
+apLeftBox		:1000FF0B
+apRightBox		:1000FF0C
+apUpBox			:1000FF0D
+apDownBox		:1000FF0E
+apPop			:1000FF0F
+apRead			:1000FF10
+apEdit			:1000FF11
+apSave			:1000FF12
+apExit			:1000FF13
+apRepeat		:1000FF14
+hpModelock1		:1000FF48
+hpModelock2		:1000FF49
+hpReset			:1000FF6C
+hpSystem		:1000FF6D
+hpUser			:1000FF6E
+hpClearLine		:1000FF6F
+hpInsertLine		:1000FF70
+hpDeleteLine		:1000FF71
+hpInsertChar		:1000FF72
+hpDeleteChar		:1000FF73
+hpBackTab		:1000FF74
+hpKP_BackTab		:1000FF75
+apKP_parenleft		:1000FFA8
+apKP_parenright		:1000FFA9
+
+I2ND_FUNC_L		:10004001
+I2ND_FUNC_R		:10004002
+IREMOVE			:10004003
+IREPEAT			:10004004
+IA1			:10004101
+IA2			:10004102
+IA3			:10004103
+IA4			:10004104
+IA5			:10004105
+IA6			:10004106
+IA7			:10004107
+IA8			:10004108
+IA9			:10004109
+IA10			:1000410A
+IA11			:1000410B
+IA12			:1000410C
+IA13			:1000410D
+IA14			:1000410E
+IA15			:1000410F
+IB1			:10004201
+IB2			:10004202
+IB3			:10004203
+IB4			:10004204
+IB5			:10004205
+IB6			:10004206
+IB7			:10004207
+IB8			:10004208
+IB9			:10004209
+IB10			:1000420A
+IB11			:1000420B
+IB12			:1000420C
+IB13			:1000420D
+IB14			:1000420E
+IB15			:1000420F
+IB16			:10004210
+
+DRemove			:1000FF00
+Dring_accent		:1000FEB0
+Dcircumflex_accent	:1000FE5E
+Dcedilla_accent		:1000FE2C
+Dacute_accent		:1000FE27
+Dgrave_accent		:1000FE60
+Dtilde			:1000FE7E
+Ddiaeresis		:1000FE22
+
+osfCopy			:1004FF02
+osfCut			:1004FF03
+osfPaste		:1004FF04
+osfBackTab		:1004FF07
+osfBackSpace		:1004FF08
+osfClear		:1004FF0B
+osfEscape		:1004FF1B
+osfAddMode		:1004FF31
+osfPrimaryPaste		:1004FF32
+osfQuickPaste		:1004FF33
+osfPageLeft		:1004FF40
+osfPageUp		:1004FF41
+osfPageDown		:1004FF42
+osfPageRight		:1004FF43
+osfActivate		:1004FF44
+osfMenuBar		:1004FF45
+osfLeft			:1004FF51
+osfUp			:1004FF52
+osfRight		:1004FF53
+osfDown			:1004FF54
+osfPrior		:1004FF55
+osfNext			:1004FF56
+osfEndLine		:1004FF57
+osfBeginLine		:1004FF58
+osfEndData		:1004FF59
+osfBeginData		:1004FF5A
+osfPrevMenu		:1004FF5B
+osfNextMenu		:1004FF5C
+osfPrevField		:1004FF5D
+osfNextField		:1004FF5E
+osfSelect		:1004FF60
+osfInsert		:1004FF63
+osfUndo			:1004FF65
+osfMenu			:1004FF67
+osfCancel		:1004FF69
+osfHelp			:1004FF6A
+osfSelectAll		:1004FF71
+osfDeselectAll		:1004FF72
+osfReselect		:1004FF73
+osfExtend		:1004FF74
+osfRestore		:1004FF78
+osfSwitchDirection	:1004FF7E
+osfPriorMinor		:1004FFF5
+osfNextMinor		:1004FFF6
+osfRightLine		:1004FFF7
+osfLeftLine		:1004FFF8
+osfDelete		:1004FFFF
+
+SunFA_Grave		:1005FF00
+SunFA_Circum		:1005FF01
+SunFA_Tilde		:1005FF02
+SunFA_Acute		:1005FF03
+SunFA_Diaeresis		:1005FF04
+SunFA_Cedilla		:1005FF05
+SunF36			:1005FF10
+SunF37			:1005FF11
+SunSys_Req		:1005FF60
+SunProps		:1005FF70
+SunFront		:1005FF71
+SunCopy			:1005FF72
+SunOpen			:1005FF73
+SunPaste		:1005FF74
+SunCut			:1005FF75
+SunPowerSwitch		:1005FF76
+SunAudioLowerVolume	:1005FF77
+SunAudioMute		:1005FF78
+SunAudioRaiseVolume	:1005FF79
+SunVideoDegauss		:1005FF7A
+SunVideoLowerBrightness	:1005FF7B
+SunVideoRaiseBrightness	:1005FF7C
+SunPowerSwitchShift	:1005FF7D
+
+SunCompose		:FF20
+SunPageUp		:FF55
+SunPageDown		:FF56
+SunPrint_Screen		:FF61
+SunUndo			:FF65
+SunAgain		:FF66
+SunFind			:FF68
+SunStop			:FF69
+SunAltGraph		:FF7E
+
+WYSetup			:1006FF00
+
+ncdSetup		:1006FF00
+
+XeroxPointerButton1	:10070001
+XeroxPointerButton2	:10070002
+XeroxPointerButton3	:10070003
+XeroxPointerButton4	:10070004
+XeroxPointerButton5	:10070005
+
+! The definitions here should match <X11/XF86keysym.h>
+XF86ModeLock		:1008FF01
+XF86MonBrightnessUp	:1008FF02
+XF86MonBrightnessDown	:1008FF03
+XF86KbdLightOnOff	:1008FF04
+XF86KbdBrightnessUp	:1008FF05
+XF86KbdBrightnessDown	:1008FF06
+XF86Standby		:1008FF10
+XF86AudioLowerVolume	:1008FF11
+XF86AudioMute		:1008FF12
+XF86AudioRaiseVolume	:1008FF13
+XF86AudioPlay		:1008FF14
+XF86AudioStop		:1008FF15
+XF86AudioPrev		:1008FF16
+XF86AudioNext		:1008FF17
+XF86HomePage		:1008FF18
+XF86Mail		:1008FF19
+XF86Start		:1008FF1A
+XF86Search		:1008FF1B
+XF86AudioRecord		:1008FF1C
+XF86Calculator		:1008FF1D
+XF86Memo		:1008FF1E
+XF86ToDoList		:1008FF1F
+XF86Calendar		:1008FF20
+XF86PowerDown		:1008FF21
+XF86ContrastAdjust	:1008FF22
+XF86RockerUp		:1008FF23
+XF86RockerDown		:1008FF24
+XF86RockerEnter		:1008FF25
+XF86Back		:1008FF26
+XF86Forward		:1008FF27
+XF86Stop		:1008FF28
+XF86Refresh		:1008FF29
+XF86PowerOff		:1008FF2A
+XF86WakeUp		:1008FF2B
+XF86Eject               :1008FF2C
+XF86ScreenSaver         :1008FF2D
+XF86WWW                 :1008FF2E
+XF86Sleep               :1008FF2F
+XF86Favorites		:1008FF30
+XF86AudioPause		:1008FF31
+XF86AudioMedia		:1008FF32
+XF86MyComputer		:1008FF33
+XF86VendorHome		:1008FF34
+XF86LightBulb		:1008FF35
+XF86Shop		:1008FF36
+XF86History		:1008FF37
+XF86OpenURL		:1008FF38
+XF86AddFavorite		:1008FF39
+XF86HotLinks		:1008FF3A
+XF86BrightnessAdjust	:1008FF3B
+XF86Finance		:1008FF3C
+XF86Community		:1008FF3D
+XF86AudioRewind		:1008FF3E
+XF86BackForward		:1008FF3F
+XF86Launch0		:1008FF40
+XF86Launch1		:1008FF41
+XF86Launch2		:1008FF42
+XF86Launch3		:1008FF43
+XF86Launch4		:1008FF44
+XF86Launch5		:1008FF45
+XF86Launch6		:1008FF46
+XF86Launch7		:1008FF47
+XF86Launch8		:1008FF48
+XF86Launch9		:1008FF49
+XF86LaunchA		:1008FF4A
+XF86LaunchB		:1008FF4B
+XF86LaunchC		:1008FF4C
+XF86LaunchD		:1008FF4D
+XF86LaunchE		:1008FF4E
+XF86LaunchF		:1008FF4F
+XF86ApplicationLeft	:1008FF50
+XF86ApplicationRight	:1008FF51
+XF86Book		:1008FF52
+XF86CD			:1008FF53
+XF86Calculater		:1008FF54
+XF86Clear		:1008FF55
+XF86Close		:1008FF56
+XF86Copy		:1008FF57
+XF86Cut			:1008FF58
+XF86Display		:1008FF59
+XF86DOS			:1008FF5A
+XF86Documents		:1008FF5B
+XF86Excel		:1008FF5C
+XF86Explorer		:1008FF5D
+XF86Game		:1008FF5E
+XF86Go			:1008FF5F
+XF86iTouch		:1008FF60
+XF86LogOff		:1008FF61
+XF86Market		:1008FF62
+XF86Meeting		:1008FF63
+XF86MenuKB		:1008FF65
+XF86MenuPB		:1008FF66
+XF86MySites		:1008FF67
+XF86New			:1008FF68
+XF86News		:1008FF69
+XF86OfficeHome		:1008FF6A
+XF86Open		:1008FF6B
+XF86Option		:1008FF6C
+XF86Paste		:1008FF6D
+XF86Phone		:1008FF6E
+XF86Q			:1008FF70
+XF86Reply		:1008FF72
+XF86Reload		:1008FF73
+XF86RotateWindows	:1008FF74
+XF86RotationPB		:1008FF75
+XF86RotationKB		:1008FF76
+XF86Save		:1008FF77
+XF86ScrollUp		:1008FF78
+XF86ScrollDown		:1008FF79
+XF86ScrollClick		:1008FF7A
+XF86Send		:1008FF7B
+XF86Spell		:1008FF7C
+XF86SplitScreen		:1008FF7D
+XF86Support		:1008FF7E
+XF86TaskPane		:1008FF7F
+XF86Terminal		:1008FF80
+XF86Tools		:1008FF81
+XF86Travel		:1008FF82
+XF86UserPB		:1008FF84
+XF86User1KB		:1008FF85
+XF86User2KB		:1008FF86
+XF86Video		:1008FF87
+XF86WheelButton		:1008FF88
+XF86Word		:1008FF89
+XF86Xfer		:1008FF8A
+XF86ZoomIn		:1008FF8B
+XF86ZoomOut		:1008FF8C
+XF86Away		:1008FF8D
+XF86Messenger		:1008FF8E
+XF86WebCam		:1008FF8F
+XF86MailForward		:1008FF90
+XF86Pictures		:1008FF91
+XF86Music		:1008FF92
+XF86Battery		:1008FF93
+XF86Bluetooth		:1008FF94
+XF86WLAN		:1008FF95
+XF86UWB			:1008FF96
+XF86AudioForward	:1008FF97
+XF86AudioRepeat		:1008FF98
+XF86AudioRandomPlay	:1008FF99
+XF86Subtitle		:1008FF9A
+XF86AudioCycleTrack	:1008FF9B
+XF86CycleAngle		:1008FF9C
+XF86FrameBack		:1008FF9D
+XF86FrameForward	:1008FF9E
+XF86Time		:1008FF9F
+XF86Select		:1008FFA0
+XF86View		:1008FFA1
+XF86TopMenu		:1008FFA2
+XF86Red			:1008FFA3
+XF86Green		:1008FFA4
+XF86Yellow		:1008FFA5
+XF86Blue             	:1008FFA6
+XF86Suspend		:1008FFA7
+XF86Hibernate		:1008FFA8
+XF86TouchpadToggle	:1008FFA9
+
+! XFree86 special action keys
+XF86_Switch_VT_1	:1008FE01
+XF86_Switch_VT_2	:1008FE02
+XF86_Switch_VT_3	:1008FE03
+XF86_Switch_VT_4	:1008FE04
+XF86_Switch_VT_5	:1008FE05
+XF86_Switch_VT_6	:1008FE06
+XF86_Switch_VT_7	:1008FE07
+XF86_Switch_VT_8	:1008FE08
+XF86_Switch_VT_9	:1008FE09
+XF86_Switch_VT_10	:1008FE0A
+XF86_Switch_VT_11	:1008FE0B
+XF86_Switch_VT_12	:1008FE0C
+XF86_Ungrab		:1008FE20
+XF86_ClearGrab		:1008FE21
+XF86_Next_VMode		:1008FE22
+XF86_Prev_VMode		:1008FE23
+
+usldead_acute		:100000A8
+usldead_grave		:100000A9
+usldead_diaeresis	:100000AB
+usldead_asciicircum	:100000AA
+usldead_asciitilde	:100000AC
+usldead_cedilla		:1000FE2C
+usldead_ring		:1000FEB0